From ca9ca6e29078edf8ae4f2042722b1cf92a4cb9ad Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 14:45:26 +0200
Subject: [PATCH 1/6] [POST cours|td|tp] adds the default formation if exists +
 given formations as arguments - also it returns as output the added formation
 id list

---
 build/api/module/ue/coursController.php | 24 +++++++++++++++++++++++-
 build/api/module/ue/tdController.php    | 25 +++++++++++++++++++++++--
 build/api/module/ue/tpController.php    | 23 ++++++++++++++++++++++-
 config/modules.json                     |  9 ++++++---
 4 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/build/api/module/ue/coursController.php b/build/api/module/ue/coursController.php
index f4ecc76..198a237 100644
--- a/build/api/module/ue/coursController.php
+++ b/build/api/module/ue/coursController.php
@@ -25,10 +25,31 @@ class coursController{
 		$formations = [];
 		extract($args);
 
-		/* Get the cours repo */
+		/* Get the repos */
 		/** @var cours $cours_repo */
 		$cours_repo = Repo::getRepo('cours');
+		/** @var ue $ue_repo */
+		$ue_repo = Repo::getRepo('ue');
 
+
+		/* (1) Fetch default formation from UE
+		---------------------------------------------------------*/
+		/* (1) Try to fetch the cours' UE */
+		$fetched_ue = $ue_repo->get($code);
+
+		/* (2) Manage error */
+		if( !is_array($fetched_ue) || count($fetched_ue) < 1 )
+			return ['error' => new Error(Err::RepoError)];
+
+		$defaultForm = intval($fetched_ue[0]['idForm']);
+
+		/* (3) Add to formation list if got a valid default formation */
+		if( is_int($defaultForm) && $defaultForm >= 0 && !in_array($defaultForm, $formations) )
+			$formations[] = $defaultForm;
+
+
+		/* (2) Create the cours
+		---------------------------------------------------------*/
 		/* (1) Try to create cours */
 		$created_id = $cours_repo->create($code, $idProf, $volume, $formations);
 
@@ -36,6 +57,7 @@ class coursController{
 		if( is_null($created_id) || !is_int($created_id) )
 			return ['error' => new Error(Err::RepoError)];
 
+
 		return ['created_id' => $created_id];
 
 	}
diff --git a/build/api/module/ue/tdController.php b/build/api/module/ue/tdController.php
index f617005..fb19c99 100644
--- a/build/api/module/ue/tdController.php
+++ b/build/api/module/ue/tdController.php
@@ -25,10 +25,31 @@ class tdController{
 		$formations = [];
 		extract($args);
 
-		/* Get the td repo */
+		/* Get the repos */
 		/** @var td $td_repo */
 		$td_repo = Repo::getRepo('td');
+		/** @var ue $ue_repo */
+		$ue_repo = Repo::getRepo('ue');
 
+
+		/* (1) Fetch default formation from UE
+		---------------------------------------------------------*/
+		/* (1) Try to fetch the TD' UE */
+		$fetched_ue = $ue_repo->get($code);
+
+		/* (2) Manage error */
+		if( !is_array($fetched_ue) || count($fetched_ue) < 1 )
+			return ['error' => new Error(Err::RepoError)];
+
+		$defaultForm = intval($fetched_ue[0]['idForm']);
+
+		/* (3) Add to formation list if got a valid default formation */
+		if( is_int($defaultForm) && $defaultForm >= 0 && !in_array($defaultForm, $formations) )
+			$formations[] = $defaultForm;
+
+
+		/* (2) Create the TD
+		---------------------------------------------------------*/
 		/* (1) Try to create td */
 		$created_id = $td_repo->create($code, $idProf, $volume, $formations);
 
@@ -36,7 +57,7 @@ class tdController{
 		if( is_null($created_id) || !is_int($created_id) )
 			return ['error' => new Error(Err::RepoError)];
 
-		return ['created_id' => $created_id];
+		return ['created_id' => $created_id, 'formations' => $formations];
 
 	}
 
diff --git a/build/api/module/ue/tpController.php b/build/api/module/ue/tpController.php
index 4fe66e1..dc36c81 100644
--- a/build/api/module/ue/tpController.php
+++ b/build/api/module/ue/tpController.php
@@ -25,10 +25,31 @@ class tpController{
 		$formations = [];
 		extract($args);
 
-		/* Get the tp repo */
+		/* Get the repos */
 		/** @var tp $tp_repo */
 		$tp_repo = Repo::getRepo('tp');
+		/** @var ue $ue_repo */
+		$ue_repo = Repo::getRepo('ue');
 
+
+		/* (1) Fetch default formation from UE
+		---------------------------------------------------------*/
+		/* (1) Try to fetch the TP' UE */
+		$fetched_ue = $ue_repo->get($code);
+
+		/* (2) Manage error */
+		if( !is_array($fetched_ue) || count($fetched_ue) < 1 )
+			return ['error' => new Error(Err::RepoError)];
+
+		$defaultForm = intval($fetched_ue[0]['idForm']);
+
+		/* (3) Add to formation list if got a valid default formation */
+		if( is_int($defaultForm) && $defaultForm >= 0 && !in_array($defaultForm, $formations) )
+			$formations[] = $defaultForm;
+
+
+		/* (2) Create the TP
+		---------------------------------------------------------*/
 		/* (1) Try to create tp */
 		$created_id = $tp_repo->create($code, $idProf, $volume, $formations);
 
diff --git a/config/modules.json b/config/modules.json
index ec5aa3d..0596718 100644
--- a/config/modules.json
+++ b/config/modules.json
@@ -316,7 +316,8 @@
 					"formations": { "des": "List of formations (ids)",  "typ": "array<id>", "opt": true, "def": [] }
 				},
 				"output": {
-					"created_id" : { "des": "The id of the created Cours", "typ": "id" }
+					"created_id" : { "des": "The id of the created Cours", "typ": "id" },
+					"formations" : { "des": "The ids of the linked formations", "typ": "array<id>" }
 				}
 			},
 
@@ -368,7 +369,8 @@
 					"formations": { "des": "List of formations (ids)",  "typ": "array<id>", "opt": true, "def": [] }
 				},
 				"output": {
-					"created_id" : { "des": "The id of the created TD", "typ": "id" }
+					"created_id" : { "des": "The id of the created TD", "typ": "id" },
+					"formations" : { "des": "The ids of the linked formations", "typ": "array<id>" }
 				}
 			},
 
