add absence verifié

diff --git a/app_v3/chrome/content/modules/presences/dailypresences.html b/app_v3/chrome/content/modules/presences/dailypresences.html
index adb4609..30fdcc6 100644 (file)
--- a/app_v3/chrome/content/modules/presences/dailypresences.html
+++ b/app_v3/chrome/content/modules/presences/dailypresences.html
@@ -52,7 +52,8 @@
     <li><button class="btn btn-default" style="width: 100%;"><span class="glyphicons glyphicons-circle-question-mark" aria-hidden="true"></span> non configuré</button></li>
     <li><button class="btn btn-success" style="width: 100%;"><span class="glyphicons glyphicons-ok" aria-hidden="true"></span> présent</button></li>
     <li><button class="btn btn-warning" style="width: 100%;"><span class="glyphicons glyphicons-stethoscope" aria-hidden="true"></span> malade</button></li>
-    <li><button class="btn btn-danger" style="width: 100%;"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absent</button></li>
+    <li><button class="btn btn-danger" style="width: 100%;"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absence non verifé</button></li>
+    <li><button class="btn btn-absent2" style="width: 100%;"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absence verifié</button></li>
     <li><button class="btn btn-info" style="width: 100%;"><span class="glyphicon glyphicon-plane" aria-hidden="true"></span> vacances</button></li>
     <li><button class="btn btn-primary" style="width: 100%;"><span class="glyphicons glyphicons-circle-question-mark" aria-hidden="true"></span> essaie</button></li>
   </ul>

