dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15887
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5865: (patient) translation, remove unused file.
------------------------------------------------------------
revno: 5865
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-06 10:59:06 +0700
message:
(patient) translation, remove unused file.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/patch.diff
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/java.exe.stackdump
modified:
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/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm
--
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
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/patch.diff'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/patch.diff 2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/patch.diff 1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java'
---- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java 2012-02-03 08:17:56 +0000
-+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java 2012-02-03 14:47:55 +0000
-@@ -44,6 +44,8 @@
-
- OptionSet getOptionSet( String uid );
-
-+ OptionSet getOptionSetByName( String name );
-+
- void deleteOptionSet( OptionSet optionSet );
-
- Collection<OptionSet> getAllOptionSets();
-
-=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/DefaultOptionService.java'
---- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/DefaultOptionService.java 2012-02-03 08:17:56 +0000
-+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/DefaultOptionService.java 2012-02-03 14:48:50 +0000
-@@ -66,6 +66,11 @@
- return optionSetStore.getByUid( uid );
- }
-
-+ public OptionSet getOptionSetByName( String name )
-+ {
-+ return optionSetStore.getByName( name );
-+ }
-+
- public void deleteOptionSet( OptionSet optionSet )
- {
- optionSetStore.delete( optionSet );
-
-=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
---- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-01-11 06:17:35 +0000
-+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-02-04 07:47:01 +0000
-@@ -539,7 +539,7 @@
- // Add ProvidedByOtherFacility checkbox
- // -----------------------------------------------------------
-
-- appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage );
-+ appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }
- else
- {
-@@ -770,7 +770,7 @@
- // Add ProvidedByOtherFacility checkbox
- // -----------------------------------------------------------
-
-- appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage );
-+ appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }
-
- // -----------------------------------------------------------
-@@ -994,7 +994,7 @@
- // Add ProvidedByOtherFacility checkbox
- // -----------------------------------------------------------
-
-- appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage );
-+ appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }
-
- // -----------------------------------------------------------
-@@ -1223,7 +1223,7 @@
- // Add ProvidedByOtherFacility checkbox
- // ---------------------------------------------------------
-
-- appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage );
-+ appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }
-
- // -------------------------------------------------------------
-@@ -1336,9 +1336,9 @@
- * @param patientDataValue: currrent PatientDataValue
- * @return full html code after append the check box
- */
-- private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue, ProgramStage programStage )
-+ private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue )
- {
-- appendCode += "<label for=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" title=\"is provided by another Facility ?\" ></label><input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" style=\"display:$DISPLAY;\" ";
-+ appendCode += "<label for=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" title=\"is provided by another Facility ?\" ></label><input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" ";
-
- if ( patientDataValue != null && patientDataValue.isProvidedByAnotherFacility() )
- {
-@@ -1346,9 +1346,6 @@
- }
- appendCode += "onChange=\"updateProvidingFacility( $DATAELEMENTID, this )\" >";
-
-- String display = ( programStage.getProgram().getAnonymous() ) ? "none" : "block";
-- appendCode = appendCode.replace( "$DISPLAY", display );
--
- return appendCode;
-
- }
-
-=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
---- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 20:01:36 +0000
-+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2012-02-03 15:46:03 +0000
-@@ -333,4 +333,36 @@
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
-+ <!-- OptionSet -->
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction" class="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction" class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction" class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
-+ <bean id="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction" class="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction"
-+ scope="prototype">
-+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
-+ </bean>
-+
- </beans>
-
-=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
---- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-01-28 17:42:13 +0000
-+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-02-04 07:19:38 +0000
-@@ -380,4 +380,14 @@
- execute_now=Execute now
- execute_tasks_confirmation=Are you sure you want to execute all tasks now? Task processing might fully utilize your system resources and slow down other operations.
- no_aggregation=No aggregation
--data_elements_in_data_set_not_in_form = Data elements in data set but not in form or sections
-\ No newline at end of file
-+data_elements_in_data_set_not_in_form = Data elements in data set but not in form or sections
-+option_set = Option set
-+intro_option_set = Create the option values which would be included in data elements.
-+add_option_set = Add option set
-+options = Options
-+option = Option
-+add_option = Add Option
-+option_name_already_exists = The option name already exists
-+specify_option_name = Please specify a option name
-+must_include_option = Please include one or more category options
-+edit_option_set = Edit option set
-
-=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
---- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2011-11-24 13:19:36 +0000
-+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2012-02-04 06:38:16 +0000
-@@ -569,5 +569,61 @@
- <param name="requiredAuthorities">F_SCHEDULING_ADMIN</param>
- </action>
-
-+
-+ <!-- OptionSet -->
-+
-+ <action name="optionSet" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction">
-+ <result name="success" type="velocity">/main.vm</result>
-+ <param name="page">/dhis-web-maintenance-dataadmin/optionSet.vm</param>
-+ <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-+ <param name="javascripts">javascript/optionSet.js</param>
-+ <param name="requiredAuthorities">F_OPTIONSET_MANAGEMENT</param>
-+ </action>
-+
-+ <action name="showAddOptionSetForm" class="org.hisp.dhis.dataadmin.action.NoAction">
-+ <result name="success" type="velocity">/main.vm</result>
-+ <param name="page">/dhis-web-maintenance-dataadmin/addOptionSetForm.vm</param>
-+ <param name="javascripts">javascript/optionSet.js</param>
-+ <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
-+ </action>
-+
-+ <action name="addOptionSet" class="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction">
-+ <result name="success" type="redirect">optionSet.action</result>
-+ <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
-+ </action>
-+
-+ <action name="showUpdateOptionSetForm" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
-+ <result name="success" type="velocity">/main.vm</result>
-+ <param name="page">/dhis-web-maintenance-dataadmin/updateOptionSetForm.vm</param>
-+ <param name="javascripts">javascript/optionSet.js</param>
-+ <param name="requiredAuthorities">F_OPTIONSET_UPDATE</param>
-+ </action>
-+
-+ <action name="updateOptionSet" class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction">
-+ <result name="success" type="redirect">optionSet.action</result>
-+ <param name="requiredAuthorities">F_OPTIONSET_UPDATE</param>
-+ </action>
-+
-+ <action name="removeOptionSet" class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction">
-+ <result name="success" type="velocity-json">
-+ /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-+ <param name="requiredAuthorities">F_OPTIONSET_DELETE</param>
-+ </action>
-+
-+ <action name="validateOptionSet"
-+ class="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction">
-+ <result name="success" type="velocity-json">
-+ /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-+ <result name="error" type="velocity-json">
-+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
-+ <param name="onExceptionReturn">plainTextError</param>
-+ </action>
-+
-+ <action name="getOptionSet"
-+ class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
-+ <result name="success" type="velocity-json">
-+ /dhis-web-maintenance-dataadmin/jsonOptionSet.vm</result>
-+ </action>
-+
- </package>
- </struts>
-
-=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
---- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-01-03 06:08:25 +0000
-+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-02-03 15:56:53 +0000
-@@ -167,7 +167,10 @@
- F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
- F_VALIDATIONCRITERIA_UPDATE=Update Validation Criteria
- F_SEND_MESSAGE=Send message
--F_DV_ADMIN=Administrate Data Visualizer
-+F_OPTIONSET_MANAGEMENT=Option Set Management
-+F_OPTIONSET_ADD=Add Option Set
-+F_OPTIONSET_UPDATE=Update Option Set
-+F_OPTIONSET_DELETE=Delete Option Set
-
- #-- User module ---------------------------------------------------------------#
-
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/java.exe.stackdump'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/java.exe.stackdump 2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/java.exe.stackdump 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Exception: STATUS_ACCESS_VIOLATION at eip=610C8439
-eax=00000000 ebx=00000001 ecx=00000000 edx=0000023C esi=00000000 edi=1B1FCCB0
-ebp=1B1FCAEC esp=1B1FCAC4 program=\\?\C:\Program Files (x86)\Java\jdk1.6.0_20\bin\java.exe, pid 6012, thread unknown (0xB70)
-cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B
-Stack trace:
-Frame Function Args
-1B1FCAEC 610C8439 (00000000, 00000000, 00000000, 00000000)
-1B1FCBFC 610C8DD5 (00000000, 00000000, 00000000, 00000000)
-1B1FCCBC 610C9B3A (FFFFFFFF, FFFFFFFF, 74F734F3, FFFFFFFE)
-1B1FCD0C 61028182 (00000002, C0B399B5, 1B1FCE64, 00000002)
-1B1FCD98 763E6B59 (00000002, 1B1FCDD4, 763E69A4, 00000002)
-End of stack trace
=== 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 2012-01-15 14:53:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-02-06 03:59:06 +0000
@@ -170,7 +170,6 @@
beneficiary_aggregation_query_builder_management=Beneficiary aggregation query builder management
dataelement_group=Data Element Group
dataelement=Data Element
-program_stage_de=ProgramStageDataElement
case_attributes=Beneficiary Attributes
operator=Operator
and_or=And/Or
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-02-06 03:59:06 +0000
@@ -73,7 +73,7 @@
<tr>
<td>
<fieldset style="border: 1px solid #3f5d8e; ">
- <legend>$i18n.getString( "program_stage_de" )</legend>
+ <legend>$i18n.getString( "dataelement" )</legend>
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-02-06 03:59:06 +0000
@@ -77,7 +77,7 @@
<tr>
<td>
<fieldset style="border: 1px solid #3f5d8e; ">
- <legend>$i18n.getString( "program_stage_de" )</legend>
+ <legend>$i18n.getString( "dataelement" )</legend>
<table>
<tr>
<td>
