Add import dossiers Proweb

conf.inc.php

@@ -105,4 +105,8 @@ define("EMAIL_FROM_EMAIL", "cms@cse-invent.com");
 define("EMAIL_FROM_NAME", "CMS CSE Invent");
 
 // Sécurité
-define("NB_ALERT_AUTHENTICATOR", 3);
+define("NB_ALERT_AUTHENTICATOR", 3);
+
+// Liens directs ProWeb
+define("PROWEB_DOSSIERS", "https://www.cse-invent.com/gestion/prestations/dossiers?pagesize=20&__d_id=%7BDefault%7D&d_date_dossier%5Boptions%5D=periode&d_date_dossier%5Bperiode%5D=year&etats_d=%7BDefault%7D&d_annul=Tous&d_rglt=Tous&f_mod_cat_libel_p=%7BDefault%7D&p_etat=3&f_o_name_bis=%7BDefault%7D&o_name_bis=%7BDefault%7D&mod_cat_libel_p=%7BDefault%7D&search=avance");
+define("PROWEB_SALARIES", "https://www.cse-invent.com/gestion/beneficiaire/od?pagesize=20&f_o_name_bis=%7BDefault%7D&soc_situation=Tous&soc_status=%7BDefault%7D&o_name_bis=%7BDefault%7D&search=avance");

core/class/prowebDossiers.class.php

@@ -53,7 +53,11 @@ class prowebDossiers
             'doss_partce',
             'doss_partod',
             'doss_montant_total',
-            'comm_ref'
+            'comm_ref',
+            'od_matricule',
+            'od_nom',
+            'od_prenom',
+            'hismo_date_crea'
         ];
 
         $firstEntry = $_array[0] ?? [];
@@ -93,7 +97,8 @@ class prowebDossiers
                 :id_$index, :exe_ref_$index, :prest_id_$index, :prest_lib_$index, :prest_lib2_$index,
                 :catprest_id_$index, :catprest_lib_$index, :prest_period_$index, :prest_closed_$index,
                 :doss_id_$index, :doss_lib_$index, :etdoss_id_$index, :etdoss_lib_$index,
-                :doss_nb_inscrit_$index, :od_meyclub_subv_$index, :doss_partce_$index, :doss_partod_$index, :doss_montant_total_$index, :comm_ref_$index)";
+                :doss_nb_inscrit_$index, :od_meyclub_subv_$index, :doss_partce_$index, :doss_partod_$index, :doss_montant_total_$index, :comm_ref_$index, 
+                :od_matricule_$index, :od_nom_$index, :od_prenom_$index, :hismo_date_crea_$index)";
 
                 $params[":id_$index"] = $entry[1] . $entry[8];
 
@@ -120,7 +125,12 @@ class prowebDossiers
                 $params[":doss_partod_$index"] = $entry[15];
                 $params[":doss_montant_total_$index"] = $entry[16];
                 $params[":comm_ref_$index"] = $entry[17];
+                $params[":od_matricule_$index"] = $entry[18];
+                $params[":od_nom_$index"] = $entry[19];
+                $params[":od_prenom_$index"] = $entry[20];
+                $params[":hismo_date_crea_$index"] = $entry[21];
             }
+            
         }
 
 
@@ -128,7 +138,8 @@ class prowebDossiers
             id, exe_ref, prest_id, prest_lib, prest_lib2,
             catprest_id, catprest_lib, prest_period, prest_closed,
             doss_id, doss_lib, etdoss_id, etdoss_lib,
-            doss_nb_inscrit, od_meyclub_subv, doss_partce, doss_partod, doss_montant_total, comm_ref
+            doss_nb_inscrit, od_meyclub_subv, doss_partce, doss_partod, doss_montant_total, comm_ref, 
+            od_matricule, od_nom, od_prenom, hismo_date_crea
         ) VALUES " . implode(", ", $placeholders) . "
         ON DUPLICATE KEY UPDATE
             exe_ref = VALUES(exe_ref),
@@ -148,7 +159,11 @@ class prowebDossiers
             doss_partce = VALUES(doss_partce),
             doss_partod = VALUES(doss_partod),
             doss_montant_total = VALUES(doss_montant_total),
-            comm_ref = VALUES(comm_ref)";
+            comm_ref = VALUES(comm_ref),
+            od_matricule = VALUES(od_matricule),
+            od_nom = VALUES(od_nom),
+            od_prenom = VALUES(od_prenom), 
+            hismo_date_crea = VALUES(hismo_date_crea)";
 
         db::query($sql);
 

core/views/_cms.menu.php

@@ -77,6 +77,7 @@
                 core::elementMenuLink("pratique", "https://wiki.cse-invent.com", "Wiki CSE");
                 core::elementMenuLink("pratique", "https://contact.cse-invent.com", "Contact CSE");
                 core::elementMenuLink("pratique", "https://sender.cse-invent.com", "SendPortal CSE");
+                core::elementMenuLink("pratique", "https://www.cse-invent.com/gestion/outils/etat", "ProWeb Lien filtres dossiers");
             echo '</ul>';
 
             $temp_accordion = array("user", "parametres", "maj", "parametres-users", "parametres-teams", "tags", "historique");

core/views/pages/cms.parametres.php

