dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15213
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5406: Added missing licenses
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 5406 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-14 12:16:24 +0100
message:
Added missing licenses
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPersonAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipPatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateAddRelationshipPatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patientchart/GeneratePatientChartAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/idgen/PatientIdentifierGenerator.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-12-14 09:17:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-12-14 11:15:54 +0000
@@ -215,8 +215,7 @@
// orgunit shortname uniqueness
executeSql( "ALTER TABLE organisationunit DROP CONSTRAINT organisationunit_shortname_key" );
- // update dataset-dataentryform association and programstage -
- // dataentryform association
+ // update dataset-dataentryform association and programstage-cde association
if ( updateDataSetAssociation() && updateProgramStageAssociation() )
{
// delete table dataentryformassociation
@@ -227,12 +226,16 @@
executeSql( "UPDATE patientattribute set inheritable=false where inheritable is null" );
executeSql( "UPDATE dataelement set numbertype='number' where numbertype is null and valuetype='int'" );
- // revert prepare aggregateXXXValue tables for offline diffs
+ // revert prepare aggregate*Value tables for offline diffs
executeSql( "ALTER TABLE aggregateddatavalue DROP COLUMN modified");
executeSql( "ALTER TABLE aggregatedindicatorvalue DROP COLUMN modified ");
executeSql( "UPDATE indicatortype SET indicatornumber=false WHERE indicatornumber is null" );
+ // program
+
+ executeSql( "ALTER TABLE programinstance ALTER COLUMN patientid DROP NOT NULL" );
+
// remove outdated relative periods
executeSql( "ALTER TABLE reporttable DROP COLUMN last3months" );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2011-11-07 07:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2011-12-14 11:15:54 +0000
@@ -293,7 +293,6 @@
// Support methods
// -------------------------------------------------------------------------
- // Returns the OrgUnitTree for which Root is the orgUnit
private List<OrganisationUnit> getChildOrgUnitTree( OrganisationUnit orgUnit )
{
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
@@ -325,5 +324,4 @@
return periods;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java 2011-07-25 02:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java 2011-12-14 11:15:54 +0000
@@ -115,7 +115,7 @@
organisationUnit = selectedStateManager.getSelectedOrganisationUnit();
- if( organisationUnit != null )
+ if ( organisationUnit != null )
{
programs = programService.getPrograms( organisationUnit );
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java 2011-11-02 08:12:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java 2011-12-14 11:15:54 +0000
@@ -84,5 +84,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java 2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java 2011-12-14 11:15:54 +0000
@@ -183,6 +183,7 @@
else
{
Set<DataElementCategoryOptionCombo> options = dataElement.getCategoryCombo().getOptionCombos();
+
if ( options != null )
{
for ( DataElementCategoryOptionCombo tmpOption : options )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPersonAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPersonAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPersonAction.java 2011-12-14 11:15:54 +0000
@@ -96,6 +96,7 @@
}
}
}
+
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipPatientAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipPatientAction.java 2011-12-14 11:15:54 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2004-2010, University of Oslo
* All rights reserved.
@@ -25,6 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package org.hisp.dhis.caseentry.action.patient;
import java.util.Collection;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateAddRelationshipPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateAddRelationshipPatientAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateAddRelationshipPatientAction.java 2011-12-14 11:15:54 +0000
@@ -1,5 +1,32 @@
package org.hisp.dhis.caseentry.action.patient;
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java 2011-12-14 11:15:54 +0000
@@ -207,8 +207,11 @@
}
}
}
+
if ( flagDuplicate )
+ {
return PATIENT_DUPLICATE;
+ }
}
}
@@ -257,9 +260,11 @@
if ( !underAge || (underAge && !idType.isRelated()) )
{
value = request.getParameter( AddPatientAction.PREFIX_IDENTIFIER + idType.getId() );
+
if ( StringUtils.isNotBlank( value ) )
{
PatientIdentifier identifier = patientIdentifierService.get( idType, value );
+
if ( identifier != null
&& (id == null || identifier.getPatient().getId().intValue() != id.intValue()) )
{
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java 2011-11-30 06:38:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java 2011-12-14 11:15:54 +0000
@@ -214,6 +214,5 @@
message = i18n.getString( "everything_is_ok" );
return SUCCESS;
-
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java 2011-09-29 07:41:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java 2011-12-14 11:15:54 +0000
@@ -33,8 +33,6 @@
/**
* @author Chau Thu Tran
- * @version $ID : VerifyOrganisationUnitHasParentAction.java May 4, 2011
- * 10:19:48 AM $
*/
public class VerifyOrganisationUnitHasParentAction
implements Action
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patientchart/GeneratePatientChartAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patientchart/GeneratePatientChartAction.java 2011-09-06 02:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patientchart/GeneratePatientChartAction.java 2011-12-14 11:15:54 +0000
@@ -107,5 +107,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/idgen/PatientIdentifierGenerator.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/idgen/PatientIdentifierGenerator.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/idgen/PatientIdentifierGenerator.java 2011-12-14 11:15:54 +0000
@@ -24,6 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package org.hisp.dhis.caseentry.idgen;
import java.text.DecimalFormat;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-12-14 11:15:54 +0000
@@ -4,7 +4,7 @@
program_stages_history_plan=Program Stages History/Plan
completed_on=Completed On
scheduled_for=Scheduled For
-list_all_patients=List All Beneficiaries
+list_all_patients=List all beneficiaries
summary_report=Summary Report
data_entry=Data Entry
reports=Reports
@@ -262,7 +262,7 @@
case_aggregation_form=Beneficiary aggregation form
dataset_list=Dataset List
multiple_data_entry=Multiple Data Entry
-intro_case_aggregation=Generate routine data values from patient-data by month (or other interval if desired) and organisation unit.
+intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
from=From
to=To
ga_orgunit=OrganisationUnit
@@ -319,7 +319,7 @@
view_patient_chart=View Patient chart
generate_patient_chart=Generate patient chart
patient_chart_management=Patient Chart Management
-intro_patient_registration=Create, modify and search for Beneficiaries. Any type of data can be registered for a Beneficiary by including attributes.
+intro_patient_registration=Create, modify and search for beneficiaries. Any type of data can be registered for a beneficiary by including attributes.
registration=Registration
select_relationship=Select Relationship
please_select_a_representative=Please select a representing relationship
@@ -445,6 +445,6 @@
relationship_for=Relationship for
enter_new_encounter=Enter new encounter
date_of_edit=Date of edit
-can_not_enrol_into_the_program_because=Can not enrol into the program because
+can_not_enrol_into_the_program_because=Could not enroll into the program because
event_registration=Event registration
-intro_event_registration=Anonymous event registration
\ No newline at end of file
+intro_event_registration=Register anonymous events. The data to register is defined by a single event anonymous program.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2011-12-14 07:33:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2011-12-14 11:15:54 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "event_registration" )</h3>
- <div id='dataRecordingSelectDiv' class="inputCriteria" style="width:420px;height:80px;">
+ <div id="dataRecordingSelectDiv" class="inputCriteria" style="width:420px;height:80px;">
<input type='hidden' id="programStageId">
@@ -28,8 +28,7 @@
#parse( "dhis-web-commons/loader/loader.vm" )
-
- <div id='dataEntryFormDiv'> </div>
+ <div id="dataEntryFormDiv"> </div>
<script>
var i18n_please_select = '[ ' + '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'" )' + ' ]';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-12-14 11:15:54 +0000
@@ -234,6 +234,7 @@
intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Beneficiary data.
intro_program_attribute=Create, modify and view Program attributes. A program can have any number of attributes.
intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database.
+intro_patient_registration=Define the organisation units which should be allowed to register beneficiaries.
intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data.
add_dependent=Add dependent
inheritable=Inheritable
@@ -317,7 +318,6 @@
validation_criteria_details=Validation criteria details
program_attribute_details=Program attribute details
patient_registration=Beneficiary Registration
-intro_patient_registration=Select organisation units which can register beneficiaries
select_program=Select program
fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form
define_single_dataelement_validation=Define Single Data Element Validation
