dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16443
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6259: (patient) Don't generate program summary report.
------------------------------------------------------------
revno: 6259
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-03-13 16:23:23 +0700
message:
(patient) Don't generate program summary report.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.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/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-03-05 07:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-03-13 09:23:23 +0000
@@ -9,7 +9,7 @@
disable('createEventBtn');
disable('deleteCurrentEventBtn');
- $.getJSON( 'loadAnonymousPrograms.action',{}
+ $.get( 'loadAnonymousPrograms.action',{}
, function( json )
{
clearListById( 'programId' );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-03-12 07:03:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-03-13 09:23:23 +0000
@@ -3,6 +3,7 @@
validation( 'reportForm', function(form){
loadGeneratedReport();
});
+ datePickerInRange( 'startDate' , 'endDate' );
});
</script>
@@ -32,20 +33,14 @@
<tr>
<td><label>$i18n.getString( "start_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <input type="text" id="startDate" name="startDate" class="{validate:{required:true}}" />
- <script type="text/javascript">
- datePicker('startDate');
- </script>
+ <input type="text" id="startDate" name="startDate" />
</td>
</tr>
<tr>
<td><label>$i18n.getString( "end_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <input type="text" id="endDate" name="endDate" class="{validate:{required:true, greaterOrEqualsDate:'#startDate' }}" />
- <script type="text/javascript">
- datePicker('endDate');
- </script>
+ <input type="text" id="endDate" name="endDate" />
</td>
</tr>