Refact

core/class/core.class.php

@@ -46,6 +46,14 @@ class core
         }
     }
 
+    public static function cleanAccent(string $_data)
+    {
+        $search  = array('À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'à', 'á', 'â', 'ã', 'ä', 'å', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ð', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ');
+        $replace = array('A', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y');
+        $return = str_replace($search, $replace, $_data);
+        return strtoupper($return);
+    }
+
     public static function convertDate(string $_datetime, bool $_hour = TRUE)
     {
         $pieces = explode(" ", $_datetime);

core/class/event.class.php

@@ -145,6 +145,25 @@ class event
         return db::resultset();
     }
 
+    public static function getInscriptions()
+    {
+        db::query("SELECT "
+            . "" . DB_T_SALARIES . ".id, "
+            . "" . DB_T_SALARIES . ".loginId, "
+            . "" . DB_T_SALARIES . ".nom, "
+            . "" . DB_T_SALARIES . ".prenom, "
+            . "" . DB_T_SALARIES . ".sexe, "
+            . "" . DB_T_SALARIES . ".contrat, "
+            . "" . DB_T_SALARIES . ".lieu, "
+            . "" . DB_T_SALARIES . ".actif, "
+            . "IF(" . DB_T_EVENTS_INSCRITS . ".id_salarie IS NOT NULL, 1, 0) AS inscrit, "
+            . "" . DB_T_EVENTS_INSCRITS . ".present "
+            . "FROM " . DB_T_SALARIES . " "
+            . "LEFT JOIN " . DB_T_EVENTS_INSCRITS . " ON " . DB_T_SALARIES . ".id = " . DB_T_EVENTS_INSCRITS . ".id_salarie "
+            . "AND " . DB_T_EVENTS_INSCRITS . ".id_evenement = " . core::getGet("id"));
+            return db::resultset();
+    }
+
     public static function connectSalarie(array $_post)
     {
 
@@ -300,8 +319,6 @@ class event
         return db::resultset();
     }
 
-
-
     public static function checkEvenementBySalarie(string $_md5)
     {
 
@@ -408,7 +425,7 @@ class event
         $md5Evenement = core::getGet("e");
         $key = core::getGet("k");
 
-        $salarie = salaries::get_salarieById($idSalarie);
+        $salarie = salaries::getSalarieById($idSalarie);
 
         $constructKey = md5($md5Evenement . $salarie["sel"]);
 

core/class/json.class.php

@@ -40,7 +40,7 @@ class json extends db
 
     private static function create_salaries()
     {
-        $row = salaries::get_salaries();
+        $row = salaries::getSalaries();
         if (file_put_contents(DIR_DATAS_JSON . "salaries.json", json_encode($row))) {
             return 1;
         } else {

core/class/proweb.class.php

@@ -153,17 +153,17 @@ class proweb
 
     private static function archiveExcelValuesloginId(string $_string)
     {
-        return salaries::clean_accent($_string);
+        return core::cleanAccent($_string);
     }
 
     private static function archiveExcelValuesNom(string $_string)
     {
-        return salaries::clean_accent($_string);
+        return core::cleanAccent($_string);
     }
 
     private static function archiveExcelValuesPrenom(string $_string)
     {
-        return salaries::clean_accent($_string);
+        return core::cleanAccent($_string);
     }
 
     private static function archiveExcelValuesActif(string $_string)

core/class/salaries.class.php

@@ -2,22 +2,14 @@
 
 class salaries
 {
-    public static function clean_tmp()
+    public static function cleanTmp()
     {
         // Nettoyage de la table temporaire des salairés
         db::query("TRUNCATE " . DB_T_TEMP_SALARIES);
         db::execute();
     }
 
-    public static function clean_accent(string $_data)
-    {
-        $search  = array('À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'à', 'á', 'â', 'ã', 'ä', 'å', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ð', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ');
-        $replace = array('A', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y');
-        $return = str_replace($search, $replace, $_data);
-        return strtoupper($return);
-    }
-
-    public static function get_salarieByidLocal(int $_idLocal)
+    public static function getSalarieByidLocal(int $_idLocal)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT * FROM " . DB_T_SALARIES . " WHERE idLocal = :idLocal");
@@ -25,7 +17,7 @@ class salaries
         return db::single();
     }
 
-    public static function get_salarieByLoginId(string $_loginId)
+    public static function getSalarieByLoginId(string $_loginId)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT * FROM " . DB_T_SALARIES . " WHERE loginId = :loginId");
@@ -33,7 +25,7 @@ class salaries
         return db::single();
     }
 
-    public static function get_salarieById(int $_id)
+    public static function getSalarieById(int $_id)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT * FROM " . DB_T_SALARIES . " WHERE id = :id");
@@ -41,7 +33,7 @@ class salaries
         return db::single();
     }
 
-    public static function get_salaries()
+    public static function getSalaries()
     {
         db::query("SELECT "
             . "idLocal, "
@@ -68,13 +60,13 @@ class salaries
         return db::single()["id"];
     }
 
-    public static function lastExcel_forSFTP()
+    public static function lastExcelForSFTP()
     {
         db::query("SELECT MAX(id) AS id FROM " . DB_T_EXCEL . " WHERE forSFTP IS NOT NULL");
         return db::single()["id"];
     }
 
-    public static function get_excel_Md5(int $_id)
+    public static function getExcelMd5(int $_id)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT md5 FROM " . DB_T_EXCEL . " WHERE id = :id");
@@ -82,7 +74,24 @@ class salaries
         return db::single()["md5"];
     }
 
-    public static function get_excel_Json_forSFTP(int $_id)
+    public static function insertExcel(array $_data)
+    {
+        db::query("INSERT INTO " . DB_T_EXCEL . " (nbSalaries, md5, json, dateData, id_user) VALUES (:nbSalaries, :md5, :json, :dateData, :id_user)");
+        db::bind(':nbSalaries', $_data["nbSalaries"]);
+        db::bind(':dateData', $_data["date"]);
+        db::bind(':md5', $_data["md5File"]);
+        db::bind(':json', base64_encode($_data["json"]));
+        db::bind(':id_user', session::getId());
+
+        try {
+            db::execute();
+            return TRUE;
+        } catch (Exception $ex) {
+            return FALSE;
+        }
+    }
+
+    public static function getExcelJsonForSFTP(int $_id)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT forSFTP, md5forSFTP, createForSFTP, contratForSFTP FROM " . DB_T_EXCEL . " WHERE id = :id");
@@ -90,7 +99,7 @@ class salaries
         return db::single();
     }
 
-    public static function get_excel_Json_transfer_forSFTP(string $_md5)
+    public static function getExcelJsonTransferForSFTP(string $_md5)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT transfertForSFTP FROM " . DB_T_EXCEL . " WHERE md5forSFTP = :md5forSFTP");
@@ -98,7 +107,7 @@ class salaries
         return db::single()["transfertForSFTP"];
     }
 
-    public static function get_excel_json(int $_id)
+    public static function getExcelJson(int $_id)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT json FROM " . DB_T_EXCEL . " WHERE id = :id");
@@ -106,7 +115,7 @@ class salaries
         return base64_decode(db::single()["json"]);
     }
 
-    public static function get_excel_name(int $_id)
+    public static function getExcelName(int $_id)
     {
         // Récupération des données de l'excel au format Json
         db::query("SELECT 
@@ -119,7 +128,7 @@ class salaries
         return db::single()["name"];
     }
 
-    public static function excel_update_in_progress(int $_id, int $_action = 1)
+    public static function excelUpdateInProgress(int $_id, int $_action = 1)
     {
         db::query("UPDATE 
         " . DB_T_EXCEL . " 
@@ -147,7 +156,7 @@ class salaries
         }
     }
 
-    public static function excel_get_in_progress()
+    public static function excelGetInProgress()
     {
         db::query("SELECT 
         " .DB_T_EXCEL. ".id, 
@@ -159,12 +168,12 @@ class salaries
         return db::single();
     }
 
-    public static function get_excel_array(int $_id)
+    public static function getExcelArray(int $_id)
     {
-        return json_decode(self::get_excel_json($_id));
+        return json_decode(self::getExcelJson($_id));
     }
 
-    public static function excel_to_mysql(array $_value)
+    public static function excelToMysql(array $_value)
     {
         if ($_value[4] == "Actif") {
             $_value[4] = 1;
@@ -175,17 +184,17 @@ class salaries
         return array(
             "idLocal" => $_value[0],
             "loginId" => $_value[7],
-            "nom" => self::clean_accent($_value[1]),
-            "prenom" => self::clean_accent($_value[2]),
+            "nom" => core::cleanAccent($_value[1]),
+            "prenom" => core::cleanAccent($_value[2]),
             "sexe" => $_value[3],
             "contrat" => $_value[4],
             "jourEntree" => $_value[5],
-            "lieu" => self::clean_accent($_value[6]),
+            "lieu" => core::cleanAccent($_value[6]),
             "actif" => 1
         );
     }
 
-    public static function create_tmp(string $_excel)
+    public static function createTmp(string $_excel)
     {
         db::query("SELECT idLocal, loginId, nom, prenom, sexe, contrat, jourEntree, lieu, actif FROM " . DB_T_SALARIES);
         $row = db::resultset();
@@ -209,7 +218,7 @@ class salaries
         }
     }
 
-    public static function update_inactive_temp_salarie()
+    public static function updateInactiveTempSalarie()
     {
         db::query("UPDATE " . DB_T_TEMP_SALARIES . " SET "
             . "log = :log "
@@ -224,7 +233,7 @@ class salaries
         }
     }
 
-    public static function update_json_excel(array $_json)
+    public static function updateJsonExcel(array $_json)
     {
         db::query("UPDATE " . DB_T_EXCEL . " SET "
             . "goMysql = current_timestamp(), "
@@ -251,8 +260,8 @@ class salaries
         foreach ($_new_salaries as $key => $value) {
             $sql = $change = NULL;
             if ($key > 0) {
-                $tmp = self::excel_to_mysql($value);
-                $salarieByidLocal = self::get_salarieByidLocal($tmp["idLocal"]);
+                $tmp = self::excelToMysql($value);
+                $salarieByidLocal = self::getSalarieByidLocal($tmp["idLocal"]);
 
                 if (isset($salarieByidLocal["idLocal"])) {
                     $tmp_sql = "";
@@ -390,7 +399,7 @@ class salaries
         }
     }
 
-    public static function update_salaries(int $_excel)
+    public static function updateSalaries(int $_excel)
     {
         $cp["INSERT"]["SUCCESS"] = 0;
         $cp["INSERT"]["ERROR"] = 0;
@@ -400,7 +409,7 @@ class salaries
         $cp["UPDATE"]["ERROR"] = 0;
         $cp["forSFTP"] = 0;
 
-        $updateContrat = json_decode(self::get_excel_Json_forSFTP($_excel)["contratForSFTP"], TRUE);
+        $updateContrat = json_decode(self::getExcelJsonForSFTP($_excel)["contratForSFTP"], TRUE);
 
         $jourSortie = date("Y-m-d 00:00:00");
         $dateReprise = date("Y-m-d 00:00:00");
@@ -592,7 +601,7 @@ class salaries
         }
     }
 
-    public static function create_rapport()
+    public static function createRapport()
     {
         $log = NULL;
 
@@ -659,7 +668,7 @@ class salaries
         return $log;
     }
 
-    public static function count_tmp_salaries()
+    public static function countTmpSalaries()
     {
         db::query("SELECT COUNT(*) AS nb FROM " . DB_T_TEMP_SALARIES);
         return db::single()["nb"];
@@ -667,8 +676,8 @@ class salaries
 
     public static function dataForSFTP()
     {
-        $lastExcel = self::lastExcel_forSFTP();
-        $forSFTP = self::get_excel_Json_forSFTP($lastExcel);
+        $lastExcel = self::lastExcelForSFTP();
+        $forSFTP = self::getExcelJsonForSFTP($lastExcel);
         $finalSalarie = NULL;
         $csv = "OD_" . date("d-m-Y") . ".csv";
 
@@ -705,7 +714,7 @@ class salaries
     public static function ifSubmitLastForSFTP()
     {
         $lastExcel = self::lastExcel();
-        $forSFTP = self::get_excel_Json_forSFTP($lastExcel);
+        $forSFTP = self::getExcelJsonForSFTP($lastExcel);
         return (@$forSFTP["md5forSFTP"] != NULL and @$forSFTP["createForSFTP"] == NULL) ? TRUE : FALSE;
     }
 

core/json/cms.event-salaries.php

@@ -1,20 +1,7 @@
 <?php 
 
-db::query("SELECT "
-            . "" . DB_T_SALARIES . ".id, "
-            . "" . DB_T_SALARIES . ".loginId, "
-            . "" . DB_T_SALARIES . ".nom, "
-            . "" . DB_T_SALARIES . ".prenom, "
-            . "" . DB_T_SALARIES . ".sexe, "
-            . "" . DB_T_SALARIES . ".contrat, "
-            . "" . DB_T_SALARIES . ".lieu, "
-            . "" . DB_T_SALARIES . ".actif, "
-            . "IF(" . DB_T_EVENTS_INSCRITS . ".id_salarie IS NOT NULL, 1, 0) AS inscrit, "
-            . "" . DB_T_EVENTS_INSCRITS . ".present "
-            . "FROM " . DB_T_SALARIES . " "
-            . "LEFT JOIN " . DB_T_EVENTS_INSCRITS . " ON " . DB_T_SALARIES . ".id = " . DB_T_EVENTS_INSCRITS . ".id_salarie "
-            . "AND " . DB_T_EVENTS_INSCRITS . ".id_evenement = " . core::getGet("id"));
-            $row = db::resultset();
+$row = event::getInscriptions();
+
 if (!empty($row)) {
     echo json_encode($row);
     exit();

core/json/events.check-control-emargement.php

@@ -26,7 +26,7 @@ if (session::isConnect("salarie")) {
     exit();
 } elseif (session::isConnect()) {
     if (core::ifGet("s") and core::ifGet("e") and core::ifGet("k")) {
-        $salarie = salaries::get_salarieById(core::getGet("s"));
+        $salarie = salaries::getSalarieById(core::getGet("s"));
         $evenement = event::getFicheByMd5(core::getGet("e"));
         $return = event::emargementEvenementByQRCode();
         $return["salarie"] = $salarie["prenom"] . " " . $salarie["nom"];

core/submit/cms.event-import-inscription.php

@@ -44,7 +44,7 @@ if (core::ifPost("from") AND core::getPost("from") == "event-import-inscription"
             
             foreach ($returnXlsx as $key => $ligne) {   
                 if($key > 0){
-                    $salarie = salaries::get_salarieByLoginId($ligne[0]);
+                    $salarie = salaries::getSalarieByLoginId($ligne[0]);
                     $titreEvenement = event::getInscriptionEvenementById(core::getPost("event"), $salarie["id"])["titre"];
                     if(empty($titreEvenement) AND isset($salarie["id"])){
                         if(event::subscribe($salarie["id"]) == TRUE){

core/submit/cms.rh-annule-import.php

@@ -1,7 +1,7 @@
 <?php 
 
 if (core::ifPost("from")) {
-    $md5 = salaries::get_excel_Md5(core::getPost("id"));
+    $md5 = salaries::getExcelMd5(core::getPost("id"));
     if(isset($md5) AND salaries::delete_excel(core::getPost("id"))){
         if(file::delete($md5)){
             alert::recSuccess("L'import a bien été annulé");

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

@@ -2,14 +2,14 @@
 
 if (core::ifPost("from") AND core::getPost("from") == "rh-excel-to-temp") {
     // Nettoyage de la table temporaire des salairés
-    salaries::clean_tmp();
-    salaries::create_tmp(core::getPost("excel"));
-    salaries::excel_update_in_progress(core::getPost("excel"), 1);
-    $new_salaries = salaries::get_excel_array(core::getPost("excel"));
+    salaries::cleanTmp();
+    salaries::createTmp(core::getPost("excel"));
+    salaries::excelUpdateInProgress(core::getPost("excel"), 1);
+    $new_salaries = salaries::getExcelArray(core::getPost("excel"));
 
     if (isset($new_salaries)) {
         salaries::update_temp_salaries($new_salaries, core::getPost("excel"));
-        salaries::update_inactive_temp_salarie();
+        salaries::updateInactiveTempSalarie();
     }
     header("Location: /rh-import-to-temp.html");
     exit();

core/submit/cms.rh-import-excel.php

@@ -26,6 +26,8 @@ if (core::ifPost("from") AND core::getPost("from") == "rh-import-excel") {
 
         if (file_exists($_FILES[core::getPost("from")]['tmp_name'])) {
 
+            $data = array();
+
             $simpleXLSX = new simpleXLSX();
             $xlsx = $simpleXLSX->parse($_FILES[core::getPost("from")]['tmp_name']);
             $returnXlsx = $xlsx->rows();
@@ -54,25 +56,17 @@ if (core::ifPost("from") AND core::getPost("from") == "rh-import-excel") {
                 exit();
             } 
             
-            $md5File = file::record($_FILES[core::getPost("from")]);
-            if($md5File == FALSE){
+            $data["md5File"] = file::record($_FILES[core::getPost("from")]);
+            if($data["md5File"] == FALSE){
                 header("Location: /rh-upload-excel.html");
                 exit();
             }
 
-            $nbSalaries = count($returnXlsx) - 1;
-            $json = json_encode($returnXlsx);
-
-            db::query("INSERT INTO " . DB_T_EXCEL . " (nbSalaries, md5, json, dateData, id_user) VALUES (:nbSalaries, :md5, :json, :dateData, :id_user)");
-            db::bind(':nbSalaries', $nbSalaries);
-            db::bind(':dateData', $_POST["date"]);
-            db::bind(':md5', $md5File);
-            db::bind(':json', base64_encode($json));
-            db::bind(':id_user', session::getId());
+            $data["nbSalaries"] = count($returnXlsx) - 1;
+            $data["json"] = json_encode($returnXlsx);
+            $data["date"] = core::getPost("date");
 
-            try {
-                db::execute();
-            } catch (Exception $ex) {
+            if(salaries::insertExcel($data) == FALSE){
                 alert::recError("Erreur #submit sur l'import du fichier " . $_FILES[core::getPost("from")]['name']);
                 header("Location: /rh-upload-excel.html");
                 exit();

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

@@ -5,16 +5,16 @@ if (core::ifPost("from") AND core::getPost("from") == "rh-temp-to-mysql") {
     // Backup
     (backup::create()) ? alert::recSuccess("Backup des données OK") : alert::recError("Backup des données KO");
     
-    $json = salaries::create_rapport();
-    salaries::update_json_excel($json);
+    $json = salaries::createRapport();
+    salaries::updateJsonExcel($json);
     json::create("excel");
     
-    alert::recSuccess(salaries::get_excel_name(core::getPost("excel")) . " a bien été importé");
+    alert::recSuccess(salaries::getExcelName(core::getPost("excel")) . " a bien été importé");
     
-    salaries::update_salaries(core::getPost("excel"));
-    salaries::clean_tmp();
+    salaries::updateSalaries(core::getPost("excel"));
+    salaries::cleanTmp();
     json::create("salaries");
-    salaries::excel_update_in_progress(core::getPost("excel"), 0);
+    salaries::excelUpdateInProgress(core::getPost("excel"), 0);
 
     (file::cleanFilesByOrder(DIR_BACKUP)) ? alert::recSuccess("Clean backup des données OK") : alert::recError("Clean backup des données KO");
 

core/views/_cms.menu.php

@@ -6,7 +6,7 @@
                     core::elementMenuH6("Salariés");
                     core::elementMenu("rh-liste-salaries", "/", "RH : Liste des salariés", "users");
                     core::elementMenu("rh-historique-excel", "/rh-historique-excel.html", "RH : Historique des Excels", "file-text");
-                    if(isset(salaries::excel_get_in_progress()["name"])){ core::elementMenu("rh-import-to-temp", "/rh-import-to-temp.html", "RH : Reprise du traitement", "file-text"); } 
+                    if(isset(salaries::excelGetInProgress()["name"])){ core::elementMenu("rh-import-to-temp", "/rh-import-to-temp.html", "RH : Reprise du traitement", "file-text"); } 
                     core::elementMenu("stats", "/stats.html", "RH : Stats salariés", "pie-chart"); 
                 }
                     

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

@@ -1,13 +1,11 @@
 <?php
-if ($lastExcel_forSFTP = salaries::lastExcel_forSFTP()) {
-    $get_excel_Json_forSFTP = salaries::get_excel_Json_forSFTP($lastExcel_forSFTP)["md5forSFTP"];
+if ($lastExcelForSFTP = salaries::lastExcelForSFTP()) {
+    $getExcelJsonForSFTP = salaries::getExcelJsonForSFTP($lastExcelForSFTP)["md5forSFTP"];
 } else {
-    $get_excel_Json_forSFTP = "";
+    $getExcelJsonForSFTP = "";
 }
-
 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>Proweb : Exporter vers ProWeb</span>
@@ -107,7 +105,7 @@ echo core::filAriane(array(
             </div>
             <div class="col">
                 <label style="color: gray;">Dernière emprunte des données générées</label>
-                <input type="text" value="<?php echo $get_excel_Json_forSFTP ?>" class="form-control text-center" disabled>
+                <input type="text" value="<?php echo $getExcelJsonForSFTP ?>" class="form-control text-center" disabled>
             </div>
         </div>
         <div class="row">

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

@@ -1,5 +1,5 @@
 <?php
-    $inProgress = salaries::excel_get_in_progress();
+    $inProgress = salaries::excelGetInProgress();
     json::create("excel");
 ?>
 

core/views/pages/cms.rh-import-to-temp.php

@@ -1,9 +1,9 @@
 <?php
-$cpt_tmp = salaries::count_tmp_salaries();
+$cpt_tmp = salaries::countTmpSalaries();
 
-$json = salaries::create_rapport();
+$json = salaries::createRapport();
 file_put_contents(DIR_DATAS_JSON."tmp_salaries.json", $json["json"]);
-$excelInfo = salaries::excel_get_in_progress();
+$excelInfo = salaries::excelGetInProgress();
 
 if(empty($json["excel"])){