diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 4719dd8..5c0551d 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -35,3 +35,57 @@ modal_button.delete=Delete modal_button.cancel=Cancel animal_cares_and_behaviors.delete.modal_body.behavior=Do you want to delete this behavior? animal_cares_and_behaviors.delete.modal_body.care=Do you want to delete this care? +animal_list.title=Your animals' list +animal_list.animal_list.title=Your animals' list +animal_list.animal.delete.tooltip=Delete +animal_list.animal.add.title=Add an animal +animal_list.animal.add.label=Animal's name: +animal_list.animal.add.placeholder=Name +animal_list.animal.add.tooltip=Add +animal_list.change_password.title=Change password +animal_list.change_password.old_password.label=Old password: +animal_list.change_password.old_password.placeholder=Old password +animal_list.change_password.new_password.label=New password: +animal_list.change_password.new_password.placeholder=New password +animal_list.change_password.new_password_check.label=New password: +animal_list.change_password.new_password_check.placeholder=Check new password +animal_list.change_password.submit=Change password +progression.title={0} sheet +progression.table.column.care=Care +progression.table.column.behavior=Consent behavior + + +animal_care_and_behavior.title={0} sheet +animal_care_and_behavior.care_list=Cares list +animal_care_and_behavior.add_care=Add care +animal_care_and_behavior.add_care.care_name.placeholder=Care name +animal_care_and_behavior.add_care.care_description.placeholder=Care description (optional) +animal_care_and_behavior.add_care.button.submit=Add +animal_care_and_behavior.behavior_list=Consent behaviors list +animal_care_and_behavior.add_behavior=Add consent behavior +animal_care_and_behavior.add_behavior.care_name.placeholder=Consent behavior +animal_care_and_behavior.add_behavior.care_description.placeholder=Consent behavior description (optional) +animal_care_and_behavior.add_behavior.button.submit=Add +animal_care_and_behavior.button.delete.tooltip=Delete + +animal_care.title={0} sheet +animal_care.subtitle=Progression of "{0}" +animal_care.table.behavior=Consent behavior +animal_care.table.executed_by_me=Execute by me +animal_care.table.executed_by_someone_else=Execute by someone else +animal_care.table.executed_by_veterinary=Execute by veterinary +animal_care.button.delete.tooltip=Delete +animal_care.button.add.tooltip=Add +animal_care.add_behavior=Add a consent behavior to this care +animal_care.add_behavior.empty_list=No more consent behaviors to add + +animal_behavior.title={0} sheet +animal_behavior.subtitle=Progression of "{0}" +animal_behavior.table.care=Care +animal_behavior.table.executed_by_me=Execute by me +animal_behavior.table.executed_by_someone_else=Execute by someone else +animal_behavior.table.executed_by_veterinary=Execute by veterinary +animal_behavior.button.delete.tooltip=Delete +animal_behavior.button.add.tooltip=Add +animal_behavior.add_care=Add care to this consent behavior +animal_behavior.add_care.empty_list=No more cares to add diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index e59be89..232d967 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -35,3 +35,53 @@ modal_button.delete=Delete modal_button.cancel=Cancel animal_cares_and_behaviors.delete.modal_body.behavior=Do you want to delete this behavior? animal_cares_and_behaviors.delete.modal_body.care=Do you want to delete this care? +animal_list.title=Your animals' list +animal_list.animal_list.title=Your animals' list +animal_list.animal.add.title=Add an animal +animal_list.animal.add.label=Animal's name: +animal_list.animal.add.placeholder=Name +animal_list.animal.add.tooltip=Add +animal_list.change_password.title=Change password +animal_list.change_password.old_password.label=Old password: +animal_list.change_password.old_password.placeholder=Old password +animal_list.change_password.new_password.label=New password: +animal_list.change_password.new_password.placeholder=New password +animal_list.change_password.new_password_check.label=New password: +animal_list.change_password.new_password_check.placeholder=Check new password +animal_list.change_password.submit=Change password +progression.title={0} sheet +progression.table.column.care=Care +progression.table.column.behavior=Consent behavior +animal_care_and_behavior.title={0} sheet +animal_care_and_behavior.care_list=Cares list +animal_care_and_behavior.add_care=Add care +animal_care_and_behavior.add_care.care_name.placeholder=Care name +animal_care_and_behavior.add_care.care_description.placeholder=Care description (optional) +animal_care_and_behavior.add_care.button.submit=Add +animal_care_and_behavior.behavior_list=Consent behaviors list +animal_care_and_behavior.add_behavior=Add consent behavior +animal_care_and_behavior.add_behavior.care_name.placeholder=Consent behavior +animal_care_and_behavior.add_behavior.care_description.placeholder=Consent behavior description (optional) +animal_care_and_behavior.add_behavior.button.submit=Add +animal_care_and_behavior.button.delete.tooltip=Delete +animal_care.title={0} sheet +animal_care.subtitle=Progression of "{0}" +animal_behavior.title={0} sheet +animal_list.animal.delete.tooltip=Delete +animal_care.add_behavior.empty_list=No more consent behaviors to add +animal_care.add_behavior=Add a consent behavior to this care +animal_care.button.delete.tooltip=Delete +animal_care.button.add.tooltip=Add +animal_care.table.executed_by_veterinary=Execute by veterinary +animal_care.table.executed_by_someone_else=Execute by someone else +animal_care.table.executed_by_me=Execute by me +animal_care.table.behavior=Consent behavior +animal_behavior.subtitle=Progression of "{0}" +animal_behavior.table.care=Care +animal_behavior.table.executed_by_me=Execute by me +animal_behavior.table.executed_by_someone_else=Execute by someone else +animal_behavior.table.executed_by_veterinary=Execute by veterinary +animal_behavior.button.delete.tooltip=Delete +animal_behavior.button.add.tooltip=Add +animal_behavior.add_care=Add care to this consent behavior +animal_behavior.add_care.empty_list=No more cares to add diff --git a/src/main/resources/messages_fr.properties b/src/main/resources/messages_fr.properties index 7080044..ed545c7 100644 --- a/src/main/resources/messages_fr.properties +++ b/src/main/resources/messages_fr.properties @@ -35,3 +35,53 @@ modal_button.delete=Supprimer modal_button.cancel=Annuler animal_cares_and_behaviors.delete.modal_body.behavior=Voulez-vous vraiment supprimer ce comportement ? animal_cares_and_behaviors.delete.modal_body.care=Voulez-vous vraiment supprimer ce soin ? +animal_list.title=Liste de vos animaux +animal_list.animal_list.title=Liste de vos animaux +animal_list.animal.add.title=Ajouter un animal +animal_list.animal.add.label=Nom de l'animal : +animal_list.animal.add.placeholder=Nom +animal_list.animal.add.tooltip=Ajouter +animal_list.change_password.title=Changer de mot de passe +animal_list.change_password.old_password.label=Ancien mot de passe : +animal_list.change_password.old_password.placeholder=Ancien mot de passe +animal_list.change_password.new_password.label=Nouveau mot de passe : +animal_list.change_password.new_password.placeholder=Nouveau mot de passe +animal_list.change_password.new_password_check.label=Nouveau mot de passe : +animal_list.change_password.new_password_check.placeholder=V\u00e9rification nouveau mot de passe +animal_list.change_password.submit=Changer le mot de passe +progression.title=Feuille de {0} +progression.table.column.care=Soin +progression.table.column.behavior=Comportement de consentement +animal_care_and_behavior.title=Feuille de {0} +animal_care_and_behavior.care_list=Liste des soins +animal_care_and_behavior.add_care=Ajouter un soin +animal_care_and_behavior.add_care.care_name.placeholder=Nom du soin +animal_care_and_behavior.add_care.care_description.placeholder=Description du soin (optionelle) +animal_care_and_behavior.add_care.button.submit=Ajouter +animal_care_and_behavior.behavior_list=Liste des comportements de consentements +animal_care_and_behavior.add_behavior=Ajouter un comportement de consentement +animal_care_and_behavior.add_behavior.care_name.placeholder=Comportement de consentement +animal_care_and_behavior.add_behavior.care_description.placeholder=Description du comportement de consentement (optionelle) +animal_care_and_behavior.add_behavior.button.submit=Ajouter +animal_care_and_behavior.button.delete.tooltip=Supprimer +animal_care.title=Feuille de {0} +animal_behavior.title=Feuille de {0} +animal_care.subtitle=Progression de "{0}" +animal_list.animal.delete.tooltip=Supprimer +animal_care.table.behavior=Comportement de consentement +animal_care.table.executed_by_me=Ex\u00e9cut\u00e9 par moi +animal_care.table.executed_by_someone_else=Ex\u00e9cut\u00e9 par quelqu'un d'autre +animal_care.table.executed_by_veterinary=Ex\u00e9cut\u00e9 par le v\u00e9t\u00e9rinaire +animal_care.button.delete.tooltip=Supptimer +animal_care.button.add.tooltip=Ajouter +animal_care.add_behavior=Ajouter un comportement de consentement \u00e0 ce soin +animal_care.add_behavior.empty_list=Aucun comportements de consentement \u00e0 ajouter +animal_behavior.subtitle=Progression de "{0}" +animal_behavior.table.care=Soin +animal_behavior.table.executed_by_me=Ex\u00e9cut\u00e9 par moi +animal_behavior.table.executed_by_someone_else=Ex\u00e9cut\u00e9 par quelqu'un d'autre +animal_behavior.table.executed_by_veterinary=Ex\u00e9cut\u00e9 par le v\u00e9t\u00e9rinaire +animal_behavior.button.delete.tooltip=Supprimer +animal_behavior.button.add.tooltip=Ajouter +animal_behavior.add_care=Ajouter un soin \u00e0 ce comportement de consentement +animal_behavior.add_care.empty_list=Aucun soins \u00e0 ajouter diff --git a/src/main/webapp/vue/animal_behavior.jsp b/src/main/webapp/vue/animal_behavior.jsp index 519ef00..dce83c6 100644 --- a/src/main/webapp/vue/animal_behavior.jsp +++ b/src/main/webapp/vue/animal_behavior.jsp @@ -32,22 +32,29 @@
<%@ include file="base/navbar.jsp" %> -

