diff --git a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java index 6ec7dae83..7189740f2 100644 --- a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java +++ b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java @@ -36,14 +36,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers(HttpMethod.GET, "/", "/oups").permitAll() .antMatchers("/users/new").permitAll() - .antMatchers("/nuOffers/**").hasAnyAuthority("admin","client") - .antMatchers("/timeOffers/**").hasAnyAuthority("admin","client") - .antMatchers("/login/**").anonymous() .antMatchers("/logout").permitAll() .antMatchers("/usuarios/new").permitAll() .antMatchers("/admin/**").hasAnyAuthority("admin") + .antMatchers("/owners/**").hasAnyAuthority("owner", "admin") .antMatchers("/offers/**/new").hasAnyAuthority("admin", "client") @@ -52,6 +50,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers("/clients/new").permitAll() .antMatchers("/offers/**").permitAll() + .and().formLogin() .loginPage("/login").permitAll() .failureUrl("/login?error") diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java index 210e3ed70..23fa89b80 100644 --- a/src/main/java/org/springframework/cheapy/model/Client.java +++ b/src/main/java/org/springframework/cheapy/model/Client.java @@ -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 foodOffers; - + @OneToMany private Set nuOffers; - + @OneToMany private Set speedOffers; - + @OneToMany private Set 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 getFoodOffers() { return foodOffers; } diff --git a/src/main/java/org/springframework/cheapy/model/FoodOffer.java b/src/main/java/org/springframework/cheapy/model/FoodOffer.java index 59419f1d1..3cb6a1e56 100644 --- a/src/main/java/org/springframework/cheapy/model/FoodOffer.java +++ b/src/main/java/org/springframework/cheapy/model/FoodOffer.java @@ -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; - } - } \ No newline at end of file diff --git a/src/main/java/org/springframework/cheapy/model/NuOffer.java b/src/main/java/org/springframework/cheapy/model/NuOffer.java index 5a52a5756..6f250737d 100644 --- a/src/main/java/org/springframework/cheapy/model/NuOffer.java +++ b/src/main/java/org/springframework/cheapy/model/NuOffer.java @@ -3,38 +3,42 @@ package org.springframework.cheapy.model; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @Entity @Table(name = "nu_offers") public class NuOffer extends Offer { - /** - * - */ + //Oferta por numero de comensales private static final long serialVersionUID = 1L; - + @NotNull - private Integer gold; + @Min(1) + private Integer gold; @Column(name = "discount_gold") - @NotBlank - private String discountGold; + @NotNull + @Min(0) + private Integer discountGold; @NotNull - private Integer silver; + @Min(1) + private Integer silver; @Column(name = "discount_silver") - @NotBlank - private String discountSilver; + @NotNull + @Min(0) + private Integer discountSilver; @NotNull - private Integer bronze; + @Min(1) + private Integer bronze; @Column(name = "discount_bronze") - @NotBlank - private String discountBronze; + @NotNull + @Min(0) + private Integer discountBronze; public Integer getGold() { return gold; @@ -44,11 +48,11 @@ public class NuOffer extends Offer { this.gold = gold; } - public String getDiscountGold() { + public Integer getDiscountGold() { return discountGold; } - public void setDiscountGold(String discountGold) { + public void setDiscountGold(Integer discountGold) { this.discountGold = discountGold; } @@ -60,11 +64,11 @@ public class NuOffer extends Offer { this.silver = silver; } - public String getDiscountSilver() { + public Integer getDiscountSilver() { return discountSilver; } - public void setDiscountSilver(String discountSilver) { + public void setDiscountSilver(Integer discountSilver) { this.discountSilver = discountSilver; } @@ -76,12 +80,12 @@ public class NuOffer extends Offer { this.bronze = bronze; } - public String getDiscountBronze() { + public Integer getDiscountBronze() { return discountBronze; } - public void setDiscountBronze(String discountBronze) { + public void setDiscountBronze(Integer discountBronze) { this.discountBronze = discountBronze; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/cheapy/model/Offer.java b/src/main/java/org/springframework/cheapy/model/Offer.java index f5c92c10d..5ae64feba 100644 --- a/src/main/java/org/springframework/cheapy/model/Offer.java +++ b/src/main/java/org/springframework/cheapy/model/Offer.java @@ -32,7 +32,8 @@ 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,11 +47,10 @@ public class Offer extends BaseEntity { 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() { @@ -77,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; } diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 021a89106..84b551829 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -3,35 +3,42 @@ package org.springframework.cheapy.model; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @Entity @Table(name = "speed_offers") public class SpeedOffer extends Offer { + // Ofertar por rapidez comiendo private static final long serialVersionUID = 1L; @NotNull - private Integer gold; // x minutos + @Min(0) + private Integer gold; @Column(name = "discount_gold") - @NotBlank - private String discountGold; + @NotNull + @Min(0) + private Integer discountGold; @NotNull + @Min(0) private Integer silver; @Column(name = "discount_silver") - @NotBlank - private String discountSilver; + @NotNull + @Min(0) + private Integer discountSilver; @NotNull + @Min(0) private Integer bronze; @Column(name = "discount_bronze") - @NotBlank - private String discountBronze; + @NotNull + @Min(0) + private Integer discountBronze; public Integer getGold() { return gold; @@ -41,11 +48,11 @@ public class SpeedOffer extends Offer { this.gold = gold; } - public String getDiscountGold() { + public Integer getDiscountGold() { return discountGold; } - public void setDiscountGold(String discountGold) { + public void setDiscountGold(Integer discountGold) { this.discountGold = discountGold; } @@ -57,11 +64,11 @@ public class SpeedOffer extends Offer { this.silver = silver; } - public String getDiscountSilver() { + public Integer getDiscountSilver() { return discountSilver; } - public void setDiscountSilver(String discountSilver) { + public void setDiscountSilver(Integer discountSilver) { this.discountSilver = discountSilver; } @@ -73,12 +80,12 @@ public class SpeedOffer extends Offer { this.bronze = bronze; } - public String getDiscountBronze() { + public Integer getDiscountBronze() { return discountBronze; } - public void setDiscountBronze(String discountBronze) { + public void setDiscountBronze(Integer discountBronze) { this.discountBronze = discountBronze; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/cheapy/model/TimeOffer.java b/src/main/java/org/springframework/cheapy/model/TimeOffer.java index d9833e0c8..44ae5e3d6 100644 --- a/src/main/java/org/springframework/cheapy/model/TimeOffer.java +++ b/src/main/java/org/springframework/cheapy/model/TimeOffer.java @@ -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; } diff --git a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java index 764b35184..1e04f6f3a 100644 --- a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java @@ -10,5 +10,5 @@ public interface ClientRepository extends CrudRepository { @Query("SELECT client FROM Client client WHERE username =:username") @Transactional(readOnly = true) Client findByUsername(String username); - + } diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java index 475a2e7ab..d09255d64 100644 --- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java @@ -1,37 +1,36 @@ -package org.springframework.cheapy.service; +package org.springframework.cheapy.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.repository.NuOfferRepository; -import java.util.Collection; import java.util.List; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service public class NuOfferService { - private NuOfferRepository nuOfferRepository; + private NuOfferRepository nuOfferRepository; @Autowired public NuOfferService(final NuOfferRepository nuOfferRepository) { this.nuOfferRepository = nuOfferRepository; } + @Transactional public NuOffer findNuOfferById(final int id) { - return this.nuOfferRepository.findNuOfferById(id); } - public List findAllNuOffer() { // - return this.nuOfferRepository.findAllNuOffer(); + @Transactional + public List findAllNuOffer() { + return this.nuOfferRepository.findAllNuOffer(); } - - public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { // - + @Transactional + public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { this.nuOfferRepository.save(nuOffer); - } } diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java index ca2b08036..121874247 100644 --- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java @@ -1,13 +1,13 @@ + package org.springframework.cheapy.service; - -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.repository.SpeedOfferRepository; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service public class SpeedOfferService { @@ -20,19 +20,18 @@ public class SpeedOfferService { this.speedOfferRepository = speedOfferRepository; } + @Transactional public SpeedOffer findSpeedOfferById(final int id) { return this.speedOfferRepository.findById(id); } + @Transactional public List findAllSpeedOffer() { // return this.speedOfferRepository.findAllSpeedOffer(); - } - - public void saveSpeedOffer(final SpeedOffer speedOffer) throws DataAccessException { - + @Transactional + public void saveSpeedOffer(final SpeedOffer speedOffer) throws DataAccessException { // this.speedOfferRepository.save(speedOffer); - } } diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index 8f2b50ab5..b2870d93b 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -1,6 +1,7 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; @@ -25,12 +26,12 @@ public class FoodOfferController { private final FoodOfferService foodOfferService; private final ClientService clientService; - public FoodOfferController(final FoodOfferService foodOfferService, final ClientService clientService) { this.foodOfferService = foodOfferService; this.clientService = clientService; } + @GetMapping("/offers/food/new") public String initCreationForm(Map model) { FoodOffer foodOffer = new FoodOffer(); @@ -42,11 +43,10 @@ public class FoodOfferController { public String processCreationForm(@Valid FoodOffer foodOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + } else { Client client = this.clientService.getCurrentClient(); foodOffer.setClient(client); - foodOffer.setType(StatusOffer.hidden); + foodOffer.setStatus(StatusOffer.hidden); this.foodOfferService.saveFoodOffer(foodOffer); return "redirect:/offers/food/" + foodOffer.getId(); } @@ -56,9 +56,9 @@ public class FoodOfferController { public String activateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, ModelMap modelMap) { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); Client client = this.clientService.getCurrentClient(); - if(foodOffer.getClient().equals(client)) { - foodOffer.setType(StatusOffer.active); - foodOffer.setCode("FO-"+foodOfferId); + if (foodOffer.getClient().equals(client)) { + foodOffer.setStatus(StatusOffer.active); + foodOffer.setCode("FO-" + foodOfferId); this.foodOfferService.saveFoodOffer(foodOffer); } else { modelMap.addAttribute("message", "You don't have access to this food offer"); @@ -66,14 +66,63 @@ public class FoodOfferController { return "redirect:/offers/food/"+foodOfferId; } + @GetMapping("/offers/food/{foodOfferId}") public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map model) { - FoodOffer foodOffer=this.foodOfferService.findFoodOfferById(foodOfferId); - + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.put("foodOffer", foodOffer); + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + + return "offers/food/foodOffersShow"; } + + @GetMapping(value = "/offers/food/{foodOfferId}/edit") + public String updateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.addAttribute("foodOffer", foodOffer); + return FoodOfferController.VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/food/{foodOfferId}/edit") + public String updateFoodOffer(@Valid final FoodOffer foodOfferEdit, final BindingResult result, + final ModelMap model) { + + if (result.hasErrors()) { + model.addAttribute("foodOffer", foodOfferEdit); + return FoodOfferController.VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.foodOfferService.saveFoodOffer(foodOfferEdit); + return "redirect:/offers/food/" + foodOfferEdit.getId(); + } + } + + @GetMapping(value = "/offers/food/{foodOfferId}/disable") + public String disableFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.put("foodOffer", foodOffer); + return "foodOffers/foodOffersDisable"; + } + + @PostMapping(value = "/offers/food/{foodOfferId}/disable") + public String disableFoodOfferForm(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + + foodOffer.setStatus(StatusOffer.inactive); + + this.foodOfferService.saveFoodOffer(foodOffer); + + return "redirect:/offers"; + + } } diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index 5649386ba..979f912b3 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -1,22 +1,24 @@ package org.springframework.cheapy.web; +import java.security.Principal; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; -import org.springframework.cheapy.model.Client; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.model.StatusOffer; +import org.springframework.cheapy.model.Client; import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.NuOfferService; import org.springframework.stereotype.Controller; + import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - @Controller public class NuOfferController { @@ -25,13 +27,9 @@ public class NuOfferController { private final NuOfferService nuOfferService; private final ClientService clientService; - - - public NuOfferController(final NuOfferService nuOfferService,ClientService clientService) { + public NuOfferController(final NuOfferService nuOfferService, final ClientService clientService) { this.nuOfferService = nuOfferService; this.clientService = clientService; - - } @@ -46,48 +44,86 @@ public class NuOfferController { public String processCreationForm(@Valid NuOffer nuOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; - } - else { - nuOffer.setType(StatusOffer.hidden); - + } else { + nuOffer.setStatus(StatusOffer.hidden); + Client client = this.clientService.getCurrentClient(); - + nuOffer.setClient(client); - - + this.nuOfferService.saveNuOffer(nuOffer); return "redirect:/offers/nu/"+nuOffer.getId(); } } + @GetMapping(value ="/offers/nu/{nuOfferId}/activate") public String activateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final ModelMap modelMap) { Client client = this.clientService.getCurrentClient(); - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); - if(nuOffer.getClient().equals(client)) { - nuOffer.setType(StatusOffer.active); - nuOffer.setCode("NU-"+nuOfferId); + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + if (nuOffer.getClient().equals(client)) { + nuOffer.setStatus(StatusOffer.active); + nuOffer.setCode("NU-" + nuOfferId); this.nuOfferService.saveNuOffer(nuOffer); - } else { - modelMap.addAttribute("message", "You don't have access to this number offer"); - } - return "redirect:/offers/nu/"+nuOffer.getId(); - + modelMap.addAttribute("message", "You don't have access to this number offer"); + } + return "redirect:/nuOffers/"+ nuOffer.getId(); } - - @GetMapping("/offers/nu/{nuOfferId}") - public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map model) { - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); - + @GetMapping("/offers/nu/{nuOfferId}") + public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map model) { + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); model.put("nuOffer", nuOffer); - + + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); return "offers/nu/nuOffersShow"; } + @GetMapping(value = "/offers/nu/{nuOfferId}/edit") + public String updateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final ModelMap model) { + + + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + model.addAttribute("nuOffer", nuOffer); + return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/nu/{nuOfferId}/edit") + public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, final ModelMap model) { + + if (result.hasErrors()) { + model.addAttribute("nuOffer", nuOfferEdit); + return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.nuOfferService.saveNuOffer(nuOfferEdit); + return "redirect:/offers/nu/" + nuOfferEdit.getId(); + } + } + + @GetMapping(value = "/offers/nu/{nuOfferId}/disable") + public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, + final ModelMap model) { + + + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + model.put("nuOffer", nuOffer); + return "nuOffers/nuOffersDisable"; + } + + @PostMapping(value = "/offers/nu/{nuOfferId}/disable") + public String disableNuOfferForm(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, + final ModelMap model) { + + + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + nuOffer.setStatus(StatusOffer.inactive); + this.nuOfferService.saveNuOffer(nuOffer); + return "redirect:/offers"; + + } - } diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java index ffb11b46f..c7cb3de71 100644 --- a/src/main/java/org/springframework/cheapy/web/OfertaController.java +++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java @@ -1,5 +1,6 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -43,6 +44,9 @@ public class OfertaController { model.put("speedOfferLs", speedOfferLs); model.put("timeOfferLs", timeOfferLs); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/offersList"; } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index f41a85803..2162e8558 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -1,28 +1,13 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.springframework.cheapy.web; - +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; -import org.springframework.cheapy.model.Client; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; +import org.springframework.cheapy.model.Client; import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.SpeedOfferService; import org.springframework.stereotype.Controller; @@ -45,6 +30,7 @@ public class SpeedOfferController { this.clientService = clientService; } + @GetMapping("/offers/speed/new") public String initCreationForm(Map model) { SpeedOffer speedOffer = new SpeedOffer(); @@ -56,35 +42,82 @@ public class SpeedOfferController { public String processCreationForm(@Valid SpeedOffer speedOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + } else { Client client = this.clientService.getCurrentClient(); speedOffer.setClient(client); - speedOffer.setType(StatusOffer.hidden); + speedOffer.setStatus(StatusOffer.hidden); this.speedOfferService.saveSpeedOffer(speedOffer); return "redirect:/offers/speed/" + speedOffer.getId(); } } + @GetMapping(value = "/offers/speed/{speedOfferId}/activate") public String activateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, ModelMap modelMap) { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); Client client = this.clientService.getCurrentClient(); - if(speedOffer.getClient().equals(client)) { - speedOffer.setType(StatusOffer.active); - speedOffer.setCode("SP-"+speedOfferId); + if (speedOffer.getClient().equals(client)) { + speedOffer.setStatus(StatusOffer.active); + speedOffer.setCode("SP-" + speedOfferId); this.speedOfferService.saveSpeedOffer(speedOffer); } else { modelMap.addAttribute("message", "You don't have access to this speed offer"); } return "redirect:/offers/speed/" + speedOffer.getId(); } - - @GetMapping("/offers/speed/{speedOfferId}") + + @GetMapping("/offers/speed/{speedOfferId}") public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map model) { - SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); + + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); return "offers/speed/speedOffersShow"; } + + @GetMapping(value = "/offers/speed/{speedOfferId}/edit") + public String updateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + model.addAttribute("speedOffer", speedOffer); + return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/speed/{speedOfferId}/edit") + public String updateSpeedOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, final ModelMap model) { + + if (result.hasErrors()) { + model.addAttribute("speedOffer", speedOfferEdit); + return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.speedOfferService.saveSpeedOffer(speedOfferEdit); + return "redirect:/offers/speed/" + speedOfferEdit.getId(); + } + + } + + @GetMapping(value = "/offers/speed/{speedOfferId}/disable") + public String disableSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + model.put("speedOffer", speedOffer); + return "speedOffers/speedOffersDisable"; + } + + @PostMapping(value = "/offers/speed/{speedOfferId}/disable") + public String disableSpeedOfferForm(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + + speedOffer.setStatus(StatusOffer.inactive); + + this.speedOfferService.saveSpeedOffer(speedOffer); + + return "redirect:/offers"; + + } } diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index 80980ae54..1429535ad 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -1,5 +1,7 @@ package org.springframework.cheapy.web; + +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; @@ -16,75 +18,119 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - @Controller public class TimeOfferController { - private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "offers/time/createOrUpdateTimeOfferForm"; + private static final String VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM = "offers/time/createOrUpdateTimeOfferForm"; private final TimeOfferService timeOfferService; private final ClientService clientService; - - - public TimeOfferController(final TimeOfferService timeOfferService,ClientService clientService) { + public TimeOfferController(final TimeOfferService timeOfferService, ClientService clientService) { this.timeOfferService = timeOfferService; this.clientService = clientService; - - } @GetMapping("/offers/time/new") public String initCreationForm(Map model) { TimeOffer timeOffer = new TimeOffer(); model.put("timeOffer", timeOffer); - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } @PostMapping("/offers/time/new") public String processCreationForm(@Valid TimeOffer timeOffer, BindingResult result) { if (result.hasErrors()) { - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; - } - else { - timeOffer.setType(StatusOffer.hidden); - + return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + } else { + timeOffer.setStatus(StatusOffer.hidden); + Client client = this.clientService.getCurrentClient(); - + timeOffer.setClient(client); - - + this.timeOfferService.saveTimeOffer(timeOffer); return "redirect:/offers/time/" + timeOffer.getId(); } } + @GetMapping(value ="/offers/time/{timeOfferId}/activate") public String activateTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap modelMap) { Client client = this.clientService.getCurrentClient(); - TimeOffer timeOffer=this.timeOfferService.findTimeOfferById(timeOfferId); - if(timeOffer.getClient().equals(client)) { - timeOffer.setType(StatusOffer.active); - timeOffer.setCode("TI-"+timeOfferId); + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + if (timeOffer.getClient().equals(client)) { + timeOffer.setStatus(StatusOffer.active); + timeOffer.setCode("TI-" + timeOfferId); this.timeOfferService.saveTimeOffer(timeOffer); + } else { - modelMap.addAttribute("message", "You don't have access to this time offer"); - } - return "redirect:/offers/time/" + timeOffer.getId(); - + modelMap.addAttribute("message", "You don't have access to this time offer"); + } + return "redirect:/timeOffers/" + timeOffer.getId(); + } - - @GetMapping("/offers/time/{timeOfferId}") + + @GetMapping("/offers/time/{timeOfferId}") public String processShowForm(@PathVariable("timeOfferId") int timeOfferId, Map model) { - TimeOffer timeOffer=this.timeOfferService.findTimeOfferById(timeOfferId); - + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.put("timeOffer", timeOffer); + + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); return "offers/time/timeOffersShow"; } - + + @GetMapping(value = "/offers/time/{timeOfferId}/edit") + public String updateTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.addAttribute("timeOffer", timeOffer); + return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/time/{timeOfferId}/edit") + public String updateTimeOffer(@Valid final TimeOffer timeOfferEdit, final BindingResult result, final ModelMap model) { + + + if (result.hasErrors()) { + model.addAttribute("timeOffer", timeOfferEdit); + return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.timeOfferService.saveTimeOffer(timeOfferEdit); + return "redirect:/offers/time/" + timeOfferEdit.getId(); + } + + } + + @GetMapping(value = "/offers/time/{timeOfferId}/disable") + public String disableTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.put("timeOffer", timeOffer); + return "timeOffers/timeOffersDisable"; + } + + @PostMapping(value = "/offers/time/{timeOfferId}/disable") + public String disableTimeOfferForm(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + + timeOffer.setStatus(StatusOffer.inactive); + + this.timeOfferService.saveTimeOffer(timeOffer); + + return "redirect:/offers"; + + + } } diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less index 0f326f7ed..2ad446686 100644 --- a/src/main/less/cheapy.less +++ b/src/main/less/cheapy.less @@ -47,10 +47,10 @@ @pagination-active-bg: @spring-brown; @pagination-active-border: @spring-blue; -@table-border-color: @spring-brown; +@table-border-color: rgb(0, 64, 128); -.table > thead > tr > th { - background-color: lighten(@spring-brown, 3%); + .table > thead > tr > th { + background-color: rgb(40, 140, 215); color: @spring-light-grey; } @@ -237,7 +237,131 @@ img.img-responsive{ .btn-home button:hover { - background-color: rgb(0, 64, 128); + background-color: rgb(40, 140, 215); +} + +#foodOfferTable th { + width: 25%; +} + +#nuOfferTable th { + width: 33%; +} + +#speedOfferTable th { + width: 33%; +} + +#timeOfferTable th { + width: 33%; +} + +.btn-detalles button { + background-color: rgb(0, 64, 128); + border: 1px solid rgb(0, 0, 160); + color: white; + padding: 10px 24px; + cursor: pointer; + display: block; + float: right; +} + +.btn-detalles button:not(:last-child) { + border-bottom: none; +} + + +.btn-detalles button:hover { + background-color: rgb(40, 140, 215); +} + +.btn-return{ + display: table; + margin: 0 auto; + width: 100%; +} + +.btn-return button { + background-color: rgb(0, 64, 128); + border: 1px solid rgb(0, 0, 160); + color: white; + padding: 10px 24px; + cursor: pointer; + display: block; + left: 0%; +} + +.btn-return button:not(:last-child) { + border-bottom: none; +} + + +.btn-return button:hover { + background-color: rgb(40, 140, 215); +} + +#foodOfferTable td{ + vertical-align:middle; +} + +#nuOfferTable td{ + vertical-align:middle; +} + +#speedOfferTable td{ + vertical-align:middle; +} + +#timeOfferTable td{ + vertical-align:middle; +} + +#nuOffer-table tr:nth-child(3){ + background-color: rgb(255, 215, 0); +} + +#nuOffer-table tr:nth-child(4){ + background-color: rgb(255, 215, 0); +} + +#nuOffer-table tr:nth-child(5){ + background-color: rgb(192, 192, 192); +} + +#nuOffer-table tr:nth-child(6){ + background-color: rgb(192, 192, 192); +} + +#nuOffer-table tr:nth-child(7){ + background-color: rgb(204, 128, 51); +} + +#nuOffer-table tr:nth-child(8){ + background-color: rgb(204, 128, 51); +} + +#speedOffer-table tr:nth-child(3){ + background-color: rgb(255, 215, 0); +} + +#speedOffer-table tr:nth-child(4){ + background-color: rgb(255, 215, 0); +} + +#speedOffer-table tr:nth-child(5){ + background-color: rgb(192, 192, 192); +} + +#speedOffer-table tr:nth-child(6){ + background-color: rgb(192, 192, 192); +} + +#speedOffer-table tr:nth-child(7){ + background-color: rgb(204, 128, 51); +} + +#speedOffer-table tr:nth-child(8){ + background-color: rgb(204, 128, 51); } .alert-success { diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 6a281a682..baa9d8384 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -12,9 +12,11 @@ INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Wa INSERT INTO users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE ); INSERT INTO authorities VALUES ('admin','admin'); INSERT INTO users (dtype,username,password,enabled) VALUES ('User','manoli','manoli', TRUE ); + INSERT INTO authorities VALUES ('manoli','client'); INSERT INTO users (dtype,username,password,enabled) VALUES ('User','david','david', TRUE ); INSERT INTO authorities VALUES ('david','client'); + INSERT INTO users (dtype,username,password,enabled) VALUES ('User','paco','paco', TRUE ); INSERT INTO authorities VALUES ('paco','usuario'); INSERT INTO users (dtype,username,password,enabled) VALUES ('User','lolo','lolo', TRUE ); @@ -27,11 +29,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 VALUES (1,'manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli'); -INSERT INTO clients 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, 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); -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', null, 'macarrones', '15%', 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', null, 5, '15%', 10, '10%', 15, '5%'); -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', 'jkhlljk', 'active', null, '12:00:00', '13:00:00', '10%'); -INSERT INTO speed_offers(id,start, end, code, type, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES (3,'2021-06-15 12:00:00', '2021-06-16 12:00:00', 'jkhlljk', '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', 'jkhlljk', 'active', null,15,'25%',10,'15%',5,'10%' ); diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties index 173417a10..1947d786c 100644 --- a/src/main/resources/messages/messages.properties +++ b/src/main/resources/messages/messages.properties @@ -1,4 +1,6 @@ -welcome=Welcome +welcome=Welcome to +listOffers=List Offers + required=is required notFound=has not been found duplicate=is already in use diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties index bdf81dae7..81b71314d 100644 --- a/src/main/resources/messages/messages_es.properties +++ b/src/main/resources/messages/messages_es.properties @@ -1,8 +1,34 @@ welcome=Bienvenido a -required=Es requerido +listOffers=Ver Ofertas +foodOffers=Ofertas por plato especifico +foodOffer=Oferta por plato especifico +nuOffers=Ofertas por numero de comensales +nuOffer=Oferta por numero de comensales +speedOffers=Ofertas rapidez comiendo +speedOffer=Oferta por comer veloz +timeOffers=Ofertas por franja horaria +timeOffer=Oferta por franja horaria +food=Plato +foodInOffer=Plato en oferta +cuantity=Cantidad +discount=Descuento +goldGoal=Meta oro +goldDiscount=Descuento oro +silverGoal=Meta plata +silverDiscount=Descuento plata +bronzeGoal=Meta bronce +bronzeDiscount=Descuento bronce +startDate=Fecha inicio +offerBeginning=Inicio de la oferta +endDate=Fecha fin +offerEnding=Fin de la oferta +details=Detalles +offerCode=Codigo de la oferta +return=Volver +required=Es requeridOfertas por franja horariao notFound=No ha sido encontrado duplicate=Ya se encuentra en uso nonNumeric=Sólo debe contener numeros duplicateFormSubmission=No se permite el envío de formularios duplicados typeMismatch.date=Fecha invalida -typeMismatch.birthDate=Fecha invalida +typeMismatch.birthDate=Fecha invalida \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp index 3534ac497..a1fcc6296 100644 --- a/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -5,7 +5,7 @@ -

Algo malo ha pasado...

+

Algo malo ha pasado...

diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp index ff6097fe2..daeeec363 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp @@ -12,18 +12,23 @@
+ + + -
- + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp new file mode 100644 index 000000000..14a7519e0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp @@ -0,0 +1,23 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere eliminar su oferta?

+ + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp index 0b7c8785a..44b10a7f0 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp @@ -1,44 +1,58 @@ <%@ page session="false" trimDirectiveWhitespaces="true" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> + -

Oferta por plato específico

+ +

- + +
+ - - + + - - + + - + - + + - - - - - + +
Inicio de la oferta
Fin de la oferta
Plato en oferta
Descuento
Cantidad
Codigo de la oferta
+ +
+ +
- <%-- - + + - Edit Owner --%> - + Editar oferta + + + + + Desactivar oferta + diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp index e0d2366cd..904bbfffb 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp @@ -12,6 +12,9 @@
+ + + @@ -27,10 +30,10 @@
- + - +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp new file mode 100644 index 000000000..83fa94c10 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp @@ -0,0 +1,27 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere dar de baja su offer?

+ + + + + + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp index 431d2a4d6..f5a351168 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp @@ -3,35 +3,37 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por número de comensales

+

- +
- - + + - - + + - + - + - + - + @@ -39,18 +41,29 @@ - + - +
Inicio de la oferta
Fin de la oferta
Meta oro
Descuento oro
Meta plata
Descuento plata
Descuento bronce
Codigo de la oferta
+ +
+ +
- <%-- - + + - Edit Owner --%> + Editar oferta + + + + + Desactivar oferta diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index d65c50967..30ee72a07 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -4,17 +4,18 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> + -

Ofertas por plato específico

+

- - - + + + @@ -25,16 +26,20 @@ @@ -42,14 +47,14 @@
PlatoFecha inicioFecha fin
- + - + - - - - Enlace + + + +
+ +
-

Ofertas por número de comensales

+

- - + + @@ -59,29 +64,33 @@
Fecha inicioFecha fin
- + - + - - - - Enlace + + + +
+ +
-

Ofertas rapidez comiendo

+

- - + + @@ -91,30 +100,34 @@
Fecha inicioFecha fin
- + - + - Enlace +
+ +
-

Ofertas por franja horaria

+

- - + + @@ -123,16 +136,20 @@ diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp index 0e35b6ed3..3327373db 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp @@ -12,6 +12,9 @@
+ + + @@ -25,8 +28,11 @@
- + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp new file mode 100644 index 000000000..0e2febbf0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp @@ -0,0 +1,27 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere dar de baja su offer?

+ + + + + + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp index 4a85df28b..de2a32a80 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp @@ -3,54 +3,67 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por comer veloz

+

-
Fecha inicioFecha fin
- + - + - + - Enlace +
+ +
+
- - + + - - + + - + - + - + - + - + - + - +
Inicio de la oferta
Fin de la oferta
Meta oro
Descuento oro
Meta plata
Descuento plata
Meta bronce
Descuento bronce
Codigo de la oferta
+ +
+ +
- <%-- - + + - Edit Owner --%> + Editar oferta + + + + + Desactivar oferta diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp index 13aca05e8..cd12ad6fc 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp @@ -12,6 +12,9 @@
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp new file mode 100644 index 000000000..0baaaabcc --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp @@ -0,0 +1,24 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere eliminar su oferta?

+ + + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp index a344a6221..3db0c885a 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp @@ -3,29 +3,49 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por franja horária

+

+ - - + + - - + + - + - + +
Inicio de la oferta
Fin de la oferta
Descuento
Codigo de la oferta
+ + + + Editar oferta + + + + + Desactivar oferta + +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 5d48bc8d5..95c506f42 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -14,8 +14,9 @@
- +
diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index d402d3729..daa63faa2 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -34,12 +34,13 @@ Ver ofertas + @@ -48,7 +49,7 @@