Index: src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (revision 32d6a94aff41814498219d5896b69ba0e6d486d3) +++ src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (revision 79f84952634205e193ff09d1633fabe70edf6ce9) @@ -23,5 +23,4 @@ List medicineList = medicineService.findAll(); model.addAttribute("medicineList", medicineList); - return "medicine-interactions"; } @@ -30,10 +29,16 @@ public String searchInteractions(@RequestParam String searchTerm, Model model) { - List medicineList = medicineService.findAll(); model.addAttribute("medicineList", medicineList); + model.addAttribute("searchedMedicine", searchTerm); + try { List interactions = medicineService.interactions(searchTerm); model.addAttribute("interactions", interactions); + + if (interactions.isEmpty()) { + model.addAttribute("hasInfo", true); + model.addAttribute("info", "Нема пронајдени интеракции за " + searchTerm); + } } catch (RuntimeException ex) { @@ -50,8 +55,9 @@ List medicineList = medicineService.findAll(); model.addAttribute("medicineList", medicineList); + try { Optional optMedicine = medicineService.findById(id); if (optMedicine.isEmpty()) { - throw new RuntimeException("Medicine not found"); + throw new RuntimeException("Лекот не е пронајден"); } @@ -63,5 +69,5 @@ if (interactions.isEmpty()) { model.addAttribute("hasInfo", true); - model.addAttribute("info", "No interactions found for " + medicine.getMedicineName()); + model.addAttribute("info", "Нема пронајдени интеракции за " + medicine.getMedicineName()); } @@ -89,5 +95,5 @@ try { if (medicine1Id.equals(medicine2Id)) { - throw new RuntimeException("You cannot select the same medicine twice."); + throw new RuntimeException("Не можете да изберете ист лек двапати."); } @@ -96,5 +102,5 @@ if (med1.isEmpty() || med2.isEmpty()) { - throw new RuntimeException("The selected medicine does not exist."); + throw new RuntimeException("Избраниот лек не постои."); } @@ -102,5 +108,6 @@ model.addAttribute("hasSuccess", true); - model.addAttribute("success", "Interaction successfully added."); + model.addAttribute("success", "Интеракцијата е успешно додадена."); + } catch (RuntimeException ex) { model.addAttribute("hasError", true); Index: src/main/resources/templates/medicine-interactions.html =================================================================== --- src/main/resources/templates/medicine-interactions.html (revision 32d6a94aff41814498219d5896b69ba0e6d486d3) +++ src/main/resources/templates/medicine-interactions.html (revision 79f84952634205e193ff09d1633fabe70edf6ce9) @@ -1,4 +1,4 @@ - + @@ -6,6 +6,6 @@ SynergyMed - Интеракции на лекови - - + +