Removing test + auto-merging
This commit is contained in:
xdrm-brackets
commit
8b30dbb4d2
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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']); }
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@
|
|||
|
||||
class Builder{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@
|
|||
|
||||
/* TRAITE LES DONNÉES D'UN FORMULAIRE DE TYPE TÉLÉPHONIQUE
|
||||
*
|
||||
* @subject<int> Id du sujet concerné
|
||||
* @subject<Array> Données du sujet concerné
|
||||
* @contacts<Array> Tableau contenant les données des contacts
|
||||
* @mini<Array> Tableau contenant les données des mini fiches relation
|
||||
* @mini<Array> Tableau contenant les données des mini fiches relation
|
||||
* @fiches<Array> Tableau contenant les données des fiches relation
|
||||
*
|
||||
* @return subject_id<int> 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> Id du sujet concerné
|
||||
* @subject<Array> Données du sujet concerné
|
||||
* @contacts<Array> Tableau contenant les données des contacts
|
||||
* @mini<Array> Tableau contenant les données des mini fiches relation
|
||||
* @mini<Array> Tableau contenant les données des mini fiches relation
|
||||
* @fiches<Array> Tableau contenant les données des fiches relation
|
||||
*
|
||||
* @return subject_id<int> 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){
|
||||
|
|
|
|||
|
|
@ -114,6 +114,11 @@
|
|||
}
|
||||
$db->close();
|
||||
|
||||
/* [2] Gestion des relations
|
||||
=========================================================*/
|
||||
/* (1) On récupère toutes les relations */
|
||||
//blabla
|
||||
|
||||
|
||||
/* [4] Gestion du retour
|
||||
=========================================================*/
|
||||
|
|
|
|||
|
|
@ -78,13 +78,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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']);
|
||||
|
||||
|
|
|
|||
|
|
@ -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"}
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
{"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}}
|
||||
|
|
@ -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"
|
||||
}
|
||||
|
||||
},
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -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}}
|
||||
|
|
@ -1 +1 @@
|
|||
49
|
||||
607
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<mixed>" },
|
||||
"contacts": { "description": "Données des contacts de l'enquête.", "type": "array<array>" },
|
||||
"mini": { "description": "Mini fiches relations sur les contacts de l'enquête.", "type": "array<array>" },
|
||||
"fiches": { "description": "Fiches relation sur les plus proches contacts de l'enquête.", "type": "array<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<mixed>" },
|
||||
"contacts": { "description": "Données des contacts de l'enquête.", "type": "array<array>" },
|
||||
"mini": { "description": "Mini fiches relations sur les contacts de l'enquête.", "type": "array<array>" },
|
||||
"fiches": { "description": "Fiches relation sur les plus proches contacts de l'enquête.", "type": "array<array>" },
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 324 KiB |
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue