Huge refractor, now the event are more safer and light, so no more 81…

…15bt sended over the network, this will not cause any Connection Timeout on some players
JericoFX · Apr 24, 2022 · 70e8782 · 70e8782
1 parent 3cba9a9
commit 70e8782
Show file tree

Hide file tree

Showing 24 changed files with 691 additions and 815 deletions.
diff --git a/client/client.lua b/client/client.lua
@@ -108,20 +108,20 @@ RegisterNetEvent("QBCore:Client:OnPlayerLoaded",function()
         return
     end
     TriggerServerEvent("fx-mdt:server:SendHelpOnLogin")
-    TriggerServerEvent("fx-mdt:server:UpdateReports")
+    TriggerServerEvent("fx-mdt:server:UpdateAllReports")
 end)
 RegisterNetEvent('QBCore:Client:OnJobUpdate',function(job)
     if job.name=="police" then
         TriggerServerEvent("fx-mdt:server:SendHelpOnLogin")
-        TriggerServerEvent("fx-mdt:server:UpdateReports")
+        TriggerServerEvent("fx-mdt:server:UpdateAllReports")
     end
 
 end)
 
-RegisterNetEvent("fx-mdt:client:UpdateReports",function(Reportes)
+RegisterNetEvent("fx-mdt:client:UpdateAllReports",function(Reportes)
     Reports={}
-    Reports=Reportes
-    SendData("updateReports",{reports=Reports})
+    Reports = Reportes
+    SendData("updateAllReports",{reports= Reports})
 end)
 function SendData(action,data)
     if action and type(data)=="table" then
@@ -135,7 +135,7 @@ function SendData(action,data)
 end
 
 RegisterNetEvent("fx-mdt:client:openTablet",function()
-    TriggerServerEvent("fx-mdt:server:UpdateReports")
+    -- TriggerServerEvent("fx-mdt:server:UpdateReports")
     TriggerServerEvent("fx-mdt:server:SendHelpOnLogin")
     local metadata,citizenid,charinfo,job in QBCore.Functions.GetPlayerData()
     SendData("openTablet",{
@@ -155,7 +155,7 @@ RegisterNetEvent("fx-mdt:client:openTablet",function()
 end)
 
 RegisterCommand("mdt",function(source,args)
-    TriggerServerEvent("fx-mdt:server:UpdateReports")
+    -- TriggerServerEvent("fx-mdt:server:UpdateReports")
     local ped=PlayerPedId()
     local veh=GetEntityModel(GetVehiclePedIsIn(ped))
     local metadata,citizenid,charinfo,job in QBCore.Functions.GetPlayerData()
@@ -216,3 +216,26 @@ end)
 RegisterNetEvent("fx-mdt:client:sendUpdateCalls",function(calls)
     SendData("getMycalls",{calls=calls})
 end)
+RegisterNetEvent("fx-mdt:client:UpdateReports",function(data) 
+    print(json.encode(data))
+SendData("updateReports",{reports = data})
+end)
+RegisterNetEvent('fx-mdt:client:updateCallReport', function(id,call)
+
+SendData("updateCallReport",{id = id,call=call})
+end)
+RegisterNetEvent('fx-mdt:client:deleteCall', function(id)
+    SendData("deleteCall",{id = id})
+end)
+
+RegisterNetEvent("fx-mdt:client:deleteReport",function(id)
+    print(id)
+    SendData("delReport",{id = id})
+end)
+AddEventHandler('onResourceStart', function(resourceName)
+    if (GetCurrentResourceName() ~= resourceName) then
+      return
+    end
+    TriggerServerEvent("fx-mdt:server:UpdateAllReports")
+  end)
+
diff --git a/client/nuiCallbacks.lua b/client/nuiCallbacks.lua
@@ -31,8 +31,8 @@ RegisterNUICallback("sendNewReport", function(data, cb)
     local Info = data
 
     QBCore.Functions.TriggerCallback("fx-mdt:server:setNewReport", function(isok)
-        cb({type = isok.type, reports = Reports})
-        TriggerServerEvent("fx-mdt:server:UpdateReports")
+        cb(isok)
+        --TriggerServerEvent("fx-mdt:server:UpdateReports")
     end, Info)
 end)
 
@@ -52,7 +52,6 @@ RegisterNUICallback("deleteReport", function(data, cb)
 
     QBCore.Functions.TriggerCallback("fx-mdt:server:deleteReport", function(bol)
         cb(bol)
-        --TriggerServerEvent("fx-mdt:server:UpdateReports")
     end, ID)
 end)
 RegisterNUICallback("getReports", function(data, cb)
@@ -69,9 +68,9 @@ RegisterNUICallback("getVehicleByPlate", function(data, cb)
     end, Plate)
 end)
 
-function addBlip(coords, text, cb)
+function addBlip(coords, text)
     local blips = {}
-    if coords ~= nil and text ~= nil and not cb then
+    if coords ~= nil and text ~= nil then
         local blip = AddBlipForCoord(coords.x, coords.y, coords.z)
         SetBlipSprite(blip, 535)
         SetBlipColour(blip, 1)
@@ -84,8 +83,7 @@ function addBlip(coords, text, cb)
         AddTextComponentString("CASE ID: "..blip)
         EndTextCommandSetBlipName(blip)
         blips[#blips + 1] = {id = text, bid = blip}
-    else
-        cb(blips)
+
 
     end
 
@@ -108,7 +106,7 @@ end)
 
 RegisterNUICallback("deleteAssignment", function(data, cb)
     local ID = data.id
-    local Callsign = data?.callsign
+    local Callsign = data.callsign
     QBCore.Functions.TriggerCallback("fx-mdt:server:deleteCall", function(cb1)
         cb(cb1)
     end, ID, Callsign)
@@ -139,10 +137,9 @@ RegisterNUICallback("setDestination", function(data, cb)
     cb({})
 end)
 
-RegisterCommand("rfs", function(source, args)
-    TriggerServerEvent("QBCore:Server:SetMetaData", "callsign", "NO CALLSIGN")
-
-end)
+-- RegisterCommand("rfs", function(source, args)
+--     TriggerServerEvent("QBCore:Server:SetMetaData", "callsign", "NO CALLSIGN")
+-- end)
 
 RegisterNUICallback("getDataByPlate", function(data, cb)
     local Plate = data.plate
@@ -181,4 +178,9 @@ RegisterNetEvent("fx-mdt:client:HelpRequested", function(data)
 
     end)
 
-
+   RegisterNUICallback("sendMessage",function (data,cb)
+       local msg = data.message
+       QBCore.Functions.Notify(tostring(msg))
+       cb({})
+   end)
+
diff --git a/config.lua b/config.lua
@@ -1,4 +1,4 @@
-Config=Config or {}
+Config = Config or {}
 --Make this way, nameOfTheCar = true
 Config.AllowedCars={
     [`police`]=true,
@@ -35,6 +35,7 @@ Config.LangAvaliable={
                 index="en",
                 lang="English"
             }}
+
 Config.DefaultLang="en"
 
 
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -19,6 +19,7 @@ shared_scripts({
 files({
 	"nui/dist/index.html",
 	"nui/dist/locales/*.json",
+	"nui/dist/utils/*.json",
 	"nui/dist/assets/*.js",
 	"nui/dist/assets/*.css",
 	"nui/dist/iconos/*.png",

diff --git a/nui/dist/assets/About.0ecc1655.js → nui/dist/assets/About.31fafb72.js b/nui/dist/assets/About.0ecc1655.js → nui/dist/assets/About.31fafb72.js
diff --git a/nui/dist/assets/MyTool.517a58da.js b/nui/dist/assets/MyTool.517a58da.js