Skip to content

REPORT-909 Fix report renderer paths for editing report designs #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkayiwa merged 1 commit into from
Apr 2, 2025
Merged

REPORT-909 Fix report renderer paths for editing report designs #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...mrs/module/reporting/web/reports/renderers/DelimitedTextReportRendererFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public DelimitedTextReportRendererFormController() { }
/**
* prepares a new form for the a DelimitedReportRenderer
*/
@RequestMapping("/module/reporting/reports/renderers/delimitedTextReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/delimitedTextReportRenderer.form")
public void delimitedTextReportRenderer(ModelMap model,
@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid,
@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
Expand Down Expand Up @@ -95,7 +95,7 @@ else if (successUrl.startsWith(pathToRemove)) {
* @throws IllegalAccessException
* @throws InstantiationException
*/
@RequestMapping("/module/reporting/reports/renderers/saveDelimitedTextReportDesign")
@RequestMapping("/module/reporting/reports/renderers/saveDelimitedTextReportDesign.form")
public String saveDelimitedTextReportDesign(ModelMap model, HttpServletRequest request,
@RequestParam(required=false, value="uuid") String uuid,
@RequestParam(required=true, value="name") String name,
Expand Down
4 changes: 2 additions & 2 deletions ...org/openmrs/module/reporting/web/reports/renderers/ExcelReportRendererFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public ExcelReportRendererFormController() { }
/**
* prepares a new form for the Excel report renderers
*/
@RequestMapping("/module/reporting/reports/renderers/excelReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/excelReportRenderer.form")
public void excelReportRenderer(ModelMap model,
@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid,
@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
Expand Down Expand Up @@ -110,7 +110,7 @@ else if (successUrl.startsWith(pathToRemove)) {
* @throws InstantiationException
*/
@SuppressWarnings("unchecked")
@RequestMapping("/module/reporting/reports/renderers/saveExcelReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/saveExcelReportRenderer.form")
public String saveExcelReportRenderer(ModelMap model, HttpServletRequest request,
@RequestParam(required=false, value="uuid") String uuid,
@RequestParam(required=true, value="name") String name,
Expand Down
4 changes: 2 additions & 2 deletions ...s/module/reporting/web/reports/renderers/NonConfigurableReportRendererFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public NonConfigurableReportRendererFormController() { }
/**
* prepares a new form for the a IndicatorReportRenderer
*/
@RequestMapping("/module/reporting/reports/renderers/nonConfigurableReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/nonConfigurableReportRenderer.form")
public void nonConfigurableReportRenderer(ModelMap model,
@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid,
@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
Expand Down Expand Up @@ -78,7 +78,7 @@ else if (successUrl.startsWith(pathToRemove)) {
/**
* Saves report design
*/
@RequestMapping("/module/reporting/reports/renderers/saveNonConfigurableReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/saveNonConfigurableReportRenderer.form")
public String saveNonConfigurableReportRenderer(ModelMap model, HttpServletRequest request,
@RequestParam(required=false, value="uuid") String uuid,
@RequestParam(required=true, value="name") String name,
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/org/openmrs/module/reporting/web/reports/renderers/TextTemplateFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void initBinder(WebDataBinder binder) {
* prepares a new form for the a TextTemplateRenderer
* @throws UnsupportedEncodingException
*/
@RequestMapping("/module/reporting/reports/renderers/textTemplateReportRenderer")
@RequestMapping("/module/reporting/reports/renderers/textTemplateReportRenderer.form")
public void textTemplateReportRenderer(ModelMap model,
@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid,
@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
Expand Down Expand Up @@ -124,7 +124,7 @@ else if (successUrl.startsWith(pathToRemove)) {
* Saves report design
* @throws UnsupportedEncodingException
*/
@RequestMapping("/module/reporting/reports/renderers/saveTextTemplateReportRendererDesign")
@RequestMapping("/module/reporting/reports/renderers/saveTextTemplateReportRendererDesign.form")
public String saveTextTemplateReportRendererDesign(ModelMap model, HttpServletRequest request,
@RequestParam(required=false, value="uuid") String uuid,
@RequestParam(required=true, value="name") String name,
Expand Down Expand Up @@ -203,7 +203,7 @@ public UserParams userParams ( @RequestParam(required=false, value="userEnteredP
return userParams;
}

@RequestMapping( value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer", method=RequestMethod.GET)
@RequestMapping( value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer.form", method=RequestMethod.GET)
public void initPreviewForm(ModelMap model, HttpServletRequest request,
@RequestParam(required=true, value="reportDefinition") String reportDefinitionUuid,
@RequestParam(required=false, value="uuid") String uuid,
Expand Down Expand Up @@ -257,7 +257,7 @@ public void initPreviewForm(ModelMap model, HttpServletRequest request,
}

@SuppressWarnings("unchecked")
@RequestMapping(value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer", method=RequestMethod.POST)
@RequestMapping(value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer.form", method=RequestMethod.POST)
public void previewScript(ModelMap model, HttpServletRequest request,
@RequestParam(required=true, value="reportDefinition") String reportDefinitionUuid,
@RequestParam(required=true, value="uuid") String uuid,
Expand Down
Loading