@@ -420,7 +422,8 @@
 					"formations": { "des": "List of formations (ids)",  "typ": "array<id>", "opt": true, "def": [] }
 				},
 				"output": {
-					"created_id" : { "des": "The id of the created TP", "typ": "id" }
+					"created_id" : { "des": "The id of the created TP", "typ": "id" },
+					"formations" : { "des": "The ids of the linked formations", "typ": "array<id>" }
 				}
 			},
 

From 4e1ca634ff849618611c6a5d6f2d547f500550e6 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 14:46:50 +0200
Subject: [PATCH 2/6] fixed [ue.manage] list style + added ordering basis
 (TODO: order algorithm)

---
 webpack/component/ue/manage.vue  | 18 +++++++++---------
 webpack/data/ue.js               | 32 ++++++++++++++++++++++++++++++++
 webpack/scss/container/list.scss | 13 ++++++-------
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/webpack/component/ue/manage.vue b/webpack/component/ue/manage.vue
index 7adca42..572f910 100644
--- a/webpack/component/ue/manage.vue
+++ b/webpack/component/ue/manage.vue
@@ -12,9 +12,9 @@
 			<!-- FILTERS -->
 			<section class='filter'>
 				<div style='flex-basis: 3.2em'></div>
-				<div data-filter='1'>enseignant     <span class='arrow' data-way='down'></span></div>
-				<div data-filter='0'>volume horaire <span class='arrow' data-way='down'></span></div>
-				<div data-filter='0'>formations     <span class='arrow' data-way='down'></span></div>
+				<div :data-filter='gstore.order.current===0?1:0' @click='gstore.order_toggle(0)'>enseignant     <span class='arrow' :data-way='gstore.order.way'></span></div>
+				<div :data-filter='gstore.order.current===1?1:0' @click='gstore.order_toggle(1)'>volume horaire <span class='arrow' :data-way='gstore.order.way'></span></div>
+				<div :data-filter='gstore.order.current===2?1:0' @click='gstore.order_toggle(2)'>formations     <span class='arrow' :data-way='gstore.order.way'></span></div>
 
 			</section>
 
@@ -54,9 +54,9 @@
 				data-anim-incoming='1'
 				:data-anim-bounce='gstore.nav_anim.out?1:0'
 
+				:data-prof='c.idProf'
 				:data-vol='c.volume'
-				:data-form='c.formations.join(`|`)'
-				data-typ='cm'>
+				:data-form='c.formations.join(`|`)'>
 
 				<div class='icon remove' @click='gstore.rem(0, i)'></div>
 				<select v-model='c.new_prof' @change='gstore.upd_prof(0, i)'>
@@ -92,9 +92,9 @@
 				data-anim-incoming='1'
 				:data-anim-bounce='gstore.nav_anim.out?1:0'
 
+				:data-prof='td.idProf'
 				:data-vol='td.volume'
