From f19bb82d9a45c03fdca73cc48794471c817589bb Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Wed, 6 Sep 2017 07:50:54 -0500 Subject: [PATCH 1/5] Update main.lua --- server/main.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index 823ce96d..df7e1429 100644 --- a/server/main.lua +++ b/server/main.lua @@ -127,8 +127,14 @@ ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, }) local user = result[1] - local firstname = user['firstname'] - local lastname = user['lastname'] + local firstname = user['firstname'] + local lastname = user['lastname'] + local sex = user['sex'] + local dob = tostring(user['dateofbirth']) + local heightInit = user['height'] + local heightFeet = tonumber(string.format("%.0f",heightInit / 12, 0)) + local heightInches = heightInit % 12 + local height = heightFeet .. "\' " .. heightInches .. "\"" local data = { name = GetPlayerName(target), @@ -137,7 +143,10 @@ ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, accounts = xPlayer.accounts, weapons = xPlayer.loadout, firstname = firstname, - lastname = lastname + lastname = lastname, + sex = sex, + dob = dob, + height = height } TriggerEvent('esx_status:getStatus', _source, 'drunk', function(status) From e6ec5b859afc9bc8f2db3da0bf6c9ac39d68dd54 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Wed, 6 Sep 2017 07:52:00 -0500 Subject: [PATCH 2/5] Update main.lua --- server/main.lua | 130 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 36 deletions(-) diff --git a/server/main.lua b/server/main.lua index df7e1429..eea0f1f8 100644 --- a/server/main.lua +++ b/server/main.lua @@ -209,55 +209,113 @@ end) ESX.RegisterServerCallback('esx_policejob:getVehicleInfos', function(source, cb, plate) - MySQL.Async.fetchAll( - 'SELECT * FROM owned_vehicles', - {}, - function(result) + if Config.EnableGCIdentity then + + MySQL.Async.fetchAll( + 'SELECT * FROM owned_vehicles', + {}, + function(result) - local foundIdentifier = nil + local foundIdentifier = nil - for i=1, #result, 1 do + for i=1, #result, 1 do - local vehicleData = json.decode(result[i].vehicle) + local vehicleData = json.decode(result[i].vehicle) + + if vehicleData.plate == plate then + foundIdentifier = result[i].owner + break + end + + end + + if foundIdentifier ~= nil then + + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = foundIdentifier + }, + function(result) + + local ownerName = result[1].firstname .. " " .. result[1].lastname + + local infos = { + plate = plate, + owner = ownerName + } + + cb(infos) + + end + ) + + else + + local infos = { + plate = plate + } + + cb(infos) - if vehicleData.plate == plate then - foundIdentifier = result[i].owner - break end end - - if foundIdentifier ~= nil then - - MySQL.Async.fetchAll( - 'SELECT * FROM users WHERE identifier = @identifier', - { - ['@identifier'] = foundIdentifier - }, - function(result) - - local infos = { - plate = plate, - owner = result[1].name - } - - cb(infos) - - end - ) + ) + + else + + MySQL.Async.fetchAll( + 'SELECT * FROM owned_vehicles', + {}, + function(result) - else + local foundIdentifier = nil - local infos = { + for i=1, #result, 1 do + + local vehicleData = json.decode(result[i].vehicle) + + if vehicleData.plate == plate then + foundIdentifier = result[i].owner + break + end + + end + + if foundIdentifier ~= nil then + + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = foundIdentifier + }, + function(result) + + local infos = { + plate = plate, + owner = result[1].name + } + + cb(infos) + + end + ) + + else + + local infos = { plate = plate - } + } - cb(infos) + cb(infos) + + end end - - end - ) + ) + + end end) From 081ee252789f00da4e3128538a2a9ff4104d34e2 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Wed, 6 Sep 2017 07:53:44 -0500 Subject: [PATCH 3/5] Update main.lua --- client/main.lua | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index e52a75e5..54f0ac0b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -621,17 +621,55 @@ function OpenIdentityCardMenu(player) ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) - local jobLabel = nil - + local jobLabel = nil + local sexLabel = nil + local sex = nil + local dobLabel = nil + local heightLabel = nil + local idLabel = nil + if data.job.grade_label ~= nil and data.job.grade_label ~= '' then jobLabel = 'Job : ' .. data.job.label .. ' - ' .. data.job.grade_label else jobLabel = 'Job : ' .. data.job.label end + if data.sex ~= nil then + if (data.sex == 'm') or (data.sex == 'M') then + sex = 'Male' + else + sex = 'Female' + end + sexLabel = 'Sex : ' .. sex + else + sexLabel = 'Sex : Unknown' + end + + if data.dob ~= nil then + dobLabel = 'DOB : ' .. data.dob + else + dobLabel = 'DOB : Unknown' + end + + if data.height ~= nil then + heightLabel = 'Height : ' .. data.height + else + heightLabel = 'Height : Unknown' + end + + if data.name ~= nil then + idLabel = 'ID : ' .. data.name + else + idLabel = 'ID : Unknown' + end + local elements = { {label = _U('name') .. data.firstname .. " " .. data.lastname, value = nil}, + {label = sexLabel, value = nil}, + {label = dobLabel, value = nil}, + {label = heightLabel, value = nil}, {label = jobLabel, value = nil}, + {label = idLabel, value = nil}, } if data.drunk ~= nil then From 04f81235c856af865db632eab3ade8344f057785 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Wed, 6 Sep 2017 08:06:14 -0500 Subject: [PATCH 4/5] Update main.lua --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 54f0ac0b..bd590a13 100644 --- a/client/main.lua +++ b/client/main.lua @@ -623,7 +623,7 @@ function OpenIdentityCardMenu(player) local jobLabel = nil local sexLabel = nil - local sex = nil + local sex = nil local dobLabel = nil local heightLabel = nil local idLabel = nil From c336248e2345f3ebf43e47697dc12fc37bec8a10 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Wed, 6 Sep 2017 08:07:08 -0500 Subject: [PATCH 5/5] Update main.lua --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index bd590a13..9fd361eb 100644 --- a/client/main.lua +++ b/client/main.lua @@ -669,7 +669,7 @@ function OpenIdentityCardMenu(player) {label = dobLabel, value = nil}, {label = heightLabel, value = nil}, {label = jobLabel, value = nil}, - {label = idLabel, value = nil}, + {label = idLabel, value = nil}, } if data.drunk ~= nil then