Merge pull request #21 from uonafya/sharing-updates

Fixes and updates
uonafya · Feb 23, 2017 · eb3e28f · eb3e28f
2 parents 05fa0ce + 6e0d734
commit eb3e28f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/...src/main/java/org/hisp/dhis/jphes/hierarchy/action/national/UpdateNationalUnitAction.java b/...src/main/java/org/hisp/dhis/jphes/hierarchy/action/national/UpdateNationalUnitAction.java
@@ -120,15 +120,23 @@ public void setSelectedProgramList( Collection<String> selectedProgramList )
             //Save UserGroup
             userGroupService.updateUserGroup( userGroup );
 
-            //CategoryOptionGroupSet
+            //CategoryOptionGroupSet Donor
 
             CategoryOptionGroupSet categoryOptionGroupSet = nationalUnit.getCategoryOptionGroupSet();
             categoryOptionGroupSet.setName( "A. Donors-" + StringUtils.abbreviate( StringUtils.trimToNull( shortName ), 30 ) );
             categoryOptionGroupSet.setDescription( StringUtils.trimToNull( description ) );
             categoryOptionGroupSet.setDataDimension( true );
 
-            //save categoryOptionGroupSet
+            //CategoryOptionGroupSet Agency
+
+            CategoryOptionGroupSet categoryOptionGroupSetAgency = nationalUnit.getCategoryOptionGroupSetAgency();
+            categoryOptionGroupSetAgency.setName(  "B. Agency Units-"+ StringUtils.abbreviate( StringUtils.trimToNull( shortName ), 30 )  );
+            categoryOptionGroupSetAgency.setDescription( StringUtils.trimToNull( description ) );
+            categoryOptionGroupSetAgency.setDataDimension( true );
+
+            //update categoryOptionGroupSetDonor and Agency
             categoryService.updateCategoryOptionGroupSet( categoryOptionGroupSet );
+            categoryService.updateCategoryOptionGroupSet( categoryOptionGroupSetAgency );
 
             //Mechanism Category
             DataElementCategory category = nationalUnit.getMechanismCategory();

diff --git a/...-web-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/agency/allAgencyUnit.vm b/...-web-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/agency/allAgencyUnit.vm
@@ -11,7 +11,7 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
+##    <li data-enabled="canUpdate"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li><a data-target-fn="viewAgencyPrograms"><i class="fa fa-eye"></i>&nbsp;&nbsp;$i18n.getString( "view_programs" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showAddMechanismUnitForm"><i class="fa fa-plus"></i>&nbsp;&nbsp;$i18n.getString( "add_mechanism" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showUpdateAgencyUnitForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>

diff --git a/...es-web-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/donor/allDonorUnit.vm b/...es-web-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/donor/allDonorUnit.vm
@@ -11,7 +11,7 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
+##    <li data-enabled="canUpdate"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li><a data-target-fn="viewDonorPrograms"><i class="fa fa-eye"></i>&nbsp;&nbsp;$i18n.getString( "view_programs" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showAddAgencyUnitForm"><i class="fa fa-plus"></i>&nbsp;&nbsp;$i18n.getString( "add_agency" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showUpdateDonorUnitForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>

diff --git a/...pps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/mechanism/allMechanismUnit.vm b/...pps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/mechanism/allMechanismUnit.vm
@@ -11,7 +11,7 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
+##    <li data-enabled="canUpdate"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li><a data-target-fn="viewMechanismPrograms"><i class="fa fa-eye"></i>&nbsp;&nbsp;$i18n.getString( "view_programs" )</a></li>
     <li><a data-target-fn="viewOrganistionUnits"><i class="fa fa-building"></i>&nbsp;&nbsp;$i18n.getString( "view_orgunits" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showUpdateMechanismUnitForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>

diff --git a/...es-web-hierarchy/src/main/webapp/jphes-web-hierarchy/mechanism/updateMechanismUnitForm.vm b/...es-web-hierarchy/src/main/webapp/jphes-web-hierarchy/mechanism/updateMechanismUnitForm.vm
@@ -67,12 +67,12 @@
 
     <tr>
       <td><label for="startDate">$i18n.getString( "jphes_startdate" )</label></td>
-      <td colspan="3"><input type="text" id="startDate" name="startDate" value="$!encoder.htmlEncode( $mechanismUnit.categoryOption.startdate )"></td>
+      <td colspan="3"><input type="text" id="startDate" name="startDate" value="$!mechanismUnit.categoryOption.startDate"></td>
     </tr>
 
     <tr>
       <td><label for="endDate">$i18n.getString( "jphes_enddate" )</label></td>
-      <td colspan="3"><input type="text" id="endDate" name="endDate" value="$!encoder.htmlEncode( $mechanismUnit.categoryOption.enddate )"></td>
+      <td colspan="3"><input type="text" id="endDate" name="endDate" value="$!mechanismUnit.categoryOption.endDate"></td>
     </tr>
 
     <tr>

diff --git a/...-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/national/allNationalUnit.vm b/...-apps/jphes-web-hierarchy/src/main/webapp/jphes-web-hierarchy/national/allNationalUnit.vm
@@ -11,7 +11,7 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
+##    <li data-enabled="canUpdate"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li><a data-target-fn="viewNationalPrograms"><i class="fa fa-eye"></i>&nbsp;&nbsp;$i18n.getString( "view_programs" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showAddDonorUnitForm"><i class="fa fa-plus"></i>&nbsp;&nbsp;$i18n.getString( "add_donor" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showUpdateNationalUnitForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>