From 0f136299e9d48dc31b8c964ea164caf3eddcdf43 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 29 Mar 2018 22:01:40 +0200 Subject: [PATCH] [teacher.view] added 'sous-service'/'sur-service' + EHTD + EDIT MODE valid + info header --- webpack/component/teacher/view.vue | 29 +++++++++++++++++++---------- webpack/scss/global.scss | 3 ++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/webpack/component/teacher/view.vue b/webpack/component/teacher/view.vue index a52e363..66d1b89 100644 --- a/webpack/component/teacher/view.vue +++ b/webpack/component/teacher/view.vue @@ -83,22 +83,25 @@
-
- - {{prof.hoursToDo}} - - - - heures à faire -
-
+ +
{{ prof.equiTD }} HETD
+ +
+ + heures à faire +
+ + +
+ {{ prof.equiTD < prof.hoursToDo ? prof.hoursToDo-prof.equiTD : prof.equiTD-prof.hoursToDo }} + {{ prof.equiTD < prof.hoursToDo ? 'sous-service' : 'sur-service' }} +
-
{{ prof.VHCours + prof.VHTd + prof.VHTp }} heures présentielles
fiche
{{ gstore.edit_err }}
@@ -116,6 +119,12 @@
+ + +
+ {{ prof.hoursToDo }}h à faire, {{ prof.VHCours + prof.VHTd + prof.VHTp }}h présentielles +
+ diff --git a/webpack/scss/global.scss b/webpack/scss/global.scss index 0bf7c43..d0189e2 100644 --- a/webpack/scss/global.scss +++ b/webpack/scss/global.scss @@ -13,7 +13,8 @@ @import 'global/tag'; -.error, [data-error='1']{ font-weight: bold; color: $form-invalid-color; } +.error, [data-error='1']{ font-weight: bold; color: $form-invalid-color; } +.success, [data-success='1']{ color: $form-valid-color; }