Prépa envoi formulaire + création parseur markdown (docu) à partir de /config/modules.json

config/modules.json

@@ -29,6 +29,13 @@
 			"description": "Méthode utile à phpunit pour le test des permissions.",
 			"permissions": ["a", "b"],
 			"parameters": {}
+		},
+
+
+		"markdown": {
+			"description": "Retourne une description en markdown des différents modules de l'API",
+			"permissions": [],
+			"parameters": {}
 		}
 	},
 
@@ -97,7 +104,7 @@
 		}
 	},
 
-	"charts": {
+	"chart": {
 
 		"network_data": {
 			"description": "Renvoie un jeu de donnees fictif pour un graphique de type #network.",

js/includes/charts-sociogram-min.js

@@ -1,5 +1,5 @@
 function sociogramClass(a){this.container=a;this.log("sociogram created")}
-sociogramClass.prototype={container:this.container,sigma:null,request:{path:"charts/network_data"},response:null,nodes:[],edges:[],rad:500,nodeDistance:100,overloadGraph:function(){},load:function(){},nodeAt:function(a,b){},arrange:function(a,b,d){},extractNodesFromResponse:function(){},extractEdgesFromResponse:function(){},renderNodes:function(){},renderEdges:function(){},overload:{nodeNeighbors:function(a){},nodeDirectNeighbors:function(a){}},bindings:{clickNode:function(a,b){},clickStage:function(a,
+sociogramClass.prototype={container:this.container,sigma:null,request:{path:"chart/network_data"},response:null,nodes:[],edges:[],rad:500,nodeDistance:100,overloadGraph:function(){},load:function(){},nodeAt:function(a,b){},arrange:function(a,b,d){},extractNodesFromResponse:function(){},extractEdgesFromResponse:function(){},renderNodes:function(){},renderEdges:function(){},overload:{nodeNeighbors:function(a){},nodeDirectNeighbors:function(a){}},bindings:{clickNode:function(a,b){},clickStage:function(a,
 b){}},log:function(a){console.log("--[SOCIOGRAM]--");console.warn(a);console.log("--[/SOCIOGRAM]--")}};sociogramClass.prototype.overloadGraph=function(){sigma.classes.graph.addMethod("nodeNeighbors",this.overload.nodeNeighbors);sigma.classes.graph.addMethod("nodeDirectNeighbors",this.overload.nodeDirectNeighbors);this.log("graph overloaded")};
 sociogramClass.prototype.load=function(){this.sigma=new sigma({renderer:{container:this.container,type:"canvas"}});var a=this;api.send(this.request,function(b){a.log(b);0==b.ModuleError&&(a.response=b,a.sigma.settings({defaultNodeColor:"#348ed8",defaultLabelSize:14,defaultLabelBGColor:"#ddd",defaultHoverLabelBGColor:"#002147",defaultLabelHoverColor:"#fff",labelThreshold:10,defaultEdgeType:"line"}),a.extractNodesFromResponse(),a.extractEdgesFromResponse(),a.addNodes(),a.addEdges(),a.sigma.bind("clickNode",
 function(b){a.bindings.clickNode(a,b)}),a.sigma.bind("clickStage",function(b){a.bindings.clickStage(a,b)}),a.sigma.graph.nodes().forEach(function(b){a.arrange(b.id,null,!0)}),a.sigma.camera.ratio=1.2,a.sigma.refresh())})};sociogramClass.prototype.nodeAt=function(a,b){var d=this.sigma.graph.nodes(),c=null,e;for(e in d){var f=Math.sqrt(Math.pow(a-d[e].x,2)+Math.pow(b-d[e].y,2));if(null==c||f<c)c=f}return c};

js/includes/charts-sociogram.js

@@ -27,7 +27,7 @@ function sociogramClass(container){
 sociogramClass.prototype = {
 	container: this.container,
 	sigma: null,
-	request: { path: 'charts/network_data' },
+	request: { path: 'chart/network_data' },
 	response: null,
 	nodes: [],
 	edges: [],

js/includes/input-phone-fiche-min.js

@@ -2,9 +2,8 @@ function inputPhoneFiche(a,b){this.container=a;this.nav_container=b}
 inputPhoneFiche.prototype={container:this.container,nav_container:this.nav_container,selected:0,handler:null,defaultData:{firstname:"",lastname:"",username:"",sexe:[{status:!0},{status:!1}],age:"",job:".",famsit:[{status:!0},{status:!1},{status:!1}],studies:".",reltype:[{status:!0},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1}],reltypeSpecial:"",city:"",loc:[{status:!0},{status:!1},{status:!1},{status:!1}],duration:["",""],context:[{status:!0},{status:!1},
 {status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1},{status:!1}],contextSpecial:["","",""],freq:[[{status:!0},{status:!1},{status:!1},{status:!1}],[{status:!0},{status:!1},{status:!1},{status:!1}],[{status:!0},{status:!1},{status:!1},{status:!1}],[{status:!0},{status:!1},{status:!1},{status:!1}],[{status:!0},{status:!1},{status:!1},{status:!1}]],connect:[[{status:!1},{status:!0}],[{status:!1},{status:!0}],[{status:!1},
 {status:!0}],[{status:!1},{status:!0}],[{status:!1},{status:!0}],[{status:!1},{status:!0}]],connectSpecial:["",""]}};
-inputPhoneFiche.prototype.fieldsToStorage=function(){console.log("FICHE: FIELDS TO STORAGE");for(var a=$$("article.relation-panel .fiche-relation"),b=0;b<a.length;b++){var c=(new FormDeflater(a[b],["input","select"],["data-name"])).deflate();console.log(c);var d=lsi.get("fiches","form"+c.uid.value);!1===d&&(d.username="inconnu",d.firstname="inconnu",d.lastname="inconnu");c={uid:c.uid.value,firstname:d.firstname,lastname:d.lastname,username:d.username,sexe:c.sexe,age:c.age.value,job:c.job.value,famsit:c.famsit,
+inputPhoneFiche.prototype.fieldsToStorage=function(){console.log("FICHE: FIELDS TO STORAGE");for(var a=$$("article.relation-panel .fiche-relation"),b=0;b<a.length;b++){var c=(new FormDeflater(a[b],["input","select"],["data-name"])).deflate(),d=lsi.get("fiches","form"+c.uid.value);!1===d&&(d.username="inconnu",d.firstname="inconnu",d.lastname="inconnu");c={uid:c.uid.value,firstname:d.firstname,lastname:d.lastname,username:d.username,sexe:c.sexe,age:c.age.value,job:c.job.value,famsit:c.famsit,studies:c.studies.value,
-studies:c.studies.value,reltype:c.reltype,reltypeSpecial:c.reltypeSpecial.value,city:c.city.value,loc:c.loc,duration:[c.duration[0].value,c.duration[1].value],context:c.context,contextSpecial:[c.contextSpecial[0].value,c.contextSpecial[1].value,c.contextSpecial[2].value],freq:[c.freq0,c.freq1,c.freq2,c.freq3,c.freq4],connect:[c.connect0,c.connect1,c.connect2,c.connect3,c.connect4,c.connect5],connectSpecial:[c.connectSpecial[0].value,c.connectSpecial[1].value]};c.valid=this.check(c);lsi.set("fiches",
+reltype:c.reltype,reltypeSpecial:c.reltypeSpecial.value,city:c.city.value,loc:c.loc,duration:[c.duration[0].value,c.duration[1].value],context:c.context,contextSpecial:[c.contextSpecial[0].value,c.contextSpecial[1].value,c.contextSpecial[2].value],freq:[c.freq0,c.freq1,c.freq2,c.freq3,c.freq4],connect:[c.connect0,c.connect1,c.connect2,c.connect3,c.connect4,c.connect5],connectSpecial:[c.connectSpecial[0].value,c.connectSpecial[1].value]};c.valid=this.check(c);lsi.set("fiches","form"+c.uid,c)}};
-"form"+c.uid,c)}};
 inputPhoneFiche.prototype.add=function(a){console.log("FICHE: ADD");if(null==a.uid)return!1;a.firstname=null!=a.firstname?a.firstname:this.defaultData.firstname;a.lastname=null!=a.lastname?a.lastname:this.defaultData.lastname;a.username=null!=a.username?a.username:this.defaultData.username;a.age=null!=a.age?a.age:this.defaultData.age;a.city=null!=a.city?a.city:this.defaultData.city;a.duration[0]=null!=a.duration[0]?a.duration[0]:this.defaultData.duration[0];a.duration[1]=null!=a.duration[1]?a.duration[1]:
 this.defaultData.duration[1];a.reltypeSpecial=null!=a.reltypeSpecial?a.reltypeSpecial:this.defaultData.reltypeSpecial;a.contextSpecial[0]=null!=a.contextSpecial[0]?a.contextSpecial[0]:this.defaultData.contextSpecial[0];a.contextSpecial[1]=null!=a.contextSpecial[1]?a.contextSpecial[1]:this.defaultData.contextSpecial[1];a.contextSpecial[2]=null!=a.contextSpecial[2]?a.contextSpecial[2]:this.defaultData.contextSpecial[2];a.connectSpecial[0]=null!=a.connectSpecial[0]?a.connectSpecial[0]:this.defaultData.connectSpecial[0];
 a.connectSpecial[1]=null!=a.connectSpecial[1]?a.connectSpecial[1]:this.defaultData.connectSpecial[1];a.job=null!=a.job?a.job:this.defaultData.job;a.studies=null!=a.studies?a.studies:this.defaultData.studies;a.sexe=null!=a.sexe?a.sexe:this.defaultData.sexe;a.famsit=null!=a.famsit?a.famsit:this.defaultData.famsit;a.reltype=null!=a.reltype?a.reltype:this.defaultData.reltype;a.loc=null!=a.loc?a.loc:this.defaultData.loc;a.context=null!=a.context?a.context:this.defaultData.context;a.freq=null!=a.freq?a.freq:

js/includes/input-phone-fiche.js

@@ -65,7 +65,7 @@ inputPhoneFiche.prototype.fieldsToStorage = function(){
         var deflated = deflater.deflate();
 
 
-        console.log(deflated);
+        // console.log(deflated);
 
 
         // {4} On récupère les données du LSI si elles existent //

js/includes/input-phone-mini-min.js

@@ -1,6 +1,6 @@
 function inputPhoneMini(a,b){this.container=a;this.nav_container=b}inputPhoneMini.prototype={container:this.container,nav_container:this.nav_container,selected:0,handler:null,defaultData:{firstname:"",lastname:"",username:"",sexe:[{status:!0},{status:!1}],age:"",job:".",loc:[{status:!0},{status:!1},{status:!1},{status:!1}]}};
-inputPhoneMini.prototype.fieldsToStorage=function(){console.log("MINI FICHE: FIELDS TO STORAGE");for(var a=$$("article.mini-relation-panel .mini-fiche-relation"),b=0;b<a.length;b++){var c=(new FormDeflater(a[b],["input","select"],["data-name"])).deflate();console.log(c);var d=lsi.get("mini-fiches","form"+c.uid.value);!1===d&&(d.username="inconnu",d.firstname="inconnu",d.lastname="inconnu");c={uid:c.uid.value,firstname:d.firstname,lastname:d.lastname,username:d.username,sexe:c.sexe,age:c.age.value,
+inputPhoneMini.prototype.fieldsToStorage=function(){console.log("MINI FICHE: FIELDS TO STORAGE");for(var a=$$("article.mini-relation-panel .mini-fiche-relation"),b=0;b<a.length;b++){var c=(new FormDeflater(a[b],["input","select"],["data-name"])).deflate(),d=lsi.get("mini-fiches","form"+c.uid.value);!1===d&&(d.username="inconnu",d.firstname="inconnu",d.lastname="inconnu");c={uid:c.uid.value,firstname:d.firstname,lastname:d.lastname,username:d.username,sexe:c.sexe,age:c.age.value,job:c.job.value,loc:c.loc};
-job:c.job.value,loc:c.loc};c.valid=this.check(c);lsi.set("mini-fiches","form"+c.uid,c)}};
+c.valid=this.check(c);lsi.set("mini-fiches","form"+c.uid,c)}};
 inputPhoneMini.prototype.add=function(a){console.log("MINI FICHE: ADD");if(null==a||null==a.uid)return!1;a.firstname=null!=a.firstname?a.firstname:this.defaultData.firstname;a.lastname=null!=a.lastname?a.lastname:this.defaultData.lastname;a.username=null!=a.username?a.username:this.defaultData.username;a.age=null!=a.age?a.age:this.defaultData.age;a.sexe=null!=a.sexe?a.sexe:this.defaultData.sexe;a.job=null!=a.job?a.job:this.defaultData.job;a.loc=null!=a.loc?a.loc:this.defaultData.loc;this.container.innerHTML+=
 miniFicheBuilder.build({firstname:a.firstname,lastname:a.lastname,username:a.username,uid:a.uid,age:a.age,job:a.job});var b=$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>span>select[data-name="job"]>option[value="'+a.job+'"]');null!=b&&b.setAttribute("selected","selected");for(var c=$$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>input[type="radio"][data-name="sexe"]'),b=0;b<c.length&&b<a.sexe.length;b++)a.sexe[b].status?c[b].setAttribute("checked",
 "checked"):c[b].removeAttribute("checked");c=$$('article.mini-fiche-relation input[data-name="uid"][value="'+a.uid+'"] ~ h5>input[type="radio"][data-name="loc"]');for(b=0;b<c.length&&b<a.loc.length;b++)a.loc[b].status?c[b].setAttribute("checked","checked"):c[b].removeAttribute("checked")};inputPhoneMini.prototype.storageToFields=function(){console.log("MINI FICHE: STORAGE TO FIELDS");var a=lsi["export"]("mini-fiches");this.container.innerHTML="";this.add(a["form"+this.selected]);this.updateNavBar()};

js/includes/input-phone-mini.js

@@ -39,7 +39,7 @@ inputPhoneMini.prototype.fieldsToStorage = function(){
         var deflated = deflater.deflate();
 
 
-        console.log(deflated);
+        // console.log(deflated);
 
 
         // {4} On récupère les données du LSI si elles existent //

manager/module/chart.php

@@ -11,7 +11,7 @@
 
 
 
-	class charts{
+	class chart{
 
 
 		/* RETOURNE UN JEU DE DONNEES POUR GRAPHIQUE #NETWORK

manager/module/module.php

@@ -2,9 +2,13 @@
 
 	namespace manager\module;
 	use \manager\ManagerError;
+	use \manager\ResourceDispatcher;
 
 	class module{
 
+		/* PERMET DE TESTER L'API
+		*
+		*/
 		public static function method(){
 
 			return array(
@@ -15,6 +19,9 @@
 		}
 
 
+		/* PERMET DE TESTER UNE L'ORDRE DES PARAMÈTRES
+		*
+		*/
 		public static function phpunitParams($params){
 			extract($params);
 
@@ -25,10 +32,58 @@
 			);
 		}
 
+		/* RENVOIE UNE DESCRIPTION EN MARKDOWN DES MODULES DE L'API
+		*
+		* @return markdown<String> 						Description des modules
+		*
+		*/
+		public static function markdown(){
+			/* [1] Récupération de la configuration
+			=========================================================*/
+			// On récupère le fichier et on le parse
+			$modules = json_decode( ResourceDispatcher::getResource('f/json/modules/conf'), true );
+
+			// Gestion de l'erreur de parsage
+			if( $modules == null )
+				return array( 'ModuleError' => ManagerError::ParsingFailed );
+
+			/* [2] Mise en forme de la liste des modules
+			=========================================================*/
+			$markdown = "## Module List<br>";
+
+			foreach($modules as $moduleName=>$moduleData)
+				$markdown .= "- $moduleName<br>";
+
+			/* [3] Mise en forme des méthodes des modules
+			=========================================================*/
+			$markdown .= '----<br>## Method List & Description<br>';
+
+			$count = 1;
+			foreach($modules as $moduleName=>$moduleData){
+				$markdown .= "### $count - '$moduleName' methods<br>";
+
+				foreach($moduleData as $methodName=>$methodData)
+					$markdown .= "- `$methodName` - ".$methodData['description']."<br>";
+
+				$markdown .= '----<br>';
+
+				$count++;
+			}
+
+
+
+			/* [n] Gestion du retour
+			=========================================================*/
+			return array(
+				'ModuleError' => ManagerError::Success,
+				'markdown'    => $markdown
+			);
+		}
 
 
 
 	}
 
 
+
 ?>

view/charts.php

@@ -13,7 +13,7 @@
 /* [1] Gestion du cercle des relations
 =======================================*/
 /* (1) On recupere les donnees */
-$getData = new ModuleRequest('charts/network_data');
+$getData = new ModuleRequest('chart/network_data');
 $answer = $getData->dispatch();
 
 // Si pas d'erreur
@@ -25,7 +25,7 @@ $data = $answer->get('data');
 
 
 /* (2) On recupere le rendu */
-$getRender = new ModuleRequest('charts/network_render', array('dataset' => $data));
+$getRender = new ModuleRequest('chart/network_render', array('dataset' => $data));
 $answer = $getRender->dispatch();
 
 // Si pas d'erreur

view/input.php

@@ -110,14 +110,23 @@
 
 		<!-- GESTION DES FICHES RELATIONS -->
 		<h3 data-n='4' class='color4'>Remplir les fiches relations complètes des contacts les plus contactés</h3>
-
 		<!-- NAVIGATION ENTRE LES FICHES -->
 		<div class='arrow-container line' id='nav-fiche'></div>
-
+		<article class='relation-panel'></article>
-		<article class='relation-panel'>
+		<span data-space></span>
 
 
+
+		<!-- BOUTON D'ENVOI DU FORMULAIRE -->
+		<h3 data-n='5' class='color4'>Envoi des données</h3>
+		<article class='submit-panel'>
+			<h4>
+				<input type='submit' class='line' value='Envoyer le formulaire' id='submit-all'>
+			</h4>
 		</article>
+
+
+
 	</section>
 	<span data-space></span>
 

view/js/input-min.js

@@ -1,8 +1,9 @@
-var clearAllButton=$("#clear-all"),importCallLog=$('input#call_log-import[type="file"]'),subjectManager,contactManager,miniManager,ficheManager;
+var clearAllButton=$("#clear-all"),submitAllButton=$("#submit-all"),importCallLog=$('input#call_log-import[type="file"]'),subjectManager,contactManager,miniManager,ficheManager;
 function dynamicUpdate(a){var c=a instanceof Element,b=c&&"SPAN"==a.tagName&&"switch-left"==a.className,d=c&&"SPAN"==a.tagName&&"switch-both"==a.className,e=c&&"INPUT"==a.tagName&&"submit"==a.type,f=c&&"SPAN"==a.tagName&&("nav-mini"==a.parentNode.id||"nav-fiche"==a.parentNode.id),c=c&&"SPAN"==a.tagName&&"nav-contact"==a.parentNode.id;if(!(d||b||e||f||c)&&!0!==a)return!1;if(d)console.log("> switch firstname <-> lastname"),b=a.parentNode,a=b.children[3],b=b.children[5],d=a.value,a.value=b.value,b.value=
 d;else if(b){console.log("> switch firstname+lastname -> username");b=a.parentNode;d=b.children[1];a=b.children[3];b=b.children[5];if(0<d.value.length||0==a.value.length&&0==b.value.length)return!1;d.value=a.value+" "+b.value;a.value="";b.value=""}else console.log("> dynamic update"),miniManager.fieldsToStorage(),ficheManager.fieldsToStorage(),contactManager.fieldsToStorage(),miniManager.sync(),ficheManager.sync(),miniManager.storageToFields(),ficheManager.storageToFields(),(e||c)&&contactManager.storageToFields()}
 function checkRadioValue(a){for(var c=0,b=0;b<a.length;b++)!0===a[b].status&&c++;return 1!=c?!1:!0}
 include("/js/includes/input-phone-subject.js",function(){include("/js/includes/input-phone-contact.js",function(){include("/js/includes/input-phone-mini.js",function(){include("/js/includes/input-phone-fiche.js",function(){subjectManager=new inputPhoneSubject($('article.subject-panel [data-name="number"]'),$('article.subject-panel [data-name="username"]'),$('article.subject-panel [data-name="firstname"]'),$('article.subject-panel [data-name="lastname"]'),$('article.subject-panel [data-name="submit"]'));
 subjectManager.attach();contactManager=new inputPhoneContact($("article.contact-panel"),$("#nav-contact"));contactManager.attach(dynamicUpdate);miniManager=new inputPhoneMini($("article.mini-relation-panel"),$("#nav-mini"));miniManager.attach(dynamicUpdate);ficheManager=new inputPhoneFiche($("article.relation-panel"),$("#nav-fiche"));ficheManager.attach(dynamicUpdate);importCallLog.addEventListener("change",function(a){api.send({path:"upload/call_log",file:importCallLog.files[0]},function(a){console.log(a);
 0==a.ModuleError&&(importCallLog.addClass("active"),a={path:"call_log/unserialize",phone_number:$("#subject_phone_number").value},api.send(a,function(a){console.log(a);if(0==a.ModuleError){for(var d=0;d<a.directory.length;d++){var c=(null===a.directory[d].name?"":a.directory[d].name).split(" ");lsi.set("contacts","form"+d,{uid:d,number:a.directory[d].number,username:1==c.length?c[0]:"",firstname:1<c.length?c[0]:"",lastname:1<c.length?c.splice(1).join(" "):""})}contactManager.storageToFields();dynamicUpdate(!0)}}))})},
-!1);clearAllButton.addEventListener("click",function(a){localStorage.clear();reload()},!1)})})})});
+!1);clearAllButton.addEventListener("click",function(a){localStorage.clear();reload()},!1);submitAllButton.addEventListener("click",function(a){console.log("> GATHERING ALL DATA");subjectManager.fieldsToStorage();contactManager.fieldsToStorage();miniManager.fieldsToStorage();ficheManager.fieldsToStorage();a={subject:lsi["export"]("subject"),contact:lsi["export"]("contacts"),mini:lsi["export"]("mini-fiches"),fiche:lsi["export"]("fiches")};console.log(a);api.send({path:"input/phone",data:a},function(a){console.log(a)},
+!1)},!1)})})})});

