From e16ff5e8c40cf2228a61e7e18005f251776d8e96 Mon Sep 17 00:00:00 2001 From: Lim Han Date: Tue, 3 Feb 2015 23:42:02 +0800 Subject: [PATCH] LH : Moved images file into db folder --- src/main/resources/db/hsqldb/initDB.sql | 9 ++- src/main/resources/db/hsqldb/populateDB.sql | 58 +++++++++--------- .../main/resources/db}/images/service1.jpg | Bin .../main/resources/db}/images/service2.jpg | Bin .../main/resources/db}/images/service3.jpg | Bin .../main/resources/db}/images/service4.jpg | Bin .../main/resources/db}/images/vet1.jpg | Bin .../main/resources/db}/images/vet2.jpg | Bin .../main/resources/db}/images/vet3.jpg | Bin .../main/resources/db}/images/vet4.jpg | Bin src/main/resources/spring/mvc-core-config.xml | 7 --- .../veterinarians/veterinarians.html | 53 +--------------- 12 files changed, 37 insertions(+), 90 deletions(-) rename {assets/files => src/main/resources/db}/images/service1.jpg (100%) rename {assets/files => src/main/resources/db}/images/service2.jpg (100%) rename {assets/files => src/main/resources/db}/images/service3.jpg (100%) rename {assets/files => src/main/resources/db}/images/service4.jpg (100%) rename {assets/files => src/main/resources/db}/images/vet1.jpg (100%) rename {assets/files => src/main/resources/db}/images/vet2.jpg (100%) rename {assets/files => src/main/resources/db}/images/vet3.jpg (100%) rename {assets/files => src/main/resources/db}/images/vet4.jpg (100%) diff --git a/src/main/resources/db/hsqldb/initDB.sql b/src/main/resources/db/hsqldb/initDB.sql index a16c42dec..51415879e 100644 --- a/src/main/resources/db/hsqldb/initDB.sql +++ b/src/main/resources/db/hsqldb/initDB.sql @@ -10,7 +10,8 @@ DROP TABLE owners IF EXISTS; CREATE TABLE vets ( id INTEGER IDENTITY PRIMARY KEY, first_name VARCHAR(30), - last_name VARCHAR(30) + last_name VARCHAR(30), + profile_pic BLOB ); CREATE INDEX vets_last_name ON vets (last_name); @@ -39,7 +40,8 @@ CREATE TABLE owners ( last_name VARCHAR(30), address VARCHAR(255), city VARCHAR(80), - telephone VARCHAR(20) + telephone VARCHAR(20), + profile_pic BLOB ); CREATE INDEX owners_last_name ON owners (last_name); @@ -48,7 +50,8 @@ CREATE TABLE pets ( name VARCHAR(30), birth_date DATE, type_id INTEGER NOT NULL, - owner_id INTEGER NOT NULL + owner_id INTEGER NOT NULL, + profile_pic BLOB ); 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 16dda3e84..624b642c1 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'); -INSERT INTO vets VALUES (2, 'Helen', 'Leary'); -INSERT INTO vets VALUES (3, 'Linda', 'Douglas'); -INSERT INTO vets VALUES (4, 'Rafael', 'Ortega'); -INSERT INTO vets VALUES (5, 'Henry', 'Stevens'); -INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins'); +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 specialties VALUES (1, 'radiology'); INSERT INTO specialties VALUES (2, 'surgery'); @@ -22,30 +22,30 @@ INSERT INTO types VALUES (4, 'snake'); INSERT INTO types VALUES (5, 'bird'); INSERT INTO types VALUES (6, 'hamster'); -INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023'); -INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); -INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); -INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); -INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); -INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); -INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); -INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); -INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); -INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); +INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023', NULL); +INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749', NULL); +INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763', NULL); +INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198', NULL); +INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765', NULL); +INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654', NULL); +INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387', NULL); +INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683', NULL); +INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435', NULL); +INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487', NULL); -INSERT INTO pets VALUES (1, 'Leo', '2010-09-07', 1, 1); -INSERT INTO pets VALUES (2, 'Basil', '2012-08-06', 6, 2); -INSERT INTO pets VALUES (3, 'Rosy', '2011-04-17', 2, 3); -INSERT INTO pets VALUES (4, 'Jewel', '2010-03-07', 2, 3); -INSERT INTO pets VALUES (5, 'Iggy', '2010-11-30', 3, 4); -INSERT INTO pets VALUES (6, 'George', '2010-01-20', 4, 5); -INSERT INTO pets VALUES (7, 'Samantha', '2012-09-04', 1, 6); -INSERT INTO pets VALUES (8, 'Max', '2012-09-04', 1, 6); -INSERT INTO pets VALUES (9, 'Lucky', '2011-08-06', 5, 7); -INSERT INTO pets VALUES (10, 'Mulligan', '2007-02-24', 2, 8); -INSERT INTO pets VALUES (11, 'Freddy', '2010-03-09', 5, 9); -INSERT INTO pets VALUES (12, 'Lucky', '2010-06-24', 2, 10); -INSERT INTO pets VALUES (13, 'Sly', '2012-06-08', 1, 10); +INSERT INTO pets VALUES (1, 'Leo', '2010-09-07', 1, 1, NULL); +INSERT INTO pets VALUES (2, 'Basil', '2012-08-06', 6, 2, NULL); +INSERT INTO pets VALUES (3, 'Rosy', '2011-04-17', 2, 3, NULL); +INSERT INTO pets VALUES (4, 'Jewel', '2010-03-07', 2, 3, NULL); +INSERT INTO pets VALUES (5, 'Iggy', '2010-11-30', 3, 4, NULL); +INSERT INTO pets VALUES (6, 'George', '2010-01-20', 4, 5, NULL); +INSERT INTO pets VALUES (7, 'Samantha', '2012-09-04', 1, 6, NULL); +INSERT INTO pets VALUES (8, 'Max', '2012-09-04', 1, 6, NULL); +INSERT INTO pets VALUES (9, 'Lucky', '2011-08-06', 5, 7, NULL); +INSERT INTO pets VALUES (10, 'Mulligan', '2007-02-24', 2, 8, NULL); +INSERT INTO pets VALUES (11, 'Freddy', '2010-03-09', 5, 9, NULL); +INSERT INTO pets VALUES (12, 'Lucky', '2010-06-24', 2, 10, NULL); +INSERT INTO pets VALUES (13, 'Sly', '2012-06-08', 1, 10, NULL); 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/assets/files/images/service1.jpg b/src/main/resources/db/images/service1.jpg similarity index 100% rename from assets/files/images/service1.jpg rename to src/main/resources/db/images/service1.jpg diff --git a/assets/files/images/service2.jpg b/src/main/resources/db/images/service2.jpg similarity index 100% rename from assets/files/images/service2.jpg rename to src/main/resources/db/images/service2.jpg diff --git a/assets/files/images/service3.jpg b/src/main/resources/db/images/service3.jpg similarity index 100% rename from assets/files/images/service3.jpg rename to src/main/resources/db/images/service3.jpg diff --git a/assets/files/images/service4.jpg b/src/main/resources/db/images/service4.jpg similarity index 100% rename from assets/files/images/service4.jpg rename to src/main/resources/db/images/service4.jpg diff --git a/assets/files/images/vet1.jpg b/src/main/resources/db/images/vet1.jpg similarity index 100% rename from assets/files/images/vet1.jpg rename to src/main/resources/db/images/vet1.jpg diff --git a/assets/files/images/vet2.jpg b/src/main/resources/db/images/vet2.jpg similarity index 100% rename from assets/files/images/vet2.jpg rename to src/main/resources/db/images/vet2.jpg diff --git a/assets/files/images/vet3.jpg b/src/main/resources/db/images/vet3.jpg similarity index 100% rename from assets/files/images/vet3.jpg rename to src/main/resources/db/images/vet3.jpg diff --git a/assets/files/images/vet4.jpg b/src/main/resources/db/images/vet4.jpg similarity index 100% rename from assets/files/images/vet4.jpg rename to src/main/resources/db/images/vet4.jpg diff --git a/src/main/resources/spring/mvc-core-config.xml b/src/main/resources/spring/mvc-core-config.xml index 8f661a167..62d86c010 100644 --- a/src/main/resources/spring/mvc-core-config.xml +++ b/src/main/resources/spring/mvc-core-config.xml @@ -43,13 +43,6 @@ - - - - - - -
-
-
- 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.

-
-
-
-
-