dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16472
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6267: (patient) Add stored_by property for program-stage-instance
------------------------------------------------------------
revno: 6267
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-15 16:25:30 +0700
message:
(patient) Add stored_by property for program-stage-instance
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/DerbyStatementBuilder.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java 2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java 2012-03-15 09:25:30 +0000
@@ -68,6 +68,8 @@
private boolean completed = false;
private Boolean providedByAnotherFacility = false;
+
+ private String storedBy;
// -------------------------------------------------------------------------
// Constructors
@@ -260,4 +262,14 @@
{
return providedByAnotherFacility;
}
+
+ public String getStoredBy()
+ {
+ return storedBy;
+ }
+
+ public void setStoredBy( String storedBy )
+ {
+ this.storedBy = storedBy;
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2012-02-17 12:10:18 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2012-03-15 09:25:30 +0000
@@ -170,7 +170,8 @@
{
// Move data from patientdatavalue to patientdatavaluearchive
String sql = "INSERT INTO patientdatavaluearchive ( "
- + "SELECT pdv.* FROM patientdatavalue AS pdv "
+ + "SELECT pdv.programstageinstanceid, pdv.dataelementid, pdv.value, "
+ +" pdv.timestamp FROM patientdatavalue AS pdv "
+ "INNER JOIN programstageinstance AS psi "
+ "ON pdv.programstageinstanceid = psi.programstageinstanceid "
+ "INNER JOIN programinstance AS pi "
@@ -192,8 +193,8 @@
{
// Move data from patientdatavalue to patientdatavaluearchive
String sql = "INSERT INTO patientdatavalue ( "
- + "SELECT pdv.programstageinstanceid, pdv.dataelementid, pdv.organisationunitid, pdv.value, "
- +"pdv.providedbyanotherfacility, pdv.timestamp FROM patientdatavaluearchive AS pdv "
+ + "SELECT pdv.programstageinstanceid, pdv.dataelementid, pdv.value, "
+ +"pdv.timestamp FROM patientdatavaluearchive AS pdv "
+ "INNER JOIN programstageinstance AS psi "
+ "ON pdv.programstageinstanceid = psi.programstageinstanceid "
+ "INNER JOIN programinstance AS pi "
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-03-07 06:26:09 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-03-15 09:25:30 +0000
@@ -74,6 +74,12 @@
updateProgramStageInstanceOrgunit();
executeSql( "ALTER TABLE programstage_dataelements DROP COLUMN showOnReport" );
+
+ executeSql( "ALTER TABLE programstage_dataelements DROP COLUMN showOnReport" );
+
+ executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN providedbyanotherfacility" );
+ executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN organisationunitid" );
+ executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN storedby" );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml 2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml 2012-03-15 09:25:30 +0000
@@ -28,6 +28,8 @@
column="organisationunitid" foreign-key="fk_programstageinstance_organisationunitid" />
<property name="providedByAnotherFacility" column="providedbyanotherfacility" />
-
+
+ <property name="storedBy" column="storedby" length="31" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/DerbyStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/DerbyStatementBuilder.java 2012-02-28 08:07:22 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/DerbyStatementBuilder.java 2012-03-15 09:25:30 +0000
@@ -234,7 +234,6 @@
+ "USING patientdatavaluearchive AS a "
+ "WHERE d.programstageinstanceid=a.programstageinstanceid "
+ "AND d.dataelementid=a.dataelementid "
- + "AND d.organisationunitid=a.organisationunitid "
+ "AND d.timestamp<a.timestamp;";
}
@@ -243,8 +242,7 @@
return "DELETE FROM patientdatavaluearchive AS a "
+ "USING patientdatavalue AS d "
+ "WHERE d.programstageinstanceid=a.programstageinstanceid "
- + "AND d.dataelementid=a.dataelementid "
- + "AND d.organisationunitid=a.organisationunitid ";
+ + "AND d.dataelementid=a.dataelementid ";
}
public String deleteOldestOverlappingPatientDataValue()
@@ -253,7 +251,6 @@
+ "USING patientdatavaluearchive AS a "
+ "WHERE d.programstageinstanceid=a.programstageinstanceid "
+ "AND d.dataelementid=a.dataelementid "
- + "AND d.organisationunitid=a.organisationunitid "
+ "AND d.timestamp<a.timestamp;";
}
@@ -261,7 +258,6 @@
{
return "DELETE FROM patientdatavalue AS d " + "USING patientdatavaluearchive AS a "
+ "WHERE d.programstageinstanceid=a.programstageinstanceid " + "AND d.dataelementid=a.dataelementid "
- + "AND d.organisationunitid=a.organisationunitid "
+ "AND a.timestamp<=d.timestamp;";
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java 2012-02-28 08:07:22 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java 2012-03-15 09:25:30 +0000
@@ -249,7 +249,6 @@
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND d.timestamp<a.timestamp;";
}
@@ -258,8 +257,7 @@
return "DELETE FROM patientdatavaluearchive AS a " +
"USING patientdatavalue AS d " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
- "AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid ";
+ "AND d.dataelementid=a.dataelementid ";
}
public String deleteOldestOverlappingPatientDataValue()
@@ -268,7 +266,6 @@
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND d.timestamp<a.timestamp;";
}
@@ -278,7 +275,6 @@
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND a.timestamp<=d.timestamp;";
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java 2012-02-28 08:07:22 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java 2012-03-15 09:25:30 +0000
@@ -247,8 +247,7 @@
return "DELETE d FROM patientdatavalue AS d " +
"INNER JOIN patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
- "AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid; " ;
+ "AND d.dataelementid=a.dataelementid; " ;
}
public String deleteArchivedOverlappingPatientData()
@@ -256,8 +255,7 @@
return "DELETE a FROM patientdatavaluearchive AS a " +
"INNER JOIN patientdatavalue AS d " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
- "AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid ";
+ "AND d.dataelementid=a.dataelementid ";
}
public String deleteOldestOverlappingPatientDataValue()
@@ -266,7 +264,6 @@
"INNER JOIN patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND d.timestamp<a.timestamp;";
}
@@ -276,7 +273,6 @@
"INNER JOIN patientdatavalue AS d " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND a.timestamp<=d.timestamp;";
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java 2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java 2012-03-15 09:25:30 +0000
@@ -246,8 +246,7 @@
return "DELETE FROM patientdatavalue AS d " +
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
- "AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid; ";
+ "AND d.dataelementid=a.dataelementid; ";
}
public String deleteArchivedOverlappingPatientData()
@@ -255,8 +254,7 @@
return "DELETE FROM patientdatavaluearchive AS a " +
"USING patientdatavalue AS d " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
- "AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid ";
+ "AND d.dataelementid=a.dataelementid ";
}
public String deleteOldestOverlappingPatientDataValue()
@@ -265,7 +263,6 @@
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND d.timestamp<a.timestamp;";
}
@@ -275,7 +272,6 @@
"USING patientdatavaluearchive AS a " +
"WHERE d.programstageinstanceid=a.programstageinstanceid " +
"AND d.dataelementid=a.dataelementid " +
- "AND d.organisationunitid=a.organisationunitid " +
"AND a.timestamp<=d.timestamp;";
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java 2012-03-05 08:41:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java 2012-03-15 09:25:30 +0000
@@ -42,6 +42,7 @@
import org.hisp.dhis.program.ProgramStageInstance;
import org.hisp.dhis.program.ProgramStageInstanceService;
import org.hisp.dhis.program.ProgramStageService;
+import org.hisp.dhis.user.CurrentUserService;
import com.opensymphony.xwork2.Action;
@@ -99,7 +100,13 @@
{
this.format = format;
}
+
+ private CurrentUserService currentUserService;
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
// -------------------------------------------------------------------------
// Input/Output
// -------------------------------------------------------------------------
@@ -134,6 +141,8 @@
{
Date dateValue = format.parseDate( executionDate );
+ String storedBy = currentUserService.getCurrentUsername();
+
if ( dateValue != null )
{
// Get program-stage-instance of the patient
@@ -170,6 +179,7 @@
programStageInstance.setStageInProgram( programStage.getStageInProgram() );
programStageInstance.setDueDate( dateValue );
programStageInstance.setExecutionDate( dateValue );
+ programStageInstance.setStoredBy( storedBy );
programStageInstance.setOrganisationUnit( selectedStateManager.getSelectedOrganisationUnit() );
programStageInstance.setProvidedByAnotherFacility( false );
@@ -182,6 +192,7 @@
else
{
programStageInstance.setExecutionDate( dateValue );
+ programStageInstance.setStoredBy( storedBy );
programStageInstance.setOrganisationUnit( selectedStateManager.getSelectedOrganisationUnit() );
if ( programStageInstance.getProgramInstance().getProgram().getSingleEvent() )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-03-12 07:03:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-03-15 09:25:30 +0000
@@ -68,6 +68,7 @@
<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
<property name="selectedStateManager"
ref="org.hisp.dhis.caseentry.state.SelectedStateManager" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
<bean id="org.hisp.dhis.caseentry.action.caseentry.SaveValueAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2012-03-13 08:24:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2012-03-15 09:25:30 +0000
@@ -49,6 +49,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addRelationshipTypeForm.vm</param>
<param name="javascripts">javascript/relationship.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_RELATIONSHIPTYPE_ADD</param>
</action>
@@ -57,6 +58,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm</param>
<param name="javascripts">javascript/relationship.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
</action>
@@ -131,6 +133,7 @@
<param name="page">
/dhis-web-maintenance-patient/addPatientAttributeForm.vm</param>
<param name="javascripts">javascript/patientAttribute.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
</action>
@@ -141,7 +144,7 @@
/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm</param>
<param name="javascripts">javascript/patientAttribute.js
,../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js</param>
- <param name="stylesheets">../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
</action>
@@ -227,6 +230,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addProgramForm.vm</param>
<param name="javascripts">javascript/program.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_ADD</param>
</action>
@@ -235,6 +239,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateProgramForm.vm</param>
<param name="javascripts">javascript/program.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
</action>
@@ -309,6 +314,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addProgramAttributeForm.vm</param>
<param name="javascripts">javascript/programAttribute.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_ADD</param>
</action>
@@ -317,6 +323,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateProgramAttributeForm.vm</param>
<param name="javascripts">javascript/programAttribute.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_UPDATE</param>
</action>
@@ -382,7 +389,7 @@
<param name="page">
/dhis-web-maintenance-patient/addProgramStageForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
- <param name="stylesheets">/dhis-web-maintenance-patient/style/basic.css</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
</action>
@@ -415,7 +422,7 @@
<param name="page">
/dhis-web-maintenance-patient/updateProgramStageForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
- <param name="stylesheets">/dhis-web-maintenance-patient/style/basic.css</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_UPDATE</param>
</action>
@@ -535,6 +542,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm</param>
<param name="javascripts">javascript/patientAttributeGroup.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
</action>
@@ -578,6 +586,7 @@
<param name="page">
/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_ADD</param>
</action>
@@ -598,6 +607,7 @@
<param name="page">
/dhis-web-maintenance-patient/updatePatientIdentifierType.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_UPDATE</param>
</action>
@@ -839,6 +849,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -847,6 +858,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -870,6 +882,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -878,6 +891,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
+ <param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -935,6 +949,7 @@
class="org.hisp.dhis.patient.action.patientchart.ShowAddPatientChartFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addPatientChartForm.vm</param>
+ <param name="stylesheets">style/basic.css</param>
</action>
<action name="addPatientChart"
@@ -948,6 +963,7 @@
class="org.hisp.dhis.patient.action.patientchart.GetPatientChartAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updatePatientChartForm.vm</param>
+ <param name="stylesheets">style/basic.css</param>
</action>
<action name="updatePatientChart"
