dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07804
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2297: Bug Fixed in Beneficiaries and Programs
------------------------------------------------------------
revno: 2297
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-10-01 18:38:28 +0530
message:
Bug Fixed in Beneficiaries and Programs
modified:
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/caseAggregationForm.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.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
=== 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 2010-08-25 05:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2010-10-01 13:08:28 +0000
@@ -466,4 +466,8 @@
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.
\ No newline at end of file
+intro_case_aggregation = Generate routine data values from patient-data by month (or other interval if desired) and organisation unit.
+from = From
+to = To
+ga_orgunit = OrganisationUnit
+ga_facilityby = OrganisationUnit By
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm 2010-07-15 05:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm 2010-10-01 13:08:28 +0000
@@ -19,7 +19,7 @@
<table>
<tr>
<td class="NormalB" colspan="2">
- $i18n.getString( "dataset_list" ) : <br>
+ <strong> $i18n.getString( "dataset_list" ) : </strong><br>
<select id="selectedDataSets" name="selectedDataSets" onchange="getdSetPeriods()" >
#foreach ( $dataSet in $datasets )
<option value='$dataSet.id' title='$dataSet.name'>$dataSet.name</option>
@@ -34,11 +34,11 @@
<tr>
<td class="NormalB">
- $i18n.getString( "from" )<br>
+ <strong>$i18n.getString( "from" )</strong><br>
<select id="sDateLB" name="sDateLB"></select>
</td>
<td class="NormalB">
- $i18n.getString( "to" )<br>
+ <strong>$i18n.getString( "to" )</strong><br>
<select id="eDateLB" name="eDateLB"></select>
</td>
</tr>
@@ -49,7 +49,7 @@
<tr>
<td class="NormalB"><br/><input type="submit" name="Aggregate" value="Aggregate" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" /></td>
<td class="NormalB">
- $i18n.getString( "ga_facilityby" )<br>
+ <strong> $i18n.getString( "ga_facilityby" )</strong><br>
<select id="facilityLB" name="facilityLB">
<option value="random" selected>Selected</option>
<option value="immChildren" >Immediate Children</option>
@@ -70,7 +70,7 @@
</tr>
<tr>
<td class="NormalB">
- $i18n.getString( "ga_orgunit" )<br>
+ <strong> $i18n.getString( "ga_orgunit" )</strong><br>
<select name="orgUnitListCB" id="orgUnitListCB" multiple style="width: 325px;height: 110px" ondblclick="remOUFunction()">
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2010-09-28 06:10:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2010-10-01 13:08:28 +0000
@@ -130,3 +130,4 @@
register_complete_dataset_success = Register complete dataset successfully.
register_complete_dataset_failed = Register complete dataset failed.
undo_register_complete_dataset_success = Undo register complete dataset success
+datavalue_history = Data value history
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2010-10-01 13:08:28 +0000
@@ -115,4 +115,5 @@
intro_org_unit_level = Create, modify, view and delete descriptive names for the organisation unit levels in the system.
intro_hierarchy_operations_menu = Move organisation units in the organisation unit tree. All children will be moved along with the unit.
filter_by_name = Filter by name
-loading = Loading
\ No newline at end of file
+loading = Loading
+coordinates = Coordinates
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2010-09-25 07:53:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2010-10-01 13:08:28 +0000
@@ -61,7 +61,7 @@
<!-- age -->
<div id="integerValueOfAgeDiv" style="display:none ">
- <input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" style="width: 16em">
+ <input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 16em">
</div>
<!-- birthDate -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2010-09-25 07:53:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2010-10-01 13:08:28 +0000
@@ -62,7 +62,7 @@
<!-- age -->
<div id="integerValueOfAgeDiv" style="display:none ">
- <input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" style="width: 15.5em">
+ <input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 15.5em">
</div>
<!-- birthDate -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2010-09-24 09:50:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2010-10-01 13:08:28 +0000
@@ -8,8 +8,9 @@
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
</td>
- <td >
- <input align="right" type="button" value="$i18n.getString( "add" )" onclick="window.location.href='showAddValidationCriteriaForm.action'" style="width:10em">
+
+ <td style="text-align:right" >
+ <input style="text-align:right" type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddValidationCriteriaForm.action'" style="width:70px">
</td>
</tr>
</table>
