From f4b831e315484ecb919b2db5724b6c72d7508773 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 06:28:52 -0400
Subject: [PATCH 1/7] #285 Adding pet status form field

---
 .../com/josdem/vetlog/enums/PetStatus.java    | 25 ++++++++++++++++---
 src/main/resources/templates/pet/edit.html    |  7 ++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/josdem/vetlog/enums/PetStatus.java b/src/main/java/com/josdem/vetlog/enums/PetStatus.java
index 7bacc586..5cf863b0 100644
--- a/src/main/java/com/josdem/vetlog/enums/PetStatus.java
+++ b/src/main/java/com/josdem/vetlog/enums/PetStatus.java
@@ -17,7 +17,26 @@
 package com.josdem.vetlog.enums;
 
 public enum PetStatus {
-    OWNED,
-    IN_ADOPTION,
-    ADOPTED
+    OWNED("Owned"),
+    IN_ADOPTION("In Adoption"),
+    ADOPTED("Adopted");
+
+    private final String value;
+
+    PetStatus(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public static PetStatus getPetStatusByValue(String value) {
+        for (PetStatus status : PetStatus.values()) {
+            if (value.equals(status.value)) {
+                return status;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index a44ab148..9436c678 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -85,6 +85,13 @@
                             <label th:if="${#fields.hasErrors('vaccinated')}" th:errors="*{vaccinated}"></label>
                             <br/>
                             <br/>
+                            <label for="type"><h4 th:text="#{pet.status}"/></label>
+                            <select id="statusSelector" name="status" th:field="*{status}" class="form-control"
+                                    onchange="updateStatus()">
+                                <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
+                                        th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
+                            </select>
+                            <br/>
                             <label for="type"><h4 th:text="#{pet.type}"/></label>
                             <select id="typeSelector" name="type" th:field="*{type}" class="form-control"
                                     onchange="updateBreedType()">

From 3c3fe1a4bc1987dc0e2410426e82380607b34a52 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 06:31:22 -0400
Subject: [PATCH 2/7] #285 Adding pet status labels

---
 src/main/resources/i18n/messages.properties    | 1 +
 src/main/resources/i18n/messages_es.properties | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
index 771c488e..043c0044 100644
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -104,6 +104,7 @@ pet.vaccinated=Vaccinated
 pet.not.vaccinated=Not Vaccinated
 pet.breed=Breed
 pet.type=Pet Type
+pet.status=Status
 pet.list.empty=List is empty
 pet.image=Pet's Image
 pet.data=Pet and Data
diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties
index 296f0f2c..d0406200 100644
--- a/src/main/resources/i18n/messages_es.properties
+++ b/src/main/resources/i18n/messages_es.properties
@@ -107,6 +107,7 @@ pet.vaccinated=Vacunado
 pet.not.vaccinated=No Vacunado
 pet.breed=Tipo de Mascota
 pet.type=Raza
+pet.status=Estatus
 pet.list.empty=Lista Vacía
 pet.image=Imágen de la mascota
 pet.data=Mascota y Datos

From 404f4ed580dde5bff93dcc9907de76b0addcc935 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 06:37:16 -0400
Subject: [PATCH 3/7] #285 Deleting unnecesary JS call

---
 src/main/resources/templates/pet/edit.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 9436c678..6033275d 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -86,8 +86,7 @@
                             <br/>
                             <br/>
                             <label for="type"><h4 th:text="#{pet.status}"/></label>
-                            <select id="statusSelector" name="status" th:field="*{status}" class="form-control"
-                                    onchange="updateStatus()">
+                            <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
                                 <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
                                         th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
                             </select>

From 61e53c9cb6c2fb85b53d2c48a51fed2b9b4b27e5 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 06:46:25 -0400
Subject: [PATCH 4/7] #285 Adding security labels to only show status to admins

---
 src/main/resources/templates/pet/edit.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 6033275d..83058d65 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html xmlns:th="https://www.thymeleaf.org">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 <head>
     <title th:text="#{pet.view.create.title}"/>
     <head th:insert="~{fragments/include}"/>
@@ -85,12 +85,14 @@
                             <label th:if="${#fields.hasErrors('vaccinated')}" th:errors="*{vaccinated}"></label>
                             <br/>
                             <br/>
-                            <label for="type"><h4 th:text="#{pet.status}"/></label>
-                            <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
-                                <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
+                            <div sec:authorize="hasAuthority('ADMIN')">
+                                <label for="type"><h4 th:text="#{pet.status}"/></label>
+                                <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
+                                    <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
                                         th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
-                            </select>
+                                </select>
                             <br/>
+                            </div>
                             <label for="type"><h4 th:text="#{pet.type}"/></label>
                             <select id="typeSelector" name="type" th:field="*{type}" class="form-control"
                                     onchange="updateBreedType()">

From c28e58558f0cb54051efa24bbc6e9ebd1d95fa9b Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 06:46:57 -0400
Subject: [PATCH 5/7] #285 Setting release version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 609bd232..02cb75ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ ext {
 }
 
 group = 'com.josdem.vetlog'
-version = '1.6.10'
+version = '1.7.0'
 
 configurations {
   compileOnly {

From fd92f550d0b98cccf183b6108221a7dfb767c0a6 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 07:49:45 -0400
Subject: [PATCH 6/7] #285 Fixing sonarlint issues

---
 src/main/resources/templates/pet/edit.html | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 83058d65..6d7f50a3 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -1,5 +1,6 @@
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security" th:lang="${#locale.language}">
 <head>
     <title th:text="#{pet.view.create.title}"/>
     <head th:insert="~{fragments/include}"/>
@@ -25,6 +26,7 @@
                     <form id="register" th:action="@{/pet/update}" th:object="${petCommand}" method="post"
                           class="form-horizontal" enctype="multipart/form-data">
                         <fieldset>
+                            <legend th:text="#{pet.edit}"/>
                             <label for="name"><h4 th:text="#{pet.name}"/></label>
                             <input type="text" name='name' th:field="*{name}" class="form-control" placeholder="name"
                                    id='name'/>
@@ -44,7 +46,7 @@
                                         <div th:each="image : ${petCommand.images}" class="item"
                                              th:classappend="|${petCommand.images.indexOf(image) == 0 ? 'active' : ''}|"
                                              align="center">
-                                            <img style="width:350px;height:300px;"
+                                            <img th:alt="image" style="width:350px;height:300px;"
                                                  th:attr="src=@{${gcpImageUrl} + ${image.uuid}}"/>
                                         </div>
                                     </div>
@@ -86,19 +88,20 @@
                             <br/>
                             <br/>
                             <div sec:authorize="hasAuthority('ADMIN')">
-                                <label for="type"><h4 th:text="#{pet.status}"/></label>
-                                <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
-                                    <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
-                                        th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
-                                </select>
+                                <label for="status"><h4 th:text="#{pet.status}"/>
+                                    <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
+                                        <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
+                                            th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
+                                    </select>
+                                </label>
                             <br/>
                             </div>
-                            <label for="type"><h4 th:text="#{pet.type}"/></label>
-                            <select id="typeSelector" name="type" th:field="*{type}" class="form-control"
-                                    onchange="updateBreedType()">
-                                <option th:each=" type : ${T(com.josdem.vetlog.enums.PetType).values()}"
-                                        th:value="${type}" th:text="${type.value}" th:selected="(${type} == *{type})"/>
-                            </select>
+                            <label for="type"><h4 th:text="#{pet.type}"/>
+                                <select id="typeSelector" name="type" th:field="*{type}" class="form-control" onchange="updateBreedType()">
+                                    <option th:each=" type : ${T(com.josdem.vetlog.enums.PetType).values()}"
+                                            th:value="${type}" th:text="${type.value}" th:selected="(${type} == *{type})"/>
+                                </select>
+                            </label>
                             <br/>
                             <label for="breed"><h4 th:text="#{pet.breed}"/></label>
                             <select id="breedSelector" name="breed" class="form-control">

From 9a67cda15621f9675a41591dada5f94948e3b1b2 Mon Sep 17 00:00:00 2001
From: josdem <joseluis.delacruz@gmail.com>
Date: Sat, 24 Aug 2024 07:55:20 -0400
Subject: [PATCH 7/7] #285 Label was not an issue but a thymeleaf definition

---
 src/main/resources/templates/pet/edit.html | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 6d7f50a3..997de073 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -88,20 +88,19 @@
                             <br/>
                             <br/>
                             <div sec:authorize="hasAuthority('ADMIN')">
-                                <label for="status"><h4 th:text="#{pet.status}"/>
-                                    <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
-                                        <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
-                                            th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
-                                    </select>
-                                </label>
+                                <label for="status"><h4 th:text="#{pet.status}"/></label>
+                                <select id="statusSelector" name="status" th:field="*{status}" class="form-control">
+                                    <option th:each=" status : ${T(com.josdem.vetlog.enums.PetStatus).values()}"
+                                        th:value="${status}" th:text="${status.value}" th:selected="(${status} == *{status})"/>
+                                </select>
                             <br/>
                             </div>
-                            <label for="type"><h4 th:text="#{pet.type}"/>
-                                <select id="typeSelector" name="type" th:field="*{type}" class="form-control" onchange="updateBreedType()">
-                                    <option th:each=" type : ${T(com.josdem.vetlog.enums.PetType).values()}"
-                                            th:value="${type}" th:text="${type.value}" th:selected="(${type} == *{type})"/>
-                                </select>
-                            </label>
+                            <label for="type"><h4 th:text="#{pet.type}"/></label>
+                            <select id="typeSelector" name="type" th:field="*{type}" class="form-control"
+                                    onchange="updateBreedType()">
+                                <option th:each=" type : ${T(com.josdem.vetlog.enums.PetType).values()}"
+                                        th:value="${type}" th:text="${type.value}" th:selected="(${type} == *{type})"/>
+                            </select>
                             <br/>
                             <label for="breed"><h4 th:text="#{pet.breed}"/></label>
                             <select id="breedSelector" name="breed" class="form-control">