stany.ferer 2 роки тому
батько
коміт
46fa87bd1f

+ 1 - 0
core/class/event.class.php

@@ -42,6 +42,7 @@ class event
             . "COUNT(" . DB_T_EVENTS_INSCRITS . ".id_salarie) AS m_global, "
             . "COUNT(" . DB_T_EVENTS_INSCRITS . ".present) AS m_inscrit, "
             . "" . DB_T_EVENTS . ".endDate, "
+            . "TIMESTAMPDIFF(HOUR, " . DB_T_EVENTS . ".startDate, " . DB_T_EVENTS . ".endDate) AS pastHours, "
             . "IF(" . DB_T_EVENTS . ".type_emargement = 1, 'Contôle', IF(" . DB_T_EVENTS . ".type_emargement = 2, 'Autonome', 'Contrôle & Autonome')) AS type_emargement, "
             . "IF(" . DB_T_EVENTS . ".type_inscription = 1, 'Incription', 'Libre') AS type_inscription, "
             . "" . DB_T_EVENTS . ".actif, "

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

@@ -106,13 +106,13 @@ echo core::filAriane(array(
                 <input type="text" value="<?php echo $_SERVER['SERVER_ADDR'] ?>" class="form-control text-center" disabled>
             </div>
             <div class="col">
-                <label style="color: gray;">Dernière emprunte de données génée</label>
+                <label style="color: gray;">Dernière emprunte des données génées</label>
                 <input type="text" value="<?php echo $get_excel_Json_forSFTP ?>" class="form-control text-center" disabled>
             </div>
         </div>
         <div class="row">
             <div class="col m-3">
-                <label style="color: gray;">Fichiers présents dans le dossier distant</label>
+                <label style="color: gray;">Fichiers présents dans le dossier du CSE</label>
 
                 <table id="table" class="table-striped table-hover table-sm" data-toggle="table" data-sort-name="date" data-sort-order="desc" data-url="/json.php?jsonData=proweb-transfert-local">
                     <thead>