diff --git a/app_v3/chrome/content/modules/presences/js/dailypresences.js b/app_v3/chrome/content/modules/presences/js/dailypresences.js
index 1ba3d25..05dc9c6 100644 (file)
--- a/app_v3/chrome/content/modules/presences/js/dailypresences.js
+++ b/app_v3/chrome/content/modules/presences/js/dailypresences.js
@@ -131,11 +131,12 @@ function initdata() {
                     '</div><br/><span id="'+row.childuuid+'_ddltype" style="display: none;">'+row.ddltype+'</span></td>';
               rdata += '<td>'+ 
               '<div class="btn-group"><button type="button" class="btn btn-default dropdown-toggle" data-status="'+ row.status+'"  id="btn_' + row.childuuid + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="glyphicons glyphicons-circle-question-mark" ></span></button>' +
-              '<div class="dropdown-menu dropdown-menu-right" style="width: 245px;top: 0px; left: -245px;">' +
+              '<div class="dropdown-menu dropdown-menu-right" style="width: 290px;top: 0px; left: -290px;">' +
               '<button class="btn btn-default" onclick="setpresence(\'' + row.childuuid + '\',0);"><span class="glyphicons glyphicons-circle-question-mark"></span></button>' +
               '<button class="btn btn-primary" onclick="setpresence(\'' + row.childuuid + '\',5);"><span class="glyphicons glyphicons-circle-ok"></span></button>' +
               '<button class="btn btn-info" onclick="setpresence(\'' + row.childuuid + '\',4);"><span class="glyphicon glyphicon-plane"></span></button>' +
               '<button class="btn btn-danger" onclick="setpresence(\'' + row.childuuid + '\',3);"><span class="glyphicons glyphicons-eye-close"></span></button>' +
+              '<button class="btn btn-absent2" onclick="setpresence(\'' + row.childuuid + '\',31);"><span class="glyphicons glyphicons-eye-close"></span></button>' +
               '<button class="btn btn-warning" onclick="setpresence(\'' + row.childuuid + '\',2);"><span class="glyphicons glyphicons-stethoscope" ></span></button>' +
               '<button class="btn btn-success" onclick="setpresence(\'' + row.childuuid + '\',1);"><span class="glyphicons glyphicons-check" ></span></button>' +
             '</div>' +'</div>' +

diff --git a/app_v3/chrome/content/modules/presences/js/weeklypresences.js b/app_v3/chrome/content/modules/presences/js/weeklypresences.js
index 17434a3..050fd99 100644 (file)
--- a/app_v3/chrome/content/modules/presences/js/weeklypresences.js
+++ b/app_v3/chrome/content/modules/presences/js/weeklypresences.js
@@ -27,6 +27,11 @@ var presences = {
             icon: '<span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span>',
             nextdata: 3
       },
+      "btn-absent2": {
+            class: "btn-absent2",
+            icon: '<span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span>',
+            nextdata: 31
+      },
       "btn-danger": {
             class: "btn-info",
             icon: '<span class="glyphicon glyphicon-plane" aria-hidden="true"></span>',
@@ -60,6 +65,11 @@ var presenceids = {
             icon: '<span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span>',
             nextdata: 3
       },
+      31: { 
+            class: "btn-absent2",
+            icon: '<span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span>',
+            nextdata: 31
+      },
       4: {
             class: "btn-primary",
             icon: '<span class="glyphicons glyphicons-circle-ok" aria-hidden="true"></span>',
@@ -119,6 +129,7 @@ function initdata() {
         if (vacrem.indexOf(w) != -1) {
           wdsa.push("null as "+wda[w]+"plan,null AS "+wda[w]+"lunchplan");
         } else {
+            
           wdsa.push(" CASE WHEN pl."+wda[w]+"timebegin != '00:00' AND '" + weekdates[wda[w]] + "' BETWEEN pl.datebegin AND pl.dateend THEN '<button type=\"button\" class=\"btn btn-default 2\" id=\"btn_' || ch.uuid || '_"+wda[w]+"\"  onclick=\"setpresence(this);\"><span class=\"glyphicons glyphicons-circle-question-mark\" aria-hidden=\"true\"></button>' ELSE '<button type=\"button\" class=\"btn btn-primary 1\" id=\"btn_edit_' || ch.uuid || '_"+wda[w]+"\"  onclick=\"configure_presence(this);\"><span class=\"glyphicons glyphicons-settings\" aria-hidden=\"true\"></button>' END AS "+wda[w]+"plan, " +
           " CASE WHEN pl."+wda[w]+"timebegin != '00:00' AND '" + weekdates[wda[w]] + "' BETWEEN pl.datebegin AND pl.dateend THEN '<button type=\"button\" class=\"btn btn-' || CASE WHEN pl."+wda[w]+"lunch = 1 THEN 'default' ELSE 'default' END || '\" id=\"btn_' || ch.uuid || '_"+wda[w]+"lunch\" onclick=\"setlunch(this);\" disabled=\"disabled\"><span class=\"glyphicons glyphicons-cutlery\" ></span></button>' ELSE NULL END AS "+wda[w]+"lunchplan" );
         }

diff --git a/app_v3/chrome/content/modules/presences/weeklypresences.html b/app_v3/chrome/content/modules/presences/weeklypresences.html
index 2b3991b..0ee1f1c 100644 (file)
--- a/app_v3/chrome/content/modules/presences/weeklypresences.html
+++ b/app_v3/chrome/content/modules/presences/weeklypresences.html
@@ -52,7 +52,8 @@
     <li class="btn-primary"><span class="glyphicons glyphicons-circle-question-mark" aria-hidden="true"></span> non configuré</li>
     <li class="btn-success"><span class="glyphicons glyphicons-ok" aria-hidden="true"></span> présent</li>
     <li class="btn-warning"><span class="glyphicons glyphicons-stethoscope" aria-hidden="true"></span> malade</li>
-    <li class="btn-danger"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absent</li>
+    <li class="btn-danger"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absence non verifé</li>
+    <li class="btn-absent2"><span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span> absence verifié</li>
     <li class="btn-info"><span class="glyphicon glyphicon-plane" aria-hidden="true"></span> vacences</li>
     <li class="btn-primary"><span class="glyphicons glyphicons-circle-question-mark" aria-hidden="true"></span> essaie</li>
   </ul>

diff --git a/app_v3/chrome/content/web/css/creorga.css b/app_v3/chrome/content/web/css/creorga.css
index ccea2c2..410c780 100644 (file)
--- a/app_v3/chrome/content/web/css/creorga.css
+++ b/app_v3/chrome/content/web/css/creorga.css
@@ -207,3 +207,61 @@ select {
 }
 
 /*.note-editor .note-dropzone { opacity: 0 !important; }*/
+
+.btn-absent2 {
+  color: #fff;
+  background-color: #d96f4f;
+  border-color: #ac2925;
+}
+.btn-absent2:focus,
+.btn-absent2.focus {
+  color: #fff;
+  background-color: #d96f4f;
+  border-color: #761c19;
+}
+.btn-absent2:hover {
+  color: #fff;
+  background-color: #d96f4f;
+  border-color: #ac2925;
+}
+.btn-absent2:active,
+.btn-absent2.active,
+.open > .dropdown-toggle.btn-absent2 {
+  color: #fff;
+  background-color: #d96f4f;
+  border-color: #ac2925;
+}
+.btn-absent2:active:hover,
+.btn-absent2.active:hover,
+.open > .dropdown-toggle.btn-absent2:hover,
+.btn-absent2:active:focus,
+.btn-absent2.active:focus,
+.open > .dropdown-toggle.btn-absent2:focus,
+.btn-absent2:active.focus,
+.btn-absent2.active.focus,
+.open > .dropdown-toggle.btn-absent2.focus {
+  color: #fff;
+  background-color: #d96f4f;
+  border-color: #761c19;
+}
+.btn-absent2:active,
+.btn-absent2.active,
+.open > .dropdown-toggle.btn-absent2 {
+  background-image: none;
+}
+.btn-absent2.disabled:hover,
+.btn-absent2[disabled]:hover,
+fieldset[disabled] .btn-absent2:hover,
+.btn-absent2.disabled:focus,
+.btn-absent2[disabled]:focus,
+fieldset[disabled] .btn-absent2:focus,
+.btn-absent2.disabled.focus,
+.btn-absent2[disabled].focus,
+fieldset[disabled] .btn-absent2.focus {
+  background-color: #d96f4f;
+  border-color: #ac2925;
+}
+.btn-absent2 .badge {
+  color: #d96f4f;
+  background-color: #fff;
+}
\ No newline at end of file

diff --git a/creorga.code-workspace b/creorga.code-workspace
index 6081b08..ffa785b 100644 (file)
--- a/creorga.code-workspace
+++ b/creorga.code-workspace
@@ -8,6 +8,9 @@
                },
                {
                        "path": "dev"
+               },
+               {
+                       "path": "install"
                }
        ],
        "settings": {}