dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12027
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-10 22:46:44 +0700
message:
  Allow to get data from ouMode in tabular report.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientReminderService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  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/eventMessage.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js


--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientReminderService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientReminderService.java	2013-09-10 13:28:05 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientReminderService.java	2013-09-10 15:46:44 +0000
@@ -115,7 +115,6 @@
     public Set<String> getPhonenumbers( PatientReminder patientReminder, Patient patient )
     {
         Set<String> phoneNumbers = new HashSet<String>();
-
         switch ( patientReminder.getSendTo() )
         {
         case PatientReminder.SEND_TO_ALL_USERS_IN_ORGUGNIT_REGISTERED:

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-09-10 12:25:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-09-10 15:46:44 +0000
@@ -1907,15 +1907,16 @@
 				var p = {};
 				p.startDate = TR.cmp.settings.startDate.rawValue;
 				p.endDate = TR.cmp.settings.endDate.rawValue;
-				p.facilityLB = TR.cmp.settings.facilityLB.getValue();
-				p.level = Ext.getCmp('levelCombobox').getValue();
+				if(TR.cmp.settings.facilityLB.getValue()!="" ){
+					p.ouMode = TR.cmp.settings.facilityLB.getValue();
+				}
 				
 				// order-by
 				
 				if(TR.state.asc!=""){				
 					p.asc = TR.state.asc;
 				}
-				else{
+				else if(TR.state.desc!=""){
 					p.desc= TR.state.desc;
 				}
 				
@@ -4129,9 +4130,9 @@
 			width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor - 40,
 			store:  new Ext.data.ArrayStore({
 				fields: ['value', 'name'],
-				data: [['all', TR.i18n.all], ['childrenOnly', TR.i18n.children_only], ['selected', TR.i18n.selected]],
+				data: [['', TR.i18n.all], ['CHILDREN', TR.i18n.children_only], ['SELECTED', TR.i18n.selected]],
 			}),
-			value: 'all',
+			value: '',
 			listeners: {
 				added: function() {
 					TR.cmp.settings.facilityLB = this;

=== 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-08-28 06:43:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/index.html	2013-09-10 15:46:44 +0000
@@ -18,17 +18,15 @@
 		<input type="hidden" id="userOrganisationUnitChildren" name="userOrganisationUnitChildren">
 		<input type="hidden" id="limitRecords" name="limitRecords">
 		<input type="hidden" id="deGroupBy" name="deGroupBy" >
-		<input type="hidden" id="facilityLB" name="facilityLB" >
+		<input type="hidden" id="ouMode" name="ouMode" >
 		<input type="hidden" id="position" name="position" >
 		<input type="hidden" id="deSum" name="deSum" >
 		<select multiple id="startDates" name="startDates" class="hidden"></select>
 		<input type="hidden" id="startDate" name="startDate" >
 		<input type="hidden" id="endDate" name="endDate" >
-		<input type="hidden" id="level" name="level" >
 		<input type="hidden" id="orderByOrgunitAsc" name="orderByOrgunitAsc" >
 		<input type="hidden" id="orderByExecutionDateByAsc" name="orderByExecutionDateByAsc" >
 		<select multiple id="filterValues" name="filterValues" class="hidden"></select>
-		<input type="hidden" id="useFormNameDataElement" name="useFormNameDataElement" >
 		
 		<input id="ou" name="ou" class="hidden" >
 		<select multiple id="item" name="item" class="hidden" ></select>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2013-09-10 06:22:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2013-09-10 15:46:44 +0000
@@ -47,7 +47,7 @@
 			#set( $mark = !$mark )
 		#end 
 		#foreach( $messageConversation in $programInstance.messageConversations )
-			<tr id="tr${sms.id}" #alternate( $mark )>
+			<tr id="tr${messageConversation.id}" #alternate( $mark )>
 				<td>$format.formatDateTime($!messageConversation.lastMessage)</td>
 				<td>$i18n.getString('all')</td>
 				<td>$messageConversation.lastSender.username</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-10 12:49:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-10 15:46:44 +0000
@@ -1918,6 +1918,7 @@
 					+ "<td>" + field.value + "</td>"+
 					+ "<td>" + field.value + "</td></tr>");
 				field.style.backgroundColor = SUCCESS_COLOR;
+				field.value="";
 				hideById('smsError');
 				setInnerHTML('smsSuccess', json.message);