From a01f24891f2ebba4dec690e8cb4bb49788ba531f Mon Sep 17 00:00:00 2001 From: cgsrjunior Date: Mon, 12 Aug 2019 16:57:49 -0300 Subject: [PATCH] =?UTF-8?q?Defini=C3=A7=C3=A3o=20de=20um=20reposit=C3=B3ri?= =?UTF-8?q?o=20para=20produtos=20com=20listagem=20do=20DB=20Altera=C3=A7?= =?UTF-8?q?=C3=B5es=20em=20cores=20do=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../samples/petclinic/product/Product.java | 20 +++++++++++++++---- .../petclinic/product/ProductController.java | 11 +++++++--- .../petclinic/product/ProductRepository.java | 9 +++++++++ src/main/less/header.less | 4 ++-- src/main/less/petclinic.less | 18 ++++++++--------- src/main/resources/db/hsqldb/data.sql | 4 ++++ src/main/resources/db/hsqldb/schema.sql | 6 ++++++ 7 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/springframework/samples/petclinic/product/ProductRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/product/Product.java b/src/main/java/org/springframework/samples/petclinic/product/Product.java index 4f0a06ab4..44393701c 100644 --- a/src/main/java/org/springframework/samples/petclinic/product/Product.java +++ b/src/main/java/org/springframework/samples/petclinic/product/Product.java @@ -1,13 +1,25 @@ package org.springframework.samples.petclinic.product; -public class Product { +import org.springframework.samples.petclinic.model.BaseEntity; + +import javax.persistence.Entity; +import javax.persistence.Table; + +@Entity +@Table(name = "products") +public class Product extends BaseEntity { private String description; - public Product(String description){ - this.description = description; - } + //public Product(String description){ + // this.description = description; + //} public String getDescription(){ return description; } + + + public void setDescription(String description) { + this.description = description; + } } diff --git a/src/main/java/org/springframework/samples/petclinic/product/ProductController.java b/src/main/java/org/springframework/samples/petclinic/product/ProductController.java index ed6ede93d..9e3c96614 100644 --- a/src/main/java/org/springframework/samples/petclinic/product/ProductController.java +++ b/src/main/java/org/springframework/samples/petclinic/product/ProductController.java @@ -5,18 +5,23 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import java.util.ArrayList; +import java.util.Collection; import java.util.List; @Controller public class ProductController { + //Injeção de dependencias + private ProductRepository products; + + public ProductController(ProductRepository products){ + this.products = products; + } @GetMapping("/products") public String showProductList(Model model){ - List prods = new ArrayList(); + Collection prods = products.findAll(); model.addAttribute("products",prods); - prods.add(new Product("p1")); - prods.add(new Product("p2")); return "products/productsList"; } } diff --git a/src/main/java/org/springframework/samples/petclinic/product/ProductRepository.java b/src/main/java/org/springframework/samples/petclinic/product/ProductRepository.java new file mode 100644 index 000000000..a2b9fb37b --- /dev/null +++ b/src/main/java/org/springframework/samples/petclinic/product/ProductRepository.java @@ -0,0 +1,9 @@ +package org.springframework.samples.petclinic.product; + +import org.springframework.data.repository.Repository; + +import java.util.Collection; + +public interface ProductRepository extends Repository{ + Collection findAll(); +} diff --git a/src/main/less/header.less b/src/main/less/header.less index 7cb1a7888..3bd821161 100644 --- a/src/main/less/header.less +++ b/src/main/less/header.less @@ -1,5 +1,5 @@ .navbar { - border-top: 4px solid #6db33f; + border-top: 4px solid #03030a; background-color: #34302d; margin-bottom: 0px; border-bottom: 0; @@ -56,7 +56,7 @@ } .navbar li:hover > a { color: #eeeeee; - background-color: #6db33f; + background-color: #03030a; } .navbar-toggle { diff --git a/src/main/less/petclinic.less b/src/main/less/petclinic.less index 7c88ec091..c01a2a50e 100644 --- a/src/main/less/petclinic.less +++ b/src/main/less/petclinic.less @@ -13,24 +13,24 @@ */ @icon-font-path: "../../webjars/bootstrap/fonts/"; -@spring-green: #6db33f; -@spring-dark-green: #5fa134; +@spring-blue: #0375B4; +@spring-dark-blue: #194fb4; @spring-brown: #34302D; @spring-grey: #838789; @spring-light-grey: #f1f1f1; @body-bg: @spring-light-grey; @text-color: @spring-brown; -@link-color: @spring-dark-green; -@link-hover-color: @spring-dark-green; +@link-color: @spring-dark-blue; +@link-hover-color: @spring-dark-blue; @navbar-default-link-color: @spring-light-grey; @navbar-default-link-active-color: @spring-light-grey; @navbar-default-link-hover-color: @spring-light-grey; -@navbar-default-link-hover-bg: @spring-green; +@navbar-default-link-hover-bg: @spring-blue; @navbar-default-toggle-icon-bar-bg: @spring-light-grey; @navbar-default-toggle-hover-bg: transparent; -@navbar-default-link-active-bg: @spring-green; +@navbar-default-link-active-bg: @spring-blue; @border-radius-base: 0; @border-radius-large: 0; @@ -38,7 +38,7 @@ @btn-default-color: @spring-light-grey; @btn-default-bg: @spring-brown; -@btn-default-border: @spring-green; +@btn-default-border: @spring-blue; @nav-tabs-active-link-hover-color: @spring-light-grey; @nav-tabs-active-link-hover-bg: @spring-brown; @@ -46,7 +46,7 @@ @nav-tabs-border-color: @spring-brown; @pagination-active-bg: @spring-brown; -@pagination-active-border: @spring-green; +@pagination-active-border: @spring-blue; @table-border-color: @spring-brown; .table > thead > tr > th { @@ -125,7 +125,7 @@ h1 { } .splash { - background: @spring-green; + background: @spring-blue; color: @spring-brown; display: none; } diff --git a/src/main/resources/db/hsqldb/data.sql b/src/main/resources/db/hsqldb/data.sql index 16dda3e84..4eb8e960b 100644 --- a/src/main/resources/db/hsqldb/data.sql +++ b/src/main/resources/db/hsqldb/data.sql @@ -51,3 +51,7 @@ INSERT INTO visits VALUES (1, 7, '2013-01-01', 'rabies shot'); INSERT INTO visits VALUES (2, 8, '2013-01-02', 'rabies shot'); INSERT INTO visits VALUES (3, 8, '2013-01-03', 'neutered'); INSERT INTO visits VALUES (4, 7, '2013-01-04', 'spayed'); + +INSERT INTO products VALUES (1, 'Penincilina'); +INSERT INTO products VALUES (2, 'Vermifugo'); +INSERT INTO products VALUES (3, 'Anto-pulgas'); diff --git a/src/main/resources/db/hsqldb/schema.sql b/src/main/resources/db/hsqldb/schema.sql index f3c6947b7..0fbfa6dc1 100644 --- a/src/main/resources/db/hsqldb/schema.sql +++ b/src/main/resources/db/hsqldb/schema.sql @@ -5,6 +5,7 @@ DROP TABLE visits IF EXISTS; DROP TABLE pets IF EXISTS; DROP TABLE types IF EXISTS; DROP TABLE owners IF EXISTS; +DROP TABLE products IF EXISTS; CREATE TABLE vets ( @@ -62,3 +63,8 @@ CREATE TABLE visits ( ); ALTER TABLE visits ADD CONSTRAINT fk_visits_pets FOREIGN KEY (pet_id) REFERENCES pets (id); CREATE INDEX visits_pet_id ON visits (pet_id); + +CREATE TABLE products ( + id INTEGER IDENTITY PRIMARY KEY, + description VARCHAR(80) +);