From 2260e383c9adb9c5947fe27a343fa0bf3f4aadad Mon Sep 17 00:00:00 2001
From: smal0039 <smal0039@student.monash.edu>
Date: Thu, 5 Dec 2024 23:25:50 +0800
Subject: [PATCH 1/3] Added Separate Field In Form To Add Birth Date

---
 .../java/com/josdem/vetlog/command/PetCommand.java  | 13 +++++++++++++
 .../com/josdem/vetlog/validator/PetValidator.java   |  1 +
 src/main/resources/i18n/messages.properties         |  1 +
 src/main/resources/templates/pet/create.html        |  8 +++++++-
 src/main/resources/templates/pet/edit.html          |  8 +++++++-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/josdem/vetlog/command/PetCommand.java b/src/main/java/com/josdem/vetlog/command/PetCommand.java
index 1845af03..7791cf34 100644
--- a/src/main/java/com/josdem/vetlog/command/PetCommand.java
+++ b/src/main/java/com/josdem/vetlog/command/PetCommand.java
@@ -23,6 +23,8 @@
 import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -41,6 +43,8 @@ public class PetCommand implements Command {
     @NotNull
     private String birthDate;
 
+    private String birthTime;
+
     private Boolean dewormed = false;
 
     private Boolean sterilized = false;
@@ -68,4 +72,13 @@ public class PetCommand implements Command {
     private transient List<PetImage> images = new ArrayList<>();
 
     private transient List<Vaccination> vaccines = new ArrayList<>();
+
+    public void combineBirthDateAndTime() {
+        if (Objects.equals(birthTime, "")) {
+            this.birthDate = birthDate + "T00:00:00";
+        }
+        else {
+            this.birthDate = birthDate + "T" + birthTime;
+        }
+    }
 }
diff --git a/src/main/java/com/josdem/vetlog/validator/PetValidator.java b/src/main/java/com/josdem/vetlog/validator/PetValidator.java
index 5a2a0946..5c8a301e 100644
--- a/src/main/java/com/josdem/vetlog/validator/PetValidator.java
+++ b/src/main/java/com/josdem/vetlog/validator/PetValidator.java
@@ -40,6 +40,7 @@ private void validateBirthdate(Errors errors, PetCommand petCommand) {
         if (petCommand.getBirthDate().isEmpty()) {
             return;
         }
+        petCommand.combineBirthDateAndTime();
         LocalDateTime now = LocalDateTime.now();
         if (now.isBefore(LocalDateTime.parse(petCommand.getBirthDate()))) {
             errors.rejectValue("birthDate", "pet.error.birthDate.past");
diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
index ab69c3f7..96bd473c 100644
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -70,6 +70,7 @@ pet.view.edit.title=Edit a Pet
 pet.register=Register a pet
 pet.name=Pet's Name
 pet.birthDate=Date of Birth
+pet.birthTime=Time of Birth (optional)
 pet.dewormed=Dewormed
 pet.not.dewormed=Not Dewormed
 pet.sterilized=Sterilized
diff --git a/src/main/resources/templates/pet/create.html b/src/main/resources/templates/pet/create.html
index d9e97f1d..757226ca 100644
--- a/src/main/resources/templates/pet/create.html
+++ b/src/main/resources/templates/pet/create.html
@@ -29,9 +29,15 @@
                             <input type="file" name="image"/>
                             <br/>
                             <label for="birthDate"><h4 th:text="#{pet.birthDate}"/></label>
-                            <input th:data-testid="birthDate" type="datetime-local" id="birthDate" name="birthDate">
+                            <input th:data-testid="birthDate" type="date" id="birthDate" name="birthDate">
                             <label th:if="${#fields.hasErrors('birthDate')}" th:errors="*{birthDate}"></label>
                             <br/>
+
+                            <label for="birthTime"><h4 th:text="#{pet.birthTime}"/></label>
+                            <input th:data-testid="birthTime" type="time" id="birthTime" name="birthTime" optional>
+                            <label th:if="${#fields.hasErrors('birthTime')}" th:errors="*{birthTime}"></label>
+                            <br/>
+
                             <label for="dewormed"><h4 th:text="#{pet.dewormed}"/></label>
                             <input type="checkbox" name='dewormed' th:field="*{dewormed}" class="form-control"
                                    placeholder="dewormed" id='dewormed'/>
diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 9f8d9c59..1d81b53d 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -64,9 +64,15 @@
                             <input type="file" name="image"/>
                             <br/>
                             <label for="birthDate"><h4 th:text="#{pet.birthDate}"/></label>
-                            <input type="datetime-local" id="birthDate" name="birthDate" th:data-testid="petBirthdate" th:field="*{birthDate}">
+                            <input th:data-testid="birthDate" type="date" id="birthDate" name="birthDate">
                             <label th:if="${#fields.hasErrors('birthDate')}" th:errors="*{birthDate}"></label>
                             <br/>
+
+                            <label for="birthTime"><h4 th:text="#{pet.birthTime}"/></label>
+                            <input th:data-testid="birthTime" type="time" id="birthTime" name="birthTime" optional>
+                            <label th:if="${#fields.hasErrors('birthTime')}" th:errors="*{birthTime}"></label>
+                            <br/>
+
                             <label for="dewormed"><h4 th:text="#{pet.dewormed}"/></label>
                             <input type="checkbox" name='dewormed' th:data-testid="petDewormed" th:field="*{dewormed}" class="form-control"
                                    placeholder="dewormed" id='dewormed'/>

From ce1bdeaba117c16693d597da5623f0f9113c0c87 Mon Sep 17 00:00:00 2001
From: smal0039 <smal0039@student.monash.edu>
Date: Fri, 6 Dec 2024 18:25:05 +0800
Subject: [PATCH 2/3] Removed BirthTime and restrict the birthdate input to no
 more than the present (current date)

---
 .../com/josdem/vetlog/command/PetCommand.java    | 11 ++---------
 .../josdem/vetlog/validator/PetValidator.java    |  2 +-
 src/main/resources/templates/pet/create.html     | 16 ++++++++--------
 src/main/resources/templates/pet/edit.html       |  6 ------
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/josdem/vetlog/command/PetCommand.java b/src/main/java/com/josdem/vetlog/command/PetCommand.java
index 7791cf34..3e19d36c 100644
--- a/src/main/java/com/josdem/vetlog/command/PetCommand.java
+++ b/src/main/java/com/josdem/vetlog/command/PetCommand.java
@@ -43,8 +43,6 @@ public class PetCommand implements Command {
     @NotNull
     private String birthDate;
 
-    private String birthTime;
-
     private Boolean dewormed = false;
 
     private Boolean sterilized = false;
@@ -73,12 +71,7 @@ public class PetCommand implements Command {
 
     private transient List<Vaccination> vaccines = new ArrayList<>();
 
-    public void combineBirthDateAndTime() {
-        if (Objects.equals(birthTime, "")) {
-            this.birthDate = birthDate + "T00:00:00";
-        }
-        else {
-            this.birthDate = birthDate + "T" + birthTime;
-        }
+    public void defaultBirthDateAndTime() {
+        this.birthDate = birthDate + "T" + "06:00";
     }
 }
diff --git a/src/main/java/com/josdem/vetlog/validator/PetValidator.java b/src/main/java/com/josdem/vetlog/validator/PetValidator.java
index 5c8a301e..d3beb382 100644
--- a/src/main/java/com/josdem/vetlog/validator/PetValidator.java
+++ b/src/main/java/com/josdem/vetlog/validator/PetValidator.java
@@ -33,6 +33,7 @@ public boolean supports(Class<?> clazz) {
     @Override
     public void validate(Object target, Errors errors) {
         PetCommand petCommand = (PetCommand) target;
+        petCommand.defaultBirthDateAndTime();
         validateBirthdate(errors, petCommand);
     }
 
@@ -40,7 +41,6 @@ private void validateBirthdate(Errors errors, PetCommand petCommand) {
         if (petCommand.getBirthDate().isEmpty()) {
             return;
         }
-        petCommand.combineBirthDateAndTime();
         LocalDateTime now = LocalDateTime.now();
         if (now.isBefore(LocalDateTime.parse(petCommand.getBirthDate()))) {
             errors.rejectValue("birthDate", "pet.error.birthDate.past");
diff --git a/src/main/resources/templates/pet/create.html b/src/main/resources/templates/pet/create.html
index 757226ca..576e1dd6 100644
--- a/src/main/resources/templates/pet/create.html
+++ b/src/main/resources/templates/pet/create.html
@@ -5,6 +5,12 @@
     <head th:insert="~{fragments/include}"/>
     <script th:src="@{/assets/servizi-dog-theme/node_modules/jquery/dist/jquery.min.js}"></script>
     <script th:src="@{/javascript/selector.js}"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            var today = new Date().toISOString().split('T')[0];
+            document.getElementById('birthDate').setAttribute('max', today);
+        });
+    </script>
 </head>
 <body class="login">
 <div th:insert="~{fragments/header}"/>
@@ -29,15 +35,9 @@
                             <input type="file" name="image"/>
                             <br/>
                             <label for="birthDate"><h4 th:text="#{pet.birthDate}"/></label>
-                            <input th:data-testid="birthDate" type="date" id="birthDate" name="birthDate">
+                            <input th:data-testid="birthDate" type="date" id="birthDate" name="birthDate" min="${#dates.format(#dates.createNow(), 'yyyy-MM-dd')}">
                             <label th:if="${#fields.hasErrors('birthDate')}" th:errors="*{birthDate}"></label>
                             <br/>
-
-                            <label for="birthTime"><h4 th:text="#{pet.birthTime}"/></label>
-                            <input th:data-testid="birthTime" type="time" id="birthTime" name="birthTime" optional>
-                            <label th:if="${#fields.hasErrors('birthTime')}" th:errors="*{birthTime}"></label>
-                            <br/>
-
                             <label for="dewormed"><h4 th:text="#{pet.dewormed}"/></label>
                             <input type="checkbox" name='dewormed' th:field="*{dewormed}" class="form-control"
                                    placeholder="dewormed" id='dewormed'/>
@@ -81,4 +81,4 @@
 <br/><br/>
 <div th:insert="~{fragments/footer}"/>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/pet/edit.html b/src/main/resources/templates/pet/edit.html
index 1d81b53d..9144993a 100644
--- a/src/main/resources/templates/pet/edit.html
+++ b/src/main/resources/templates/pet/edit.html
@@ -67,12 +67,6 @@
                             <input th:data-testid="birthDate" type="date" id="birthDate" name="birthDate">
                             <label th:if="${#fields.hasErrors('birthDate')}" th:errors="*{birthDate}"></label>
                             <br/>
-
-                            <label for="birthTime"><h4 th:text="#{pet.birthTime}"/></label>
-                            <input th:data-testid="birthTime" type="time" id="birthTime" name="birthTime" optional>
-                            <label th:if="${#fields.hasErrors('birthTime')}" th:errors="*{birthTime}"></label>
-                            <br/>
-
                             <label for="dewormed"><h4 th:text="#{pet.dewormed}"/></label>
                             <input type="checkbox" name='dewormed' th:data-testid="petDewormed" th:field="*{dewormed}" class="form-control"
                                    placeholder="dewormed" id='dewormed'/>

From 2f2352169a5d8a529e0c09e3f44dfe4829721e83 Mon Sep 17 00:00:00 2001
From: smal0039 <smal0039@student.monash.edu>
Date: Fri, 6 Dec 2024 21:20:16 +0800
Subject: [PATCH 3/3] removed unused imports and messages

---
 src/main/java/com/josdem/vetlog/command/PetCommand.java | 2 --
 src/main/resources/i18n/messages.properties             | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/com/josdem/vetlog/command/PetCommand.java b/src/main/java/com/josdem/vetlog/command/PetCommand.java
index 3e19d36c..b826619f 100644
--- a/src/main/java/com/josdem/vetlog/command/PetCommand.java
+++ b/src/main/java/com/josdem/vetlog/command/PetCommand.java
@@ -23,8 +23,6 @@
 import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
index 96bd473c..ab69c3f7 100644
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -70,7 +70,6 @@ pet.view.edit.title=Edit a Pet
 pet.register=Register a pet
 pet.name=Pet's Name
 pet.birthDate=Date of Birth
-pet.birthTime=Time of Birth (optional)
 pet.dewormed=Dewormed
 pet.not.dewormed=Not Dewormed
 pet.sterilized=Sterilized