'+ ++b+"");for(c in a)isNaN(c)||(b=$('[data-sublink="phone"] #p_nav-mini span[data-n="'+a[c].uid+'"]'),null!=b&&(!0===a[c].valid?b.addClass("done"):b.remClass("done")));this.nav($('[data-sublink="phone"] #p_nav-mini span[data-n="'+this.selected+'"]'))};
inputPhoneMini.prototype.check=function(a){return a.unknown?!0:""==a.sexe||"."==a.studies||"."==a.age||""==a.loc||""==a.reltype||"10"==a.reltype&&2>a.reltypeSpecial.length?!1:!0};inputPhoneMini.prototype.attach=function(a){console.log("MINI FICHE: ATTACH");lsi.createDataset("p_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 9c3aac6..7c6f784 100644
--- a/js/includes/input-phone-mini.js
+++ b/js/includes/input-phone-mini.js
@@ -13,6 +13,7 @@ inputPhoneMini.prototype = {
selected: 0, // UID de la MINI fiche sélectionnée
handler: null, // Fonction pour l'enregistrement et la synchronisation des données
defaultData: { // Valeur par défaut
+ contact: null,
sexe: '2',
age: '.',
studies: '0',
@@ -80,6 +81,7 @@ inputPhoneMini.prototype.fieldsToStorage = function(){
// On met à jour la date de modification, si on a pas qu'@uid de différent
if( diff(existingData, obj, ['hash', 'valid', 'timestamp']).length > 0 ){
console.log( diff(existingData, obj, ['hash', 'valid', 'timestamp']) );
+
console.warn('> FICHE UPDATE');
obj.timestamp = Date.now();
}
@@ -136,6 +138,7 @@ inputPhoneMini.prototype.add = function(objectData){
// On récupère les données communes
associatedContact.username = existingData.name;
+ objectData.contact = associatedContact.uid;
objectData.age = existingData.age;
objectData.sexe = existingData.sexe;
objectData.loc = existingData.dist;
@@ -260,11 +263,10 @@ inputPhoneMini.prototype.sync = function(){
/* (2) On enregistre les contacts qui ne sont pas déja dans les FICHES */
- ficheData = lsi.export('p_fiches');
-
- for( var id in ficheData )
- delete contactData[ ficheData[id].contact ];
+ ficheIndexes = lsi.keys('p_fiches');
+ for( var i in ficheIndexes )
+ delete contactData[ ficheIndexes[i] ];
/* (3) Pour chaque CONTACT restant, on met à jour/crée la MINI fiche associée */
for( var key in contactData ){
@@ -282,18 +284,14 @@ inputPhoneMini.prototype.sync = function(){
/* (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';
+ miniData = this.defaultData;
+ miniData.contact = contactData[key].uid;
+ miniData.valid = false;
}
/* (7) On met à jour la MINI fiche */
miniData.uid = parseInt( key );
-
/* (8) On enregistre les modification */
lsi.set('p_mini-fiches', uid, miniData);
@@ -314,6 +312,7 @@ inputPhoneMini.prototype.sync = function(){
}
+
};
diff --git a/src/dynamic/profile/sample.svg b/src/dynamic/profile/sample.svg
deleted file mode 100644
index 95abef2..0000000
--- a/src/dynamic/profile/sample.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/view/js/input-min.js b/view/js/input-min.js
index 5aca808..993c73e 100644
--- a/view/js/input-min.js
+++ b/view/js/input-min.js
@@ -1,4 +1,4 @@
-var sField,sSubmit,sList,pSubjectManager,pContactManager,pMiniManager,pFicheManager,pMatriceManager,fSubjectManager,fContactManager,fMiniManager,fFicheManager,fMatriceManager;sField=$("#search-field");sSubmit=$("#search-subject");sList=$('section[data-sublink="survey"] ul[data-list]');
+var sField,sSubmit,sList,pSubjectManager=null,pContactManager=null,pMiniManager=null,pFicheManager=null,pMatriceManager=null,fSubjectManager=null,fContactManager=null,fMiniManager=null,fFicheManager=null,fMatriceManager=null;sField=$("#search-field");sSubmit=$("#search-subject");sList=$('section[data-sublink="survey"] ul[data-list]');
var tmpSubjectSearchListener=function(a){api.send({path:"subject/search",name:sField.value},function(a){if(0!=a.ModuleError)return Notification.error("Erreur","La recherche a \u00e9chou\u00e9."),!1;console.log(a);var c="",g;for(g in a.results)c+="",c+="SUJET
",c+="
",c+=" "+
a.results[g].name+"
",c+=" "+a.results[g].creation+"
",c+=" ",c+="
",c+=" ",c+="
",c+="";sList.innerHTML=c})};
sSubmit.addEventListener("click",tmpSubjectSearchListener,!1);sField.addEventListener("keypress",function(a){13===a.keyCode&&tmpSubjectSearchListener(a)},!1);pMatriceManager=pFicheManager=pMiniManager=pContactManager=pSubjectManager=null;
@@ -6,7 +6,7 @@ function pDynamicUpdate(a){var b=a instanceof Element,c=b&&"INPUT"==a.tagName&&"
subject_id:pSubjectManager.subject_id.value},function(a){if(0!=a.ModuleError)return!1;lsi["import"]("p_friends",a.subjects);pMiniManager.storageToFields();pFicheManager.storageToFields();pMatriceManager.storageToFields();pContactManager.storageToFields()}):(pMiniManager.storageToFields(),pFicheManager.storageToFields(),pMatriceManager.storageToFields(),(c||b)&&pContactManager.storageToFields())}fMatriceManager=fFicheManager=fMiniManager=fContactManager=fSubjectManager=null;
function fDynamicUpdate(a){var b=a instanceof Element,c=b&&"INPUT"==a.tagName&&"submit"==a.type,g=b&&"SPAN"==a.tagName&&("f_nav-mini"==a.parentNode.id||"f_nav-fiche"==a.parentNode.id),b=b&&"SPAN"==a.tagName&&"f_nav-contact"==a.parentNode.id;if(!c&&!g&&!b&&!0!==a)return!1;console.log("> dynamic update");fMiniManager.fieldsToStorage();fFicheManager.fieldsToStorage();fContactManager.fieldsToStorage();fMatriceManager.fieldsToStorage();fFicheManager.sync();fMiniManager.sync();!0===a?api.send({path:"subject/getFriends",
subject_id:fSubjectManager.subject_id.value},function(a){if(0!=a.ModuleError)return!1;lsi["import"]("f_friends",a.subjects);fMiniManager.storageToFields();fFicheManager.storageToFields();fMatriceManager.storageToFields();fContactManager.storageToFields()}):(fMiniManager.storageToFields(),fFicheManager.storageToFields(),fMatriceManager.storageToFields(),(c||b)&&fContactManager.storageToFields())}
-include("/js/includes/input-phone-subject-min.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(){include("/js/includes/input-phone-matrice-min.js",function(){pSubjectManager=new inputPhoneSubject($('[data-sublink="phone"] article.subject-panel [data-name="tmp_id"]'),$('[data-sublink="phone"] article.subject-panel [data-name="subject_id"]'),$('[data-sublink="phone"] article.subject-panel [data-name="submit"]'));
+include("/js/includes/input-phone-subject-min.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(){include("/js/includes/input-phone-matrice.js",function(){pSubjectManager=new inputPhoneSubject($('[data-sublink="phone"] article.subject-panel [data-name="tmp_id"]'),$('[data-sublink="phone"] article.subject-panel [data-name="subject_id"]'),$('[data-sublink="phone"] article.subject-panel [data-name="submit"]'));
pSubjectManager.attach(pDynamicUpdate);pContactManager=new inputPhoneContact($('[data-sublink="phone"] article.contact-panel'),$('[data-sublink="phone"] #p_nav-contact'));pContactManager.attach(pDynamicUpdate);pMiniManager=new inputPhoneMini($('[data-sublink="phone"] article.mini-relation-panel'),$('[data-sublink="phone"] #p_nav-mini'));pMiniManager.attach(pDynamicUpdate);pFicheManager=new inputPhoneFiche($('[data-sublink="phone"] article.relation-panel'),$('[data-sublink="phone"] #p_nav-fiche'));
pFicheManager.attach(pDynamicUpdate);pMatriceManager=new inputPhoneMatrice($('[data-sublink="phone"] article.matrice-panel'));pMatriceManager.attach(pDynamicUpdate);var a=new ShortcutManager,b=!1;a.append("s+n+a+k+e",function(){b||(b=!0,pMatriceManager.snake())});a.listen();$('[data-sublink="phone"] #p_clear-all').addEventListener("click",function(a){lsi.clear("p_subject");lsi.clear("p_contacts");lsi.clear("p_mini-fiches");lsi.clear("p_fiches");lsi.clear("p_matrice");lsi.clear("p_friends");pSubjectManager.storageToFields();
pContactManager.storageToFields();pMiniManager.storageToFields();pFicheManager.storageToFields();pMatriceManager.storageToFields();Notification.success("OK","Les donn\u00e9es ont \u00e9t\u00e9 supprim\u00e9es")},!1);$('[data-sublink="phone"] #p_export-all').addEventListener("click",function(a){Notification.info("INFORMATION","Lancement du t\u00e9l\u00e9chargement de la sauvegarde");a={subject:lsi["export"]("p_subject")[0],contacts:lsi["export"]("p_contacts"),mini:lsi["export"]("p_mini-fiches"),fiches:lsi["export"]("p_fiches"),
diff --git a/view/js/input.js b/view/js/input.js
index 07a7a3a..f74286b 100644
--- a/view/js/input.js
+++ b/view/js/input.js
@@ -1,6 +1,15 @@
var sField, sSubmit, sList,
- pSubjectManager, pContactManager, pMiniManager, pFicheManager, pMatriceManager,
- fSubjectManager, fContactManager, fMiniManager, fFicheManager, fMatriceManager;
+ pSubjectManager = null,
+ pContactManager = null,
+ pMiniManager = null,
+ pFicheManager = null,
+ pMatriceManager = null,
+
+ fSubjectManager = null,
+ fContactManager = null,
+ fMiniManager = null,
+ fFicheManager = null,
+ fMatriceManager = null;
@@ -266,7 +275,7 @@ var sField, sSubmit, sList,
include('/js/includes/input-phone-mini.js', function(){
//TODO: Remettre version min
include('/js/includes/input-phone-fiche.js', function(){
- include('/js/includes/input-phone-matrice-min.js', function(){
+ include('/js/includes/input-phone-matrice.js', function(){
/* (1) Gestion du formulaire du sujet
---------------------------------------------------------*/