dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11159: Fixed bug - Data is not shown even though the data elements are marked as Display in reports in a...

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 06 Jun 2013 09:37:20 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 11159
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-06 16:34:23 +0700
message:
  Fixed bug - Data is not shown even though the data elements are marked as Display in reports in anonymous entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/index.html
  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/programStageInstancesList.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/app/index.html'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/index.html	2013-05-30 09:08:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/index.html	2013-06-06 09:34:23 +0000
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-	<form id="exportForm" name='exportForm' method="post">
+	<form id="exportForm" name='exportForm' method="post" target="_blank">
         <input type="hidden" id="programStageId" name='programStageId' >
 		<input type="hidden" id="aggregateType" name='aggregateType' >
 		<select multiple id="deFilters" name="deFilters" class="hidden"></select>

=== 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	2013-05-31 06:38:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2013-06-06 09:34:23 +0000
@@ -693,7 +693,7 @@
     var params = 'anonynousEntryForm=true';
     jQuery( '#displayInReports option' ).each( function ( i, item ) {
         var input = jQuery( item );
-        params += '&searchingValues=de_' + input.val() + '_false_';
+        params += '&filterValues=de_' + input.val() + '_false_';
     } );
 
     if ( listAll ) {
@@ -724,7 +724,7 @@
 
                 if ( value != '' ) {
                     searchingValue += getValueFormula( value );
-                    params += '&searchingValues=' + searchingValue;
+                    params += '&filterValues=' + searchingValue;
                 }
                 searchingValue = '';
                 value = '';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2013-04-22 06:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2013-06-06 09:34:23 +0000
@@ -1,4 +1,3 @@
-
 #if($message)
 	<span id='message' style="display:block;">$message</span>
 #else