Maj tableau lettre et refresh json

core/class/proweb.class.php

@@ -4,7 +4,12 @@ class proweb
 {
     public static function getBase()
     {
-        db::query("SELECT * FROM " . DB_T_SALARIES_PROWEB);
+        db::query("SELECT *, 
+        IF(contrat = 1, 'Actif', 'Désactivé') AS texteContrat,
+        IF(actif = 1, 'Actif', 'Désactivé') AS texteActif,
+        IF(RHBase = 1, 'Présent', 'Absent') AS texteRHBase,
+        IF(error = 1, 'Erreur', 'Valide') AS texteError
+        FROM " . DB_T_SALARIES_PROWEB);
         return db::resultset();
     }
 

core/class/salaries.class.php

@@ -42,6 +42,7 @@ class salaries
             . "prenom, "
             . "sexe, "
             . "contrat, "
+            . "IF(contrat = 1, 'Actif', 'Désactivé') AS texteContrat, "
             . "DATE_FORMAT(jourEntree, '%Y-%m-%d') AS jourEntree, "
             . "DATE_FORMAT(repriseContrat, '%Y-%m-%d') AS repriseContrat, "
             . "DATE_FORMAT(jourSortie, '%Y-%m-%d') AS jourSortie, "
@@ -49,6 +50,7 @@ class salaries
             . "lieu, "
             . "cree, "
             . "maj, "
+            . "IF(actif = 1, 'Actif', 'Désactivé') AS texteActif, "
             . "actif "
             . "FROM " . DB_T_SALARIES);
         return db::resultset();

core/submit/cms.parametres-json-refresh.php

@@ -0,0 +1,14 @@
+<?php 
+
+json::create("salaries");
+json::create("excel");
+json::create("excel-proweb");
+json::create("events");
+json::create("users");
+json::create("salaries-proweb");
+json::create("lotterys");
+
+alert::recSuccess("Réinitialisation des JSON réalisé avec succès");
+
+header("Location: /parametres.html");
+exit();

core/views/pages/cms.parametres-general.php

@@ -28,12 +28,17 @@
     <label class="form-check-label" for="checkLogWarning">Historiser les actions réalisées avec warning</label>
 </div>
 
-
 <div class="element-parametres form-check form-switch">
     <input class="form-check-input" type="checkbox" role="switch" id="checkLogError" <?php core::checkboxSelecter($checkLogError) ?>>
     <label class="form-check-label" for="checkLogError">Historiser les actions en erreur</label>
 </div>
 
+<h4>Rechargement</h4>
+<div class="element-parametres">
+    <a href="/submit.php?from=parametres-json-refresh" onclick="return confirm('Etes-vous certain de vouloir réinitialiser les JSON ?')"><button type="button" class="btn btn-warning">Réinitialisation des JSON</button></a>
+</div>
+
+
 <?php if (session::accessUserByType(1) and session::getId() == 1 and (ENVIRONNEMENT == "DEV" or ENVIRONNEMENT == "PREPROD")) { ?>
 
     <h4>Développement</h4>

core/views/pages/cms.proweb-salaries.php

@@ -43,10 +43,10 @@
                 <th data-sortable="true" data-field="jourEntreeRH" data-filter-control="input">Entrée RH</th>
                 <th data-sortable="true" data-field="jourSortie" data-filter-control="input">Sortie</th>
                 <th data-sortable="true" data-field="lieu" data-filter-control="select">Localité</th>
-                <th data-sortable="true" data-field="contrat" data-filter-control="select">Contrat</th>
-                <th data-sortable="true" data-field="actif" data-filter-control="select">Actif</th>
-                <th data-sortable="true" data-field="RHBase" data-filter-control="select">Base RH</th>
-                <th data-sortable="true" data-field="error" data-filter-control="select">Erreur</th>
+                <th data-sortable="true" data-field="texteContrat" data-filter-control="select">Contrat</th>
+                <th data-sortable="true" data-field="texteActif" data-filter-control="select">Actif</th>
+                <th data-sortable="true" data-field="texteRHBase" data-filter-control="select">Base RH</th>
+                <th data-sortable="true" data-field="texteError" data-filter-control="select">Erreur</th>
                 <th data-sortable="true" data-field="errorJson" data-filter-control="input">Erreur info</th>
             </tr>
         </thead>

core/views/pages/cms.rh-liste-salaries.php

@@ -36,12 +36,12 @@
                 <th data-sortable="true" data-field="nom" data-filter-control="input">Nom</th>
                 <th data-sortable="true" data-field="prenom" data-filter-control="input">Prénom</th>
                 <th data-sortable="true" data-field="sexe" data-filter-control="select">Sexe</th>
-                <th data-sortable="true" data-field="contrat" data-filter-control="select">Statut Contrat</th>
+                <th data-sortable="true" data-field="texteContrat" data-filter-control="select">Statut Contrat</th>
                 <th data-sortable="true" data-field="jourEntree" data-filter-control="input">Date d'entrée</th>
                 <th data-sortable="true" data-field="repriseContrat" data-filter-control="input">Date de reprise</th>
                 <th data-sortable="true" data-field="jourSortie" data-filter-control="input">Date de sortie</th>
                 <th data-sortable="true" data-field="lieu" data-filter-control="select">Localité</th>
-                <th data-sortable="true" data-field="actif" data-filter-control="select">Actif</th>
+                <th data-sortable="true" data-field="texteActif" data-filter-control="select">Actif</th>
             </tr>
         </thead>
     </table>