| Line 294... |
Line 294... |
| 294 |
@RequestMapping(value = "/getCategorisedCatalog", method = RequestMethod.GET)
|
294 |
@RequestMapping(value = "/getCategorisedCatalog", method = RequestMethod.GET)
|
| 295 |
public String getCategorisedCatalog(HttpServletRequest request, Model model) throws Exception {
|
295 |
public String getCategorisedCatalog(HttpServletRequest request, Model model) throws Exception {
|
| 296 |
List<String> brands = brandsService.getBrandsToDisplay(3).stream().map(x -> x.getName()).collect(Collectors.toList());
|
296 |
List<String> brands = brandsService.getBrandsToDisplay(3).stream().map(x -> x.getName()).collect(Collectors.toList());
|
| 297 |
model.addAttribute("brands", brands);
|
297 |
model.addAttribute("brands", brands);
|
| 298 |
|
298 |
|
| 299 |
return "catagorised-catalog";
|
299 |
return "categoriesed-catalog";
|
| 300 |
|
300 |
|
| 301 |
}
|
301 |
}
|
| 302 |
|
302 |
|
| 303 |
@RequestMapping(value = "/getCatalogMovementByBrand", method = RequestMethod.GET)
|
303 |
@RequestMapping(value = "/getCatalogMovementByBrand", method = RequestMethod.GET)
|
| 304 |
public String getCatalogMovementByBrand(HttpServletRequest request, Model model, @RequestParam String brand) throws Exception {
|
304 |
public String getCatalogMovementByBrand(HttpServletRequest request, Model model, @RequestParam String brand) throws Exception {
|
| Line 312... |
Line 312... |
| 312 |
model.addAttribute("categorisedCatalogListModels", categorisedCatalogListModels);
|
312 |
model.addAttribute("categorisedCatalogListModels", categorisedCatalogListModels);
|
| 313 |
model.addAttribute("catalogs", catalogs);
|
313 |
model.addAttribute("catalogs", catalogs);
|
| 314 |
model.addAttribute("catalogMovingEnumList", catalogMovingEnumList);
|
314 |
model.addAttribute("catalogMovingEnumList", catalogMovingEnumList);
|
| 315 |
model.addAttribute("brand", brand);
|
315 |
model.addAttribute("brand", brand);
|
| 316 |
|
316 |
|
| 317 |
return "catagorised-catalog-list";
|
317 |
return "categoriesed-catalog-list";
|
| 318 |
|
318 |
|
| 319 |
}
|
319 |
}
|
| 320 |
|
320 |
|
| 321 |
@RequestMapping(value = "/createUpdateCatalogMovement", method = RequestMethod.GET)
|
321 |
@RequestMapping(value = "/createUpdateCatalogMovement", method = RequestMethod.GET)
|
| 322 |
public String createUpdateCatalogMovement(HttpServletRequest request, Model model, @RequestParam int catalogId, @RequestParam CatalogMovingEnum status, @RequestParam LocalDate startDate, @RequestParam String brand) throws Exception {
|
322 |
public String createUpdateCatalogMovement(HttpServletRequest request, Model model, @RequestParam int catalogId, @RequestParam CatalogMovingEnum status, @RequestParam LocalDate startDate, @RequestParam String brand) throws Exception {
|