diff --git a/src/main/java/org/openelisglobal/analysis/daoimpl/AnalysisDAOImpl.java b/src/main/java/org/openelisglobal/analysis/daoimpl/AnalysisDAOImpl.java index c015265401..f59a796ec2 100644 --- a/src/main/java/org/openelisglobal/analysis/daoimpl/AnalysisDAOImpl.java +++ b/src/main/java/org/openelisglobal/analysis/daoimpl/AnalysisDAOImpl.java @@ -35,8 +35,8 @@ import org.openelisglobal.common.log.LogEvent; import org.openelisglobal.common.services.IStatusService; import org.openelisglobal.common.services.StatusService.AnalysisStatus; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.result.valueholder.Result; import org.openelisglobal.sample.valueholder.OrderPriority; import org.openelisglobal.sample.valueholder.Sample; @@ -444,11 +444,14 @@ public List getAnalysesByPriorityAndStatusId(OrderPriority priority, L public List getAnalysesReadyToBeReported() throws LIMSRuntimeException { try { List analysisStatusesToInclude = new ArrayList<>(); - analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusReleased()); + analysisStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.released")); List sampleStatusesToInclude = new ArrayList<>(); - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusEntry2Complete()); - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusReleased()); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.entry.2.complete")); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.released")); String sql = "select distinct anal.id\n" + " from\n" + " sample samp,\n" + " test_analyte ta,\n" + " analysis anal,\n" @@ -497,7 +500,7 @@ public List getAllChildAnalysesByResult(Result result) throws LIMSRunt Query query = entityManager.unwrap(Session.class).createQuery(sql, Analysis.class); query.setParameter("param", result.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param2", statusesToExclude); return query.list(); } catch (RuntimeException e) { @@ -518,7 +521,7 @@ public List getMaxRevisionAnalysesBySample(SampleItem sampleItem) thro Query query = entityManager.unwrap(Session.class).createQuery(sql, Analysis.class); query.setParameter("param", sampleItem.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param2", statusesToExclude); return query.list(); } catch (RuntimeException e) { @@ -561,7 +564,7 @@ public List getRevisionHistoryOfAnalysesBySample(SampleItem sampleItem Query query = entityManager.unwrap(Session.class).createQuery(sql, Analysis.class); query.setParameter("param", sampleItem.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param2", statusesToExclude); return query.list(); } catch (RuntimeException e) { @@ -591,7 +594,7 @@ public List getRevisionHistoryOfAnalysesBySampleAndTest(SampleItem sam query.setParameter("param", sampleItem.getId()); query.setParameter("param2", test.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param3", statusesToExclude); return query.list(); } catch (RuntimeException e) { @@ -613,7 +616,7 @@ public List getAllMaxRevisionAnalysesPerTest(Test test) throws LIMSRun query.setParameter("param", test.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param2", statusesToExclude); return query.list(); @@ -629,11 +632,14 @@ public List getAllMaxRevisionAnalysesPerTest(Test test) throws LIMSRun public List getMaxRevisionAnalysesReadyToBeReported() throws LIMSRuntimeException { try { List analysisStatusesToInclude = new ArrayList<>(); - analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusReleased()); + analysisStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.released")); List sampleStatusesToInclude = new ArrayList<>(); - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusEntry2Complete()); - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusReleased()); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.entry.2.complete")); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.released")); String sql = "select distinct anal.id\n" + " from\n" + " sample samp,\n" + " test_analyte ta,\n" + " analysis anal,\n" @@ -689,12 +695,15 @@ public List getMaxRevisionAnalysesReadyForReportPreviewBySample(List sampleStatusesToInclude = new ArrayList<>(); - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusEntry2Complete()); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.entry.2.complete")); // see question in 1900 - should this be included? Yes - sampleStatusesToInclude.add(SystemConfiguration.getInstance().getSampleStatusReleased()); + sampleStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("sample.status.released")); if (accessionNumbers != null && accessionNumbers.size() > 0) { String sql = "select distinct anal.id\n" + " from\n" + " sample samp,\n" @@ -779,10 +788,12 @@ public List getMaxRevisionPendingAnalysesReadyToBeReportedBySample(Sam throws LIMSRuntimeException { try { List analysisStatusesToInclude = new ArrayList<>(); - analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusAssigned()); + analysisStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.assigned")); // bugzilla 2264 per Nancy add results completed status to pending // tests - analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusResultCompleted()); + analysisStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.result.completed")); String sql = "select\n" + " distinct anal.id\n" + " from\n" + " sample_item sampitem,\n" + " sample samp,\n" + " analysis anal,\n" + " test test\n" + "\n" + " where\n" @@ -830,10 +841,11 @@ public List getMaxRevisionPendingAnalysesReadyForReportPreviewBySample try { List analysisStatusesToInclude = new ArrayList<>(); - analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusAssigned()); + analysisStatusesToInclude + .add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.assigned")); // see question in 1900 do we need to include this? // Answer NO - // analysisStatusesToInclude.add(SystemConfiguration.getInstance().getAnalysisStatusResultCompleted()); + // analysisStatusesToInclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.result.completed")); list = entityManager.unwrap(Session.class) .getNamedQuery("analysis.getMaxRevisionPendingAnalysesReadyToBeReportedBySample") @@ -876,7 +888,7 @@ public Analysis getPreviousAnalysisForAmendedAnalysis(Analysis analysis) throws query.setParameter("param3", analysis.getTest()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param4", statusesToExclude); List list = query.list(); if ((list != null) && !list.isEmpty()) { @@ -906,7 +918,7 @@ public void getMaxRevisionAnalysisBySampleAndTest(Analysis analysis) throws LIMS query.setParameter("param", analysis.getSampleItem().getId()); query.setParameter("param2", analysis.getTest().getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param3", statusesToExclude); anal = query.uniqueResult(); @@ -939,7 +951,7 @@ public List getMaxRevisionParentTestAnalysesBySample(SampleItem sample Query query = entityManager.unwrap(Session.class).createQuery(sql, Analysis.class); query.setParameter("param", sampleItem.getId()); List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param2", statusesToExclude); list = query.list(); } catch (RuntimeException e) { diff --git a/src/main/java/org/openelisglobal/analysis/valueholder/Analysis.java b/src/main/java/org/openelisglobal/analysis/valueholder/Analysis.java index 809f7f07a8..722c70a05b 100644 --- a/src/main/java/org/openelisglobal/analysis/valueholder/Analysis.java +++ b/src/main/java/org/openelisglobal/analysis/valueholder/Analysis.java @@ -21,8 +21,9 @@ import java.util.UUID; import org.apache.commons.validator.GenericValidator; import org.openelisglobal.analysis.service.AnalysisServiceImpl; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -166,7 +167,7 @@ public String getCompletedDateForDisplay() { public void setCompletedDateForDisplay(String completedDateForDisplay) { this.completedDateForDisplay = completedDateForDisplay; - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); completedDate = DateUtil.convertStringDateToSqlDate(this.completedDateForDisplay, locale); } @@ -194,7 +195,7 @@ public String getStartedDateForDisplay() { public void setStartedDateForDisplay(String startedDateForDisplay) { this.startedDateForDisplay = startedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); startedDate = DateUtil.convertStringDateToSqlDate(this.startedDateForDisplay, locale); } @@ -230,7 +231,7 @@ public String getPrintedDateForDisplay() { public void setPrintedDateForDisplay(String printedDateForDisplay) { this.printedDateForDisplay = printedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); printedDate = DateUtil.convertStringDateToSqlDate(this.printedDateForDisplay, locale); } @@ -250,7 +251,7 @@ public String getReleasedDateForDisplay() { public void setReleasedDateForDisplay(String releasedDateForDisplay) { this.releasedDateForDisplay = releasedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); releasedDate = DateUtil.convertStringDateToSqlDate(this.releasedDateForDisplay, locale); } @@ -278,7 +279,7 @@ public String getSoNotifyReceivedDateForDisplay() { public void setSoNotifyReceivedDateForDisplay(String soNotifyReceivedDateForDisplay) { this.soNotifyReceivedDateForDisplay = soNotifyReceivedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); soNotifyReceivedDate = DateUtil.convertStringDateToSqlDate(this.soNotifyReceivedDateForDisplay, locale); } @@ -298,7 +299,7 @@ public String getSoNotifySendDateForDisplay() { public void setSoNotifySendDateForDisplay(String soNotifySendDateForDisplay) { this.soNotifySendDateForDisplay = soNotifySendDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); soNotifySendDate = DateUtil.convertStringDateToSqlDate(this.soNotifySendDateForDisplay, locale); } @@ -318,7 +319,7 @@ public String getSoSendDateForDisplay() { public void setSoSendDateForDisplay(String soSendDateForDisplay) { this.soSendDateForDisplay = soSendDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); soSendDate = DateUtil.convertStringDateToSqlDate(this.soSendDateForDisplay, locale); } @@ -346,7 +347,7 @@ public String getSoSendEntryDateForDisplay() { public void setSoSendEntryDateForDisplay(String soSendEntryDateForDisplay) { this.soSendEntryDateForDisplay = soSendEntryDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); soSendEntryDate = DateUtil.convertStringDateToSqlDate(this.soSendEntryDateForDisplay, locale); } @@ -366,7 +367,7 @@ public String getSoSendReadyDateForDisplay() { public void setSoSendReadyDateForDisplay(String soSendReadyDateForDisplay) { this.soSendReadyDateForDisplay = soSendReadyDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); soSendReadyDate = DateUtil.convertStringDateToSqlDate(this.soSendReadyDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/analysisqaevent/valueholder/AnalysisQaEvent.java b/src/main/java/org/openelisglobal/analysisqaevent/valueholder/AnalysisQaEvent.java index 468785c914..48f0d99c91 100644 --- a/src/main/java/org/openelisglobal/analysisqaevent/valueholder/AnalysisQaEvent.java +++ b/src/main/java/org/openelisglobal/analysisqaevent/valueholder/AnalysisQaEvent.java @@ -15,8 +15,9 @@ import java.sql.Date; import org.openelisglobal.analysis.valueholder.Analysis; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -120,7 +121,7 @@ public String getCompletedDateForDisplay() { public void setCompletedDateForDisplay(String completedDateForDisplay) { this.completedDateForDisplay = completedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.completedDate = DateUtil.convertStringDateToSqlDate(completedDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/analysisqaeventaction/valueholder/AnalysisQaEventAction.java b/src/main/java/org/openelisglobal/analysisqaeventaction/valueholder/AnalysisQaEventAction.java index 9a81b36f47..00079d2c8b 100644 --- a/src/main/java/org/openelisglobal/analysisqaeventaction/valueholder/AnalysisQaEventAction.java +++ b/src/main/java/org/openelisglobal/analysisqaeventaction/valueholder/AnalysisQaEventAction.java @@ -16,8 +16,9 @@ import java.sql.Date; import org.openelisglobal.action.valueholder.Action; import org.openelisglobal.analysisqaevent.valueholder.AnalysisQaEvent; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -124,7 +125,7 @@ public String getCreatedDateForDisplay() { public void setCreatedDateForDisplay(String createdDateForDisplay) { this.createdDateForDisplay = createdDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.createdDate = DateUtil.convertStringDateToSqlDate(createdDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/common/controller/BaseController.java b/src/main/java/org/openelisglobal/common/controller/BaseController.java index 91561a35f2..ed318de169 100644 --- a/src/main/java/org/openelisglobal/common/controller/BaseController.java +++ b/src/main/java/org/openelisglobal/common/controller/BaseController.java @@ -12,8 +12,8 @@ import org.openelisglobal.common.constants.Constants; import org.openelisglobal.common.form.BaseForm; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.internationalization.MessageUtil; import org.openelisglobal.login.dao.UserModuleService; import org.openelisglobal.login.valueholder.UserSessionData; @@ -204,7 +204,7 @@ protected void setSuccessFlag(HttpServletRequest request) { protected boolean userHasPermissionForModule(HttpServletRequest request, String module) { if (!userModuleService.isUserAdmin(request) - && SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + && ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { @SuppressWarnings("rawtypes") HashSet accessMap = (HashSet) request.getSession().getAttribute(IActionConstants.PERMITTED_ACTIONS_MAP); return accessMap.contains(module); diff --git a/src/main/java/org/openelisglobal/common/controller/BaseMenuController.java b/src/main/java/org/openelisglobal/common/controller/BaseMenuController.java index 0282f2ab6e..39129c2be3 100644 --- a/src/main/java/org/openelisglobal/common/controller/BaseMenuController.java +++ b/src/main/java/org/openelisglobal/common/controller/BaseMenuController.java @@ -7,8 +7,8 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.menu.service.AdminMenuItemService; import org.openelisglobal.spring.util.SpringContext; @@ -21,7 +21,7 @@ public abstract class BaseMenuController extends BaseController { protected static final int NONE = -1; protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } protected String performMenuAction(AdminOptionMenuForm form, HttpServletRequest request) diff --git a/src/main/java/org/openelisglobal/common/daoimpl/BaseDAOImpl.java b/src/main/java/org/openelisglobal/common/daoimpl/BaseDAOImpl.java index 08523eb8d6..df01459075 100644 --- a/src/main/java/org/openelisglobal/common/daoimpl/BaseDAOImpl.java +++ b/src/main/java/org/openelisglobal/common/daoimpl/BaseDAOImpl.java @@ -40,9 +40,10 @@ import org.openelisglobal.common.dao.BaseDAO; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.valueholder.BaseObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -51,6 +52,7 @@ * @param */ @Component +@DependsOn({ "defaultConfigurationProperties", "springContext" }) @Transactional public abstract class BaseDAOImpl, PK extends Serializable> implements BaseDAO, IActionConstants { @@ -59,8 +61,6 @@ private enum DBComparison { EQ, LIKE, IN } - protected static final int DEFAULT_PAGE_SIZE = SystemConfiguration.getInstance().getDefaultPageSize(); - private final Class classType; @PersistenceContext @@ -399,7 +399,9 @@ public List getMatchingOrderedPage(Map propertyValues, List typedQuery = entityManager.createQuery(criteriaQuery); typedQuery.setFirstResult(startingRecNo - 1); - typedQuery.setMaxResults(DEFAULT_PAGE_SIZE + 1); + typedQuery.setMaxResults( + Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); return typedQuery.getResultList(); // Map aliases = new HashMap<>(); @@ -412,7 +414,8 @@ public List getMatchingOrderedPage(Map propertyValues, List getLikeOrderedPage(Map propertyValues, List typedQuery = entityManager.createQuery(criteriaQuery); typedQuery.setFirstResult(startingRecNo - 1); - typedQuery.setMaxResults(DEFAULT_PAGE_SIZE + 1); + typedQuery.setMaxResults( + Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); return typedQuery.getResultList(); // Map aliases = new HashMap<>(); @@ -492,7 +497,8 @@ public List getLikeOrderedPage(Map propertyValues, ListSoftware distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF - * ANY KIND, either express or implied. See the License for the specific language governing rights - * and limitations under the License. - * - *

The Original Code is OpenELIS code. - * - *

