Merged feature/fiche-updates into dev

This commit is contained in:
xdrm-brackets 2016-12-15 16:18:19 +01:00
commit 38e479c73c
12 changed files with 91 additions and 65 deletions

View File

@ -131,7 +131,8 @@
$subject_set['subject']['surveys'][] = 'phone'; $subject_set['subject']['surveys'][] = 'phone';
/* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */ /* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */
$subject_set['subject']['coords'] = $subject['coords']; if( !empty($subject['coords']) )
$subject_set['subject']['coords'] = $subject['coords'];
/* (6) On récupère les noms des contacts */ /* (6) On récupère les noms des contacts */
$contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche') $contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche')
@ -497,7 +498,8 @@
$subject_set['subject']['surveys'][] = 'facebook'; $subject_set['subject']['surveys'][] = 'facebook';
/* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */ /* (5) On met à jour si le sujet veut renouveller l'enquête plus tard */
$subject_set['subject']['coords'] = $subject['coords']; if( !empty($subject['coords']) )
$subject_set['subject']['coords'] = $subject['coords'];
/* (6) On récupère les noms des contacts */ /* (6) On récupère les noms des contacts */
$contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche') $contactsById = []; // idContact -> nomContact, typeEnquete ('mini' ou 'fiche')

View File

