Maj vérification import Proweb

core/class/alert.class.php

@@ -107,7 +107,7 @@ class alert
     {
         $text = ($_texte != NULL) ? self::printAlert($_texte) : NULL;
         
-        echo '  <div  id="' . $_idAlert . '" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true" data-delay="1500" style="margin-top:10px; ' . $_style . '">
+        echo '  <div  id="' . $_idAlert . '" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true" data-delay="3000" style="margin-top:10px; ' . $_style . '">
                     <div class="toast-header">' . $_icon . '</div><div class="toast-body" id="' . $_idAlert . 'Txt">' . $text . '</div>
                 </div>';
     }

core/submit/cms.proweb-import-salaries.php

@@ -36,6 +36,13 @@ if (core::ifPost("from") AND core::getPost("from") == $name["files"]) {
             $simpleXLSX = new simpleXLSX();
             $dataExcel = $simpleXLSX->parse($_FILES[$name["files"]]['tmp_name']);
             $returnData = $dataExcel->rows();
+
+            $nbImport = count($returnData)-1;
+            if(core::getConfig("MIN_PROWEB_PEOPLE") >= $nbImport){
+                alert::recError("Votre fichier comporte " . $nbImport . " salariés ce qui n'est pas normal. Votre fichier devrait comprendre plus de " . core::getConfig("MIN_PROWEB_PEOPLE") . " salariés.");
+                header("Location: /proweb-salaries-upload.html");
+                exit();
+            }
             
             db::query("TRUNCATE TABLE ". DB_T_SALARIES_PROWEB);
             db::execute();

core/views/pages/cms.documents.php

@@ -1,6 +1,4 @@
 <?php
-    //json::create("documents");
-
     $jsonTarget = "/json.php?file=documents";
     if(core::isDebug()){
         debug::log(debug::getBadge($jsonTarget, "OUVRIR LE JSON : ".$jsonTarget), "JSON chargé en arrière plan");
@@ -39,19 +37,18 @@
         data-pagination="true"
         data-filter-control="true"
         data-flat="true"
-        data-sort-name="cree"
+        data-sort-name="date"
         data-sort-order="desc"
         data-url="<?php echo $jsonTarget ?>">
         <thead>
             <tr>
-                <th data-sortable="true" data-field="id" data-filter-control="input" data-width="15">#</th>
-                <th data-sortable="true" data-field="titre" data-filter-control="input">Titre</th>
-                <th data-sortable="true" data-field="label" data-filter-control="select" data-width="200">Type</th>
                 <th data-sortable="true" data-field="date" data-filter-control="input" data-width="100">Date</th>
+                <th data-sortable="true" data-field="titre" data-filter-control="input">Titre</th>
+                <th data-sortable="true" data-field="label" data-filter-control="select" data-width="180">Type</th>
                 <th data-sortable="true" data-field="deadline" data-filter-control="input" data-width="100">Echéance</th>
                 <th data-sortable="true" data-field="tags" data-filter-control="input" data-width="200">Tags</th>
                 <th data-sortable="true" data-field="assign" data-filter-control="input" data-width="200">Attribution</th>
-                <th data-sortable="true" data-field="done" data-filter-control="select" data-width="50">Statut</th>
+                <th data-sortable="true"s data-field="done" data-filter-control="select" data-width="100">Statut</th>
                 <th data-sortable="true" data-field="montant" data-filter-control="input" data-width="110" data-formatter="dataFormatter" data-footer-formatter="montantFormatter">Montant</th>
                 <th data-field="id" data-formatter="selectFormatter" data-width="60"></th>
             </tr>
@@ -80,4 +77,5 @@
         });
         return parseFloat(total) === 0 ? euro.format(0.00) : euro.format(total.toFixed(2));
     }
+    
 </script>

maj/sql/maj.sql

@@ -1,2 +1,2 @@
 
-ALTER TABLE `documents` ADD `montant` FLOAT NOT NULL DEFAULT '0' AFTER `description`;
+INSERT INTO `config` (`id`, `name`, `value`) VALUES ('6', 'MIN_PROWEB_PEOPLE', '5435');