From 5c2bd00bb428e3a41be7310f6298b836315ee557 Mon Sep 17 00:00:00 2001 From: Geoffrey POUZET Date: Fri, 30 Oct 2020 10:37:33 +0100 Subject: [PATCH] Add not used progression. --- .../dao/bean/Progression.java | 10 ++ src/main/webapp/vue/animal_behavior.jsp | 129 +++++++++--------- src/main/webapp/vue/animal_care.jsp | 129 +++++++++--------- src/main/webapp/vue/animal_progression.jsp | 42 +++--- 4 files changed, 166 insertions(+), 144 deletions(-) diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bean/Progression.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bean/Progression.java index cb13202..dfcd880 100644 --- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bean/Progression.java +++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bean/Progression.java @@ -9,6 +9,7 @@ public class Progression { public static final String PROGRESSION_VALUE_NOT_TRAINED = "NOT_TRAINED"; public static final String PROGRESSION_VALUE_CURRENTLY_TRAINING = "CURRENTLY_TRAINING"; public static final String PROGRESSION_VALUE_TRAINED = "TRAINED"; + public static final String PROGRESSION_VALUE_NOT_USED = "NOT_USED"; private int id; private ConsentBehavior consentBehavior; @@ -54,6 +55,9 @@ public class Progression { case PROGRESSION_VALUE_TRAINED: progressionByMe = PROGRESSION_VALUE_TRAINED; break; + case PROGRESSION_VALUE_NOT_USED: + progressionByMe = PROGRESSION_VALUE_NOT_USED; + break; default: progressionByMe = PROGRESSION_VALUE_NOT_TRAINED; break; @@ -74,6 +78,9 @@ public class Progression { case PROGRESSION_VALUE_TRAINED: progressionBySomeoneElse = PROGRESSION_VALUE_TRAINED; break; + case PROGRESSION_VALUE_NOT_USED: + progressionBySomeoneElse = PROGRESSION_VALUE_NOT_USED; + break; default: progressionBySomeoneElse = PROGRESSION_VALUE_NOT_TRAINED; break; @@ -94,6 +101,9 @@ public class Progression { case PROGRESSION_VALUE_TRAINED: progressionByVeterinary = PROGRESSION_VALUE_TRAINED; break; + case PROGRESSION_VALUE_NOT_USED: + progressionByVeterinary = PROGRESSION_VALUE_NOT_USED; + break; default: progressionByVeterinary = PROGRESSION_VALUE_NOT_TRAINED; break; diff --git a/src/main/webapp/vue/animal_behavior.jsp b/src/main/webapp/vue/animal_behavior.jsp index ff7bf9b..450dc70 100644 --- a/src/main/webapp/vue/animal_behavior.jsp +++ b/src/main/webapp/vue/animal_behavior.jsp @@ -45,70 +45,72 @@

${MODEL_MAP_ANIMAL.getConsentBehaviorById(MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID).getDescription()}

- - - - - - - - - - - - +
+
+ - - - - - + + + + + - - -
${progression.getCare().getName()}success - info - active - "> - - - - success - info - active - "> - - - - success - info - active - "> - - - - -
- - - - - - -
- -
- - - - - - -
-
+ + + + + ${progression.getCare().getName()} + success + info + active + "> + + + + + success + info + active + "> + + + + + success + info + active + "> + + + + + +
+ + + + + + +
+ +
+ + + + + + +
+ + +
+ + +

@@ -178,6 +180,7 @@ + @@ -185,6 +188,7 @@ + @@ -192,6 +196,7 @@ + diff --git a/src/main/webapp/vue/animal_care.jsp b/src/main/webapp/vue/animal_care.jsp index e70fc30..9eb3b5e 100644 --- a/src/main/webapp/vue/animal_care.jsp +++ b/src/main/webapp/vue/animal_care.jsp @@ -45,70 +45,72 @@

${MODEL_MAP_ANIMAL.getCareById(MODEL_MAP_ANIMAL_CARE_ID).getDescription()}

- - - - - - - - - - - - +
+
+ - - - - - + + + + + - - -
${progression.getConsentBehavior().getName()}success - info - active - "> - - - - success - info - active - "> - - - - success - info - active - "> - - - - -
- - - - - - -
- -
- - - - - - -
-
+ + + + + ${progression.getConsentBehavior().getName()} + success + info + active + "> + + + + + success + info + active + "> + + + + + success + info + active + "> + + + + + +
+ + + + + + +
+ +
+ + + + + + +
+ + +
+ + +

@@ -177,6 +179,7 @@ + @@ -184,6 +187,7 @@ + @@ -191,6 +195,7 @@ + diff --git a/src/main/webapp/vue/animal_progression.jsp b/src/main/webapp/vue/animal_progression.jsp index d505a6a..9d0326a 100644 --- a/src/main/webapp/vue/animal_progression.jsp +++ b/src/main/webapp/vue/animal_progression.jsp @@ -36,26 +36,28 @@

-

- - - - - - - - - - success - info - active - "> - - - - - -
${progression.getCare().getName()}${progression.getConsentBehavior().getName()}
+
+ + + + + + + + + + success + info + active + "> + + + + + +
${progression.getCare().getName()}${progression.getConsentBehavior().getName()}
+
<%@ include file="base/footer.jsp" %>