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_NOT_TRAINED = "NOT_TRAINED";
public static final String PROGRESSION_VALUE_CURRENTLY_TRAINING = "CURRENTLY_TRAINING"; public static final String PROGRESSION_VALUE_CURRENTLY_TRAINING = "CURRENTLY_TRAINING";
public static final String PROGRESSION_VALUE_TRAINED = "TRAINED"; public static final String PROGRESSION_VALUE_TRAINED = "TRAINED";
public static final String PROGRESSION_VALUE_NOT_USED = "NOT_USED";
private int id; private int id;
private ConsentBehavior consentBehavior; private ConsentBehavior consentBehavior;
@ -54,6 +55,9 @@ public class Progression {
case PROGRESSION_VALUE_TRAINED: case PROGRESSION_VALUE_TRAINED:
progressionByMe = PROGRESSION_VALUE_TRAINED; progressionByMe = PROGRESSION_VALUE_TRAINED;
break; break;
case PROGRESSION_VALUE_NOT_USED:
progressionByMe = PROGRESSION_VALUE_NOT_USED;
break;
default: default:
progressionByMe = PROGRESSION_VALUE_NOT_TRAINED; progressionByMe = PROGRESSION_VALUE_NOT_TRAINED;
break; break;
@ -74,6 +78,9 @@ public class Progression {
case PROGRESSION_VALUE_TRAINED: case PROGRESSION_VALUE_TRAINED:
progressionBySomeoneElse = PROGRESSION_VALUE_TRAINED; progressionBySomeoneElse = PROGRESSION_VALUE_TRAINED;
break; break;
case PROGRESSION_VALUE_NOT_USED:
progressionBySomeoneElse = PROGRESSION_VALUE_NOT_USED;
break;
default: default:
progressionBySomeoneElse = PROGRESSION_VALUE_NOT_TRAINED; progressionBySomeoneElse = PROGRESSION_VALUE_NOT_TRAINED;
break; break;
@ -94,6 +101,9 @@ public class Progression {
case PROGRESSION_VALUE_TRAINED: case PROGRESSION_VALUE_TRAINED:
progressionByVeterinary = PROGRESSION_VALUE_TRAINED; progressionByVeterinary = PROGRESSION_VALUE_TRAINED;
break; break;
case PROGRESSION_VALUE_NOT_USED:
progressionByVeterinary = PROGRESSION_VALUE_NOT_USED;
break;
default: default:
progressionByVeterinary = PROGRESSION_VALUE_NOT_TRAINED; progressionByVeterinary = PROGRESSION_VALUE_NOT_TRAINED;
break; break;

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

@ -45,70 +45,72 @@
</h3> </h3>
<p>${MODEL_MAP_ANIMAL.getConsentBehaviorById(MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID).getDescription()}</p> <p>${MODEL_MAP_ANIMAL.getConsentBehaviorById(MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID).getDescription()}</p>
<table class="table table-hover"> <div class="table-responsive">
<thead> <table class="table table-hover">
<tr> <thead>
<th><fmt:message key="animal_behavior.table.care"></fmt:message></th>
<th><fmt:message key="animal_behavior.table.executed_by_me"></fmt:message></th>
<th><fmt:message key="animal_behavior.table.executed_by_someone_else"></fmt:message></th>
<th><fmt:message key="animal_behavior.table.executed_by_veterinary"></fmt:message></th>
<th></th>
</tr>
</thead>
<tbody>
<c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression">
<tr> <tr>
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/care/${progression.getCare().getId()}">${progression.getCare().getName()}</a></td> <th><fmt:message key="animal_behavior.table.care"></fmt:message></th>
<td class=" <th><fmt:message key="animal_behavior.table.executed_by_me"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'TRAINED'}">success</c:if> <th><fmt:message key="animal_behavior.table.executed_by_someone_else"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'CURRENTLY_TRAINING'}">info</c:if> <th><fmt:message key="animal_behavior.table.executed_by_veterinary"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'NOT_TRAINED'}">active</c:if> <th></th>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_me/${progression.getProgressionByMe()}">
<fmt:message key="progression.value.${progression.getProgressionByMe()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionBySomeoneElse() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_someone_else/${progression.getProgressionBySomeoneElse()}">
<fmt:message key="progression.value.${progression.getProgressionBySomeoneElse()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionByVeterinary() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_veterinary/${progression.getProgressionByVeterinary()}">
<fmt:message key="progression.value.${progression.getProgressionByVeterinary()}"></fmt:message>
</a>
</td>
<td>
<form class="pull-right" action="${animalDeleteProgressionURL}/${progression.getId()}" method="POST">
<input value="${progression.getCare().getName()}" hidden />
<label class="sr-only" for="form_page">Page</label>
<input id="form_page" name="page" value="consent_behavior" hidden />
<label class="sr-only" for="form_consent_behavior_id">Consent behavior ID</label>
<input id="form_consent_behavior_id" name="redirect_id" value="${MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID}" hidden />
<button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_behavior.button.delete.tooltip"></fmt:message>"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
</form>
<form class="pull-right" action="${animalEditProgressionURL}/${progression.getId()}" method="GET">
<input value="${progression.getCare().getId()}" hidden />
<input value="${progression.getCare().getName()}" hidden />
<input value="${progression.getProgressionByMe()}" hidden />
<input value="${progression.getProgressionBySomeoneElse()}" hidden />
<input value="${progression.getProgressionByVeterinary()}" hidden />
<button class="btn btn-default" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_consent_behavior.button.edit.tooltip"></fmt:message>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
</form>
</td>
</tr> </tr>
</c:forEach> </thead>
</tbody> <tbody>
</table> <c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression">
<tr>
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/care/${progression.getCare().getId()}">${progression.getCare().getName()}</a></td>
<td class="
<c:if test="${progression.getProgressionByMe() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByMe() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByMe() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_me/${progression.getProgressionByMe()}">
<fmt:message key="progression.value.${progression.getProgressionByMe()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionBySomeoneElse() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_someone_else/${progression.getProgressionBySomeoneElse()}">
<fmt:message key="progression.value.${progression.getProgressionBySomeoneElse()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionByVeterinary() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_veterinary/${progression.getProgressionByVeterinary()}">
<fmt:message key="progression.value.${progression.getProgressionByVeterinary()}"></fmt:message>
</a>
</td>
<td>
<form class="pull-right" action="${animalDeleteProgressionURL}/${progression.getId()}" method="POST">
<input value="${progression.getCare().getName()}" hidden />
<label class="sr-only" for="form_page">Page</label>
<input id="form_page" name="page" value="consent_behavior" hidden />
<label class="sr-only" for="form_consent_behavior_id">Consent behavior ID</label>
<input id="form_consent_behavior_id" name="redirect_id" value="${MODEL_MAP_ANIMAL_CONSENT_BEHAVIOR_ID}" hidden />
<button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_behavior.button.delete.tooltip"></fmt:message>"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
</form>
<form class="pull-right" action="${animalEditProgressionURL}/${progression.getId()}" method="GET">
<input value="${progression.getCare().getId()}" hidden />
<input value="${progression.getCare().getName()}" hidden />
<input value="${progression.getProgressionByMe()}" hidden />
<input value="${progression.getProgressionBySomeoneElse()}" hidden />
<input value="${progression.getProgressionByVeterinary()}" hidden />
<button class="btn btn-default" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_consent_behavior.button.edit.tooltip"></fmt:message>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
</form>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
<hr/> <hr/>
<h4><fmt:message key="animal_behavior.add_care"></fmt:message></h4> <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="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="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="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> </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> <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="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="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="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> </select>
<label for="modal_edit_consent_behavior_form_progression_by_veterinary"><fmt:message key="animal_behavior.table.executed_by_veterinary"></fmt:message></label> <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="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="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="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> </select>
<input name="page" value="consent_behavior" hidden /> <input name="page" value="consent_behavior" hidden />

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

@ -45,70 +45,72 @@
</h3> </h3>
<p>${MODEL_MAP_ANIMAL.getCareById(MODEL_MAP_ANIMAL_CARE_ID).getDescription()}</p> <p>${MODEL_MAP_ANIMAL.getCareById(MODEL_MAP_ANIMAL_CARE_ID).getDescription()}</p>
<table class="table table-hover"> <div class="table-responsive">
<thead> <table class="table table-hover">
<tr> <thead>
<th><fmt:message key="animal_care.table.behavior"></fmt:message></th>
<th><fmt:message key="animal_care.table.executed_by_me"></fmt:message></th>
<th><fmt:message key="animal_care.table.executed_by_someone_else"></fmt:message></th>
<th><fmt:message key="animal_care.table.executed_by_veterinary"></fmt:message></th>
<th></th>
</tr>
</thead>
<tbody>
<c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression">
<tr> <tr>
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/consent_behavior/${progression.getConsentBehavior().getId()}">${progression.getConsentBehavior().getName()}</a></td> <th><fmt:message key="animal_care.table.behavior"></fmt:message></th>
<td class=" <th><fmt:message key="animal_care.table.executed_by_me"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'TRAINED'}">success</c:if> <th><fmt:message key="animal_care.table.executed_by_someone_else"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'CURRENTLY_TRAINING'}">info</c:if> <th><fmt:message key="animal_care.table.executed_by_veterinary"></fmt:message></th>
<c:if test="${progression.getProgressionByMe() == 'NOT_TRAINED'}">active</c:if> <th></th>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_me/${progression.getProgressionByMe()}">
<fmt:message key="progression.value.${progression.getProgressionByMe()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionBySomeoneElse() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_someone_else/${progression.getProgressionBySomeoneElse()}">
<fmt:message key="progression.value.${progression.getProgressionBySomeoneElse()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionByVeterinary() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_veterinary/${progression.getProgressionByVeterinary()}">
<fmt:message key="progression.value.${progression.getProgressionByVeterinary()}"></fmt:message>
</a>
</td>
<td>
<form class="pull-right" action="${animalDeleteProgressionURL}/${progression.getId()}" method="POST">
<input value="${progression.getConsentBehavior().getName()}" hidden />
<label class="sr-only" for="form_page">Page</label>
<input id="form_page" name="page" value="care" hidden />
<label class="sr-only" for="form_care_id">Care ID</label>
<input id="form_care_id" name="redirect_id" value="${MODEL_MAP_ANIMAL_CARE_ID}" hidden />
<button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_care.button.delete.tooltip"></fmt:message>"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
</form>
<form class="pull-right" action="${animalEditProgressionURL}/${progression.getId()}" method="GET">
<input value="${progression.getConsentBehavior().getId()}" hidden />
<input value="${progression.getConsentBehavior().getName()}" hidden />
<input value="${progression.getProgressionByMe()}" hidden />
<input value="${progression.getProgressionBySomeoneElse()}" hidden />
<input value="${progression.getProgressionByVeterinary()}" hidden />
<button class="btn btn-default" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_care.button.edit.tooltip"></fmt:message>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
</form>
</td>
</tr> </tr>
</c:forEach> </thead>
</tbody> <tbody>
</table> <c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression">
<tr>
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/consent_behavior/${progression.getConsentBehavior().getId()}">${progression.getConsentBehavior().getName()}</a></td>
<td class="
<c:if test="${progression.getProgressionByMe() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByMe() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByMe() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_me/${progression.getProgressionByMe()}">
<fmt:message key="progression.value.${progression.getProgressionByMe()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionBySomeoneElse() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionBySomeoneElse() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_someone_else/${progression.getProgressionBySomeoneElse()}">
<fmt:message key="progression.value.${progression.getProgressionBySomeoneElse()}"></fmt:message>
</a>
</td>
<td class="
<c:if test="${progression.getProgressionByVeterinary() == 'TRAINED'}">success</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'CURRENTLY_TRAINING'}">info</c:if>
<c:if test="${progression.getProgressionByVeterinary() == 'NOT_TRAINED'}">active</c:if>
">
<a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/progression_by_veterinary/${progression.getProgressionByVeterinary()}">
<fmt:message key="progression.value.${progression.getProgressionByVeterinary()}"></fmt:message>
</a>
</td>
<td>
<form class="pull-right" action="${animalDeleteProgressionURL}/${progression.getId()}" method="POST">
<input value="${progression.getConsentBehavior().getName()}" hidden />
<label class="sr-only" for="form_page">Page</label>
<input id="form_page" name="page" value="care" hidden />
<label class="sr-only" for="form_care_id">Care ID</label>
<input id="form_care_id" name="redirect_id" value="${MODEL_MAP_ANIMAL_CARE_ID}" hidden />
<button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_care.button.delete.tooltip"></fmt:message>"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
</form>
<form class="pull-right" action="${animalEditProgressionURL}/${progression.getId()}" method="GET">
<input value="${progression.getConsentBehavior().getId()}" hidden />
<input value="${progression.getConsentBehavior().getName()}" hidden />
<input value="${progression.getProgressionByMe()}" hidden />
<input value="${progression.getProgressionBySomeoneElse()}" hidden />
<input value="${progression.getProgressionByVeterinary()}" hidden />
<button class="btn btn-default" type="submit" data-toggle="tooltip" data-placement="bottom" title="<fmt:message key="animal_care.button.edit.tooltip"></fmt:message>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
</form>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
<hr/> <hr/>
<h4><fmt:message key="animal_care.add_behavior"></fmt:message></h4> <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="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="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="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> </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> <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="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="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="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> </select>
<label for="modal_edit_consent_behavior_form_progression_by_veterinary"><fmt:message key="animal_care.table.executed_by_veterinary"></fmt:message></label> <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="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="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="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> </select>
<input name="page" value="care" hidden /> <input name="page" value="care" hidden />

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

