From 258cee201252ce4636f94dc4973d00d57fda83dd Mon Sep 17 00:00:00 2001 From: wouldsmina Date: Wed, 25 Sep 2019 21:54:28 +0200 Subject: [PATCH 1/8] tableau de bord employe --- App/Views/Employe/TableauBord.php | 98 +++++++++++++++++++++++++++++++ Public/Assets/Css/reboot.css | 8 +++ utilisateur/user_index.php | 13 ++-- 3 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 App/Views/Employe/TableauBord.php diff --git a/App/Views/Employe/TableauBord.php b/App/Views/Employe/TableauBord.php new file mode 100644 index 000000000..81a70507c --- /dev/null +++ b/App/Views/Employe/TableauBord.php @@ -0,0 +1,98 @@ + +

+
+
+

{{ getLibelle(s) }}

+
+
Restants : {{ getRestant(s) }}
+
Reliquats : {{ getReliquat(s) }}
+
Consommés : {{ getConsomme(s) }}
+
+
+
+
+ diff --git a/Public/Assets/Css/reboot.css b/Public/Assets/Css/reboot.css index 0bee87527..3ca6300ec 100644 --- a/Public/Assets/Css/reboot.css +++ b/Public/Assets/Css/reboot.css @@ -240,6 +240,14 @@ content-title { font-size: 18px; font-size: 1.8rem } + +.progress-label { + float: left; + margin-right: 1em; + margin-bottom: 20px; + margin-top: 0px; +} + #main-content.traite_user .calendar-nav { margin: 0; padding: 0; diff --git a/utilisateur/user_index.php b/utilisateur/user_index.php index 5613c5bc0..0a05bb1ae 100644 --- a/utilisateur/user_index.php +++ b/utilisateur/user_index.php @@ -1,10 +1,11 @@ -getUrlAccueil() . '/api/'; // SERVER $PHP_SELF = filter_var($_SERVER['PHP_SELF'], FILTER_SANITIZE_URL); @@ -45,13 +46,13 @@ /*********************************/ /* AFFICHAGE DU RECAP ... */ /*********************************/ +//afficher la quotité de travail +//API : récupérer le solde des congés +//Si conges excep = false retirer de la réponse +//Si heure = true API : Solde employé (table users) -echo "
\n"; -echo '

' . _('tableau_recap') . '

'; -echo affiche_tableau_bilan_conges_user($_SESSION['userlogin']); -echo "
\n"; -echo "
\n"; +require_once VIEW_PATH . 'Employe/TableauBord.php'; /*********************************/ /* AFFICHAGE DE L'ONGLET ... */ /*********************************/ From 8885e3ba99f01dacf30a64eb574ba184738a9286 Mon Sep 17 00:00:00 2001 From: wouldsmina Date: Thu, 10 Oct 2019 21:35:02 +0200 Subject: [PATCH 2/8] =?UTF-8?q?affiche=20tous=20les=20types=20de=20cong?= =?UTF-8?q?=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Views/Employe/Conges/Liste.php | 5 +- App/Views/Employe/TableauBord.php | 87 ++++++++++++++++++++++++------ utilisateur/user_index.php | 10 ---- utilisateur/user_liste_conge.php | 1 + 4 files changed, 76 insertions(+), 27 deletions(-) diff --git a/App/Views/Employe/Conges/Liste.php b/App/Views/Employe/Conges/Liste.php index 4ce10a9e5..70e2f6f2a 100644 --- a/App/Views/Employe/Conges/Liste.php +++ b/App/Views/Employe/Conges/Liste.php @@ -1,4 +1,4 @@ - +

+ +