From 4ff3c0d654e3d26170cb6764be1895491e5ae691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= <jeremie.ngadi@gmail.com>
Date: Tue, 15 Aug 2017 14:32:56 +0200
Subject: [PATCH] Add removeSpecialContact + disable gps option

---
 client/main.lua     | 12 ++++++++++-
 html/scripts/app.js | 52 +++++++++++++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 73dc6121..be5ca732 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -108,6 +108,16 @@ AddEventHandler('esx_phone:addSpecialContact', function(name, phoneNumber, base6
 
 end)
 
+RegisterNetEvent('esx_phone:removeSpecialContact')
+AddEventHandler('esx_phone:removeSpecialContact', function(phoneNumber)
+	
+	SendNUIMessage({
+		removeSpecialContact = true,
+		number               = phoneNumber
+	})
+
+end)
+
 RegisterNUICallback('add_contact', function(data, cb)
 	
 	local phoneNumber = tonumber(data.phoneNumber)
@@ -167,7 +177,7 @@ AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId, playerName
 
 end)
 
-RegisterNUICallback('setGPS', function(data)	
+RegisterNUICallback('setGPS', function(data)
 	SetNewWaypoint(data.x,  data.y)
 	ESX.ShowNotification('Position entrée dans le GPS')
 end)
diff --git a/html/scripts/app.js b/html/scripts/app.js
index 4934837c..a4f64f5a 100644
--- a/html/scripts/app.js
+++ b/html/scripts/app.js
@@ -206,9 +206,9 @@
 					okNumberData   : fromNumber,
 					gpsLocationX   : (messages[i].job == 'player') ? '' : messages[i].position.x,
 					gpsLocationY   : (messages[i].job == 'player') ? '' : messages[i].position.y,
-					activeGPS      : (messages[i].job == 'player') ? '' : "active",
+					activeGPS      : (messages[i].job == 'player') ? '' : (messages[i].position) ? 'active' : '',
 					jobData        : (messages[i].job == 'player') ? '' : messages[i].job,
-					showOK         : (messages[i].job == 'player') ? '' : "showOK"
+					showOK         : (messages[i].job == 'player') ? '' : 'showOK'
 				}
 				
 				let html = Mustache.render(MessageTpl, view);
@@ -249,17 +249,40 @@
 			element.scrollTop += 100;
 	}
 
-	window.addSpecialContact = function(name, number, base64Icon){
-	
-		specialContacts.push({
-			name      : name,
-			number    : number,
-			base64Icon: base64Icon
-		});
+	let addSpecialContact = function(name, number, base64Icon){
+		
+		let found = false
 
-		specialContacts.sort((a,b) => {
-			return a.name.localeCompare(b.name);
-		});
+		for(let i=0; i<specialContacts.length; i++)
+			if(specialContacts[i].number == number)
+				found = true;
+
+		if(!found){
+
+			specialContacts.push({
+				name      : name,
+				number    : number,
+				base64Icon: base64Icon
+			});
+
+			specialContacts.sort((a,b) => {
+				return a.name.localeCompare(b.name);
+			});
+
+			renderSpecialContacts();
+
+		}
+
+	}
+
+	let removeSpecialContact = function(number){
+
+		for(let i=0; i<specialContacts.length; i++){
+			if(specialContacts[i].number == number){
+				specialContacts.splice(i, 1);
+				break;
+			}
+		}
 
 		renderSpecialContacts();
 
@@ -424,7 +447,10 @@
 
 		if(data.addSpecialContact === true){
 			addSpecialContact(data.name, data.number, data.base64Icon);
-			renderSpecialContacts();
+		}
+
+		if(data.removeSpecialContact === true){
+			removeSpecialContact(data.number);
 		}
 
 		if(data.move && isPhoneShowed){