-				:data-form='td.formations.join(`|`)'
-				data-typ='td'>
+				:data-form='td.formations.join(`|`)'>
 
 				<div class='icon remove' @click='gstore.rem(1, i)'></div>
 				<select v-model='td.new_prof' @change='gstore.upd_prof(1, i)'>
@@ -130,9 +130,9 @@
 				data-anim-incoming='1'
 				:data-anim-bounce='gstore.nav_anim.out?1:0'
 
+				:data-prof='tp.idProf'
 				:data-vol='tp.volume'
-				:data-form='tp.formations.join(`|`)'
-				data-typ='td'>
+				:data-form='tp.formations.join(`|`)'>
 
 				<div class='icon remove' @click='gstore.rem(2, i)'></div>
 				<select v-model='tp.new_prof' @change='gstore.upd_prof(2, i)'>
diff --git a/webpack/data/ue.js b/webpack/data/ue.js
index 7d9fb35..e4aacd8 100644
--- a/webpack/data/ue.js
+++ b/webpack/data/ue.js
@@ -1078,6 +1078,38 @@ gstore.add('upd_prof', function(type, res_i){
 	});
 
 
+});
+
+/* (4) Ordering filters */
+gstore.add('order', {
+	available: ['prof', 'volume', 'forms'],
+	current: 0,
+	way: 1 // 1 ASC, -1 DESC
+});
+
+gstore.add('order_toggle', function(ord_i){
+
+	// 1. Check params types
+	if( isNaN(ord_i) || gstore.get.order.available[ord_i] == null )
+		return;
+
+	// 2. If new ordering field -> toggle it
+	if( ord_i !== gstore.get.order.current )
+		gstore.get.order.current = ord_i;
+
+	// 3. If already selected -> toggle way
+	else
+		gstore.get.order.way *= -1;
+
+	// 4. Get all elements to order
+	let els = document.querySelectorAll('section[data-prof][data-vol][data-form]');
+
+	// 5. Ordering by 'prof'
+
+
+
+
+
 });
 
 
diff --git a/webpack/scss/container/list.scss b/webpack/scss/container/list.scss
index eb0783d..8ef14d3 100644
--- a/webpack/scss/container/list.scss
+++ b/webpack/scss/container/list.scss
@@ -157,6 +157,8 @@
 
 		& > div{
 
+			cursor: default;
+
 			& > span.arrow{
 				display: inline-block;
 				position: relative;
@@ -165,13 +167,9 @@
 
 				margin-bottom: -.3em;
 
-				background: url('/asset/svg/down_arrow.svg@aaaaaa') center center no-repeat;
+				background: url() center center no-repeat;
 				background-size: auto 100%;
 
-
-				&[data-way='up']{   background-image: url('/asset/svg/up_arrow.svg@aaaaaa'); }
-				&[data-way='down']{ background-image: url('/asset/svg/down_arrow.svg@aaaaaa'); }
-
 				cursor: pointer;
 			}
 
@@ -180,8 +178,9 @@
 				color: $primary-color;
 
 				& > span.arrow{
-					&[data-way='up']{   background-image: url('/asset/svg/up_arrow.svg@555555'); }
-					&[data-way='down']{ background-image: url('/asset/svg/down_arrow.svg@555555'); }
+
+					&[data-way='-1']{   background-image: url('/asset/svg/up_arrow.svg@555555'); }
+					&[data-way='1']{ background-image: url('/asset/svg/down_arrow.svg@555555'); }
 				}
 
 			}

From 465fde053bc69cc77ee927f7fd1494f9b40759d3 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 14:48:48 +0200
Subject: [PATCH 3/6] fix api.ue.cours + api.ue.tp to return 'formations' id
 list

---
 build/api/module/ue/coursController.php | 3 +--
 build/api/module/ue/tpController.php    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/api/module/ue/coursController.php b/build/api/module/ue/coursController.php
index 198a237..72acc39 100644
--- a/build/api/module/ue/coursController.php
+++ b/build/api/module/ue/coursController.php
@@ -57,8 +57,7 @@ class coursController{
 		if( is_null($created_id) || !is_int($created_id) )
 			return ['error' => new Error(Err::RepoError)];
 
-
-		return ['created_id' => $created_id];
+		return ['created_id' => $created_id, 'formations' => $formations];
 
 	}
 
diff --git a/build/api/module/ue/tpController.php b/build/api/module/ue/tpController.php
index dc36c81..51a4a42 100644
--- a/build/api/module/ue/tpController.php
+++ b/build/api/module/ue/tpController.php
@@ -57,7 +57,7 @@ class tpController{
 		if( is_null($created_id) || !is_int($created_id) )
 			return ['error' => new Error(Err::RepoError)];
 
-		return ['created_id' => $created_id];
+		return ['created_id' => $created_id, 'formations' => $formations];
 
 	}
 

