From cc6ee0f0998982eaf49cba16e231373eb415c1c7 Mon Sep 17 00:00:00 2001
From: "kilian (ksmachome)" <ksaffran@dks.lu>
Date: Mon, 9 Dec 2019 11:46:15 +0100
Subject: [PATCH] staff

---
 backoffice/img/icons/home.svg         |   9 +
 backoffice/tmp/sql.log                | 432 ++++++++++++++++++++++++++
 backoffice/tmpl/module/staff/index.js |  10 +-
 backoffice/tmpl/module/staff/index.tt |  45 ++-
 4 files changed, 481 insertions(+), 15 deletions(-)
 create mode 100644 backoffice/img/icons/home.svg

diff --git a/backoffice/img/icons/home.svg b/backoffice/img/icons/home.svg
new file mode 100644
index 00000000..f6b8f1c9
--- /dev/null
+++ b/backoffice/img/icons/home.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<g id="home_2_">
+	<polygon points="31,19.05 31,13 28,13 28,16.082 24.517,12.628 24.515,12.58 12.033,25 16,25 16,36 22,36 22,30 27,30 27,36 33,36 
+		33,25 37,25 	"/>
+</g>
+</svg>
diff --git a/backoffice/tmp/sql.log b/backoffice/tmp/sql.log
index 30bcaa14..613af42b 100644
--- a/backoffice/tmp/sql.log
+++ b/backoffice/tmp/sql.log
@@ -4834,3 +4834,435 @@ $VAR1 = {
           'id' => '1',
           'username' => 'ksaffran@dks.lu'
         };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu'