Feuille de ${MODEL_MAP_ANIMAL.getName()}

-

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

+

+ + + +

+

+ + + +

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

-

Progression

- - - - - - - - + + + + + + + + @@ -85,30 +92,35 @@ - - - - + + + +
SoinsRéalisé par moiRéalisé par quelqu'un d'autreRéalisé par le vétérinaire
${progression.getCare().getName()}
-

Ajouter un soins pour ce comportement de consentement

-
- - - - - - - - -
+

+ +

+ + +
+ + + + + + + + +
+ <%@ include file="base/footer.jsp" %>
diff --git a/src/main/webapp/vue/animal_care.jsp b/src/main/webapp/vue/animal_care.jsp index 9e8f236..2bc225d 100644 --- a/src/main/webapp/vue/animal_care.jsp +++ b/src/main/webapp/vue/animal_care.jsp @@ -32,22 +32,29 @@
<%@ include file="base/navbar.jsp" %> -

Feuille de ${MODEL_MAP_ANIMAL.getName()}

-

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

+

+ + + +

+

+ + + +

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

-

Progression

- - - - - - - - + + + + + + + + @@ -85,29 +92,34 @@ - - - - + + + +
Comportement de consentementRéalisé par moiRéalisé par quelqu'un d'autreRéalisé par le vétérinaire
${progression.getConsentBehavior().getName()}
-

Ajouter un comportement de consentement pour ce soin

-
- - - - - - - -
+

+ +

+ + +
+ + + + + + + +
+ <%@ include file="base/footer.jsp" %>
diff --git a/src/main/webapp/vue/animal_cares_and_behaviors.jsp b/src/main/webapp/vue/animal_cares_and_behaviors.jsp index 48cf5e0..56cedcb 100644 --- a/src/main/webapp/vue/animal_cares_and_behaviors.jsp +++ b/src/main/webapp/vue/animal_cares_and_behaviors.jsp @@ -35,13 +35,17 @@
<%@ include file="base/navbar.jsp" %> -

Feuille de ${MODEL_MAP_ANIMAL.getName()}

+

+ + + +

-

Liste des soins

+

@@ -50,7 +54,7 @@ ${care.getName()}
- +
@@ -62,11 +66,11 @@
-

Ajouter un soin

+

- - - + " required /> + +
@@ -74,7 +78,7 @@
-

Liste des comportements de consentements

+

@@ -83,7 +87,7 @@ ${consentBehavior.getName()}
- +
@@ -95,11 +99,11 @@
-

Ajouter un comportement de consentement

+

- - - + " required /> + +
diff --git a/src/main/webapp/vue/animal_list.jsp b/src/main/webapp/vue/animal_list.jsp index 5c79f27..2b24201 100644 --- a/src/main/webapp/vue/animal_list.jsp +++ b/src/main/webapp/vue/animal_list.jsp @@ -32,17 +32,17 @@
<%@ include file="base/navbar.jsp" %> - +

-

List de vos animaux

+

${animal.getName()}
- +