From c8f47065821d11f3c600f3aa37bd2d106e3620b8 Mon Sep 17 00:00:00 2001 From: "Daniel.ryan@glowtouch.com" Date: Fri, 16 Jun 2017 09:11:09 -0400 Subject: [PATCH 1/2] Allergy and Medication Field Added --- .../samples/kidclinic/parent/Kid.java | 22 ++++++++++++++++ .../kidclinic/parent/KidValidator.java | 11 ++++++++ src/main/resources/db/hsqldb/data.sql | 26 +++++++++---------- src/main/resources/db/hsqldb/schema.sql | 4 ++- .../templates/kids/createOrUpdateKidForm.html | 5 ++++ .../templates/parents/parentDetails.html | 5 ++++ 6 files changed, 59 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springframework/samples/kidclinic/parent/Kid.java b/src/main/java/org/springframework/samples/kidclinic/parent/Kid.java index 84835eed2..c0d0afd96 100644 --- a/src/main/java/org/springframework/samples/kidclinic/parent/Kid.java +++ b/src/main/java/org/springframework/samples/kidclinic/parent/Kid.java @@ -63,6 +63,12 @@ public class Kid extends NamedEntity { @ManyToOne @JoinColumn(name = "parent_id") private Parent parent; + + @Column(name = "allergies") + private String allergies; + + @Column(name = "medications") + private String medications; @OneToMany(cascade = CascadeType.ALL, mappedBy = "kidId", fetch = FetchType.EAGER) private Set visits = new LinkedHashSet<>(); @@ -90,6 +96,22 @@ public class Kid extends NamedEntity { protected void setParent(Parent parent) { this.parent = parent; } + + public String getAllergies(){ + return this.allergies; + } + + public void setAllergies(String allergies){ + this.allergies = allergies; + } + + public String getMedications(){ + return this.medications; + } + + public void setMedications(String medications){ + this.medications = medications; + } protected Set getVisitsInternal() { if (this.visits == null) { diff --git a/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java b/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java index cc0b2c9bc..06f807f9e 100644 --- a/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java +++ b/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java @@ -36,10 +36,21 @@ public class KidValidator implements Validator { public void validate(Object obj, Errors errors) { Kid kid = (Kid) obj; String name = kid.getName(); + String medications = kid.getMedications(); + String allergies = kid.getAllergies(); + // name validation if (!StringUtils.hasLength(name)) { errors.rejectValue("name", REQUIRED, REQUIRED); } + + if (!StringUtils.hasLength(allergies)) { + errors.rejectValue("allergies", REQUIRED, REQUIRED); + } + + if (!StringUtils.hasLength(medications)) { + errors.rejectValue("medications", REQUIRED, REQUIRED); + } // gender validation if (kid.isNew() && kid.getGender() == null) { diff --git a/src/main/resources/db/hsqldb/data.sql b/src/main/resources/db/hsqldb/data.sql index 12674d1dd..bdfe916ad 100644 --- a/src/main/resources/db/hsqldb/data.sql +++ b/src/main/resources/db/hsqldb/data.sql @@ -30,19 +30,19 @@ INSERT INTO parents VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', INSERT INTO parents VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); INSERT INTO parents VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); -INSERT INTO kids VALUES (1, 'Alyssa', '2000-09-07', 2, 1); -INSERT INTO kids VALUES (2, 'Joe', '2002-08-06', 1, 2); -INSERT INTO kids VALUES (3, 'Lauren', '2001-04-17', 2, 3); -INSERT INTO kids VALUES (4, 'Nicole', '2000-03-07', 2, 3); -INSERT INTO kids VALUES (5, 'Thomas', '2000-11-30', 1, 4); -INSERT INTO kids VALUES (6, 'Samantha', '2000-01-20', 2, 5); -INSERT INTO kids VALUES (7, 'George', '1995-09-04', 1, 6); -INSERT INTO kids VALUES (8, 'Max', '1995-09-04', 1, 6); -INSERT INTO kids VALUES (9, 'Brendan', '1999-08-06', 1, 7); -INSERT INTO kids VALUES (10, 'Elizabeth', '1997-02-24', 2, 8); -INSERT INTO kids VALUES (11, 'Lucy', '2000-03-09', 2, 9); -INSERT INTO kids VALUES (12, 'Sunny', '2000-06-24', 2, 10); -INSERT INTO kids VALUES (13, 'Conner', '2002-06-08', 1, 10); +INSERT INTO kids VALUES (1, 'Alyssa', '2000-09-07', 2, 1, 'Claritin', 'None'); +INSERT INTO kids VALUES (2, 'Joe', '2002-08-06', 1, 2, 'None', 'Lipitor'); +INSERT INTO kids VALUES (3, 'Lauren', '2001-04-17', 2, 3, 'None', 'None'); +INSERT INTO kids VALUES (4, 'Nicole', '2000-03-07', 2, 3, 'Penicilin', 'None'); +INSERT INTO kids VALUES (5, 'Thomas', '2000-11-30', 1, 4, 'None', 'Plavix'); +INSERT INTO kids VALUES (6, 'Samantha', '2000-01-20', 2, 5, 'Latex', 'Advair Diskus'); +INSERT INTO kids VALUES (7, 'George', '1995-09-04', 1, 6, 'Insulin', 'None'); +INSERT INTO kids VALUES (8, 'Max', '1995-09-04', 1, 6, 'None', 'Singulair'); +INSERT INTO kids VALUES (9, 'Brendan', '1999-08-06', 1, 7, 'None', 'Actos'); +INSERT INTO kids VALUES (10, 'Elizabeth', '1997-02-24', 2, 8, 'None', 'None'); +INSERT INTO kids VALUES (11, 'Lucy', '2000-03-09', 2, 9, 'Iodine', 'None'); +INSERT INTO kids VALUES (12, 'Sunny', '2000-06-24', 2, 10, 'None', 'None'); +INSERT INTO kids VALUES (13, 'Conner', '2002-06-08', 1, 10, 'None', 'Epogen'); INSERT INTO visits VALUES (1, 7, '2013-01-01', 'rabies shot'); INSERT INTO visits VALUES (2, 8, '2013-01-02', 'rabies shot'); diff --git a/src/main/resources/db/hsqldb/schema.sql b/src/main/resources/db/hsqldb/schema.sql index 084c62ad7..59bf2ae30 100644 --- a/src/main/resources/db/hsqldb/schema.sql +++ b/src/main/resources/db/hsqldb/schema.sql @@ -48,7 +48,9 @@ CREATE TABLE kids ( name VARCHAR(30), birth_date DATE, gender_id INTEGER NOT NULL, - parent_id INTEGER NOT NULL + parent_id INTEGER NOT NULL, + allergies VARCHAR(255), + medications VARCHAR(255) ); ALTER TABLE kids ADD CONSTRAINT fk_kids_parents FOREIGN KEY (parent_id) REFERENCES parents (id); ALTER TABLE kids ADD CONSTRAINT fk_kids_gender FOREIGN KEY (gender_id) REFERENCES gender (id); diff --git a/src/main/resources/templates/kids/createOrUpdateKidForm.html b/src/main/resources/templates/kids/createOrUpdateKidForm.html index 2eea69fbd..8801fc8a4 100644 --- a/src/main/resources/templates/kids/createOrUpdateKidForm.html +++ b/src/main/resources/templates/kids/createOrUpdateKidForm.html @@ -22,6 +22,11 @@ th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate')}" /> + + +
diff --git a/src/main/resources/templates/parents/parentDetails.html b/src/main/resources/templates/parents/parentDetails.html index a406b582f..a3e6c78fb 100644 --- a/src/main/resources/templates/parents/parentDetails.html +++ b/src/main/resources/templates/parents/parentDetails.html @@ -50,6 +50,11 @@ th:text="${#calendars.format(kid.birthDate, 'yyyy-MM-dd')}" />
Gender
+
Allergies
+
+
Medications
+
+ From eb611d72bc0f097299fbefd104423f3ac6bdb671 Mon Sep 17 00:00:00 2001 From: "Daniel.ryan@glowtouch.com" Date: Fri, 16 Jun 2017 09:57:18 -0400 Subject: [PATCH 2/2] Commenting and Capitalization --- .../samples/kidclinic/parent/KidValidator.java | 3 ++- src/main/resources/db/hsqldb/data.sql | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java b/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java index 06f807f9e..3ba883ff9 100644 --- a/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java +++ b/src/main/java/org/springframework/samples/kidclinic/parent/KidValidator.java @@ -44,15 +44,16 @@ public class KidValidator implements Validator { errors.rejectValue("name", REQUIRED, REQUIRED); } + // allergies validation if (!StringUtils.hasLength(allergies)) { errors.rejectValue("allergies", REQUIRED, REQUIRED); } + // medications validation if (!StringUtils.hasLength(medications)) { errors.rejectValue("medications", REQUIRED, REQUIRED); } - // gender validation if (kid.isNew() && kid.getGender() == null) { errors.rejectValue("gender", REQUIRED, REQUIRED); } diff --git a/src/main/resources/db/hsqldb/data.sql b/src/main/resources/db/hsqldb/data.sql index bdfe916ad..95bd7dd5b 100644 --- a/src/main/resources/db/hsqldb/data.sql +++ b/src/main/resources/db/hsqldb/data.sql @@ -15,8 +15,8 @@ INSERT INTO doctor_specialties VALUES (3, 3); INSERT INTO doctor_specialties VALUES (4, 2); INSERT INTO doctor_specialties VALUES (5, 1); -INSERT INTO gender VALUES (1, 'male'); -INSERT INTO gender VALUES (2, 'female'); +INSERT INTO gender VALUES (1, 'Male'); +INSERT INTO gender VALUES (2, 'Female'); INSERT INTO parents VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');