Fixe erreur data fichier RH

core/class/salaries.class.php

@@ -263,6 +263,12 @@ class salaries
             $sql = $change = NULL;
             if ($key > 0) {
                 $tmp = self::excelToMysql($value);
+                if(!is_int($tmp["idLocal"])) {
+                    alert::recError("Une valeur dans le fichie n'est pas conforme à l'attendu (Ligne " . $key . ")");
+                    self::cleanTmp();
+                    self::excelUpdateInProgress(self::lastExcel(), 0);
+                    return FALSE;
+                }
                 $salarieByidLocal = self::getSalarieByidLocal($tmp["idLocal"]);
 
                 if (isset($salarieByidLocal["idLocal"])) {
@@ -381,8 +387,10 @@ class salaries
 
         if ($cp["INSERT"]["ERROR"] != 0 or $cp["INSERT"]["ERROR"] != 0) {
             alert::recError("Une erreur s'est produite lors de la mise en cache.");
+            return TRUE;
         } else {
             alert::recSuccess("La mise en cache a été réalisée avec succès.");
+            return TRUE;
         }
     }
 

core/submit/cms.rh-excel-to-temp.php

@@ -8,10 +8,10 @@ if (core::ifPost("from") AND core::getPost("from") == "rh-excel-to-temp") {
     $new_salaries = salaries::getExcelArray(core::getPost("excel"));
 
     if (isset($new_salaries)) {
-        salaries::update_temp_salaries($new_salaries, core::getPost("excel"));
+        $location = (salaries::update_temp_salaries($new_salaries, core::getPost("excel")) == FALSE) ? "/rh-historique-excel.html" : "/rh-import-to-temp.html";
         salaries::updateInactiveTempSalarie();
     }
-    header("Location: /rh-import-to-temp.html");
+    header("Location: " . $location);
     exit();
 } else {
     header('HTTP/1.0 401 Unauthorized');

core/views/pages/cms.rh-historique-excel.php

@@ -52,11 +52,17 @@
     <script>
         function selectFormatter(value, row) { 
             if(row.goMysql == null ){
-                return '<form method="post" action="/submit.php"  onsubmit="loading()">\n\
+                $return = '<form style="float: left;" method="post" action="/submit.php"  onsubmit="loading()">\n\
                             <input type="hidden" name="from" value="rh-excel-to-temp">\n\
                             <input type="hidden" name="excel" value="' + value + '">\n\
-                            <button type="submit" class="btn btn-outline-primary btn-sm">Traiter ce fichier</button>\n\
+                            <button type="submit" class="btn btn-outline-primary btn-sm">Traiter</button>\n\
                         </form>';
+                $return += '<form method="post" action="/submit.php">\n\
+                        <input type="hidden" name="from" value="rh-annule-import">\n\
+                        <input type="hidden" name="id" value="' + row.id + '">\n\
+                        <button type="submit" style="margin-left:10px;" class="btn btn-outline-danger btn-sm" title="Annuler l\'import">Annuler</button>\n\
+                    </form>';
+                return $return;
             } else {
                 return '<button class="btn btn-light btn-sm" disabled>Fichier déjà traiter</button>'; 
             }
@@ -79,7 +85,7 @@
                             </form>';
                 return $return;
             } else if(row.goMysql == null ){
-                return '<button class="btn btn-outline-primary btn-sm" disabled>Traiter ce fichier</button>';
+                return '<button class="btn btn-outline-primary btn-sm" disabled>Traiter</button>';
             } else {
                 return '<button class="btn btn-light btn-sm" disabled>Fichier déjà traiter</button>'; 
             }