"):a+="| ";a+=" | "}a+=""}this.container.innerHTML=
-a+""};inputPhoneMatrice.prototype.attach=function(){console.log("MATRICE: ATTACH");lsi.createDataset("matrice");this.storageToFields();var a=this;this.container.addEventListener("click",function(d){a.fieldsToStorage();a.storageToFields()},!1)};
+inputPhoneMatrice.prototype.fieldsToStorage=function(){console.log("MATRICE: FIELDS TO STORAGE");var a=(new FormDeflater(this.container,["input"],["data-name"])).deflate();crc32(JSON.stringify(a));var d={},b;for(b in a)if(a[b]instanceof Array)for(var e in a[b])null==d[b]&&(d[b]=[]),d[b].push(parseInt(a[b][e]));else null!==a[b]&&(null==d[b]&&(d[b]=[]),d[b].push(parseInt(a[b])));lsi.set("matrice",0,d)};
+inputPhoneMatrice.prototype.storageToFields=function(){console.log("MATRICE: STORAGE TO FIELDS");var a=lsi["export"]("fiches"),d=lsi.get("matrice",0),b=lsi["export"]("contacts"),e=[],c;for(c in a)-1==e.indexOf(a[c].contact)&&e.push(a[c].contact);a="";for(c=0;c";0',a+=readableName(f.username,f.firstname,f.lastname),a+=""):a+=" | ";for(var h=0;h",a+='',a+=readableName(g.username,g.firstname,g.lastname),a+=""):h",a+=""):a+="";a+=" | "}a+=""}this.container.innerHTML=a+"
"};
+inputPhoneMatrice.prototype.attach=function(){console.log("MATRICE: ATTACH");lsi.createDataset("matrice");this.storageToFields();var a=this;this.container.addEventListener("click",function(d){a.fieldsToStorage();a.storageToFields()},!1)};
diff --git a/js/includes/input-phone-matrice.js b/js/includes/input-phone-matrice.js
index 0337fb7..555f0ed 100644
--- a/js/includes/input-phone-matrice.js
+++ b/js/includes/input-phone-matrice.js
@@ -108,8 +108,7 @@ inputPhoneMatrice.prototype.storageToFields = function(){
if( A > 0 ){ // Noms sur la première ligne (abscisses)
matrice_html += '';
- matrice_html += conA.firstname+' '+conA.lastname
- matrice_html += (conA.username.length>0) ? ' ('+conA.username+')' : '';
+ matrice_html += readableName(conA.username, conA.firstname, conA.lastname);
matrice_html += ' | ';
}else // Sinon,
matrice_html += ' | ';
@@ -122,8 +121,7 @@ inputPhoneMatrice.prototype.storageToFields = function(){
if( A == 0 ){
matrice_html += '';
matrice_html += '';
- matrice_html += conB.firstname+' '+conB.lastname;
- matrice_html += (conB.username.length>0) ? ' ('+conB.username+')' : '';
+ matrice_html += readableName(conB.username, conB.firstname, conB.lastname),
matrice_html += '';
// {4} Valeurs des relations (boutons) //
diff --git a/js/includes/input-phone-mini-min.js b/js/includes/input-phone-mini-min.js
index 9e23333..55d860d 100644
--- a/js/includes/input-phone-mini-min.js
+++ b/js/includes/input-phone-mini-min.js
@@ -1,11 +1,11 @@
function inputPhoneMini(a,b){this.container=a;this.nav_container=b}inputPhoneMini.prototype={container:this.container,nav_container:this.nav_container,selected:0,handler:null,defaultData:{sexe:"H",age:".",studies:".",loc:"0",reltype:"0",reltypeSpecial:"",timestamp:0,valid:!1}};
-inputPhoneMini.prototype.fieldsToStorage=function(){console.log("MINI FICHE: FIELDS TO STORAGE");for(var a=$$("article.mini-relation-panel .mini-fiche-relation"),b=0;b MINI UPDATE");c={uid:parseInt(c.uid),firstname:d.firstname,lastname:d.lastname,username:d.username,sexe:c.sexe,age:c.age,studies:c.studies,
-reltype:c.reltype,reltypeSpecial:c.reltypeSpecial,loc:c.loc,hash:e};c.valid=this.check(c);0 FICHE UPDATE"),c.timestamp=Date.now());lsi.set("mini-fiches",c.uid,c)}}};
+inputPhoneMini.prototype.fieldsToStorage=function(){console.log("MINI FICHE: FIELDS TO STORAGE");for(var a=$$("article.mini-relation-panel .mini-fiche-relation"),b=0;b MINI UPDATE");c={uid:parseInt(c.uid),sexe:c.sexe,age:c.age,studies:c.studies,reltype:c.reltype,reltypeSpecial:c.reltypeSpecial,
+loc:c.loc,hash:e};c.valid=this.check(c);0 FICHE UPDATE"),c.timestamp=Date.now());lsi.set("mini-fiches",c.uid,c)}}};
inputPhoneMini.prototype.add=function(a){console.log("MINI FICHE: ADD");if(null==a||null==a.uid)return!1;a.age=null!=a.age?a.age:this.defaultData.age;a.sexe=null!=a.sexe?a.sexe:this.defaultData.sexe;a.studies=null!=a.studies?a.studies:this.defaultData.studies;a.reltype=null!=a.reltype?a.reltype:this.defaultData.reltype;a.reltypeSpecial=null!=a.reltypeSpecial?a.reltypeSpecial:this.defaultData.reltypeSpecial;a.loc=null!=a.loc?a.loc:this.defaultData.loc;var b=lsi.get("contacts",a.uid);if(!1===b)return!1;
-this.container.innerHTML+=miniFicheBuilder.build({firstname:b.firstname,lastname:b.lastname,username:0==b.username.length?"":"("+b.username+")",countcall:b.countcall,countsms:b.countsms,uid:a.uid,reltypespecial:a.reltypeSpecial});b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="studies"]>option[value="'+a.studies+'"]');null!=b&&b.setAttribute("selected","selected");b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="age"]>option[value="'+
+this.container.innerHTML+=miniFicheBuilder.build({name:readableName(b.username,b.firstname,b.lastname),countcall:b.countcall,countsms:b.countsms,uid:a.uid,reltypespecial:a.reltypeSpecial});b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="studies"]>option[value="'+a.studies+'"]');null!=b&&b.setAttribute("selected","selected");b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="age"]>option[value="'+
a.age+'"]');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;binput[type="radio"][data-name="reltype"]');for(b=0;binput[type="radio"][data-name="loc"]');for(b=0;binput[type="radio"][data-name="loc"]');for(b=0;b span.active"),c=0;c'+ ++b+"";for(c in a)b=$('#nav-mini [data-n="'+a[c].uid+'"]'),null!=b&&(!0===a[c].valid?b.addClass("done"):b.remClass("done"));this.nav($('#nav-mini [data-n="'+this.selected+'"]'))};
+inputPhoneMini.prototype.updateNavBar=function(){var a=lsi["export"]("mini-fiches");this.nav_container.innerHTML="";var b=0,c;for(c in a)isNaN(c)||(this.nav_container.innerHTML+=''+ ++b+"");for(c in a)isNaN(c)||(b=$('#nav-mini [data-n="'+a[c].uid+'"]'),null!=b&&(!0===a[c].valid?b.addClass("done"):b.remClass("done")));this.nav($('#nav-mini [data-n="'+this.selected+'"]'))};
inputPhoneMini.prototype.check=function(a){return""==a.sexe||"."==a.studies||"."==a.age||""==a.loc||""==a.reltype||"8"==a.reltype&&2>a.reltypeSpecial.length?!1:!0};inputPhoneMini.prototype.attach=function(a){console.log("MINI FICHE: ATTACH");lsi.createDataset("mini-fiches");this.storageToFields();this.handler=a;var 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 fc6a8fa..06cbcf5 100644
--- a/js/includes/input-phone-mini.js
+++ b/js/includes/input-phone-mini.js
@@ -63,9 +63,6 @@ inputPhoneMini.prototype.fieldsToStorage = function(){
var obj = {
uid: parseInt(deflated.uid),
- firstname: existingData.firstname,
- lastname: existingData.lastname,
- username: existingData.username,
sexe: deflated.sexe, // [0] Homme, [1] Femme
age: deflated.age,
studies: deflated.studies,
@@ -133,9 +130,7 @@ inputPhoneMini.prototype.add = function(objectData){
// {2} Création physique //
this.container.innerHTML += miniFicheBuilder.build({
- firstname: associatedContact.firstname,
- lastname: associatedContact.lastname,
- username: (associatedContact.username.length==0) ? '' : '('+associatedContact.username+')',
+ name: readableName(associatedContact.username, associatedContact.firstname, associatedContact.lastname),
countcall: associatedContact.countcall,
countsms: associatedContact.countsms,
uid: objectData.uid,
@@ -190,6 +185,12 @@ inputPhoneMini.prototype.storageToFields = function(){
// {1} Pour chaque contact du 'localStorage' //
var miniData = lsi.get('mini-fiches', this.selected);
+ // Si on a rien trouvé, on ne fait rien
+ if( miniData == null ){
+ this.updateNavBar();
+ return false;
+ }
+
// On réinitialise le HTML
this.container.innerHTML = '';
@@ -237,17 +238,25 @@ inputPhoneMini.prototype.sync = function(){
lsi.del('mini-fiches', key);
continue;
}
- console.warn(key, ignoredContacts, ignoredContacts.indexOf(parseInt(key)), lsi.export('mini-fiches'));
+ /* (5) Si le contact n'a aucun nominatif, on met inconnu par défaut, mais on ne l'affiche pas */
+ var noName = contactData[key].username.length+contactData[key].firstname.length+contactData[key].lastname.length == 0;
+
+ // On rajoute un '.' après pour dire qu'on affichera pas
+ var uid = noName ? key.toString()+'-' : key;
/* (5) On récupère les informations de la MINI (si elle existe) */
- var miniData = lsi.get('mini-fiches', key);
+ var miniData = lsi.get('mini-fiches', uid);
/* (6) Si la MINI fiche n'exise pas, on la crée avec les valeurs par défaut */
if( miniData == null ){
miniData = this.defaultData;
miniData.valid = false;
+
+ // Si aucun nom, on met 'inconnu' par défaut pour la fiche de relation
+ if( isNaN(uid) )
+ miniData.reltype = '9';
}
/* (7) On met à jour la MINI fiche */
@@ -255,7 +264,7 @@ inputPhoneMini.prototype.sync = function(){
/* (8) On enregistre les modification */
- lsi.set('mini-fiches', key, miniData);
+ lsi.set('mini-fiches', uid, miniData);
}
@@ -297,7 +306,6 @@ inputPhoneMini.prototype.nav = function(element){
=========================================================*/
inputPhoneMini.prototype.updateNavBar = function(){
var miniData = lsi.export('mini-fiches');
- var len = Object.keys(miniData).length;
/* (1) On vide et remplit la barre de nav, si elle n'est pas à jour */
@@ -305,12 +313,17 @@ inputPhoneMini.prototype.updateNavBar = function(){
var i = 0;
for( var key in miniData )
- this.nav_container.innerHTML += ''+(++i)+'';
+ if( !isNaN(key) ) // On affiche que les clés numériques
+ this.nav_container.innerHTML += ''+(++i)+'';
/* (2) On montre les MINI fiches qui sont correctes dans la navbar */
for( var key in miniData ){
+ // Si la clé n'est pas numérique, on ne gère pas
+ if( isNaN(key) )
+ continue;
+
var currentElement = $('#nav-mini [data-n="'+miniData[key].uid+'"]');
if( currentElement == null )
diff --git a/src/upload/call_log/xdrm.xml b/src/upload/call_log/xdrm.xml
index 8757312..d18fde5 100755
--- a/src/upload/call_log/xdrm.xml
+++ b/src/upload/call_log/xdrm.xml
@@ -1,1001 +1,23 @@
- |