@ -1,43 +1,43 @@
{"id":185,"name":"contact-x","sexe":"1","age":"6","studies2":"1","reltype":"1","dist":"1","job":"12","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":["",""],"medsoc":"1","interest":"0","irlfreq":["1","6","11","16","21"],"relmark":"0","medrel":"1"} {"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":186,"name":"contact-1","sexe":"0","age":"6","studies2":"6","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":["",""],"medsoc":"2","interest":"1","irlfreq":["2","7","12","17","22"],"relmark":"1","medrel":"0"} {"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":187,"name":"contact-2","sexe":"1","age":"7","studies2":"7","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":["",""],"medsoc":"3","interest":"2","irlfreq":["3","8","13","18","23"],"relmark":"2","medrel":"1"} {"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":188,"name":"contact-3","sexe":"2","age":"8","studies2":"0","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":["",""],"medsoc":"0","interest":"3","irlfreq":["0","5","10","15","20"],"relmark":"3","medrel":"2"} {"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":189,"name":"contact-4","sexe":"0","age":"9","studies2":"1","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":["",""],"medsoc":"1","interest":"4","irlfreq":["1","6","11","16","21"],"relmark":"4","medrel":"0"} {"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":190,"name":"contact-5","sexe":"1","age":"10","studies2":"2","reltype":"2","dist":"2","job":"10","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":["",""],"medsoc":"2","interest":"0","irlfreq":["2","7","12","17","22"],"relmark":"0","medrel":"1"} {"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":191,"name":"contact-6","sexe":"2","age":"11","studies2":"3","reltype":"3","dist":"3","job":"11","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":["",""],"medsoc":"3","interest":"1","irlfreq":["3","8","13","18","23"],"relmark":"1","medrel":"2"} {"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":192,"name":"contact-7","sexe":"0","age":"12","studies2":"4","reltype":"4","dist":"0","job":"12","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":["",""],"medsoc":"0","interest":"2","irlfreq":["0","5","10","15","20"],"relmark":"2","medrel":"0"} {"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":193,"name":"contact-8","sexe":"1","age":"13","studies2":"5","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":["",""],"medsoc":"1","interest":"3","irlfreq":["1","6","11","16","21"],"relmark":"3","medrel":"1"} {"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":194,"name":"contact-9","sexe":"2","age":"14","studies2":"6","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":["",""],"medsoc":"2","interest":"4","irlfreq":["2","7","12","17","22"],"relmark":"4","medrel":"2"} {"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":195,"name":"contact-10","sexe":"0","age":"15","studies2":"7","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":["",""],"medsoc":"3","interest":"0","irlfreq":["3","8","13","18","23"],"relmark":"0","medrel":"0"} {"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":196,"name":"contact-11","sexe":"1","age":"16","studies2":"0","reltype":"0","dist":"0","job":"3","famsit":"0","city":"26","cp":"10016","quartier":"16","duration":["16","116"],"context":"2","contextExtra":["internet","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""],"medsoc":"0","interest":"1","irlfreq":["0","5","10","15","20"],"relmark":"1","medrel":"1"} {"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":197,"name":"contact-12","sexe":"2","age":"17","studies2":"1","reltype":"1","dist":"1","job":"4","famsit":"1","city":"27","cp":"10017","quartier":"17","duration":["17","117"],"context":"3","contextExtra":["","association",""],"freq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""],"medsoc":"1","interest":"2","irlfreq":["1","6","11","16","21"],"relmark":"2","medrel":"2"} {"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":198,"name":"contact-13","sexe":"0","age":"18","studies2":"2","reltype":"2","dist":"2","job":"5","famsit":"2","city":"28","cp":"10018","quartier":"18","duration":["18","118"],"context":"4","contextExtra":["","","autre"],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""],"medsoc":"2","interest":"3","irlfreq":["2","7","12","17","22"],"relmark":"3","medrel":"0"} {"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":199,"name":"contact-14","sexe":"1","age":"0","studies2":"3","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":["",""],"medsoc":"3","interest":"4","irlfreq":["3","8","13","18","23"],"relmark":"4","medrel":"1"} {"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":200,"name":"contact-15","sexe":"2","age":"1","studies2":"4","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":["",""],"medsoc":"0","interest":"0","irlfreq":["0","5","10","15","20"],"relmark":"0","medrel":"2"} {"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":201,"name":"contact-16","sexe":"0","age":"2","studies2":"5","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":["",""],"medsoc":"1","interest":"1","irlfreq":["1","6","11","16","21"],"relmark":"1","medrel":"0"} {"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":202,"name":"contact-17","sexe":"1","age":"3","studies2":"6","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":["",""],"medsoc":"2","interest":"2","irlfreq":["2","7","12","17","22"],"relmark":"2","medrel":"1"} {"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":203,"name":"contact-18","sexe":"2","age":"4","studies2":"7","reltype":"autre","dist":"3","job":"10","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":["",""],"medsoc":"3","interest":"3","irlfreq":["3","8","13","18","23"],"relmark":"3","medrel":"2"} {"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":204,"name":"contact-19","sexe":"0","age":"5","studies2":"0","reltype":"0","dist":"0","job":"11","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":["",""],"medsoc":"0","interest":"4","irlfreq":["0","5","10","15","20"],"relmark":"4","medrel":"0"} {"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":206,"name":"contact-21","sexe":"2","age":"7","studies2":"2","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":["",""],"medsoc":"2","interest":"1","irlfreq":["2","7","12","17","22"],"relmark":"1","medrel":"2"} {"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":207,"name":"contact-22","sexe":"0","age":"8","studies2":"3","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":["",""],"medsoc":"3","interest":"2","irlfreq":["3","8","13","18","23"],"relmark":"2","medrel":"0"} {"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":208,"name":"contact-23","sexe":"1","age":"9","studies2":"4","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":["",""],"medsoc":"0","interest":"3","irlfreq":["0","5","10","15","20"],"relmark":"3","medrel":"1"} {"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":209,"name":"contact-24","sexe":"2","age":"10","studies2":"5","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":["",""],"medsoc":"1","interest":"4","irlfreq":["1","6","11","16","21"],"relmark":"4","medrel":"2"} {"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":210,"name":"contact-25","sexe":"0","age":"11","studies2":"6","reltype":"6","dist":"2","job":"4","famsit":"2","city":"40","cp":"10030","quartier":"30","duration":["30","130"],"context":"2","contextExtra":["internet","",""],"freq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""],"medsoc":"2","interest":"0","irlfreq":["2","7","12","17","22"],"relmark":"0","medrel":"0"} {"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":211,"name":"contact-26","sexe":"1","age":"12","studies2":"7","reltype":"autre","dist":"3","job":"5","famsit":"3","city":"41","cp":"10031","quartier":"31","duration":["31","131"],"context":"3","contextExtra":["","association",""],"freq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectExtra":["",""],"medsoc":"3","interest":"1","irlfreq":["3","8","13","18","23"],"relmark":"1","medrel":"1"} {"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":212,"name":"contact-27","sexe":"2","age":"13","studies2":"0","reltype":"0","dist":"0","job":"6","famsit":"0","city":"42","cp":"10032","quartier":"32","duration":["32","132"],"context":"4","contextExtra":["","","autre"],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""],"medsoc":"0","interest":"2","irlfreq":["0","5","10","15","20"],"relmark":"2","medrel":"2"} {"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":213,"name":"contact-28","sexe":"0","age":"14","studies2":"1","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":["",""],"medsoc":"1","interest":"3","irlfreq":["1","6","11","16","21"],"relmark":"3","medrel":"0"} {"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":214,"name":"contact-29","sexe":"1","age":"15","studies2":"2","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":["",""],"medsoc":"2","interest":"4","irlfreq":["2","7","12","17","22"],"relmark":"4","medrel":"1"} {"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":215,"name":"contact-30","sexe":"2","age":"16","studies2":"3","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":["",""],"medsoc":"3","interest":"0","irlfreq":["3","8","13","18","23"],"relmark":"0","medrel":"2"} {"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":216,"name":"contact-31","sexe":"0","age":"17","studies2":"4","reltype":"4","dist":"0","job":"10","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":["",""],"medsoc":"0","interest":"1","irlfreq":["0","5","10","15","20"],"relmark":"1","medrel":"0"} {"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":217,"name":"contact-32","sexe":"1","age":"18","studies2":"5","reltype":"5","dist":"1","job":"11","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":["",""],"medsoc":"1","interest":"2","irlfreq":["1","6","11","16","21"],"relmark":"2","medrel":"1"} {"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":218,"name":"contact-33","sexe":"2","age":"0","studies2":"6","reltype":"6","dist":"2","job":"12","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":["",""],"medsoc":"2","interest":"3","irlfreq":["2","7","12","17","22"],"relmark":"3","medrel":"2"} {"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":219,"name":"contact-34","sexe":"0","age":"1","studies2":"7","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":["",""],"medsoc":"3","interest":"4","irlfreq":["3","8","13","18","23"],"relmark":"4","medrel":"0"} {"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":220,"name":"contact-35","sexe":"1","age":"2","studies2":"0","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":["",""],"medsoc":"0","interest":"0","irlfreq":["0","5","10","15","20"],"relmark":"0","medrel":"1"} {"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":221,"name":"contact-36","sexe":"2","age":"3","studies2":"1","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":["",""],"medsoc":"1","interest":"1","irlfreq":["1","6","11","16","21"],"relmark":"1","medrel":"2"} {"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":222,"name":"contact-37","sexe":"0","age":"4","studies2":"2","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":["",""],"medsoc":"2","interest":"2","irlfreq":["2","7","12","17","22"],"relmark":"2","medrel":"0"} {"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":223,"name":"contact-38","sexe":"1","age":"5","studies2":"3","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":["",""],"medsoc":"3","interest":"3","irlfreq":["3","8","13","18","23"],"relmark":"3","medrel":"1"} {"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":224,"name":"contact-39","sexe":"2","age":"6","studies2":"4","reltype":"4","dist":"0","job":"5","famsit":"0","city":"54","cp":"10044","quartier":"44","duration":["44","144"],"context":"2","contextExtra":["internet","",""],"freq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectExtra":["",""],"medsoc":"0","interest":"4","irlfreq":["0","5","10","15","20"],"relmark":"4","medrel":"2"} {"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":226,"name":"contact-41","sexe":"1","age":"","studies1":"2","reltype":"1","dist":"."} {"id":595,"name":"contact-41","sexe":"1","age":"1","studies1":"2","reltype":"1","dist":"0"}
{"id":227,"name":"contact-42","sexe":"0","age":"2","studies1":"3","reltype":"2","dist":"."} {"id":596,"name":"contact-42","sexe":"0","age":"2","studies1":"3","reltype":"2","dist":"1"}
{"id":228,"name":"contact-43","sexe":"1","age":"3","studies1":"4","reltype":"3","dist":"."} {"id":597,"name":"contact-43","sexe":"1","age":"3","studies1":"4","reltype":"3","dist":"2"}
{"id":229,"name":"contact-44","sexe":"0","age":"4","studies1":"5","reltype":"4","dist":"."} {"id":598,"name":"contact-44","sexe":"0","age":"4","studies1":"5","reltype":"4","dist":"3"}

View File

@ -1 +1 @@
{"185":{"line":0},"186":{"line":1},"187":{"line":2},"188":{"line":3},"189":{"line":4},"190":{"line":5},"191":{"line":6},"192":{"line":7},"193":{"line":8},"194":{"line":9},"195":{"line":10},"196":{"line":11},"197":{"line":12},"198":{"line":13},"199":{"line":14},"200":{"line":15},"201":{"line":16},"202":{"line":17},"203":{"line":18},"204":{"line":19},"206":{"line":20},"207":{"line":21},"208":{"line":22},"209":{"line":23},"210":{"line":24},"211":{"line":25},"212":{"line":26},"213":{"line":27},"214":{"line":28},"215":{"line":29},"216":{"line":30},"217":{"line":31},"218":{"line":32},"219":{"line":33},"220":{"line":34},"221":{"line":35},"222":{"line":36},"223":{"line":37},"224":{"line":38},"226":{"line":39},"227":{"line":40},"228":{"line":41},"229":{"line":42}} {"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}}

View File

@ -82,7 +82,7 @@
"4": "Diplôme universitaire de 1er cycle: Licence, BTS, DUT", "4": "Diplôme universitaire de 1er cycle: Licence, BTS, DUT",
"5": "Diplôme universitaire de 2ème cycle : MASTER, Maîtrise ou DEA, CAPES", "5": "Diplôme universitaire de 2ème cycle : MASTER, Maîtrise ou DEA, CAPES",
"6": "Doctorat (y compris médecine, pharmacie, dentaire)", "6": "Doctorat (y compris médecine, pharmacie, dentaire)",
"7": "Diplôme d'ingénieur, diplôme d'une grande école de commerce", "7": "Diplôme d'ingénieur, diplôme d'une grande école de commerce"
}, },
"job": { "job": {

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"1":{"line":0}} {"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}}

View File

@ -1 +1 @@
238 607

View File

@ -18,6 +18,7 @@
var_dump( $index.' # '.$sl->fetch($index)['subject']['name'] ); var_dump( $index.' # '.$sl->fetch($index)['subject']['name'] );
$sub = $sl->fetch(1); $sub = $sl->fetch(1);
var_dump($sub['subject']);
var_dump( 'contacts: '.count($sub['contacts']) ); var_dump( 'contacts: '.count($sub['contacts']) );
var_dump( 'relations: '.count($sub['relations']) ); var_dump( 'relations: '.count($sub['relations']) );
@ -31,6 +32,9 @@
echo $Aname.'('.$rel['idA'].') + '.$cl->fetch((int)$rel['idB'])['name'].'('.$rel['idB'].') = '.$rel['type']."<br>"; echo $Aname.'('.$rel['idA'].') + '.$cl->fetch((int)$rel['idB'])['name'].'('.$rel['idB'].') = '.$rel['type']."<br>";
} }
$ct = $cl->fetch(595);
var_dump($ct);
}else{ }else{
/* [1] Remove contacts /* [1] Remove contacts

View File

@ -116,12 +116,12 @@ fMiniFicheBuilder.setLayout(
"\t<h4 data-icon='m'>Où habite t-elle/il ?</h4>\n"+ "\t<h4 data-icon='m'>Où habite t-elle/il ?</h4>\n"+
"\t<h5 class='nobold color0'>\n"+ "\t<h5 class='nobold color0'>\n"+
"\t\tÀ combien de temps est-ce de chez vous ?<br>\n"+ "\t\tÀ combien de temps est-ce de chez vous ?<br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locX_mini_f_@uid' value='.'><label for='locX_mini_f_@uid'>Je ne sais pas</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locX_mini_f_@uid' value='.'><label for='locX_mini_f_@uid'>Je ne sais pas</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locA_mini_f_@uid' value='0'><label for='locA_mini_f_@uid'>- de 5 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locA_mini_f_@uid' value='0'><label for='locA_mini_f_@uid'>- de 5 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locB_mini_f_@uid' value='1'><label for='locB_mini_f_@uid'>de 5 à 15 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locB_mini_f_@uid' value='1'><label for='locB_mini_f_@uid'>de 5 à 15 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locC_mini_f_@uid' value='2'><label for='locC_mini_f_@uid'>de 15 à 60 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locC_mini_f_@uid' value='2'><label for='locC_mini_f_@uid'>de 15 à 60 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locD_mini_f_@uid' value='3'><label for='locD_mini_f_@uid'>+ d'une heure</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_f_@uid' data-name='loc' id='locD_mini_f_@uid' value='3'><label for='locD_mini_f_@uid'>+ d'une heure</label><br>\n"+
"\t</h5>\n"+ "\t</h5>\n"+
"</article>"); "</article>");

View File

@ -59,13 +59,6 @@ pMiniFicheBuilder.setLayout(
"\t\t<input type='checkbox' data-name='unknown' id='unknown_min_p_@uid' value='1'><label for='unknown_min_p_@uid'>Contact inconnu</label>"+ "\t\t<input type='checkbox' data-name='unknown' id='unknown_min_p_@uid' value='1'><label for='unknown_min_p_@uid'>Contact inconnu</label>"+
"\t</h5>"+ "\t</h5>"+
// "\t<h5 class='nobold color0'>"+
// "\t\t@countcall appels"+
// "\t</h5>"+
// "\t<h5 class='nobold color0'>"+
// "\t\t@countsms sms"+
// "\t</h5>"+
"\t<h5 class='nobold color0'>\n"+ "\t<h5 class='nobold color0'>\n"+
"\t\t<input type='radio' name='sexe_mini_p_@uid' data-name='sexe' id='sexeH_mini_p_@uid' value='0'><label for='sexeH_mini_p_@uid'>Homme</label>\n"+ "\t\t<input type='radio' name='sexe_mini_p_@uid' data-name='sexe' id='sexeH_mini_p_@uid' value='0'><label for='sexeH_mini_p_@uid'>Homme</label>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='sexe_mini_p_@uid' data-name='sexe' id='sexeF_mini_p_@uid' value='1'><label for='sexeF_mini_p_@uid'>Femme</label>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='sexe_mini_p_@uid' data-name='sexe' id='sexeF_mini_p_@uid' value='1'><label for='sexeF_mini_p_@uid'>Femme</label>\n"+
@ -128,7 +121,15 @@ pMiniFicheBuilder.setLayout(
"\t<h4 data-icon='m'>Où habite t-elle/il ?</h4>\n"+ "\t<h4 data-icon='m'>Où habite t-elle/il ?</h4>\n"+
"\t<h5 class='nobold color0'>\n"+ "\t\tÀ combien de temps est-ce de chez vous ?<br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locX_mini_p_@uid' value='.'><label for='locX_mini_p_@uid'>Je ne sais pas</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locA_mini_p_@uid' value='0'><label for='locA_mini_p_@uid'>- de 5 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locB_mini_p_@uid' value='1'><label for='locB_mini_p_@uid'>de 5 à 15 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locC_mini_p_@uid' value='2'><label for='locC_mini_p_@uid'>de 15 à 60 minutes</label><br>\n"+ "\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locD_mini_p_@uid' value='3'><label for='locD_mini_p_@uid'>+ d'une heure</label><br>\n"+ "\t</h5>\n"+ "</article>"); "\t<h5 class='nobold color0'>\n"+
"\t\tÀ combien de temps est-ce de chez vous ?<br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locX_mini_p_@uid' value='.'><label for='locX_mini_p_@uid'>Je ne sais pas</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locA_mini_p_@uid' value='0'><label for='locA_mini_p_@uid'>- de 5 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locB_mini_p_@uid' value='1'><label for='locB_mini_p_@uid'>de 5 à 15 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locC_mini_p_@uid' value='2'><label for='locC_mini_p_@uid'>de 15 à 60 minutes</label><br>\n"+
"\t\t&nbsp;&nbsp;&nbsp;<input type='radio' name='loc_mini_p_@uid' data-name='loc' id='locD_mini_p_@uid' value='3'><label for='locD_mini_p_@uid'>+ d'une heure</label><br>\n"+
"\t</h5>\n"+
"</article>");

File diff suppressed because one or more lines are too long

View File

@ -850,6 +850,8 @@ function testRoutinePhone(doMini){
$('#unknown_min_p_'+m).checked = name.length == 0; $('#unknown_min_p_'+m).checked = name.length == 0;
/* (3) Si personne inconnue -> valeurs indéterminées */ /* (3) Si personne inconnue -> valeurs indéterminées */
if( name.length == 0 ){ if( name.length == 0 ){
@ -893,6 +895,9 @@ function testRoutinePhone(doMini){
}else }else
$('#reltype'+relVal+'_mini_p_'+m).checked = true; $('#reltype'+relVal+'_mini_p_'+m).checked = true;
// {7} Temps entre les domiciles //
var locVal = ['X', 'A', 'B', 'C', 'D'][ Math.floor(count % 5) ];
$('#loc'+locVal+'_mini_p_'+m).checked = true;
} }
count++; count++;
@ -903,6 +908,8 @@ function testRoutinePhone(doMini){
/* [2] Remplissage des fiches complètes /* [2] Remplissage des fiches complètes
*
*
=========================================================*/ =========================================================*/
for( var f in fiches ){ for( var f in fiches ){
@ -1133,6 +1140,9 @@ function testRoutineFacebook(doMini){
}else }else
$('#reltype'+relVal+'_mini_f_'+m).checked = true; $('#reltype'+relVal+'_mini_f_'+m).checked = true;
// {7} Temps entre les domiciles //
var locVal = ['X', 'A', 'B', 'C', 'D'][ Math.floor(count % 5) ];
$('#loc'+locVal+'_mini_f_'+m).checked = true;
} }
count++; count++;