@ -36,26 +36,28 @@
</fmt:message> </fmt:message>
</h1></center> </h1></center>
<h4><fmt:message key="progression.${MODEL_MAP_PROGRESSION_TYPE}"></fmt:message> - <fmt:message key="progression.value.${MODEL_MAP_PROGRESSION}"></fmt:message></h4> <h4><fmt:message key="progression.${MODEL_MAP_PROGRESSION_TYPE}"></fmt:message> - <fmt:message key="progression.value.${MODEL_MAP_PROGRESSION}"></fmt:message></h4>
<table class="table table-hover"> <div class="table-responsive">
<thead> <table class="table table-hover">
<tr> <thead>
<th><fmt:message key="progression.table.column.care"></fmt:message></th> <tr>
<th><fmt:message key="progression.table.column.behavior"></fmt:message></th> <th><fmt:message key="progression.table.column.care"></fmt:message></th>
</tr> <th><fmt:message key="progression.table.column.behavior"></fmt:message></th>
</thead> </tr>
<tbody> </thead>
<c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression"> <tbody>
<tr class=" <c:forEach items="${MODEL_MAP_ANIMAL.getProgressionList()}" var="progression">
<c:if test="${MODEL_MAP_PROGRESSION == 'TRAINED'}">success</c:if> <tr class="
<c:if test="${MODEL_MAP_PROGRESSION == 'CURRENTLY_TRAINING'}">info</c:if> <c:if test="${MODEL_MAP_PROGRESSION == 'TRAINED'}">success</c:if>
<c:if test="${MODEL_MAP_PROGRESSION == 'NOT_TRAINED'}">active</c:if> <c:if test="${MODEL_MAP_PROGRESSION == 'CURRENTLY_TRAINING'}">info</c:if>
"> <c:if test="${MODEL_MAP_PROGRESSION == 'NOT_TRAINED'}">active</c:if>
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/care/${progression.getCare().getId()}">${progression.getCare().getName()}</a></td> ">
<td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/consent_behavior/${progression.getConsentBehavior().getId()}">${progression.getConsentBehavior().getName()}</a></td> <td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/care/${progression.getCare().getId()}">${progression.getCare().getName()}</a></td>
</tr> <td><a href="${animalURL}/${MODEL_MAP_ANIMAL.getId()}/consent_behavior/${progression.getConsentBehavior().getId()}">${progression.getConsentBehavior().getName()}</a></td>
</c:forEach> </tr>
</tbody> </c:forEach>
</table> </tbody>
</table>
</div>
<%@ include file="base/footer.jsp" %> <%@ include file="base/footer.jsp" %>
</div> </div>
</body> </body>