From 092a09088f3bea4ebb8d63d35b0775764e9b5c7e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Thu, 28 Apr 2016 18:00:09 +0200
Subject: [PATCH] =?UTF-8?q?Correction,=20affichage=20(m=C3=A0j)=20apr?=
 =?UTF-8?q?=C3=A8s=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/includes/input-phone-mini-min.js |  2 +-
 js/includes/input-phone-mini.js     |  2 ++
 manager/module/call_log.php         |  2 +-
 view/js/input-min.js                |  4 ++--
 view/js/input.js                    | 15 ++++++++++-----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/js/includes/input-phone-mini-min.js b/js/includes/input-phone-mini-min.js
index 4495a5b..89c7461 100644
--- a/js/includes/input-phone-mini-min.js
+++ b/js/includes/input-phone-mini-min.js
@@ -5,7 +5,7 @@ inputPhoneMini.prototype.add=function(a){console.log("MINI FICHE: ADD");if(null=
 miniFicheBuilder.build({firstname:a.firstname,lastname:a.lastname,username:a.username,uid:a.uid,age:a.age,job:a.job});var b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="job"]>option[value="'+a.job+'"]');null!=b&&b.setAttribute("selected","selected");for(var c=$$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>input[type="radio"][data-name="sexe"]'),b=0;b<c.length&&b<a.sexe.length;b++)a.sexe[b].status?c[b].setAttribute("checked",
 "checked"):c[b].removeAttribute("checked");c=$$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>input[type="radio"][data-name="loc"]');for(b=0;b<c.length&&b<a.loc.length;b++)a.loc[b].status?c[b].setAttribute("checked","checked"):c[b].removeAttribute("checked")};
 inputPhoneMini.prototype.storageToFields=function(){console.log("MINI FICHE: STORAGE TO FIELDS");var a=lsi["export"]("mini-fiches");this.container.innerHTML="";var b=[],c;for(c in a){var d=a[c].uid;d==this.selected&&this.add(a[c]);b.push(d)}this.updateNavBar(b)};
-inputPhoneMini.prototype.sync=function(){console.log("MINI FICHE: SYNC");var a=lsi["export"]("contacts"),b;for(b in a){var c=lsi.get("mini-fiches",b);null==c&&(c=this.defaultData,c.valid=!1);c.uid=a[b].uid;c.firstname=a[b].firstname;c.lastname=a[b].lastname;c.username=a[b].username;lsi.set("mini-fiches",b,c)}};
+inputPhoneMini.prototype.sync=function(){console.log("MINI FICHE: SYNC");var a=lsi["export"]("contacts"),b;for(b in a){var c=lsi.get("mini-fiches",b);null==c&&(c=this.defaultData,c.valid=!1);console.log(a[b]);c.uid=a[b].uid;c.firstname=a[b].firstname;c.lastname=a[b].lastname;c.username=a[b].username;lsi.set("mini-fiches",b,c)}};
 inputPhoneMini.prototype.nav=function(a){if("undefined"==typeof a||isNaN(a.innerHTML))return!1;for(var b=$$("#nav-mini > span.active"),c=0;c<b.length;c++)b[c].remClass("active");a.addClass("active");this.selected=parseInt(a.innerHTML)-1};
 inputPhoneMini.prototype.updateNavBar=function(a){if(this.nav_container.children.length!=a.length){this.nav_container.innerHTML="";for(var b=0;b<a.length;b++)this.nav_container.innerHTML+="<span>"+(parseInt(a[b])+1)+"</span>"}a=lsi["export"]("mini-fiches");for(var c in a)!0===a[c].valid?this.nav_container.children[a[c].uid].addClass("done"):this.nav_container.children[a[c].uid].remClass("done");this.nav(this.nav_container.children[this.selected])};
 inputPhoneMini.prototype.check=function(a){return!isNaN(parseInt(a.age))&&checkRadioValue(a.sexe)&&"."!=a.job&&checkRadioValue(a.loc)?!0:!1};inputPhoneMini.prototype.attach=function(a){console.log("MINI FICHE: ATTACH");lsi.createDataset("mini-fiches");this.storageToFields();this.handler=a;var b=this,b=this;this.nav_container.addEventListener("click",function(a){b.nav(a.target);b.handler(a.target)},!1)};
diff --git a/js/includes/input-phone-mini.js b/js/includes/input-phone-mini.js
index 2969b47..babb62e 100644
--- a/js/includes/input-phone-mini.js
+++ b/js/includes/input-phone-mini.js
@@ -209,6 +209,8 @@ inputPhoneMini.prototype.sync = function(){
             miniData.valid = false;
         }
 
+        console.log(contactData[key]);
+
         /* (5) On met à jour la MINI fiche */
         miniData.uid       = contactData[key].uid;
         miniData.firstname = contactData[key].firstname;
diff --git a/manager/module/call_log.php b/manager/module/call_log.php
index be8294e..a3a897d 100644
--- a/manager/module/call_log.php
+++ b/manager/module/call_log.php
@@ -130,10 +130,10 @@
 					'total'  => $tmp[$maxNumber]['sms'] + 5*$tmp[$maxNumber]['calls']
 				));
 
+
 				unset($tmp[$maxNumber]);
 			}
 
-
 			/* [6] Gestion du retour
 			=========================================================*/
 			return array(
diff --git a/view/js/input-min.js b/view/js/input-min.js
index adeb8fd..4959a67 100644
--- a/view/js/input-min.js
+++ b/view/js/input-min.js
@@ -3,5 +3,5 @@ function dynamicUpdate(a){var c=a instanceof Element,b=c&&"SPAN"==a.tagName&&"sw
 b=a.parentNode,d=b.children[1],a=b.children[3],b=b.children[5],d.value=a.value+" "+b.value,a.value="",b.value=""):(console.log("> dynamic update"),miniManager.fieldsToStorage(),ficheManager.fieldsToStorage(),contactManager.fieldsToStorage(),miniManager.sync(),ficheManager.sync(),miniManager.storageToFields(),ficheManager.storageToFields(),contactManager.storageToFields())}function checkRadioValue(a){for(var c=0,b=0;b<a.length;b++)!0===a[b].status&&c++;return 1!=c?!1:!0}
 include("/js/includes/input-phone-subject.js",function(){include("/js/includes/input-phone-contact.js",function(){include("/js/includes/input-phone-mini.js",function(){include("/js/includes/input-phone-fiche.js",function(){subjectManager=new inputPhoneSubject($('article.subject-panel [data-name="number"]'),$('article.subject-panel [data-name="username"]'),$('article.subject-panel [data-name="firstname"]'),$('article.subject-panel [data-name="lastname"]'),$('article.subject-panel [data-name="submit"]'));
 subjectManager.attach();contactManager=new inputPhoneContact($("article.contact-panel"),$("h4.add-contact"));contactManager.attach(dynamicUpdate);miniManager=new inputPhoneMini($("article.mini-relation-panel"),$("#nav-mini"));miniManager.attach(dynamicUpdate);ficheManager=new inputPhoneFiche($("article.relation-panel"),$("#nav-fiche"));ficheManager.attach(dynamicUpdate);importCallLog.addEventListener("change",function(a){api.send({path:"upload/call_log",file:importCallLog.files[0]},function(a){console.log(a);
-0==a.ModuleError&&(importCallLog.addClass("active"),a={path:"call_log/unserialize",phone_number:$("#subject_phone_number").value},api.send(a,function(a){console.log(a);if(0==a.ModuleError){for(var d=0;d<a.directory.length&&20>d;d++){var c=a.directory[d].name.split(" ");lsi.set("contacts","form"+d,{uid:d,number:a.directory[d].number,username:1==c.length?c[0]:"",firstname:1<c.length?c[0]:"",lastname:1<c.length?c.splice(1).join(" "):""})}dynamicUpdate(!0)}}))})},!1);clearAllButton.addEventListener("click",
-function(a){localStorage.clear();reload()},!1)})})})});
+0==a.ModuleError&&(importCallLog.addClass("active"),a={path:"call_log/unserialize",phone_number:$("#subject_phone_number").value},api.send(a,function(a){console.log(a);if(0==a.ModuleError){for(var d=0;d<a.directory.length;d++){console.log(a.directory[d]);var c=(null===a.directory[d].name?"":a.directory[d].name).split(" ");lsi.set("contacts","form"+d,{uid:d,number:a.directory[d].number,username:1==c.length?c[0]:"",firstname:1<c.length?c[0]:"",lastname:1<c.length?c.splice(1).join(" "):""})}dynamicUpdate(!0)}}))})},
+!1);clearAllButton.addEventListener("click",function(a){localStorage.clear();reload()},!1)})})})});
diff --git a/view/js/input.js b/view/js/input.js
index 31b583e..ec74f3a 100644
--- a/view/js/input.js
+++ b/view/js/input.js
@@ -197,26 +197,31 @@ include('/js/includes/input-phone-fiche.js', function(){
                 importCallLog.addClass('active');
 
                 /* (3) On rédige la requête pour récupérer les données du fichier */
-                var getCallLogRequest = {
+                var callLogRequest = {
                     path: 'call_log/unserialize',
                     phone_number: $('#subject_phone_number').value
                 };
 
                 /* (4) On effectue la récupération d'informations */
-                api.send(getCallLogRequest, function(dataResponse){
+                api.send(callLogRequest, function(dataResponse){
                     console.log(dataResponse);
 
                     // Si erreur, on quitte
                     if( dataResponse.ModuleError != 0 )
                         return;
 
+
+
                     /* (5) Pour chaque contact de l'annuaire, on ajoute un contact */
-                    for( var i = 0 ; i < dataResponse.directory.length && i < 20 ; i++ ){
+                    for( var i = 0 ; i < dataResponse.directory.length ; i++ ){
+                        console.log(dataResponse.directory[i]);
+
                         // On découpe le nom par espaces
-                        var splitted = dataResponse.directory[i].name.split(' ');
+                        var name     = dataResponse.directory[i].name===null ? '' : dataResponse.directory[i].name;
+                        var splitted = name.split(' ');
 
                         lsi.set('contacts', 'form'+i, {
-                            uid: i,
+                            uid:       i,
                             number:    dataResponse.directory[i].number,
                             username:  splitted.length == 1 ? splitted[0]                  : '', // Si un seul mot -> pseudo
                             firstname: splitted.length >  1 ? splitted[0]                  : '', // Si plusieurs mots -> le 1er est le prénom