Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

ci_regional and ci IPCI now have the same field form set #564

Merged
merged 1 commit into from
May 1, 2015
Merged

ci_regional and ci IPCI now have the same field form set #564

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/WebContent/pages/patient/patientManagement.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
supportPatientType = FormFields.getInstance().useField(Field.PatientType);
supportInsurance = FormFields.getInstance().useField(Field.InsuranceNumber);
supportSubjectNumber = FormFields.getInstance().useField(Field.SubjectNumber);
subjectNumberRequired = FormFields.getInstance().useField( Field.SubjectNumberRequired );
subjectNumberRequired = ConfigurationProperties.getInstance().isPropertyValueEqual(ConfigurationProperties.Property.PATIENT_SUBJECT_NUMBER_REQUIRED, "true");
supportNationalID = FormFields.getInstance().useField(Field.NationalID);
supportOccupation = FormFields.getInstance().useField(Field.Occupation);
supportCommune = FormFields.getInstance().useField(Field.ADDRESS_COMMUNE);
Expand All @@ -64,7 +64,7 @@
patientAgeRequired = false;
patientGenderRequired = false;
}else{
patientIDRequired = FormFields.getInstance().useField(Field.PatientIDRequired);
patientIDRequired = ConfigurationProperties.getInstance().isPropertyValueEqual(ConfigurationProperties.Property.PATIENT_ID_REQUIRED, "true");
patientRequired = FormFields.getInstance().useField(Field.PatientRequired );
patientAgeRequired = true;
patientGenderRequired = true;
Expand Down
4 changes: 2 additions & 2 deletions app/WebContent/pages/qaevent/nonConformity.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%@ page import="us.mn.state.health.lims.common.util.DateUtil" %>
<%@ page import="us.mn.state.health.lims.common.util.StringUtil, us.mn.state.health.lims.common.util.Versioning" %>
<%@ page import="us.mn.state.health.lims.qaevent.valueholder.retroCI.QaEventItem" %>

<%@ page import="us.mn.state.health.lims.common.util.ConfigurationProperties" %>


<%@ taglib uri="/tags/struts-bean" prefix="bean"%>
Expand Down Expand Up @@ -497,7 +497,7 @@ function processPhoneSuccess(xhr){
</logic:notEqual>
<html:hidden name='<%=formName%>' styleId="doctorNew" property="doctorNew" />
<% if (FormFields.getInstance().useField(Field.QA_FULL_PROVIDER_INFO )) { %>
<% if( FormFields.getInstance().useField( Field.QA_REQUESTER_SAMPLE_ID )) { %>
<% if(ConfigurationProperties.getInstance().isPropertyValueEqual(ConfigurationProperties.Property.QA_SAMPLE_ID_REQUIRED, "true")) { %>
<tr>
<td><bean:message key="sample.clientReference" />:</td>
<td >
Expand Down
8 changes: 7 additions & 1 deletion app/src/MessageResources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3401,4 +3401,10 @@ result.type.multiselect=Multiselect
result.type.cascading=Cascading multiselect
label.unitofmeasure=Unit of Measure
label.none=None
label.orderable=Orderable
label.orderable=Orderable
instruction.patient.id.required=If true then a patient ID will be required when new patient information is entered
instruction.patient.subNumber.required=If true then a subject number will be required when adding a new patient
instruction.nonConformity.sample.id=If true then the sample number from the sending lab will be required when entering a non-conformity
site.info.patient.id.required=Is a patient ID required for a new patient
site.info.patient.subjectNumber.required=Is a subject number required for a new patient
site.info.nonConformity.sample.id=Is a sample id from the referring lab required
6 changes: 6 additions & 0 deletions app/src/MessageResources_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2403,3 +2403,9 @@ result.type.cascading=Multiselect cascade (provisional)
label.unitofmeasure=Unit\u00E9 de Mesure
label.none=Aucun
label.orderable=Ordonnable (provisional)
instruction.patient.id.required=Si vrai, alors un patient ID seront n�cessaires lorsque de nouvelles informations patient est entr�
instruction.patient.subNumber.required=Si vrai, alors un certain nombre de sujet seront n�cessaires lors de l'ajout d'un nouveau patient
instruction.nonConformity.sample.id=Si vrai, alors le num�ro d'�chantillon du laboratoire exp�diteur seront n�cessaires lors de la saisie d'une non-conformit�
site.info.patient.id.required=Est un patient d'identit� requise pour un nouveau patient
site.info.patient.subjectNumber.required=Est un num�ro de l'objet n�cessaire pour un nouveau patient
site.info.nonConformity.sample.id=Est un �chantillon id du laboratoire r�f�rant requise
482 changes: 232 additions & 250 deletions app/src/us/mn/state/health/lims/common/action/IActionConstants.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...on/formfields/CI_IPCIAdminFormFields.java → ...formfields/CI_GeneralAdminFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import us.mn.state.health.lims.common.formfields.AdminFormFields.Field;

public class CI_IPCIAdminFormFields implements IAdminFormFieldsForImplementation {
public class CI_GeneralAdminFormFields implements IAdminFormFieldsForImplementation {

public HashMap<AdminFormFields.Field, Boolean> getImplementationAttributes() {
HashMap<AdminFormFields.Field, Boolean> settings = new HashMap<AdminFormFields.Field, Boolean>();
Expand Down
5 changes: 2 additions & 3 deletions .../common/formfields/CI_IPCIFormFields.java → ...mmon/formfields/CI_GeneralFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.HashMap;


public class CI_IPCIFormFields implements IFormFieldsForImplementation {
public class CI_GeneralFormFields implements IFormFieldsForImplementation {

public HashMap<FormFields.Field, Boolean> getImplementationAttributes() {
HashMap<FormFields.Field, Boolean> settings = new HashMap<FormFields.Field, Boolean>();
Expand All @@ -44,14 +44,13 @@ public HashMap<FormFields.Field, Boolean> getImplementationAttributes() {
settings.put(Field.OrganizationMultiUnit, Boolean.FALSE);
settings.put(Field.OrganizationOrgId, Boolean.FALSE);
settings.put(Field.RequesterSiteList, Boolean.TRUE);
settings.put(Field.ADDRESS_CITY, Boolean.FALSE);
settings.put(Field.ADDRESS_CITY, Boolean.TRUE);
settings.put(Field.PatientRequired, Boolean.TRUE);
settings.put(Field.SampleCondition, Boolean.FALSE);
settings.put(Field.NON_CONFORMITY_SITE_LIST, Boolean.TRUE);
settings.put(Field.NON_CONFORMITY_SITE_LIST_USER_ADDABLE, Boolean.TRUE);
settings.put(Field.PatientNameRequired, Boolean.FALSE);
settings.put(Field.SubjectNumber, Boolean.TRUE);
settings.put(Field.SubjectNumberRequired, Boolean.TRUE);
settings.put(Field.NationalID, Boolean.TRUE);
settings.put(Field.SampleEntryUseReceptionHour, Boolean.TRUE);
settings.put(Field.SampleEntryUseRequestDate, Boolean.TRUE);
Expand Down
1 change: 0 additions & 1 deletion app/src/us/mn/state/health/lims/common/formfields/CI_LNSPFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public HashMap<FormFields.Field, Boolean> getImplementationAttributes() {
settings.put(Field.NON_CONFORMITY_SITE_LIST_USER_ADDABLE, Boolean.TRUE);
settings.put(Field.PatientNameRequired, Boolean.FALSE);
settings.put(Field.SubjectNumber, Boolean.TRUE);
settings.put(Field.SubjectNumberRequired, Boolean.TRUE);
settings.put(Field.NationalID, Boolean.TRUE);
settings.put(Field.SampleEntryUseReceptionHour, Boolean.TRUE);
settings.put(Field.SampleEntryUseRequestDate, Boolean.TRUE);
Expand Down
36 changes: 0 additions & 36 deletions app/src/us/mn/state/health/lims/common/formfields/CI_RegionalAdminFormFields.java
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions app/src/us/mn/state/health/lims/common/formfields/CI_RegionalFormFields.java
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions app/src/us/mn/state/health/lims/common/formfields/DefaultAdminFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ protected HashMap<Field, Boolean> getSetAttributes() {
return new CI_LNSPAdminFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CDI.equals(fieldSet)){
return new CI_RETROAdminFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_IPCI.equals(fieldSet)){
return new CI_IPCIAdminFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_REGIONAL.equals(fieldSet)){
return new CI_RegionalAdminFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_GENERAL.equals(fieldSet)){
return new CI_GeneralAdminFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_KENYA.equals(fieldSet)){
return new KenyaAdminFormFields().getImplementationAttributes();
}
Expand Down
11 changes: 3 additions & 8 deletions app/src/us/mn/state/health/lims/common/formfields/DefaultFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ public class DefaultFormFields extends AFormFields {
setFieldTrue(Field.ADDRESS_CITY );
setFieldTrue(Field.PatientRequired);
setFieldTrue(Field.QA_FULL_PROVIDER_INFO );
setFieldTrue(Field.QA_REQUESTER_SAMPLE_ID);
setFieldTrue(Field.PatientIDRequired);
setFieldTrue(Field.PatientNameRequired);
setFieldTrue(Field.SampleEntryRequestingSiteSampleId);
setFieldTrue( Field.ADDRESS_COMMUNE );
setFieldTrue( Field.ADDRESS_VILLAGE );
setFieldTrue(Field.ADDRESS_VILLAGE);

setFieldFalse(Field.OrgState);
setFieldFalse(Field.ZipCode);
Expand All @@ -66,7 +64,6 @@ public class DefaultFormFields extends AFormFields {
setFieldFalse(Field.RequesterSiteList);
setFieldFalse(Field.InlineOrganizationTypes);
setFieldFalse(Field.SubjectNumber);
setFieldFalse(Field.SubjectNumberRequired );
setFieldFalse(Field.ADDRESS_DEPARTMENT );
setFieldFalse(Field.MotherInitial);
setFieldFalse(Field.SearchSampleStatus);
Expand Down Expand Up @@ -133,10 +130,8 @@ protected HashMap<Field, Boolean> getSetAttributes() {
return new CI_LNSPFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CDI.equals(fieldSet)){
return new CI_RETROFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_IPCI.equals(fieldSet)){
return new CI_IPCIFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_REGIONAL.equals(fieldSet)){
return new CI_RegionalFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_CI_GENERAL.equals(fieldSet)){
return new CI_GeneralFormFields().getImplementationAttributes();
}else if(IActionConstants.FORM_FIELD_SET_KENYA.equals(fieldSet)){
return new KenyaFormFields().getImplementationAttributes();
}
Expand Down
3 changes: 0 additions & 3 deletions app/src/us/mn/state/health/lims/common/formfields/FormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public static enum Field {
MLS, //Include indicator if organization is a sentinel lab
InlineOrganizationTypes, //Should organization types be included when specifying organizations
SubjectNumber, //Include subject number with patient info
SubjectNumberRequired, //If using subject number is it required
ProviderInfo, //Include provider information on order form
NationalID, //Include national ID with patient info
Occupation, //Include occupation with patient info
Expand Down Expand Up @@ -69,10 +68,8 @@ public static enum Field {
PatientRequired, // By default, a (minimal) patient to go with a sample is required.
PatientRequired_SampleConfirmation, //Is patient required for sample confirmation
QA_FULL_PROVIDER_INFO, //Include provider information on non-conformity
QA_REQUESTER_SAMPLE_ID, //If provider info is used on non-conformity should it include provider sample id
QASubjectNumber, //Include subject number be on non-conformity
QATimeWithDate, //Include time in addition to date on non-conformity
PatientIDRequired, //Is patient ID required for patient
PatientIDRequired_SampleConfirmation, //Is patient ID required for patient on sample conformation form
PatientNameRequired, //Is patient name required
SampleEntryUseReceptionHour, //Include reception time on sample entry
Expand Down
1 change: 0 additions & 1 deletion app/src/us/mn/state/health/lims/common/formfields/HT_LNSPFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public HashMap<FormFields.Field, Boolean> getImplementationAttributes() {
settings.put(Field.CollectionTime, Boolean.TRUE);
settings.put(Field.SAMPLE_ENTRY_USE_REFFERING_PATIENT_NUMBER, Boolean.TRUE);
settings.put(Field.SampleEntryRequestingSiteSampleId, Boolean.FALSE);
settings.put(Field.PatientIDRequired, Boolean.FALSE );
settings.put(Field.PatientIDRequired_SampleConfirmation, Boolean.FALSE );
return settings;
}
Expand Down
1 change: 0 additions & 1 deletion app/src/us/mn/state/health/lims/common/formfields/KenyaFormFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public HashMap<FormFields.Field, Boolean> getImplementationAttributes() {
settings.put(Field.NON_CONFORMITY_SITE_LIST_USER_ADDABLE, Boolean.TRUE);
settings.put(Field.PatientNameRequired, Boolean.FALSE);
settings.put(Field.SubjectNumber, Boolean.TRUE);
settings.put(Field.SubjectNumberRequired, Boolean.TRUE);
settings.put(Field.NationalID, Boolean.TRUE);
settings.put(Field.SampleEntryUseReceptionHour, Boolean.TRUE);
settings.put(Field.SampleEntryUseRequestDate, Boolean.TRUE);
Expand Down
5 changes: 4 additions & 1 deletion app/src/us/mn/state/health/lims/common/util/ConfigurationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ public enum Property{
ORDER_PROGRAM, //Should program be part of an order
BANNER_TEXT, //Text on Banner
CLOCK_24, //True for 24 hour clock, false for 12 hour clock
PATIENT_NATIONALITY //True if patient nationality should be collected with patient information
PATIENT_NATIONALITY, //True if patient nationality should be collected with patient information
PATIENT_ID_REQUIRED, //True if patient id is required for new patient
PATIENT_SUBJECT_NUMBER_REQUIRED, //True if patient subject number is required for new patient
QA_SAMPLE_ID_REQUIRED //True if sample id required from referring lab
}


Expand Down
9 changes: 6 additions & 3 deletions app/src/us/mn/state/health/lims/common/util/DefaultConfigurationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public class DefaultConfigurationProperties extends ConfigurationProperties {
propertiesFileMap.put(Property.AmbiguousDateHolder , new KeyDefaultPair("date.ambiguous.date.holder", "X") );
propertiesFileMap.put(Property.ReferingLabParentOrg , new KeyDefaultPair("organization.reference.lab.parent", null) );
propertiesFileMap.put(Property.resultsResendTime , new KeyDefaultPair("results.send.retry.time", "30") );
/* propertiesFileMap.put(Property. , new KeyDefaultPair() );
// propertiesFileMap.put(Property. , new KeyDefaultPair() );


*/
//config from site_information table
dbNamePropertiesMap = new HashMap<String, ConfigurationProperties.Property>();
setDBPropertyMappingAndDefault(Property.SiteCode, "siteNumber", "" );
Expand Down Expand Up @@ -109,7 +109,10 @@ public class DefaultConfigurationProperties extends ConfigurationProperties {
setDBPropertyMappingAndDefault( Property.ORDER_PROGRAM, "Program", "false" );
setDBPropertyMappingAndDefault( Property.BANNER_TEXT, "bannerHeading", "-1" );
setDBPropertyMappingAndDefault( Property.CLOCK_24, "24 hour clock", "true" );
setDBPropertyMappingAndDefault( Property.PATIENT_NATIONALITY, "supportPatientNationality", "false");
setDBPropertyMappingAndDefault( Property.PATIENT_NATIONALITY, "supportPatientNationality", "false");
setDBPropertyMappingAndDefault( Property.PATIENT_ID_REQUIRED, "Patient ID required", "true");
setDBPropertyMappingAndDefault( Property.PATIENT_SUBJECT_NUMBER_REQUIRED, "Subject number required", "true");
setDBPropertyMappingAndDefault( Property.QA_SAMPLE_ID_REQUIRED, "sample id required", "false");
}

private void setDBPropertyMappingAndDefault(Property property, String dbName, String defaultValue) {
Expand Down
Loading