mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-23 07:45:49 +00:00
Merge pull request #34 from cheapy-ispp/hotfix-entidades
Actualizacion de entidades
This commit is contained in:
javgranar
GitHub
commit
2e876d3a43
17 changed files with 137 additions and 152 deletions
|
|
@ -14,27 +14,29 @@ import javax.validation.constraints.NotEmpty;
|
|||
|
||||
@Entity
|
||||
@Table(name = "clients")
|
||||
public class Client extends BaseEntity{
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public class Client extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// (id, email, address, init, finish, telephone, description, code, food, usuar)
|
||||
// (id, name, email, address, init, finish, telephone, description, code, food,
|
||||
// usuar)
|
||||
|
||||
@NotEmpty
|
||||
private String name;
|
||||
|
||||
@NotEmpty
|
||||
private String email;
|
||||
|
||||
|
||||
@NotEmpty
|
||||
private String address;
|
||||
|
||||
//@DateTimeFormat(pattern = "HH:mm")
|
||||
@NotBlank
|
||||
private String init;
|
||||
// Hora de apertura del local
|
||||
@NotBlank
|
||||
private String init;
|
||||
|
||||
//@DateTimeFormat(pattern = "HH:mm")
|
||||
@NotBlank
|
||||
private String finish;
|
||||
// Hora de cierre del local
|
||||
@NotBlank
|
||||
private String finish;
|
||||
|
||||
@NotEmpty
|
||||
@Digits(fraction = 0, integer = 10)
|
||||
|
|
@ -43,38 +45,45 @@ public class Client extends BaseEntity{
|
|||
@NotEmpty
|
||||
private String description;
|
||||
|
||||
// Codigo de activacion de cuenta
|
||||
@NotEmpty
|
||||
private String code;
|
||||
|
||||
@NotEmpty
|
||||
private String food;
|
||||
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
@JoinColumn(name = "username", referencedColumnName = "username")
|
||||
private User usuar;
|
||||
|
||||
|
||||
@OneToMany
|
||||
private Set<FoodOffer> foodOffers;
|
||||
|
||||
|
||||
@OneToMany
|
||||
private Set<NuOffer> nuOffers;
|
||||
|
||||
|
||||
@OneToMany
|
||||
private Set<SpeedOffer> speedOffers;
|
||||
|
||||
|
||||
@OneToMany
|
||||
private Set<TimeOffer> timeOffers;
|
||||
|
||||
|
||||
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
|
||||
public String getAddress() {
|
||||
return address;
|
||||
}
|
||||
|
|
@ -83,7 +92,6 @@ public class Client extends BaseEntity{
|
|||
this.address = address;
|
||||
}
|
||||
|
||||
|
||||
public String getInit() {
|
||||
return init;
|
||||
}
|
||||
|
|
@ -100,14 +108,6 @@ public class Client extends BaseEntity{
|
|||
this.finish = finish;
|
||||
}
|
||||
|
||||
public User getUsername() {
|
||||
return usuar;
|
||||
}
|
||||
|
||||
public void setUsername(User username) {
|
||||
this.usuar = username;
|
||||
}
|
||||
|
||||
public String getTelephone() {
|
||||
return telephone;
|
||||
}
|
||||
|
|
@ -140,6 +140,14 @@ public class Client extends BaseEntity{
|
|||
this.food = food;
|
||||
}
|
||||
|
||||
public User getUsuar() {
|
||||
return usuar;
|
||||
}
|
||||
|
||||
public void setUsuar(User usuar) {
|
||||
this.usuar = usuar;
|
||||
}
|
||||
|
||||
public Set<FoodOffer> getFoodOffers() {
|
||||
return foodOffers;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ package org.springframework.cheapy.model;
|
|||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
|
|
@ -24,20 +25,15 @@ import javax.validation.constraints.NotNull;
|
|||
@Table(name = "food_offers")
|
||||
public class FoodOffer extends Offer {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//Plato específico
|
||||
@NotBlank
|
||||
private String food;
|
||||
|
||||
@NotBlank
|
||||
private String discount;
|
||||
|
||||
@NotNull
|
||||
private Integer units; // revisar
|
||||
@Min(0)
|
||||
private Integer discount;
|
||||
|
||||
public String getFood() {
|
||||
return food;
|
||||
|
|
@ -47,20 +43,12 @@ public class FoodOffer extends Offer {
|
|||
this.food = food;
|
||||
}
|
||||
|
||||
public String getDiscount() {
|
||||
public Integer getDiscount() {
|
||||
return discount;
|
||||
}
|
||||
|
||||
public void setDiscount(String discount) {
|
||||
public void setDiscount(Integer discount) {
|
||||
this.discount = discount;
|
||||
}
|
||||
|
||||
public Integer getUnits() {
|
||||
return units;
|
||||
}
|
||||
|
||||
public void setUnits(Integer units) {
|
||||
this.units = units;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,7 +4,6 @@ import javax.persistence.Column;
|
|||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Entity
|
||||
|
|
@ -19,71 +18,73 @@ public class NuOffer extends Offer {
|
|||
private Integer gold;
|
||||
|
||||
@Column(name = "discount_gold")
|
||||
@NotBlank
|
||||
private String discountGold;
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountGold;
|
||||
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Integer silver;
|
||||
|
||||
@Column(name = "discount_silver")
|
||||
@NotBlank
|
||||
private String discountSilver;
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountSilver;
|
||||
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Integer bronze;
|
||||
|
||||
@Column(name = "discount_bronze")
|
||||
@NotBlank
|
||||
private String discountBronze;
|
||||
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountBronze;
|
||||
|
||||
public Integer getGold() {
|
||||
return this.gold;
|
||||
return gold;
|
||||
}
|
||||
|
||||
public void setGold(final Integer gold) {
|
||||
public void setGold(Integer gold) {
|
||||
this.gold = gold;
|
||||
}
|
||||
|
||||
public String getDiscountGold() {
|
||||
return this.discountGold;
|
||||
public Integer getDiscountGold() {
|
||||
return discountGold;
|
||||
}
|
||||
|
||||
public void setDiscountGold(final String discountGold) {
|
||||
public void setDiscountGold(Integer discountGold) {
|
||||
this.discountGold = discountGold;
|
||||
}
|
||||
|
||||
public Integer getSilver() {
|
||||
return this.silver;
|
||||
return silver;
|
||||
}
|
||||
|
||||
public void setSilver(final Integer silver) {
|
||||
public void setSilver(Integer silver) {
|
||||
this.silver = silver;
|
||||
}
|
||||
|
||||
public String getDiscountSilver() {
|
||||
return this.discountSilver;
|
||||
public Integer getDiscountSilver() {
|
||||
return discountSilver;
|
||||
}
|
||||
|
||||
public void setDiscountSilver(final String discountSilver) {
|
||||
public void setDiscountSilver(Integer discountSilver) {
|
||||
this.discountSilver = discountSilver;
|
||||
}
|
||||
|
||||
public Integer getBronze() {
|
||||
return this.bronze;
|
||||
return bronze;
|
||||
}
|
||||
|
||||
public void setBronze(final Integer bronze) {
|
||||
public void setBronze(Integer bronze) {
|
||||
this.bronze = bronze;
|
||||
}
|
||||
|
||||
public String getDiscountBronze() {
|
||||
return this.discountBronze;
|
||||
public Integer getDiscountBronze() {
|
||||
return discountBronze;
|
||||
}
|
||||
|
||||
public void setDiscountBronze(final String discountBronze) {
|
||||
public void setDiscountBronze(Integer discountBronze) {
|
||||
this.discountBronze = discountBronze;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,13 +29,11 @@ import org.springframework.format.annotation.DateTimeFormat;
|
|||
|
||||
@MappedSuperclass
|
||||
public class Offer extends BaseEntity {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//Clase padre
|
||||
// Clase padre
|
||||
|
||||
@DateTimeFormat(pattern = "dd/MM/yyyy HH:mm")
|
||||
@NotNull
|
||||
@Future
|
||||
|
|
@ -46,15 +44,13 @@ public class Offer extends BaseEntity {
|
|||
@Future
|
||||
private LocalDateTime end;
|
||||
|
||||
|
||||
private String code;
|
||||
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
private StatusOffer type;
|
||||
|
||||
|
||||
private StatusOffer status;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name="client_id")
|
||||
@JoinColumn(name = "client_id")
|
||||
private Client client;
|
||||
|
||||
public LocalDateTime getStart() {
|
||||
|
|
@ -81,14 +77,14 @@ public class Offer extends BaseEntity {
|
|||
this.code = code;
|
||||
}
|
||||
|
||||
public StatusOffer getType() {
|
||||
return type;
|
||||
public StatusOffer getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setType(StatusOffer type) {
|
||||
this.type = type;
|
||||
public void setStatus(StatusOffer type) {
|
||||
this.status = type;
|
||||
}
|
||||
|
||||
|
||||
public Client getClient() {
|
||||
return client;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,86 +4,87 @@ import javax.persistence.Column;
|
|||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Entity
|
||||
@Table(name = "speed_offers")
|
||||
public class SpeedOffer extends Offer {
|
||||
|
||||
//Ofertar por rapidez comiendo
|
||||
// Ofertar por rapidez comiendo
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer gold; // x minutos
|
||||
private Integer gold;
|
||||
|
||||
@Column(name = "discount_gold")
|
||||
@NotBlank
|
||||
private String discountGold;
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountGold;
|
||||
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer silver;
|
||||
private Integer silver;
|
||||
|
||||
@Column(name = "discount_silver")
|
||||
@NotBlank
|
||||
private String discountSilver;
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountSilver;
|
||||
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer bronze;
|
||||
private Integer bronze;
|
||||
|
||||
@Column(name = "discount_bronze")
|
||||
@NotBlank
|
||||
private String discountBronze;
|
||||
|
||||
@NotNull
|
||||
@Min(0)
|
||||
private Integer discountBronze;
|
||||
|
||||
public Integer getGold() {
|
||||
return this.gold;
|
||||
return gold;
|
||||
}
|
||||
|
||||
public void setGold(final Integer gold) {
|
||||
public void setGold(Integer gold) {
|
||||
this.gold = gold;
|
||||
}
|
||||
|
||||
public String getDiscountGold() {
|
||||
return this.discountGold;
|
||||
public Integer getDiscountGold() {
|
||||
return discountGold;
|
||||
}
|
||||
|
||||
public void setDiscountGold(final String discountGold) {
|
||||
public void setDiscountGold(Integer discountGold) {
|
||||
this.discountGold = discountGold;
|
||||
}
|
||||
|
||||
public Integer getSilver() {
|
||||
return this.silver;
|
||||
return silver;
|
||||
}
|
||||
|
||||
public void setSilver(final Integer silver) {
|
||||
public void setSilver(Integer silver) {
|
||||
this.silver = silver;
|
||||
}
|
||||
|
||||
public String getDiscountSilver() {
|
||||
return this.discountSilver;
|
||||
public Integer getDiscountSilver() {
|
||||
return discountSilver;
|
||||
}
|
||||
|
||||
public void setDiscountSilver(final String discountSilver) {
|
||||
public void setDiscountSilver(Integer discountSilver) {
|
||||
this.discountSilver = discountSilver;
|
||||
}
|
||||
|
||||
public Integer getBronze() {
|
||||
return this.bronze;
|
||||
return bronze;
|
||||
}
|
||||
|
||||
public void setBronze(final Integer bronze) {
|
||||
public void setBronze(Integer bronze) {
|
||||
this.bronze = bronze;
|
||||
}
|
||||
|
||||
public String getDiscountBronze() {
|
||||
return this.discountBronze;
|
||||
public Integer getDiscountBronze() {
|
||||
return discountBronze;
|
||||
}
|
||||
|
||||
public void setDiscountBronze(final String discountBronze) {
|
||||
public void setDiscountBronze(Integer discountBronze) {
|
||||
this.discountBronze = discountBronze;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import java.time.LocalTime;
|
|||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
|
@ -12,13 +11,11 @@ import org.springframework.format.annotation.DateTimeFormat;
|
|||
@Entity
|
||||
@Table(name = "time_offers")
|
||||
public class TimeOffer extends Offer {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//Oferta por franja horaria
|
||||
// Oferta por franja horaria
|
||||
|
||||
@DateTimeFormat(pattern = "HH:mm")
|
||||
@NotNull
|
||||
private LocalTime init;
|
||||
|
|
@ -27,8 +24,8 @@ public class TimeOffer extends Offer {
|
|||
@NotNull
|
||||
private LocalTime finish;
|
||||
|
||||
@NotBlank
|
||||
private String discount;
|
||||
@NotNull
|
||||
private Integer discount;
|
||||
|
||||
public LocalTime getInit() {
|
||||
return init;
|
||||
|
|
@ -46,11 +43,11 @@ public class TimeOffer extends Offer {
|
|||
this.finish = finish;
|
||||
}
|
||||
|
||||
public String getDiscount() {
|
||||
public Integer getDiscount() {
|
||||
return discount;
|
||||
}
|
||||
|
||||
public void setDiscount(String discount) {
|
||||
public void setDiscount(Integer discount) {
|
||||
this.discount = discount;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class FoodOfferController {
|
|||
} else {
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
foodOffer.setClient(client);
|
||||
foodOffer.setType(StatusOffer.hidden);
|
||||
foodOffer.setStatus(StatusOffer.hidden);
|
||||
this.foodOfferService.saveFoodOffer(foodOffer);
|
||||
return "redirect:/foodOffers/" + foodOffer.getId();
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ public class FoodOfferController {
|
|||
FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId);
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
if (foodOffer.getClient().equals(client)) {
|
||||
foodOffer.setType(StatusOffer.active);
|
||||
foodOffer.setStatus(StatusOffer.active);
|
||||
foodOffer.setCode("FO-" + foodOfferId);
|
||||
this.foodOfferService.saveFoodOffer(foodOffer);
|
||||
} else {
|
||||
|
|
@ -135,7 +135,7 @@ public class FoodOfferController {
|
|||
|
||||
FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId);
|
||||
|
||||
foodOffer.setType(StatusOffer.inactive);
|
||||
foodOffer.setStatus(StatusOffer.inactive);
|
||||
|
||||
this.foodOfferService.saveFoodOffer(foodOffer);
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public class NuOfferController {
|
|||
if (result.hasErrors()) {
|
||||
return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
|
||||
} else {
|
||||
nuOffer.setType(StatusOffer.hidden);
|
||||
nuOffer.setStatus(StatusOffer.hidden);
|
||||
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ public class NuOfferController {
|
|||
Client client = this.clientService.getCurrentClient();
|
||||
NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId);
|
||||
if (nuOffer.getClient().equals(client)) {
|
||||
nuOffer.setType(StatusOffer.active);
|
||||
nuOffer.setStatus(StatusOffer.active);
|
||||
nuOffer.setCode("NU-" + nuOfferId);
|
||||
this.nuOfferService.saveNuOffer(nuOffer);
|
||||
|
||||
|
|
@ -142,7 +142,7 @@ public class NuOfferController {
|
|||
}
|
||||
|
||||
NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId);
|
||||
nuOffer.setType(StatusOffer.inactive);
|
||||
nuOffer.setStatus(StatusOffer.inactive);
|
||||
this.nuOfferService.saveNuOffer(nuOffer);
|
||||
return "redirect:/offers";
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class SpeedOfferController {
|
|||
} else {
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
speedOffer.setClient(client);
|
||||
speedOffer.setType(StatusOffer.hidden);
|
||||
speedOffer.setStatus(StatusOffer.hidden);
|
||||
this.speedOfferService.saveSpeedOffer(speedOffer);
|
||||
return "redirect:/speedOffers/" + speedOffer.getId();
|
||||
}
|
||||
|
|
@ -65,7 +65,7 @@ public class SpeedOfferController {
|
|||
SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId);
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
if (speedOffer.getClient().equals(client)) {
|
||||
speedOffer.setType(StatusOffer.active);
|
||||
speedOffer.setStatus(StatusOffer.active);
|
||||
speedOffer.setCode("SP-" + speedOfferId);
|
||||
this.speedOfferService.saveSpeedOffer(speedOffer);
|
||||
} else {
|
||||
|
|
@ -133,7 +133,7 @@ public class SpeedOfferController {
|
|||
|
||||
SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId);
|
||||
|
||||
speedOffer.setType(StatusOffer.inactive);
|
||||
speedOffer.setStatus(StatusOffer.inactive);
|
||||
|
||||
this.speedOfferService.saveSpeedOffer(speedOffer);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class TimeOfferController {
|
|||
if (result.hasErrors()) {
|
||||
return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
|
||||
} else {
|
||||
timeOffer.setType(StatusOffer.hidden);
|
||||
timeOffer.setStatus(StatusOffer.hidden);
|
||||
|
||||
Client client = this.clientService.getCurrentClient();
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ public class TimeOfferController {
|
|||
Client client = this.clientService.getCurrentClient();
|
||||
TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId);
|
||||
if (timeOffer.getClient().equals(client)) {
|
||||
timeOffer.setType(StatusOffer.active);
|
||||
timeOffer.setStatus(StatusOffer.active);
|
||||
timeOffer.setCode("TI-" + timeOfferId);
|
||||
this.timeOfferService.saveTimeOffer(timeOffer);
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ public class TimeOfferController {
|
|||
|
||||
TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId);
|
||||
|
||||
timeOffer.setType(StatusOffer.inactive);
|
||||
timeOffer.setStatus(StatusOffer.inactive);
|
||||
|
||||
this.timeOfferService.saveTimeOffer(timeOffer);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ INSERT INTO usuarios VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', '
|
|||
INSERT INTO usuarios VALUES (3, 'Lolo', 'Lopez', '25486596L', 'C/Macarena', '690670547' ,'Lolo@gmail.com','lolo');
|
||||
INSERT INTO usuarios VALUES (4, 'Pepe', 'Lopez', '12456776V', 'C/Macarena', '690670547', 'Pepe@gmail.com','pepe');
|
||||
|
||||
INSERT INTO clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
|
||||
INSERT INTO clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david');
|
||||
INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
|
||||
INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'bar david','david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david');
|
||||
|
||||
INSERT INTO food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', 1, 'macarrones', '15%', 10);
|
||||
INSERT INTO time_offers(start, end, code, type, client_id, init, finish, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'T-1', 'active', 1, '12:00:00', '13:00:00', '10%');
|
||||
INSERT INTO speed_offers(start, end, code, type, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'SP-1', 'active', 1,5,'25%',10,'15%',15,'10%' );
|
||||
INSERT INTO nu_offers(start, end, code, type, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'NU-1', 'active', 1,15,'25%',10,'15%',5,'10%' );
|
||||
INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', 1, 'macarrones', 15);
|
||||
INSERT INTO time_offers(start, end, code, status, client_id, init, finish, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'T-1', 'active', 1, '12:00:00', '13:00:00', 10);
|
||||
INSERT INTO speed_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'SP-1', 'active',1,5,25,10,15,15,10);
|
||||
INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'NU-1', 'active',1,15,25,10,15,5,10);
|
||||
|
||||
|
|
|
|||
|
|
@ -14,18 +14,17 @@
|
|||
<div class="form-group has-feedback">
|
||||
<form:hidden path="id"/>
|
||||
<form:hidden path="code"/>
|
||||
<form:hidden path="type"/>
|
||||
<form:hidden path="status"/>
|
||||
<petclinic:inputField label="Start Date" name="start"/>
|
||||
<petclinic:inputField label="End Date" name="end"/>
|
||||
<petclinic:inputField label="Food" name="food"/>
|
||||
<petclinic:inputField label="Discount" name="discount"/>
|
||||
<petclinic:inputField label="Units" name="units"/>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<c:choose>
|
||||
<c:when test="${foodOffer['new']}">
|
||||
<button class="btn btn-default" type="submit">Add Food Offer</button>
|
||||
<button class="btn btn-default" type="submit">Crear oferta</button>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<button class="btn btn-default" type="submit">Modificar</button>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
<form:form modelAttribute="foodOffer" class="form-horizontal">
|
||||
<input type="hidden" name="food" value="${food_offer.food}" />
|
||||
<input type="hidden" name="discount" value="${food_offer.discount}" />
|
||||
<input type="hidden" name="units" value="${food_offer.units}" />
|
||||
|
||||
<button class="btn btn-default" type="submit">Eliminar Oferta</button>
|
||||
</form:form>
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@
|
|||
<th>Descuento</th>
|
||||
<td><c:out value="${foodOffer.discount}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Cantidad</th>
|
||||
<td><c:out value="${foodOffer.units}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Codigo de la oferta</th>
|
||||
<td><c:out value="${foodOffer.code}"/></td>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="form-group has-feedback">
|
||||
<form:hidden path="id"/>
|
||||
<form:hidden path="code"/>
|
||||
<form:hidden path="type"/>
|
||||
<form:hidden path="status"/>
|
||||
<petclinic:inputField label="Fecha de inicio" name="start"/>
|
||||
<petclinic:inputField label="Fecha de fin" name="end"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="form-group has-feedback">
|
||||
<form:hidden path="id"/>
|
||||
<form:hidden path="code"/>
|
||||
<form:hidden path="type"/>
|
||||
<form:hidden path="status"/>
|
||||
<petclinic:inputField label="Start Date" name="start"/>
|
||||
<petclinic:inputField label="End Date" name="end"/>
|
||||
<petclinic:inputField label="Gold" name="gold"/>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="form-group has-feedback">
|
||||
<form:hidden path="id"/>
|
||||
<form:hidden path="code"/>
|
||||
<form:hidden path="type"/>
|
||||
<form:hidden path="status"/>
|
||||
<petclinic:inputField label="Fecha de inicio" name="start"/>
|
||||
<petclinic:inputField label="Fecha de fin" name="end"/>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue