dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17488
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-11-17 05:54:11 +0000
message:
  local/in add missing method inMaintenance rbf partner
modified:
  local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java
  local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.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 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java	2014-11-15 09:02:15 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java	2014-11-17 05:54:11 +0000
@@ -70,15 +70,16 @@
         return partnerStore.getPartner( organisationUnit, dataSet );
     }
 
-    @Override
-    public Collection<Partner> getPartner( OrganisationUnit organisationUnit, DataElement dataElement )
-    {
-        return partnerStore.getPartner( organisationUnit, dataElement );
-    }    
-    
+
     public Map<String, Integer> getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate )
     {
         return partnerStore.getOrgUnitCountFromPartner( dataSetId, dataElementId, optionId, startDate, endDate );
     }    
     
+    public Collection<String> getStartAndEndDate( Integer dataSetId, Integer dataElementId, Integer optionId )
+    {
+        return partnerStore.getStartAndEndDate( dataSetId, dataElementId, optionId );
+    }
+    
+    
 }

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm	2014-11-12 09:32:10 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm	2014-11-17 05:54:11 +0000
@@ -133,8 +133,13 @@
 			#set( $count = 0)						
 			#set( $pbfDataValue = $!pbfDataValueMap.get( $dataElement ) )
 
-            <td><label>$!pbfDataValue.getOption().getDisplayName()</label></td>				
-				
+            <!--<td><label>$!pbfDataValue.getOption().getDisplayName()</label></td>-->				
+			
+			#if( $pbfDataValue.getOption().getDisplayName() && $!pbfDataValue.getOption().getDisplayName() != "" )
+					<td><label>$!pbfDataValue.getOption().getDisplayName()</label></td>
+			#else
+				<td><label>Ministry of Health</label></td>
+			#end
 				##if( $auth.hasAccess( "dhis-web-maintenance-rbf", "pbfAdminDataEntry" ) )
 					<td>
         				<input onblur="savePBFDataValue('$dataElement.id', 1 )" type="text" name="pbfdv_qty_reported_$dataElement.id" id="pbfdv_qty_reported_$dataElement.id"