Skip to content

Commit

Permalink
Refactor code
Browse files Browse the repository at this point in the history
  • Loading branch information
@rokon12
rokon12 committed Oct 18, 2015
1 parent d0f1c3f commit ee53ac3
Show file tree
Hide file tree
Showing 15 changed files with 241 additions and 184 deletions.
23 changes: 11 additions & 12 deletions src/main/java/org/jugbd/mnet/web/controller/ChiefComplaintsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
@RequestMapping("chiefcomplaints")
public class ChiefComplaintsController {

public static final String REDIRECT_REGISTER_CHIEFCOMPLAINTS = "redirect:/register/chiefcomplaints/";
public static final String REDIRECT_REGISTER_CHIEF_COMPLAINTS_PAGE = "redirect:/register/chiefcomplaints/";
public static final String CHIEF_COMPLAINTS_CREATE_SHOW = "chiefcomplaints/create";
public static final String CHIEF_COMPLAINTS_EDIT_PAGE = "chiefcomplaints/edit";

@Autowired
private RegisterService registerService;

Expand All @@ -43,7 +46,7 @@ public String create(@PathVariable Long registerId,
registerService.findRegisterEither(registerId, registrationType)
.map(chiefComplaint::setRegister, chiefComplaint::setOutdoorRegister);

return "chiefcomplaints/create";
return CHIEF_COMPLAINTS_CREATE_SHOW;
}

@RequestMapping(value = "create", method = RequestMethod.POST)
Expand All @@ -54,7 +57,7 @@ public String save(@RequestParam(required = true) RegistrationType registrationT

if (result.hasErrors()) {

return "chiefcomplaints/create";
return CHIEF_COMPLAINTS_CREATE_SHOW;
}

ChiefComplaint savedChiefComplaint = chiefComplaintService.save(chiefComplaint, registrationType);
Expand All @@ -73,7 +76,7 @@ public String edit(@PathVariable Long id,
uiModel.addAttribute("chiefComplaint", chiefComplaint);
uiModel.addAttribute("registrationType", registrationType);

return "chiefcomplaints/edit";
return CHIEF_COMPLAINTS_EDIT_PAGE;
}

@RequestMapping(value = "edit", method = RequestMethod.POST)
Expand All @@ -83,7 +86,7 @@ public String update(@RequestParam RegistrationType registrationType,
RedirectAttributes redirectAttributes) {
if (result.hasErrors()) {

return "chiefcomplaints/edit";
return CHIEF_COMPLAINTS_EDIT_PAGE;
}

ChiefComplaint savedChiefComplaint = chiefComplaintService.save(chiefComplaint, registrationType);
Expand All @@ -95,18 +98,14 @@ public String update(@RequestParam RegistrationType registrationType,
@RequestMapping(value = "back/{registerId}", method = RequestMethod.GET)
public String back(@PathVariable Long registerId, @RequestParam RegistrationType registrationType) {

String redirectUrl = REDIRECT_REGISTER_CHIEFCOMPLAINTS;
String appender = "?registrationType=" + registrationType;

return redirectUrl + registerId + appender;
return REDIRECT_REGISTER_CHIEF_COMPLAINTS_PAGE + registerId + "?registrationType=" + registrationType;
}

private String getRedirectUrl(RegistrationType registrationType, ChiefComplaint chiefComplaint) {
String redirectUrl = REDIRECT_REGISTER_CHIEFCOMPLAINTS;
String appender = "?registrationType=" + registrationType;

return (registrationType == RegistrationType.OUTDOOR)
? (String.format("%s%d%s", redirectUrl, chiefComplaint.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", redirectUrl, chiefComplaint.getRegister().getId(), appender));
? (String.format("%s%d%s", REDIRECT_REGISTER_CHIEF_COMPLAINTS_PAGE, chiefComplaint.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", REDIRECT_REGISTER_CHIEF_COMPLAINTS_PAGE, chiefComplaint.getRegister().getId(), appender));
}
}
36 changes: 17 additions & 19 deletions src/main/java/org/jugbd/mnet/web/controller/ComplicationManagementController.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jugbd.mnet.web.controller;

import org.jugbd.mnet.dao.RegisterDao;
import org.jugbd.mnet.domain.ComplicationManagement;
import org.jugbd.mnet.domain.Register;
import org.jugbd.mnet.service.ComplicationManagementService;
Expand All @@ -25,21 +24,23 @@
@Secured({"ROLE_ADMIN", "ROLE_USER"})
@RequestMapping("complicationmanagement")
public class ComplicationManagementController {

public static final String COMPLICATION_MANAGEMENT_CREATE_PAGE = "complicationmanagement/create";
public static final String COMPLICATION_MANAGEMENT_EDIT_PAGE = "complicationmanagement/edit";
public static final String REDIRECT_REGISTER_COMPLICATION_MANAGEMENT_PAGE = "redirect:/register/complicationmanagement/";

@Autowired
private ComplicationManagementService complicationManagementService;

@Autowired
private RegisterService registerService;

@Autowired
private RegisterDao registerDao;

@RequestMapping(value = "create/{registerId}", method = RequestMethod.GET)
public String create(@PathVariable Long registerId, ComplicationManagement complicationManagement) {
Register register = registerService.findOne(registerId);
complicationManagement.setRegister(register);

return "complicationmanagement/create";
return COMPLICATION_MANAGEMENT_CREATE_PAGE;
}

@RequestMapping(value = "create", method = RequestMethod.POST)
Expand All @@ -48,23 +49,22 @@ public String save(@Valid ComplicationManagement complicationManagement,

if (result.hasErrors()) {

return "complicationmanagement/create";
return COMPLICATION_MANAGEMENT_CREATE_PAGE;
}

ComplicationManagement complicationManagementSaved = complicationManagementService.save(complicationManagement);

redirectAttributes.addFlashAttribute("message", "Complication Management successfully created");
return "redirect:/register/complicationmanagement/" + complicationManagementSaved.getRegister().getId();

return REDIRECT_REGISTER_COMPLICATION_MANAGEMENT_PAGE + complicationManagementSaved.getRegister().getId();
}


@RequestMapping(value = "edit/{id}", method = RequestMethod.GET)
public String edit(@PathVariable Long id, Model uiModel) {
ComplicationManagement complicationManagement = complicationManagementService.findOne(id);

uiModel.addAttribute("complicationManagement", complicationManagement);

return "complicationmanagement/edit";
return COMPLICATION_MANAGEMENT_EDIT_PAGE;
}

@RequestMapping(value = "edit", method = RequestMethod.POST)
Expand All @@ -73,29 +73,27 @@ public String update(@Valid ComplicationManagement complicationManagement,
RedirectAttributes redirectAttributes) {
if (result.hasErrors()) {

return "complicationmanagement/edit";
return COMPLICATION_MANAGEMENT_EDIT_PAGE;
}

ComplicationManagement complicationManagementSaved = complicationManagementService.save(complicationManagement);

redirectAttributes.addFlashAttribute("message", "Complication Management successfully updated");
return "redirect:/register/complicationmanagement/" + complicationManagementSaved.getRegister().getId();

return REDIRECT_REGISTER_COMPLICATION_MANAGEMENT_PAGE + complicationManagementSaved.getRegister().getId();
}

@RequestMapping(value = "delete/{id}", method = RequestMethod.POST)
public String delete(@PathVariable Long id) {
ComplicationManagement one = complicationManagementService.findOne(id);
Long registerId = one.getRegister().getId();

complicationManagementService.delete(one);
ComplicationManagement complicationManagement = complicationManagementService.findOne(id);
complicationManagementService.delete(complicationManagement);

return "redirect:/register/complicationmanagement/" + registerId;
return REDIRECT_REGISTER_COMPLICATION_MANAGEMENT_PAGE + complicationManagement.getRegister().getId();
}

@RequestMapping(value = "cancel/{registerId}", method = RequestMethod.GET)
public String cancel(@PathVariable Long registerId) {

return "redirect:/register/complicationmanagement/" + registerDao.findOne(registerId).getId();
return REDIRECT_REGISTER_COMPLICATION_MANAGEMENT_PAGE + registerId;
}

}
20 changes: 11 additions & 9 deletions src/main/java/org/jugbd/mnet/web/controller/DiagnosisController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
public class DiagnosisController {

private static final Logger log = LoggerFactory.getLogger(DiagnosisController.class);
public static final String REDIRECT_REGISTER_DIAGNOSIS = "redirect:/register/diagnosis/";

public static final String REDIRECT_REGISTER_DIAGNOSIS_PAGE = "redirect:/register/diagnosis/";
public static final String DIAGNOSIS_CREATE_PAGE = "diagnosis/create";
public static final String DIAGNOSIS_EDIT_PAGE = "diagnosis/edit";

@Autowired
private DiagnosisService diagnosisService;
Expand All @@ -46,7 +49,7 @@ public String create(@PathVariable Long registerId,
registerService.findRegisterEither(registerId, registrationType)
.map(diagnosis::setRegister, diagnosis::setOutdoorRegister);

return "diagnosis/create";
return DIAGNOSIS_CREATE_PAGE;
}

@RequestMapping(value = "/create", method = RequestMethod.POST)
Expand All @@ -56,7 +59,7 @@ public String save(@RequestParam RegistrationType registrationType, @Valid Diagn

if (result.hasErrors()) {

return "diagnosis/create";
return DIAGNOSIS_CREATE_PAGE;
}

Diagnosis diagnosisFromDb = diagnosisService.save(diagnosis, registrationType);
Expand All @@ -74,10 +77,9 @@ public String editDiagnosis(@PathVariable("diagnosisId") Long diagnosisId,
uiModel.addAttribute("diagnosis", diagnosis);
uiModel.addAttribute("registrationType", registrationType);

return "diagnosis/edit";
return DIAGNOSIS_EDIT_PAGE;
}


@RequestMapping(value = "/edit", method = RequestMethod.POST)
public String update(@RequestParam RegistrationType registrationType,
@Valid Diagnosis diagnosis,
Expand All @@ -88,7 +90,7 @@ public String update(@RequestParam RegistrationType registrationType,
if (result.hasErrors()) {
uiModel.addAttribute("registrationType", registrationType);

return "diagnosis/create";
return DIAGNOSIS_CREATE_PAGE;
}

Diagnosis diagnosisFromDb = diagnosisService.save(diagnosis, registrationType);
Expand All @@ -100,14 +102,14 @@ public String update(@RequestParam RegistrationType registrationType,
@RequestMapping(value = "/back/{registerId}", method = RequestMethod.GET)
public String back(@PathVariable Long registerId, @RequestParam RegistrationType registrationType) {

return REDIRECT_REGISTER_DIAGNOSIS + registerId + "?registrationType=" + registrationType;
return REDIRECT_REGISTER_DIAGNOSIS_PAGE + registerId + "?registrationType=" + registrationType;
}

private String getRedirectUrl(RegistrationType registrationType, Diagnosis diagnosis) {
String appender = "?registrationType=" + registrationType;

return (registrationType == RegistrationType.OUTDOOR)
? (String.format("%s%d%s", REDIRECT_REGISTER_DIAGNOSIS, diagnosis.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", REDIRECT_REGISTER_DIAGNOSIS, diagnosis.getRegister().getId(), appender));
? (String.format("%s%d%s", REDIRECT_REGISTER_DIAGNOSIS_PAGE, diagnosis.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", REDIRECT_REGISTER_DIAGNOSIS_PAGE, diagnosis.getRegister().getId(), appender));
}
}
19 changes: 11 additions & 8 deletions src/main/java/org/jugbd/mnet/web/controller/ExaminationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
@RequestMapping("examination")
public class ExaminationController {

public static final String EXAMINATION_CREATE_PAGE = "examination/create";
public static final String EXAMINATION_EDIT_PAGE = "examination/edit";
public static final String REDIRECT_REGISTER_EXAMINATION_PAGE = "redirect:/register/examination/";

@Autowired
private ExaminationService examinationService;

Expand All @@ -42,7 +46,7 @@ public String create(@PathVariable Long registerId,
registerService.findRegisterEither(registerId, registrationType)
.map(examination::setRegister, examination::setOutdoorRegister);

return "examination/create";
return EXAMINATION_CREATE_PAGE;
}

@RequestMapping(value = "create", method = RequestMethod.POST)
Expand All @@ -53,7 +57,7 @@ public String save(@RequestParam RegistrationType registrationType,

if (result.hasErrors()) {

return "examination/create";
return EXAMINATION_CREATE_PAGE;
}

Examination examinationFromDb = examinationService.save(examination, registrationType);
Expand All @@ -71,7 +75,7 @@ public String edit(@PathVariable Long id,
uiModel.addAttribute("examination", examination);
uiModel.addAttribute("registrationType", registrationType);

return "examination/edit";
return EXAMINATION_EDIT_PAGE;
}

@RequestMapping(value = "edit", method = RequestMethod.POST)
Expand All @@ -82,7 +86,7 @@ public String update(@RequestParam RegistrationType registrationType,

if (result.hasErrors()) {

return "examination/edit";
return EXAMINATION_EDIT_PAGE;
}

Examination examinationFromDb = examinationService.save(examination, registrationType);
Expand All @@ -94,15 +98,14 @@ public String update(@RequestParam RegistrationType registrationType,
@RequestMapping(value = "cancel/{registerId}", method = RequestMethod.GET)
public String cancel(@PathVariable Long registerId, @RequestParam RegistrationType registrationType) {

return "redirect:/register/examination/" + registerService.findOne(registerId).getId() + "?registrationType=" + registrationType;
return REDIRECT_REGISTER_EXAMINATION_PAGE + registerService.findOne(registerId).getId() + "?registrationType=" + registrationType;
}

private String getRedirectUrl(RegistrationType registrationType, Examination examination) {
String redirectUrl = "redirect:/register/examination/";
String appender = "?registrationType=" + registrationType;

return (registrationType == RegistrationType.OUTDOOR)
? (String.format("%s%d%s", redirectUrl, examination.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", redirectUrl, examination.getRegister().getId(), appender));
? (String.format("%s%d%s", REDIRECT_REGISTER_EXAMINATION_PAGE, examination.getOutdoorRegister().getId(), appender))
: (String.format("%s%d%s", REDIRECT_REGISTER_EXAMINATION_PAGE, examination.getRegister().getId(), appender));
}
}
Loading

0 comments on commit ee53ac3

Please sign in to comment.