dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10842
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-15 13:28:45 +0700
message:
  Add add-button for posting comment on case entry form; fix bug Last 3 months not working in tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateAggregateReportAction.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/dataEntryForm.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/java/org/hisp/dhis/caseentry/action/report/GenerateAggregateReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateAggregateReportAction.java	2013-04-09 05:48:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateAggregateReportAction.java	2013-05-15 06:28:45 +0000
@@ -379,6 +379,12 @@
             periods.addAll( periodService.reloadPeriods( rp.getRelativePeriods() ) );
         }
 
+        if ( relativePeriods.contains( "last3Months" ) )
+        {
+            rp.clear().setLast3Months( true );
+            periods.addAll( periodService.reloadPeriods( rp.getRelativePeriods() ) );
+        }
+        
         if ( relativePeriods.contains( "last12Months" ) )
         {
             rp.clear().setLast12Months( true );

=== 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	2013-05-03 07:36:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-15 06:28:45 +0000
@@ -514,7 +514,7 @@
 last_six_month = Last six-month
 last_two_six_month = Last 2 six months
 years = Years
-this_year = This years
+this_year = This year
 last_year = Last year
 last_5_years = Last 5 years
 fixed_periods = Fixed periods

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-15 03:40:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-15 06:28:45 +0000
@@ -38,8 +38,9 @@
 			<th class='coordinates1'><label for="postComment">$i18n.getString('post_comment'):</label></th>
 			<th colspan='3'>
 				<input type="text" class="{validate:{maxlength:160}} criteria" id="commentInput"
-                        style="width:430px;#if($programStage.captureCoordinates=='false') margin-left:10px; #end "
+                        style="width:380px;#if($programStage.captureCoordinates=='false') margin-left:10px; #end "
                        onkeypress="keypressOnComment( event, this );">
+				<input type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( this )'>
 			</th>
 		</tr>