Bugfix et Améliorations Export CSV

Etienne Pallier
1 parent 66b80e1a
Showing 3 changed files with 50 additions and 26 deletions Show diff stats
README.md
src/Controller/MaterielsController.php
src/Template/Materiels/view.ctp
@@ -53,11 +53,11 @@ Logiciel testé et validé sur les configurations suivantes :
  
 VERSION ACTUELLE
  
-Date: 04/06/2019
-Version: 2.12.26
+Date: 05/06/2019
+Version: 2.12.27
 Author: EP
 Commentaire: 
-	Bugfix et Améliorations Emprunt
+	Bugfix et Améliorations Export CSV
  
 IMPORTANT : 
 	- Pour connaitre la version actuelle, taper "./VERSION"
@@ -93,6 +93,12 @@ La liste ci-dessous n&#39;est plus à jour, elle est désormais en ligne ici : https
  
 -----------------------------------------------------------------------------------------------------------
  
+05/06/2019	Version: 2.12.27 (EP)
+			Bugfix et Améliorations Export CSV
+			
+04/06/2019	Version: 2.12.26 (EP)
+			Bugfix et Améliorations Emprunt
+	
 03/06/2019	Version: 2.12.24-25 (EP)
 			LDAP CACHED v3
  
@@ -2281,6 +2281,7 @@ class MaterielsController extends AppController
  
         $contain = ['Fournisseurs'];
  
+        // EXPORT SELECTED materiels only
         if ($this->request->getData('export') !== null) {
             $this->myDebug("IN EXPORT");
             $what = $this->request->getData('what');
@@ -2298,22 +2299,27 @@ class MaterielsController extends AppController
             }
  
             $this->myDebug($selectedMateriels);
+            // Si la liste de materiels cochés est vide, ne rien faire
+            if (empty($selectedMateriels)) {
+                if ($what != '' && $what != 'search') return $this->redirect(['action' => 'index', $what]);
+                else if ($what == 'search') return $this->redirect('javascript:window.history.go(-3)');
+                else return $this->redirect(['action' => 'index']);
+            }
  
+            //if (sizeof($selectedMateriels) > 0) {
+            $materiels = $this->Materiels->find('all')
+                ->where(['Materiels.id' => $selectedMateriels[0]])
+                ->contain($contain);
  
-            if (sizeof($selectedMateriels) > 0) {
-                
-                $materiels = $this->Materiels->find('all')
-                    ->where(['Materiels.id' => $selectedMateriels[0]])
-                    ->contain($contain);
-                
-                for ($j = 0; $j < sizeof($selectedMateriels); $j ++) {
-                    $materiels->orWhere([
-                        'Materiels.id' => $selectedMateriels[$j]
-                    ]);
-                }
-                
-                $this->myDebug($materiels);
+            for ($j = 0; $j < sizeof($selectedMateriels); $j ++) {
+                $materiels->orWhere([
+                    'Materiels.id' => $selectedMateriels[$j]
+                ]);
             }
+            //$this->myDebug($materiels);
+            //}
+
+        // EXPORT ALL materiels
         } else if ($this->request->getData('exportAll') !== null) {
             $this->myDebug("IN EXPORTALL");
  
@@ -2335,9 +2341,10 @@ class MaterielsController extends AppController
                     'contain' => $contain
                 ]);
             }
-            
             $this->myDebug("what is " . $what);
             $this->myDebug("statut is " . $status);
+        
+        // OTHER CASE 3
         } else if (isset($this->request->getAttribute('params')['pass'][0])) {
             $this->myDebug("OTHER CASE 3");
             $what = $this->request->getAttribute('params')['pass'][0];
@@ -2345,6 +2352,8 @@ class MaterielsController extends AppController
             if ($what == 'search') {
                 $materiels = $this->request->getSession()->read("result");
             }
+            
+        // OTHER CASE 4
         } else {
             $this->myDebug("OTHER CASE 4");
             $materiels = $this->Materiels->find('all', [
@@ -2355,8 +2364,14 @@ class MaterielsController extends AppController
             ]);
         }
  
-        $this->myDebug("Nb matos = " . count($materiels));
-        $this->myDebug($materiels, true);
+        
+        // NOW, CREATE THE CSV file from $materiels
+        
+        $this->myDebug("Nb matos = " .$materiels->count());
+        //$this->myDebug("Nb matos = " . count($materiels));
+        
+        //$this->myDebug($materiels, true);
+        $this->myDebug($materiels);
  
         ini_set('max_execution_time', 600);
  
@@ -2413,9 +2428,12 @@ class MaterielsController extends AppController
             "Email responsable"
         ];
  
+        // 1) Write HEADER row        
         fputcsv($csv_file, $header_row, ';');
  
+        // 2) Write DATA rows, 1 by 1
         foreach ($materiels as $result) {
+            $this->myDebug($result);
             $row = [
                 //utf8_encode($result->id),
                 $result->designation
@@ -2443,7 +2461,7 @@ class MaterielsController extends AppController
             array_push($row, $result->numero_laboratoire);
             array_push($row, $result->description);
  
-            if ($organismes[$result->organisme_id] !== null) {
+            if ( !is_null($result->organisme_id) && !is_null($organismes[$result->organisme_id] ) ) {
                 array_push($row, $organismes[$result->organisme_id]);
             } else {
                 array_push($row, "");
@@ -539,10 +539,10 @@ $bStyle = &#39;margin:0&#39;;
 			<tr>
 				<th class="actions"><?=__('')?></th>
 				<th><?=__('N°')?></th>
-				<th><?=__('Type d\'intervention')?></th>
+				<th><?=__('Type')?></th>
 				<th><?=__('Intitulé')?></th>
-				<th><?=__('Date debut / Frequence')?></th>
-				<th><?=__('Date fin / Repetition')?></th>
+				<th><?=__('Date début / Fréquence')?></th>
+				<th><?=__('Date fin / Répétition')?></th>
 				<th><?=__('Statut')?></th>
 			</tr>
 			<?php foreach ($materiel->suivis as $suivi) :?>
@@ -621,10 +621,10 @@ $bStyle = &#39;margin:0&#39;;
 				<th class="actions"><?=__('')?></th>
 				<th><?=__('N°')?></th>
 				<th><?=__('Emprunteur')?></th>
-				<th><?=__('Type d\'Emprunt')?></th>
+				<th><?=__("Type")?></th>
 				<th><?=__('Lieu')?></th>
-				<th><?=__('Date de l\'emprunt')?></th>
-				<th><?=__('Date de retour')?></th>
+				<th><?=__('Date emprunt')?></th>
+				<th><?=__('Date retour')?></th>
 			</tr>
 				<?php