diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 22524c5..3a15f2b --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,10 @@ sftp-config.json phpunit/coverage/ /public_html/tmp/* +<<<<<<< HEAD /build/lightdb/storage/* /config/server.json +======= +/build/lightdb/storage/*/data +**.swp +>>>>>>> 255af4d6b03408ab9f840db1fea74a35b7bc28c4 diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/autoloader.php b/autoloader.php old mode 100644 new mode 100755 index 5150cf1..a7af07f --- a/autoloader.php +++ b/autoloader.php @@ -20,7 +20,7 @@ // Loads the build facade - require_once __BUILD__.'/Builder.php'; + // require_once __BUILD__.'/Builder.php'; /* AUTOLOADER @@ -52,11 +52,10 @@ \manager\sessionManager::session_start(); - /* [3] Gestion des droits des utilisateurs =========================================================*/ /* (1) Retourne si l'utilisateur est connecte ou non */ - function connected(){ return isset($_SESSION['permission']) && count($_SESSION['permission']); } + function connected(){ return isset($_SESSION['permission']) && is_array($_SESSION['permission']) && count($_SESSION['permission']) > 0; } /* (2) Retourne si l'utilisateur a le status en question */ function permission($type){ return connected() && in_array($type, $_SESSION['permission']); } diff --git a/build/.htaccess b/build/.htaccess old mode 100644 new mode 100755 diff --git a/build/Builder.php b/build/Builder.php old mode 100644 new mode 100755 index e084f24..7d08a82 --- a/build/Builder.php +++ b/build/Builder.php @@ -13,5 +13,5 @@ class Builder{ - + } diff --git a/build/api/core/Checker.php b/build/api/core/Checker.php old mode 100644 new mode 100755 diff --git a/build/api/core/ModuleRequest.php b/build/api/core/ModuleRequest.php old mode 100644 new mode 100755 diff --git a/build/api/core/ModuleResponse.php b/build/api/core/ModuleResponse.php old mode 100644 new mode 100755 diff --git a/build/api/module/chart.php b/build/api/module/chart.php old mode 100644 new mode 100755 diff --git a/build/api/module/download.php b/build/api/module/download.php old mode 100644 new mode 100755 diff --git a/build/api/module/input.php b/build/api/module/input.php old mode 100644 new mode 100755 index 14bc800..09175db --- a/build/api/module/input.php +++ b/build/api/module/input.php @@ -64,9 +64,9 @@ /* TRAITE LES DONNÉES D'UN FORMULAIRE DE TYPE TÉLÉPHONIQUE * - * @subject Id du sujet concerné + * @subject Données du sujet concerné * @contacts Tableau contenant les données des contacts - * @mini Tableau contenant les données des mini fiches relation + * @mini Tableau contenant les données des mini fiches relation * @fiches Tableau contenant les données des fiches relation * * @return subject_id Retourne l'id sujet de l'enquête @@ -91,7 +91,7 @@ $offset = intval($uniqid) + 1; // on enregistre l'id du sujet - $subject_id = intval($subject); + $subject_id = intval($subject['subject_id']); // Contiendra la valeur de l'id maximum $maxId = $offset; @@ -130,7 +130,11 @@ if( !in_array('phone', $subject_set['subject']['surveys']) ) $subject_set['subject']['surveys'][] = 'phone'; - /* (5) On récupère les noms des contacts */ + /* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */ + if( !empty($subject['coords']) ) + $subject_set['subject']['coords'] = $subject['coords']; + + /* (6) On récupère les noms des contacts */ $contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche') foreach($subject_set['contacts'] as $contactId){ @@ -230,7 +234,12 @@ 'contextExtra' => $ficheData['contextSpecial'], 'freq' => $ficheData['freq'], 'connect' => $ficheData['connect'], - 'connectExtra' => $ficheData['connectSpecial'] + 'connectExtra' => $ficheData['connectSpecial'], + 'medsoc' => $ficheData['medsoc'], + 'interest' => $ficheData['interest'], + 'irlfreq' => $ficheData['irlfreq'], + 'relmark' => $ficheData['relmark'], + 'medrel' => $ficheData['medrel'] ] ); // On ajoute le contact dans la liste des contacts du sujet (si pas déja) @@ -422,9 +431,9 @@ /* TRAITE LES DONNÉES D'UN FORMULAIRE DE TYPE FACEBOOK * - * @subject Id du sujet concerné + * @subject Données du sujet concerné * @contacts Tableau contenant les données des contacts - * @mini Tableau contenant les données des mini fiches relation + * @mini Tableau contenant les données des mini fiches relation * @fiches Tableau contenant les données des fiches relation * * @return subject_id Retourne l'id sujet de l'enquête @@ -449,7 +458,7 @@ $offset = intval($uniqid) + 1; // on enregistre l'id du sujet - $subject_id = intval($subject); + $subject_id = intval($subject['subject_id']); // Contiendra la valeur de l'id maximum $maxId = $offset; @@ -488,7 +497,11 @@ if( !in_array('facebook', $subject_set['subject']['surveys']) ) $subject_set['subject']['surveys'][] = 'facebook'; - /* (5) On récupère les noms des contacts */ + /* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */ + if( !empty($subject['coords']) ) + $subject_set['subject']['coords'] = $subject['coords']; + + /* (6) On récupère les noms des contacts */ $contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche') foreach($subject_set['contacts'] as $contactId){ diff --git a/build/api/module/module.php b/build/api/module/module.php old mode 100644 new mode 100755 diff --git a/build/api/module/subject.php b/build/api/module/subject.php old mode 100644 new mode 100755 index f28d9c4..4e4196d --- a/build/api/module/subject.php +++ b/build/api/module/subject.php @@ -114,6 +114,11 @@ } $db->close(); + /* [2] Gestion des relations + =========================================================*/ + /* (1) On récupère toutes les relations */ + //blabla + /* [4] Gestion du retour =========================================================*/ diff --git a/build/api/module/token.php b/build/api/module/token.php old mode 100644 new mode 100755 index fdcc6b8..b6ebbf3 --- a/build/api/module/token.php +++ b/build/api/module/token.php @@ -78,13 +78,6 @@ - - - - - - - } diff --git a/build/api/module/upload.php b/build/api/module/upload.php old mode 100644 new mode 100755 index 709289b..9cf8248 --- a/build/api/module/upload.php +++ b/build/api/module/upload.php @@ -48,7 +48,7 @@ /* [3] Construction du chemin =========================================================*/ /* (1) On construit le chemin */ - $path = __BUILD__.$uploadAuth['root'].'/'.$prefix.'/'; + $path = __PUBLIC__.$uploadAuth['root'].'/'.$prefix.'/'; /* (2) On crée le dossier s'il n'existe pas */ if ( !file_exists($path) ) mkdir($path, 0775, true); @@ -82,8 +82,8 @@ */ private static function simpleFile($prefix, $extension, $file, $tester){ // Si on est pas connecté, on retourne une erreur -> impossible via token - if( !connected() ) return [ 'error' => ManagerError::PermissionError ]; - if( !file_exists($file['tmp_name']) ) return [ 'error' => ManagerError::UnreachableResource ]; + if( !connected() ) return ManagerError::PermissionError; + if( !file_exists($file['tmp_name']) ) return ManagerError::UnreachableResource; /* [1] On récupère le chemin du fichier à créer et vérifie le dossier @@ -158,6 +158,7 @@ /* (3) Vérification du sujet */ $checkSubject = isset($json['subject']['subject_id']) && is_numeric($json['subject']['subject_id']); + $checkSubject = $checkSubject && isset($json['subject']['coords']) && is_string($json['subject']['coords']); // Erreur des attributs du sujet incorrects ou manquants if( !$checkSubject ) @@ -167,10 +168,11 @@ /* (4) Vérification des contacts */ foreach($json['contacts'] as $contact){ $checkContact = isset($contact['uid']) && is_numeric($contact['uid']); - $checkContact = $checkContact && isset($contact['username']) && is_string($contact['username']); - // Existing ou username.length > 0 - $checkContact = $checkContact && isset($contact['existing']); - $checkContact = $checkContact && ( strlen($contact['username']) > 0 || intval($contact['existing']) == $contact['existing'] ); + $checkContact = $checkContact && ( + ( isset($contact['username']) && is_string($contact['username']) ) + || + ( isset($contact['existing']) && is_numeric($contact['existing']) ) + ); // $checkContact = $checkContact && isset($contact['sms']) && is_numeric($contact['sms']); // $checkContact = $checkContact && isset($contact['call']) && is_numeric($contact['call']); // $checkContact = $checkContact && isset($contact['countsms']) && is_numeric($contact['countsms']); @@ -182,7 +184,6 @@ } - /* (5) Vérification des mini-fiches */ foreach($json['mini'] as $mini){ $checkMini = isset($mini['uid']) && is_numeric($mini['uid']); @@ -199,18 +200,21 @@ } - /* (6) Vérification des fiches */ foreach($json['fiches'] as $fiches){ $checkFiche = isset($fiches['uid']) && is_numeric($fiches['uid']); $checkFiche = $checkFiche && isset($fiches['contact']) && is_numeric($fiches['contact']); $checkFiche = $checkFiche && isset($fiches['sexe']) && is_numeric($fiches['sexe']); $checkFiche = $checkFiche && isset($fiches['age']) && is_string($fiches['age']); + $checkFiche = $checkFiche && isset($fiches['interest']) && is_numeric($fiches['interest']); + $checkFiche = $checkFiche && isset($fiches['relmark']) && is_numeric($fiches['relmark']); $checkFiche = $checkFiche && isset($fiches['job']) && is_string($fiches['job']); $checkFiche = $checkFiche && isset($fiches['loc']) && (is_numeric($fiches['loc']) || $fiches['loc']=='.'); $checkFiche = $checkFiche && isset($fiches['studies']) && is_string($fiches['studies']); $checkFiche = $checkFiche && isset($fiches['famsit']) && is_numeric($fiches['famsit']); $checkFiche = $checkFiche && isset($fiches['reltype']) && is_numeric($fiches['reltype']); + $checkFiche = $checkFiche && isset($fiches['medsoc']) && is_numeric($fiches['medsoc']); + $checkFiche = $checkFiche && isset($fiches['medrel']) && is_numeric($fiches['medrel']); $checkFiche = $checkFiche && isset($fiches['reltypeSpecial']) && is_string($fiches['reltypeSpecial']); $checkFiche = $checkFiche && isset($fiches['city']) && is_string($fiches['city']); $checkFiche = $checkFiche && isset($fiches['cp']) && is_string($fiches['cp']); @@ -218,6 +222,7 @@ $checkFiche = $checkFiche && isset($fiches['context']) && is_numeric($fiches['context']); $checkFiche = $checkFiche && isset($fiches['contextSpecial']) && is_array($fiches['contextSpecial']); $checkFiche = $checkFiche && isset($fiches['freq']) && is_array($fiches['freq']); + $checkFiche = $checkFiche && isset($fiches['irlfreq']) && is_array($fiches['irlfreq']); $checkFiche = $checkFiche && isset($fiches['connect']) && is_array($fiches['connect']); $checkFiche = $checkFiche && isset($fiches['connectSpecial']) && is_array($fiches['connectSpecial']); diff --git a/build/api/module/user.php b/build/api/module/user.php old mode 100644 new mode 100755 diff --git a/build/database/core/DatabaseDriver.php b/build/database/core/DatabaseDriver.php old mode 100644 new mode 100755 diff --git a/build/database/core/Repo.php b/build/database/core/Repo.php old mode 100644 new mode 100755 diff --git a/build/database/repo/parentRepo.php b/build/database/repo/parentRepo.php old mode 100644 new mode 100755 diff --git a/build/database/repo/token.php b/build/database/repo/token.php old mode 100644 new mode 100755 diff --git a/build/database/repo/user.php b/build/database/repo/user.php old mode 100644 new mode 100755 diff --git a/build/lightdb/core/lightdb.php b/build/lightdb/core/lightdb.php old mode 100644 new mode 100755 diff --git a/build/lightdb/storage/contact/data b/build/lightdb/storage/contact/data index 8a6b2a6..77099e9 100755 --- a/build/lightdb/storage/contact/data +++ b/build/lightdb/storage/contact/data @@ -1,43 +1,43 @@ -{"id":2,"name":"contact-x","sexe":"1","age":"6","studies2":"01","reltype":"7","dist":"1","job":"82","famsit":"0","city":"35","cp":"10025","quartier":"25","duration":["25","125"],"context":"11","contextExtra":["internet","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":3,"name":"contact-1","sexe":"0","age":"6","studies2":"06","reltype":"6","dist":"2","job":"36","famsit":"0","city":"16","cp":"10006","quartier":"6","duration":["6","16"],"context":"6","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":4,"name":"contact-2","sexe":"1","age":"7","studies2":"07","reltype":"7","dist":"3","job":"41","famsit":"0","city":"17","cp":"10007","quartier":"7","duration":["7","17"],"context":"7","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":5,"name":"contact-3","sexe":"2","age":"8","studies2":"08","reltype":"autre","dist":"0","job":"46","famsit":"0","city":"18","cp":"10008","quartier":"8","duration":["8","18"],"context":"8","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":6,"name":"contact-4","sexe":"0","age":"9","studies2":"09","reltype":"0","dist":"1","job":"47","famsit":"0","city":"19","cp":"10009","quartier":"9","duration":["9","19"],"context":"9","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":7,"name":"contact-5","sexe":"1","age":"10","studies2":"10","reltype":"1","dist":"2","job":"48","famsit":"0","city":"20","cp":"10010","quartier":"10","duration":["10","110"],"context":"10","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":8,"name":"contact-6","sexe":"2","age":"11","studies2":"11","reltype":"2","dist":"3","job":"51","famsit":"0","city":"21","cp":"10011","quartier":"11","duration":["11","111"],"context":"11","contextExtra":["internet","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":9,"name":"contact-7","sexe":"0","age":"12","studies2":"","reltype":"3","dist":"0","job":"54","famsit":"0","city":"22","cp":"10012","quartier":"12","duration":["12","112"],"context":"12","contextExtra":["","association",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":10,"name":"contact-8","sexe":"1","age":"13","studies2":"01","reltype":"4","dist":"1","job":"55","famsit":"0","city":"23","cp":"10013","quartier":"13","duration":["13","113"],"context":"13","contextExtra":["","","autre"],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":11,"name":"contact-9","sexe":"2","age":"14","studies2":"02","reltype":"5","dist":"2","job":"56","famsit":"0","city":"24","cp":"10014","quartier":"14","duration":["14","114"],"context":"0","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":12,"name":"contact-10","sexe":"0","age":"15","studies2":"03","reltype":"6","dist":"3","job":"61","famsit":"0","city":"25","cp":"10015","quartier":"15","duration":["15","115"],"context":"1","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":13,"name":"contact-11","sexe":"1","age":"16","studies2":"04","reltype":"7","dist":"0","job":"66","famsit":"0","city":"26","cp":"10016","quartier":"16","duration":["16","116"],"context":"2","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":14,"name":"contact-12","sexe":"2","age":"17","studies2":"05","reltype":"autre","dist":"1","job":"69","famsit":"0","city":"27","cp":"10017","quartier":"17","duration":["17","117"],"context":"3","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":15,"name":"contact-13","sexe":"0","age":"18","studies2":"06","reltype":"0","dist":"2","job":"71","famsit":"0","city":"28","cp":"10018","quartier":"18","duration":["18","118"],"context":"4","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":16,"name":"contact-14","sexe":"1","age":"0","studies2":"07","reltype":"1","dist":"3","job":"72","famsit":"0","city":"29","cp":"10019","quartier":"19","duration":["19","119"],"context":"5","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":17,"name":"contact-15","sexe":"2","age":"1","studies2":"08","reltype":"2","dist":"0","job":"73","famsit":"0","city":"30","cp":"10020","quartier":"20","duration":["20","120"],"context":"6","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":18,"name":"contact-16","sexe":"0","age":"2","studies2":"09","reltype":"3","dist":"1","job":"74","famsit":"0","city":"31","cp":"10021","quartier":"21","duration":["21","121"],"context":"7","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":19,"name":"contact-17","sexe":"1","age":"3","studies2":"10","reltype":"4","dist":"2","job":"75","famsit":"0","city":"32","cp":"10022","quartier":"22","duration":["22","122"],"context":"8","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":20,"name":"contact-18","sexe":"2","age":"4","studies2":"11","reltype":"5","dist":"3","job":"76","famsit":"0","city":"33","cp":"10023","quartier":"23","duration":["23","123"],"context":"9","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":21,"name":"contact-19","sexe":"0","age":"5","studies2":"","reltype":"6","dist":"0","job":"81","famsit":"0","city":"34","cp":"10024","quartier":"24","duration":["24","124"],"context":"10","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":23,"name":"contact-21","sexe":"2","age":"7","studies2":"02","reltype":"autre","dist":"2","job":"10","famsit":"0","city":"36","cp":"10026","quartier":"26","duration":["26","126"],"context":"12","contextExtra":["","association",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":24,"name":"contact-22","sexe":"0","age":"8","studies2":"03","reltype":"0","dist":"3","job":"21","famsit":"0","city":"37","cp":"10027","quartier":"27","duration":["27","127"],"context":"13","contextExtra":["","","autre"],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":25,"name":"contact-23","sexe":"1","age":"9","studies2":"04","reltype":"1","dist":"0","job":"22","famsit":"0","city":"38","cp":"10028","quartier":"28","duration":["28","128"],"context":"0","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":26,"name":"contact-24","sexe":"2","age":"10","studies2":"05","reltype":"2","dist":"1","job":"23","famsit":"0","city":"39","cp":"10029","quartier":"29","duration":["29","129"],"context":"1","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":27,"name":"contact-25","sexe":"0","age":"11","studies2":"06","reltype":"3","dist":"2","job":"31","famsit":"0","city":"40","cp":"10030","quartier":"30","duration":["30","130"],"context":"2","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":28,"name":"contact-26","sexe":"1","age":"12","studies2":"07","reltype":"4","dist":"3","job":"32","famsit":"0","city":"41","cp":"10031","quartier":"31","duration":["31","131"],"context":"3","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":29,"name":"contact-27","sexe":"2","age":"13","studies2":"08","reltype":"5","dist":"0","job":"36","famsit":"0","city":"42","cp":"10032","quartier":"32","duration":["32","132"],"context":"4","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":30,"name":"contact-28","sexe":"0","age":"14","studies2":"09","reltype":"6","dist":"1","job":"41","famsit":"0","city":"43","cp":"10033","quartier":"33","duration":["33","133"],"context":"5","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":31,"name":"contact-29","sexe":"1","age":"15","studies2":"10","reltype":"7","dist":"2","job":"46","famsit":"0","city":"44","cp":"10034","quartier":"34","duration":["34","134"],"context":"6","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":32,"name":"contact-30","sexe":"2","age":"16","studies2":"11","reltype":"autre","dist":"3","job":"47","famsit":"0","city":"45","cp":"10035","quartier":"35","duration":["35","135"],"context":"7","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":33,"name":"contact-31","sexe":"0","age":"17","studies2":"","reltype":"0","dist":"0","job":"48","famsit":"0","city":"46","cp":"10036","quartier":"36","duration":["36","136"],"context":"8","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":34,"name":"contact-32","sexe":"1","age":"18","studies2":"01","reltype":"1","dist":"1","job":"51","famsit":"0","city":"47","cp":"10037","quartier":"37","duration":["37","137"],"context":"9","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":35,"name":"contact-33","sexe":"2","age":"0","studies2":"02","reltype":"2","dist":"2","job":"54","famsit":"0","city":"48","cp":"10038","quartier":"38","duration":["38","138"],"context":"10","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":36,"name":"contact-34","sexe":"0","age":"1","studies2":"03","reltype":"3","dist":"3","job":"55","famsit":"0","city":"49","cp":"10039","quartier":"39","duration":["39","139"],"context":"11","contextExtra":["internet","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":37,"name":"contact-35","sexe":"1","age":"2","studies2":"04","reltype":"4","dist":"0","job":"56","famsit":"0","city":"50","cp":"10040","quartier":"40","duration":["40","140"],"context":"12","contextExtra":["","association",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":38,"name":"contact-36","sexe":"2","age":"3","studies2":"05","reltype":"5","dist":"1","job":"61","famsit":"0","city":"51","cp":"10041","quartier":"41","duration":["41","141"],"context":"13","contextExtra":["","","autre"],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":39,"name":"contact-37","sexe":"0","age":"4","studies2":"06","reltype":"6","dist":"2","job":"66","famsit":"0","city":"52","cp":"10042","quartier":"42","duration":["42","142"],"context":"0","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":40,"name":"contact-38","sexe":"1","age":"5","studies2":"07","reltype":"7","dist":"3","job":"69","famsit":"0","city":"53","cp":"10043","quartier":"43","duration":["43","143"],"context":"1","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":41,"name":"contact-39","sexe":"2","age":"6","studies2":"08","reltype":"autre","dist":"0","job":"71","famsit":"0","city":"54","cp":"10044","quartier":"44","duration":["44","144"],"context":"2","contextExtra":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} -{"id":43,"name":"contact-41","sexe":"1","age":"","studies1":"2","reltype":"1","dist":"."} -{"id":44,"name":"contact-42","sexe":"0","age":"2","studies1":"3","reltype":"2","dist":"."} -{"id":45,"name":"contact-43","sexe":"1","age":"3","studies1":"4","reltype":"3","dist":"."} -{"id":46,"name":"contact-44","sexe":"0","age":"4","studies1":"5","reltype":"4","dist":"."} +{"id":554,"name":"contact-x","sexe":"1","age":"6","studies2":"","reltype":"1","dist":"1","job":"2","famsit":"1","city":"35","cp":"10025","quartier":"25","duration":["25","125"],"context":"11","contextExtra":["internet","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":555,"name":"contact-1","sexe":"0","age":"6","studies2":"","reltype":"6","dist":"2","job":"6","famsit":"2","city":"16","cp":"10006","quartier":"6","duration":["6","16"],"context":"6","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":556,"name":"contact-2","sexe":"1","age":"7","studies2":"","reltype":"autre","dist":"3","job":"7","famsit":"3","city":"17","cp":"10007","quartier":"7","duration":["7","17"],"context":"7","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":557,"name":"contact-3","sexe":"2","age":"8","studies2":"","reltype":"0","dist":"0","job":"8","famsit":"0","city":"18","cp":"10008","quartier":"8","duration":["8","18"],"context":"8","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":558,"name":"contact-4","sexe":"0","age":"9","studies2":"","reltype":"1","dist":"1","job":"9","famsit":"1","city":"19","cp":"10009","quartier":"9","duration":["9","19"],"context":"9","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":559,"name":"contact-5","sexe":"1","age":"10","studies2":"","reltype":"2","dist":"2","job":"1","famsit":"2","city":"20","cp":"10010","quartier":"10","duration":["10","110"],"context":"10","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":560,"name":"contact-6","sexe":"2","age":"11","studies2":"","reltype":"3","dist":"3","job":"1","famsit":"3","city":"21","cp":"10011","quartier":"11","duration":["11","111"],"context":"11","contextExtra":["internet","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":561,"name":"contact-7","sexe":"0","age":"12","studies2":"","reltype":"4","dist":"0","job":"1","famsit":"0","city":"22","cp":"10012","quartier":"12","duration":["12","112"],"context":"12","contextExtra":["","association",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":562,"name":"contact-8","sexe":"1","age":"13","studies2":"","reltype":"5","dist":"1","job":"0","famsit":"1","city":"23","cp":"10013","quartier":"13","duration":["13","113"],"context":"13","contextExtra":["","","autre"],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":563,"name":"contact-9","sexe":"2","age":"14","studies2":"","reltype":"6","dist":"2","job":"1","famsit":"2","city":"24","cp":"10014","quartier":"14","duration":["14","114"],"context":"0","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":564,"name":"contact-10","sexe":"0","age":"15","studies2":"","reltype":"autre","dist":"3","job":"2","famsit":"3","city":"25","cp":"10015","quartier":"15","duration":["15","115"],"context":"1","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":565,"name":"contact-11","sexe":"1","age":"16","studies2":"","reltype":"0","dist":"0","job":"3","famsit":"0","city":"26","cp":"10016","quartier":"16","duration":["16","116"],"context":"2","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":566,"name":"contact-12","sexe":"2","age":"17","studies2":"","reltype":"1","dist":"1","job":"4","famsit":"1","city":"27","cp":"10017","quartier":"17","duration":["17","117"],"context":"3","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":567,"name":"contact-13","sexe":"0","age":"18","studies2":"","reltype":"2","dist":"2","job":"5","famsit":"2","city":"28","cp":"10018","quartier":"18","duration":["18","118"],"context":"4","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":568,"name":"contact-14","sexe":"1","age":"0","studies2":"","reltype":"3","dist":"3","job":"6","famsit":"3","city":"29","cp":"10019","quartier":"19","duration":["19","119"],"context":"5","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":569,"name":"contact-15","sexe":"2","age":"1","studies2":"","reltype":"4","dist":"0","job":"7","famsit":"0","city":"30","cp":"10020","quartier":"20","duration":["20","120"],"context":"6","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":570,"name":"contact-16","sexe":"0","age":"2","studies2":"","reltype":"5","dist":"1","job":"8","famsit":"1","city":"31","cp":"10021","quartier":"21","duration":["21","121"],"context":"7","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":571,"name":"contact-17","sexe":"1","age":"3","studies2":"","reltype":"6","dist":"2","job":"9","famsit":"2","city":"32","cp":"10022","quartier":"22","duration":["22","122"],"context":"8","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":572,"name":"contact-18","sexe":"2","age":"4","studies2":"","reltype":"autre","dist":"3","job":"0","famsit":"3","city":"33","cp":"10023","quartier":"23","duration":["23","123"],"context":"9","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":573,"name":"contact-19","sexe":"0","age":"5","studies2":"","reltype":"0","dist":"0","job":"1","famsit":"0","city":"34","cp":"10024","quartier":"24","duration":["24","124"],"context":"10","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":575,"name":"contact-21","sexe":"2","age":"7","studies2":"","reltype":"2","dist":"2","job":"0","famsit":"2","city":"36","cp":"10026","quartier":"26","duration":["26","126"],"context":"12","contextExtra":["","association",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":576,"name":"contact-22","sexe":"0","age":"8","studies2":"","reltype":"3","dist":"3","job":"1","famsit":"3","city":"37","cp":"10027","quartier":"27","duration":["27","127"],"context":"13","contextExtra":["","","autre"],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":577,"name":"contact-23","sexe":"1","age":"9","studies2":"","reltype":"4","dist":"0","job":"2","famsit":"0","city":"38","cp":"10028","quartier":"28","duration":["28","128"],"context":"0","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":578,"name":"contact-24","sexe":"2","age":"10","studies2":"","reltype":"5","dist":"1","job":"3","famsit":"1","city":"39","cp":"10029","quartier":"29","duration":["29","129"],"context":"1","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":579,"name":"contact-25","sexe":"0","age":"11","studies2":"","reltype":"6","dist":"2","job":"4","famsit":"2","city":"40","cp":"10030","quartier":"30","duration":["30","130"],"context":"2","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":580,"name":"contact-26","sexe":"1","age":"12","studies2":"","reltype":"autre","dist":"3","job":"5","famsit":"3","city":"41","cp":"10031","quartier":"31","duration":["31","131"],"context":"3","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":581,"name":"contact-27","sexe":"2","age":"13","studies2":"","reltype":"0","dist":"0","job":"6","famsit":"0","city":"42","cp":"10032","quartier":"32","duration":["32","132"],"context":"4","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":582,"name":"contact-28","sexe":"0","age":"14","studies2":"","reltype":"1","dist":"1","job":"7","famsit":"1","city":"43","cp":"10033","quartier":"33","duration":["33","133"],"context":"5","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":583,"name":"contact-29","sexe":"1","age":"15","studies2":"","reltype":"2","dist":"2","job":"8","famsit":"2","city":"44","cp":"10034","quartier":"34","duration":["34","134"],"context":"6","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":584,"name":"contact-30","sexe":"2","age":"16","studies2":"","reltype":"3","dist":"3","job":"9","famsit":"3","city":"45","cp":"10035","quartier":"35","duration":["35","135"],"context":"7","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":585,"name":"contact-31","sexe":"0","age":"17","studies2":"","reltype":"4","dist":"0","job":"1","famsit":"0","city":"46","cp":"10036","quartier":"36","duration":["36","136"],"context":"8","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":586,"name":"contact-32","sexe":"1","age":"18","studies2":"","reltype":"5","dist":"1","job":"1","famsit":"1","city":"47","cp":"10037","quartier":"37","duration":["37","137"],"context":"9","contextExtra":["","",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":587,"name":"contact-33","sexe":"2","age":"0","studies2":"","reltype":"6","dist":"2","job":"1","famsit":"2","city":"48","cp":"10038","quartier":"38","duration":["38","138"],"context":"10","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":588,"name":"contact-34","sexe":"0","age":"1","studies2":"","reltype":"autre","dist":"3","job":"0","famsit":"3","city":"49","cp":"10039","quartier":"39","duration":["39","139"],"context":"11","contextExtra":["internet","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":589,"name":"contact-35","sexe":"1","age":"2","studies2":"","reltype":"0","dist":"0","job":"1","famsit":"0","city":"50","cp":"10040","quartier":"40","duration":["40","140"],"context":"12","contextExtra":["","association",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":590,"name":"contact-36","sexe":"2","age":"3","studies2":"","reltype":"1","dist":"1","job":"2","famsit":"1","city":"51","cp":"10041","quartier":"41","duration":["41","141"],"context":"13","contextExtra":["","","autre"],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":591,"name":"contact-37","sexe":"0","age":"4","studies2":"","reltype":"2","dist":"2","job":"3","famsit":"2","city":"52","cp":"10042","quartier":"42","duration":["42","142"],"context":"0","contextExtra":["","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":592,"name":"contact-38","sexe":"1","age":"5","studies2":"","reltype":"3","dist":"3","job":"4","famsit":"3","city":"53","cp":"10043","quartier":"43","duration":["43","143"],"context":"1","contextExtra":["","",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""]} +{"id":593,"name":"contact-39","sexe":"2","age":"6","studies2":"1","reltype":"4","dist":"0","job":"5","famsit":"0","city":"54","cp":"10044","quartier":"44","duration":["44","144"],"context":"2","contextExtra":["","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""]} +{"id":595,"name":"contact-41","sexe":"1","age":"1","studies1":"2","reltype":"1","dist":"0"} +{"id":596,"name":"contact-42","sexe":"0","age":"2","studies1":"3","reltype":"2","dist":"1"} +{"id":597,"name":"contact-43","sexe":"1","age":"3","studies1":"4","reltype":"3","dist":"2"} +{"id":598,"name":"contact-44","sexe":"0","age":"4","studies1":"5","reltype":"4","dist":"3"} diff --git a/build/lightdb/storage/contact/index b/build/lightdb/storage/contact/index index 7e5cecc..ee83ae7 100755 --- a/build/lightdb/storage/contact/index +++ b/build/lightdb/storage/contact/index @@ -1 +1 @@ -{"2":{"line":0},"3":{"line":1},"4":{"line":2},"5":{"line":3},"6":{"line":4},"7":{"line":5},"8":{"line":6},"9":{"line":7},"10":{"line":8},"11":{"line":9},"12":{"line":10},"13":{"line":11},"14":{"line":12},"15":{"line":13},"16":{"line":14},"17":{"line":15},"18":{"line":16},"19":{"line":17},"20":{"line":18},"21":{"line":19},"23":{"line":20},"24":{"line":21},"25":{"line":22},"26":{"line":23},"27":{"line":24},"28":{"line":25},"29":{"line":26},"30":{"line":27},"31":{"line":28},"32":{"line":29},"33":{"line":30},"34":{"line":31},"35":{"line":32},"36":{"line":33},"37":{"line":34},"38":{"line":35},"39":{"line":36},"40":{"line":37},"41":{"line":38},"43":{"line":39},"44":{"line":40},"45":{"line":41},"46":{"line":42}} \ No newline at end of file +{"554":{"line":0},"555":{"line":1},"556":{"line":2},"557":{"line":3},"558":{"line":4},"559":{"line":5},"560":{"line":6},"561":{"line":7},"562":{"line":8},"563":{"line":9},"564":{"line":10},"565":{"line":11},"566":{"line":12},"567":{"line":13},"568":{"line":14},"569":{"line":15},"570":{"line":16},"571":{"line":17},"572":{"line":18},"573":{"line":19},"575":{"line":20},"576":{"line":21},"577":{"line":22},"578":{"line":23},"579":{"line":24},"580":{"line":25},"581":{"line":26},"582":{"line":27},"583":{"line":28},"584":{"line":29},"585":{"line":30},"586":{"line":31},"587":{"line":32},"588":{"line":33},"589":{"line":34},"590":{"line":35},"591":{"line":36},"592":{"line":37},"593":{"line":38},"595":{"line":39},"596":{"line":40},"597":{"line":41},"598":{"line":42}} \ No newline at end of file diff --git a/build/lightdb/storage/dictionary.json b/build/lightdb/storage/dictionary.json index 12b015d..ef7a30f 100755 --- a/build/lightdb/storage/dictionary.json +++ b/build/lightdb/storage/dictionary.json @@ -7,6 +7,48 @@ }, + "questions": { + "sexe": { "x": "Civilité" }, + "age": { "x": "Age" }, + "studies1": { "x": "Niveau d'études maximal (fiche rapide)" }, + "studies2": { "x": "Niveau d'études maximal (fiche complète)" }, + "job": { "x": "Dernière profession exercée" }, + "city": { "x": "Où habite t-elle/il ? (ville)" }, + "cp": { "x": "Où habite t-elle/il ? (code postal)" }, + "quartier": { "x": "Où habite t-elle/il ? (quartier)" }, + "context": { "x": "Contexte de rencontre" }, + "contextExtra": { "0": "Internet (quel contexte ? préciser)", + "1": "Par une association (quel type ? préciser)", + "2": "Autre" }, + "famsit": { "x": "Situation familiale" }, + "reltype": { "x": "Type de relation" }, + "dist": { "x": "À combien de temps est-ce de chez vous (en voiture) ? (si deux domiciles, le plus proche)" }, + "duration": { "0": "Depuis quand connaissez-vous cette personne ? (mois)", + "1": "Depuis quand connaissez-vous cette personne ? (années)" }, + "freq": { "0": "Avec quelle fréquence discutez-vous avec cette personne face à face ?", + "1": "Avec quelle fréquence discutez-vous avec cette personne via téléphone ou skype et équivalent ?", + "2": "Avec quelle fréquence discutez-vous avec cette personne via SMS et équivalents ?", + "3": "Avec quelle fréquence discutez-vous avec cette personne via courrier éléctronique ?", + "4": "Avec quelle fréquence discutez-vous avec cette personne via facebook ou autre réseau social ?" }, + "irlfreq": { "0": "Selon vous, à quelle fréquence cette personne publie des commentaires personnels ou réagit aux publications des autres ?", + "1": "Selon vous, à quelle fréquence cette personne publie des photos personnelles (profil, voyages, etc.) ?", + "2": "Selon vous, à quelle fréquence cette personne partage de la musique ou des clips musicaux ?", + "3": "Selon vous, à quelle fréquence cette personne partage des informations culturelles (concert, exposition, etc.) ?", + "4": "Selon vous, à quelle fréquence cette personne partage des articles, des informations, des contenus avec une portée politique ?" }, + "connect": { "0": "Ses coordonnées sont dans votre carnet d'adresse", + "1": "Son numéro de mobile est enregistré sur votre mobile (ou vous-mêmes êtes sur le sien)", + "2": "Elle figure parmi vos amis facebook (idem)", + "3": "Elle figure parmi vos amis facebook et vous interagissez avec elle sur ce dispositif régulièrement (idem)", + "4": "Vous le suivez sur Twitter (ou elle vous suit)", + "5": "Vous communiquez avec cette personne sur Twitter (idem)" }, + "connectExtra": { "0": "Vous communiquez dans autre réseau", + "1": "Vous communiquez dans un autre dispositif (blogs, jeu vidéo ou autre)" }, + "medsoc": { "x": "Comment cette personne utilise-t-elle les médias sociaux de votre point de vue ?" }, + "medrel": { "x": "Considérez-vous que vos échange avec cette personne à travers les médias sociaux" }, + "interest": { "x": "Sur une échelle de 1 à 5, préciser l'intérêt que vous accordez aux contenue qu'elle partage via les médias sociaux" }, + "relmark": { "x": "Sur une échelle de 1 à 5, comment jugez-vous votre relation à cette personne ?" } + + }, @@ -32,49 +74,32 @@ }, "studies2": { - ".": "NA", - "0": "Inconnue", - "01": "Pas de scolarité", - "02": "Aucun diplôme mais scolarité jusqu'en école primaire ou au collège", - "03": "Aucun diplôme mais scolarité au-delà du collège", - "04": "Certificat d'études primaires (CEP)", - "05": "BEPC, brevet élémentaire, brevet des collèges", - "06": "Certificat d'aptitudes professionnelles (CAP), brevet de compagnon, y compris CAPA", - "07": "Brevet d'études professionnelles (BEP), y compris BEPA et diplômes agricoles (BAA, BPA) Diplômes sociaux (aide-soignante, auxiliaire de puériculture, travailleuse familiale)", - "08": "Baccalauréat général, brevet supérieur BAC ( L, ES, S ou A, B , C, D, D’, E )", - "09": "Bac technologique ou professionnel, brevet professionnel ou de technicien BAC (STI, STL, SMS, STT ou F, G, H) BEC, BEI, BEH, capacité en droit Brevet de technicien agricole (BTA)", - "10": "Diplôme universitaire de 1er cycle BTS, DUT, DEUG Diplôme des professions sociales ou de santé, d'infirmier(ère) Diplôme universitaire propédeutique, DUEL, DUES, DEUG, PCEM", - "11": "Diplôme universitaire de 2ème ou 3ème cycle MASTER, DOCTORAT (y compris médecine, pharmacie, dentaire), Maîtrise, DEA, DESS, CAPES, CAPET, agrégation Diplôme d'ingénieur, d'une grande école, etc." + ".": "NA", + "0": "Aucun diplôme, CEP, BEPC", + "1": "CAP, CAPA, BEP, BEPA, Brevet de compagnon, Diplômes sociaux (aide-soignante, auxiliaire de puériculture, travailleuse familiale)", + "2": "Bac technologique ou professionnel, brevet professionnel ou de technicien", + "3": "Baccalauréat général, brevet supérieur", + "4": "Diplôme universitaire de 1er cycle: Licence, BTS, DUT", + "5": "Diplôme universitaire de 2ème cycle : MASTER, Maîtrise ou DEA, CAPES", + "6": "Doctorat (y compris médecine, pharmacie, dentaire)", + "7": "Diplôme d'ingénieur, diplôme d'une grande école de commerce" }, "job": { - ".": "NA", - "10": "Agriculteurs exploitants (Agriculteurs, maraîchers, viticulteurs…)", - "21": "Artisans (Maçons, électriciens, couturiers, boulangers, garagistes, coiffeurs…)", - "22": "Commerçants et assimilés (Commerçants en détail ou en gros, buralistes, cafetiers, agents immobiliers…)", - "23": "Chefs d'entreprise de 10 salariés ou plus", - "31": "Professions libérales et assimilés (Médecins, avocats, notaires, architectes libéraux…)", - "32": "Cadres de la fonction publique, professions intellectuelles et artistiques (Personnels administratifs de catégorie A, professeurs de l’enseignement secondaire ou supérieur, médecins hospitaliers, artistes…)", - "36": "Cadres d'entreprise (Cadres administratifs, cadres commerciaux, ingénieurs…)", - "41": "Professions intermédiaires de l'enseignement, de la santé, de la fonction publique et assimilés (Personnels administratifs de catégorie B, instituteurs, infirmiers, travailleurs sociaux…)", - "46": "Professions intermédiaires administratives et commerciales des entreprises (Comptables, chargés de clientèles…)", - "47": "Techniciens (Techniciens d’études, techniciens de contrôle, dessinateurs en bâtiment, géomètres…)", - "48": "Contremaîtres, agents de maîtrise (Conducteurs de travaux, chefs d’équipe…)", - "51": "Employés de la fonction publique (Personnels de catégorie C, agents administratifs, agents de service…)", - "54": "Employés administratifs d'entreprise (Secrétaires, agents d’accueil…)", - "55": "Employés de commerce (Vendeurs, caissiers…)", - "56": "Personnels des services directs aux particuliers (Serveurs, coiffeurs, assistantes maternelles…)", - "61": "Ouvriers qualifiés de type industriel ou artisanal (Mécaniciens, chauffeurs, cuisiniers…)", - "66": "Ouvriers non qualifiés de type industriel ou artisanal (Ouvrier de production, manœuvres…)", - "69": "Ouvriers agricoles (Bergers, ouvriers de la viticulture, bûcherons, ouvrier forestiers…)", - "71": "Anciens agriculteurs exploitants", - "72": "Anciens artisans, commerçants, chefs d'entreprise", - "73": "Anciens cadres", - "74": "Anciennes professions intermédiaires", - "75": "Anciens employés", - "76": "Anciens ouvriers", - "81": "Chômeurs n'ayant jamais travaillé", - "82": "Inactifs divers (autres que retraités)" + ".": "NA", + "0": "Agriculateur exploitants", + "1": "Artisans", + "2": "Commerçants et assimilés", + "3": "Chefs d'entreprise de 10 salariés ou plus", + "4": "Professions libérales et assimilés", + "5": "Cadres de la fonction publique, professions intellectuelles et artistiques", + "6": "Cadres d'entreprise", + "7": "Professions intermétiaires de l'enseignement, de la santé, de la fonction publique et assimilés", + "8": "Professions intermédiaires administratives et commerciales des entreprises", + "9": "Techniciens", + "10": "Contremaîtres, agents de maîtrise", + "11": "Employés", + "12": "Ouvriers" }, @@ -102,8 +127,6 @@ "3": "En couple avec enfants" }, - - "reltype": { "0": "Père, mère ou équivalent", "1": "Frère ou soeur", @@ -133,9 +156,46 @@ "4": "Jamais" }, + "irlfreq": { + "0": "plusieurs fois par semaine", + "1": "1 fois par semaine", + "2": "1 fois par mois", + "3": "1 fois par an ou moins", + "4": "Jamais" + }, + "connect": { "0": "Oui", "1": "Non" + }, + + "medsoc": { + "0": "D'une personne qui n'utilise pas ou peu les médias sociaux", + "1": "D'une personne qui consulte des publications mais partage peu de contenus", + "2": "D'une personne qui consulte des publication et partage des contenus de temps en temps", + "3": "D'une personne qui partage beaucoup de contenus et s'exprime fréquemment" + }, + + "medrel": { + "0": "N'ont aucun effet sur votre relation", + "1": "Vous ont rapproché d'elle", + "2": "Vous ont éloigné d'elle" + }, + + "interest": { + "0": "1", + "1": "2", + "2": "3", + "3": "4", + "4": "5" + }, + + "relmark": { + "0": "1", + "1": "2", + "2": "3", + "3": "4", + "4": "5" } }, diff --git a/build/lightdb/storage/subject/data b/build/lightdb/storage/subject/data index d4b7133..0349bde 100755 --- a/build/lightdb/storage/subject/data +++ b/build/lightdb/storage/subject/data @@ -1 +1,10 @@ -{"subject":{"id":1,"name":"Sujet 1","creation":1480074746,"surveys":["facebook","phone"]},"contacts":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,43,44,45,46],"relations":[{"idA":1,"idB":2,"type":6},{"idA":1,"idB":3,"type":6},{"idA":1,"idB":4,"type":6},{"idA":1,"idB":5,"type":6},{"idA":1,"idB":6,"type":6},{"idA":1,"idB":7,"type":6},{"idA":1,"idB":8,"type":6},{"idA":1,"idB":9,"type":6},{"idA":1,"idB":10,"type":6},{"idA":1,"idB":11,"type":6},{"idA":1,"idB":12,"type":6},{"idA":1,"idB":13,"type":6},{"idA":1,"idB":14,"type":6},{"idA":1,"idB":15,"type":6},{"idA":1,"idB":16,"type":6},{"idA":1,"idB":17,"type":6},{"idA":1,"idB":18,"type":6},{"idA":1,"idB":19,"type":6},{"idA":1,"idB":20,"type":6},{"idA":1,"idB":21,"type":6},{"idA":1,"idB":23,"type":7},{"idA":1,"idB":24,"type":7},{"idA":1,"idB":25,"type":7},{"idA":1,"idB":26,"type":7},{"idA":1,"idB":27,"type":7},{"idA":1,"idB":28,"type":7},{"idA":1,"idB":29,"type":7},{"idA":1,"idB":30,"type":7},{"idA":1,"idB":31,"type":7},{"idA":1,"idB":32,"type":7},{"idA":1,"idB":33,"type":7},{"idA":1,"idB":34,"type":7},{"idA":1,"idB":35,"type":7},{"idA":1,"idB":36,"type":7},{"idA":1,"idB":37,"type":7},{"idA":1,"idB":38,"type":7},{"idA":1,"idB":39,"type":7},{"idA":1,"idB":40,"type":7},{"idA":1,"idB":41,"type":7},{"idA":1,"idB":43,"type":3},{"idA":1,"idB":44,"type":3},{"idA":1,"idB":45,"type":3},{"idA":1,"idB":46,"type":3},{"idA":2,"idB":3,"type":1},{"idA":2,"idB":4,"type":1},{"idA":2,"idB":5,"type":0},{"idA":2,"idB":6,"type":0},{"idA":2,"idB":7,"type":0},{"idA":2,"idB":8,"type":0},{"idA":2,"idB":9,"type":0},{"idA":2,"idB":10,"type":0},{"idA":2,"idB":11,"type":0},{"idA":2,"idB":12,"type":0},{"idA":2,"idB":13,"type":1},{"idA":2,"idB":14,"type":0},{"idA":2,"idB":15,"type":0},{"idA":2,"idB":16,"type":0},{"idA":2,"idB":17,"type":0},{"idA":2,"idB":18,"type":0},{"idA":2,"idB":19,"type":0},{"idA":2,"idB":20,"type":0},{"idA":2,"idB":21,"type":0},{"idA":2,"idB":23,"type":0},{"idA":2,"idB":24,"type":0},{"idA":2,"idB":25,"type":0},{"idA":2,"idB":26,"type":0},{"idA":2,"idB":27,"type":1},{"idA":2,"idB":28,"type":0},{"idA":2,"idB":29,"type":0},{"idA":2,"idB":30,"type":1},{"idA":2,"idB":31,"type":0},{"idA":2,"idB":32,"type":0},{"idA":2,"idB":33,"type":0},{"idA":2,"idB":34,"type":0},{"idA":2,"idB":35,"type":0},{"idA":2,"idB":36,"type":0},{"idA":2,"idB":37,"type":0},{"idA":2,"idB":38,"type":0},{"idA":2,"idB":39,"type":0},{"idA":2,"idB":40,"type":0},{"idA":2,"idB":41,"type":0},{"idA":2,"idB":43,"type":0},{"idA":2,"idB":44,"type":0},{"idA":2,"idB":45,"type":0},{"idA":2,"idB":46,"type":0},{"idA":3,"idB":4,"type":0},{"idA":3,"idB":5,"type":0},{"idA":3,"idB":6,"type":0},{"idA":3,"idB":7,"type":0},{"idA":3,"idB":8,"type":0},{"idA":3,"idB":9,"type":0},{"idA":3,"idB":10,"type":0},{"idA":3,"idB":11,"type":0},{"idA":3,"idB":12,"type":0},{"idA":3,"idB":13,"type":0},{"idA":3,"idB":14,"type":0},{"idA":3,"idB":15,"type":0},{"idA":3,"idB":16,"type":0},{"idA":3,"idB":17,"type":0},{"idA":3,"idB":18,"type":0},{"idA":3,"idB":19,"type":0},{"idA":3,"idB":20,"type":0},{"idA":3,"idB":21,"type":0},{"idA":3,"idB":23,"type":0},{"idA":3,"idB":24,"type":0},{"idA":3,"idB":25,"type":0},{"idA":3,"idB":26,"type":0},{"idA":3,"idB":27,"type":0},{"idA":3,"idB":28,"type":0},{"idA":3,"idB":29,"type":0},{"idA":3,"idB":30,"type":0},{"idA":3,"idB":31,"type":0},{"idA":3,"idB":32,"type":0},{"idA":3,"idB":33,"type":0},{"idA":3,"idB":34,"type":0},{"idA":3,"idB":35,"type":0},{"idA":3,"idB":36,"type":0},{"idA":3,"idB":37,"type":0},{"idA":3,"idB":38,"type":0},{"idA":3,"idB":39,"type":0},{"idA":3,"idB":40,"type":0},{"idA":3,"idB":41,"type":0},{"idA":3,"idB":43,"type":0},{"idA":3,"idB":44,"type":0},{"idA":3,"idB":45,"type":0},{"idA":3,"idB":46,"type":0},{"idA":4,"idB":5,"type":0},{"idA":4,"idB":6,"type":0},{"idA":4,"idB":7,"type":0},{"idA":4,"idB":8,"type":0},{"idA":4,"idB":9,"type":0},{"idA":4,"idB":10,"type":0},{"idA":4,"idB":11,"type":0},{"idA":4,"idB":12,"type":0},{"idA":4,"idB":13,"type":0},{"idA":4,"idB":14,"type":0},{"idA":4,"idB":15,"type":0},{"idA":4,"idB":16,"type":0},{"idA":4,"idB":17,"type":0},{"idA":4,"idB":18,"type":0},{"idA":4,"idB":19,"type":0},{"idA":4,"idB":20,"type":0},{"idA":4,"idB":21,"type":0},{"idA":4,"idB":23,"type":0},{"idA":4,"idB":24,"type":0},{"idA":4,"idB":25,"type":0},{"idA":4,"idB":26,"type":0},{"idA":4,"idB":27,"type":0},{"idA":4,"idB":28,"type":0},{"idA":4,"idB":29,"type":0},{"idA":4,"idB":30,"type":0},{"idA":4,"idB":31,"type":0},{"idA":4,"idB":32,"type":0},{"idA":4,"idB":33,"type":0},{"idA":4,"idB":34,"type":0},{"idA":4,"idB":35,"type":0},{"idA":4,"idB":36,"type":0},{"idA":4,"idB":37,"type":0},{"idA":4,"idB":38,"type":0},{"idA":4,"idB":39,"type":0},{"idA":4,"idB":40,"type":0},{"idA":4,"idB":41,"type":0},{"idA":4,"idB":43,"type":0},{"idA":4,"idB":44,"type":0},{"idA":4,"idB":45,"type":0},{"idA":4,"idB":46,"type":0},{"idA":5,"idB":6,"type":0},{"idA":5,"idB":7,"type":0},{"idA":5,"idB":8,"type":0},{"idA":5,"idB":9,"type":0},{"idA":5,"idB":10,"type":0},{"idA":5,"idB":11,"type":0},{"idA":5,"idB":12,"type":0},{"idA":5,"idB":13,"type":0},{"idA":5,"idB":14,"type":0},{"idA":5,"idB":15,"type":0},{"idA":5,"idB":16,"type":0},{"idA":5,"idB":17,"type":0},{"idA":5,"idB":18,"type":0},{"idA":5,"idB":19,"type":0},{"idA":5,"idB":20,"type":0},{"idA":5,"idB":21,"type":0},{"idA":5,"idB":23,"type":0},{"idA":5,"idB":24,"type":0},{"idA":5,"idB":25,"type":0},{"idA":5,"idB":26,"type":0},{"idA":5,"idB":27,"type":0},{"idA":5,"idB":28,"type":0},{"idA":5,"idB":29,"type":0},{"idA":5,"idB":30,"type":0},{"idA":5,"idB":31,"type":0},{"idA":5,"idB":32,"type":0},{"idA":5,"idB":33,"type":0},{"idA":5,"idB":34,"type":0},{"idA":5,"idB":35,"type":0},{"idA":5,"idB":36,"type":0},{"idA":5,"idB":37,"type":0},{"idA":5,"idB":38,"type":0},{"idA":5,"idB":39,"type":0},{"idA":5,"idB":40,"type":0},{"idA":5,"idB":41,"type":0},{"idA":5,"idB":43,"type":0},{"idA":5,"idB":44,"type":0},{"idA":5,"idB":45,"type":0},{"idA":5,"idB":46,"type":0},{"idA":6,"idB":7,"type":0},{"idA":6,"idB":8,"type":0},{"idA":6,"idB":9,"type":0},{"idA":6,"idB":10,"type":0},{"idA":6,"idB":11,"type":0},{"idA":6,"idB":12,"type":0},{"idA":6,"idB":13,"type":0},{"idA":6,"idB":14,"type":0},{"idA":6,"idB":15,"type":0},{"idA":6,"idB":16,"type":0},{"idA":6,"idB":17,"type":0},{"idA":6,"idB":18,"type":1},{"idA":6,"idB":19,"type":0},{"idA":6,"idB":20,"type":0},{"idA":6,"idB":21,"type":0},{"idA":6,"idB":23,"type":0},{"idA":6,"idB":24,"type":0},{"idA":6,"idB":25,"type":0},{"idA":6,"idB":26,"type":0},{"idA":6,"idB":27,"type":0},{"idA":6,"idB":28,"type":1},{"idA":6,"idB":29,"type":0},{"idA":6,"idB":30,"type":0},{"idA":6,"idB":31,"type":0},{"idA":6,"idB":32,"type":0},{"idA":6,"idB":33,"type":0},{"idA":6,"idB":34,"type":0},{"idA":6,"idB":35,"type":0},{"idA":6,"idB":36,"type":0},{"idA":6,"idB":37,"type":0},{"idA":6,"idB":38,"type":0},{"idA":6,"idB":39,"type":0},{"idA":6,"idB":40,"type":0},{"idA":6,"idB":41,"type":0},{"idA":6,"idB":43,"type":0},{"idA":6,"idB":44,"type":0},{"idA":6,"idB":45,"type":0},{"idA":6,"idB":46,"type":0},{"idA":7,"idB":8,"type":0},{"idA":7,"idB":9,"type":0},{"idA":7,"idB":10,"type":0},{"idA":7,"idB":11,"type":0},{"idA":7,"idB":12,"type":0},{"idA":7,"idB":13,"type":1},{"idA":7,"idB":14,"type":0},{"idA":7,"idB":15,"type":0},{"idA":7,"idB":16,"type":0},{"idA":7,"idB":17,"type":0},{"idA":7,"idB":18,"type":0},{"idA":7,"idB":19,"type":0},{"idA":7,"idB":20,"type":0},{"idA":7,"idB":21,"type":0},{"idA":7,"idB":23,"type":0},{"idA":7,"idB":24,"type":0},{"idA":7,"idB":25,"type":1},{"idA":7,"idB":26,"type":0},{"idA":7,"idB":27,"type":0},{"idA":7,"idB":28,"type":0},{"idA":7,"idB":29,"type":1},{"idA":7,"idB":30,"type":0},{"idA":7,"idB":31,"type":0},{"idA":7,"idB":32,"type":0},{"idA":7,"idB":33,"type":0},{"idA":7,"idB":34,"type":0},{"idA":7,"idB":35,"type":0},{"idA":7,"idB":36,"type":0},{"idA":7,"idB":37,"type":0},{"idA":7,"idB":38,"type":0},{"idA":7,"idB":39,"type":0},{"idA":7,"idB":40,"type":0},{"idA":7,"idB":41,"type":0},{"idA":7,"idB":43,"type":0},{"idA":7,"idB":44,"type":0},{"idA":7,"idB":45,"type":0},{"idA":7,"idB":46,"type":0},{"idA":8,"idB":9,"type":0},{"idA":8,"idB":10,"type":0},{"idA":8,"idB":11,"type":0},{"idA":8,"idB":12,"type":0},{"idA":8,"idB":13,"type":0},{"idA":8,"idB":14,"type":0},{"idA":8,"idB":15,"type":0},{"idA":8,"idB":16,"type":0},{"idA":8,"idB":17,"type":0},{"idA":8,"idB":18,"type":0},{"idA":8,"idB":19,"type":0},{"idA":8,"idB":20,"type":0},{"idA":8,"idB":21,"type":0},{"idA":8,"idB":23,"type":0},{"idA":8,"idB":24,"type":0},{"idA":8,"idB":25,"type":0},{"idA":8,"idB":26,"type":0},{"idA":8,"idB":27,"type":0},{"idA":8,"idB":28,"type":0},{"idA":8,"idB":29,"type":0},{"idA":8,"idB":30,"type":0},{"idA":8,"idB":31,"type":0},{"idA":8,"idB":32,"type":0},{"idA":8,"idB":33,"type":0},{"idA":8,"idB":34,"type":0},{"idA":8,"idB":35,"type":0},{"idA":8,"idB":36,"type":0},{"idA":8,"idB":37,"type":0},{"idA":8,"idB":38,"type":0},{"idA":8,"idB":39,"type":0},{"idA":8,"idB":40,"type":0},{"idA":8,"idB":41,"type":0},{"idA":8,"idB":43,"type":0},{"idA":8,"idB":44,"type":0},{"idA":8,"idB":45,"type":0},{"idA":8,"idB":46,"type":0},{"idA":9,"idB":10,"type":0},{"idA":9,"idB":11,"type":0},{"idA":9,"idB":12,"type":0},{"idA":9,"idB":13,"type":0},{"idA":9,"idB":14,"type":0},{"idA":9,"idB":15,"type":0},{"idA":9,"idB":16,"type":0},{"idA":9,"idB":17,"type":0},{"idA":9,"idB":18,"type":0},{"idA":9,"idB":19,"type":0},{"idA":9,"idB":20,"type":0},{"idA":9,"idB":21,"type":0},{"idA":9,"idB":23,"type":0},{"idA":9,"idB":24,"type":0},{"idA":9,"idB":25,"type":0},{"idA":9,"idB":26,"type":0},{"idA":9,"idB":27,"type":0},{"idA":9,"idB":28,"type":0},{"idA":9,"idB":29,"type":0},{"idA":9,"idB":30,"type":0},{"idA":9,"idB":31,"type":0},{"idA":9,"idB":32,"type":0},{"idA":9,"idB":33,"type":0},{"idA":9,"idB":34,"type":0},{"idA":9,"idB":35,"type":0},{"idA":9,"idB":36,"type":0},{"idA":9,"idB":37,"type":0},{"idA":9,"idB":38,"type":0},{"idA":9,"idB":39,"type":0},{"idA":9,"idB":40,"type":0},{"idA":9,"idB":41,"type":0},{"idA":9,"idB":43,"type":0},{"idA":9,"idB":44,"type":0},{"idA":9,"idB":45,"type":0},{"idA":9,"idB":46,"type":0},{"idA":10,"idB":11,"type":0},{"idA":10,"idB":12,"type":0},{"idA":10,"idB":13,"type":0},{"idA":10,"idB":14,"type":0},{"idA":10,"idB":15,"type":0},{"idA":10,"idB":16,"type":0},{"idA":10,"idB":17,"type":0},{"idA":10,"idB":18,"type":0},{"idA":10,"idB":19,"type":0},{"idA":10,"idB":20,"type":0},{"idA":10,"idB":21,"type":0},{"idA":10,"idB":23,"type":0},{"idA":10,"idB":24,"type":0},{"idA":10,"idB":25,"type":0},{"idA":10,"idB":26,"type":0},{"idA":10,"idB":27,"type":0},{"idA":10,"idB":28,"type":0},{"idA":10,"idB":29,"type":0},{"idA":10,"idB":30,"type":0},{"idA":10,"idB":31,"type":0},{"idA":10,"idB":32,"type":0},{"idA":10,"idB":33,"type":0},{"idA":10,"idB":34,"type":0},{"idA":10,"idB":35,"type":0},{"idA":10,"idB":36,"type":0},{"idA":10,"idB":37,"type":0},{"idA":10,"idB":38,"type":0},{"idA":10,"idB":39,"type":0},{"idA":10,"idB":40,"type":0},{"idA":10,"idB":41,"type":0},{"idA":10,"idB":43,"type":0},{"idA":10,"idB":44,"type":0},{"idA":10,"idB":45,"type":0},{"idA":10,"idB":46,"type":0},{"idA":11,"idB":12,"type":0},{"idA":11,"idB":13,"type":0},{"idA":11,"idB":14,"type":0},{"idA":11,"idB":15,"type":0},{"idA":11,"idB":16,"type":0},{"idA":11,"idB":17,"type":0},{"idA":11,"idB":18,"type":0},{"idA":11,"idB":19,"type":0},{"idA":11,"idB":20,"type":0},{"idA":11,"idB":21,"type":0},{"idA":11,"idB":23,"type":0},{"idA":11,"idB":24,"type":0},{"idA":11,"idB":25,"type":0},{"idA":11,"idB":26,"type":0},{"idA":11,"idB":27,"type":0},{"idA":11,"idB":28,"type":0},{"idA":11,"idB":29,"type":0},{"idA":11,"idB":30,"type":0},{"idA":11,"idB":31,"type":0},{"idA":11,"idB":32,"type":0},{"idA":11,"idB":33,"type":0},{"idA":11,"idB":34,"type":0},{"idA":11,"idB":35,"type":0},{"idA":11,"idB":36,"type":0},{"idA":11,"idB":37,"type":0},{"idA":11,"idB":38,"type":0},{"idA":11,"idB":39,"type":0},{"idA":11,"idB":40,"type":0},{"idA":11,"idB":41,"type":0},{"idA":11,"idB":43,"type":0},{"idA":11,"idB":44,"type":0},{"idA":11,"idB":45,"type":0},{"idA":11,"idB":46,"type":0},{"idA":12,"idB":13,"type":0},{"idA":12,"idB":14,"type":0},{"idA":12,"idB":15,"type":0},{"idA":12,"idB":16,"type":0},{"idA":12,"idB":17,"type":0},{"idA":12,"idB":18,"type":0},{"idA":12,"idB":19,"type":0},{"idA":12,"idB":20,"type":0},{"idA":12,"idB":21,"type":0},{"idA":12,"idB":23,"type":0},{"idA":12,"idB":24,"type":0},{"idA":12,"idB":25,"type":0},{"idA":12,"idB":26,"type":0},{"idA":12,"idB":27,"type":0},{"idA":12,"idB":28,"type":0},{"idA":12,"idB":29,"type":0},{"idA":12,"idB":30,"type":0},{"idA":12,"idB":31,"type":0},{"idA":12,"idB":32,"type":0},{"idA":12,"idB":33,"type":0},{"idA":12,"idB":34,"type":0},{"idA":12,"idB":35,"type":0},{"idA":12,"idB":36,"type":0},{"idA":12,"idB":37,"type":0},{"idA":12,"idB":38,"type":0},{"idA":12,"idB":39,"type":0},{"idA":12,"idB":40,"type":0},{"idA":12,"idB":41,"type":0},{"idA":12,"idB":43,"type":0},{"idA":12,"idB":44,"type":0},{"idA":12,"idB":45,"type":0},{"idA":12,"idB":46,"type":0},{"idA":13,"idB":14,"type":0},{"idA":13,"idB":15,"type":0},{"idA":13,"idB":16,"type":0},{"idA":13,"idB":17,"type":0},{"idA":13,"idB":18,"type":0},{"idA":13,"idB":19,"type":0},{"idA":13,"idB":20,"type":0},{"idA":13,"idB":21,"type":0},{"idA":13,"idB":23,"type":0},{"idA":13,"idB":24,"type":0},{"idA":13,"idB":25,"type":0},{"idA":13,"idB":26,"type":0},{"idA":13,"idB":27,"type":0},{"idA":13,"idB":28,"type":0},{"idA":13,"idB":29,"type":0},{"idA":13,"idB":30,"type":0},{"idA":13,"idB":31,"type":0},{"idA":13,"idB":32,"type":0},{"idA":13,"idB":33,"type":0},{"idA":13,"idB":34,"type":0},{"idA":13,"idB":35,"type":0},{"idA":13,"idB":36,"type":0},{"idA":13,"idB":37,"type":0},{"idA":13,"idB":38,"type":0},{"idA":13,"idB":39,"type":0},{"idA":13,"idB":40,"type":0},{"idA":13,"idB":41,"type":0},{"idA":13,"idB":43,"type":0},{"idA":13,"idB":44,"type":0},{"idA":13,"idB":45,"type":0},{"idA":13,"idB":46,"type":0},{"idA":14,"idB":15,"type":0},{"idA":14,"idB":16,"type":0},{"idA":14,"idB":17,"type":0},{"idA":14,"idB":18,"type":0},{"idA":14,"idB":19,"type":0},{"idA":14,"idB":20,"type":0},{"idA":14,"idB":21,"type":0},{"idA":14,"idB":23,"type":0},{"idA":14,"idB":24,"type":0},{"idA":14,"idB":25,"type":0},{"idA":14,"idB":26,"type":0},{"idA":14,"idB":27,"type":0},{"idA":14,"idB":28,"type":0},{"idA":14,"idB":29,"type":0},{"idA":14,"idB":30,"type":0},{"idA":14,"idB":31,"type":0},{"idA":14,"idB":32,"type":0},{"idA":14,"idB":33,"type":0},{"idA":14,"idB":34,"type":0},{"idA":14,"idB":35,"type":0},{"idA":14,"idB":36,"type":0},{"idA":14,"idB":37,"type":0},{"idA":14,"idB":38,"type":0},{"idA":14,"idB":39,"type":0},{"idA":14,"idB":40,"type":0},{"idA":14,"idB":41,"type":0},{"idA":14,"idB":43,"type":0},{"idA":14,"idB":44,"type":0},{"idA":14,"idB":45,"type":0},{"idA":14,"idB":46,"type":0},{"idA":15,"idB":16,"type":0},{"idA":15,"idB":17,"type":0},{"idA":15,"idB":18,"type":0},{"idA":15,"idB":19,"type":0},{"idA":15,"idB":20,"type":0},{"idA":15,"idB":21,"type":0},{"idA":15,"idB":23,"type":0},{"idA":15,"idB":24,"type":0},{"idA":15,"idB":25,"type":0},{"idA":15,"idB":26,"type":0},{"idA":15,"idB":27,"type":0},{"idA":15,"idB":28,"type":0},{"idA":15,"idB":29,"type":0},{"idA":15,"idB":30,"type":0},{"idA":15,"idB":31,"type":0},{"idA":15,"idB":32,"type":0},{"idA":15,"idB":33,"type":0},{"idA":15,"idB":34,"type":0},{"idA":15,"idB":35,"type":0},{"idA":15,"idB":36,"type":0},{"idA":15,"idB":37,"type":0},{"idA":15,"idB":38,"type":0},{"idA":15,"idB":39,"type":0},{"idA":15,"idB":40,"type":0},{"idA":15,"idB":41,"type":0},{"idA":15,"idB":43,"type":0},{"idA":15,"idB":44,"type":0},{"idA":15,"idB":45,"type":0},{"idA":15,"idB":46,"type":0},{"idA":16,"idB":17,"type":0},{"idA":16,"idB":18,"type":0},{"idA":16,"idB":19,"type":0},{"idA":16,"idB":20,"type":0},{"idA":16,"idB":21,"type":0},{"idA":16,"idB":23,"type":0},{"idA":16,"idB":24,"type":0},{"idA":16,"idB":25,"type":0},{"idA":16,"idB":26,"type":0},{"idA":16,"idB":27,"type":0},{"idA":16,"idB":28,"type":0},{"idA":16,"idB":29,"type":0},{"idA":16,"idB":30,"type":0},{"idA":16,"idB":31,"type":0},{"idA":16,"idB":32,"type":0},{"idA":16,"idB":33,"type":0},{"idA":16,"idB":34,"type":0},{"idA":16,"idB":35,"type":0},{"idA":16,"idB":36,"type":0},{"idA":16,"idB":37,"type":0},{"idA":16,"idB":38,"type":0},{"idA":16,"idB":39,"type":0},{"idA":16,"idB":40,"type":0},{"idA":16,"idB":41,"type":0},{"idA":16,"idB":43,"type":0},{"idA":16,"idB":44,"type":0},{"idA":16,"idB":45,"type":0},{"idA":16,"idB":46,"type":0},{"idA":17,"idB":18,"type":0},{"idA":17,"idB":19,"type":0},{"idA":17,"idB":20,"type":0},{"idA":17,"idB":21,"type":0},{"idA":17,"idB":23,"type":0},{"idA":17,"idB":24,"type":0},{"idA":17,"idB":25,"type":0},{"idA":17,"idB":26,"type":0},{"idA":17,"idB":27,"type":0},{"idA":17,"idB":28,"type":0},{"idA":17,"idB":29,"type":0},{"idA":17,"idB":30,"type":0},{"idA":17,"idB":31,"type":0},{"idA":17,"idB":32,"type":0},{"idA":17,"idB":33,"type":0},{"idA":17,"idB":34,"type":0},{"idA":17,"idB":35,"type":0},{"idA":17,"idB":36,"type":0},{"idA":17,"idB":37,"type":0},{"idA":17,"idB":38,"type":0},{"idA":17,"idB":39,"type":0},{"idA":17,"idB":40,"type":0},{"idA":17,"idB":41,"type":0},{"idA":17,"idB":43,"type":0},{"idA":17,"idB":44,"type":0},{"idA":17,"idB":45,"type":0},{"idA":17,"idB":46,"type":0},{"idA":18,"idB":19,"type":0},{"idA":18,"idB":20,"type":0},{"idA":18,"idB":21,"type":0},{"idA":18,"idB":23,"type":0},{"idA":18,"idB":24,"type":0},{"idA":18,"idB":25,"type":0},{"idA":18,"idB":26,"type":0},{"idA":18,"idB":27,"type":0},{"idA":18,"idB":28,"type":0},{"idA":18,"idB":29,"type":0},{"idA":18,"idB":30,"type":0},{"idA":18,"idB":31,"type":0},{"idA":18,"idB":32,"type":0},{"idA":18,"idB":33,"type":0},{"idA":18,"idB":34,"type":0},{"idA":18,"idB":35,"type":0},{"idA":18,"idB":36,"type":0},{"idA":18,"idB":37,"type":0},{"idA":18,"idB":38,"type":0},{"idA":18,"idB":39,"type":0},{"idA":18,"idB":40,"type":0},{"idA":18,"idB":41,"type":0},{"idA":18,"idB":43,"type":0},{"idA":18,"idB":44,"type":0},{"idA":18,"idB":45,"type":0},{"idA":18,"idB":46,"type":0},{"idA":19,"idB":20,"type":0},{"idA":19,"idB":21,"type":0},{"idA":19,"idB":23,"type":0},{"idA":19,"idB":24,"type":0},{"idA":19,"idB":25,"type":0},{"idA":19,"idB":26,"type":0},{"idA":19,"idB":27,"type":0},{"idA":19,"idB":28,"type":0},{"idA":19,"idB":29,"type":0},{"idA":19,"idB":30,"type":0},{"idA":19,"idB":31,"type":0},{"idA":19,"idB":32,"type":0},{"idA":19,"idB":33,"type":0},{"idA":19,"idB":34,"type":0},{"idA":19,"idB":35,"type":0},{"idA":19,"idB":36,"type":0},{"idA":19,"idB":37,"type":0},{"idA":19,"idB":38,"type":0},{"idA":19,"idB":39,"type":0},{"idA":19,"idB":40,"type":0},{"idA":19,"idB":41,"type":0},{"idA":19,"idB":43,"type":0},{"idA":19,"idB":44,"type":0},{"idA":19,"idB":45,"type":0},{"idA":19,"idB":46,"type":0},{"idA":20,"idB":21,"type":0},{"idA":20,"idB":23,"type":0},{"idA":20,"idB":24,"type":0},{"idA":20,"idB":25,"type":0},{"idA":20,"idB":26,"type":0},{"idA":20,"idB":27,"type":0},{"idA":20,"idB":28,"type":0},{"idA":20,"idB":29,"type":0},{"idA":20,"idB":30,"type":0},{"idA":20,"idB":31,"type":0},{"idA":20,"idB":32,"type":0},{"idA":20,"idB":33,"type":0},{"idA":20,"idB":34,"type":0},{"idA":20,"idB":35,"type":0},{"idA":20,"idB":36,"type":0},{"idA":20,"idB":37,"type":0},{"idA":20,"idB":38,"type":0},{"idA":20,"idB":39,"type":0},{"idA":20,"idB":40,"type":0},{"idA":20,"idB":41,"type":0},{"idA":20,"idB":43,"type":0},{"idA":20,"idB":44,"type":0},{"idA":20,"idB":45,"type":0},{"idA":20,"idB":46,"type":0},{"idA":21,"idB":23,"type":0},{"idA":21,"idB":24,"type":0},{"idA":21,"idB":25,"type":0},{"idA":21,"idB":26,"type":0},{"idA":21,"idB":27,"type":0},{"idA":21,"idB":28,"type":0},{"idA":21,"idB":29,"type":0},{"idA":21,"idB":30,"type":0},{"idA":21,"idB":31,"type":0},{"idA":21,"idB":32,"type":0},{"idA":21,"idB":33,"type":0},{"idA":21,"idB":34,"type":0},{"idA":21,"idB":35,"type":0},{"idA":21,"idB":36,"type":0},{"idA":21,"idB":37,"type":0},{"idA":21,"idB":38,"type":0},{"idA":21,"idB":39,"type":0},{"idA":21,"idB":40,"type":0},{"idA":21,"idB":41,"type":0},{"idA":21,"idB":43,"type":0},{"idA":21,"idB":44,"type":0},{"idA":21,"idB":45,"type":0},{"idA":21,"idB":46,"type":0},{"idA":23,"idB":24,"type":0},{"idA":23,"idB":25,"type":0},{"idA":23,"idB":26,"type":0},{"idA":23,"idB":27,"type":0},{"idA":23,"idB":28,"type":0},{"idA":23,"idB":29,"type":0},{"idA":23,"idB":30,"type":0},{"idA":23,"idB":31,"type":0},{"idA":23,"idB":32,"type":0},{"idA":23,"idB":33,"type":0},{"idA":23,"idB":34,"type":0},{"idA":23,"idB":35,"type":0},{"idA":23,"idB":36,"type":0},{"idA":23,"idB":37,"type":0},{"idA":23,"idB":38,"type":0},{"idA":23,"idB":39,"type":0},{"idA":23,"idB":40,"type":0},{"idA":23,"idB":41,"type":0},{"idA":23,"idB":43,"type":0},{"idA":23,"idB":44,"type":0},{"idA":23,"idB":45,"type":0},{"idA":23,"idB":46,"type":0},{"idA":24,"idB":25,"type":0},{"idA":24,"idB":26,"type":0},{"idA":24,"idB":27,"type":0},{"idA":24,"idB":28,"type":0},{"idA":24,"idB":29,"type":0},{"idA":24,"idB":30,"type":0},{"idA":24,"idB":31,"type":0},{"idA":24,"idB":32,"type":0},{"idA":24,"idB":33,"type":0},{"idA":24,"idB":34,"type":0},{"idA":24,"idB":35,"type":0},{"idA":24,"idB":36,"type":0},{"idA":24,"idB":37,"type":0},{"idA":24,"idB":38,"type":0},{"idA":24,"idB":39,"type":0},{"idA":24,"idB":40,"type":0},{"idA":24,"idB":41,"type":0},{"idA":24,"idB":43,"type":0},{"idA":24,"idB":44,"type":0},{"idA":24,"idB":45,"type":0},{"idA":24,"idB":46,"type":0},{"idA":25,"idB":26,"type":0},{"idA":25,"idB":27,"type":0},{"idA":25,"idB":28,"type":0},{"idA":25,"idB":29,"type":0},{"idA":25,"idB":30,"type":0},{"idA":25,"idB":31,"type":0},{"idA":25,"idB":32,"type":0},{"idA":25,"idB":33,"type":0},{"idA":25,"idB":34,"type":0},{"idA":25,"idB":35,"type":0},{"idA":25,"idB":36,"type":0},{"idA":25,"idB":37,"type":0},{"idA":25,"idB":38,"type":0},{"idA":25,"idB":39,"type":0},{"idA":25,"idB":40,"type":0},{"idA":25,"idB":41,"type":0},{"idA":25,"idB":43,"type":0},{"idA":25,"idB":44,"type":0},{"idA":25,"idB":45,"type":0},{"idA":25,"idB":46,"type":0},{"idA":26,"idB":27,"type":0},{"idA":26,"idB":28,"type":0},{"idA":26,"idB":29,"type":0},{"idA":26,"idB":30,"type":0},{"idA":26,"idB":31,"type":0},{"idA":26,"idB":32,"type":0},{"idA":26,"idB":33,"type":0},{"idA":26,"idB":34,"type":0},{"idA":26,"idB":35,"type":0},{"idA":26,"idB":36,"type":0},{"idA":26,"idB":37,"type":0},{"idA":26,"idB":38,"type":0},{"idA":26,"idB":39,"type":0},{"idA":26,"idB":40,"type":0},{"idA":26,"idB":41,"type":0},{"idA":26,"idB":43,"type":0},{"idA":26,"idB":44,"type":0},{"idA":26,"idB":45,"type":0},{"idA":26,"idB":46,"type":0},{"idA":27,"idB":28,"type":0},{"idA":27,"idB":29,"type":0},{"idA":27,"idB":30,"type":0},{"idA":27,"idB":31,"type":0},{"idA":27,"idB":32,"type":0},{"idA":27,"idB":33,"type":0},{"idA":27,"idB":34,"type":0},{"idA":27,"idB":35,"type":0},{"idA":27,"idB":36,"type":0},{"idA":27,"idB":37,"type":0},{"idA":27,"idB":38,"type":0},{"idA":27,"idB":39,"type":0},{"idA":27,"idB":40,"type":0},{"idA":27,"idB":41,"type":0},{"idA":27,"idB":43,"type":0},{"idA":27,"idB":44,"type":0},{"idA":27,"idB":45,"type":0},{"idA":27,"idB":46,"type":0},{"idA":28,"idB":29,"type":0},{"idA":28,"idB":30,"type":0},{"idA":28,"idB":31,"type":0},{"idA":28,"idB":32,"type":0},{"idA":28,"idB":33,"type":0},{"idA":28,"idB":34,"type":0},{"idA":28,"idB":35,"type":0},{"idA":28,"idB":36,"type":0},{"idA":28,"idB":37,"type":0},{"idA":28,"idB":38,"type":0},{"idA":28,"idB":39,"type":0},{"idA":28,"idB":40,"type":0},{"idA":28,"idB":41,"type":0},{"idA":28,"idB":43,"type":0},{"idA":28,"idB":44,"type":0},{"idA":28,"idB":45,"type":0},{"idA":28,"idB":46,"type":0},{"idA":29,"idB":30,"type":0},{"idA":29,"idB":31,"type":0},{"idA":29,"idB":32,"type":0},{"idA":29,"idB":33,"type":0},{"idA":29,"idB":34,"type":0},{"idA":29,"idB":35,"type":0},{"idA":29,"idB":36,"type":0},{"idA":29,"idB":37,"type":0},{"idA":29,"idB":38,"type":0},{"idA":29,"idB":39,"type":0},{"idA":29,"idB":40,"type":0},{"idA":29,"idB":41,"type":0},{"idA":29,"idB":43,"type":0},{"idA":29,"idB":44,"type":0},{"idA":29,"idB":45,"type":0},{"idA":29,"idB":46,"type":0},{"idA":30,"idB":31,"type":0},{"idA":30,"idB":32,"type":0},{"idA":30,"idB":33,"type":0},{"idA":30,"idB":34,"type":0},{"idA":30,"idB":35,"type":0},{"idA":30,"idB":36,"type":0},{"idA":30,"idB":37,"type":0},{"idA":30,"idB":38,"type":0},{"idA":30,"idB":39,"type":0},{"idA":30,"idB":40,"type":0},{"idA":30,"idB":41,"type":0},{"idA":30,"idB":43,"type":0},{"idA":30,"idB":44,"type":0},{"idA":30,"idB":45,"type":0},{"idA":30,"idB":46,"type":0},{"idA":31,"idB":32,"type":0},{"idA":31,"idB":33,"type":0},{"idA":31,"idB":34,"type":0},{"idA":31,"idB":35,"type":0},{"idA":31,"idB":36,"type":0},{"idA":31,"idB":37,"type":0},{"idA":31,"idB":38,"type":0},{"idA":31,"idB":39,"type":0},{"idA":31,"idB":40,"type":0},{"idA":31,"idB":41,"type":0},{"idA":31,"idB":43,"type":0},{"idA":31,"idB":44,"type":0},{"idA":31,"idB":45,"type":0},{"idA":31,"idB":46,"type":0},{"idA":32,"idB":33,"type":0},{"idA":32,"idB":34,"type":0},{"idA":32,"idB":35,"type":0},{"idA":32,"idB":36,"type":0},{"idA":32,"idB":37,"type":0},{"idA":32,"idB":38,"type":0},{"idA":32,"idB":39,"type":0},{"idA":32,"idB":40,"type":0},{"idA":32,"idB":41,"type":0},{"idA":32,"idB":43,"type":0},{"idA":32,"idB":44,"type":0},{"idA":32,"idB":45,"type":0},{"idA":32,"idB":46,"type":0},{"idA":33,"idB":34,"type":0},{"idA":33,"idB":35,"type":0},{"idA":33,"idB":36,"type":0},{"idA":33,"idB":37,"type":0},{"idA":33,"idB":38,"type":1},{"idA":33,"idB":39,"type":1},{"idA":33,"idB":40,"type":0},{"idA":33,"idB":41,"type":0},{"idA":33,"idB":43,"type":0},{"idA":33,"idB":44,"type":0},{"idA":33,"idB":45,"type":0},{"idA":33,"idB":46,"type":0},{"idA":34,"idB":35,"type":0},{"idA":34,"idB":36,"type":1},{"idA":34,"idB":37,"type":0},{"idA":34,"idB":38,"type":0},{"idA":34,"idB":39,"type":0},{"idA":34,"idB":40,"type":0},{"idA":34,"idB":41,"type":0},{"idA":34,"idB":43,"type":0},{"idA":34,"idB":44,"type":0},{"idA":34,"idB":45,"type":0},{"idA":34,"idB":46,"type":0},{"idA":35,"idB":36,"type":1},{"idA":35,"idB":37,"type":0},{"idA":35,"idB":38,"type":0},{"idA":35,"idB":39,"type":0},{"idA":35,"idB":40,"type":1},{"idA":35,"idB":41,"type":0},{"idA":35,"idB":43,"type":0},{"idA":35,"idB":44,"type":0},{"idA":35,"idB":45,"type":0},{"idA":35,"idB":46,"type":0},{"idA":36,"idB":37,"type":0},{"idA":36,"idB":38,"type":0},{"idA":36,"idB":39,"type":0},{"idA":36,"idB":40,"type":0},{"idA":36,"idB":41,"type":0},{"idA":36,"idB":43,"type":0},{"idA":36,"idB":44,"type":0},{"idA":36,"idB":45,"type":0},{"idA":36,"idB":46,"type":0},{"idA":37,"idB":38,"type":0},{"idA":37,"idB":39,"type":1},{"idA":37,"idB":40,"type":0},{"idA":37,"idB":41,"type":0},{"idA":37,"idB":43,"type":0},{"idA":37,"idB":44,"type":0},{"idA":37,"idB":45,"type":0},{"idA":37,"idB":46,"type":0},{"idA":38,"idB":39,"type":0},{"idA":38,"idB":40,"type":0},{"idA":38,"idB":41,"type":0},{"idA":38,"idB":43,"type":0},{"idA":38,"idB":44,"type":0},{"idA":38,"idB":45,"type":0},{"idA":38,"idB":46,"type":0},{"idA":39,"idB":40,"type":0},{"idA":39,"idB":41,"type":0},{"idA":39,"idB":43,"type":0},{"idA":39,"idB":44,"type":0},{"idA":39,"idB":45,"type":0},{"idA":39,"idB":46,"type":0},{"idA":40,"idB":41,"type":0},{"idA":40,"idB":43,"type":0},{"idA":40,"idB":44,"type":0},{"idA":40,"idB":45,"type":0},{"idA":40,"idB":46,"type":0},{"idA":41,"idB":43,"type":0},{"idA":41,"idB":44,"type":0},{"idA":41,"idB":45,"type":0},{"idA":41,"idB":46,"type":0},{"idA":43,"idB":44,"type":0},{"idA":43,"idB":45,"type":0},{"idA":43,"idB":46,"type":0},{"idA":44,"idB":45,"type":0},{"idA":44,"idB":46,"type":0},{"idA":45,"idB":46,"type":0}]} +{"subject":{"id":1,"name":"Sujet 1","creation":1480074746,"surveys":["facebook"],"renew":null,"coords":"blablobli"},"contacts":[554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,595,596,597,598],"relations":[{"idA":1,"idB":554,"type":6},{"idA":1,"idB":555,"type":6},{"idA":1,"idB":556,"type":6},{"idA":1,"idB":557,"type":6},{"idA":1,"idB":558,"type":6},{"idA":1,"idB":559,"type":6},{"idA":1,"idB":560,"type":6},{"idA":1,"idB":561,"type":6},{"idA":1,"idB":562,"type":6},{"idA":1,"idB":563,"type":6},{"idA":1,"idB":564,"type":6},{"idA":1,"idB":565,"type":6},{"idA":1,"idB":566,"type":6},{"idA":1,"idB":567,"type":6},{"idA":1,"idB":568,"type":6},{"idA":1,"idB":569,"type":6},{"idA":1,"idB":570,"type":6},{"idA":1,"idB":571,"type":6},{"idA":1,"idB":572,"type":6},{"idA":1,"idB":573,"type":6},{"idA":1,"idB":575,"type":7},{"idA":1,"idB":576,"type":7},{"idA":1,"idB":577,"type":7},{"idA":1,"idB":578,"type":7},{"idA":1,"idB":579,"type":7},{"idA":1,"idB":580,"type":7},{"idA":1,"idB":581,"type":7},{"idA":1,"idB":582,"type":7},{"idA":1,"idB":583,"type":7},{"idA":1,"idB":584,"type":7},{"idA":1,"idB":585,"type":7},{"idA":1,"idB":586,"type":7},{"idA":1,"idB":587,"type":7},{"idA":1,"idB":588,"type":7},{"idA":1,"idB":589,"type":7},{"idA":1,"idB":590,"type":7},{"idA":1,"idB":591,"type":7},{"idA":1,"idB":592,"type":7},{"idA":1,"idB":593,"type":7},{"idA":1,"idB":595,"type":3},{"idA":1,"idB":596,"type":3},{"idA":1,"idB":597,"type":3},{"idA":1,"idB":598,"type":3},{"idA":554,"idB":555,"type":0},{"idA":554,"idB":556,"type":0},{"idA":554,"idB":557,"type":0},{"idA":554,"idB":558,"type":0},{"idA":554,"idB":559,"type":0},{"idA":554,"idB":560,"type":0},{"idA":554,"idB":561,"type":0},{"idA":554,"idB":562,"type":0},{"idA":554,"idB":563,"type":0},{"idA":554,"idB":564,"type":0},{"idA":554,"idB":565,"type":0},{"idA":554,"idB":566,"type":0},{"idA":554,"idB":567,"type":0},{"idA":554,"idB":568,"type":0},{"idA":554,"idB":569,"type":0},{"idA":554,"idB":570,"type":0},{"idA":554,"idB":571,"type":0},{"idA":554,"idB":572,"type":0},{"idA":554,"idB":573,"type":0},{"idA":554,"idB":575,"type":0},{"idA":554,"idB":576,"type":0},{"idA":554,"idB":577,"type":0},{"idA":554,"idB":578,"type":0},{"idA":554,"idB":579,"type":0},{"idA":554,"idB":580,"type":0},{"idA":554,"idB":581,"type":0},{"idA":554,"idB":582,"type":0},{"idA":554,"idB":583,"type":0},{"idA":554,"idB":584,"type":0},{"idA":554,"idB":585,"type":0},{"idA":554,"idB":586,"type":0},{"idA":554,"idB":587,"type":0},{"idA":554,"idB":588,"type":0},{"idA":554,"idB":589,"type":0},{"idA":554,"idB":590,"type":0},{"idA":554,"idB":591,"type":0},{"idA":554,"idB":592,"type":0},{"idA":554,"idB":593,"type":0},{"idA":554,"idB":595,"type":0},{"idA":554,"idB":596,"type":0},{"idA":554,"idB":597,"type":0},{"idA":554,"idB":598,"type":0},{"idA":555,"idB":556,"type":0},{"idA":555,"idB":557,"type":0},{"idA":555,"idB":558,"type":0},{"idA":555,"idB":559,"type":0},{"idA":555,"idB":560,"type":0},{"idA":555,"idB":561,"type":0},{"idA":555,"idB":562,"type":0},{"idA":555,"idB":563,"type":0},{"idA":555,"idB":564,"type":0},{"idA":555,"idB":565,"type":0},{"idA":555,"idB":566,"type":0},{"idA":555,"idB":567,"type":0},{"idA":555,"idB":568,"type":0},{"idA":555,"idB":569,"type":0},{"idA":555,"idB":570,"type":0},{"idA":555,"idB":571,"type":0},{"idA":555,"idB":572,"type":0},{"idA":555,"idB":573,"type":0},{"idA":555,"idB":575,"type":0},{"idA":555,"idB":576,"type":0},{"idA":555,"idB":577,"type":0},{"idA":555,"idB":578,"type":0},{"idA":555,"idB":579,"type":0},{"idA":555,"idB":580,"type":0},{"idA":555,"idB":581,"type":0},{"idA":555,"idB":582,"type":0},{"idA":555,"idB":583,"type":0},{"idA":555,"idB":584,"type":0},{"idA":555,"idB":585,"type":0},{"idA":555,"idB":586,"type":0},{"idA":555,"idB":587,"type":0},{"idA":555,"idB":588,"type":0},{"idA":555,"idB":589,"type":0},{"idA":555,"idB":590,"type":0},{"idA":555,"idB":591,"type":0},{"idA":555,"idB":592,"type":0},{"idA":555,"idB":593,"type":0},{"idA":555,"idB":595,"type":0},{"idA":555,"idB":596,"type":0},{"idA":555,"idB":597,"type":0},{"idA":555,"idB":598,"type":0},{"idA":556,"idB":557,"type":0},{"idA":556,"idB":558,"type":0},{"idA":556,"idB":559,"type":0},{"idA":556,"idB":560,"type":0},{"idA":556,"idB":561,"type":0},{"idA":556,"idB":562,"type":0},{"idA":556,"idB":563,"type":0},{"idA":556,"idB":564,"type":0},{"idA":556,"idB":565,"type":0},{"idA":556,"idB":566,"type":0},{"idA":556,"idB":567,"type":0},{"idA":556,"idB":568,"type":0},{"idA":556,"idB":569,"type":0},{"idA":556,"idB":570,"type":0},{"idA":556,"idB":571,"type":0},{"idA":556,"idB":572,"type":0},{"idA":556,"idB":573,"type":0},{"idA":556,"idB":575,"type":0},{"idA":556,"idB":576,"type":0},{"idA":556,"idB":577,"type":0},{"idA":556,"idB":578,"type":0},{"idA":556,"idB":579,"type":0},{"idA":556,"idB":580,"type":0},{"idA":556,"idB":581,"type":0},{"idA":556,"idB":582,"type":0},{"idA":556,"idB":583,"type":0},{"idA":556,"idB":584,"type":0},{"idA":556,"idB":585,"type":0},{"idA":556,"idB":586,"type":0},{"idA":556,"idB":587,"type":0},{"idA":556,"idB":588,"type":0},{"idA":556,"idB":589,"type":0},{"idA":556,"idB":590,"type":0},{"idA":556,"idB":591,"type":0},{"idA":556,"idB":592,"type":0},{"idA":556,"idB":593,"type":0},{"idA":556,"idB":595,"type":0},{"idA":556,"idB":596,"type":0},{"idA":556,"idB":597,"type":0},{"idA":556,"idB":598,"type":0},{"idA":557,"idB":558,"type":0},{"idA":557,"idB":559,"type":0},{"idA":557,"idB":560,"type":0},{"idA":557,"idB":561,"type":0},{"idA":557,"idB":562,"type":0},{"idA":557,"idB":563,"type":0},{"idA":557,"idB":564,"type":0},{"idA":557,"idB":565,"type":0},{"idA":557,"idB":566,"type":0},{"idA":557,"idB":567,"type":0},{"idA":557,"idB":568,"type":0},{"idA":557,"idB":569,"type":0},{"idA":557,"idB":570,"type":0},{"idA":557,"idB":571,"type":0},{"idA":557,"idB":572,"type":0},{"idA":557,"idB":573,"type":0},{"idA":557,"idB":575,"type":0},{"idA":557,"idB":576,"type":0},{"idA":557,"idB":577,"type":0},{"idA":557,"idB":578,"type":0},{"idA":557,"idB":579,"type":0},{"idA":557,"idB":580,"type":0},{"idA":557,"idB":581,"type":0},{"idA":557,"idB":582,"type":0},{"idA":557,"idB":583,"type":0},{"idA":557,"idB":584,"type":0},{"idA":557,"idB":585,"type":0},{"idA":557,"idB":586,"type":0},{"idA":557,"idB":587,"type":0},{"idA":557,"idB":588,"type":0},{"idA":557,"idB":589,"type":0},{"idA":557,"idB":590,"type":0},{"idA":557,"idB":591,"type":0},{"idA":557,"idB":592,"type":0},{"idA":557,"idB":593,"type":0},{"idA":557,"idB":595,"type":0},{"idA":557,"idB":596,"type":0},{"idA":557,"idB":597,"type":0},{"idA":557,"idB":598,"type":0},{"idA":558,"idB":559,"type":0},{"idA":558,"idB":560,"type":0},{"idA":558,"idB":561,"type":0},{"idA":558,"idB":562,"type":0},{"idA":558,"idB":563,"type":0},{"idA":558,"idB":564,"type":0},{"idA":558,"idB":565,"type":0},{"idA":558,"idB":566,"type":0},{"idA":558,"idB":567,"type":0},{"idA":558,"idB":568,"type":0},{"idA":558,"idB":569,"type":0},{"idA":558,"idB":570,"type":0},{"idA":558,"idB":571,"type":0},{"idA":558,"idB":572,"type":0},{"idA":558,"idB":573,"type":0},{"idA":558,"idB":575,"type":0},{"idA":558,"idB":576,"type":0},{"idA":558,"idB":577,"type":0},{"idA":558,"idB":578,"type":0},{"idA":558,"idB":579,"type":0},{"idA":558,"idB":580,"type":0},{"idA":558,"idB":581,"type":0},{"idA":558,"idB":582,"type":0},{"idA":558,"idB":583,"type":0},{"idA":558,"idB":584,"type":0},{"idA":558,"idB":585,"type":0},{"idA":558,"idB":586,"type":0},{"idA":558,"idB":587,"type":0},{"idA":558,"idB":588,"type":0},{"idA":558,"idB":589,"type":0},{"idA":558,"idB":590,"type":0},{"idA":558,"idB":591,"type":0},{"idA":558,"idB":592,"type":0},{"idA":558,"idB":593,"type":0},{"idA":558,"idB":595,"type":0},{"idA":558,"idB":596,"type":0},{"idA":558,"idB":597,"type":0},{"idA":558,"idB":598,"type":0},{"idA":559,"idB":560,"type":0},{"idA":559,"idB":561,"type":0},{"idA":559,"idB":562,"type":0},{"idA":559,"idB":563,"type":0},{"idA":559,"idB":564,"type":0},{"idA":559,"idB":565,"type":0},{"idA":559,"idB":566,"type":0},{"idA":559,"idB":567,"type":0},{"idA":559,"idB":568,"type":0},{"idA":559,"idB":569,"type":0},{"idA":559,"idB":570,"type":0},{"idA":559,"idB":571,"type":0},{"idA":559,"idB":572,"type":0},{"idA":559,"idB":573,"type":0},{"idA":559,"idB":575,"type":0},{"idA":559,"idB":576,"type":0},{"idA":559,"idB":577,"type":0},{"idA":559,"idB":578,"type":0},{"idA":559,"idB":579,"type":0},{"idA":559,"idB":580,"type":0},{"idA":559,"idB":581,"type":0},{"idA":559,"idB":582,"type":0},{"idA":559,"idB":583,"type":0},{"idA":559,"idB":584,"type":0},{"idA":559,"idB":585,"type":0},{"idA":559,"idB":586,"type":0},{"idA":559,"idB":587,"type":0},{"idA":559,"idB":588,"type":0},{"idA":559,"idB":589,"type":0},{"idA":559,"idB":590,"type":0},{"idA":559,"idB":591,"type":0},{"idA":559,"idB":592,"type":0},{"idA":559,"idB":593,"type":0},{"idA":559,"idB":595,"type":0},{"idA":559,"idB":596,"type":0},{"idA":559,"idB":597,"type":0},{"idA":559,"idB":598,"type":0},{"idA":560,"idB":561,"type":0},{"idA":560,"idB":562,"type":0},{"idA":560,"idB":563,"type":0},{"idA":560,"idB":564,"type":0},{"idA":560,"idB":565,"type":0},{"idA":560,"idB":566,"type":0},{"idA":560,"idB":567,"type":0},{"idA":560,"idB":568,"type":0},{"idA":560,"idB":569,"type":0},{"idA":560,"idB":570,"type":0},{"idA":560,"idB":571,"type":0},{"idA":560,"idB":572,"type":0},{"idA":560,"idB":573,"type":0},{"idA":560,"idB":575,"type":0},{"idA":560,"idB":576,"type":0},{"idA":560,"idB":577,"type":0},{"idA":560,"idB":578,"type":0},{"idA":560,"idB":579,"type":0},{"idA":560,"idB":580,"type":0},{"idA":560,"idB":581,"type":0},{"idA":560,"idB":582,"type":0},{"idA":560,"idB":583,"type":0},{"idA":560,"idB":584,"type":0},{"idA":560,"idB":585,"type":0},{"idA":560,"idB":586,"type":0},{"idA":560,"idB":587,"type":0},{"idA":560,"idB":588,"type":0},{"idA":560,"idB":589,"type":0},{"idA":560,"idB":590,"type":0},{"idA":560,"idB":591,"type":0},{"idA":560,"idB":592,"type":0},{"idA":560,"idB":593,"type":0},{"idA":560,"idB":595,"type":0},{"idA":560,"idB":596,"type":0},{"idA":560,"idB":597,"type":0},{"idA":560,"idB":598,"type":0},{"idA":561,"idB":562,"type":0},{"idA":561,"idB":563,"type":0},{"idA":561,"idB":564,"type":0},{"idA":561,"idB":565,"type":0},{"idA":561,"idB":566,"type":0},{"idA":561,"idB":567,"type":0},{"idA":561,"idB":568,"type":0},{"idA":561,"idB":569,"type":0},{"idA":561,"idB":570,"type":0},{"idA":561,"idB":571,"type":0},{"idA":561,"idB":572,"type":0},{"idA":561,"idB":573,"type":0},{"idA":561,"idB":575,"type":0},{"idA":561,"idB":576,"type":0},{"idA":561,"idB":577,"type":0},{"idA":561,"idB":578,"type":0},{"idA":561,"idB":579,"type":0},{"idA":561,"idB":580,"type":0},{"idA":561,"idB":581,"type":0},{"idA":561,"idB":582,"type":0},{"idA":561,"idB":583,"type":0},{"idA":561,"idB":584,"type":0},{"idA":561,"idB":585,"type":0},{"idA":561,"idB":586,"type":0},{"idA":561,"idB":587,"type":0},{"idA":561,"idB":588,"type":0},{"idA":561,"idB":589,"type":0},{"idA":561,"idB":590,"type":0},{"idA":561,"idB":591,"type":0},{"idA":561,"idB":592,"type":0},{"idA":561,"idB":593,"type":0},{"idA":561,"idB":595,"type":0},{"idA":561,"idB":596,"type":0},{"idA":561,"idB":597,"type":0},{"idA":561,"idB":598,"type":0},{"idA":562,"idB":563,"type":0},{"idA":562,"idB":564,"type":0},{"idA":562,"idB":565,"type":0},{"idA":562,"idB":566,"type":0},{"idA":562,"idB":567,"type":0},{"idA":562,"idB":568,"type":0},{"idA":562,"idB":569,"type":0},{"idA":562,"idB":570,"type":0},{"idA":562,"idB":571,"type":0},{"idA":562,"idB":572,"type":0},{"idA":562,"idB":573,"type":0},{"idA":562,"idB":575,"type":0},{"idA":562,"idB":576,"type":0},{"idA":562,"idB":577,"type":0},{"idA":562,"idB":578,"type":0},{"idA":562,"idB":579,"type":0},{"idA":562,"idB":580,"type":0},{"idA":562,"idB":581,"type":0},{"idA":562,"idB":582,"type":0},{"idA":562,"idB":583,"type":0},{"idA":562,"idB":584,"type":0},{"idA":562,"idB":585,"type":0},{"idA":562,"idB":586,"type":0},{"idA":562,"idB":587,"type":0},{"idA":562,"idB":588,"type":0},{"idA":562,"idB":589,"type":0},{"idA":562,"idB":590,"type":0},{"idA":562,"idB":591,"type":0},{"idA":562,"idB":592,"type":0},{"idA":562,"idB":593,"type":0},{"idA":562,"idB":595,"type":0},{"idA":562,"idB":596,"type":0},{"idA":562,"idB":597,"type":0},{"idA":562,"idB":598,"type":0},{"idA":563,"idB":564,"type":0},{"idA":563,"idB":565,"type":0},{"idA":563,"idB":566,"type":0},{"idA":563,"idB":567,"type":0},{"idA":563,"idB":568,"type":0},{"idA":563,"idB":569,"type":0},{"idA":563,"idB":570,"type":0},{"idA":563,"idB":571,"type":0},{"idA":563,"idB":572,"type":0},{"idA":563,"idB":573,"type":0},{"idA":563,"idB":575,"type":0},{"idA":563,"idB":576,"type":0},{"idA":563,"idB":577,"type":0},{"idA":563,"idB":578,"type":0},{"idA":563,"idB":579,"type":0},{"idA":563,"idB":580,"type":0},{"idA":563,"idB":581,"type":0},{"idA":563,"idB":582,"type":0},{"idA":563,"idB":583,"type":0},{"idA":563,"idB":584,"type":0},{"idA":563,"idB":585,"type":0},{"idA":563,"idB":586,"type":0},{"idA":563,"idB":587,"type":0},{"idA":563,"idB":588,"type":0},{"idA":563,"idB":589,"type":0},{"idA":563,"idB":590,"type":0},{"idA":563,"idB":591,"type":0},{"idA":563,"idB":592,"type":0},{"idA":563,"idB":593,"type":0},{"idA":563,"idB":595,"type":0},{"idA":563,"idB":596,"type":0},{"idA":563,"idB":597,"type":0},{"idA":563,"idB":598,"type":0},{"idA":564,"idB":565,"type":0},{"idA":564,"idB":566,"type":0},{"idA":564,"idB":567,"type":0},{"idA":564,"idB":568,"type":0},{"idA":564,"idB":569,"type":0},{"idA":564,"idB":570,"type":0},{"idA":564,"idB":571,"type":0},{"idA":564,"idB":572,"type":0},{"idA":564,"idB":573,"type":0},{"idA":564,"idB":575,"type":0},{"idA":564,"idB":576,"type":0},{"idA":564,"idB":577,"type":0},{"idA":564,"idB":578,"type":0},{"idA":564,"idB":579,"type":0},{"idA":564,"idB":580,"type":0},{"idA":564,"idB":581,"type":0},{"idA":564,"idB":582,"type":0},{"idA":564,"idB":583,"type":0},{"idA":564,"idB":584,"type":0},{"idA":564,"idB":585,"type":0},{"idA":564,"idB":586,"type":0},{"idA":564,"idB":587,"type":0},{"idA":564,"idB":588,"type":0},{"idA":564,"idB":589,"type":0},{"idA":564,"idB":590,"type":0},{"idA":564,"idB":591,"type":0},{"idA":564,"idB":592,"type":0},{"idA":564,"idB":593,"type":0},{"idA":564,"idB":595,"type":0},{"idA":564,"idB":596,"type":0},{"idA":564,"idB":597,"type":0},{"idA":564,"idB":598,"type":0},{"idA":565,"idB":566,"type":0},{"idA":565,"idB":567,"type":0},{"idA":565,"idB":568,"type":0},{"idA":565,"idB":569,"type":0},{"idA":565,"idB":570,"type":0},{"idA":565,"idB":571,"type":0},{"idA":565,"idB":572,"type":0},{"idA":565,"idB":573,"type":0},{"idA":565,"idB":575,"type":0},{"idA":565,"idB":576,"type":0},{"idA":565,"idB":577,"type":0},{"idA":565,"idB":578,"type":0},{"idA":565,"idB":579,"type":0},{"idA":565,"idB":580,"type":0},{"idA":565,"idB":581,"type":0},{"idA":565,"idB":582,"type":0},{"idA":565,"idB":583,"type":0},{"idA":565,"idB":584,"type":0},{"idA":565,"idB":585,"type":0},{"idA":565,"idB":586,"type":0},{"idA":565,"idB":587,"type":0},{"idA":565,"idB":588,"type":0},{"idA":565,"idB":589,"type":0},{"idA":565,"idB":590,"type":0},{"idA":565,"idB":591,"type":0},{"idA":565,"idB":592,"type":0},{"idA":565,"idB":593,"type":0},{"idA":565,"idB":595,"type":0},{"idA":565,"idB":596,"type":0},{"idA":565,"idB":597,"type":0},{"idA":565,"idB":598,"type":0},{"idA":566,"idB":567,"type":0},{"idA":566,"idB":568,"type":0},{"idA":566,"idB":569,"type":0},{"idA":566,"idB":570,"type":0},{"idA":566,"idB":571,"type":0},{"idA":566,"idB":572,"type":0},{"idA":566,"idB":573,"type":0},{"idA":566,"idB":575,"type":0},{"idA":566,"idB":576,"type":0},{"idA":566,"idB":577,"type":0},{"idA":566,"idB":578,"type":0},{"idA":566,"idB":579,"type":0},{"idA":566,"idB":580,"type":0},{"idA":566,"idB":581,"type":0},{"idA":566,"idB":582,"type":0},{"idA":566,"idB":583,"type":0},{"idA":566,"idB":584,"type":0},{"idA":566,"idB":585,"type":0},{"idA":566,"idB":586,"type":0},{"idA":566,"idB":587,"type":0},{"idA":566,"idB":588,"type":0},{"idA":566,"idB":589,"type":0},{"idA":566,"idB":590,"type":0},{"idA":566,"idB":591,"type":0},{"idA":566,"idB":592,"type":0},{"idA":566,"idB":593,"type":0},{"idA":566,"idB":595,"type":0},{"idA":566,"idB":596,"type":0},{"idA":566,"idB":597,"type":0},{"idA":566,"idB":598,"type":0},{"idA":567,"idB":568,"type":0},{"idA":567,"idB":569,"type":0},{"idA":567,"idB":570,"type":0},{"idA":567,"idB":571,"type":0},{"idA":567,"idB":572,"type":0},{"idA":567,"idB":573,"type":0},{"idA":567,"idB":575,"type":0},{"idA":567,"idB":576,"type":0},{"idA":567,"idB":577,"type":0},{"idA":567,"idB":578,"type":0},{"idA":567,"idB":579,"type":0},{"idA":567,"idB":580,"type":0},{"idA":567,"idB":581,"type":0},{"idA":567,"idB":582,"type":0},{"idA":567,"idB":583,"type":0},{"idA":567,"idB":584,"type":0},{"idA":567,"idB":585,"type":0},{"idA":567,"idB":586,"type":0},{"idA":567,"idB":587,"type":0},{"idA":567,"idB":588,"type":0},{"idA":567,"idB":589,"type":0},{"idA":567,"idB":590,"type":0},{"idA":567,"idB":591,"type":0},{"idA":567,"idB":592,"type":0},{"idA":567,"idB":593,"type":0},{"idA":567,"idB":595,"type":0},{"idA":567,"idB":596,"type":0},{"idA":567,"idB":597,"type":0},{"idA":567,"idB":598,"type":0},{"idA":568,"idB":569,"type":0},{"idA":568,"idB":570,"type":0},{"idA":568,"idB":571,"type":0},{"idA":568,"idB":572,"type":0},{"idA":568,"idB":573,"type":0},{"idA":568,"idB":575,"type":0},{"idA":568,"idB":576,"type":0},{"idA":568,"idB":577,"type":0},{"idA":568,"idB":578,"type":0},{"idA":568,"idB":579,"type":0},{"idA":568,"idB":580,"type":0},{"idA":568,"idB":581,"type":0},{"idA":568,"idB":582,"type":0},{"idA":568,"idB":583,"type":0},{"idA":568,"idB":584,"type":0},{"idA":568,"idB":585,"type":0},{"idA":568,"idB":586,"type":0},{"idA":568,"idB":587,"type":0},{"idA":568,"idB":588,"type":0},{"idA":568,"idB":589,"type":0},{"idA":568,"idB":590,"type":0},{"idA":568,"idB":591,"type":0},{"idA":568,"idB":592,"type":0},{"idA":568,"idB":593,"type":0},{"idA":568,"idB":595,"type":0},{"idA":568,"idB":596,"type":0},{"idA":568,"idB":597,"type":0},{"idA":568,"idB":598,"type":0},{"idA":569,"idB":570,"type":0},{"idA":569,"idB":571,"type":0},{"idA":569,"idB":572,"type":0},{"idA":569,"idB":573,"type":0},{"idA":569,"idB":575,"type":0},{"idA":569,"idB":576,"type":0},{"idA":569,"idB":577,"type":0},{"idA":569,"idB":578,"type":0},{"idA":569,"idB":579,"type":0},{"idA":569,"idB":580,"type":0},{"idA":569,"idB":581,"type":0},{"idA":569,"idB":582,"type":0},{"idA":569,"idB":583,"type":0},{"idA":569,"idB":584,"type":0},{"idA":569,"idB":585,"type":0},{"idA":569,"idB":586,"type":0},{"idA":569,"idB":587,"type":0},{"idA":569,"idB":588,"type":0},{"idA":569,"idB":589,"type":0},{"idA":569,"idB":590,"type":0},{"idA":569,"idB":591,"type":0},{"idA":569,"idB":592,"type":0},{"idA":569,"idB":593,"type":0},{"idA":569,"idB":595,"type":0},{"idA":569,"idB":596,"type":0},{"idA":569,"idB":597,"type":0},{"idA":569,"idB":598,"type":0},{"idA":570,"idB":571,"type":0},{"idA":570,"idB":572,"type":0},{"idA":570,"idB":573,"type":0},{"idA":570,"idB":575,"type":0},{"idA":570,"idB":576,"type":0},{"idA":570,"idB":577,"type":0},{"idA":570,"idB":578,"type":0},{"idA":570,"idB":579,"type":0},{"idA":570,"idB":580,"type":0},{"idA":570,"idB":581,"type":0},{"idA":570,"idB":582,"type":0},{"idA":570,"idB":583,"type":0},{"idA":570,"idB":584,"type":0},{"idA":570,"idB":585,"type":0},{"idA":570,"idB":586,"type":0},{"idA":570,"idB":587,"type":0},{"idA":570,"idB":588,"type":0},{"idA":570,"idB":589,"type":0},{"idA":570,"idB":590,"type":0},{"idA":570,"idB":591,"type":0},{"idA":570,"idB":592,"type":0},{"idA":570,"idB":593,"type":0},{"idA":570,"idB":595,"type":0},{"idA":570,"idB":596,"type":0},{"idA":570,"idB":597,"type":0},{"idA":570,"idB":598,"type":0},{"idA":571,"idB":572,"type":0},{"idA":571,"idB":573,"type":0},{"idA":571,"idB":575,"type":0},{"idA":571,"idB":576,"type":0},{"idA":571,"idB":577,"type":0},{"idA":571,"idB":578,"type":0},{"idA":571,"idB":579,"type":0},{"idA":571,"idB":580,"type":0},{"idA":571,"idB":581,"type":0},{"idA":571,"idB":582,"type":0},{"idA":571,"idB":583,"type":0},{"idA":571,"idB":584,"type":0},{"idA":571,"idB":585,"type":0},{"idA":571,"idB":586,"type":0},{"idA":571,"idB":587,"type":0},{"idA":571,"idB":588,"type":0},{"idA":571,"idB":589,"type":0},{"idA":571,"idB":590,"type":0},{"idA":571,"idB":591,"type":0},{"idA":571,"idB":592,"type":0},{"idA":571,"idB":593,"type":0},{"idA":571,"idB":595,"type":0},{"idA":571,"idB":596,"type":0},{"idA":571,"idB":597,"type":0},{"idA":571,"idB":598,"type":0},{"idA":572,"idB":573,"type":0},{"idA":572,"idB":575,"type":0},{"idA":572,"idB":576,"type":0},{"idA":572,"idB":577,"type":0},{"idA":572,"idB":578,"type":0},{"idA":572,"idB":579,"type":0},{"idA":572,"idB":580,"type":0},{"idA":572,"idB":581,"type":0},{"idA":572,"idB":582,"type":0},{"idA":572,"idB":583,"type":0},{"idA":572,"idB":584,"type":0},{"idA":572,"idB":585,"type":0},{"idA":572,"idB":586,"type":0},{"idA":572,"idB":587,"type":0},{"idA":572,"idB":588,"type":0},{"idA":572,"idB":589,"type":0},{"idA":572,"idB":590,"type":0},{"idA":572,"idB":591,"type":0},{"idA":572,"idB":592,"type":0},{"idA":572,"idB":593,"type":0},{"idA":572,"idB":595,"type":0},{"idA":572,"idB":596,"type":0},{"idA":572,"idB":597,"type":0},{"idA":572,"idB":598,"type":0},{"idA":573,"idB":575,"type":0},{"idA":573,"idB":576,"type":0},{"idA":573,"idB":577,"type":0},{"idA":573,"idB":578,"type":0},{"idA":573,"idB":579,"type":0},{"idA":573,"idB":580,"type":0},{"idA":573,"idB":581,"type":0},{"idA":573,"idB":582,"type":0},{"idA":573,"idB":583,"type":0},{"idA":573,"idB":584,"type":0},{"idA":573,"idB":585,"type":0},{"idA":573,"idB":586,"type":0},{"idA":573,"idB":587,"type":0},{"idA":573,"idB":588,"type":0},{"idA":573,"idB":589,"type":0},{"idA":573,"idB":590,"type":0},{"idA":573,"idB":591,"type":0},{"idA":573,"idB":592,"type":0},{"idA":573,"idB":593,"type":0},{"idA":573,"idB":595,"type":0},{"idA":573,"idB":596,"type":0},{"idA":573,"idB":597,"type":0},{"idA":573,"idB":598,"type":0},{"idA":575,"idB":576,"type":0},{"idA":575,"idB":577,"type":0},{"idA":575,"idB":578,"type":0},{"idA":575,"idB":579,"type":0},{"idA":575,"idB":580,"type":0},{"idA":575,"idB":581,"type":0},{"idA":575,"idB":582,"type":0},{"idA":575,"idB":583,"type":0},{"idA":575,"idB":584,"type":0},{"idA":575,"idB":585,"type":0},{"idA":575,"idB":586,"type":0},{"idA":575,"idB":587,"type":0},{"idA":575,"idB":588,"type":0},{"idA":575,"idB":589,"type":0},{"idA":575,"idB":590,"type":0},{"idA":575,"idB":591,"type":0},{"idA":575,"idB":592,"type":0},{"idA":575,"idB":593,"type":0},{"idA":575,"idB":595,"type":0},{"idA":575,"idB":596,"type":0},{"idA":575,"idB":597,"type":0},{"idA":575,"idB":598,"type":0},{"idA":576,"idB":577,"type":0},{"idA":576,"idB":578,"type":0},{"idA":576,"idB":579,"type":0},{"idA":576,"idB":580,"type":0},{"idA":576,"idB":581,"type":0},{"idA":576,"idB":582,"type":0},{"idA":576,"idB":583,"type":0},{"idA":576,"idB":584,"type":0},{"idA":576,"idB":585,"type":0},{"idA":576,"idB":586,"type":0},{"idA":576,"idB":587,"type":0},{"idA":576,"idB":588,"type":0},{"idA":576,"idB":589,"type":0},{"idA":576,"idB":590,"type":0},{"idA":576,"idB":591,"type":0},{"idA":576,"idB":592,"type":0},{"idA":576,"idB":593,"type":0},{"idA":576,"idB":595,"type":0},{"idA":576,"idB":596,"type":0},{"idA":576,"idB":597,"type":0},{"idA":576,"idB":598,"type":0},{"idA":577,"idB":578,"type":0},{"idA":577,"idB":579,"type":0},{"idA":577,"idB":580,"type":0},{"idA":577,"idB":581,"type":0},{"idA":577,"idB":582,"type":0},{"idA":577,"idB":583,"type":0},{"idA":577,"idB":584,"type":0},{"idA":577,"idB":585,"type":0},{"idA":577,"idB":586,"type":0},{"idA":577,"idB":587,"type":0},{"idA":577,"idB":588,"type":0},{"idA":577,"idB":589,"type":0},{"idA":577,"idB":590,"type":0},{"idA":577,"idB":591,"type":0},{"idA":577,"idB":592,"type":0},{"idA":577,"idB":593,"type":0},{"idA":577,"idB":595,"type":0},{"idA":577,"idB":596,"type":0},{"idA":577,"idB":597,"type":0},{"idA":577,"idB":598,"type":0},{"idA":578,"idB":579,"type":0},{"idA":578,"idB":580,"type":0},{"idA":578,"idB":581,"type":0},{"idA":578,"idB":582,"type":0},{"idA":578,"idB":583,"type":0},{"idA":578,"idB":584,"type":0},{"idA":578,"idB":585,"type":0},{"idA":578,"idB":586,"type":0},{"idA":578,"idB":587,"type":0},{"idA":578,"idB":588,"type":0},{"idA":578,"idB":589,"type":0},{"idA":578,"idB":590,"type":0},{"idA":578,"idB":591,"type":0},{"idA":578,"idB":592,"type":0},{"idA":578,"idB":593,"type":0},{"idA":578,"idB":595,"type":0},{"idA":578,"idB":596,"type":0},{"idA":578,"idB":597,"type":0},{"idA":578,"idB":598,"type":0},{"idA":579,"idB":580,"type":0},{"idA":579,"idB":581,"type":0},{"idA":579,"idB":582,"type":0},{"idA":579,"idB":583,"type":0},{"idA":579,"idB":584,"type":0},{"idA":579,"idB":585,"type":0},{"idA":579,"idB":586,"type":0},{"idA":579,"idB":587,"type":0},{"idA":579,"idB":588,"type":0},{"idA":579,"idB":589,"type":0},{"idA":579,"idB":590,"type":0},{"idA":579,"idB":591,"type":0},{"idA":579,"idB":592,"type":0},{"idA":579,"idB":593,"type":0},{"idA":579,"idB":595,"type":0},{"idA":579,"idB":596,"type":0},{"idA":579,"idB":597,"type":0},{"idA":579,"idB":598,"type":0},{"idA":580,"idB":581,"type":0},{"idA":580,"idB":582,"type":0},{"idA":580,"idB":583,"type":0},{"idA":580,"idB":584,"type":0},{"idA":580,"idB":585,"type":0},{"idA":580,"idB":586,"type":0},{"idA":580,"idB":587,"type":0},{"idA":580,"idB":588,"type":0},{"idA":580,"idB":589,"type":0},{"idA":580,"idB":590,"type":0},{"idA":580,"idB":591,"type":0},{"idA":580,"idB":592,"type":0},{"idA":580,"idB":593,"type":0},{"idA":580,"idB":595,"type":0},{"idA":580,"idB":596,"type":0},{"idA":580,"idB":597,"type":0},{"idA":580,"idB":598,"type":0},{"idA":581,"idB":582,"type":0},{"idA":581,"idB":583,"type":0},{"idA":581,"idB":584,"type":0},{"idA":581,"idB":585,"type":0},{"idA":581,"idB":586,"type":0},{"idA":581,"idB":587,"type":0},{"idA":581,"idB":588,"type":0},{"idA":581,"idB":589,"type":0},{"idA":581,"idB":590,"type":0},{"idA":581,"idB":591,"type":0},{"idA":581,"idB":592,"type":0},{"idA":581,"idB":593,"type":0},{"idA":581,"idB":595,"type":0},{"idA":581,"idB":596,"type":0},{"idA":581,"idB":597,"type":0},{"idA":581,"idB":598,"type":0},{"idA":582,"idB":583,"type":0},{"idA":582,"idB":584,"type":0},{"idA":582,"idB":585,"type":0},{"idA":582,"idB":586,"type":0},{"idA":582,"idB":587,"type":0},{"idA":582,"idB":588,"type":0},{"idA":582,"idB":589,"type":0},{"idA":582,"idB":590,"type":0},{"idA":582,"idB":591,"type":0},{"idA":582,"idB":592,"type":0},{"idA":582,"idB":593,"type":0},{"idA":582,"idB":595,"type":0},{"idA":582,"idB":596,"type":0},{"idA":582,"idB":597,"type":0},{"idA":582,"idB":598,"type":0},{"idA":583,"idB":584,"type":0},{"idA":583,"idB":585,"type":0},{"idA":583,"idB":586,"type":0},{"idA":583,"idB":587,"type":0},{"idA":583,"idB":588,"type":0},{"idA":583,"idB":589,"type":0},{"idA":583,"idB":590,"type":0},{"idA":583,"idB":591,"type":0},{"idA":583,"idB":592,"type":0},{"idA":583,"idB":593,"type":0},{"idA":583,"idB":595,"type":0},{"idA":583,"idB":596,"type":0},{"idA":583,"idB":597,"type":0},{"idA":583,"idB":598,"type":0},{"idA":584,"idB":585,"type":0},{"idA":584,"idB":586,"type":0},{"idA":584,"idB":587,"type":0},{"idA":584,"idB":588,"type":0},{"idA":584,"idB":589,"type":0},{"idA":584,"idB":590,"type":0},{"idA":584,"idB":591,"type":0},{"idA":584,"idB":592,"type":0},{"idA":584,"idB":593,"type":0},{"idA":584,"idB":595,"type":0},{"idA":584,"idB":596,"type":0},{"idA":584,"idB":597,"type":0},{"idA":584,"idB":598,"type":0},{"idA":585,"idB":586,"type":0},{"idA":585,"idB":587,"type":0},{"idA":585,"idB":588,"type":0},{"idA":585,"idB":589,"type":0},{"idA":585,"idB":590,"type":0},{"idA":585,"idB":591,"type":0},{"idA":585,"idB":592,"type":0},{"idA":585,"idB":593,"type":0},{"idA":585,"idB":595,"type":0},{"idA":585,"idB":596,"type":0},{"idA":585,"idB":597,"type":0},{"idA":585,"idB":598,"type":0},{"idA":586,"idB":587,"type":0},{"idA":586,"idB":588,"type":0},{"idA":586,"idB":589,"type":0},{"idA":586,"idB":590,"type":0},{"idA":586,"idB":591,"type":0},{"idA":586,"idB":592,"type":0},{"idA":586,"idB":593,"type":0},{"idA":586,"idB":595,"type":0},{"idA":586,"idB":596,"type":0},{"idA":586,"idB":597,"type":0},{"idA":586,"idB":598,"type":0},{"idA":587,"idB":588,"type":0},{"idA":587,"idB":589,"type":0},{"idA":587,"idB":590,"type":0},{"idA":587,"idB":591,"type":0},{"idA":587,"idB":592,"type":0},{"idA":587,"idB":593,"type":0},{"idA":587,"idB":595,"type":0},{"idA":587,"idB":596,"type":0},{"idA":587,"idB":597,"type":0},{"idA":587,"idB":598,"type":0},{"idA":588,"idB":589,"type":0},{"idA":588,"idB":590,"type":0},{"idA":588,"idB":591,"type":0},{"idA":588,"idB":592,"type":0},{"idA":588,"idB":593,"type":0},{"idA":588,"idB":595,"type":0},{"idA":588,"idB":596,"type":0},{"idA":588,"idB":597,"type":0},{"idA":588,"idB":598,"type":0},{"idA":589,"idB":590,"type":0},{"idA":589,"idB":591,"type":0},{"idA":589,"idB":592,"type":0},{"idA":589,"idB":593,"type":0},{"idA":589,"idB":595,"type":0},{"idA":589,"idB":596,"type":0},{"idA":589,"idB":597,"type":0},{"idA":589,"idB":598,"type":0},{"idA":590,"idB":591,"type":0},{"idA":590,"idB":592,"type":0},{"idA":590,"idB":593,"type":0},{"idA":590,"idB":595,"type":0},{"idA":590,"idB":596,"type":0},{"idA":590,"idB":597,"type":0},{"idA":590,"idB":598,"type":0},{"idA":591,"idB":592,"type":1},{"idA":591,"idB":593,"type":0},{"idA":591,"idB":595,"type":0},{"idA":591,"idB":596,"type":0},{"idA":591,"idB":597,"type":0},{"idA":591,"idB":598,"type":0},{"idA":592,"idB":593,"type":1},{"idA":592,"idB":595,"type":0},{"idA":592,"idB":596,"type":0},{"idA":592,"idB":597,"type":0},{"idA":592,"idB":598,"type":0},{"idA":593,"idB":595,"type":0},{"idA":593,"idB":596,"type":0},{"idA":593,"idB":597,"type":0},{"idA":593,"idB":598,"type":0},{"idA":595,"idB":596,"type":0},{"idA":595,"idB":597,"type":0},{"idA":595,"idB":598,"type":0},{"idA":596,"idB":597,"type":0},{"idA":596,"idB":598,"type":0},{"idA":597,"idB":598,"type":0}]} +{"subject":{"id":599,"name":"Sujet 2","creation":1481815026,"surveys":[]}} +{"subject":{"id":600,"name":"Sujet 3","creation":1481815029,"surveys":[]}} +{"subject":{"id":601,"name":"Sujet 4","creation":1481815030,"surveys":[]}} +{"subject":{"id":602,"name":"Sujet 5","creation":1481815030,"surveys":[]}} +{"subject":{"id":603,"name":"Sujet 6","creation":1481815031,"surveys":[]}} +{"subject":{"id":604,"name":"Sujet 7","creation":1481815033,"surveys":[]}} +{"subject":{"id":605,"name":"Sujet 8","creation":1481815035,"surveys":[]}} +{"subject":{"id":606,"name":"Sujet 9","creation":1481815035,"surveys":[]}} +{"subject":{"id":607,"name":"Sujet 10","creation":1481815036,"surveys":[]}} diff --git a/build/lightdb/storage/subject/index b/build/lightdb/storage/subject/index index 3360d54..79d67ad 100755 --- a/build/lightdb/storage/subject/index +++ b/build/lightdb/storage/subject/index @@ -1 +1 @@ -{"1":{"line":0}} \ No newline at end of file +{"1":{"line":0},"599":{"line":1},"600":{"line":2},"601":{"line":3},"602":{"line":4},"603":{"line":5},"604":{"line":6},"605":{"line":7},"606":{"line":8},"607":{"line":9}} \ No newline at end of file diff --git a/build/lightdb/storage/uniqid b/build/lightdb/storage/uniqid index 2e66562..a9ba125 100755 --- a/build/lightdb/storage/uniqid +++ b/build/lightdb/storage/uniqid @@ -1 +1 @@ -49 \ No newline at end of file +607 \ No newline at end of file diff --git a/build/manager/.htaccess b/build/manager/.htaccess old mode 100644 new mode 100755 diff --git a/build/manager/ManagerError.php b/build/manager/ManagerError.php old mode 100644 new mode 100755 diff --git a/build/manager/MenuManager.php b/build/manager/MenuManager.php old mode 100644 new mode 100755 diff --git a/build/manager/sessionManager.php b/build/manager/sessionManager.php old mode 100644 new mode 100755 index 6a27e1e..bdad14e --- a/build/manager/sessionManager.php +++ b/build/manager/sessionManager.php @@ -27,7 +27,7 @@ // On definit l'id session si donne en argument if( $session_id != null ) session_id( $session_id ); - + // Precaution: on met a jour le cookie setcookie( 'PHPSESSID', session_id(), time()+60*30, '/'); @@ -45,7 +45,7 @@ /*******************/ private static function update_token(){ $token = self::$prefix.self::sha1(uniqid()); - + // On definit le token en session $_SESSION['session_token'] = $token; @@ -53,13 +53,12 @@ $_COOKIE['session_token'] = $_SESSION['session_token']; setcookie( 'session_token', $_COOKIE['session_token'], time()+60*30, '/'); } - + /************/ /* AMORCEUR */ /************/ public static function session_start(){ - \session_start(); - return; + return \session_start(); /* [1] Génération et Gestion des donnees a utiliser @@ -85,12 +84,12 @@ // On verifie l'id session (5 premiers chars du hash des donnees perso) $valid_sessid = strpos( session_id(), substr(self::$prefix,0,5) ) === 0; - // Si id session incorrect ou pas de token + // Si id session incorrect ou pas de token if( !$valid_sessid ) self::reset_session( $sessid ); // On initialise la session (bon id session) - - - + + + /* [3] Verification du token ==============================================================*/ // On verifie que le token est valide diff --git a/build/orm/core/Rows.php b/build/orm/core/Rows.php old mode 100644 new mode 100755 diff --git a/build/orm/core/SQLBuilder.php b/build/orm/core/SQLBuilder.php old mode 100644 new mode 100755 diff --git a/build/orm/core/Table.php b/build/orm/core/Table.php old mode 100644 new mode 100755 diff --git a/build/router/core/Route.php b/build/router/core/Route.php old mode 100644 new mode 100755 diff --git a/build/router/core/Router.php b/build/router/core/Router.php old mode 100644 new mode 100755 diff --git a/build/src/upload/local_data/xdrm-brackets.json b/build/src/upload/local_data/xdrm-brackets.json old mode 100644 new mode 100755 diff --git a/config/.htaccess b/config/.htaccess old mode 100644 new mode 100755 diff --git a/config/database-driver.json b/config/database-driver.json old mode 100644 new mode 100755 index f91c69f..1953a0b --- a/config/database-driver.json +++ b/config/database-driver.json @@ -16,16 +16,16 @@ "lab-surveys": { "local": { - "host" : "shadowx-dev.com", - "dbname" : "cnrs", - "user" : "cnrs", - "password" : "yEHsPxCurd7RsynE" + "host" : "listic-lab-surveys.irit.fr", + "dbname" : "lab-surveys", + "user" : "lab-surveys", + "password" : "wxcvbn" }, "remote": { - "host" : "shadowx-dev.com", - "dbname" : "cnrs", - "user" : "cnrs", - "password" : "yEHsPxCurd7RsynE" + "host" : "listic-lab-surveys.irit.fr", + "dbname" : "lab-surveys", + "user" : "lab-surveys", + "password" : "wxcvbn" } } } diff --git a/config/menu.json b/config/menu.json old mode 100644 new mode 100755 diff --git a/config/modules.json b/config/modules.json index 91eda8d..5618a61 100755 --- a/config/modules.json +++ b/config/modules.json @@ -201,7 +201,7 @@ "description": "Enregistre les données d'une enquête téléphonique.", "permissions": ["admin"], "parameters": { - "subject": { "description": "Id du sujet concerné", "type": "id" }, + "subject": { "description": "Données du sujet (id, etc)", "type": "array" }, "contacts": { "description": "Données des contacts de l'enquête.", "type": "array" }, "mini": { "description": "Mini fiches relations sur les contacts de l'enquête.", "type": "array" }, "fiches": { "description": "Fiches relation sur les plus proches contacts de l'enquête.", "type": "array" }, @@ -216,7 +216,7 @@ "description": "Enregistre les données d'une enquête facebook.", "permissions": ["admin"], "parameters": { - "subject": { "description": "Id du sujet concerné", "type": "id" }, + "subject": { "description": "Données du sujet (id, etc)", "type": "array" }, "contacts": { "description": "Données des contacts de l'enquête.", "type": "array" }, "mini": { "description": "Mini fiches relations sur les contacts de l'enquête.", "type": "array" }, "fiches": { "description": "Fiches relation sur les plus proches contacts de l'enquête.", "type": "array" }, diff --git a/config/server.json b/config/server.json old mode 100644 new mode 100755 diff --git a/config/upload-auth.json b/config/upload-auth.json old mode 100644 new mode 100755 diff --git a/config/views.json b/config/views.json old mode 100644 new mode 100755 diff --git a/doc/.htaccess b/doc/.htaccess old mode 100644 new mode 100755 diff --git a/doc/Annexes.odt b/doc/Annexes.odt old mode 100644 new mode 100755 diff --git a/doc/Annexes.pdf b/doc/Annexes.pdf old mode 100644 new mode 100755 diff --git a/doc/bdd.sql b/doc/bdd.sql old mode 100644 new mode 100755 diff --git a/doc/form-builder/behaviour-min.js b/doc/form-builder/behaviour-min.js old mode 100644 new mode 100755 diff --git a/doc/form-builder/behaviour.js b/doc/form-builder/behaviour.js old mode 100644 new mode 100755 diff --git a/doc/form-builder/constraints-min.js b/doc/form-builder/constraints-min.js old mode 100644 new mode 100755 diff --git a/doc/form-builder/constraints.js b/doc/form-builder/constraints.js old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E1-Caroline-CallLogExport.xml b/doc/journaux d'appels/E1-Caroline-CallLogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E10-Boris-LogExport.xml b/doc/journaux d'appels/E10-Boris-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E3-Clement-CallLogExport-V2.xml b/doc/journaux d'appels/E3-Clement-CallLogExport-V2.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E4-Coralie-LogExport.xml b/doc/journaux d'appels/E4-Coralie-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E5-Laurent-LogExport.xml b/doc/journaux d'appels/E5-Laurent-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E7-Emilie-LogExport.xml b/doc/journaux d'appels/E7-Emilie-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E8-Celine-LogExport.xml b/doc/journaux d'appels/E8-Celine-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E9-Pierre-LogExport 2.xml b/doc/journaux d'appels/E9-Pierre-LogExport 2.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/E9-Pierre-LogExport.xml b/doc/journaux d'appels/E9-Pierre-LogExport.xml old mode 100644 new mode 100755 diff --git a/doc/journaux d'appels/JDA-Julien.txt b/doc/journaux d'appels/JDA-Julien.txt old mode 100644 new mode 100755 diff --git a/doc/permissions.json b/doc/permissions.json old mode 100644 new mode 100755 diff --git a/doc/phone_log.json b/doc/phone_log.json old mode 100644 new mode 100755 diff --git a/doc/phone_log_dict.json b/doc/phone_log_dict.json old mode 100644 new mode 100755 diff --git a/doc/rapport.odt b/doc/rapport.odt old mode 100644 new mode 100755 diff --git a/doc/rapport.pdf b/doc/rapport.pdf old mode 100644 new mode 100755 diff --git a/doc/set_permissions.php b/doc/set_permissions.php old mode 100644 new mode 100755 diff --git a/doc/wireframe.png b/doc/wireframe.png old mode 100644 new mode 100755 diff --git a/public_html/.htaccess b/public_html/.htaccess old mode 100644 new mode 100755 diff --git a/public_html/css/constants.scss b/public_html/css/constants.scss old mode 100644 new mode 100755 diff --git a/public_html/css/container.scss b/public_html/css/container.scss old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/constants.css b/public_html/css/expanded/constants.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/constants.css.map b/public_html/css/expanded/constants.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/container.css b/public_html/css/expanded/container.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/container.css.map b/public_html/css/expanded/container.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/font.css b/public_html/css/expanded/font.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/font.css.map b/public_html/css/expanded/font.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/global.css b/public_html/css/expanded/global.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/global.css.map b/public_html/css/expanded/global.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/header.css b/public_html/css/expanded/header.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/header.css.map b/public_html/css/expanded/header.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/layout.css b/public_html/css/expanded/layout.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/layout.css.map b/public_html/css/expanded/layout.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/menu-side.css b/public_html/css/expanded/menu-side.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/menu-side.css.map b/public_html/css/expanded/menu-side.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/notif.css b/public_html/css/expanded/notif.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/notif.css.map b/public_html/css/expanded/notif.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/panel-list.css b/public_html/css/expanded/panel-list.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/panel-list.css.map b/public_html/css/expanded/panel-list.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/reset.css b/public_html/css/expanded/reset.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/reset.css.map b/public_html/css/expanded/reset.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/timeline-form-facebook.css b/public_html/css/expanded/timeline-form-facebook.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/timeline-form-facebook.css.map b/public_html/css/expanded/timeline-form-facebook.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/timeline-form.css b/public_html/css/expanded/timeline-form.css old mode 100644 new mode 100755 diff --git a/public_html/css/expanded/timeline-form.css.map b/public_html/css/expanded/timeline-form.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/font.scss b/public_html/css/font.scss old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/icomoon/old/regular.eot b/public_html/css/fonts/icomoon/old/regular.eot new file mode 100755 index 0000000..d5eea09 Binary files /dev/null and b/public_html/css/fonts/icomoon/old/regular.eot differ diff --git a/public_html/css/fonts/icomoon/old/regular.ttf b/public_html/css/fonts/icomoon/old/regular.ttf new file mode 100755 index 0000000..34058f2 Binary files /dev/null and b/public_html/css/fonts/icomoon/old/regular.ttf differ diff --git a/public_html/css/fonts/icomoon/old/regular.woff b/public_html/css/fonts/icomoon/old/regular.woff new file mode 100755 index 0000000..df958a6 Binary files /dev/null and b/public_html/css/fonts/icomoon/old/regular.woff differ diff --git a/public_html/css/fonts/icomoon/regular.eot b/public_html/css/fonts/icomoon/regular.eot old mode 100644 new mode 100755 index d5eea09..c3fb25f Binary files a/public_html/css/fonts/icomoon/regular.eot and b/public_html/css/fonts/icomoon/regular.eot differ diff --git a/public_html/css/fonts/icomoon/regular.ttf b/public_html/css/fonts/icomoon/regular.ttf old mode 100644 new mode 100755 index 34058f2..f85d495 Binary files a/public_html/css/fonts/icomoon/regular.ttf and b/public_html/css/fonts/icomoon/regular.ttf differ diff --git a/public_html/css/fonts/icomoon/regular.woff b/public_html/css/fonts/icomoon/regular.woff old mode 100644 new mode 100755 index df958a6..d0c12fb Binary files a/public_html/css/fonts/icomoon/regular.woff and b/public_html/css/fonts/icomoon/regular.woff differ diff --git a/public_html/css/fonts/inconsolata/regular.otf b/public_html/css/fonts/inconsolata/regular.otf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/bold.ttf b/public_html/css/fonts/opensans/bold.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/bolditalic.ttf b/public_html/css/fonts/opensans/bolditalic.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/extrabold.ttf b/public_html/css/fonts/opensans/extrabold.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/extrabolditalic.ttf b/public_html/css/fonts/opensans/extrabolditalic.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/italic.ttf b/public_html/css/fonts/opensans/italic.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/light.ttf b/public_html/css/fonts/opensans/light.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/lightitalic.ttf b/public_html/css/fonts/opensans/lightitalic.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/regular.ttf b/public_html/css/fonts/opensans/regular.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/semibold.ttf b/public_html/css/fonts/opensans/semibold.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/opensans/semibolditalic.ttf b/public_html/css/fonts/opensans/semibolditalic.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/regular#iefix.eot b/public_html/css/fonts/proxima-nova/regular#iefix.eot old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/regular.eot b/public_html/css/fonts/proxima-nova/regular.eot old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/regular.ttf b/public_html/css/fonts/proxima-nova/regular.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/regular.woff b/public_html/css/fonts/proxima-nova/regular.woff old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/thin#iefix.eot b/public_html/css/fonts/proxima-nova/thin#iefix.eot old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/thin.eot b/public_html/css/fonts/proxima-nova/thin.eot old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/thin.ttf b/public_html/css/fonts/proxima-nova/thin.ttf old mode 100644 new mode 100755 diff --git a/public_html/css/fonts/proxima-nova/thin.woff b/public_html/css/fonts/proxima-nova/thin.woff old mode 100644 new mode 100755 diff --git a/public_html/css/global.scss b/public_html/css/global.scss old mode 100644 new mode 100755 diff --git a/public_html/css/header.scss b/public_html/css/header.scss old mode 100644 new mode 100755 diff --git a/public_html/css/layout.scss b/public_html/css/layout.scss old mode 100644 new mode 100755 diff --git a/public_html/css/menu-side.scss b/public_html/css/menu-side.scss old mode 100644 new mode 100755 diff --git a/public_html/css/min/constants.css b/public_html/css/min/constants.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/constants.css.map b/public_html/css/min/constants.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/container.css b/public_html/css/min/container.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/container.css.map b/public_html/css/min/container.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/font.css b/public_html/css/min/font.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/font.css.map b/public_html/css/min/font.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/global.css b/public_html/css/min/global.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/global.css.map b/public_html/css/min/global.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/header.css b/public_html/css/min/header.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/header.css.map b/public_html/css/min/header.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/layout.css b/public_html/css/min/layout.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/layout.css.map b/public_html/css/min/layout.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/menu-side.css b/public_html/css/min/menu-side.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/menu-side.css.map b/public_html/css/min/menu-side.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/notif.css b/public_html/css/min/notif.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/notif.css.map b/public_html/css/min/notif.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/panel-list.css b/public_html/css/min/panel-list.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/panel-list.css.map b/public_html/css/min/panel-list.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/reset.css b/public_html/css/min/reset.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/reset.css.map b/public_html/css/min/reset.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/timeline-form-facebook.css b/public_html/css/min/timeline-form-facebook.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/timeline-form-facebook.css.map b/public_html/css/min/timeline-form-facebook.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/min/timeline-form.css b/public_html/css/min/timeline-form.css old mode 100644 new mode 100755 diff --git a/public_html/css/min/timeline-form.css.map b/public_html/css/min/timeline-form.css.map old mode 100644 new mode 100755 diff --git a/public_html/css/notif.scss b/public_html/css/notif.scss old mode 100644 new mode 100755 diff --git a/public_html/css/panel-list.scss b/public_html/css/panel-list.scss old mode 100644 new mode 100755 diff --git a/public_html/css/reset.scss b/public_html/css/reset.scss old mode 100644 new mode 100755 diff --git a/public_html/css/timeline-form-facebook.scss b/public_html/css/timeline-form-facebook.scss old mode 100644 new mode 100755 diff --git a/public_html/css/timeline-form.scss b/public_html/css/timeline-form.scss old mode 100644 new mode 100755 diff --git a/public_html/index.php b/public_html/index.php old mode 100644 new mode 100755 diff --git a/public_html/js/action-script.js b/public_html/js/action-script.js old mode 100644 new mode 100755 diff --git a/public_html/js/includes/input-facebook-contact.js b/public_html/js/includes/input-facebook-contact.js old mode 100644 new mode 100755 diff --git a/public_html/js/includes/input-facebook-fiche.js b/public_html/js/includes/input-facebook-fiche.js old mode 100644 new mode 100755 index face42b..3f83ef6 --- a/public_html/js/includes/input-facebook-fiche.js +++ b/public_html/js/includes/input-facebook-fiche.js @@ -17,9 +17,11 @@ inputFacebookFiche.prototype = { defaultData: { // Valeurs par défaut sexe: '2', age: '.', + interest: '.', + relmark: '.', job: '.', famsit: '0', // Choix 1 à 3 - studies: '0', + studies: '.', reltype: '0', // Choix 1 à 9 reltypeSpecial: '', city: '', @@ -29,9 +31,12 @@ inputFacebookFiche.prototype = { duration: ['', ''], context: '0', // Choix 1 à 14 contextSpecial: ['', '', ''], - freq: ['4', '9', '14', '19', '24'], // 1er choix des 4 pour chaque question + freq: ['3', '8', '13', '18', '23'], // 4er choix des 4 pour chaque question + irlfreq: ['3', '8', '13', '18', '23'], // 4er choix des 4 pour chaque question connect: ['1', '3', '5', '7', '9', '11'], // Le deuxième choix (Oui/Non) donc 'Non' par défaut pour chaque question connectSpecial: ['', ''], + medsoc: '0', + medrel: '0', timestamp: 0, valid: false } @@ -68,6 +73,8 @@ inputFacebookFiche.prototype.fieldsToStorage = function(){ obj = { sexe: deflated.sexe, age: deflated.age, + interest: deflated.interest, + relmark: deflated.relmark, job: deflated.job, famsit: deflated.famsit, studies: deflated.studies, @@ -79,8 +86,11 @@ inputFacebookFiche.prototype.fieldsToStorage = function(){ loc: deflated.loc, duration: deflated.duration, context: deflated.context, + medsoc: deflated.medsoc, + medrel: deflated.medrel, contextSpecial: deflated.contextSpecial, freq: deflated.freq, + irlfreq: deflated.irlfreq, connect: deflated.connect, connectSpecial: deflated.connectSpecial, uid: parseInt(deflated.uid), @@ -143,9 +153,11 @@ inputFacebookFiche.prototype.add = function(objectData){ objectData.connectSpecial[1] = (objectData.connectSpecial[1] != null) ? objectData.connectSpecial[1] : this.defaultData.connectSpecial[1]; // {2} Champs // + /* {1} Vérification des */ // 1. La ville a au moins 2 caractères if( ficheData.city.length < 2 ) return false; - // 3. La durée de la relation en mois est vide ou un nombre + // 2. La durée de la relation en mois est vide ou un nombre if( isNaN(parseInt(ficheData.duration[0])) && ficheData.duration[0].length > 0 ) return false; - // 4. La durée de la relation en année est vide ou un nombre + // 3. La durée de la relation en année est vide ou un nombre if( isNaN(parseInt(ficheData.duration[1])) && ficheData.duration[1].length > 0 ) return false; - // 5. Pour la durée de la relation, au moins un des 2 n'est pas vide + // 4. Pour la durée de la relation, au moins un des 2 n'est pas vide if( ficheData.duration[0].length+ficheData.duration[1].length == 0 ) return false; - // {2} Vérification des pour la profession n'est pas indéfini + /* {2} Vérification des pour la profession n'est pas indéfini if( ficheData.job == '.' ) return false; - // 7. Le pour les études n'est pas indéfini if( ficheData.studies == '.' ) return false; - // 8. Le pour l'AGE n'est pas indéfini if( ficheData.age == '.' ) return false; + // 8. Le pour la NOTE DE RELATION n'est pas indéfini + if( ficheData.relmark == '.' ) + return false; - // {3} Vérification des radio // - // 9. Le SEXE a un et un seul choix + /* {3} Vérification des radio */ + // 10. Le SEXE a un et un seul choix if( ficheData.sexe == '' ) return false; - // 10. La SITUATION FAMILIALE a un et un seul choix + // 11. La SITUATION FAMILIALE a un et un seul choix if( ficheData.famsit == '' ) return false; - // 11. Le TYPE DE RELATION a un et un seul choix + // 12. Le TYPE DE RELATION a un et un seul choix if( ficheData.reltype == '' ) return false; - // 12. La DISTANCE DE DOMICILE (location) a un et un seul choix + // 13. La DISTANCE DE DOMICILE (location) a un et un seul choix if( ficheData.loc == '' ) return false; - // 13. Le CONTEXTE DE RENCONTRE a un et un seul choix + // 14. Le CONTEXTE DE RENCONTRE a un et un seul choix if( ficheData.context == '' ) return false; - // 14. Les FRÉQUENCES ont un et un seul choix (par question de fréquence) + // 15. L'UTILISATION DES MEDIAS SOCIAUX a un et un seul choix + if( ficheData.medsoc == '' ) + return false; + // 16. L'UTILISATION DES MEDIAS SOCIAUX a un et un seul choix + if( ficheData.medrel == '' ) + return false; + // 17. Les FRÉQUENCES ont un et un seul choix (par question de fréquence) for( var i = 0 ; i < ficheData.freq.length ; i++ ) if( ficheData.freq[i] == '' ) return false; - // 15. Les CONNECTION ont un et un seul choix (par question de connection) + // 18. Les FRÉQUENCES IRL ont un et un seul choix (par question de fréquence) + for( var i = 0 ; i < ficheData.irlfreq.length ; i++ ) + if( ficheData.irlfreq[i] == '' ) + return false; + // 19. Les CONNECTION ont un et un seul choix (par question de connection) for( var i = 0 ; i < ficheData.connect.length ; i++ ) if( ficheData.connect[i] == '' ) return false; - // {4} dépendant d'un choix d'un radio // - // 16. TYPE DE RELATION si autre est coché (indice 8), reltypeSpecial doit avoir au moins 2 caractère + /* {4} dépendant d'un choix d'un radio */ + // 20. TYPE DE RELATION si autre est coché (indice 8), reltypeSpecial doit avoir au moins 2 caractère if( ficheData.reltype == '10' && ficheData.reltypeSpecial.length < 2 ) return false; - // 17. CONTEXTE DE RELATION si est coché indice 11, contactSpecial[0] doit avoir au moins 2 caractères + // 21. CONTEXTE DE RELATION si est coché indice 11, contactSpecial[0] doit avoir au moins 2 caractères if( ficheData.context == '11' && ficheData.contextSpecial[0].length < 2 ) return false; - // 18. CONTEXTE DE RELATION si est coché indice 12, contextSpecial[1] doit avoir au moins 2 caractères + // 22. CONTEXTE DE RELATION si est coché indice 12, contextSpecial[1] doit avoir au moins 2 caractères if( ficheData.context == '12' && ficheData.contextSpecial[1].length < 2 ) return false; - // 19. CONTEXTE DE RELATION si est coché indice 13, contextSpecial[2] doit avoir au moins 2 caractères + // 23. CONTEXTE DE RELATION si est coché indice 13, contextSpecial[2] doit avoir au moins 2 caractères if( ficheData.context == '13' && ficheData.contextSpecial[2].length < 2 ) return false; - // 20. Si tout s'est bien passé, on retourne TRUE + // 24. Si tout s'est bien passé, on retourne TRUE return true; }; diff --git a/public_html/js/includes/input-facebook-matrice.js b/public_html/js/includes/input-facebook-matrice.js old mode 100644 new mode 100755 index 0feac05..412d262 --- a/public_html/js/includes/input-facebook-matrice.js +++ b/public_html/js/includes/input-facebook-matrice.js @@ -99,53 +99,38 @@ inputFacebookMatrice.prototype.storageToFields = function(){ /* (2) On construit le HTML de la matrice */ // Contiendra le HTML - var matrice_html = [""]; + var matrice_html = ["
"]; + var conA, conB, L, Ll, C, Cl; // {1} Pour chaque ligne // - for( var A = 0 ; A < contacts.length ; A++ ){ - var conA = contactData[A]; - - - matrice_html.push('
'); - - if( A > 0 ){ // Noms sur la première ligne (abscisses) - matrice_html.push(''); - }else // Sinon, - matrice_html.push(''); + for( L = 0, Ll = contacts.length ; L < Ll ; L++ ){ + conA = contactData[L]; // {2} Pour chaque case // - for( var B = 0 ; B < contacts.length ; B++ ){ if( B < contacts.length-1 ){ - var conB = contactData[B]; + for( C = L+1, Cl = contacts.length ; C < Cl ; C++ ){ + conB = contactData[C]; - // {3} Première colonne -> Intitulé des ordonnées // - if( A == 0 ){ - matrice_html.push(''); - }} + matrice_html.push( "" ); + + } - matrice_html.push(''); } - matrice_html.push('
'); - matrice_html.push(conA.username); - matrice_html.push(''); - matrice_html.push(''); - matrice_html.push(conB.username); - matrice_html.push(''); + // {3} Insertion // + matrice_html.push( ""); - matrice_html.push(" -1 ) - matrice_html.push(" checked"); - matrice_html.push(" >"); - matrice_html.push(""); + // Si lien actif, on le restitue + if( matriceData.hasOwnProperty(conA.uid) && matriceData[conA.uid].indexOf(conB.uid) > -1 ) + matrice_html.push( "checked='checked'"); - // {5} Cases vides (moitié supérieure droite) // - }else - matrice_html.push("
'); + matrice_html.push( '' ); /* (3) On affiche la matrice */ diff --git a/public_html/js/includes/input-facebook-mini.js b/public_html/js/includes/input-facebook-mini.js old mode 100644 new mode 100755 diff --git a/public_html/js/includes/input-facebook-subject.js b/public_html/js/includes/input-facebook-subject.js old mode 100644 new mode 100755 index 54bcae5..ac87411 --- a/public_html/js/includes/input-facebook-subject.js +++ b/public_html/js/includes/input-facebook-subject.js @@ -1,7 +1,8 @@ /* [0] Constructeur -> définit le conteneur et le bouton d'ajout =========================================================*/ -function inputFacebookSubject(iSubjectId, store_button){ +function inputFacebookSubject(iSubjectId, iCoords, store_button){ this.subject_id = iSubjectId; + this.coords = iCoords; this.store_button = store_button; } @@ -10,6 +11,7 @@ function inputFacebookSubject(iSubjectId, store_button){ inputFacebookSubject.prototype = { store_button: this.store_button, // Bouton d'ajout d'un formulaire subject_id: this.subject_id, + coords: this.coords, handler: null }; @@ -23,20 +25,25 @@ inputFacebookSubject.prototype.check = function(){ /* [3] Gestion de l'enregistrement des formulaires de contact =========================================================*/ -inputFacebookSubject.prototype.fieldsToStorage = function(){ +inputFacebookSubject.prototype.fieldsToStorage = function(onlyCoords){ console.group('[facebook.subject] fields to storage'); + ( typeof onlyCoords != 'boolean' ) ? false : onlyCoords; + // {1} Si le formulaire n'est pas valide, on ne l'enregistre pas // - if( !this.check() ) return false; + if( !onlyCoords ) + if( !this.check() ) + return false; // {2} Si on a déja saisie 1+ contact, on ne l'enregistre pas // - if( lsi.keys('f_contacts').length > 0 ){ + // et si on modifie le sujet + if( lsi.keys('f_subject').length === 1 && this.subject_id.value != lsi.get('f_subject',0).subject_id && lsi.keys('f_contacts').length > 0 ){ Notification.warning('Attention', 'Vous devez effacer le formulaire pour changer de sujet'); return false; } // {3} On récupère et met en forme les valeurs du deflater // - var obj = { subject_id: this.subject_id.value }; + var obj = { subject_id: this.subject_id.value, coords: this.coords.value }; // {4} On enregistre les données dans le 'localStorage' // lsi.set('f_subject', 0, obj); @@ -57,11 +64,11 @@ inputFacebookSubject.prototype.storageToFields = function(){ // {1} On récupère les informations du sujet // var subjectData = lsi.get('f_subject', 0); - if( subjectData == null ) - subjectData = { subject_id: '' }; + subjectData = subjectData || { subject_id: '', coords: '' }; // {2} On restore les valeurs // - this.subject_id.value = subjectData.subject_id; + this.subject_id.value = subjectData.subject_id; + this.coords.value = subjectData.coords; console.groupEnd(); }; @@ -79,16 +86,20 @@ inputFacebookSubject.prototype.attach = function(handler){ // Pointeur pour les scopes des addEventListener() this.handler = handler; - var ptr = this; + // Handler de mise à jour quand les champs sont bons - function fts(e){ ptr.fieldsToStorage(); ptr.handler(true); ptr.storageToFields(); } + function fts(e){ this.fieldsToStorage(); this.handler(true); this.storageToFields(); }; + function fts2(e){ this.fieldsToStorage(true); this.storageToFields(); }; /* (2) On attache l'évènement sur le bouton d'enregistrement */ - this.store_button.addEventListener('click', fts, false); + this.store_button.addEventListener('click', fts.bind(this), false); /* (3) On attache un évènement de 'blur' sur chaque '' */ - this.subject_id.addEventListener('blur', fts, false); + this.subject_id.addEventListener('blur', fts.bind(this), false); + + /* (4) On attache un évènement pour le champ coord */ + this.coords.addEventListener('blur', fts2.bind(this), false); /* (4) On charge le sujet depuis la mémoire ('localStorage') */ this.storageToFields(); diff --git a/public_html/js/includes/input-html-facebook-data.js b/public_html/js/includes/input-html-facebook-data.js old mode 100644 new mode 100755 index 4a2bd7c..3e7bd3a --- a/public_html/js/includes/input-html-facebook-data.js +++ b/public_html/js/includes/input-html-facebook-data.js @@ -101,29 +101,27 @@ fMiniFicheBuilder.setLayout( "\t

Type de relation

\n"+ "\t
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ "\t
\n"+ "\t

Où habite t-elle/il ?

\n"+ "\t
\n"+ "\t\tÀ combien de temps est-ce de chez vous ?
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\n"+ ""); @@ -219,43 +217,19 @@ fFicheBuilder.setLayout( "\t
\n"+ "\t\t\n"+ "\t
\n"+ @@ -271,31 +245,14 @@ fFicheBuilder.setLayout( "\t
\n"+ "\t\t\n"+ "\t
\n"+ @@ -307,8 +264,8 @@ fFicheBuilder.setLayout( "\t\t   
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ + "\t\t   
\n"+ + // "\t\t   
\n"+ "\t\t   
\n"+ "\t\n"+ @@ -366,7 +323,7 @@ fFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t\n"+ "\t
\n"+ @@ -375,7 +332,7 @@ fFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -384,7 +341,7 @@ fFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -393,7 +350,7 @@ fFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -402,7 +359,7 @@ fFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ @@ -451,4 +408,96 @@ fFicheBuilder.setLayout( "\t\tVous communiquez dans un autre dispositif (blogs, jeu vidéo ou autre) : \n"+ "\t\n"+ + + + "\t

Comment cette personne utilise-t-elle les médias sociaux de votre point de vue ? Il s'agit :

\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t
Sur une échelle de 1 à 5, préciser l'intérêt que vous accordez aux contenue qu'elle partage via les médias sociaux

\n"+ + // "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + + // RELEASE v2 + + + "\t

Selon vous, à quelle fréquence cette personne ?

\n"+ + "\t
\n"+ + "\t\tPublie des commentaires personnels ou réagit aux publications des autres ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPublie des photos personnelles (profil, voyages, etc.) ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage de la musique ou des clips musicaux ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage des informations culturelles (concert, exposition, etc.) ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage des articles, des informations, des contenus avec une portée politique ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + + "\t
Sur une échelle de 1 à 5, comment jugez-vous votre relation à cette personne ?

\n"+ + // "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t
Considérez-vous que vos échange avec cette personne à travers les médias sociaux:
\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + "\n"); diff --git a/public_html/js/includes/input-html-phone-data.js b/public_html/js/includes/input-html-phone-data.js old mode 100644 new mode 100755 index d4212bf..a978faa --- a/public_html/js/includes/input-html-phone-data.js +++ b/public_html/js/includes/input-html-phone-data.js @@ -1,4 +1,4 @@ -/* [0] Gestion des constructeurs HTML + /* [0] Gestion des constructeurs HTML =========================================================*/ /* (1) Constructeur de formulaire de contact */ var pContactBuilder = new HTMLBuilder(); @@ -59,13 +59,6 @@ pMiniFicheBuilder.setLayout( "\t\t"+ "\t"+ - // "\t
"+ - // "\t\t@countcall appels"+ - // "\t
"+ - // "\t
"+ - // "\t\t@countsms sms"+ - // "\t
"+ - "\t
\n"+ "\t\t\n"+ "\t\t   \n"+ @@ -115,38 +108,28 @@ pMiniFicheBuilder.setLayout( "\t

Type de relation

\n"+ "\t
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ "\t
\n"+ "\t

Où habite t-elle/il ?

\n"+ "\t
\n"+ "\t\tÀ combien de temps est-ce de chez vous ?
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t
\n"+ - ""); - - - - - - - - + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\n"+ + ""); @@ -236,43 +219,19 @@ pFicheBuilder.setLayout( "\t
\n"+ "\t\t\n"+ "\t
\n"+ @@ -288,31 +247,14 @@ pFicheBuilder.setLayout( "\t
\n"+ "\t\t\n"+ "\t
\n"+ @@ -324,9 +266,9 @@ pFicheBuilder.setLayout( "\t\t   
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ - "\t\t   
\n"+ + "\t\t   
\n"+ + // "\t\t   
\n"+ + // "\t\t   
\n"+ "\t\t   
\n"+ "\t\n"+ @@ -342,7 +284,8 @@ pFicheBuilder.setLayout( "\t
\n"+ - "\t\tÀ combien de temps est-ce de chez vous ?
\n"+ + "\t\tÀ combien de temps est-ce de chez vous (en voiture) ?
\n"+ + "\t\t(si deux domiciles, le plus proche)
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ @@ -360,7 +303,7 @@ pFicheBuilder.setLayout( "\t
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ - "\t\t   
\n"+ + "\t\t   
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ "\t\t   
\n"+ @@ -384,7 +327,7 @@ pFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -393,7 +336,7 @@ pFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -402,7 +345,7 @@ pFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -411,7 +354,7 @@ pFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ "\t
\n"+ @@ -420,7 +363,7 @@ pFicheBuilder.setLayout( "\t\t   \n"+ "\t\t   \n"+ "\t\t   \n"+ - "\t\t   \n"+ + // "\t\t   \n"+ "\t
\n"+ @@ -438,35 +381,125 @@ pFicheBuilder.setLayout( "\t\n"+ "\t
\n"+ - "\t\tElle figure parmi vos amis facebook
\n"+ + "\t\tElle figure parmi vos amis facebook (idem)
\n"+ "\t\t   \n"+ "\t\t   \n"+ "\t
\n"+ "\t
\n"+ - "\t\tElle figure parmi vos amis facebook et vous interagissez avec elle sur ce dispositif régulièrement
\n"+ + "\t\tElle figure parmi vos amis facebook et vous interagissez avec elle sur ce dispositif régulièrement (idem)
\n"+ "\t\t   \n"+ "\t\t   \n"+ "\t
\n"+ "\t
\n"+ - "\t\tVous le suivez sur Twitter
\n"+ + "\t\tVous le suivez sur Twitter (ou elle vous suit)
\n"+ "\t\t   \n"+ "\t\t   \n"+ "\t
\n"+ "\t
\n"+ - "\t\tVous communiquez avec cette personne sur Twitter
\n"+ + "\t\tVous communiquez avec cette personne sur Twitter (idem)
\n"+ "\t\t   \n"+ "\t\t   \n"+ "\t
\n"+ "\t
\n"+ - "\t\tVous communiquez dans autre réseau social : \n"+ + "\t\tVous communiquez dans autre réseau : \n"+ "\t
\n"+ "\t
\n"+ "\t\tVous communiquez dans un autre dispositif (blogs, jeu vidéo ou autre) : \n"+ "\t
\n"+ + // RELEASE v2 + + "\t

Comment cette personne utilise-t-elle les médias sociaux de votre point de vue ? Il s'agit :

\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t
Sur une échelle de 1 à 5, préciser l'intérêt que vous accordez aux contenue qu'elle partage via les médias sociaux

\n"+ + // "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + + + "\t

Selon vous, à quelle fréquence cette personne ?

\n"+ + "\t
\n"+ + "\t\tPublie des commentaires personnels ou réagit aux publications des autres ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPublie des photos personnelles (profil, voyages, etc.) ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage de la musique ou des clips musicaux ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage des informations culturelles (concert, exposition, etc.) ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tPartage des articles, des informations, des contenus avec une portée politique ?
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + // "\t\t   \n"+ + "\t
\n"+ + + + "\t
Sur une échelle de 1 à 5, comment jugez-vous votre relation à cette personne ?

\n"+ + // "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t
Considérez-vous que vos échange avec cette personne à travers les médias sociaux:
\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + "\n"); diff --git a/public_html/js/includes/input-html-phone-data.old.js b/public_html/js/includes/input-html-phone-data.old.js new file mode 100755 index 0000000..d4212bf --- /dev/null +++ b/public_html/js/includes/input-html-phone-data.old.js @@ -0,0 +1,472 @@ +/* [0] Gestion des constructeurs HTML +=========================================================*/ +/* (1) Constructeur de formulaire de contact */ +var pContactBuilder = new HTMLBuilder(); +pContactBuilder.setLayout( + "

\n"+ + + "\t\n"+ + // "\t\n"+ + // "\t\n"+ + // + // "\t\n"+ + // "\t\n"+ + // + // "\t \n"+ + + "\t\n"+ + + "\t    ou    \n"+ + + "\t \n"+ + "\t\n"+ + + "

\n\n"); + + + + + + + + + + + + + + + + + + + + +/* (2) Constructeur de MINI fiche de relation */ +var pMiniFicheBuilder = new HTMLBuilder(); +pMiniFicheBuilder.setLayout( + "
\n"+ + + "\t\n"+ + + "\t\n"+ + "\t

@name

\n"+ + + "\t
"+ + "\t\t"+ + "\t
"+ + + // "\t
"+ + // "\t\t@countcall appels"+ + // "\t
"+ + // "\t
"+ + // "\t\t@countsms sms"+ + // "\t
"+ + + "\t
\n"+ + "\t\t\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + + "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + + + "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t

Type de relation

\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + + "\t

Où habite t-elle/il ?

\n"+ + "\t
\n"+ + "\t\tÀ combien de temps est-ce de chez vous ?
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + "
"); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* (3) Constructeur de formulaire fiche relation */ +var pFicheBuilder = new HTMLBuilder(); +pFicheBuilder.setLayout( + "
\n"+ + + "\t\n"+ + "\t\n"+ + + "\t

@name

\n"+ + + "\t
"+ + "\t\t@importedfiche"+ + "\t
"+ + // "\t
"+ + // "\t\t@countsms sms"+ + // "\t
"+ + + "\t
\n"+ + "\t\t\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + + "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tSituation familiale:
\n"+ + "\t\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\t\n"+ + "\t
\n"+ + + "\t

Type de relation

\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t

Où habite t-elle/il ?

\n"+ + + "\t
\n"+ + "\t\t\n"+ + "\t\t
\n"+ + "\t
\n"+ + "\t
\n"+ + "\t\tSi Toulouse : \n"+ + "\t
\n"+ + + + "\t
\n"+ + "\t\tÀ combien de temps est-ce de chez vous ?
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tDepuis quand connaissez-vous cette personne ?

\n"+ + "\t\tmois\n"+ + "\t\tet    ans.\n"+ + "\t
\n"+ + + + "\t

Contexte de rencontre

\n"+ + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t\t   
\n"+ + "\t
\n"+ + + "\t

Avec quelle fréquence discutez-vous avec cette personne ?

\n"+ + "\t
\n"+ + "\t\tFace à face
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tTéléphone ou skype et équivalent
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tSMS, et équivalents
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tCourrier électronique
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tFacebook ou autre réseau social
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + + "\t

Comment êtes-vous « connecté » à cette personne ?

\n"+ + "\t
\n"+ + "\t\tSes coordonnées sont dans votre carnet d’adresse
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tSon numéro de mobile est enregistré sur votre mobile (ou vous-mêmes êtes sur le sien)
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tElle figure parmi vos amis facebook
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tElle figure parmi vos amis facebook et vous interagissez avec elle sur ce dispositif régulièrement
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tVous le suivez sur Twitter
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tVous communiquez avec cette personne sur Twitter
\n"+ + "\t\t   \n"+ + "\t\t   \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tVous communiquez dans autre réseau social : \n"+ + "\t
\n"+ + + "\t
\n"+ + "\t\tVous communiquez dans un autre dispositif (blogs, jeu vidéo ou autre) : \n"+ + "\t
\n"+ + + "
\n"); diff --git a/public_html/js/includes/input-phone-contact.js b/public_html/js/includes/input-phone-contact.js old mode 100644 new mode 100755 diff --git a/public_html/js/includes/input-phone-fiche.js b/public_html/js/includes/input-phone-fiche.js old mode 100644 new mode 100755 index 3f89af6..c09e751 --- a/public_html/js/includes/input-phone-fiche.js +++ b/public_html/js/includes/input-phone-fiche.js @@ -16,9 +16,11 @@ inputPhoneFiche.prototype = { defaultData: { // Valeurs par défaut sexe: '2', age: '.', + interest: '.', + relmark: '.', job: '.', famsit: '0', // Choix 1 à 3 - studies: '0', + studies: '.', reltype: '0', // Choix 1 à 9 reltypeSpecial: '', city: '', @@ -28,9 +30,12 @@ inputPhoneFiche.prototype = { duration: ['', ''], context: '0', // Choix 1 à 14 contextSpecial: ['', '', ''], - freq: ['4', '9', '14', '19', '24'], // 1er choix des 4 pour chaque question + freq: ['3', '8', '13', '18', '23'], // 4er choix des 4 pour chaque question + irlfreq: ['3', '8', '13', '18', '23'], // 4er choix des 4 pour chaque question connect: ['1', '3', '5', '7', '9', '11'], // Le deuxième choix (Oui/Non) donc 'Non' par défaut pour chaque question connectSpecial: ['', ''], + medsoc: '0', + medrel: '0', timestamp: 0, valid: false } @@ -67,6 +72,8 @@ inputPhoneFiche.prototype.fieldsToStorage = function(){ obj = { sexe: deflated.sexe, age: deflated.age, + interest: deflated.interest, + relmark: deflated.relmark, job: deflated.job, famsit: deflated.famsit, studies: deflated.studies, @@ -78,8 +85,11 @@ inputPhoneFiche.prototype.fieldsToStorage = function(){ loc: deflated.loc, duration: deflated.duration, context: deflated.context, + medsoc: deflated.medsoc, + medrel: deflated.medrel, contextSpecial: deflated.contextSpecial, freq: deflated.freq, + irlfreq: deflated.irlfreq, connect: deflated.connect, connectSpecial: deflated.connectSpecial, uid: parseInt(deflated.uid), @@ -144,9 +154,11 @@ inputPhoneFiche.prototype.add = function(objectData){ objectData.connectSpecial[1] = (objectData.connectSpecial[1] != null) ? objectData.connectSpecial[1] : this.defaultData.connectSpecial[1]; // {2} Champs // + /* {1} Vérification des */ // 1. La ville a au moins 2 caractères if( ficheData.city.length < 2 ) return false; - // 3. La durée de la relation en mois est vide ou un nombre + // 2. La durée de la relation en mois est vide ou un nombre if( isNaN(parseInt(ficheData.duration[0])) && ficheData.duration[0].length > 0 ) return false; - // 4. La durée de la relation en année est vide ou un nombre + // 3. La durée de la relation en année est vide ou un nombre if( isNaN(parseInt(ficheData.duration[1])) && ficheData.duration[1].length > 0 ) return false; - // 5. Pour la durée de la relation, au moins un des 2 n'est pas vide + // 4. Pour la durée de la relation, au moins un des 2 n'est pas vide if( ficheData.duration[0].length+ficheData.duration[1].length == 0 ) return false; - // {2} Vérification des pour la profession n'est pas indéfini + /* {2} Vérification des pour la profession n'est pas indéfini if( ficheData.job == '.' ) return false; - // 7. Le pour les études n'est pas indéfini if( ficheData.studies == '.' ) return false; - // 8. Le pour l'AGE n'est pas indéfini + if( ficheData.age == '.' ) + return false; + // 8. Le pour la NOTE DE RELATION n'est pas indéfini + if( ficheData.relmark == '.' ) return false; - // {3} Vérification des radio // - // 9. Le SEXE a un et un seul choix + /* {3} Vérification des radio */ + // 10. Le SEXE a un et un seul choix if( ficheData.sexe == '' ) return false; - // 10. La SITUATION FAMILIALE a un et un seul choix + // 11. La SITUATION FAMILIALE a un et un seul choix if( ficheData.famsit == '' ) return false; - // 11. Le TYPE DE RELATION a un et un seul choix + // 12. Le TYPE DE RELATION a un et un seul choix if( ficheData.reltype == '' ) return false; - // 12. La DISTANCE DE DOMICILE (location) a un et un seul choix + // 13. La DISTANCE DE DOMICILE (location) a un et un seul choix if( ficheData.loc == '' ) return false; - // 13. Le CONTEXTE DE RENCONTRE a un et un seul choix + // 14. Le CONTEXTE DE RENCONTRE a un et un seul choix if( ficheData.context == '' ) return false; - // 14. Les FRÉQUENCES ont un et un seul choix (par question de fréquence) + // 15. L'UTILISATION DES MEDIAS SOCIAUX a un et un seul choix + if( ficheData.medsoc == '' ) + return false; + // 16. L'UTILISATION DES MEDIAS SOCIAUX a un et un seul choix + if( ficheData.medrel == '' ) + return false; + // 17. Les FRÉQUENCES ont un et un seul choix (par question de fréquence) for( var i = 0 ; i < ficheData.freq.length ; i++ ) if( ficheData.freq[i] == '' ) return false; - // 15. Les CONNECTION ont un et un seul choix (par question de connection) + // 18. Les FRÉQUENCES IRL ont un et un seul choix (par question de fréquence) + for( var i = 0 ; i < ficheData.irlfreq.length ; i++ ) + if( ficheData.irlfreq[i] == '' ) + return false; + // 19. Les CONNECTION ont un et un seul choix (par question de connection) for( var i = 0 ; i < ficheData.connect.length ; i++ ) if( ficheData.connect[i] == '' ) return false; - // {4} dépendant d'un choix d'un radio // - // 16. TYPE DE RELATION si autre est coché (indice 8), reltypeSpecial doit avoir au moins 2 caractère + /* {4} dépendant d'un choix d'un radio */ + // 20. TYPE DE RELATION si autre est coché (indice 8), reltypeSpecial doit avoir au moins 2 caractère if( ficheData.reltype == '10' && ficheData.reltypeSpecial.length < 2 ) return false; - // 17. CONTEXTE DE RELATION si est coché indice 11, contactSpecial[0] doit avoir au moins 2 caractères + // 21. CONTEXTE DE RELATION si est coché indice 11, contactSpecial[0] doit avoir au moins 2 caractères if( ficheData.context == '11' && ficheData.contextSpecial[0].length < 2 ) return false; - // 18. CONTEXTE DE RELATION si est coché indice 12, contextSpecial[1] doit avoir au moins 2 caractères + // 22. CONTEXTE DE RELATION si est coché indice 12, contextSpecial[1] doit avoir au moins 2 caractères if( ficheData.context == '12' && ficheData.contextSpecial[1].length < 2 ) return false; - // 19. CONTEXTE DE RELATION si est coché indice 13, contextSpecial[2] doit avoir au moins 2 caractères + // 23. CONTEXTE DE RELATION si est coché indice 13, contextSpecial[2] doit avoir au moins 2 caractères if( ficheData.context == '13' && ficheData.contextSpecial[2].length < 2 ) return false; - // 20. Si tout s'est bien passé, on retourne TRUE + // 24. Si tout s'est bien passé, on retourne TRUE return true; }; diff --git a/public_html/js/includes/input-phone-matrice.js b/public_html/js/includes/input-phone-matrice.js old mode 100644 new mode 100755 index 38df8c3..6086a0f --- a/public_html/js/includes/input-phone-matrice.js +++ b/public_html/js/includes/input-phone-matrice.js @@ -111,7 +111,7 @@ inputPhoneMatrice.prototype.storageToFields = function(){ conB = contactData[C]; // {3} Insertion // - matrice_html.push( " -1 ) @@ -119,7 +119,7 @@ inputPhoneMatrice.prototype.storageToFields = function(){ matrice_html.push( ">" ); - matrice_html.push( "