diff --git a/src/main/java/org/springframework/samples/kidclinic/parent/Parent.java b/src/main/java/org/springframework/samples/kidclinic/parent/Parent.java index 662c47aae..5be5fc030 100644 --- a/src/main/java/org/springframework/samples/kidclinic/parent/Parent.java +++ b/src/main/java/org/springframework/samples/kidclinic/parent/Parent.java @@ -52,7 +52,11 @@ public class Parent extends Person { @Column(name = "city") @NotEmpty private String city; - + + @Column(name = "state") + @NotEmpty + private String state; + @Column(name = "telephone") @NotEmpty @Digits(fraction = 0, integer = 10) @@ -77,6 +81,14 @@ public class Parent extends Person { public void setCity(String city) { this.city = city; } + + public String getState(){ + return this.state; + } + + public void setState(String state){ + this.state = state; + } public String getTelephone() { return this.telephone; diff --git a/src/main/resources/db/hsqldb/data.sql b/src/main/resources/db/hsqldb/data.sql index 95bd7dd5b..0839f919c 100644 --- a/src/main/resources/db/hsqldb/data.sql +++ b/src/main/resources/db/hsqldb/data.sql @@ -19,16 +19,16 @@ 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'); -INSERT INTO parents VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); -INSERT INTO parents VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); -INSERT INTO parents VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); -INSERT INTO parents VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); -INSERT INTO parents VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); -INSERT INTO parents VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); -INSERT INTO parents VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); -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 parents VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', 'WI', '6085551023'); +INSERT INTO parents VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', 'WI', '6085551749'); +INSERT INTO parents VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', 'AZ', '6085558763'); +INSERT INTO parents VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', 'CO', '6085553198'); +INSERT INTO parents VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', 'WI', '6085552765'); +INSERT INTO parents VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', 'WI', '6085552654'); +INSERT INTO parents VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', 'WI', '6085555387'); +INSERT INTO parents VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', 'WI', '6085557683'); +INSERT INTO parents VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', 'WI', '6085559435'); +INSERT INTO parents VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', 'WI', '6085555487'); 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'); diff --git a/src/main/resources/db/hsqldb/schema.sql b/src/main/resources/db/hsqldb/schema.sql index 59bf2ae30..29ffa11ef 100644 --- a/src/main/resources/db/hsqldb/schema.sql +++ b/src/main/resources/db/hsqldb/schema.sql @@ -39,6 +39,7 @@ CREATE TABLE parents ( last_name VARCHAR_IGNORECASE(30), address VARCHAR(255), city VARCHAR(80), + state VARCHAR(30), telephone VARCHAR(20) ); CREATE INDEX parents_last_name ON parents (last_name); diff --git a/src/main/resources/templates/parents/createOrUpdateParentForm.html b/src/main/resources/templates/parents/createOrUpdateParentForm.html index 56f0dfddb..ae3c1483b 100644 --- a/src/main/resources/templates/parents/createOrUpdateParentForm.html +++ b/src/main/resources/templates/parents/createOrUpdateParentForm.html @@ -14,6 +14,8 @@ th:replace="~{fragments/inputField :: input ('Address', 'address')}" /> + diff --git a/src/main/resources/templates/parents/parentDetails.html b/src/main/resources/templates/parents/parentDetails.html index a3e6c78fb..f63b4eb96 100644 --- a/src/main/resources/templates/parents/parentDetails.html +++ b/src/main/resources/templates/parents/parentDetails.html @@ -22,6 +22,10 @@ City + + State + + Telephone diff --git a/src/main/resources/templates/parents/parentsList.html b/src/main/resources/templates/parents/parentsList.html index 452f76638..3ecb8a031 100644 --- a/src/main/resources/templates/parents/parentsList.html +++ b/src/main/resources/templates/parents/parentsList.html @@ -11,9 +11,10 @@ Name Address - City - Telephone - Children + City + State + Telephone + Children @@ -23,6 +24,7 @@ +