From 179f27270caf2d056677a05c1174ed157d85e005 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 8 Apr 2020 17:46:29 +0200
Subject: [PATCH] Tri des images WIP

---
 core/module/install/ressource/defaultdata.php |   4 +-
 module/gallery/gallery.php                    | 154 +++++++++---------
 module/gallery/view/config/config.js.php      |   2 +-
 module/gallery/view/edit/edit.js.php          |   9 +-
 module/gallery/view/edit/edit.php             |  14 +-
 5 files changed, 83 insertions(+), 100 deletions(-)

diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 9b85e8de..064db0ad 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -547,7 +547,7 @@ class init extends common {
 						'icebergjpg' => 'Un iceberg',
 						'meadowjpg' => 'Une prairie'
 					],
-					'postion' => [
+					'position' => [
 						'desertjpg' => 3,
 						'icebergjpg' => 1,
 						'meadowjpg' => 2
@@ -566,7 +566,7 @@ class init extends common {
 						'cosmosjpg' => 'Le cosmos',
 						'nebulajpg' => 'Une nébuleuse'
 					],
-					'postion' => [
+					'position' => [
 						'earthjpg' => 1,
 						'cosmosjpg' => 3,
 						'nebulajpg' => 2
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 6ca4eeed..a2794f03 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -25,7 +25,7 @@ class gallery extends common {
 	public static $sort = [
 		'SORT_ASC' => 'Alphabétique ',
 		'SORT_DSC' => 'Alphabétique inversé',
-		'none' => 'Aucun tri',
+		'SORT_HAND' => 'Tri manuel',
 	];
 
 	public static $directories = [];
@@ -58,7 +58,7 @@ class gallery extends common {
 					'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
 					'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
 					'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
-					'position' => $i + 1 
+					'position' => $i
 				],
 				'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
 			]]);
@@ -69,29 +69,6 @@ class gallery extends common {
 		header('Refresh: 0;url='. helper::baseUrl() . $this->getUrl() );	
 	}
 
-	private function sortPicture() {
-		// Traitement du tri
-			$data = explode('&',($this->getInput('galleryEditFilterResponse')));
-			$data = str_replace('galleryTable%5B%5D=','',$data);
-			for($i=0;$i<count($data);$i++) {
-				$this->setData(['module', $this->getUrl(0), $data[$i], [
-					'config' => [
-						'position' => $this->getData(['module',$this->getUrl(0),$data[$i],'config'])
-					],
-					'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend']),
-					'position' => [
-
-					],
-				
-				]]);
-			}		
-			$this->saveData();
-			// Valeurs en sortie
-			// Recharge la page
-			header('Refresh: 0;url='. helper::baseUrl() . $this->getUrl() );	
-		}
-
-
 
 	/**
 	 * Configuration
@@ -175,7 +152,7 @@ class gallery extends common {
 				]]);
 				// Valeurs en sortie
 				$this->addOutput([
-					'redirect' => helper::baseUrl() . $this->getUrl(),
+					'redirect' => helper::baseUrl() . $this->getUrl(),					
 					'notification' => 'Modifications enregistrées',
 					'state' => true
 				]);
@@ -257,48 +234,56 @@ class gallery extends common {
 		else {
 			// Soumission du formulaire
 			if($this->isPost()) {
-				if ($this->getInput('galleryEditFilterResponse')) {
-					self::sortPicture();
+				if ($this->getInput('galleryEditFormResponse')) {
+					// Tri des images
+					$picturesPosition = explode('&',($this->getInput('galleryEditFormResponse')));
+					$picturesPosition = str_replace('galleryTable%5B%5D=','',$picturesPosition);	
+					$picturesPosition = array_flip($picturesPosition);
 				} else {
-					// Si l'id a changée
-					$galleryId = $this->getInput('galleryEditName', helper::FILTER_ID, true);
-					if($galleryId !== $this->getUrl(2)) {
-						// Incrémente le nouvel id de la galerie
-						$galleryId = helper::increment($galleryId, $this->getData(['module', $this->getUrl(0)]));
-						// Supprime l'ancienne galerie
-						$this->deleteData(['module', $this->getUrl(0), $this->getUrl(2)]);
-					}
-					// légendes
-					$legends = [];
-					foreach((array) $this->getInput('legend', null) as $file => $legend) {
-						$file = str_replace('.','',$file);
-						$legends[$file] = helper::filter($legend, helper::FILTER_STRING_SHORT);
-					}
-					// Photo de la page de garde de l'album
-					$homePicture = array_keys($this->getInput('homePicture', null));
-					// Sauvegarder
-					$this->setData(['module', $this->getUrl(0), $galleryId, [
-						'config' => [
-							'name' => $this->getInput('galleryEditName', helper::FILTER_STRING_SHORT, true),
-							'directory' => $this->getInput('galleryEditDirectory', helper::FILTER_STRING_SHORT, true),
-							'homePicture' => $homePicture[0],
-							'sort' => $this->getInput('galleryEditSort'),
-							'position' => count($this->getData(['module',$this->getUrl(0)])) + 1
-						],
-						'legend' => $legends
-					]]);
-					// Valeurs en sortie
-					$this->addOutput([
-						'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
-						'notification' => 'Modifications enregistrées',
-						'state' => true
-					]);
+					$picturesPosition = $this->getData(['module',$this->getUrl(0),'position']);
 				}
+				// Si l'id a changée
+				$galleryId = $this->getInput('galleryEditName', helper::FILTER_ID, true);
+				if($galleryId !== $this->getUrl(2)) {
+					// Incrémente le nouvel id de la galerie
+					$galleryId = helper::increment($galleryId, $this->getData(['module', $this->getUrl(0)]));
+					// Supprime l'ancienne galerie
+					$this->deleteData(['module', $this->getUrl(0), $this->getUrl(2)]);
+				}
+				// légendes
+				$legends = [];
+				foreach((array) $this->getInput('legend', null) as $file => $legend) {
+					$file = str_replace('.','',$file);
+					$legends[$file] = helper::filter($legend, helper::FILTER_STRING_SHORT);
+				}
+				// Photo de la page de garde de l'album
+				$homePicture = array_keys($this->getInput('homePicture', null));
+				// Sauvegarder
+				$this->setData(['module', $this->getUrl(0), $galleryId, [
+					'config' => [
+						'name' => $this->getInput('galleryEditName', helper::FILTER_STRING_SHORT, true),
+						'directory' => $this->getInput('galleryEditDirectory', helper::FILTER_STRING_SHORT, true),
+						'homePicture' => $homePicture[0],
+						'sort' => $this->getInput('galleryEditSort'),
+						'position' => count($this->getData(['module',$this->getUrl(0)]))
+					],
+					'legend' => $legends,
+					'position' => empty($picturesPosition) ? $this->getData(['module', $this->getUrl(0),  $this->getUrl(2),'position']) : $picturesPosition
+				]]);
+				// Valeurs en sortie
+				$this->addOutput([
+					//'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
+					'redirect' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(2)  . '/' . $_SESSION['csrf'],
+					'notification' => 'Modifications enregistrées',
+					'state' => true
+				]);
+			
 			}
 			// Met en forme le tableau
 			$directory = $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'config', 'directory']);
 			if(is_dir($directory)) {
 				$iterator = new DirectoryIterator($directory);
+				
 				foreach($iterator as $fileInfos) {
 					if($fileInfos->isDot() === false AND $fileInfos->isFile() AND @getimagesize($fileInfos->getPathname())) {
 						// Créer la miniature si manquante
@@ -307,35 +292,44 @@ class gallery extends common {
 											str_replace('source','thumb',$fileInfos->getPath()) .  '/' . self::THUMBS_SEPARATOR  . strtolower($fileInfos->getFilename()),
 											self::THUMBS_WIDTH);
 						}
-						self::$pictures[$fileInfos->getFilename()] = [
+						self::$pictures[str_replace('.','',$fileInfos->getFilename())] = [								
 							template::ico('sort'),
 							$fileInfos->getFilename(),
 							template::checkbox( 'homePicture[' . $fileInfos->getFilename() . ']', true, '', [ 
 								'checked' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2),'config', 'homePicture']) === $fileInfos->getFilename() ? true : false,
 								'class' => 'homePicture'
-
 							]),	
 							template::text('legend[' . $fileInfos->getFilename() . ']', [
 								'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'legend', str_replace('.','',$fileInfos->getFilename())])
 							]),
 							'<a href="'. str_replace('source','thumb',$directory)  . '/mini_' . $fileInfos->getFilename() .'" rel="data-lity" data-lity=""><img src="'. str_replace('source','thumb',$directory) . '/' . $fileInfos->getFilename() .  '"></a>'
 						];
-						// Tableau des id des galleries pour le drag and drop
-						self::$picturesId[] = $fileInfos->getFilename();
+						self::$picturesId [] = str_replace('.','',$fileInfos->getFilename());
 					}
 				}
-
 				// Tri des images par ordre alphabétique
+		
 				switch ($this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'config', 'sort'])) {
-					case 'none':
+					case 'SORT_HAND':
+						$positions = $this->getdata(['module',$this->getUrl(0), $this->getUrl(2),'position']);
+						if ($positions) {
+							foreach ($positions as $position => $name) {
+								$tempPictures [] = self::$pictures[$position];							
+								$tempPicturesId [] = $position;																
+							}							
+							self::$pictures = $tempPictures;
+							self::$picturesId  = $tempPicturesId;
+						}
 						break;
+					case 'SORT_ASC':
+						ksort(self::$pictures,SORT_NATURAL);
+						sort(self::$picturesId,SORT_NATURAL);
+						break;						
 					case 'SORT_DSC':
 						krsort(self::$pictures,SORT_NATURAL);
+						rsort(self::$picturesId,SORT_NATURAL);
 						break;													
-					case 'SORT_ASC':
-					default:
-						ksort(self::$pictures,SORT_NATURAL);
-						break;
+
 				}	
 			}
 			// Valeurs en sortie
@@ -370,7 +364,8 @@ class gallery extends common {
 					$iterator = new DirectoryIterator($directory);
 					foreach($iterator as $fileInfos) {
 						if($fileInfos->isDot() === false AND $fileInfos->isFile() AND @getimagesize($fileInfos->getPathname())) {
-							self::$pictures[$directory . '/' . $fileInfos->getFilename()] = $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'legend', str_replace('.','',$fileInfos->getFilename())]);
+							self::$pictures[$directory . '/' . $fileInfos->getFilename()] = $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'legend', str_replace('.','',$fileInfos->getFilename())]);							
+							$picturesSort[$directory . '/' . $fileInfos->getFilename()] = $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'position', str_replace('.','',$fileInfos->getFilename())]);
 							// Créer la miniature si manquante
 							if (!file_exists( str_replace('source','thumb',$fileInfos->getPathname()) . '/' . self::THUMBS_SEPARATOR  . strtolower($fileInfos->getFilename()))) {
 								$this->makeThumb($fileInfos->getPathname(),
@@ -385,8 +380,15 @@ class gallery extends common {
 					}
 					// Tri des images par ordre alphabétique
 					switch ($this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'sort'])) {
-						case 'none':
-							break;
+						case 'SORT_HAND':
+							asort($picturesSort);
+							if ($picturesSort) {
+								foreach ($picturesSort as $name => $position) {
+									$temp[$name] = self::$pictures[$name];
+								}				
+								self::$pictures = $temp;
+								break;
+							}
 						case 'SORT_DSC':
 							krsort(self::$pictures,SORT_NATURAL);
 							break;													
@@ -402,10 +404,6 @@ class gallery extends common {
 					$this->addOutput([
 						'showBarEditButton' => true,
 						'title' => $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'name']),
-						/* Désactivé car SLB est actif pour tout le site
-						'vendor' => [
-							'simplelightbox'
-						],*/
 						'view' => 'gallery'
 					]);
 				}
diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php
index c79e46ce..d40ad1ec 100644
--- a/module/gallery/view/config/config.js.php
+++ b/module/gallery/view/config/config.js.php
@@ -26,7 +26,7 @@ $( document ).ready(function() {
 
 // Activer le bouton de tri uniquement après un tri
 $("#galleryTable").click(function() {
-	if ($("#galleryConfigFilterResponse").val() != "") {
+	if ($("#galleryEditFilterResponse").val() != "") {
 		$(":input[type='submit']").prop('disabled', false);
 	}
 });
diff --git a/module/gallery/view/edit/edit.js.php b/module/gallery/view/edit/edit.js.php
index 4b6d6f35..2cdb78ad 100644
--- a/module/gallery/view/edit/edit.js.php
+++ b/module/gallery/view/edit/edit.js.php
@@ -61,15 +61,8 @@ $('.homePicture').click(function(){
 $( document ).ready(function() {
 	$("#galleryTable").tableDnD({		
 		onDrop: function(table, row) {
-			$("#galleryEditFilterResponse").val($.tableDnD.serialize());
+			$("#galleryEditFormResponse").val($.tableDnD.serialize());
 		},
 		serializeRegexp:  "[^\_]*$"
 	});
 });
-
-// Activer le bouton de tri uniquement après un tri
-$("#galleryTable").click(function() {
-	if ($("#galleryEditResponse").val() != "") {
-		$(":input[type='submit']").prop('disabled', false);
-	}
-});
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index ce8b484e..af1c842e 100644
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@@ -44,24 +44,16 @@
 			</div>
 		</div>
 	</div>
-<?php echo template::formClose(); ?>	
-<?php echo template::formOpen('galleryEditFilterForm'); ?>
+	
 	<?php if($module::$pictures): ?>
 		<?php echo template::table([1, 4, 1, 5, 1], $module::$pictures, ['','Image', 'Couverture','Légende',''],['id' => 'galleryTable'], $module::$picturesId ); ?>
-		<?php echo template::hidden('galleryEditFilterResponse'); ?>
-		<?php echo template::hidden('galleryEditFilterSubmit',[
+		<?php echo template::hidden('galleryEditFormResponse'); ?>
+		<?php echo template::hidden('galleryEditSubmit',[
 					'value' => false
 				]); ?>
 	<?php else: ?>
 		<?php echo template::speech('Aucune galerie.'); ?>
 	<?php endif; ?>
-	<div class="row">
-		<div class="col2 offset10">
-			<?php echo template::submit('galleryEditFilterSubmit', [
-				'value' => 'Trier',
-				'disabled' => true
-			]); ?>
-		</div>
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°