@@ -23,7 +23,7 @@ echo core::filAriane(array(
     <li><a class="nav-link active" href="#parametres-general">Général</a></li>
     <li><a class="nav-link" href="#parametres-restore">Backup & restauration</a></li>
     <li><a class="nav-link" href="#parametres-debug">Debug & développement</a></li>
-    <li><a class="nav-link" href="#parametres-server-logs">Logs serveur</a></li>
+    <li><a class="nav-link" href="#parametres-server-logs">Logs Apache serveur</a></li>
 </ul>
 
 <div class="tab-content">

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

@@ -11,7 +11,7 @@
     <?php if(access::ifAccesss("proweb-dossiers-upload")){ ?>
     <div class="fix-container-button-nav">
         <a href="proweb-dossiers-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><?php icon::getFont(["icon" => "bi bi-file-earmark-plus"]) ?> Importer un fichier Excel</button></a>
-        <a href="https://www.cse-invent.com/gestion" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les dossiers depuis Proweb</button></a>
+        <a href="<?= PROWEB_DOSSIERS ?>" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les dossiers depuis Proweb</button></a>
     </div>
     <?php } ?>
 </header>

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

@@ -4,10 +4,10 @@ $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData, FALSE) . ")
 
 json::create("dossiers-proweb");
 
-    $jsonTarget = "/json.php?file=dossiers-proweb";
-    if(debug::isFile("debug")){
-        debug::log(debug::getBadge($jsonTarget, "OUVRIR LE JSON : ".$jsonTarget), "JSON chargé en arrière plan");
-    } 
+$jsonTarget = "/json.php?file=dossiers-proweb";
+if(debug::isFile("debug")){
+    debug::log(debug::getBadge($jsonTarget, "OUVRIR LE JSON : ".$jsonTarget), "JSON chargé en arrière plan");
+} 
 ?>
 <header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
     <h2 class="bd-title" id="content">
@@ -16,7 +16,7 @@ json::create("dossiers-proweb");
     <?php if(access::ifAccesss("proweb-dossiers-upload")){ ?>
     <div class="fix-container-button-nav">
         <a href="proweb-dossiers-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><?php icon::getFont(["icon" => "bi bi-file-earmark-plus"]) ?> Importer un fichier Excel</button></a>
-        <a href="https://www.cse-invent.com/gestion" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les dossiers depuis Proweb</button></a>
+        <a href="<?= PROWEB_DOSSIERS ?>" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les dossiers depuis Proweb</button></a>
     </div>
     <?php } ?>
 </header>
@@ -29,18 +29,22 @@ echo core::filAriane(array(
         "Liste des dossiers" => "proweb-dossiers.html"
     )
 ));
+
 ?>
 <div>
     <table id="ProWebSalary" class="table-striped table-hover table-sm" data-page-size="25" data-show-footer="true" data-toggle="table" data-buttons-align="left" data-pagination="true" data-filter-control="true" data-flat="true" data-show-columns-toggle-all="true" data-url="<?php echo $jsonTarget ?>">
         <thead>
             <tr>
                 <th data-sortable="true" data-field="exe_ref" data-filter-control="select">Année</th>
+                <th data-sortable="true" data-field="hismo_date_crea" data-filter-control="select">Création</th>
                 <th data-sortable="true" data-field="prest_lib" data-filter-control="select">Prestation</th>
                 <th data-sortable="true" data-field="prest_lib2" data-filter-control="select">Complément</th>
                 <th data-sortable="true" data-field="catprest_lib" data-filter-control="select">Catégorie</th>
                 <th data-sortable="true" data-field="comm_ref" data-filter-control="select">Commission</th>
                 <th data-sortable="true" data-field="prest_closed" data-filter-control="select" data-formatter="clotureFormatter">Clôturé</th>
                 <th data-sortable="true" data-field="etdoss_lib" data-filter-control="select">Etat</th>
+                <th data-sortable="true" data-field="od_matricule" data-filter-control="input">Matricule</th>
+                <th data-sortable="true" data-field="nomComplet" data-filter-control="input" data-formatter="concatNomPrenom">Prénom Nom</th>
                 <th data-sortable="true" data-field="doss_nb_inscrit" data-filter-control="select" data-footer-formatter="totalInscrits">Nb. Inscrits</th>
                 <th data-sortable="true" data-formatter="dataFormatter" data-field="doss_partce" data-filter-control="input" data-footer-formatter="prixCSE">Part CSE</th>
                 <th data-sortable="true" data-formatter="dataFormatter" data-field="doss_partod" data-filter-control="input" data-footer-formatter="prixSalarie">Part Salarié</th>
@@ -96,6 +100,9 @@ echo core::filAriane(array(
         return parseFloat(total) === 0 ? euro.format(0.00) : euro.format(total.toFixed(2));
     }
 
+    function concatNomPrenom(value, row, index) {
+        return row.od_prenom + ' ' + row.od_nom;
+    }
 
     function clotureFormatter(value) {
         return value == 1 ? "Clôturé" : "Ouvert";

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

@@ -10,7 +10,7 @@
     </h2>
     <div class="fix-container-button-nav">
         <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><?php icon::getFont(["icon" => "bi bi-file-earmark-plus"]) ?> 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"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les salariés depuis Proweb</button></a>
+        <a href="<?= PROWEB_SALARIES ?>" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les salariés depuis Proweb</button></a>
     </div>
 </header>
 <?php   

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

@@ -14,7 +14,7 @@ $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData, FALSE) . ")
     <?php if(access::ifAccesss("proweb-salaries-upload")){ ?>
     <div class="fix-container-button-nav">
         <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><?php icon::getFont(["icon" => "bi bi-file-earmark-plus"]) ?> 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"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les salariés depuis Proweb</button></a>
+        <a href="<?= PROWEB_SALARIES ?>" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><?php icon::getFont(["icon" => "bi bi-link-45deg"]) ?> Exporter tous les salariés depuis Proweb</button></a>
     </div>
     <?php } ?>
 </header>