view/js/input.js

@@ -7,8 +7,12 @@
 
 /* [1] Initialisation des utilitaires et variables
 =========================================================*/
-/* (1) Bouton pour effacer toutes les données */
+/* (1) Boutons primaires */
-var clearAllButton = $('#clear-all');
+    // {1} pour effacer toutes les données //
+    var clearAllButton = $('#clear-all');
+    // {2} pour envoyer toutes les données //
+    var submitAllButton = $('#submit-all');
+
 
 /* (2) Input de type fichier pour l'import */
 var importCallLog = $('input#call_log-import[type="file"]');
@@ -274,6 +278,41 @@ include('/js/includes/input-phone-fiche.js', function(){
     }, false);
 
 
+    /* (7) Gestion de la validation et de l'envoi des données
+    ---------------------------------------------------------*/
+    submitAllButton.addEventListener('click', function(e){
+        console.log('> GATHERING ALL DATA')
+
+        /* (1) On met dans la mémoire tout les champs non enregistrés */
+        subjectManager.fieldsToStorage();
+        contactManager.fieldsToStorage();
+        miniManager.fieldsToStorage();
+        ficheManager.fieldsToStorage();
+
+        /* (2) On construit un objet qui contiendra toutes les données */
+        var data = {
+            subject: lsi.export('subject'),
+            contact: lsi.export('contacts'),
+            mini:    lsi.export('mini-fiches'),
+            fiche:   lsi.export('fiches')
+        };
+        console.log( data );
+
+        /* (3) On prépare la requête */
+        var request = {
+            path: 'input/phone',
+            data: data
+        };
+
+        /* (4) On envoie la requête et traite la réponse */
+        api.send(request, function(response){
+            console.log(response);
+        }, false);
+
+
+    }, false);
+
+
 
 }) }) }) });