From 6d57e0aa5b47527d0b4ed50a72559a13ee6d3fe0 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 14:50:39 +0200
Subject: [PATCH 4/6] display default creation formations on UI for 'POST
 api.ue.*'

---
 webpack/data/ue.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/data/ue.js b/webpack/data/ue.js
index e4aacd8..9b2ac34 100644
--- a/webpack/data/ue.js
+++ b/webpack/data/ue.js
@@ -1282,7 +1282,7 @@ gstore.add('ccreate', function(){
 		newRes[`id${restyp2}`] = rs.created_id;
 		newRes[`idProf`]       = prof;
 		newRes[`volume`]       = vol;
-		newRes[`formations`]   = [];
+		newRes[`formations`]   = rs.formations;
 		newRes[`add_form`]     = '-';
 		newRes[`new_prof`]     = prof;
 

From bc5d2fff1977425e8c8f4b892c8cf6195747ad38 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 15:48:45 +0200
Subject: [PATCH 5/6] alphabetical professor order

---
 build/database/repo/professor.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/database/repo/professor.php b/build/database/repo/professor.php
index 0dc845b..4741a85 100644
--- a/build/database/repo/professor.php
+++ b/build/database/repo/professor.php
@@ -321,7 +321,7 @@ class professor extends Repo_i {
 		$parm = is_null($prof_id) ? [] : [':id' => $prof_id];
 
 		/* (2) Prepare Statement */
-		$st = $this->pdo->prepare("SELECT * FROM `Professeur`$cond ORDER BY abreviation ASC");
+		$st = $this->pdo->prepare("SELECT * FROM `Professeur`$cond ORDER BY firstName, lastName ASC");
 
 		/* (3) Bind params and execute statement */
 		if( is_bool($st) ) return [];
@@ -433,7 +433,8 @@ class professor extends Repo_i {
 			AND   VHTp.idProf                = Prof.idProfesseur
 			AND   VHTd.idProf                = Prof.idProfesseur
 			GROUP BY
-				Prof.idProfesseur;");
+				Prof.idProfesseur
+			ORDER BY Prof.firstName, Prof.lastName ASC;");
 
 		/* (3) Bind params and execute statement */
 		if( is_bool($st) ) return [];

From d803925b2bd7c1c1ca4a1c97011f65a7b51d988e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 8 May 2018 15:57:59 +0200
Subject: [PATCH 6/6] add ordering in 'vue.ue.manage' by professor name OR
 volume count | formation list length

---
 webpack/data/ue.js               | 30 +++++++++++++++++++++++++++++-
 webpack/scss/container/list.scss |  2 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/webpack/data/ue.js b/webpack/data/ue.js
index 9b2ac34..d739644 100644
--- a/webpack/data/ue.js
+++ b/webpack/data/ue.js
@@ -1104,7 +1104,35 @@ gstore.add('order_toggle', function(ord_i){
 	// 4. Get all elements to order
 	let els = document.querySelectorAll('section[data-prof][data-vol][data-form]');
 
-	// 5. Ordering by 'prof'
+	// 5. Ordering by formations
+	if( gstore.get.order.current === 2 ){
+		return els.forEach((el) => {
+			el.style.order = el.getAttribute('data-form').split('|').length * gstore.get.order.way
+		});
+	}
+
+	// 6. Ordering by 'volume'
+	if( gstore.get.order.current === 1 )
+		return els.forEach((el) => {
+			el.style.order = parseInt( el.getAttribute('data-vol') ) * gstore.get.order.way
+		});
+
+	// 7. Ordering by 'prof'
+	els.forEach((el) => {
+		var profId = parseInt( el.getAttribute('data-prof') );
+
+		// outside by default if no prof set
+		el.style.order = - gstore.get.order.way;
+
+		// professors are already sorted
+		for( pi in gstore.get.manage.prof ) {
+			if( gstore.get.manage.prof[pi].idProfesseur == profId ){
+				el.style.order = pi * gstore.get.order.way;
+				break;
+			}
+		}
+
+	});
 
 
 
diff --git a/webpack/scss/container/list.scss b/webpack/scss/container/list.scss
index 8ef14d3..6338b6c 100644
--- a/webpack/scss/container/list.scss
+++ b/webpack/scss/container/list.scss
@@ -22,6 +22,8 @@
 	/* (1) List element */
 	& > section{
 
+		order: -100000;
+
 		flex: 1 1 90%;
 
 		display: flex;