Copyright (C) The Minnesota Department of Health. All Rights Reserved. - */ -package org.openelisglobal.common.provider.reports; - -import java.io.IOException; -import java.util.Map; -import javax.print.Doc; -import javax.print.DocFlavor; -import javax.print.DocPrintJob; -import javax.print.PrintException; -import javax.print.PrintService; -import javax.print.PrintServiceLookup; -import javax.print.SimpleDoc; -import javax.print.attribute.HashPrintRequestAttributeSet; -import javax.print.attribute.PrintRequestAttributeSet; -import javax.print.attribute.standard.Copies; -import javax.print.attribute.standard.PrinterName; -import javax.print.event.PrintJobEvent; -import javax.print.event.PrintJobListener; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.openelisglobal.common.exception.LIMSInvalidPrinterException; -import org.openelisglobal.common.exception.LIMSPrintException; -import org.openelisglobal.common.exception.LIMSRuntimeException; -import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; - -/** - * @author benzd1 modified for bugzilla 2380 - */ -public class SampleLabelPrintProvider extends BasePrintProvider { - - /* - * (non-Javadoc) - * - * @see - * org.openelisglobal.common.provider.reports.BaseReportsProvider#processRequest - * (java.util.Map, javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) bugzilla 2380: this method now throws - * exceptions instead of returning boolean successful - */ - @Override - public void processRequest(Map parameters, HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException, PrintException, LIMSPrintException, LIMSInvalidPrinterException { - - try { - - PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null); - String printer = null; - PrinterName printerName = null; - - PrintService ps = null; - - // bugzilla 2380 - String validPrintersMessage = ""; - for (int i = 0; i < services.length; i++) { - printer = services[i].getName(); - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "This is - // one of - // the printers " + printer); - // bugzilla 2380 this is for error message to list valid printers in ActionError - if (i == 0) { - validPrintersMessage = "\\n"; - } - validPrintersMessage += "\\n " + printer; - - // bugzilla 2380: name must match - not start with - if (printer.equalsIgnoreCase(SystemConfiguration.getInstance().getLabelPrinterName())) { - printerName = new PrinterName(printer, null); - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "This is - // the - // printer I will use " - // + printerName); - ps = services[i]; - // bugzilla 2380: load all valid printer names for error message - // break; - } - } - - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "Printer - // is - // found " + printer); - if (printerName == null) { - throw new LIMSInvalidPrinterException(validPrintersMessage); - } - - String numberOfLabelCopiesString = null; - int numberOfLabelCopies = 1; - try { - numberOfLabelCopiesString = SystemConfiguration.getInstance() - .getLabelNumberOfCopies("print.label.numberofcopies"); - numberOfLabelCopies = Integer.parseInt(numberOfLabelCopiesString); - } catch (NumberFormatException e) { - // bugzilla 2154 - LogEvent.logError(e); - } - - String accessionNumber = (String) parameters.get("Accession_Number"); - - if (ps == null) { - throw new LIMSPrintException("no print service"); - } - - DocPrintJob job = ps.createPrintJob(); - - PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(); - aset.add(new Copies(numberOfLabelCopies)); - - String label = SystemConfiguration.getInstance().getDefaultSampleLabel(accessionNumber); - - byte[] byt = label.getBytes(); - DocFlavor flavor = DocFlavor.BYTE_ARRAY.AUTOSENSE; - - Doc doc = new SimpleDoc(byt, flavor, null); - - job.addPrintJobListener(new MyPrintJobListener()); - - job.print(doc, aset); - - } catch (RuntimeException e) { - LogEvent.logError(e); - throw new LIMSRuntimeException("Error in SampleLabelPrintProvider processRequest()", e); - } - } - - class MyPrintJobListener implements PrintJobListener { - @Override - public void printDataTransferCompleted(PrintJobEvent pje) { - // System.out - // .println("The print data has been transferred to the print service"); - } - - @Override - public void printJobCanceled(PrintJobEvent pje) { - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "The print - // job - // was cancelled"); - } - - @Override - public void printJobCompleted(PrintJobEvent pje) { - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "The print - // job - // was completed"); - } - - @Override - public void printJobFailed(PrintJobEvent pje) { - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "The print - // job - // has failed"); - } - - @Override - public void printJobNoMoreEvents(PrintJobEvent pje) { - // System.out - // .println("No more events will be delivered from this print service for this - // print job."); - // No more events will be delivered from this - // print service for this print job. - // This event is fired in cases where the print service - // is not able to determine when the job completes. - } - - @Override - public void printJobRequiresAttention(PrintJobEvent pje) { - // System.out - // .println("The print service requires some attention to repair some problem. - // E.g. running out of paper would"); - // The print service requires some attention to repair - // some problem. E.g. running out of paper would - // cause this event to be fired. - } - } -} diff --git a/src/main/java/org/openelisglobal/common/provider/selectdropdown/TestAnalyteTestResultSelectDropDownProvider.java b/src/main/java/org/openelisglobal/common/provider/selectdropdown/TestAnalyteTestResultSelectDropDownProvider.java index b9a8bfbcc9..c29147feca 100644 --- a/src/main/java/org/openelisglobal/common/provider/selectdropdown/TestAnalyteTestResultSelectDropDownProvider.java +++ b/src/main/java/org/openelisglobal/common/provider/selectdropdown/TestAnalyteTestResultSelectDropDownProvider.java @@ -20,8 +20,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dictionary.service.DictionaryService; import org.openelisglobal.dictionary.valueholder.Dictionary; import org.openelisglobal.spring.util.SpringContext; @@ -95,7 +95,8 @@ public List processRequest(HttpServletRequest request, HttpServletResponse respo for (int i = 0; i < listOfTestResults.size(); i++) { TestResult tr = new TestResult(); tr = (TestResult) listOfTestResults.get(i); - if (tr.getTestResultType().equals(SystemConfiguration.getInstance().getDictionaryType())) { + if (tr.getTestResultType() + .equals(ConfigurationProperties.getInstance().getPropertyValue("dictionaryType"))) { // get from dictionary Dictionary dictionary = new Dictionary(); dictionary.setId(tr.getValue()); diff --git a/src/main/java/org/openelisglobal/common/provider/validation/AccessionNumberValidationProvider.java b/src/main/java/org/openelisglobal/common/provider/validation/AccessionNumberValidationProvider.java index 47cde74430..b64a377075 100644 --- a/src/main/java/org/openelisglobal/common/provider/validation/AccessionNumberValidationProvider.java +++ b/src/main/java/org/openelisglobal/common/provider/validation/AccessionNumberValidationProvider.java @@ -20,8 +20,8 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; import org.openelisglobal.common.servlet.validation.AjaxServlet; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.sample.service.SampleService; import org.openelisglobal.sample.valueholder.Sample; import org.openelisglobal.spring.util.SpringContext; @@ -75,8 +75,8 @@ public String validate(String targetId, String form) throws LIMSRuntimeException if (form.equalsIgnoreCase("humanSampleOneForm")) { // bugzilla 1581 handle null status if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusQuickEntryComplete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.quick.entry.complete"))) { retVal = INVALID; } } else { @@ -85,8 +85,8 @@ public String validate(String targetId, String form) throws LIMSRuntimeException } else if (form.equalsIgnoreCase("humanSampleTwoForm")) { // bugzilla 1581 handle null status if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusEntry1Complete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.1.complete"))) { retVal = INVALID; } } else { @@ -97,9 +97,10 @@ public String validate(String targetId, String form) throws LIMSRuntimeException } else if (form.equalsIgnoreCase("influenzaSampleXMLBySampleForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusEntry2Complete()) - && !sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusReleased())) { + .equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.2.complete")) + && !sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.released"))) { retVal = INVALIDSTATUS; } @@ -108,8 +109,8 @@ public String validate(String targetId, String form) throws LIMSRuntimeException } } else if (form.equalsIgnoreCase("testManagementForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusLabelPrinted())) { + if (sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.label.printed"))) { retVal = INVALIDSTATUS; } } else { @@ -119,8 +120,8 @@ public String validate(String targetId, String form) throws LIMSRuntimeException // bugzilla 2513 } else if (form.equalsIgnoreCase("resultsEntryForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusLabelPrinted())) { + if (sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.label.printed"))) { retVal = INVALIDSTATUS; } @@ -134,17 +135,19 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // for human (clinical) we require demographics to be available at time of // results verification if (sample.getDomain() != null - && sample.getDomain().equals(SystemConfiguration.getInstance().getHumanDomain()) - && !sample.getStatus().equals( - SystemConfiguration.getInstance().getSampleStatusEntry2Complete())) { + && sample.getDomain().equals( + ConfigurationProperties.getInstance().getPropertyValue("domain.human")) + && !sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.2.complete"))) { retVal = INVALIDSTATUS; } // for newborn (and possibly other domains) allow verification of sample results // even after quick entry if (sample.getDomain() != null - && !sample.getDomain().equals(SystemConfiguration.getInstance().getHumanDomain()) - && sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusLabelPrinted())) { + && !sample.getDomain().equals( + ConfigurationProperties.getInstance().getPropertyValue("domain.human")) + && sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.label.printed"))) { retVal = INVALIDSTATUS; } } else { @@ -153,15 +156,15 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // bugzilla 2028 } else if (form.equalsIgnoreCase("qaEventsEntryForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusLabelPrinted())) { + if (sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.label.printed"))) { retVal = INVALIDSTATUS; // bugzilla 2029 } } else if (form.equalsIgnoreCase("batchQaEventsEntryForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusLabelPrinted())) { + if (sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.label.printed"))) { retVal = INVALIDSTATUS; } } @@ -171,8 +174,8 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // bugzilla 2529 } else if (form.equalsIgnoreCase("newbornSampleOneForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusQuickEntryComplete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.quick.entry.complete"))) { retVal = INVALIDSTATUS; } } else { @@ -181,8 +184,8 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // bugzilla 2530 } else if (form.equalsIgnoreCase("newbornSampleTwoForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusEntry1Complete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.1.complete"))) { retVal = INVALIDSTATUS; } } else { @@ -191,8 +194,8 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // bugzilla 2531 } else if (form.equalsIgnoreCase("newbornSampleFullForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusEntry2Complete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.2.complete"))) { retVal = INVALIDSTATUS; } } else { @@ -201,8 +204,8 @@ else if (form.equalsIgnoreCase("batchResultsVerificationForm")) { // bugzilla 2564 } else if (form.equalsIgnoreCase("testManagementNewbornForm")) { if (!StringUtil.isNullorNill(sample.getStatus())) { - if (!sample.getStatus() - .equals(SystemConfiguration.getInstance().getSampleStatusEntry2Complete())) { + if (!sample.getStatus().equals(ConfigurationProperties.getInstance() + .getPropertyValue("sample.status.entry.2.complete"))) { retVal = INVALIDSTATUS; } } else { diff --git a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java index aaff844b63..367ba026cb 100644 --- a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java +++ b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java @@ -27,7 +27,6 @@ import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.IdValuePair; import org.openelisglobal.common.util.LabelValuePair; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dictionary.service.DictionaryService; import org.openelisglobal.dictionary.valueholder.Dictionary; import org.openelisglobal.localization.service.LocalizationService; @@ -344,7 +343,8 @@ private Map getConfigurationProperties() { ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE)); configs.put(Property.UseExternalPatientInfo.toString(), ConfigurationProperties.getInstance().getPropertyValue(Property.UseExternalPatientInfo)); - configs.put("DEFAULT_PAGE_SIZE", String.valueOf(SystemConfiguration.getInstance().getDefaultPageSize())); + configs.put("DEFAULT_PAGE_SIZE", + ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); return configs; } diff --git a/src/main/java/org/openelisglobal/common/services/DisplayListService.java b/src/main/java/org/openelisglobal/common/services/DisplayListService.java index e07e7704ad..d1649f99a7 100644 --- a/src/main/java/org/openelisglobal/common/services/DisplayListService.java +++ b/src/main/java/org/openelisglobal/common/services/DisplayListService.java @@ -27,11 +27,11 @@ import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.IdValuePair; import org.openelisglobal.common.util.LocaleChangeListener; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dictionary.service.DictionaryService; import org.openelisglobal.dictionary.valueholder.Dictionary; import org.openelisglobal.gender.service.GenderService; import org.openelisglobal.gender.valueholder.Gender; +import org.openelisglobal.internationalization.GlobalLocaleResolver; import org.openelisglobal.internationalization.MessageUtil; import org.openelisglobal.method.service.MethodService; import org.openelisglobal.method.valueholder.Method; @@ -73,6 +73,7 @@ import org.openelisglobal.unitofmeasure.valueholder.UnitOfMeasure; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.LocaleResolver; @Service public class DisplayListService implements LocaleChangeListener { @@ -134,14 +135,18 @@ public enum ListType { private ProviderService providerService; @Autowired private ProgramService programService; + @Autowired + private LocaleResolver localeResolver; @PostConstruct private void setupGlobalVariables() { instance = this; refreshLists(); + if (localeResolver instanceof GlobalLocaleResolver) { + ((GlobalLocaleResolver) localeResolver).addLocalChangeListener(this); + } - SystemConfiguration.getInstance().addLocalChangeListener(this); } public static DisplayListService getInstance() { diff --git a/src/main/java/org/openelisglobal/common/services/LabIdentificationService.java b/src/main/java/org/openelisglobal/common/services/LabIdentificationService.java index e366277744..adb2c560ef 100644 --- a/src/main/java/org/openelisglobal/common/services/LabIdentificationService.java +++ b/src/main/java/org/openelisglobal/common/services/LabIdentificationService.java @@ -16,7 +16,6 @@ import java.util.Locale; import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.ConfigurationProperties.Property; -import org.openelisglobal.common.util.SystemConfiguration; import org.springframework.stereotype.Service; @Service @@ -39,6 +38,7 @@ public String getLabPhone() { } public Locale getLanguageLocale() { - return SystemConfiguration.getInstance().getDefaultLocale(); + return Locale + .forLanguageTag(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE)); } } diff --git a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java index 56919dc46c..7728d3aa3c 100644 --- a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java +++ b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java @@ -262,6 +262,11 @@ public static ConfigurationProperties getInstance() { return SpringContext.getBean(DefaultConfigurationProperties.class); } + public String getPropertyValue(String propertyName) { + return GenericValidator.isBlankOrNull(finalProperties.getProperty(propertyName)) ? null + : finalProperties.getProperty(propertyName).trim(); + } + public String getPropertyValue(Property property) { return GenericValidator.isBlankOrNull(finalProperties.getProperty(property.name())) ? null : finalProperties.getProperty(property.name()).trim(); diff --git a/src/main/java/org/openelisglobal/common/util/DateUtil.java b/src/main/java/org/openelisglobal/common/util/DateUtil.java index 767ba43555..bbfb61a4f8 100644 --- a/src/main/java/org/openelisglobal/common/util/DateUtil.java +++ b/src/main/java/org/openelisglobal/common/util/DateUtil.java @@ -71,13 +71,14 @@ public static String formatDateAsText(Date date) { } public static java.sql.Date convertStringDateToSqlDate(String date) { - String stringLocale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String stringLocale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); return convertStringDateToSqlDate(date, stringLocale); } public static LocalDate convertStringDateToLocalDate(String date) { - Locale locale = SystemConfiguration.getInstance().getDefaultLocale(); + Locale locale = Locale + .forLanguageTag(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE)); return convertStringDateToLocalDate(date, locale); } @@ -172,7 +173,8 @@ public static Timestamp convertStringDateToTimestampWithPatternNoLocale(String d public static Timestamp convertStringDateToTimestampWithPattern(String date, String pattern) throws LIMSRuntimeException { - Locale locale = SystemConfiguration.getInstance().getDefaultLocale(); + Locale locale = Locale + .forLanguageTag(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE)); SimpleDateFormat format = new SimpleDateFormat(pattern, locale); Timestamp returnTimestamp = null; @@ -674,8 +676,8 @@ public static String getDateTime12HourFormat() { } public static Locale getDateFormatLocale() { - return SystemConfiguration.getInstance().getLocaleByLocalString( - ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE)); + return Locale + .forLanguageTag(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE)); } public static String getTimeUserPrompt() { diff --git a/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java index 71b74beecb..fa56f725fb 100644 --- a/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java +++ b/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java @@ -29,6 +29,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Optional; import java.util.Properties; import java.util.Set; @@ -42,7 +43,6 @@ import org.openelisglobal.externalconnections.valueholder.BasicAuthenticationData; import org.openelisglobal.externalconnections.valueholder.ExternalConnection; import org.openelisglobal.externalconnections.valueholder.ExternalConnection.ProgrammedConnection; -import org.openelisglobal.internationalization.GlobalLocaleResolver; import org.openelisglobal.localization.service.LocalizationService; import org.openelisglobal.localization.valueholder.Localization; import org.openelisglobal.siteinformation.service.SiteInformationService; @@ -50,7 +50,6 @@ import org.openelisglobal.spring.util.SpringContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.LocaleResolver; @Component public class DefaultConfigurationProperties extends ConfigurationProperties { @@ -111,9 +110,7 @@ public void initialize() { finalProperties.setPropertyValue(Property.releaseNumber.name(), SpringContext.getBean(Versioning.class).getReleaseNumber()); LogEvent.logDebug(this.getClass().getSimpleName(), "initialize", "finished initializing configuration"); - // setDefaultLocale here to avoid a circular dependency - ((GlobalLocaleResolver) SpringContext.getBean(LocaleResolver.class)).setDefaultLocale( - Locale.forLanguageTag(finalProperties.getProperty(Property.DEFAULT_LANG_LOCALE.name()))); + SpringContext.getBean(ConfigurationListenerService.class).refreshConfigurations(); } @@ -389,13 +386,13 @@ protected void loadChangedValuesFromDatabaseIntoFinalProperties() { protected OEProperties loadChangedValuesFromDatabase() { OEProperties changedProperties = new OEProperties(); OEProperties properties = loadFromDatabase(); - if (dbOnLoadProperties != null) { + if (finalProperties != null) { for (String propertyName : properties.stringPropertyNames()) { - if (!dbOnLoadProperties.containsKey(propertyName)) { + if (!finalProperties.containsKey(propertyName)) { LogEvent.logDebug(this.getClass().getSimpleName(), "loadChangedValuesFromDatabase", propertyName + " is a new property in the database"); changedProperties.setPropertyHolder(propertyName, properties.getPropertyHolder(propertyName)); - } else if (!dbOnLoadProperties.getPropertyHolder(propertyName) + } else if (!finalProperties.getPropertyHolder(propertyName) .equals(properties.getPropertyHolder(propertyName))) { LogEvent.logDebug(this.getClass().getSimpleName(), "loadChangedValuesFromDatabase", propertyName + " has changed in the database"); @@ -516,7 +513,14 @@ private boolean areEqual(Map first, Map second) } public boolean equals(PropertyHolder that) { - return this.propertyValue.equals(that.propertyValue) && this.localizationId.equals(that.localizationId) + if (this == that) { + return true; + } + if (that == null) { + return false; + } + return Objects.equals(this.propertyValue, that.propertyValue) + && Objects.equals(this.localizationId, that.localizationId) && areEqual(this.localizationValues, that.localizationValues); } diff --git a/src/main/java/org/openelisglobal/common/util/SystemConfiguration.java b/src/main/java/org/openelisglobal/common/util/SystemConfiguration.java deleted file mode 100644 index 0180bddff1..0000000000 --- a/src/main/java/org/openelisglobal/common/util/SystemConfiguration.java +++ /dev/null @@ -1,964 +0,0 @@ -/** - * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy of the - * License at http://www.mozilla.org/MPL/ - * - *

Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF - * ANY KIND, either express or implied. See the License for the specific language governing rights - * and limitations under the License. - * - *

The Original Code is OpenELIS code. - * - *

Copyright (C) The Minnesota Department of Health. All Rights Reserved. - * - *

Contributor(s): CIRG, University of Washington, Seattle WA. - */ -package org.openelisglobal.common.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import org.apache.commons.validator.GenericValidator; -import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.ConfigurationProperties.Property; -import org.openelisglobal.internationalization.MessageUtil; - -/** This class represents the configuration properties of the application */ -public class SystemConfiguration { - - private static final String propertyFile = "/SystemConfiguration.properties"; - - private static class SingletonHelper { - private static final SystemConfiguration INSTANCE = new SystemConfiguration(); - } - - private List localChangeListeners = new ArrayList<>(); - - private Properties properties = null; - private Map localePropertyToLocaleMap = new HashMap<>(); - - private SystemConfiguration() { - InputStream propertyStream = null; - - try { - propertyStream = this.getClass().getResourceAsStream(propertyFile); - - // Now load a java.util.Properties object with the properties - properties = new Properties(); - - properties.load(propertyStream); - - } catch (IOException e) { - // bugzilla 2154 - LogEvent.logError(e); - } finally { - if (null != propertyStream) { - try { - propertyStream.close(); - } catch (IOException e) { - // bugzilla 2154 - LogEvent.logError(e); - } - } - } - } - - public static SystemConfiguration getInstance() { - return SingletonHelper.INSTANCE; - } - - public void addLocalChangeListener(LocaleChangeListener listener) { - localChangeListeners.add(listener); - } - - public int getDefaultPageSize() { - String pageSize = properties.getProperty("page.defaultPageSize"); - if (pageSize != null) { - return Integer.parseInt(pageSize); - } - // bugzilla 1409 - return 20; - } - - // bugzilla 1742 - public int getDefaultTreePageSize() { - String pageSize = properties.getProperty("page.tree.defaultPageSize"); - if (pageSize != null) { - return Integer.parseInt(pageSize); - } - return 10; - } - - // bugzilla 1742 - public int getDefaultPaginatedNodeChildCount() { - String count = properties.getProperty("page.tree.paginatednode.child.count"); - if (count != null) { - return Integer.parseInt(count); - } - return 32; - } - - public Locale getDefaultLocale() { - return getLocaleByLocalString( - ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE)); - } - - public Locale getLocaleByLocalString(String localeString) { - Locale locale = localePropertyToLocaleMap.get(localeString); - - if (locale == null) { - if (localeString != null && localeString.length() == 5) { - locale = new Locale(localeString.substring(0, 2), localeString.substring(3)); - localePropertyToLocaleMap.put(localeString, locale); - } - } - - return locale == null ? Locale.US : locale; - } - - public void setDefaultLocale(String locale) { - ConfigurationProperties.getInstance().setPropertyValue(Property.DEFAULT_LANG_LOCALE, locale); - for (LocaleChangeListener listener : localChangeListeners) { - listener.localeChanged(locale); - } - } - - public String getDefaultEncoding() { - String encodingString = properties.getProperty("default.encoding"); - if (encodingString != null) { - return encodingString; - } - return "Cp1252"; - } - - public String getDefaultApplicationName() { - String applicationNameString = properties.getProperty("default.application.name"); - if (applicationNameString != null) { - return applicationNameString; - } - // bugzilla 1995 - return "OpenELIS"; - } - - public String getDefaultIdSeparator() { - String def = properties.getProperty("default.idSeparator"); - if (def != null) { - return def; - } - return ";"; - } - - public String getDefaultTextSeparator() { - String def = properties.getProperty("default.textSeparator"); - if (def != null) { - return def; - } - return "|;|"; - } - - public String getDictionaryType() { - String dictType = properties.getProperty("dictionaryType"); - if (dictType != null) { - return dictType; - } - return "D"; - } - - public String getTiterType() { - String titerType = properties.getProperty("titerType"); - if (titerType != null) { - return titerType; - } - return "T"; - } - - public String getAnalyteTypeRequired() { - String analyteTypeRequired = properties.getProperty("analyteTypeRequired"); - if (analyteTypeRequired != null) { - return analyteTypeRequired; - } - return "R"; - } - - public String getAnalyteTypeNotRequired() { - String analyteTypeNotRequired = properties.getProperty("analyteTypeNotRequired"); - if (analyteTypeNotRequired != null) { - return analyteTypeNotRequired; - } - return "N"; - } - - public String getNumericType() { - String numericType = properties.getProperty("numericType"); - if (numericType != null) { - return numericType; - } - return "N"; - } - // ============================================================== - - public String getQuickEntryDefaultReferredCultureFlag() { - String def = properties.getProperty("quickEntry.default.sample.referredCultureFlag"); - if (def != null) { - return def; - } - return "S"; - } - - public String getQuickEntryDefaultStickerReceivedFlag() { - String def = properties.getProperty("quickEntry.default.sample.stickerReceivedFlag"); - if (def != null) { - return def; - } - return "N"; - } - - public String getQuickEntryDefaultNextItemSequence() { - String def = properties.getProperty("quickEntry.default.sample.nextItemSequence"); - if (def != null) { - return def; - } - return "1"; - } - - public String getQuickEntryDefaultRevision() { - String def = properties.getProperty("quickEntry.default.sample.revision"); - if (def != null) { - return def; - } - return "0"; - } - - public String getQuickEntryDefaultCollectionTimeForDisplay() { - String def = properties.getProperty("quickEntry.default.sample.collectionTimeForDisplay"); - if (def != null) { - return def; - } - return "00:00"; - } - // ============================================================== - - public String getHumanSampleOneDefaultReferredCultureFlag() { - String def = properties.getProperty("humanSampleOne.default.sample.referredCultureFlag"); - if (def != null) { - return def; - } - // bugzilla 1754 - blank is default - return ""; - } - - public String getHumanSampleOneDefaultStickerReceivedFlag() { - String def = properties.getProperty("humanSampleOne.default.sample.stickerReceivedFlag"); - if (def != null) { - return def; - } - return "N"; - } - - public String getHumanSampleOneDefaultNextItemSequence() { - String def = properties.getProperty("humanSampleOne.default.sample.nextItemSequence"); - if (def != null) { - return def; - } - return "1"; - } - - public String getHumanSampleOneDefaultRevision() { - String def = properties.getProperty("humanSampleOne.default.sample.revision"); - if (def != null) { - return def; - } - return "0"; - } - - public String getHumanSampleOneDefaultCollectionTimeForDisplay() { - String def = properties.getProperty("humanSampleOne.default.sample.collectionTimeForDisplay"); - if (def != null) { - return def; - } - return "00:00"; - } - - public String getHumanSampleOneDefaultPatientGender() { - String def = properties.getProperty("humanSampleOne.default.patient.gender"); - if (def != null) { - return def; - } - return ""; - } - - // bugzilla 1387 rename this method so more generic - public String getHumanDomain() { - String def = properties.getProperty("domain.human"); - if (def != null) { - return def; - } - return "H"; - } - - // bugzilla 1387 rename this method so more generic - public String getAnimalDomain() { - String def = properties.getProperty("domain.animal"); - if (def != null) { - return def; - } - return "A"; - } - - // bugzilla 1348 - analysis status for verification - public String getAnalysisVerifiedStatus() { - String def = properties.getProperty("analysis.status.verified"); - if (def != null) { - return def; - } - return "V"; - } - - // bugzilla 1348 - analysis status for verification - public String getAnalysisReadyToVerifyStatus() { - String def = properties.getProperty("analysis.status.readytoverify"); - if (def != null) { - return def; - } - return ""; - } - - // bugzilla - reports id - public String getOpenReportsReportId(String key) { - String def = properties.getProperty(key); - if (def != null) { - return def; - } - return ""; - } - - // bugzilla - reports group - public String getOpenReportsGroupId(String key) { - String def = properties.getProperty(key); - if (def != null) { - return def; - } - return ""; - } - - // bugzilla 1546 - public String getSampleStatusType() { - String def = properties.getProperty("sample.status"); - if (def != null) { - return def; - } - return ""; - } - - public String getAnalysisStatusType() { - String def = properties.getProperty("analysis.status"); - if (def != null) { - return def; - } - return ""; - } - - // bugzilla 2380 - public String getLabelPrinterName() { - String printer = properties.getProperty("print.label.name"); - if (printer != null) { - return printer; - } - return ""; - } - - public String getLabelNumberOfCopies(String key) { - String numberOfCopies = properties.getProperty(key); - if (numberOfCopies != null) { - return numberOfCopies; - } - return "1"; - } - - // bugzilla 2374 - public String getMaxNumberOfLabels() { - String maxNumberOfLabels = properties.getProperty("print.label.numeroflabels"); - if (maxNumberOfLabels != null) { - return maxNumberOfLabels; - } - return "100"; - } - - public String getBarcodeHeight() { - String height = properties.getProperty("print.label.barcode.height"); - if (height != null) { - return height; - } - return "44"; - } - - public String getBarcodeWidth() { - String width = properties.getProperty("print.label.barcode.width"); - if (width != null) { - return width; - } - return "330"; - } - - public String getBarcodeResolution() { - String res = properties.getProperty("print.label.barcode.resolution"); - if (res != null) { - return res; - } - return "300"; - } - - // bugzilla 2592 - public String getDefaultSampleLabel(String accessionNumber) { - String prependBarcode = properties.getProperty("print.label.sample.prepend.barcode"); - String prependHumanReadable = properties.getProperty("print.label.sample.prepend.humanreadable"); - String postpend = properties.getProperty("print.label.sample.postpend"); - if (prependBarcode != null && prependHumanReadable != null && postpend != null) { - int sampleLabelLength = prependBarcode.length() + accessionNumber.length() + prependHumanReadable.length() - + accessionNumber.length() + postpend.length(); - StringBuffer sb = new StringBuffer(sampleLabelLength); - sb.append(prependBarcode).append(accessionNumber).append(prependHumanReadable).append(accessionNumber) - .append(postpend); - return sb.toString(); - } - return ""; - } - - public String getAnalysisStatusAssigned() { - String val = properties.getProperty("analysis.status.assigned"); - if (val != null) { - return val; - } - - return "1"; - } - - // bugzilla 2300 - public String getAnalysisStatusCanceled() { - String val = properties.getProperty("analysis.status.canceled"); - if (val != null) { - return val; - } - - return "2"; - } - - public String getAnalysisStatusResultCompleted() { - String val = properties.getProperty("analysis.status.result.completed"); - if (val != null) { - return val; - } - - return "3"; - } - - public String getAnalysisStatusReleased() { - String val = properties.getProperty("analysis.status.released"); - if (val != null) { - return val; - } - - return "4"; - } - - public String getSampleStatusQuickEntryComplete() { - String val = properties.getProperty("sample.status.quick.entry.complete"); - if (val != null) { - return val; - } - - return "1"; - } - - public String getSampleStatusEntry1Complete() { - String val = properties.getProperty("sample.status.entry.1.complete"); - if (val != null) { - return val; - } - - return "2"; - } - - public String getSampleStatusEntry2Complete() { - String val = properties.getProperty("sample.status.entry.2.complete"); - if (val != null) { - return val; - } - - return "3"; - } - - public String getSampleStatusReleased() { - String val = properties.getProperty("sample.status.released"); - if (val != null) { - return val; - } - - return "7"; - } - - public String getSampleStatusLabelPrinted() { - String val = properties.getProperty("sample.status.label.printed"); - if (val != null) { - return val; - } - - return "8"; - } - - public String getOpenReportsSwitchModulePath() { - String res = properties.getProperty("openreports.switch.module.path"); - if (res != null) { - return res; - } - return "../../openreports"; - } - - public String getResultReferenceTableId() { - String refId = properties.getProperty("result.reference.table.id"); - if (refId != null) { - return refId; - } - return "21"; - } - - // bugzilla 2028 - public String getAnalysisQaEventActionReferenceTableId() { - String refId = properties.getProperty("analysis.qaevent.action.reference.table.id"); - if (refId != null) { - return refId; - } - return "21"; - } - - // bugzilla 2500 - public String getSampleQaEventActionReferenceTableId() { - String refId = properties.getProperty("sample.qaevent.action.reference.table.id"); - if (refId != null) { - return refId; - } - return "21"; - } - - public String getNoteTypeInternal() { - String internalType = properties.getProperty("note.type.internal"); - if (internalType != null) { - return internalType; - } - return "I"; - } - - public String getNoteTypeExternal() { - String externalType = properties.getProperty("note.type.external"); - if (externalType != null) { - return externalType; - } - return "I"; - } - - public String getDefaultTransportMethodForXMLTransmission() { - String transportMethod = properties.getProperty("default.transport.method"); - if (transportMethod != null) { - return transportMethod; - } - return "PHINMS_DEFINED_IN_SYS_CONFIG"; - } - - public String getDefaultProcessingIdForXMLTransmission() { - String processingId = properties.getProperty("default.transport.processing.id"); - if (processingId != null) { - return processingId; - } - return "T_DEFINED_IN_SYS_CONFIG"; - } - - public String getDefaultTransmissionTextSeparator() { - String separator = properties.getProperty("default.transport.text.separator"); - if (separator != null) { - return separator; - } - return "^_DEFINED_IN_SYS_CONFIG"; - } - - public String getDefaultTransmissionCodeSystemType() { - String codeSystemType = properties.getProperty("default.transport.code.system.type"); - if (codeSystemType != null) { - return codeSystemType; - } - return "L"; - } - - public String getMdhUhlIdForXMLTransmission() { - String uhlId = properties.getProperty("mdh.uhl.id"); - if (uhlId != null) { - return uhlId; - } - return "9999__DEFINED_IN_SYS_CONFIG"; - } - - public String getMdhUniversalIdForXMLTransmission() { - String universalId = properties.getProperty("mdh.universal.id"); - if (universalId != null) { - return universalId; - } - return "9999__DEFINED_IN_SYS_CONFIG"; - } - - public String getMdhUniversalIdTypeForXMLTransmission() { - String universalIdType = properties.getProperty("mdh.universal.id.type"); - if (universalIdType != null) { - return universalIdType; - } - return "9999__DEFINED_IN_SYS_CONFIG"; - } - - public String getMdhPhoneNumberForXMLTransmission() { - String phoneNumber = properties.getProperty("mdh.work.phone"); - if (phoneNumber != null) { - return phoneNumber; - } - return "800/999-9999_DEFINED_IN_SYS_CONFIG"; - } - - public String getMdhOrganizationIdForXMLTransmission() { - String orgId = properties.getProperty("mdh.organization.record.id"); - if (orgId != null) { - return orgId; - } - return "43"; - } - - // bugzilla 2393 INFLUENZA XML - public String getInfluenzaDefaultProcessingIdForXMLTransmission() { - String processingId = properties.getProperty("default.transport.processing.id.influenza"); - if (processingId != null) { - return processingId; - } - return "T"; - } - - // bugzilla 2393 - public String getInfluenzaDefaultApplicationName() { - String applicationNameString = properties.getProperty("default.application.name.influenza"); - if (applicationNameString != null) { - return applicationNameString; - } - // bugzilla 1995 - return "MN OpenELIS Stage"; - } - - // 1742 openreports static ids (tests, projects etc.) - public String getStaticIdByName(String name) { - String testId = properties.getProperty(name); - // LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", - // "SystemConfig - // getting test by name " + name); - if (testId != null) { - return testId; - } - return ""; - } - - public String getDefaultDataSource() { - String dsString = properties.getProperty("default.datasource"); - if (dsString != null) { - return dsString; - } - return "LimsDS"; - } - - // bugzilla 2028 get qaevent code for quickentry sample type NOT GIVEN - public String getQaEventCodeForRequestNoSampleType() { - String string = properties.getProperty("qaeventcode.request.sourcemissing"); - if (string != null) { - return string; - } - return "RQNSO"; - } - - // bugzilla 2028 get qaevent code for quickentry missing collection date - public String getQaEventCodeForRequestNoCollectionDate() { - String string = properties.getProperty("qaeventcode.request.collectiondatemissing"); - if (string != null) { - return string; - } - return "RQNCD"; - } - - // bugzilla 2028 get qaevent code for quickentry submitter unknown - public String getQaEventCodeForRequestUnknownSubmitter() { - String string = properties.getProperty("qaeventcode.request.submitterunknown"); - if (string != null) { - return string; - } - return "RQNSNA"; - } - - // bugzilla 2028 get unknownSubmitterNumber - // bugzilla 2589 unknown submitter number is null now - public String getUnknownSubmitterNumberForQaEvent() { - String string = properties.getProperty("unknown.submitter.number"); - if (string != null) { - return string; - } - return ""; - } - - // bugzilla 2028 get qaevent action code for quickentry sample type NOT GIVEN - public String getQaEventActionCodeForRequestNoSampleType() { - String string = properties.getProperty("qaeventactioncode.request.sourcemissing"); - if (string != null) { - return string; - } - return "RQSOC"; - } - - // bugzilla 2028 get qaevent action code for quickentry missing collection date - public String getQaEventActionCodeForRequestNoCollectionDate() { - String string = properties.getProperty("qaeventactioncode.request.collectiondatemissing"); - if (string != null) { - return string; - } - return "CDC"; - } - - // bugzilla 2028 get qaevent action code for quickentry submitter unknown - public String getQaEventActionCodeForRequestUnknownSubmitter() { - String string = properties.getProperty("qaeventactioncode.request.submitterunknown"); - if (string != null) { - return string; - } - return "SNAC"; - } - - // bugzilla 2063 - public String getQaEventDictionaryCategoryType() { - String string = properties.getProperty("dictionary.category.qaevent.type"); - if (string != null) { - return string; - } - // bugzilla 2221 - we are now defining only exceptions to the rule - return "Q"; - } - - // bugzilla 2506 - public String getQaEventDictionaryCategoryCategory() { - String string = properties.getProperty("dictionary.category.qaevent.category"); - if (string != null) { - return string; - } - // bugzilla 2221 - we are now defining only exceptions to the rule - return "QC"; - } - - public String getLoginUserChangePasswordAllowDay() { - String string = properties.getProperty("login.user.change.allow.day"); - if (string != null) { - return string; - } - return "3"; - } - - public String getLoginUserChangePasswordExpiredMonth() { - String string = properties.getProperty("login.user.expired.month"); - if (string != null) { - return string; - } - return "1"; - } - - // bugzilla 2286 password reminder days - public String getLoginUserPasswordExpiredReminderDay() { - String string = properties.getProperty("login.user.expired.reminder.day"); - if (string != null) { - return string; - } - return "15"; - } - - // bugzilla 2286 account lock after 3 failed logins - public String getLoginUserFailAttemptCount() { - String string = properties.getProperty("login.fail.attempt.count"); - if (string != null) { - return string; - } - return "3"; - } - - // bugzilla 2286 account unlock after 10 minutes - public String getLoginUserAccountUnlockMinute() { - String string = properties.getProperty("login.user.account.unlock.minute"); - if (string != null) { - return string; - } - return "10"; - } - - // User Test Section - public String getEnableUserTestSection() { - String string = properties.getProperty("enable.user.test.section"); - if (string != null) { - return string; - } - return "Y"; - } - - public String getAnalysisDefaultRevision() { - String def = properties.getProperty("analysis.default.revision"); - if (def != null) { - return def; - } - return "0"; - } - - // Encrypted PDF Path - public String getEncryptedPdfPath() { - String string = properties.getProperty("encrypted.pdf.path"); - if (string != null) { - return string; - } - return "/export/project/phl/scans"; - } - - // Allow to view the encrypted pdf - public String getEnabledSamplePdf() { - String string = properties.getProperty("enable.sample.pdf"); - if (string != null) { - return string; - } - return "Y"; - } - - // bugzilla 2528 - public String getNewbornTestPanelName() { - String string = properties.getProperty("newborn.testPanelName"); - if (string != null) { - return string; - } - return "NBS-Panel"; - } - - public String getNewbornTypeOfSample() { - String string = properties.getProperty("newborn.typeOfSample"); - if (string != null) { - return string; - } - return "DRIED BLOOD SPOT CARD"; - } - - // bugzilla 2529, 2530 - public String getNewbornDomain() { - String string = properties.getProperty("domain.newborn"); - if (string != null) { - return string; - } - return "N"; - } - - // for testing only to inject values - public void setSiteCode(String siteCode) { - properties.setProperty("sitecode", siteCode); - } - - public String getProgramCodes() { - String codes = properties.getProperty("programcodes"); - - return (codes == null ? "" : codes); - } - - // for testing only to inject values - public void setProgramCodes(String programCodes) { - properties.setProperty("programcodes", programCodes); - } - - public String getNewbornPatientRelation() { - String string = properties.getProperty("newborn.patient.relation"); - if (string != null) { - return string; - } - return "M"; - } - - // we are letting the date locale differ from the default locale. Not a good - // thing - public Locale getDateLocale() { - String localeString = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE); - Locale locale = Locale.US; - - if (!GenericValidator.isBlankOrNull(localeString)) { - String[] splitLocale = localeString.split("-"); - - if (splitLocale.length == 1) { // there is variation around separators - splitLocale = localeString.split("_"); - } - - switch (splitLocale.length) { - case 1: { - locale = new Locale(splitLocale[0]); - break; - } - case 2: { - locale = new Locale(splitLocale[0], splitLocale[1]); - break; - } - case 3: { - locale = new Locale(splitLocale[0], splitLocale[1], splitLocale[2]); - break; - } - default: // no-op - } - } - return locale; - } - - public String getPatternForDateLocale() { - Locale locale = getLocaleByLocalString( - ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE)); - return MessageUtil.getMessage("date.format.formatKey", locale).toUpperCase(); - // DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, - // getDateLocale()); - // // yyyy/mm/dd - // Date date = Date.valueOf("2000-01-02"); - // String pattern = dateFormat.format(date); - // pattern = pattern.replaceFirst("01", "MM"); - // pattern = pattern.replaceFirst("02", "DD"); - // pattern = pattern.replaceFirst("00", "YYYY"); - // return pattern; - } - - public boolean errorsToScreen() { - String id = properties.getProperty("errors.to.screen"); - return id == null ? false : Boolean.valueOf(id.trim()); - } - - public String getPermissionAgent() { - return properties.getProperty("permissions.agent", "USER").trim().toUpperCase(); - } - - public long getSearchTimeLimit() { - long limit = 20000L; - String timeLimit = properties.getProperty("patient.search.time.limit.ms"); - if (!GenericValidator.isBlankOrNull(timeLimit)) { - try { - limit = Long.parseLong(timeLimit); - } catch (NumberFormatException e) { - LogEvent.logError( - "Invalid SystemConfiguration format for 'patient.search.time.limit.ms'. Default used", e); - } - } - return limit; - } - - public boolean useTestPatientGUID() { - return "enable".equals(properties.getProperty("use.test.patient.guid", "disable")); - } - - public void setProperty(String property, String value) { - properties.setProperty(property, value); - } -} diff --git a/src/main/java/org/openelisglobal/common/util/validator/CustomDateValidator.java b/src/main/java/org/openelisglobal/common/util/validator/CustomDateValidator.java index 1daed8f144..e562849b46 100644 --- a/src/main/java/org/openelisglobal/common/util/validator/CustomDateValidator.java +++ b/src/main/java/org/openelisglobal/common/util/validator/CustomDateValidator.java @@ -23,7 +23,8 @@ import org.apache.commons.validator.routines.DateValidator; import org.openelisglobal.common.action.IActionConstants; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; public class CustomDateValidator extends DateValidator { @@ -111,7 +112,8 @@ public boolean isValid(String value, Locale locale) { } public Date getDate(String date) { - Locale locale = SystemConfiguration.getInstance().getDateLocale(); + Locale locale = Locale + .forLanguageTag(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_DATE_LOCALE)); return validate(date, locale); } diff --git a/src/main/java/org/openelisglobal/config/AppConfig.java b/src/main/java/org/openelisglobal/config/AppConfig.java index 1fa005a2f7..3ce52b2162 100644 --- a/src/main/java/org/openelisglobal/config/AppConfig.java +++ b/src/main/java/org/openelisglobal/config/AppConfig.java @@ -9,7 +9,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import java.util.Locale; import java.util.Properties; import org.apache.commons.validator.GenericValidator; import org.hl7.fhir.r4.model.Questionnaire; @@ -34,7 +33,6 @@ import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.Scope; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.http.converter.HttpMessageConverter; @@ -165,8 +163,6 @@ public JavaMailSender getJavaMailSender() { // functionality public LocaleResolver localeResolver() { GlobalLocaleResolver localeResolver = new GlobalLocaleResolver(); - localeResolver.setDefaultLocale(Locale.forLanguageTag("en-US")); - LocaleContextHolder.setDefaultLocale(Locale.forLanguageTag("en-US")); return localeResolver; } diff --git a/src/main/java/org/openelisglobal/dataexchange/resultreporting/ResultReportingCollator.java b/src/main/java/org/openelisglobal/dataexchange/resultreporting/ResultReportingCollator.java index b40ffbb6cc..d4a5e690e3 100644 --- a/src/main/java/org/openelisglobal/dataexchange/resultreporting/ResultReportingCollator.java +++ b/src/main/java/org/openelisglobal/dataexchange/resultreporting/ResultReportingCollator.java @@ -348,17 +348,6 @@ private TestResultsXmit getResultsWrapperForPatient(String patientId, boolean pr GUID_IDENTITY_TYPE); } - // Everything between these comments are for testing only and should be remove - // beforE they go into production - // if (SystemConfiguration.getInstance().useTestPatientGUID() && patientIdentity - // == null) { - // patientIdentity = new PatientIdentity(); - // patientIdentity.setIdentityData(UUID.randomUUID().toString()); - // patientIdentity.setIdentityTypeId(GUID_IDENTITY_TYPE); - // patientIdentity.setPatientId(patientId); - // } - // End of testing comment - if (patientIdentity == null) { noGUIDPatients.add(patientId); return null; diff --git a/src/main/java/org/openelisglobal/dictionary/controller/DictionaryController.java b/src/main/java/org/openelisglobal/dictionary/controller/DictionaryController.java index b95d0eacdd..576320d1b4 100644 --- a/src/main/java/org/openelisglobal/dictionary/controller/DictionaryController.java +++ b/src/main/java/org/openelisglobal/dictionary/controller/DictionaryController.java @@ -13,8 +13,8 @@ import org.openelisglobal.common.form.BaseForm; import org.openelisglobal.common.log.LogEvent; import org.openelisglobal.common.services.DisplayListService; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.common.validator.ValidationHelper; import org.openelisglobal.dictionary.form.DictionaryForm; @@ -245,7 +245,8 @@ private boolean checkForDictionaryFrozenCheck(DictionaryForm form) { String dirtyFormFields = form.getDirtyFormFields(); String isActiveValue = form.getIsActive(); - String[] dirtyFields = dirtyFormFields.split(SystemConfiguration.getInstance().getDefaultIdSeparator(), -1); + String[] dirtyFields = dirtyFormFields + .split(ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator"), -1); List listOfDirtyFields = new ArrayList<>(); for (int i = 0; i < dirtyFields.length; i++) { diff --git a/src/main/java/org/openelisglobal/dictionary/controller/DictionaryMenuController.java b/src/main/java/org/openelisglobal/dictionary/controller/DictionaryMenuController.java index 8fee1c9d29..144ee4e4d9 100644 --- a/src/main/java/org/openelisglobal/dictionary/controller/DictionaryMenuController.java +++ b/src/main/java/org/openelisglobal/dictionary/controller/DictionaryMenuController.java @@ -10,7 +10,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.dictionary.form.DictionaryMenuForm; import org.openelisglobal.dictionary.service.DictionaryService; @@ -84,8 +84,10 @@ protected List createMenuList(AdminOptionMenuForm form, request.setAttribute(MENU_TOTAL_RECORDS, String.valueOf(total)); request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; - if (dictionaries.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (dictionaries.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = dictionaries.size(); } @@ -109,7 +111,7 @@ protected List createMenuList(AdminOptionMenuForm form, @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } @Override diff --git a/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryMenuRestController.java b/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryMenuRestController.java index aaaa7ab437..69a2ca7b7e 100644 --- a/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryMenuRestController.java +++ b/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryMenuRestController.java @@ -10,7 +10,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.dictionary.form.DictionaryMenuForm; import org.openelisglobal.dictionary.service.DictionaryService; @@ -128,8 +128,10 @@ protected List createMenuList(AdminOptionMenuForm form, request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; - if (dictionaries.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (dictionaries.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = dictionaries.size(); } diff --git a/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryRestController.java b/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryRestController.java index 99e4023edf..563cc8ba5a 100644 --- a/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryRestController.java +++ b/src/main/java/org/openelisglobal/dictionary/controller/rest/DictionaryRestController.java @@ -15,8 +15,8 @@ import org.openelisglobal.common.form.BaseForm; import org.openelisglobal.common.log.LogEvent; import org.openelisglobal.common.services.DisplayListService; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.common.validator.ValidationHelper; import org.openelisglobal.dictionary.form.DictionaryForm; @@ -256,7 +256,8 @@ private boolean checkForDictionaryFrozenCheck(DictionaryForm form) { String dirtyFormFields = form.getDirtyFormFields(); String isActiveValue = form.getIsActive(); - String[] dirtyFields = dirtyFormFields.split(SystemConfiguration.getInstance().getDefaultIdSeparator(), -1); + String[] dirtyFields = dirtyFormFields + .split(ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator"), -1); List listOfDirtyFields = new ArrayList<>(); for (int i = 0; i < dirtyFields.length; i++) { diff --git a/src/main/java/org/openelisglobal/dictionary/daoimpl/DictionaryDAOImpl.java b/src/main/java/org/openelisglobal/dictionary/daoimpl/DictionaryDAOImpl.java index fe84ebc211..91f57117df 100644 --- a/src/main/java/org/openelisglobal/dictionary/daoimpl/DictionaryDAOImpl.java +++ b/src/main/java/org/openelisglobal/dictionary/daoimpl/DictionaryDAOImpl.java @@ -25,8 +25,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.dictionary.dao.DictionaryDAO; import org.openelisglobal.dictionary.valueholder.Dictionary; @@ -217,8 +217,8 @@ public boolean isDictionaryFrozen(Dictionary dictionary) throws LIMSRuntimeExcep // to check those here also check references from other tables depending on // dictionary // category local abbrev code - if (dictionary.getDictionaryCategory().getLocalAbbreviation() - .equals(SystemConfiguration.getInstance().getQaEventDictionaryCategoryType())) { + if (dictionary.getDictionaryCategory().getLocalAbbreviation().equals( + ConfigurationProperties.getInstance().getPropertyValue("dictionary.category.qaevent.type"))) { sql = "from QaEvent q where q.type = :param"; // bugzilla 2221: at this time there are only 2 categories as // far as this isFrozen() logic: diff --git a/src/main/java/org/openelisglobal/dictionary/validator/DictionaryFormValidator.java b/src/main/java/org/openelisglobal/dictionary/validator/DictionaryFormValidator.java index 0f9e6285ee..e0bd58bc56 100644 --- a/src/main/java/org/openelisglobal/dictionary/validator/DictionaryFormValidator.java +++ b/src/main/java/org/openelisglobal/dictionary/validator/DictionaryFormValidator.java @@ -1,6 +1,6 @@ package org.openelisglobal.dictionary.validator; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.ValidationHelper; import org.openelisglobal.dictionary.form.DictionaryForm; import org.springframework.stereotype.Component; @@ -20,7 +20,7 @@ public void validate(Object target, Errors errors) { DictionaryForm form = (DictionaryForm) target; String[] dirtyFields = form.getDirtyFormFields() - .split(SystemConfiguration.getInstance().getDefaultIdSeparator(), -1); + .split(ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator"), -1); for (String dirtyField : dirtyFields) { ValidationHelper.validateFieldAndCharset(dirtyField, "dirtyFormField", errors, false, 255, "a-zA-Z0-9_"); if (errors.hasErrors()) { diff --git a/src/main/java/org/openelisglobal/interceptor/ModuleAuthenticationInterceptor.java b/src/main/java/org/openelisglobal/interceptor/ModuleAuthenticationInterceptor.java index a84e2fc2e6..77bf51259d 100644 --- a/src/main/java/org/openelisglobal/interceptor/ModuleAuthenticationInterceptor.java +++ b/src/main/java/org/openelisglobal/interceptor/ModuleAuthenticationInterceptor.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.openelisglobal.common.action.IActionConstants; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.login.dao.UserModuleService; import org.openelisglobal.systemmodule.service.SystemModuleUrlService; @@ -61,7 +61,7 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response, } protected boolean hasPermission(Errors errors, HttpServletRequest request) { - if (SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + if (ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { return hasPermissionForUrl(request, USE_PARAMETERS) || userModuleService.isUserAdmin(request); } else { return userModuleService.isVerifyUserModule(request) || userModuleService.isUserAdmin(request); diff --git a/src/main/java/org/openelisglobal/internationalization/GlobalLocaleResolver.java b/src/main/java/org/openelisglobal/internationalization/GlobalLocaleResolver.java index b6d32f50ac..a32014a50c 100644 --- a/src/main/java/org/openelisglobal/internationalization/GlobalLocaleResolver.java +++ b/src/main/java/org/openelisglobal/internationalization/GlobalLocaleResolver.java @@ -1,21 +1,39 @@ package org.openelisglobal.internationalization; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openelisglobal.common.util.SystemConfiguration; +import org.apache.commons.validator.GenericValidator; +import org.openelisglobal.common.util.ConfigurationListener; +import org.openelisglobal.common.util.ConfigurationProperties.Property; +import org.openelisglobal.common.util.DefaultConfigurationProperties; +import org.openelisglobal.common.util.LocaleChangeListener; +import org.openelisglobal.spring.util.SpringContext; import org.springframework.context.i18n.LocaleContext; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.TimeZoneAwareLocaleContext; import org.springframework.lang.Nullable; import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver; -public class GlobalLocaleResolver extends AbstractLocaleContextResolver { +public class GlobalLocaleResolver extends AbstractLocaleContextResolver implements ConfigurationListener { private Locale defaultLocale; private Locale currentLocale; private TimeZone timeZone; + private List localChangeListeners = new ArrayList<>(); + + public GlobalLocaleResolver() { + defaultLocale = Locale.US; + } + + public void addLocalChangeListener(LocaleChangeListener listener) { + localChangeListeners.add(listener); + } + @Override public Locale resolveLocale(HttpServletRequest request) { if (currentLocale == null) { @@ -28,14 +46,18 @@ public Locale resolveLocale(HttpServletRequest request) { public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { if (!locale.equals(currentLocale)) { currentLocale = locale; - SystemConfiguration.getInstance().setDefaultLocale(locale.getLanguage()); } currentLocale = locale; } @Override public void setDefaultLocale(Locale locale) { - defaultLocale = locale; + if (!defaultLocale.equals(locale)) { + this.defaultLocale = locale; + for (LocaleChangeListener listener : localChangeListeners) { + listener.localeChanged(locale.toLanguageTag()); + } + } } @Override @@ -90,4 +112,14 @@ public Locale determineDefaultLocale() { protected TimeZone determineDefaultTimeZone(HttpServletRequest request) { return getDefaultTimeZone(); } + + @Override + public void refreshConfiguration() { + String localeTag = SpringContext.getBean(DefaultConfigurationProperties.class) + .getPropertyValue(Property.DEFAULT_LANG_LOCALE); + System.out.println("LOCALE IS: " + localeTag); + Locale locale = GenericValidator.isBlankOrNull(localeTag) ? Locale.US : Locale.forLanguageTag(localeTag); + setDefaultLocale(locale); + LocaleContextHolder.setDefaultLocale(locale); + } } diff --git a/src/main/java/org/openelisglobal/login/service/LoginUserServiceImpl.java b/src/main/java/org/openelisglobal/login/service/LoginUserServiceImpl.java index 40cc5aa886..b26eb33927 100644 --- a/src/main/java/org/openelisglobal/login/service/LoginUserServiceImpl.java +++ b/src/main/java/org/openelisglobal/login/service/LoginUserServiceImpl.java @@ -11,7 +11,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; import org.openelisglobal.common.service.AuditableBaseObjectServiceImpl; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.login.dao.LoginUserDAO; import org.openelisglobal.login.valueholder.LoginUser; import org.openelisglobal.security.PasswordUtil; @@ -103,7 +103,7 @@ public void hashPassword(LoginUser login, String newPassword) { login.setPassword(PasswordUtil.hashPassword(newPassword)); Calendar passwordExpiredDate = Calendar.getInstance(); passwordExpiredDate.add(Calendar.MONTH, - Integer.parseInt(SystemConfiguration.getInstance().getLoginUserChangePasswordExpiredMonth())); + Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("login.user.expired.month"))); login.setPasswordExpiredDate(new Date(passwordExpiredDate.getTimeInMillis())); login.setPasswordExpiredDayNo(baseObjectDAO.getPasswordExpiredDayNo(login)); } diff --git a/src/main/java/org/openelisglobal/login/valueholder/LoginUser.java b/src/main/java/org/openelisglobal/login/valueholder/LoginUser.java index 18fa609511..fc531e0439 100644 --- a/src/main/java/org/openelisglobal/login/valueholder/LoginUser.java +++ b/src/main/java/org/openelisglobal/login/valueholder/LoginUser.java @@ -24,8 +24,9 @@ import javax.persistence.Transient; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.validation.annotations.ValidName; import org.openelisglobal.validation.constraintvalidator.NameValidator.NameType; @@ -169,7 +170,7 @@ public void setPasswordExpiredDate(Date passwordExpiredDT) { public void setPasswordExpiredDateForDisplay(String passwordExpiredDTForDisplay) { // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.passwordExpiredDT = DateUtil.convertStringDateToSqlDate(passwordExpiredDTForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/menu/service/AdminMenuItemServiceImpl.java b/src/main/java/org/openelisglobal/menu/service/AdminMenuItemServiceImpl.java index 78257efc5e..5d4ff7997a 100644 --- a/src/main/java/org/openelisglobal/menu/service/AdminMenuItemServiceImpl.java +++ b/src/main/java/org/openelisglobal/menu/service/AdminMenuItemServiceImpl.java @@ -9,12 +9,13 @@ import org.openelisglobal.common.formfields.AdminFormFields.Field; import org.openelisglobal.common.util.ConfigurationListener; import org.openelisglobal.common.util.ConfigurationProperties; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.internationalization.MessageUtil; import org.openelisglobal.menu.valueholder.AdminMenuItem; +import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Service; @Service +@DependsOn({ "springContext", "defaultConfigurationProperties" }) public class AdminMenuItemServiceImpl implements AdminMenuItemService, ConfigurationListener { List adminMenuItems; @@ -22,7 +23,7 @@ public class AdminMenuItemServiceImpl implements AdminMenuItemService, Configura @PostConstruct public synchronized void createActiveList() { adminMenuItems = new ArrayList<>(); - String permissionBase = SystemConfiguration.getInstance().getPermissionAgent(); + String permissionBase = ConfigurationProperties.getInstance().getPropertyValue("permissions.agent"); AdminFormFields adminFields = AdminFormFields.getInstance(); AdminMenuItem curItem; diff --git a/src/main/java/org/openelisglobal/method/valueholder/Method.java b/src/main/java/org/openelisglobal/method/valueholder/Method.java index d33d9cd213..b79bb36807 100644 --- a/src/main/java/org/openelisglobal/method/valueholder/Method.java +++ b/src/main/java/org/openelisglobal/method/valueholder/Method.java @@ -14,8 +14,9 @@ package org.openelisglobal.method.valueholder; import java.sql.Date; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.EnumValueItemImpl; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -109,7 +110,7 @@ public String getIsActive() { public void setActiveBeginDateForDisplay(String activeBeginDateForDisplay) { this.activeBeginDateForDisplay = activeBeginDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.activeBeginDate = DateUtil.convertStringDateToSqlDate(this.activeBeginDateForDisplay, locale); } @@ -120,7 +121,7 @@ public String getActiveBeginDateForDisplay() { public void setActiveEndDateForDisplay(String activeEndDateForDisplay) { this.activeEndDateForDisplay = activeEndDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.activeEndDate = DateUtil.convertStringDateToSqlDate(activeEndDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/organization/controller/OrganizationMenuController.java b/src/main/java/org/openelisglobal/organization/controller/OrganizationMenuController.java index 9155511b94..58d5e0a7f8 100644 --- a/src/main/java/org/openelisglobal/organization/controller/OrganizationMenuController.java +++ b/src/main/java/org/openelisglobal/organization/controller/OrganizationMenuController.java @@ -11,7 +11,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.dataexchange.fhir.exception.FhirTransformationException; import org.openelisglobal.organization.form.OrganizationMenuForm; @@ -106,8 +106,10 @@ protected List createMenuList(AdminOptionMenuForm fo request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; if (organizations != null) { - if (organizations.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (organizations.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = organizations.size(); } @@ -138,7 +140,7 @@ protected String getDeactivateDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } // gnr: Deactivate not Delete diff --git a/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationMenuRestController.java b/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationMenuRestController.java index 6d63834da1..a361f40a76 100644 --- a/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationMenuRestController.java +++ b/src/main/java/org/openelisglobal/organization/controller/rest/OrganizationMenuRestController.java @@ -9,7 +9,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.dataexchange.fhir.exception.FhirTransformationException; import org.openelisglobal.organization.form.OrganizationMenuForm; @@ -115,8 +115,10 @@ protected List createMenuList(AdminOptionMenuForm fo request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; if (organizations != null) { - if (organizations.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (organizations.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = organizations.size(); } @@ -151,7 +153,7 @@ protected String getDeactivateDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } // gnr: Deactivate not Delete diff --git a/src/main/java/org/openelisglobal/organization/daoimpl/OrganizationDAOImpl.java b/src/main/java/org/openelisglobal/organization/daoimpl/OrganizationDAOImpl.java index 720bd390ae..8c8122a077 100644 --- a/src/main/java/org/openelisglobal/organization/daoimpl/OrganizationDAOImpl.java +++ b/src/main/java/org/openelisglobal/organization/daoimpl/OrganizationDAOImpl.java @@ -26,8 +26,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.organization.dao.OrganizationDAO; import org.openelisglobal.organization.valueholder.Organization; import org.springframework.stereotype.Component; @@ -85,7 +85,9 @@ public List getPageOfOrganizations(int startingRecNo) throws LIMSR List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from Organization o order by o.organizationName"; @@ -114,7 +116,9 @@ public List getPagesOfSearchedOrganizations(int startingRecNo, Str String sql; try { - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); int wCdPosition = searchString.indexOf(wildCard); if (wCdPosition == -1) // no wild card looking for exact match diff --git a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java index c0a813ed51..1851c8ffdc 100644 --- a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java +++ b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java @@ -25,8 +25,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.panel.dao.PanelDAO; import org.openelisglobal.panel.valueholder.Panel; import org.springframework.stereotype.Component; @@ -113,7 +113,9 @@ public List getPageOfPanels(int startingRecNo) throws LIMSRuntimeExceptio List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from Panel p order by p.panelName"; diff --git a/src/main/java/org/openelisglobal/panelitem/daoimpl/PanelItemDAOImpl.java b/src/main/java/org/openelisglobal/panelitem/daoimpl/PanelItemDAOImpl.java index 52a780a3cd..23463d843c 100644 --- a/src/main/java/org/openelisglobal/panelitem/daoimpl/PanelItemDAOImpl.java +++ b/src/main/java/org/openelisglobal/panelitem/daoimpl/PanelItemDAOImpl.java @@ -22,8 +22,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.panelitem.dao.PanelItemDAO; import org.openelisglobal.panelitem.valueholder.PanelItem; import org.springframework.stereotype.Component; @@ -78,7 +78,9 @@ public List getPageOfPanelItems(int startingRecNo) throws LIMSRuntime List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from PanelItem p order by p.panel.panelName, p.testName"; Query query = entityManager.unwrap(Session.class).createQuery(sql, PanelItem.class); diff --git a/src/main/java/org/openelisglobal/patient/daoimpl/PatientDAOImpl.java b/src/main/java/org/openelisglobal/patient/daoimpl/PatientDAOImpl.java index 8975620d1a..37430e664c 100644 --- a/src/main/java/org/openelisglobal/patient/daoimpl/PatientDAOImpl.java +++ b/src/main/java/org/openelisglobal/patient/daoimpl/PatientDAOImpl.java @@ -25,8 +25,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.patient.dao.PatientDAO; import org.openelisglobal.patient.valueholder.Patient; import org.openelisglobal.person.valueholder.Person; @@ -123,7 +123,9 @@ public List getPageOfPatients(int startingRecNo) throws LIMSRuntimeExce List patients; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Patient t order by t.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Patient.class); diff --git a/src/main/java/org/openelisglobal/patient/saving/Accessioner.java b/src/main/java/org/openelisglobal/patient/saving/Accessioner.java index 8445772742..84fd9e70b8 100644 --- a/src/main/java/org/openelisglobal/patient/saving/Accessioner.java +++ b/src/main/java/org/openelisglobal/patient/saving/Accessioner.java @@ -55,9 +55,9 @@ import org.openelisglobal.common.services.StatusService.RecordStatus; import org.openelisglobal.common.services.StatusService.SampleStatus; import org.openelisglobal.common.services.StatusSet; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dataexchange.fhir.service.FhirTransformService; import org.openelisglobal.note.service.NoteService; import org.openelisglobal.note.service.NoteServiceImpl; @@ -716,7 +716,7 @@ protected void populateSample(Timestamp receivedDateForDisplay, Timestamp collec sample.setEnteredDateForDisplay(todayAsText); sample.setEnteredDate(today); } - sample.setDomain(SystemConfiguration.getInstance().getHumanDomain()); + sample.setDomain(ConfigurationProperties.getInstance().getPropertyValue("domain.human")); } protected void populateSampleProject() { @@ -924,7 +924,7 @@ protected void persistSampleItemsAndAnalysis() { Map itemsByType = findExistingSampleTypeItems(); int nextSortOrder = calcLastSortOrder(itemsByType) + 1; - String analysisRevision = SystemConfiguration.getInstance().getAnalysisDefaultRevision(); + String analysisRevision = ConfigurationProperties.getInstance().getPropertyValue("analysis.default.revision"); boolean newAnalysis = false; for (SampleItemAnalysisCollection sampleTestPair : sampleItemsAnalysis) { diff --git a/src/main/java/org/openelisglobal/patienttype/daoimpl/PatientTypeDAOImpl.java b/src/main/java/org/openelisglobal/patienttype/daoimpl/PatientTypeDAOImpl.java index 1378d01a8f..ea0c5017fa 100644 --- a/src/main/java/org/openelisglobal/patienttype/daoimpl/PatientTypeDAOImpl.java +++ b/src/main/java/org/openelisglobal/patienttype/daoimpl/PatientTypeDAOImpl.java @@ -19,8 +19,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.patienttype.dao.PatientTypeDAO; import org.openelisglobal.patienttype.valueholder.PatientType; import org.springframework.stereotype.Component; @@ -184,7 +184,9 @@ public List getPageOfPatientType(int startingRecNo) throws LIMSRunt List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from PatientType l order by l.type"; org.hibernate.query.Query query = entityManager.unwrap(Session.class).createQuery(sql); diff --git a/src/main/java/org/openelisglobal/person/daoimpl/PersonDAOImpl.java b/src/main/java/org/openelisglobal/person/daoimpl/PersonDAOImpl.java index 110ad82c98..614ec3174c 100644 --- a/src/main/java/org/openelisglobal/person/daoimpl/PersonDAOImpl.java +++ b/src/main/java/org/openelisglobal/person/daoimpl/PersonDAOImpl.java @@ -25,7 +25,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.person.dao.PersonDAO; import org.openelisglobal.person.valueholder.Person; import org.springframework.stereotype.Component; @@ -83,7 +83,9 @@ public List getPageOfPersons(int startingRecNo) throws LIMSRuntimeExcept List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Person t order by t.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Person.class); diff --git a/src/main/java/org/openelisglobal/project/daoimpl/ProjectDAOImpl.java b/src/main/java/org/openelisglobal/project/daoimpl/ProjectDAOImpl.java index c84b8df0f6..5c6e013eb4 100644 --- a/src/main/java/org/openelisglobal/project/daoimpl/ProjectDAOImpl.java +++ b/src/main/java/org/openelisglobal/project/daoimpl/ProjectDAOImpl.java @@ -24,9 +24,9 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.project.dao.ProjectDAO; import org.openelisglobal.project.valueholder.Project; import org.springframework.stereotype.Component; @@ -89,7 +89,9 @@ public List getPageOfProjects(int startingRecNo) throws LIMSRuntimeExce List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 // bugzilla 2438 order by local abbreviation diff --git a/src/main/java/org/openelisglobal/project/valueholder/Project.java b/src/main/java/org/openelisglobal/project/valueholder/Project.java index b8ffae16c6..4a4963e815 100644 --- a/src/main/java/org/openelisglobal/project/valueholder/Project.java +++ b/src/main/java/org/openelisglobal/project/valueholder/Project.java @@ -17,8 +17,9 @@ import java.sql.Date; import java.util.Set; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -217,7 +218,7 @@ public String getOpOpId() { public void setStartedDateForDisplay(String startedDateForDisplay) { this.startedDateForDisplay = startedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.startedDate = DateUtil.convertStringDateToSqlDate(this.startedDateForDisplay, locale); } @@ -228,7 +229,7 @@ public String getStartedDateForDisplay() { public void setCompletedDateForDisplay(String completedDateForDisplay) { this.completedDateForDisplay = completedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.completedDate = DateUtil.convertStringDateToSqlDate(completedDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/provider/controller/ProviderMenuController.java b/src/main/java/org/openelisglobal/provider/controller/ProviderMenuController.java index 51c084b75d..c9efdd6400 100644 --- a/src/main/java/org/openelisglobal/provider/controller/ProviderMenuController.java +++ b/src/main/java/org/openelisglobal/provider/controller/ProviderMenuController.java @@ -11,7 +11,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.provider.form.ProviderMenuForm; import org.openelisglobal.provider.service.ProviderService; @@ -91,8 +91,10 @@ protected List createMenuList(AdminOptionMenuForm form, Http request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; if (providers != null) { - if (providers.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (providers.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = providers.size(); } @@ -133,7 +135,7 @@ protected String getEditDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } // gnr: Deactivate not Delete diff --git a/src/main/java/org/openelisglobal/provider/controller/rest/ProviderMenuRestController.java b/src/main/java/org/openelisglobal/provider/controller/rest/ProviderMenuRestController.java index 9a83a3e6cc..d202e11465 100644 --- a/src/main/java/org/openelisglobal/provider/controller/rest/ProviderMenuRestController.java +++ b/src/main/java/org/openelisglobal/provider/controller/rest/ProviderMenuRestController.java @@ -10,7 +10,7 @@ import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.provider.form.ProviderMenuForm; import org.openelisglobal.provider.service.ProviderService; import org.openelisglobal.provider.valueholder.Provider; @@ -106,8 +106,10 @@ protected List createMenuList(AdminOptionMenuForm form, Http request.setAttribute(MENU_FROM_RECORD, String.valueOf(startingRecNo)); int numOfRecs = 0; if (providers != null) { - if (providers.size() > SystemConfiguration.getInstance().getDefaultPageSize()) { - numOfRecs = SystemConfiguration.getInstance().getDefaultPageSize(); + if (providers.size() > Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"))) { + numOfRecs = Integer + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } else { numOfRecs = providers.size(); } @@ -151,7 +153,7 @@ protected String getEditDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } // gnr: Deactivate not Delete diff --git a/src/main/java/org/openelisglobal/provider/daoimpl/ProviderDAOImpl.java b/src/main/java/org/openelisglobal/provider/daoimpl/ProviderDAOImpl.java index 62bd6be497..68ad51b9f0 100644 --- a/src/main/java/org/openelisglobal/provider/daoimpl/ProviderDAOImpl.java +++ b/src/main/java/org/openelisglobal/provider/daoimpl/ProviderDAOImpl.java @@ -22,7 +22,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.person.valueholder.Person; import org.openelisglobal.provider.dao.ProviderDAO; import org.openelisglobal.provider.valueholder.Provider; @@ -80,7 +80,9 @@ public List getPageOfProviders(int startingRecNo) throws LIMSRuntimeEx List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Provider p order by p.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Provider.class); @@ -157,7 +159,9 @@ public List getPagesOfSearchedProviders(int startingRecNo, String para List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Provider p where lower(p.person.firstName) like concat('%', lower(:searchValue)," + " '%') or lower(p.person.lastName) like concat('%', lower(:searchValue), '%') or" diff --git a/src/main/java/org/openelisglobal/qaevent/controller/RejectionController.java b/src/main/java/org/openelisglobal/qaevent/controller/RejectionController.java index 7acb5b2324..e568d035d4 100644 --- a/src/main/java/org/openelisglobal/qaevent/controller/RejectionController.java +++ b/src/main/java/org/openelisglobal/qaevent/controller/RejectionController.java @@ -20,7 +20,6 @@ import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.organization.service.OrganizationService; import org.openelisglobal.organization.valueholder.Organization; import org.openelisglobal.project.service.ProjectService; @@ -179,7 +178,7 @@ public ModelAndView showNonConformityUpdate(HttpServletRequest request, DateUtil.convertStringDateToTruncatedTimestamp(form.getCollectionDateForDisplay())); rejectedSample.setEnteredDate(DateUtil.getNowAsSqlDate()); rejectedSample.setPriority(OrderPriority.ROUTINE); - rejectedSample.setDomain(SystemConfiguration.getInstance().getHumanDomain()); + rejectedSample.setDomain(ConfigurationProperties.getInstance().getPropertyValue("domain.human")); rejectedSample.setStatusId(SpringContext.getBean(IStatusService.class).getStatusID(OrderStatus.Entered)); rejectedSample.setReceivedTimestamp( DateUtil.convertStringDateToTruncatedTimestamp(form.getReceptionDateForDisplay())); diff --git a/src/main/java/org/openelisglobal/qaevent/daoimpl/QaEventDAOImpl.java b/src/main/java/org/openelisglobal/qaevent/daoimpl/QaEventDAOImpl.java index 2b4a4580a6..6310b1267e 100644 --- a/src/main/java/org/openelisglobal/qaevent/daoimpl/QaEventDAOImpl.java +++ b/src/main/java/org/openelisglobal/qaevent/daoimpl/QaEventDAOImpl.java @@ -23,8 +23,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.qaevent.dao.QaEventDAO; import org.openelisglobal.qaevent.valueholder.QaEvent; import org.springframework.stereotype.Component; @@ -81,7 +81,9 @@ public List getPageOfQaEvents(int startingRecNo) throws LIMSRuntimeExce List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from QaEvent qe order by qe.qaEventName"; Query query = entityManager.unwrap(Session.class).createQuery(sql, QaEvent.class); diff --git a/src/main/java/org/openelisglobal/referencetables/daoimpl/ReferenceTablesDAOImpl.java b/src/main/java/org/openelisglobal/referencetables/daoimpl/ReferenceTablesDAOImpl.java index 6630c07b47..6d590a87c2 100644 --- a/src/main/java/org/openelisglobal/referencetables/daoimpl/ReferenceTablesDAOImpl.java +++ b/src/main/java/org/openelisglobal/referencetables/daoimpl/ReferenceTablesDAOImpl.java @@ -24,8 +24,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.referencetables.dao.ReferenceTablesDAO; import org.openelisglobal.referencetables.valueholder.ReferenceTables; import org.springframework.stereotype.Component; @@ -83,7 +83,9 @@ public List getPageOfReferenceTables(int startingRecNo) throws List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from ReferenceTables r order by r.tableName"; Query query = entityManager.unwrap(Session.class).createQuery(sql, ReferenceTables.class); diff --git a/src/main/java/org/openelisglobal/renamemethod/valueholder/RenameMethod.java b/src/main/java/org/openelisglobal/renamemethod/valueholder/RenameMethod.java index c54c30f714..8ab716c996 100644 --- a/src/main/java/org/openelisglobal/renamemethod/valueholder/RenameMethod.java +++ b/src/main/java/org/openelisglobal/renamemethod/valueholder/RenameMethod.java @@ -14,8 +14,9 @@ package org.openelisglobal.renamemethod.valueholder; import java.sql.Date; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.EnumValueItemImpl; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -109,7 +110,7 @@ public String getIsActive() { public void setActiveBeginDateForDisplay(String activeBeginDateForDisplay) { this.activeBeginDateForDisplay = activeBeginDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.activeBeginDate = DateUtil.convertStringDateToSqlDate(this.activeBeginDateForDisplay, locale); } @@ -120,7 +121,7 @@ public String getActiveBeginDateForDisplay() { public void setActiveEndDateForDisplay(String activeEndDateForDisplay) { this.activeEndDateForDisplay = activeEndDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.activeEndDate = DateUtil.convertStringDateToSqlDate(activeEndDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/renametestsection/daoimpl/RenameTestSectionDAOImpl.java b/src/main/java/org/openelisglobal/renametestsection/daoimpl/RenameTestSectionDAOImpl.java index c5de3492d1..4fa9a00366 100644 --- a/src/main/java/org/openelisglobal/renametestsection/daoimpl/RenameTestSectionDAOImpl.java +++ b/src/main/java/org/openelisglobal/renametestsection/daoimpl/RenameTestSectionDAOImpl.java @@ -23,8 +23,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.renametestsection.dao.RenameTestSectionDAO; import org.openelisglobal.renametestsection.valueholder.RenameTestSection; import org.springframework.stereotype.Component; @@ -84,7 +84,9 @@ public List getPageOfTestSections(int startingRecNo) throws L List list = new Vector<>(); try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from TestSection t order by t.testSectionName"; diff --git a/src/main/java/org/openelisglobal/result/daoimpl/ResultDAOImpl.java b/src/main/java/org/openelisglobal/result/daoimpl/ResultDAOImpl.java index 7234fdb08c..7a798c6331 100644 --- a/src/main/java/org/openelisglobal/result/daoimpl/ResultDAOImpl.java +++ b/src/main/java/org/openelisglobal/result/daoimpl/ResultDAOImpl.java @@ -27,7 +27,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.result.dao.ResultDAO; import org.openelisglobal.result.valueholder.Result; import org.openelisglobal.sample.valueholder.Sample; @@ -172,7 +172,9 @@ public List getPageOfResults(int startingRecNo) throws LIMSRuntimeExcept List results; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Result r order by r.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Result.class); diff --git a/src/main/java/org/openelisglobal/resultlimits/daoimpl/ResultLimitDAOImpl.java b/src/main/java/org/openelisglobal/resultlimits/daoimpl/ResultLimitDAOImpl.java index c171ea2384..fac773b617 100644 --- a/src/main/java/org/openelisglobal/resultlimits/daoimpl/ResultLimitDAOImpl.java +++ b/src/main/java/org/openelisglobal/resultlimits/daoimpl/ResultLimitDAOImpl.java @@ -25,7 +25,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.resultlimits.dao.ResultLimitDAO; import org.openelisglobal.resultlimits.valueholder.ResultLimit; import org.springframework.stereotype.Component; @@ -77,7 +77,9 @@ public List getPageOfResultLimits(int startingRecNo) throws LIMSRun List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from ResultLimit t order by t.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, ResultLimit.class); diff --git a/src/main/java/org/openelisglobal/role/daoimpl/RoleDAOImpl.java b/src/main/java/org/openelisglobal/role/daoimpl/RoleDAOImpl.java index e1f9d86840..303ef86319 100644 --- a/src/main/java/org/openelisglobal/role/daoimpl/RoleDAOImpl.java +++ b/src/main/java/org/openelisglobal/role/daoimpl/RoleDAOImpl.java @@ -26,7 +26,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.role.dao.RoleDAO; import org.openelisglobal.role.valueholder.Role; import org.springframework.stereotype.Component; @@ -92,7 +92,9 @@ public List getPageOfRoles(int startingRecNo) throws LIMSRuntimeException List list = null; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Role r order by r.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Role.class); diff --git a/src/main/java/org/openelisglobal/sample/action/util/SamplePatientUpdateData.java b/src/main/java/org/openelisglobal/sample/action/util/SamplePatientUpdateData.java index 21ad8ebf41..00e83b1cdf 100644 --- a/src/main/java/org/openelisglobal/sample/action/util/SamplePatientUpdateData.java +++ b/src/main/java/org/openelisglobal/sample/action/util/SamplePatientUpdateData.java @@ -35,7 +35,6 @@ import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dataexchange.order.valueholder.ElectronicOrder; import org.openelisglobal.dataexchange.service.order.ElectronicOrderService; import org.openelisglobal.observationhistory.service.ObservationHistoryService; @@ -322,7 +321,7 @@ public void createPopulatedSample(String receivedDate, SampleOrderItem sampleOrd sample.setCollectionDateForDisplay(collectionDateFromReceiveDate); } - sample.setDomain(SystemConfiguration.getInstance().getHumanDomain()); + sample.setDomain(ConfigurationProperties.getInstance().getPropertyValue("domain.human")); sample.setStatusId(SpringContext.getBean(IStatusService.class).getStatusID(OrderStatus.Entered)); setElectronicOrderIfNeeded(sampleOrder); diff --git a/src/main/java/org/openelisglobal/sample/daoimpl/SampleDAOImpl.java b/src/main/java/org/openelisglobal/sample/daoimpl/SampleDAOImpl.java index a9c685ce07..3c99fce551 100644 --- a/src/main/java/org/openelisglobal/sample/daoimpl/SampleDAOImpl.java +++ b/src/main/java/org/openelisglobal/sample/daoimpl/SampleDAOImpl.java @@ -32,8 +32,9 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.sample.dao.SampleDAO; import org.openelisglobal.sample.valueholder.OrderPriority; import org.openelisglobal.sample.valueholder.Sample; @@ -88,7 +89,9 @@ public List getPageOfSamples(int startingRecNo) throws LIMSRuntimeExcept try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from Sample s order by s.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, Sample.class); @@ -353,7 +356,7 @@ public List getSamplesWithPendingQaEvents(Sample sample, boolean filterB } List statusesToExclude = new ArrayList<>(); - statusesToExclude.add(SystemConfiguration.getInstance().getAnalysisStatusCanceled()); + statusesToExclude.add(ConfigurationProperties.getInstance().getPropertyValue("analysis.status.canceled")); query.setParameterList("param3", statusesToExclude); list = query.list(); } catch (RuntimeException e) { @@ -427,7 +430,7 @@ public List getSamplesCollectedOn(String collectionDate) throws LIMSRunt } private Calendar getCalendarForDateString(String recievedDate) { - String localeName = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String localeName = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); Locale locale = new Locale(localeName); Calendar calendar = Calendar.getInstance(locale); diff --git a/src/main/java/org/openelisglobal/sample/form/SampleEditForm.java b/src/main/java/org/openelisglobal/sample/form/SampleEditForm.java index 69901bc74e..a59905c665 100644 --- a/src/main/java/org/openelisglobal/sample/form/SampleEditForm.java +++ b/src/main/java/org/openelisglobal/sample/form/SampleEditForm.java @@ -8,7 +8,6 @@ import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.IdValuePair; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.util.validator.CustomDateValidator.DateRelation; import org.openelisglobal.common.validator.ValidationHelper; import org.openelisglobal.patient.action.bean.PatientSearch; @@ -98,7 +97,7 @@ public interface SampleEdit { private Boolean warning = false; // in validator - private String idSeparator = SystemConfiguration.getInstance().getDefaultIdSeparator(); + private String idSeparator = ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator"); // in validator private String accessionFormat = ConfigurationProperties.getInstance().getPropertyValue(Property.AccessionFormat); diff --git a/src/main/java/org/openelisglobal/sample/service/SamplePatientEntryServiceImpl.java b/src/main/java/org/openelisglobal/sample/service/SamplePatientEntryServiceImpl.java index f21f3e8170..c49ef50f49 100644 --- a/src/main/java/org/openelisglobal/sample/service/SamplePatientEntryServiceImpl.java +++ b/src/main/java/org/openelisglobal/sample/service/SamplePatientEntryServiceImpl.java @@ -18,9 +18,9 @@ import org.openelisglobal.common.services.SampleAddService.SampleTestCollection; import org.openelisglobal.common.services.StatusService.AnalysisStatus; import org.openelisglobal.common.services.TableIdService; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.IdValuePair; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.dataexchange.service.order.ElectronicOrderService; import org.openelisglobal.note.service.NoteService; import org.openelisglobal.note.service.NoteServiceImpl.NoteType; @@ -201,7 +201,7 @@ private void persistProviderData(SamplePatientUpdateData updateData) { } private void persistSampleData(SamplePatientUpdateData updateData) { - String analysisRevision = SystemConfiguration.getInstance().getAnalysisDefaultRevision(); + String analysisRevision = ConfigurationProperties.getInstance().getPropertyValue("analysis.default.revision"); updateData.getSample().setFhirUuid(UUID.randomUUID()); sampleService.insertDataWithAccessionNumber(updateData.getSample()); diff --git a/src/main/java/org/openelisglobal/sample/validator/SampleEditFormValidator.java b/src/main/java/org/openelisglobal/sample/validator/SampleEditFormValidator.java index 5ed26421a2..9668caeb32 100644 --- a/src/main/java/org/openelisglobal/sample/validator/SampleEditFormValidator.java +++ b/src/main/java/org/openelisglobal/sample/validator/SampleEditFormValidator.java @@ -9,7 +9,6 @@ import org.openelisglobal.common.provider.validation.IAccessionNumberValidator.ValidationResults; import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.ConfigurationProperties.Property; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.util.validator.CustomDateValidator.DateRelation; import org.openelisglobal.common.validator.ValidationHelper; import org.openelisglobal.sample.form.SampleEditForm; @@ -41,7 +40,7 @@ public void validate(Object target, Errors errors) { validateSampleXML(form.getSampleXML(), errors); ValidationHelper.validateOptionField(form.getIdSeparator(), "idSeperator", errors, - new String[] { SystemConfiguration.getInstance().getDefaultIdSeparator() }); + new String[] { ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator") }); ValidationHelper.validateOptionField(form.getAccessionFormat(), "accessionFormat", errors, new String[] { ConfigurationProperties.getInstance().getPropertyValue(Property.AccessionFormat) }); diff --git a/src/main/java/org/openelisglobal/sample/valueholder/Sample.java b/src/main/java/org/openelisglobal/sample/valueholder/Sample.java index 7c21d2b6d0..54f8ae35bb 100644 --- a/src/main/java/org/openelisglobal/sample/valueholder/Sample.java +++ b/src/main/java/org/openelisglobal/sample/valueholder/Sample.java @@ -19,8 +19,9 @@ import java.util.List; import java.util.UUID; import org.apache.commons.validator.GenericValidator; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.EnumValueItemImpl; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -292,7 +293,7 @@ public String getReleasedDateForDisplay() { public void setReleasedDateForDisplay(String releasedDateForDisplay) { this.releasedDateForDisplay = releasedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); releasedDate = DateUtil.convertStringDateToSqlDate(releasedDateForDisplay, locale); } @@ -306,7 +307,7 @@ public String getTransmissionDateForDisplay() { public void setTransmissionDateForDisplay(String transmissionDateForDisplay) { this.transmissionDateForDisplay = transmissionDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); transmissionDate = DateUtil.convertStringDateToSqlDate(transmissionDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/sampleitem/daoimpl/SampleItemDAOImpl.java b/src/main/java/org/openelisglobal/sampleitem/daoimpl/SampleItemDAOImpl.java index aaab9f7c25..a43cb50439 100644 --- a/src/main/java/org/openelisglobal/sampleitem/daoimpl/SampleItemDAOImpl.java +++ b/src/main/java/org/openelisglobal/sampleitem/daoimpl/SampleItemDAOImpl.java @@ -26,7 +26,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.sampleitem.dao.SampleItemDAO; import org.openelisglobal.sampleitem.valueholder.SampleItem; import org.openelisglobal.sourceofsample.valueholder.SourceOfSample; @@ -96,7 +96,9 @@ public List getPageOfSampleItems(int startingRecNo) throws LIMSRunti List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from SampleItem s order by s.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, SampleItem.class); diff --git a/src/main/java/org/openelisglobal/sampleqaevent/valueholder/SampleQaEvent.java b/src/main/java/org/openelisglobal/sampleqaevent/valueholder/SampleQaEvent.java index a454a17fa4..f44e63c22e 100644 --- a/src/main/java/org/openelisglobal/sampleqaevent/valueholder/SampleQaEvent.java +++ b/src/main/java/org/openelisglobal/sampleqaevent/valueholder/SampleQaEvent.java @@ -16,8 +16,9 @@ import java.sql.Date; import java.sql.Timestamp; import org.openelisglobal.common.services.QAService; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -135,7 +136,7 @@ public String getCompletedDateForDisplay() { public void setCompletedDateForDisplay(String completedDateForDisplay) { this.completedDateForDisplay = completedDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); completedDate = DateUtil.convertStringDateToSqlDate(completedDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/sampleqaeventaction/valueholder/SampleQaEventAction.java b/src/main/java/org/openelisglobal/sampleqaeventaction/valueholder/SampleQaEventAction.java index 574ed5b52a..33f6362e7d 100644 --- a/src/main/java/org/openelisglobal/sampleqaeventaction/valueholder/SampleQaEventAction.java +++ b/src/main/java/org/openelisglobal/sampleqaeventaction/valueholder/SampleQaEventAction.java @@ -15,8 +15,9 @@ import java.sql.Date; import org.openelisglobal.action.valueholder.Action; +import org.openelisglobal.common.util.ConfigurationProperties; +import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.common.util.DateUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.valueholder.BaseObject; import org.openelisglobal.common.valueholder.ValueHolder; import org.openelisglobal.common.valueholder.ValueHolderInterface; @@ -127,7 +128,7 @@ public String getCreatedDateForDisplay() { public void setCreatedDateForDisplay(String createdDateForDisplay) { this.createdDateForDisplay = createdDateForDisplay; // also update the java.sql.Date - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); + String locale = ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_LANG_LOCALE); this.createdDate = DateUtil.convertStringDateToSqlDate(createdDateForDisplay, locale); } diff --git a/src/main/java/org/openelisglobal/scriptlet/daoimpl/ScriptletDAOImpl.java b/src/main/java/org/openelisglobal/scriptlet/daoimpl/ScriptletDAOImpl.java index 908d9b62f4..90c29ee9a3 100644 --- a/src/main/java/org/openelisglobal/scriptlet/daoimpl/ScriptletDAOImpl.java +++ b/src/main/java/org/openelisglobal/scriptlet/daoimpl/ScriptletDAOImpl.java @@ -22,8 +22,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.scriptlet.dao.ScriptletDAO; import org.openelisglobal.scriptlet.valueholder.Scriptlet; import org.springframework.stereotype.Component; @@ -82,7 +82,9 @@ public List getPageOfScriptlets(int startingRecNo) throws LIMSRuntime List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from Scriptlet s order by s.scriptletName"; diff --git a/src/main/java/org/openelisglobal/security/login/BasicAuthFilter.java b/src/main/java/org/openelisglobal/security/login/BasicAuthFilter.java index 161fa567b4..f668e77c25 100644 --- a/src/main/java/org/openelisglobal/security/login/BasicAuthFilter.java +++ b/src/main/java/org/openelisglobal/security/login/BasicAuthFilter.java @@ -5,7 +5,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import org.openelisglobal.common.action.IActionConstants; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.login.service.LoginUserService; import org.openelisglobal.login.valueholder.LoginUser; import org.openelisglobal.login.valueholder.UserSessionData; @@ -58,7 +58,7 @@ private void setupUserRequest(HttpServletRequest request, LoginUser loginInfo) { request.getSession().setAttribute(IActionConstants.USER_SESSION_DATA, usd); // get permitted actions map (available modules for the current user) - if (SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + if (ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { Set permittedPages = getPermittedForms(usd.getSystemUserId()); request.setAttribute(IActionConstants.PERMITTED_ACTIONS_MAP, permittedPages); // showAdminMenu |= permittedPages.contains("MasterList"); diff --git a/src/main/java/org/openelisglobal/security/login/CustomFormAuthenticationSuccessHandler.java b/src/main/java/org/openelisglobal/security/login/CustomFormAuthenticationSuccessHandler.java index 485c9a9829..1bbe2f9b15 100644 --- a/src/main/java/org/openelisglobal/security/login/CustomFormAuthenticationSuccessHandler.java +++ b/src/main/java/org/openelisglobal/security/login/CustomFormAuthenticationSuccessHandler.java @@ -14,7 +14,7 @@ import org.openelisglobal.common.action.IActionConstants; import org.openelisglobal.common.constants.Constants; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.login.service.LoginUserService; import org.openelisglobal.login.valueholder.LoginUser; @@ -159,7 +159,7 @@ private void setupUserSession(HttpServletRequest request, LoginUser loginInfo) { request.getSession().setAttribute("timezone", timezone); // get permitted actions map (available modules for the current user) - if (SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + if (ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { Set permittedPages = getPermittedForms(usd.getSystemUserId()); request.getSession().setAttribute(IActionConstants.PERMITTED_ACTIONS_MAP, permittedPages); // showAdminMenu |= permittedPages.contains("MasterList"); @@ -182,9 +182,9 @@ private Set getPermittedForms(int systemUserId) { private boolean passwordExpiringSoon(LoginUser loginInfo) { return loginInfo.getPasswordExpiredDayNo() <= Integer - .parseInt(SystemConfiguration.getInstance().getLoginUserPasswordExpiredReminderDay()) - && (loginInfo.getPasswordExpiredDayNo() > Integer - .parseInt(SystemConfiguration.getInstance().getLoginUserChangePasswordAllowDay())); + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("login.user.expired.reminder.day")) + && (loginInfo.getPasswordExpiredDayNo() > Integer.parseInt( + ConfigurationProperties.getInstance().getPropertyValue("login.user.change.allow.day"))); } protected void clearCustomAuthenticationAttributes(HttpServletRequest request) { diff --git a/src/main/java/org/openelisglobal/security/login/CustomSSOAuthenticationSuccessHandler.java b/src/main/java/org/openelisglobal/security/login/CustomSSOAuthenticationSuccessHandler.java index badbc277b7..d10b23fcf0 100644 --- a/src/main/java/org/openelisglobal/security/login/CustomSSOAuthenticationSuccessHandler.java +++ b/src/main/java/org/openelisglobal/security/login/CustomSSOAuthenticationSuccessHandler.java @@ -17,7 +17,7 @@ import org.openelisglobal.common.action.IActionConstants; import org.openelisglobal.common.constants.Constants; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.validator.GenericValidator; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.login.service.LoginUserService; @@ -246,7 +246,7 @@ private void setupUserSession(HttpServletRequest request, DefaultSaml2Authentica request.getSession().setAttribute("timezone", timezone); // get permitted actions map (available modules for the current user) - if (SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + if (ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { Set permittedPages = getPermittedForms(authorities); request.getSession().setAttribute(IActionConstants.PERMITTED_ACTIONS_MAP, permittedPages); // showAdminMenu |= permittedPages.contains("MasterList"); @@ -293,7 +293,7 @@ private void setupUserSession(HttpServletRequest request, DefaultOAuth2User prin request.getSession().setAttribute("timezone", timezone); // get permitted actions map (available modules for the current user) - if (SystemConfiguration.getInstance().getPermissionAgent().equals("ROLE")) { + if (ConfigurationProperties.getInstance().getPropertyValue("permissions.agent").equals("ROLE")) { Set permittedPages = getPermittedForms(authorities); request.getSession().setAttribute(IActionConstants.PERMITTED_ACTIONS_MAP, permittedPages); // showAdminMenu |= permittedPages.contains("MasterList"); @@ -351,9 +351,9 @@ private Set getPermittedForms(int systemUserId) { private boolean passwordExpiringSoon(LoginUser loginInfo) { return loginInfo.getPasswordExpiredDayNo() <= Integer - .parseInt(SystemConfiguration.getInstance().getLoginUserPasswordExpiredReminderDay()) - && (loginInfo.getPasswordExpiredDayNo() > Integer - .parseInt(SystemConfiguration.getInstance().getLoginUserChangePasswordAllowDay())); + .parseInt(ConfigurationProperties.getInstance().getPropertyValue("login.user.expired.reminder.day")) + && (loginInfo.getPasswordExpiredDayNo() > Integer.parseInt( + ConfigurationProperties.getInstance().getPropertyValue("login.user.change.allow.day"))); } protected void clearCustomAuthenticationAttributes(HttpServletRequest request) { diff --git a/src/main/java/org/openelisglobal/siteinformation/daoimpl/SiteInformationDAOImpl.java b/src/main/java/org/openelisglobal/siteinformation/daoimpl/SiteInformationDAOImpl.java index d0091d4d31..cc5e901dc0 100644 --- a/src/main/java/org/openelisglobal/siteinformation/daoimpl/SiteInformationDAOImpl.java +++ b/src/main/java/org/openelisglobal/siteinformation/daoimpl/SiteInformationDAOImpl.java @@ -25,7 +25,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.siteinformation.dao.SiteInformationDAO; import org.openelisglobal.siteinformation.valueholder.SiteInformation; import org.springframework.stereotype.Component; @@ -79,7 +79,9 @@ public List getPageOfSiteInformationByDomainName(int startingRe List list = new ArrayList<>(); try { - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from SiteInformation si where si.domain.name = :domainName order by si.name"; Query query = entityManager.unwrap(Session.class).createQuery(sql, SiteInformation.class); diff --git a/src/main/java/org/openelisglobal/statusofsample/daoimpl/StatusOfSampleDAOImpl.java b/src/main/java/org/openelisglobal/statusofsample/daoimpl/StatusOfSampleDAOImpl.java index 6d14760ccc..55d1c1c1d9 100644 --- a/src/main/java/org/openelisglobal/statusofsample/daoimpl/StatusOfSampleDAOImpl.java +++ b/src/main/java/org/openelisglobal/statusofsample/daoimpl/StatusOfSampleDAOImpl.java @@ -21,8 +21,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.statusofsample.dao.StatusOfSampleDAO; import org.openelisglobal.statusofsample.valueholder.StatusOfSample; import org.springframework.stereotype.Component; @@ -129,7 +129,9 @@ public List getPageOfStatusOfSamples(int startingRecNo) throws L List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from StatusOfSample s order by s.statusType, s.code"; diff --git a/src/main/java/org/openelisglobal/systemmodule/daoimpl/SystemModuleDAOImpl.java b/src/main/java/org/openelisglobal/systemmodule/daoimpl/SystemModuleDAOImpl.java index 92cd1d7c25..0339ad0773 100644 --- a/src/main/java/org/openelisglobal/systemmodule/daoimpl/SystemModuleDAOImpl.java +++ b/src/main/java/org/openelisglobal/systemmodule/daoimpl/SystemModuleDAOImpl.java @@ -22,8 +22,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.systemmodule.dao.SystemModuleDAO; import org.openelisglobal.systemmodule.valueholder.SystemModule; import org.springframework.stereotype.Component; @@ -79,7 +79,9 @@ public List getPageOfSystemModules(int startingRecNo) throws LIMSR List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from SystemModule s order by s.systemModuleName"; Query query = entityManager.unwrap(Session.class).createQuery(sql, SystemModule.class); diff --git a/src/main/java/org/openelisglobal/systemuser/controller/UnifiedSystemUserMenuController.java b/src/main/java/org/openelisglobal/systemuser/controller/UnifiedSystemUserMenuController.java index 807424cd00..9bff910163 100644 --- a/src/main/java/org/openelisglobal/systemuser/controller/UnifiedSystemUserMenuController.java +++ b/src/main/java/org/openelisglobal/systemuser/controller/UnifiedSystemUserMenuController.java @@ -15,9 +15,9 @@ import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.services.DisplayListService; import org.openelisglobal.common.services.DisplayListService.ListType; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.IdValuePair; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.login.service.LoginUserService; import org.openelisglobal.login.valueholder.LoginUser; @@ -241,7 +241,7 @@ protected String getDeactivateDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } @RequestMapping(value = "/DeleteUnifiedSystemUser", method = RequestMethod.POST) diff --git a/src/main/java/org/openelisglobal/systemuser/controller/rest/UnifiedSystemUserMenuRestController.java b/src/main/java/org/openelisglobal/systemuser/controller/rest/UnifiedSystemUserMenuRestController.java index ee4b867fef..a05431b50f 100644 --- a/src/main/java/org/openelisglobal/systemuser/controller/rest/UnifiedSystemUserMenuRestController.java +++ b/src/main/java/org/openelisglobal/systemuser/controller/rest/UnifiedSystemUserMenuRestController.java @@ -14,9 +14,9 @@ import org.openelisglobal.common.form.AdminOptionMenuForm; import org.openelisglobal.common.services.DisplayListService; import org.openelisglobal.common.services.DisplayListService.ListType; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.DateUtil; import org.openelisglobal.common.util.IdValuePair; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.common.validator.BaseErrors; import org.openelisglobal.login.service.LoginUserService; import org.openelisglobal.login.valueholder.LoginUser; @@ -255,7 +255,7 @@ protected String getDeactivateDisabled() { @Override protected int getPageSize() { - return SystemConfiguration.getInstance().getDefaultPageSize(); + return Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")); } @PostMapping(value = "/DeleteUnifiedSystemUser") diff --git a/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java b/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java index 65c456f26d..8adea37e47 100644 --- a/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java +++ b/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java @@ -22,8 +22,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.systemuser.dao.SystemUserDAO; import org.openelisglobal.systemuser.valueholder.SystemUser; import org.springframework.stereotype.Component; @@ -81,7 +81,9 @@ public List getPageOfSystemUsers(int startingRecNo) throws LIMSRunti List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from SystemUser s order by s.lastName, s.firstName"; diff --git a/src/main/java/org/openelisglobal/systemusermodule/daoimpl/RoleModuleDAOImpl.java b/src/main/java/org/openelisglobal/systemusermodule/daoimpl/RoleModuleDAOImpl.java index a8514cd7a8..9c2e53ad24 100644 --- a/src/main/java/org/openelisglobal/systemusermodule/daoimpl/RoleModuleDAOImpl.java +++ b/src/main/java/org/openelisglobal/systemusermodule/daoimpl/RoleModuleDAOImpl.java @@ -25,8 +25,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.systemusermodule.dao.RoleModuleDAO; import org.openelisglobal.systemusermodule.valueholder.RoleModule; import org.springframework.beans.factory.annotation.Qualifier; @@ -99,7 +99,9 @@ public List getPageOfPermissionModules(int startingRecNo) throws LIM List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from RoleModule s order by s.role.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, RoleModule.class); diff --git a/src/main/java/org/openelisglobal/systemusermodule/daoimpl/SystemUserModuleDAOImpl.java b/src/main/java/org/openelisglobal/systemusermodule/daoimpl/SystemUserModuleDAOImpl.java index c07f4ae224..f948115849 100644 --- a/src/main/java/org/openelisglobal/systemusermodule/daoimpl/SystemUserModuleDAOImpl.java +++ b/src/main/java/org/openelisglobal/systemusermodule/daoimpl/SystemUserModuleDAOImpl.java @@ -24,8 +24,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.systemusermodule.dao.SystemUserModuleDAO; import org.openelisglobal.systemusermodule.valueholder.SystemUserModule; import org.springframework.beans.factory.annotation.Qualifier; @@ -105,7 +105,9 @@ public List getPageOfPermissionModules(int startingRecNo) thro List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from SystemUserModule s order by s.systemUser.id"; Query query = entityManager.unwrap(Session.class).createQuery(sql, diff --git a/src/main/java/org/openelisglobal/systemusermodule/service/PermissionModuleServiceImpl.java b/src/main/java/org/openelisglobal/systemusermodule/service/PermissionModuleServiceImpl.java index 24097c5e84..993e460003 100644 --- a/src/main/java/org/openelisglobal/systemusermodule/service/PermissionModuleServiceImpl.java +++ b/src/main/java/org/openelisglobal/systemusermodule/service/PermissionModuleServiceImpl.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.rolemodule.service.RoleModuleService; import org.openelisglobal.systemusermodule.valueholder.PermissionModule; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ public class PermissionModuleServiceImpl implements PermissionModuleService getPageOfSystemUserSections(int startingRecNo) th List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from SystemUserSection s "; Query query = entityManager.unwrap(Session.class).createQuery(sql, diff --git a/src/main/java/org/openelisglobal/test/daoimpl/TestDAOImpl.java b/src/main/java/org/openelisglobal/test/daoimpl/TestDAOImpl.java index 46e16a9e66..64c23306f8 100644 --- a/src/main/java/org/openelisglobal/test/daoimpl/TestDAOImpl.java +++ b/src/main/java/org/openelisglobal/test/daoimpl/TestDAOImpl.java @@ -29,8 +29,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.method.valueholder.Method; import org.openelisglobal.panel.valueholder.Panel; import org.openelisglobal.test.dao.TestDAO; @@ -122,7 +122,9 @@ public List getPageOfTests(int startingRecNo) throws LIMSRuntimeException List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from Test t order by t.testSection.testSectionName"; @@ -150,7 +152,9 @@ public List getPageOfSearchedTests(int startingRecNo, String searchString) String sql; try { - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); int wCdPosition = searchString.indexOf(wildCard); if (wCdPosition == -1) // no wild card looking for exact match diff --git a/src/main/java/org/openelisglobal/test/daoimpl/TestSectionDAOImpl.java b/src/main/java/org/openelisglobal/test/daoimpl/TestSectionDAOImpl.java index 6fd56d3c22..1e2155d533 100644 --- a/src/main/java/org/openelisglobal/test/daoimpl/TestSectionDAOImpl.java +++ b/src/main/java/org/openelisglobal/test/daoimpl/TestSectionDAOImpl.java @@ -23,8 +23,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.test.dao.TestSectionDAO; import org.openelisglobal.test.valueholder.TestSection; import org.springframework.stereotype.Component; @@ -109,7 +109,9 @@ public List getPageOfTestSections(int startingRecNo) throws LIMSRun List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from TestSection t order by t.organization.organizationName, t.testSectionName"; diff --git a/src/main/java/org/openelisglobal/test/service/TestSectionServiceImpl.java b/src/main/java/org/openelisglobal/test/service/TestSectionServiceImpl.java index dbe3e777c4..bc7c607b05 100644 --- a/src/main/java/org/openelisglobal/test/service/TestSectionServiceImpl.java +++ b/src/main/java/org/openelisglobal/test/service/TestSectionServiceImpl.java @@ -8,7 +8,7 @@ import org.openelisglobal.common.exception.LIMSDuplicateRecordException; import org.openelisglobal.common.service.AuditableBaseObjectServiceImpl; import org.openelisglobal.common.util.LocaleChangeListener; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.internationalization.GlobalLocaleResolver; import org.openelisglobal.systemusersection.service.SystemUserSectionService; import org.openelisglobal.systemusersection.valueholder.SystemUserSection; import org.openelisglobal.test.dao.TestSectionDAO; @@ -18,6 +18,7 @@ import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.servlet.LocaleResolver; @Service @DependsOn({ "springContext" }) @@ -30,6 +31,8 @@ public class TestSectionServiceImpl extends AuditableBaseObjectServiceImpl getPageOfTestAnalytes(int startingRecNo) throws LIMSRun List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from TestAnalyte t order by t.id"; org.hibernate.query.Query query = entityManager.unwrap(Session.class).createQuery(sql, diff --git a/src/main/java/org/openelisglobal/testreflex/daoimpl/TestReflexDAOImpl.java b/src/main/java/org/openelisglobal/testreflex/daoimpl/TestReflexDAOImpl.java index 36932c9e7a..0323748a4d 100644 --- a/src/main/java/org/openelisglobal/testreflex/daoimpl/TestReflexDAOImpl.java +++ b/src/main/java/org/openelisglobal/testreflex/daoimpl/TestReflexDAOImpl.java @@ -24,8 +24,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.testanalyte.valueholder.TestAnalyte; import org.openelisglobal.testreflex.dao.TestReflexDAO; import org.openelisglobal.testreflex.valueholder.TestReflex; @@ -86,7 +86,9 @@ public List getPageOfTestReflexs(int startingRecNo) throws LIMSRunti List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 - still need to figure out how to sort (3rd sort // column) for dictionary values - requires further step of getting diff --git a/src/main/java/org/openelisglobal/testresult/daoimpl/TestResultDAOImpl.java b/src/main/java/org/openelisglobal/testresult/daoimpl/TestResultDAOImpl.java index 0ff10a8572..d566961f1b 100644 --- a/src/main/java/org/openelisglobal/testresult/daoimpl/TestResultDAOImpl.java +++ b/src/main/java/org/openelisglobal/testresult/daoimpl/TestResultDAOImpl.java @@ -24,8 +24,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.test.valueholder.Test; import org.openelisglobal.testanalyte.valueholder.TestAnalyte; import org.openelisglobal.testresult.dao.TestResultDAO; @@ -84,7 +84,9 @@ public List getPageOfTestResults(int startingRecNo) throws LIMSRunti List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); String sql = "from TestResult t order by t.test.description"; Query query = entityManager.unwrap(Session.class).createQuery(sql, TestResult.class); query.setFirstResult(startingRecNo - 1); diff --git a/src/main/java/org/openelisglobal/testtrailer/daoimpl/TestTrailerDAOImpl.java b/src/main/java/org/openelisglobal/testtrailer/daoimpl/TestTrailerDAOImpl.java index 4b7bf5da0d..23615b7711 100644 --- a/src/main/java/org/openelisglobal/testtrailer/daoimpl/TestTrailerDAOImpl.java +++ b/src/main/java/org/openelisglobal/testtrailer/daoimpl/TestTrailerDAOImpl.java @@ -22,8 +22,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.testtrailer.dao.TestTrailerDAO; import org.openelisglobal.testtrailer.valueholder.TestTrailer; import org.springframework.stereotype.Component; @@ -200,7 +200,9 @@ public List getPageOfTestTrailers(int startingRecNo) throws LIMSRun List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from TestTrailer t order by t.testTrailerName"; diff --git a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleDAOImpl.java b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleDAOImpl.java index 40ae6a745d..f300532363 100644 --- a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleDAOImpl.java +++ b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleDAOImpl.java @@ -27,8 +27,8 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.common.util.StringUtil; -import org.openelisglobal.common.util.SystemConfiguration; import org.openelisglobal.test.valueholder.Test; import org.openelisglobal.typeofsample.dao.TypeOfSampleDAO; import org.openelisglobal.typeofsample.valueholder.TypeOfSample; @@ -110,7 +110,9 @@ public List getPageOfTypeOfSamples(int startingRecNo) throws LIMSR List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + (SystemConfiguration.getInstance().getDefaultPageSize() + 1); + int endingRecNo = startingRecNo + + (Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1); // bugzilla 1399 String sql = "from TypeOfSample t order by t.domain, t.description"; diff --git a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSamplePanelDAOImpl.java b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSamplePanelDAOImpl.java index 7a20d21279..78667303f5 100644 --- a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSamplePanelDAOImpl.java +++ b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSamplePanelDAOImpl.java @@ -25,6 +25,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.typeofsample.dao.TypeOfSamplePanelDAO; import org.openelisglobal.typeofsample.valueholder.TypeOfSamplePanel; import org.springframework.stereotype.Component; @@ -82,7 +83,9 @@ public List getPageOfTypeOfSamplePanel(int startingRecNo) thr List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + DEFAULT_PAGE_SIZE + 1; + int endingRecNo = startingRecNo + + Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1; String sql = "from TypeOfSamplePanel t order by t.typeOfSampleId, t.panelId"; Query query = entityManager.unwrap(Session.class).createQuery(sql, diff --git a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleTestDAOImpl.java b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleTestDAOImpl.java index 75f4537147..db0572a2bd 100644 --- a/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleTestDAOImpl.java +++ b/src/main/java/org/openelisglobal/typeofsample/daoimpl/TypeOfSampleTestDAOImpl.java @@ -23,6 +23,7 @@ import org.openelisglobal.common.daoimpl.BaseDAOImpl; import org.openelisglobal.common.exception.LIMSRuntimeException; import org.openelisglobal.common.log.LogEvent; +import org.openelisglobal.common.util.ConfigurationProperties; import org.openelisglobal.typeofsample.dao.TypeOfSampleTestDAO; import org.openelisglobal.typeofsample.valueholder.TypeOfSampleTest; import org.springframework.stereotype.Component; @@ -82,7 +83,9 @@ public List getPageOfTypeOfSampleTests(int startingRecNo) thro List list; try { // calculate maxRow to be one more than the page size - int endingRecNo = startingRecNo + DEFAULT_PAGE_SIZE + 1; + int endingRecNo = startingRecNo + + Integer.parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize")) + + 1; String sql = "from TypeOfSampleTest t order by t.typeOfSampleId, t.testId"; Query query = entityManager.unwrap(Session.class).createQuery(sql, diff --git a/src/main/java/org/openelisglobal/unitofmeasure/service/UnitOfMeasureServiceImpl.java b/src/main/java/org/openelisglobal/unitofmeasure/service/UnitOfMeasureServiceImpl.java index 71f00f8f0c..bfaca85a79 100644 --- a/src/main/java/org/openelisglobal/unitofmeasure/service/UnitOfMeasureServiceImpl.java +++ b/src/main/java/org/openelisglobal/unitofmeasure/service/UnitOfMeasureServiceImpl.java @@ -8,7 +8,7 @@ import org.openelisglobal.common.exception.LIMSDuplicateRecordException; import org.openelisglobal.common.service.AuditableBaseObjectServiceImpl; import org.openelisglobal.common.util.LocaleChangeListener; -import org.openelisglobal.common.util.SystemConfiguration; +import org.openelisglobal.internationalization.GlobalLocaleResolver; import org.openelisglobal.localization.valueholder.Localization; import org.openelisglobal.unitofmeasure.dao.UnitOfMeasureDAO; import org.openelisglobal.unitofmeasure.valueholder.UnitOfMeasure; @@ -16,6 +16,7 @@ import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.servlet.LocaleResolver; @Service @DependsOn({ "springContext" }) @@ -26,10 +27,14 @@ public class UnitOfMeasureServiceImpl extends AuditableBaseObjectServiceImpl getAllUserTestSectionsByName(HttpServletRequest request List list = new ArrayList<>(); try { - if (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) { + if (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section") + .equals(IActionConstants.NO)) { list = testSectionService.getTestSections(testSectionName); } else { UserSessionData usd = (UserSessionData) request.getSession() @@ -67,7 +68,7 @@ public List getAllUserTestSectionsByName(HttpServletRequest request // // try { // if - // (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) + // (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section").equals(IActionConstants.NO)) // { // // if (!StringUtil.isNullorNill(doingSearch) && @@ -121,7 +122,7 @@ public List getAllUserTestSectionsByName(HttpServletRequest request // List list = new ArrayList(); // try { // if - // (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) + // (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section").equals(IActionConstants.NO)) // { // list = testSectionService.getAllTestSections(); // } else { @@ -152,7 +153,8 @@ public List getAllUserTests(HttpServletRequest request, boolean onlyTestsF TestService testService = SpringContext.getBean(TestService.class); try { - if (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) { + if (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section") + .equals(IActionConstants.NO)) { list = testService.getAllTests(onlyTestsFullySetup); } else { UserSessionData usd = (UserSessionData) request.getSession() @@ -181,7 +183,7 @@ public List getAllUserTests(HttpServletRequest request, boolean onlyTestsF // // try { // if - // (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) + // (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section").equals(IActionConstants.NO)) // { // return sample_Tas; // } else { @@ -267,7 +269,7 @@ public List getAllUserTests(HttpServletRequest request, boolean onlyTestsF // List newAnalyses = new ArrayList(); // try { // if - // (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) + // (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section").equals(IActionConstants.NO)) // { // return newAnalyses; // } else { @@ -310,7 +312,7 @@ public List getAllUserTests(HttpServletRequest request, boolean onlyTestsF // // try { // if - // (SystemConfiguration.getInstance().getEnableUserTestSection().equals(IActionConstants.NO)) + // (ConfigurationProperties.getInstance().getPropertyValue("enable.user.test.section").equals(IActionConstants.NO)) // { // return sample_Tas; // } else { diff --git a/src/main/resources/SystemConfiguration.properties b/src/main/resources/SystemConfiguration.properties index a64d24d068..e5dbd22e34 100644 --- a/src/main/resources/SystemConfiguration.properties +++ b/src/main/resources/SystemConfiguration.properties @@ -1,46 +1,17 @@ #////////////////////////////////////////////////////////////////////////////// - - -default.encoding=UTF-8 default.idSeparator=; -default.textSeparator=|;| #bugzilla 2531 -default.application.name=OpenELIS default.datasource=java:comp/env/jdbc/LimsDS -sample.status=SAMPLE -analysis.status=ANALYSIS - page.defaultPageSize=20 -page.tree.defaultPageSize=10 -page.tree.paginatednode.child.count=32 #analysis defaults analysis.default.revision=0 -#quickEntry defaults -quickEntry.default.sample.referredCultureFlag= -quickEntry.default.sample.stickerReceivedFlag=N -quickEntry.default.sample.nextItemSequence=1 -quickEntry.default.sample.revision=0 -quickEntry.default.sample.collectionTimeForDisplay=00:00 - -#humanSampleOne defaults -humanSampleOne.default.sample.referredCultureFlag= -humanSampleOne.default.sample.stickerReceivedFlag= -humanSampleOne.default.sample.nextItemSequence=1 -humanSampleOne.default.sample.revision=0 -humanSampleOne.default.sample.collectionTimeForDisplay=00:00 -humanSampleOne.default.patient.gender= - -#testAnalyteTestResult dictionaryType=D -titerType=T -numericType=N #qaevent category is referenced from QA_EVENT.CATEGORY dictionary.category.qaevent.type=Q -dictionary.category.qaevent.category=QC #--status codes analysis.status.assigned=1 @@ -53,129 +24,20 @@ sample.status.entry.1.complete=2 sample.status.entry.2.complete=3 sample.status.released=7 sample.status.label.printed=8 -analysis.status.verified=V -analysis.status.readytoverify= -analyteTypeRequired=R -analyteTypeNotRequired=N domain.human=H -domain.animal=A -domain.newborn=N - -#ids to reference tables -result.reference.table.id=21 -analysis.qaevent.action.reference.table.id=49 -sample.qaevent.action.reference.table.id=52 - -#note type -note.type.internal=I -note.type.external=E - -#--The right side values are from the DB. If things are broken go look there and make sure that the values match -#FOR MORE DEPLOYMENT INSTRUCTIONS: see application.xml, Banner.vm -#OPEN_REPORTS IDs - //local and tomcat deployment (deploying 2 war files): ../../{local context for openreports} - //change this when moving to oc4j shared server (deploying ear file): ../../../{remote context for openreports defined in application.xml} -openreports.switch.module.path=../../openreports -#openreports.switch.module.path=../../../openreportshead -openreports.group.developer=242 -openreports.group.user=1121 -openreports.group.admin=1120 - - - -#--STATIC TESTS FOR REPORTING -#--still need to fill in actual ids -statictest_microidentification=1 -statictest_anthrax=13 -statictest_mrsa=19 -statictest_mycology=18 -statictest_pertussis=20 -statictest_sib=1 -statictest_tbculture=89 -statictest_tbidentification=79 - -#--bugzilla 2491 -statictest_hsvtyping=0 -statictest_gonorrhea=14 -statictest_syphilisfta=15 -statictest_syphilisusr=16 -statictest_syphilisvdrl=17 -#--bugzila 2305 id change -statictest_hiveiablood=24 -statictest_hiveiaoralfluid=47 -statictest_hivwesternblotblood=48 -statictest_hivwesternblotoralfluid=91 -statictest_hivrapidmultispot=11 - -#--STATIC PROJECTS FOR REPORTING -#--bugzilla 2491 using project.local_abbrev = 8 instead of project.id as project# -staticproject_sib=8 - -#--bugzilla 1842 STATIC TEST SECTIONS FOR REPORTING -statictestsection_virologyunit=35 - -#Label printing -#lowercase label printer (bugzilla 2380 for no printing print.label.name\=NONE or leave blank) -print.label.name=zebra1 -#print.label.name=ldmu1 -print.label.numberofcopies=2 -#print.label.barcode.resolution=300 -#default 330 -print.label.barcode.height=44 -print.label.barcode.width=1 -print.label.numeroflabels=100 - -#/////////////// ZPLII -#/// ^AE font has no line through the zeroes. -print.label.sample.prepend.barcode=^XA^FS^BY2,3^FS^FO110,21^BCN,50,N,N,Y,A^FD -print.label.sample.prepend.humanreadable=^FS^FO100,76^AEN,11,7^FD -print.label.sample.postpend=^FS^XZ\n - - -#XML TRANSMISSION -default.transport.method=PHINMS_DEFINED_IN_SYS_CONFIG -default.transport.processing.id=T_DEFINED_IN_SYS_CONFIG -default.transport.text.separator=^ -default.transport.code.system.type=L -mdh.uhl.id=P987654321_DEFINED_IN_SYS_CONFIG -mdh.organization.record.id=43 -mdh.universal.id=24D0651409 -mdh.universal.id.type=CLIA -mdh.work.phone=800/999-9999_DEFINED_IN_SYS_CONFIG -default.transport.processing.id.influenza=T -default.application.name.influenza=MN OpenELIS Stage -qaeventcode.request.sourcemissing=RQNSO -qaeventcode.request.collectiondatemissing=RQNCD -qaeventcode.request.submitterunknown=RQNSNA -qaeventactioncode.request.sourcemissing=RQSOC -qaeventactioncode.request.collectiondatemissing=CDC -qaeventactioncode.request.submitterunknown=SNAC -#bug 2589 -unknown.submitter.number= #User Test Section (set to N when use in Vietnam) login.user.change.allow.day=3 login.user.expired.month=1 login.user.expired.reminder.day=15 -login.fail.attempt.count=5 -login.user.account.unlock.minute=2 enable.user.test.section=N -#Encrypted PDF Path (set enable.sample.pdf=N when use in Vietnam) -encrypted.pdf.path=/home/phl/scans -enable.sample.pdf=Y -newborn.testPanelName=NBS-Panel -newborn.typeOfSample=DRIED BLOOD SPOT CARD -newborn.patient.relation=M #what character will be replaced for ambiguous dates. Default is 'X'. An example of use is XX/XX/1989 is some date in 1989 date.ambiguous.date.holder=x #the default actual date which will be used for ambiguous dates. so XX/XX/1989 will be saved as 01/01/1989 in DB date.ambiguous.date.value=01 -errors.to.screen=true permissions.agent=Role -#the limit in millisec before the patient search times out. Socket times out in this amount, total search in 500 milsec more -patient.search.time.limit.ms=5000 diff --git a/src/main/webapp/pages/common/actionError.jsp b/src/main/webapp/pages/common/actionError.jsp index c3ddcaed4c..b08d6b2d3c 100644 --- a/src/main/webapp/pages/common/actionError.jsp +++ b/src/main/webapp/pages/common/actionError.jsp @@ -4,7 +4,6 @@ javax.servlet.jsp.JspException, org.openelisglobal.common.action.IActionConstants, org.openelisglobal.common.util.resources.ResourceLocator, - org.openelisglobal.common.util.SystemConfiguration, org.owasp.encoder.Encode, org.openelisglobal.common.constants.Constants" %> <%@ page isELIgnored="false" %> diff --git a/src/main/webapp/pages/dictionary/dictionaryFormFooterButtons.jsp b/src/main/webapp/pages/dictionary/dictionaryFormFooterButtons.jsp index e30bc3d571..239d13b44f 100644 --- a/src/main/webapp/pages/dictionary/dictionaryFormFooterButtons.jsp +++ b/src/main/webapp/pages/dictionary/dictionaryFormFooterButtons.jsp @@ -1,214 +1,210 @@ -<%@ page language="java" - contentType="text/html; charset=UTF-8" - import="org.openelisglobal.common.action.IActionConstants, - org.openelisglobal.common.util.Versioning, - org.openelisglobal.common.util.SystemConfiguration, - org.openelisglobal.internationalization.MessageUtil" -%> - -<%@ page isELIgnored="false" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - -<%@ taglib prefix="ajax" uri="/tags/ajaxtags" %> - -<%! - String idSeparator = SystemConfiguration.getInstance().getDefaultIdSeparator(); -%> -<%--bugzilla 2061-2063--%> -<% - String recordFrozenDisableEdits = "false"; - - if (request.getAttribute(IActionConstants.RECORD_FROZEN_EDIT_DISABLED_KEY) != null) { - recordFrozenDisableEdits = (String)request.getAttribute(IActionConstants.RECORD_FROZEN_EDIT_DISABLED_KEY); - } +<%@ page language="java" contentType="text/html; charset=UTF-8" +import="org.openelisglobal.common.action.IActionConstants, +org.openelisglobal.common.util.Versioning, +org.openelisglobal.internationalization.MessageUtil" %> <%@ page +isELIgnored="false" %> <%@ taglib prefix="form" +uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" +uri="http://www.springframework.org/tags"%> <%@ taglib prefix="c" +uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="ajax" +uri="/tags/ajaxtags" %> <%! String idSeparator = +ConfigurationProperties.getInstance().getPropertyValue("default.idSeparator"); +%> <%--bugzilla 2061-2063--%> <% String recordFrozenDisableEdits = "false"; if +(request.getAttribute(IActionConstants.RECORD_FROZEN_EDIT_DISABLED_KEY) != null) +{ recordFrozenDisableEdits = +(String)request.getAttribute(IActionConstants.RECORD_FROZEN_EDIT_DISABLED_KEY); +} String previousDisabled = "false"; String nextDisabled = "false"; if +(request.getAttribute(IActionConstants.PREVIOUS_DISABLED) != null) { +previousDisabled = +(String)request.getAttribute(IActionConstants.PREVIOUS_DISABLED); } if +(request.getAttribute(IActionConstants.NEXT_DISABLED) != null) { nextDisabled = +(String)request.getAttribute(IActionConstants.NEXT_DISABLED); } String +saveDisabled = (String)request.getAttribute(IActionConstants.SAVE_DISABLED); if +(saveDisabled == "false") { //if security check enables modification - now also +check if button is disabled for other reason if (recordFrozenDisableEdits == +"true") { saveDisabled = "true"; } } %> - String previousDisabled = "false"; - String nextDisabled = "false"; - if (request.getAttribute(IActionConstants.PREVIOUS_DISABLED) != null) { - previousDisabled = (String)request.getAttribute(IActionConstants.PREVIOUS_DISABLED); - } - if (request.getAttribute(IActionConstants.NEXT_DISABLED) != null) { - nextDisabled = (String)request.getAttribute(IActionConstants.NEXT_DISABLED); - } - String saveDisabled = (String)request.getAttribute(IActionConstants.SAVE_DISABLED); - if (saveDisabled == "false") { - //if security check enables modification - now also check if button is disabled for other reason - if (recordFrozenDisableEdits == "true") { - saveDisabled = "true"; - } - } - - %> -

- - - - - - - - - - - - - - - - - - -
- -   - -                                            - -   - -
-
\ No newline at end of file + + + + + + + + + + + + + + + + + + +
+ +   + +                                            + +   + +
+ diff --git a/src/main/webapp/pages/menu/masterListsTab/masterListsPageLeft.jsp b/src/main/webapp/pages/menu/masterListsTab/masterListsPageLeft.jsp index d29b3e690c..1b792b8e75 100644 --- a/src/main/webapp/pages/menu/masterListsTab/masterListsPageLeft.jsp +++ b/src/main/webapp/pages/menu/masterListsTab/masterListsPageLeft.jsp @@ -1,6 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - import="org.openelisglobal.common.util.SystemConfiguration, - org.openelisglobal.common.util.ConfigurationProperties, + import="org.openelisglobal.common.util.ConfigurationProperties, org.openelisglobal.common.formfields.AdminFormFields, org.openelisglobal.common.formfields.AdminFormFields.Field, org.openelisglobal.siteinformation.valueholder.SiteInformation"%> diff --git a/src/main/webapp/pages/patient/patientManagement.jsp b/src/main/webapp/pages/patient/patientManagement.jsp index dc4a4b7108..33cb9e39c1 100644 --- a/src/main/webapp/pages/patient/patientManagement.jsp +++ b/src/main/webapp/pages/patient/patientManagement.jsp @@ -6,7 +6,7 @@ org.openelisglobal.common.services.PhoneNumberService, org.openelisglobal.common.services.AddressService, org.openelisglobal.common.util.*, org.openelisglobal.internationalization.MessageUtil" %> - + <%@page import="org.openelisglobal.common.util.DateUtil"%> <%@ page isELIgnored="false" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -381,7 +381,7 @@ function /*void*/ updatePatientAge( DOB ) { var date = String( DOB.value ); - var datePattern = '<%=SystemConfiguration.getInstance().getPatternForDateLocale() %>'; + var datePattern = '<%=LocaleConfiguraiton.getInstance().getPatternForDateLocale() %>'; var splitPattern = datePattern.split("/"); var dayIndex = 0; var monthIndex = 1; @@ -525,7 +525,7 @@ function /*void*/ pt_updateDOB( ageYears, ageMonths, ageDays ) } year = date.getFullYear(); - var datePattern = '<%=SystemConfiguration.getInstance().getPatternForDateLocale() %>'; + var datePattern = '<%=DateUtil.getDateFormat() %>'; var splitPattern = datePattern.split("/"); var DOB = ""; diff --git a/src/main/webapp/pages/sample/sampleEditByProject.jsp b/src/main/webapp/pages/sample/sampleEditByProject.jsp index 1aefe2a678..fdd3b0b056 100644 --- a/src/main/webapp/pages/sample/sampleEditByProject.jsp +++ b/src/main/webapp/pages/sample/sampleEditByProject.jsp @@ -1,30 +1,28 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - import="org.openelisglobal.common.action.IActionConstants, - org.openelisglobal.common.util.SystemConfiguration, - org.openelisglobal.common.util.ConfigurationProperties, - org.openelisglobal.common.util.ConfigurationProperties.Property, - org.openelisglobal.common.util.Versioning" %> +import="org.openelisglobal.common.action.IActionConstants, +org.openelisglobal.common.util.ConfigurationProperties, +org.openelisglobal.common.util.ConfigurationProperties.Property, +org.openelisglobal.common.util.Versioning" %> <%@ page isELIgnored="false" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ +taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib +prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="ajax" +uri="/tags/ajaxtags" %> -<%@ page isELIgnored="false" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + -<%@ taglib prefix="ajax" uri="/tags/ajaxtags" %> - - - - - - - + - diff --git a/src/main/webapp/pages/sample/samplePatientEntry.jsp b/src/main/webapp/pages/sample/samplePatientEntry.jsp index d131d47a9d..718d404bc4 100644 --- a/src/main/webapp/pages/sample/samplePatientEntry.jsp +++ b/src/main/webapp/pages/sample/samplePatientEntry.jsp @@ -1,6 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" %> <%@ page import="org.openelisglobal.common.action.IActionConstants, - org.openelisglobal.common.util.SystemConfiguration, org.openelisglobal.common.util.ConfigurationProperties, org.openelisglobal.common.util.ConfigurationProperties.Property, org.openelisglobal.common.formfields.FormFields, diff --git a/src/main/webapp/pages/sample/sampleTbAdd.jsp b/src/main/webapp/pages/sample/sampleTbAdd.jsp index c2628e4546..66d9848c26 100644 --- a/src/main/webapp/pages/sample/sampleTbAdd.jsp +++ b/src/main/webapp/pages/sample/sampleTbAdd.jsp @@ -1,4 +1,3 @@ -<%@page import="org.openelisglobal.common.util.SystemConfiguration"%> <%@page import="org.openelisglobal.common.action.IActionConstants"%> <%@ page language="java" contentType="text/html; charset=UTF-8" import="org.openelisglobal.common.formfields.FormFields, @@ -147,7 +146,7 @@ function /*void*/setSaveButton() { year = date.getFullYear(); - var datePattern = '<%=SystemConfiguration.getInstance().getPatternForDateLocale() %>'; + var datePattern = '<%=DateUtil.getDateFormat() %>'; var splitPattern = datePattern.split("/"); var DOB = ""; diff --git a/src/main/webapp/pages/samplebatchentry/routine/patientManagement.jsp b/src/main/webapp/pages/samplebatchentry/routine/patientManagement.jsp index dd4de1a88c..39e0726ead 100644 --- a/src/main/webapp/pages/samplebatchentry/routine/patientManagement.jsp +++ b/src/main/webapp/pages/samplebatchentry/routine/patientManagement.jsp @@ -4,6 +4,7 @@ org.openelisglobal.common.formfields.FormFields.Field, org.openelisglobal.patient.action.bean.PatientManagementInfo, org.openelisglobal.common.util.*, org.openelisglobal.internationalization.MessageUtil" %> + <%@page import="org.openelisglobal.common.util.DateUtil"%> <%@ page isELIgnored="false" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> @@ -291,7 +292,7 @@ function /*void*/ checkValidAgeDate(dateElement) { function /*void*/ updatePatientAge(DOB) { var date = String(DOB.value); - var datePattern = '<%=SystemConfiguration.getInstance().getPatternForDateLocale() %>'; + var datePattern = '<%=DateUtil.getDateFormat()%>'; var splitPattern = datePattern.split("/"); var dayIndex = 0; var monthIndex = 1; @@ -421,7 +422,7 @@ function /*void*/ pt_updateDOB( ageYears, ageMonths, ageDays ) } year = date.getFullYear(); - var datePattern = '<%=SystemConfiguration.getInstance().getPatternForDateLocale() %>'; + var datePattern = '<%=DateUtil.getDateFormat() %>'; var splitPattern = datePattern.split("/"); var DOB = ""; diff --git a/src/main/webapp/pages/testConfiguration/resultSelectListAdd.jsp b/src/main/webapp/pages/testConfiguration/resultSelectListAdd.jsp index e8a418d516..b19c00065e 100644 --- a/src/main/webapp/pages/testConfiguration/resultSelectListAdd.jsp +++ b/src/main/webapp/pages/testConfiguration/resultSelectListAdd.jsp @@ -14,7 +14,6 @@ org.openelisglobal.common.util.IdValuePair, org.openelisglobal.internationalization.MessageUtil, org.openelisglobal.common.util.Versioning, - org.openelisglobal.common.util.SystemConfiguration, org.openelisglobal.testconfiguration.action.SampleTypePanel" %> <%@ page isELIgnored="false" %> diff --git a/src/main/webapp/pages/testConfiguration/testAdd.jsp b/src/main/webapp/pages/testConfiguration/testAdd.jsp index d62f36abb9..ee465b9b45 100644 --- a/src/main/webapp/pages/testConfiguration/testAdd.jsp +++ b/src/main/webapp/pages/testConfiguration/testAdd.jsp @@ -7,7 +7,6 @@ org.openelisglobal.common.action.IActionConstants, org.openelisglobal.common.util.IdValuePair, org.openelisglobal.common.util.Versioning, - org.openelisglobal.common.util.SystemConfiguration, org.openelisglobal.typeoftestresult.service.TypeOfTestResultServiceImpl" %> <%@ page isELIgnored="false" %> diff --git a/src/main/webapp/pages/testConfiguration/testModify.jsp b/src/main/webapp/pages/testConfiguration/testModify.jsp index d20b900983..5e4b1a10a0 100644 --- a/src/main/webapp/pages/testConfiguration/testModify.jsp +++ b/src/main/webapp/pages/testConfiguration/testModify.jsp @@ -7,7 +7,7 @@ <%@ page import="org.openelisglobal.internationalization.MessageUtil"%> <%@ page import="org.openelisglobal.common.util.Versioning"%> <%@ page - import="org.openelisglobal.common.util.SystemConfiguration"%> + import="org.openelisglobal.common.util.DateUtil"%> <%@ page import="org.openelisglobal.typeoftestresult.service.TypeOfTestResultServiceImpl"%> <%@ page @@ -38,7 +38,7 @@ --%> <% - String locale = SystemConfiguration.getInstance().getDefaultLocale().toString(); +String locale = SpringContext.getBean(DefaultConfigurationProperties.class).getPropertyValue(Property.DEFAULT_LANG_LOCALE); %> <%--Do not add jquery.ui.js, it will break the sorting --%>