chteufleur
/
MedicalTrainingTracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add not used progression.

This commit is contained in:
Geoffrey POUZET 2020-10-30 10:37:33 +01:00
parent 61007f66be
commit 5c2bd00bb4
4 changed files with 166 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/fr/geoffrey/medical_training_tracker/dao/bean/Progression.java
View File

@ -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;

5
src/main/webapp/vue/animal_behavior.jsp
View File

@ -45,6 +45,7 @@
</h3>
<p>${MODEL_MAP_ANIMAL.getConsentBehaviorById(MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID).getDescription()}</p>
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr>
@ -109,6 +110,7 @@
</c:forEach>
</tbody>
</table>
</div>
<hr/>
<h4><fmt:message key="animal_behavior.add_care"></fmt:message></h4>
@ -178,6 +180,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<label for="modal_edit_consent_behavior_form_progression_by_someone_else"><fmt:message key="animal_behavior.table.executed_by_someone_else"></fmt:message></label>
@ -185,6 +188,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<label for="modal_edit_consent_behavior_form_progression_by_veterinary"><fmt:message key="animal_behavior.table.executed_by_veterinary"></fmt:message></label>
@ -192,6 +196,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<input name="page" value="consent_behavior" hidden />

5
src/main/webapp/vue/animal_care.jsp
View File

@ -45,6 +45,7 @@
</h3>
<p>${MODEL_MAP_ANIMAL.getCareById(MODEL_MAP_ANIMAL_CARE_ID).getDescription()}</p>
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr>
@ -109,6 +110,7 @@
</c:forEach>
</tbody>
</table>
</div>
<hr/>
<h4><fmt:message key="animal_care.add_behavior"></fmt:message></h4>
@ -177,6 +179,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<label for="modal_edit_consent_behavior_form_progression_by_someone_else"><fmt:message key="animal_care.table.executed_by_someone_else"></fmt:message></label>
@ -184,6 +187,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<label for="modal_edit_consent_behavior_form_progression_by_veterinary"><fmt:message key="animal_care.table.executed_by_veterinary"></fmt:message></label>
@ -191,6 +195,7 @@
<option value="NOT_TRAINED"><fmt:message key="progression.value.NOT_TRAINED"></fmt:message></option>
<option value="CURRENTLY_TRAINING"><fmt:message key="progression.value.CURRENTLY_TRAINING"></fmt:message></option>
<option value="TRAINED"><fmt:message key="progression.value.TRAINED"></fmt:message></option>
<option value="NOT_USED"><fmt:message key="progression.value.NOT_USED"></fmt:message></option>
</select>
<input name="page" value="care" hidden />

2
src/main/webapp/vue/animal_progression.jsp
View File

@ -36,6 +36,7 @@
</fmt:message>
</h1></center>
<h4><fmt:message key="progression.${MODEL_MAP_PROGRESSION_TYPE}"></fmt:message> - <fmt:message key="progression.value.${MODEL_MAP_PROGRESSION}"></fmt:message></h4>
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr>
@ -56,6 +57,7 @@
</c:forEach>
</tbody>
</table>
</div>
<%@ include file="base/footer.jsp" %>
</div>
</body>