Skip to content
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

Pass dateTimeFormat, dateFormat and decimalFormat to all Jasper repor… #68

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Pass dateTimeFormat, dateFormat and decimalFormat to all Jasper repor… #68

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
25 changes: 24 additions & 1 deletion src/main/java/org/openlmis/ao/reports/web/JasperTemplateController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import static org.openlmis.ao.reports.web.ReportTypes.STOCK_CARD_SUMMARY_REPORT;
import static org.openlmis.ao.reports.web.ReportTypes.USERS_REPORT;

import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.time.Clock;
import java.util.List;
import java.util.Map;
Expand All @@ -33,6 +35,7 @@
import org.openlmis.ao.utils.AuthenticationHelper;
import org.openlmis.ao.utils.Message;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -70,6 +73,18 @@ public class JasperTemplateController extends BaseController {
@Autowired
private AuthenticationHelper authenticationHelper;

@Value("${dateTimeFormat}")
private String dateTimeFormat;

@Value("${dateFormat}")
private String dateFormat;

@Value("${groupingSeparator}")
private String groupingSeparator;

@Value("${groupingSize}")
private String groupingSize;

/**
* Adding report templates with ".jrxml" format to database.
*
Expand Down Expand Up @@ -184,18 +199,26 @@ public ModelAndView generateReport(HttpServletRequest request,
Map<String, Object> map = jasperTemplateService.mapRequestParametersToTemplate(
request, template
);
String fileName = jasperReportsViewService.getFilename(template, map);

map.put("format", format);
map.put("imagesDirectory", "images/");
map.put("timeZone", clock.getZone().getId());
UserDto currentUser = authenticationHelper.getCurrentUser();
map.put("user", currentUser.printName());
map.put("dateTimeFormat", dateTimeFormat);
map.put("dateFormat", dateFormat);
DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols();
decimalFormatSymbols.setGroupingSeparator(groupingSeparator.charAt(0));
DecimalFormat decimalFormat = new DecimalFormat("", decimalFormatSymbols);
decimalFormat.setGroupingSize(Integer.parseInt(groupingSize));
map.put("decimalFormat", decimalFormat);

map.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);

JasperReportsMultiFormatView jasperView =
jasperReportsViewService.getJasperReportsView(template, request);

String fileName = jasperReportsViewService.getFilename(template, map);
String contentDisposition = "inline; filename=" + fileName + "." + format;

jasperView
Expand Down
Loading