diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/src/main/java/org/springframework/samples/petclinic/model/Person.java index d3e03c0dd..9b670a4b4 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -35,8 +35,19 @@ public class Person extends BaseEntity { @Column(name = "last_name") @NotEmpty protected String lastName; + + @Column(name = "profile_description") + protected String description; - public String getFirstName() { + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getFirstName() { return this.firstName; } @@ -52,5 +63,4 @@ public class Person extends BaseEntity { this.lastName = lastName; } - } diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java index 05f6a24b2..41b272bdc 100644 --- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java +++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java @@ -64,7 +64,7 @@ public class JdbcVetRepositoryImpl implements VetRepository { List vets = new ArrayList(); // Retrieve the list of all vets. vets.addAll(this.jdbcTemplate.query( - "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name", + "SELECT id, first_name, last_name, profile_description FROM vets ORDER BY last_name,first_name", ParameterizedBeanPropertyRowMapper.newInstance(Vet.class))); // Retrieve the list of all possible specialties. diff --git a/src/main/resources/db/hsqldb/initDB.sql b/src/main/resources/db/hsqldb/initDB.sql index 51415879e..96087dd6f 100644 --- a/src/main/resources/db/hsqldb/initDB.sql +++ b/src/main/resources/db/hsqldb/initDB.sql @@ -11,7 +11,7 @@ CREATE TABLE vets ( id INTEGER IDENTITY PRIMARY KEY, first_name VARCHAR(30), last_name VARCHAR(30), - profile_pic BLOB + profile_description VARCHAR(255) ); CREATE INDEX vets_last_name ON vets (last_name); @@ -41,7 +41,7 @@ CREATE TABLE owners ( address VARCHAR(255), city VARCHAR(80), telephone VARCHAR(20), - profile_pic BLOB + profile_description VARCHAR(255) ); CREATE INDEX owners_last_name ON owners (last_name); @@ -51,7 +51,7 @@ CREATE TABLE pets ( birth_date DATE, type_id INTEGER NOT NULL, owner_id INTEGER NOT NULL, - profile_pic BLOB + profile_description VARCHAR(255) ); ALTER TABLE pets ADD CONSTRAINT fk_pets_owners FOREIGN KEY (owner_id) REFERENCES owners (id); ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES types (id); diff --git a/src/main/resources/db/hsqldb/populateDB.sql b/src/main/resources/db/hsqldb/populateDB.sql index 624b642c1..5facbe116 100644 --- a/src/main/resources/db/hsqldb/populateDB.sql +++ b/src/main/resources/db/hsqldb/populateDB.sql @@ -1,9 +1,9 @@ -INSERT INTO vets VALUES (1, 'James', 'Carter', NULL); -INSERT INTO vets VALUES (2, 'Helen', 'Leary', NULL); -INSERT INTO vets VALUES (3, 'Linda', 'Douglas', NULL); -INSERT INTO vets VALUES (4, 'Rafael', 'Ortega', NULL); -INSERT INTO vets VALUES (5, 'Henry', 'Stevens', NULL); -INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins', NULL); +INSERT INTO vets VALUES (1, 'James', 'Carter', 'Graduated from Oxford University in 2000 having "gone the long way around" picking up degrees in Agriculture & Applied Zoology and also in Animal Production along the way. He came down to work in Winchester in 2004 and set up PetClinic in 2005.'); +INSERT INTO vets VALUES (2, 'Helen', 'Leary', 'MA VetMB MRCVS A Cambridge graduate, Helen joined our expanding team of vets at the end of 2005. Helen has a cat called Checkers and a dog called Scoot.'); +INSERT INTO vets VALUES (3, 'Linda', 'Douglas', 'MA VetMB MRCVS Another Cambridge graduate, Linda joined our team in 2004. Linda has a hamster called Ash and a dog called Spotty.'); +INSERT INTO vets VALUES (4, 'Rafael', 'Ortega','MA VetMB MRCVS Rafael graduated from Cambridge in 2003 and joined PetClinit in October 2004. He has a particular interest in horseback archery and has competed in many international competitions.'); +INSERT INTO vets VALUES (5, 'Henry', 'Stevens', 'MA VetMB MRCVS Henry graduated from Oxford in 2008 and joined us in 2010. He is also a competitive chess player and has participated in many international competitions.'); +INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins','MA VetMB MRCVS Sharon graduated from Oxford in 2006 and joined us in 2007. She joins international salsa competitions and consider herself an accomplished dancer.'); INSERT INTO specialties VALUES (1, 'radiology'); INSERT INTO specialties VALUES (2, 'surgery'); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index f1d4d2355..28bd3e23c 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -17,7 +17,7 @@ - + diff --git a/src/main/webapp/components/dashboard/_vets.html b/src/main/webapp/components/dashboard/_vets.html index c875bfed3..4c28a44bb 100644 --- a/src/main/webapp/components/dashboard/_vets.html +++ b/src/main/webapp/components/dashboard/_vets.html @@ -4,7 +4,7 @@
- Generic placeholder image + Generic placeholder image

+6085558763

diff --git a/src/main/webapp/components/landing/_services.html b/src/main/webapp/components/landing/_services.html index f3a0eeaf3..57028d787 100644 --- a/src/main/webapp/components/landing/_services.html +++ b/src/main/webapp/components/landing/_services.html @@ -4,8 +4,10 @@ Generic placeholder image
-

Services One

-

A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

+

Home Visits

+

+ We provide home visits to your pets in need of care +

Learn more ยป

diff --git a/src/main/webapp/components/landing/_vets.html b/src/main/webapp/components/landing/_vets.html index ca44e92c8..52d0ec779 100644 --- a/src/main/webapp/components/landing/_vets.html +++ b/src/main/webapp/components/landing/_vets.html @@ -5,65 +5,35 @@

Our Veterinarians

-

A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

+

Meet our Veterinarian Team

- Generic placeholder image + Generic placeholder image
-

Thumbnail label

-

Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.

+

Professionalism

+

Everyone at our practice is committed to providing you with the very best in pet healthcare.

- Generic placeholder image + Generic placeholder image
-

Thumbnail label

-

Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.

+

Expertise

+

Our veterinary team bring a wealth of experience to the practice and have individually obtained high standards of professional qualifications

- Generic placeholder image + Generic placeholder image
-

Thumbnail label

-

Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.

-
-
-
-
- -
-
-
- Generic placeholder image -
-

Thumbnail label

-

Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.

-
-
-
-
-
- Generic placeholder image -
-

Thumbnail label

-

Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.

-
-
-
-
-
- Generic placeholder image -
-

Thumbnail label

-

The Big Oxmox advised her not to do so, because there were thousands of bad Commas, wild Question Marks and devious Semikoli.

+

Dedication

+

Our committed team of Veterinarians is dedicated to your pet's welfare and strive to provide the best pet healthcare to them

diff --git a/src/main/webapp/components/pets/pets.html b/src/main/webapp/components/pets/pets.html index 0b21a6dd5..2d570682e 100644 --- a/src/main/webapp/components/pets/pets.html +++ b/src/main/webapp/components/pets/pets.html @@ -30,7 +30,7 @@
-
+
Generic placeholder image
diff --git a/src/main/webapp/components/veterinarians/veterinarians.html b/src/main/webapp/components/veterinarians/veterinarians.html index 496e2c3d8..1dab270ea 100644 --- a/src/main/webapp/components/veterinarians/veterinarians.html +++ b/src/main/webapp/components/veterinarians/veterinarians.html @@ -12,10 +12,10 @@
- Generic placeholder image + Generic placeholder image

Veterinarian Name

-

Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum.

+

diff --git a/src/main/webapp/images/pets/pet1.jpg b/src/main/webapp/images/pets/pet1.jpg index 20932caaa..8bd1fff3f 100644 Binary files a/src/main/webapp/images/pets/pet1.jpg and b/src/main/webapp/images/pets/pet1.jpg differ diff --git a/src/main/webapp/images/pets/pet10.jpg b/src/main/webapp/images/pets/pet10.jpg index 295f414bd..f7ad15976 100644 Binary files a/src/main/webapp/images/pets/pet10.jpg and b/src/main/webapp/images/pets/pet10.jpg differ diff --git a/src/main/webapp/images/pets/pet2.jpg b/src/main/webapp/images/pets/pet2.jpg index 9bb1322b4..fdf2b0ffa 100644 Binary files a/src/main/webapp/images/pets/pet2.jpg and b/src/main/webapp/images/pets/pet2.jpg differ diff --git a/src/main/webapp/images/pets/pet3.jpg b/src/main/webapp/images/pets/pet3.jpg index 177b0bb9c..bd3c88214 100644 Binary files a/src/main/webapp/images/pets/pet3.jpg and b/src/main/webapp/images/pets/pet3.jpg differ diff --git a/src/main/webapp/images/pets/pet4.jpg b/src/main/webapp/images/pets/pet4.jpg index 207c8984e..df26faffd 100644 Binary files a/src/main/webapp/images/pets/pet4.jpg and b/src/main/webapp/images/pets/pet4.jpg differ diff --git a/src/main/webapp/images/pets/pet5.jpg b/src/main/webapp/images/pets/pet5.jpg index b6ad094e2..691139364 100644 Binary files a/src/main/webapp/images/pets/pet5.jpg and b/src/main/webapp/images/pets/pet5.jpg differ diff --git a/src/main/webapp/images/pets/pet6.jpg b/src/main/webapp/images/pets/pet6.jpg index 97b0d7bcb..b9d8a535c 100644 Binary files a/src/main/webapp/images/pets/pet6.jpg and b/src/main/webapp/images/pets/pet6.jpg differ diff --git a/src/main/webapp/images/pets/pet7.jpg b/src/main/webapp/images/pets/pet7.jpg index 9cc3e437d..a8e6a0b25 100644 Binary files a/src/main/webapp/images/pets/pet7.jpg and b/src/main/webapp/images/pets/pet7.jpg differ diff --git a/src/main/webapp/images/pets/pet8.jpg b/src/main/webapp/images/pets/pet8.jpg index 4851ebf8a..1023ac052 100644 Binary files a/src/main/webapp/images/pets/pet8.jpg and b/src/main/webapp/images/pets/pet8.jpg differ diff --git a/src/main/webapp/images/pets/pet9.jpg b/src/main/webapp/images/pets/pet9.jpg index b00a0f2b3..1259a77be 100644 Binary files a/src/main/webapp/images/pets/pet9.jpg and b/src/main/webapp/images/pets/pet9.jpg differ diff --git a/src/main/webapp/images/avatars/vet1.jpg b/src/main/webapp/images/vets/vet1.jpg similarity index 100% rename from src/main/webapp/images/avatars/vet1.jpg rename to src/main/webapp/images/vets/vet1.jpg diff --git a/src/main/webapp/images/avatars/vet2.jpg b/src/main/webapp/images/vets/vet2.jpg similarity index 100% rename from src/main/webapp/images/avatars/vet2.jpg rename to src/main/webapp/images/vets/vet2.jpg diff --git a/src/main/webapp/images/avatars/vet3.jpg b/src/main/webapp/images/vets/vet3.jpg similarity index 100% rename from src/main/webapp/images/avatars/vet3.jpg rename to src/main/webapp/images/vets/vet3.jpg diff --git a/src/main/webapp/images/avatars/vet4.jpg b/src/main/webapp/images/vets/vet4.jpg similarity index 100% rename from src/main/webapp/images/avatars/vet4.jpg rename to src/main/webapp/images/vets/vet4.jpg diff --git a/src/main/webapp/images/vets/vet5.jpg b/src/main/webapp/images/vets/vet5.jpg new file mode 100644 index 000000000..54621289c Binary files /dev/null and b/src/main/webapp/images/vets/vet5.jpg differ diff --git a/src/main/webapp/images/vets/vet6.jpg b/src/main/webapp/images/vets/vet6.jpg new file mode 100644 index 000000000..6ebabbec0 Binary files /dev/null and b/src/main/webapp/images/vets/vet6.jpg differ