+        };
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova'
+        };
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu'
+        };
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu'
+        };
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu'
+        };
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'userschemata' => 'portanova',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'userschemata' => 'portanova'
+        };
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova',
+          'id' => '1',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu',
+          'id' => '1',
+          'userschemata' => 'portanova'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'username' => 'ksaffran@dks.lu'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'userschemata' => 'portanova',
+          'id' => '1'
+        };
+parameter session = 9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU
+Seesion GOT!
+$VAR1 = {
+          'username' => 'ksaffran@dks.lu',
+          'userschemata' => 'portanova',
+          'usergroups' => 'superadmin',
+          'idsession' => '9UisAitYaoxdqtBaWUI37R04CiBlFxcp0STuCOZRU',
+          'id' => '1'
+        };
diff --git a/backoffice/tmpl/module/staff/index.js b/backoffice/tmpl/module/staff/index.js
index 551b4c70..58b22788 100644
--- a/backoffice/tmpl/module/staff/index.js
+++ b/backoffice/tmpl/module/staff/index.js
@@ -55,14 +55,14 @@ function inittable_staff(){
         field: "job",
         headerFilter: "input"
     }, {
-        title: "Date d'entrée",
+        title: "entrée",
         field: "entrydate",
         headerFilter: "input",align: "right",formatter:"datetime", formatterParams:{
           inputFormat:"yyyy-mm-dd",
           outputFormat:"DD.MM.YYYY",
           invalidPlaceholder:""}
     }, {
-        title: "Date de sorite",
+        title: "orite",
         field: "leavedate",align: "right",formatter:"datetime", formatterParams:{
           inputFormat:"yyyy-mm-dd",
           outputFormat:"DD.MM.YYYY",
@@ -93,18 +93,18 @@ function inittable_staffperiodbase(){
       },
     columns: [
       {
-        title: "Date début",
+        title: "début",
         field: "startdate",
         align: "right",
         formatter:"datetime",formatterParams:{inputFormat:"yyyy-mm-dd",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}
       },{
-        title: "heures par semaine",
+        title: "h/semaine",
         field: "weekhours",
         align: "right",
         sorter:"number",
         formatter:"money",formatterParams:{decimal:",",thousand:".",symbol:" ",symbolAfter:"",precision:2},
       },{
-        title: "heures par mois",
+        title: "h/mois",
         field: "monthhours",
         align: "right",
         sorter:"number",
diff --git a/backoffice/tmpl/module/staff/index.tt b/backoffice/tmpl/module/staff/index.tt
index 45bb6572..d00fdbd8 100644
--- a/backoffice/tmpl/module/staff/index.tt
+++ b/backoffice/tmpl/module/staff/index.tt
@@ -2,12 +2,14 @@
 <div class="w3-display-container">
   <div class="w3-top w3-theme-light w3-border-bottom">
     <div class="w3-bar">
-      <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="viewtable();">Employé(e)s</button>
+      <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="viewtable();"><img src="[% abspath%]img/icons/home.svg" style="height: 24px;"/></button>
+      <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="edit();">Données de base</button>
+      <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="viewvacancy();">Congé</button>
+      <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="viewplanning();">Planning</button>
     <!--<button class="w3-bar-item w3-button w3-border w3-right w3-orange" onclick="xlsxexport(); return false;"><img src="[% abspath%]img/icons/excel_white.svg" style="height: 24px;"/></button>
     <button class="w3-bar-item w3-button w3-border w3-right w3-orange" onclick="pdfexport(); return false;"><img src="[% abspath%]img/icons/pdf_white.svg" style="height: 24px;"/></button>-->
     
     <button class="w3-bar-item w3-button w3-border w3-right w3-red" onclick="remove();"><img src="[% abspath%]img/icons/remove_white.svg" style="height: 24px;"/></button>
-    <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="edit();"><img src="[% abspath%]img/icons/edit_white.svg" style="height: 24px;"/></button>
     <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="add();"><img src="[% abspath%]img/icons/plus_white.svg" style="height: 24px;"/></button> 
     </div>
   </div>
@@ -17,16 +19,23 @@
   <div class="w3-display-container w3-padding-24" id="pnl_data" style="display: none; margin-top: 20px;" >
     <div class="w3-container  w3-padding-24 w3-card  w3-margin w3-margin-bottom">
       <form id="frm_staff">
-        <h3>employé(e)</h3>
+        <h3>Données de base de l'employé(e)</h3>
         <div class="w3-row-padding"> 
           <div class="w3-container">
-            
             [% fieldhidden('id','staff','ident') %]
             <div class="w3-container">
               [% fieldeditbox('staffnumber','staff','No.','w3-half','','','') %]
-              [% fieldeditbox('prename','staff','Prénom','','','','') %]
-              [% fieldeditbox('surname','staff','Nom','','','','') %]
-              [% fieldeditbox('job','staff','Job / Position','','','','') %]
+              [% fieldeditbox('matricule','staff','Matricule','w3-half','','','') %]
+              [% fieldeditbox('surname','staff','Nom','w3-half','','','') %]
+              [% fieldeditbox('prename','staff','Prénom','w3-half','','','') %]
+              [% fieldeditbox('address','staff','adresse','','','','') %]
+              [% fieldeditbox('zip','staff','cp','w3-fifth','','','') %]
+              [% fieldeditbox('city','staff','ville','w3-twofifth','','','') %]
+              [% fieldeditbox('country','staff','pays','w3-twofifth','','','') %]
+              [% fieldeditbox('job','staff','Job / Position','w3-third','','','') %]
+              [% fieldeditbox('phone','staff','Téléphone','w3-third','','','') %]
+              [% fieldeditbox('email','staff','email','w3-third','','','') %]
+              [% fielddatebox('birthdate','staff',"date de naissance",'w3-third','','') %]
               [% fielddatebox('entrydate','staff',"date d'entrée",'w3-third','','') %]
               [% fielddatebox('leavedate','staff',"date de sortie",'w3-third','','') %]
             </div>
@@ -37,17 +46,33 @@
             </div>
         </form>
     </div>
+    <div class="w3-row">
+      <div class="w3-col w3-half">
     <div class="w3-container  w3-padding-24 w3-card  w3-margin w3-margin-bottom">
+        <h3>Données contractuelles</h3>
       <div class="w3-bar">
-        <button class="w3-bar-item w3-button w3-border w3-blue-grey w3-hover-text-white" onclick="viewtable();">Employé(e)s</button>
+      
       <button class="w3-bar-item w3-button w3-border w3-right w3-red" onclick="remove_staffperiodbase();"><img src="[% abspath%]img/icons/remove_white.svg" style="height: 24px;"/></button>
-      <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="edit_staffperiodbase();"><img src="[% abspath%]img/icons/edit_white.svg" style="height: 24px;"/></button>
+      <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="edit_staffperiodbase();"><img src="[% abspath%]img/icons/edit_white.svg" style="height: 32x;"/></button>
       <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="add_staffperiodbase();"><img src="[% abspath%]img/icons/plus_white.svg" style="height: 24px;"/></button> 
       </div>
-        <div id="tbl_staffperiodbase">
+        <div id="tbl_staffperiodbase" >
           
         </div>
     </div>
   </div>
+  <div class="w3-col w3-half">
+      <div class="w3-container  w3-padding-24 w3-card w3-margin w3-margin-bottom">
+      <h3>Données annuelles congé</h3>
+    <div class="w3-bar">
+    
+    <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="edit_staffvacancyyear();"><img src="[% abspath%]img/icons/edit_white.svg" style="height: 24px;"/></button>
+    </div>
+    <div id="tbl_staffvacancyyear" >
+          
+    </div>
+  </div>
+</div>
+  </div>
   
 </div>
-- 
2.39.5