=== 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" />
-
+
+
+
=== 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
+
/main.vm
/dhis-web-maintenance-patient/addRelationshipTypeForm.vm
javascript/relationship.js
+ style/basic.css
F_RELATIONSHIPTYPE_ADD
@@ -57,6 +58,7 @@
/main.vm
/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm
javascript/relationship.js
+ style/basic.css
F_PATIENTATTRIBUTE_UPDATE
@@ -131,6 +133,7 @@
/dhis-web-maintenance-patient/addPatientAttributeForm.vm
javascript/patientAttribute.js
+ style/basic.css
F_PATIENTATTRIBUTE_ADD
@@ -141,7 +144,7 @@
/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm
javascript/patientAttribute.js
,../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js
- ../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css
+ style/basic.css
F_PATIENTATTRIBUTE_UPDATE
@@ -227,6 +230,7 @@
/main.vm
/dhis-web-maintenance-patient/addProgramForm.vm
javascript/program.js
+ style/basic.css
F_PROGRAM_ADD
@@ -235,6 +239,7 @@
/main.vm
/dhis-web-maintenance-patient/updateProgramForm.vm
javascript/program.js
+ style/basic.css
F_PROGRAM_UPDATE
@@ -309,6 +314,7 @@
/main.vm
/dhis-web-maintenance-patient/addProgramAttributeForm.vm
javascript/programAttribute.js
+ style/basic.css
F_PROGRAM_ATTRIBUTE_ADD
@@ -317,6 +323,7 @@
/main.vm
/dhis-web-maintenance-patient/updateProgramAttributeForm.vm
javascript/programAttribute.js
+ style/basic.css
F_PROGRAM_ATTRIBUTE_UPDATE
@@ -382,7 +389,7 @@
/dhis-web-maintenance-patient/addProgramStageForm.vm
javascript/commons.js,javascript/programStage.js
- /dhis-web-maintenance-patient/style/basic.css
+ style/basic.css
F_PROGRAMSTAGE_ADD
@@ -415,7 +422,7 @@
/dhis-web-maintenance-patient/updateProgramStageForm.vm
javascript/commons.js,javascript/programStage.js
- /dhis-web-maintenance-patient/style/basic.css
+ style/basic.css
F_PROGRAMSTAGE_UPDATE
@@ -535,6 +542,7 @@
/main.vm
/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm
javascript/patientAttributeGroup.js
+ style/basic.css
F_PATIENTATTRIBUTE_UPDATE
@@ -578,6 +586,7 @@
/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm
javascript/patientIdentifierType.js
+ style/basic.css
F_PATIENTIDENTIFIERTYPE_ADD
@@ -598,6 +607,7 @@
/dhis-web-maintenance-patient/updatePatientIdentifierType.vm
javascript/patientIdentifierType.js
+ style/basic.css
F_PATIENTIDENTIFIERTYPE_UPDATE
@@ -839,6 +849,7 @@
/main.vm
/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm
javascript/programValidation.js
+ style/basic.css
F_PROGRAM_VALIDATION
@@ -847,6 +858,7 @@
/main.vm
/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm
javascript/programValidation.js
+ style/basic.css
F_PROGRAM_VALIDATION
@@ -870,6 +882,7 @@
/main.vm
/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm
javascript/programValidation.js
+ style/basic.css
F_PROGRAM_VALIDATION
@@ -878,6 +891,7 @@
/main.vm
/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm
javascript/programValidation.js
+ style/basic.css
F_PROGRAM_VALIDATION
@@ -935,6 +949,7 @@
class="org.hisp.dhis.patient.action.patientchart.ShowAddPatientChartFormAction">
/main.vm
/dhis-web-maintenance-patient/addPatientChartForm.vm
+ style/basic.css
/main.vm
/dhis-web-maintenance-patient/updatePatientChartForm.vm
+ style/basic.css