Clean menu et titre

core/class/core.class.php

@@ -46,12 +46,16 @@ class core
         }
     }
 
-    public static function convertDate(string $datetime)
+    public static function convertDate(string $_datetime, bool $_hour = TRUE)
     {
-        $pieces = explode(" ", $datetime);
+        $pieces = explode(" ", $_datetime);
         $pieces3 = explode(":", $pieces[1]);
         $pieces2 = explode("-", $pieces[0]);
-        return $pieces2[2] . "/" . $pieces2[1] . "/" . $pieces2[0] . " à " . $pieces3[0] . ":" . $pieces3[1];
+        if($_hour == TRUE){
+            return $pieces2[2] . "/" . $pieces2[1] . "/" . $pieces2[0] . " à " . $pieces3[0] . ":" . $pieces3[1];
+        } else {
+            return $pieces2[2] . "/" . $pieces2[1] . "/" . $pieces2[0];
+        }
     }
 
     public static function dateFr(string $_timestampMysql = NULL)

core/views/_cms.menu.php

@@ -15,7 +15,7 @@
                 if(session::accessUserByType(1)){ 
                     core::elementMenu("proweb-salaries", "/proweb-salaries.html", "Proweb : Liste des salariés", "archive");
                     core::elementMenu("proweb-historique-excel", "/proweb-historique-excel.html", "Proweb : Historique des Excels", "file-text");
-                    core::elementMenu("proweb-export-csv", "/proweb-export-csv.html", "Proweb : Transfert de données", "send"); 
+                    core::elementMenu("proweb-export-csv", "/proweb-export-csv.html", "Proweb : Transfert des données", "send"); 
                 }
                 
                 if(session::accessUserByType(1) OR session::accessUserByType(3)){ 

core/views/pages/cms.parametres.php

@@ -5,15 +5,15 @@ $checkDebug = core::isDebug();
 
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Paramètres</span>
+        <span>IT : Paramètres</span>
     </h2>
 </header>
 <?php
 echo core::filAriane(array(
-    "current" => "Paramètres",
+    "current" => "IT : Paramètres",
     "arbo" => array(
         "Administration" => NULL,
-        "Paramètres" => "/arametres.html"
+        "IT : Paramètres" => "/parametres.html"
     )
 ));
 ?>

core/views/pages/cms.proweb-export-csv.php

@@ -10,7 +10,7 @@ json::create("host");
 
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Exporter vers ProWeb</span>
+        <span>Proweb : Exporter vers ProWeb</span>
     </h2>
 </header>
 <?php

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

@@ -1,17 +1,16 @@
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Base ProWeb : Historique des Excels</span>
+        <span>Proweb : Historique des Excels</span>
         <a href="proweb-salaries-upload.html" style="position: absolute; right: 0; margin: 0 40px 0 0;"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
         <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank" style="position: absolute; right: 0; margin: 0 250px 0 0;"><button type="submit" class="btn btn-outline-secondary btn-sm"><span data-feather="link"></span> Exporter tous les salariés depuis Proweb</button></a>
     </h2>
 </header>
 <?php   
         echo core::filAriane(array(
-            "current" => "Historique des Excels (base Proweb)", 
+            "current" => "Historique des Excels", 
             "arbo" => array( 
-                "Salariés" => NULL,
-                "Liste des salariés (base Proweb)" => "/proweb-salaries.html",
-                "Historique des Excels (base Proweb)" => "/proweb-historique-excel.html")
+                "Proweb" => NULL,
+                "Historique des Excels" => "/proweb-historique-excel.html")
         )); 
 ?>
 <div>

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

@@ -2,16 +2,16 @@
 
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Base ProWeb : Importer un fichier Excel</span>
+        <span>ProWeb : Importer un fichier Excel</span>
     </h2>
 </header>
 <?php   
         echo core::filAriane(array(
-            "current" => "Liste des salariés", 
+            "current" => "Importer un fichier Excel", 
             "arbo" => array( 
                 "Proweb" => NULL,
                 "Liste des salariés" => "/proweb-salaries.html",
-                "Importer un fichier Excel (base Proweb)" => "/proweb-salaries-upload.html")
+                "Importer un fichier Excel" => "/proweb-salaries-upload.html")
         )); 
 ?>
 <br />

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

@@ -1,10 +1,10 @@
 <?php 
     $dateData = get::jsonDateDataExcelProweb();
-    $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData) . ")" : "";
+    $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData, FALSE) . ")" : "";
 ?>
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Base ProWeb : Liste des salariés<?php echo $date ?></span>
+        <span>Proweb : Liste des salariés<?php echo $date ?></span>
         <a href="proweb-salaries-upload.html" style="position: absolute; right: 0; margin: 0 40px 0 0;"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
         <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank" style="position: absolute; right: 0; margin: 0 250px 0 0;"><button type="submit" class="btn btn-outline-secondary btn-sm"><span data-feather="link"></span> Exporter tous les salariés depuis Proweb</button></a>
     </h2> 

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

@@ -5,7 +5,7 @@
 
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Base RH : Historique des Excels</span>
+        <span>RH : Historique des Excels</span>
         <a href="/rh-upload-excel.html" style="position: absolute; right: 0; margin: 0 40px 0 0;"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
     </h2>
 </header>
@@ -13,9 +13,8 @@
         echo core::filAriane(array(
             "current" => "Historique des Excels", 
             "arbo" => array( 
-                "Salariés RH" => NULL,
-                "Liste des salariés" => "/",
-                "Historique des Excels (base RH)" => "/rh-historique-excel.html")
+                "Salariés" => NULL,
+                "Historique des Excels" => "/rh-historique-excel.html")
         )); 
 ?>
 <div>

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

@@ -1,10 +1,10 @@
 <?php 
     $dateData = get::jsonDateDataExcel();
-    $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData) . ")" : "";
+    $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData, FALSE) . ")" : "";
 ?>
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
-        <span>Base RH : Liste des salariés<?php echo $date ?></span>
+        <span>RH : Liste des salariés<?php echo $date ?></span>
         <a href="/rh-upload-excel.html" style="position: absolute; right: 0; margin: 0 40px 0 0;"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
     </h2>
 </header>
@@ -12,7 +12,7 @@
         echo core::filAriane(array(
             "current" => "Liste des salariés", 
             "arbo" => array( 
-                "Salariés RH" => NULL, 
+                "Salariés" => NULL, 
                 "Liste des salariés" => "/")
         )); 
 ?>

core/views/pages/cms.stats.php

@@ -1,14 +1,14 @@
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
 <h2 class="bd-title" id="content">
-    <span>Base RH : Statistiques sur les salariés</span>
+    <span>RH : Stats salariés</span>
 </h2>
 </header>
 <?php   
         echo core::filAriane(array(
-            "current" => "Statistiques sur les salariés", 
+            "current" => "Stats salariés", 
             "arbo" => array( 
-                "Salariés RH" => NULL, 
-                "Statistiques sur les salariés" => "/")
+                "Salariés" => NULL, 
+                "Stats salariés" => "/stats.html")
         )); 
 ?>
 <ul class="nav nav-tabs" id="stats" role="tablist" style="margin-top: 40px;">