M&E disaggregation

amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js

@@ -71,18 +71,14 @@ function initMap() {
 function loadBaseMap() {
     map = L.map('map').setView([latitude, longitude], 7);
     // create the tile layer with correct attribution
-    var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+    var osmUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
     if (isOsm) {
-        var subdomains = ['a', 'b', 'c'];
-        if (basemapurl !== undefined && basemapurl.indexOf("mqcdn") != -1) {
-            subdomains = ['otile1', 'otile2', 'otile3', 'otile4'];
-        }
-        var osmAttrib = 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
+        var osmAttrib = 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
         tileLayer = new L.TileLayer(osmUrl, {
             minZoom: 0,
             maxZoom: 16,
             attribution: osmAttrib,
-            subdomains: subdomains
+            subdomains: ['a', 'b', 'c']
         });
     } else {
         tileLayer = L.esri.tiledMapLayer({

amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js

@@ -34,6 +34,26 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
 		return '/aim/viewActivityPreview.do~activityId=' + id;
 	}
 
+	function getRowActivityId(grid, rowId) {
+		var activityId = jQuery(grid).jqGrid('getCell', rowId, app.TabsApp.COLUMN_ACTIVITY_ID);
+		// Strip whitespace and non-breaking spaces (\u00A0 /  ) which hidden jqGrid
+		// cells may contain — they are truthy but not a valid numeric ID.
+		if (activityId) {
+			activityId = String(activityId).replace(/[\s\u00A0]/g, '');
+		}
+		if (!activityId) {
+			try {
+				activityId = jQuery(grid).jqGrid('getCell', rowId, 'Activity Id');
+				if (activityId) {
+					activityId = String(activityId).replace(/[\s\u00A0]/g, '');
+				}
+			} catch (error) {
+				activityId = '';
+			}
+		}
+		return activityId;
+	}
+
 	GridManager.prototype = {
 		constructor : GridManager
 	};
@@ -230,7 +250,7 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
 								//set default color and link for rows
 								row = this.rows[iRow];
 								className = row.className;
-								var id = row.cells[1].textContent;
+								var id = getRowActivityId(grid, row.id);
 								var iconedit = "<a href='/wicket/onepager/"+ onePagerParameter +"/" + id
 									+ "'><img src='/TEMPLATE/ampTemplate/tabs/css/images/ico_edit.gif'/></a>";
 								var iconvalidated = "<a href='/wicket/onepager/"+ onePagerParameter +"/" + id
@@ -358,9 +378,11 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
 										colIndex = i;
 									}
 								});
-                                var newContent = "<a class='preview-cell" + statusClass + "' href='" + getPreviewPageURL(id) + "'>"
-									+ jQuery(row.cells[colIndex]).html() + "</a>";
-								jQuery(row.cells[colIndex]).html(newContent);
+								if (id) {
+									var newContent = "<a class='preview-cell" + statusClass + "' href='" + getPreviewPageURL(id) + "'>"
+										+ jQuery(row.cells[colIndex]).html() + "</a>";
+									jQuery(row.cells[colIndex]).html(newContent);
+								}
 							}
 
 							TranslationManager.searchAndTranslate();
@@ -545,6 +567,18 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
 						row[column.columnName] = element.entityId;
 					}
 				});
+
+				// If AMP ID column is absent from the report the entityId was never extracted
+				// in the loop above. Every leaf element carries entityId regardless of column,
+				// so fall back to the first one we can find.
+				if (row[app.TabsApp.COLUMN_ACTIVITY_ID] === undefined) {
+					jQuery.each(obj.contents, function(hierarchicalName, element) {
+						if (element && element.entityId !== undefined) {
+							row[app.TabsApp.COLUMN_ACTIVITY_ID] = element.entityId;
+							return false; // break
+						}
+					});
+				}
 
 				// To flatten the tree structure and maintain hierarchies values on every row we add the values from "auxCurrentHierarchiesValues".
 				if (hierarchies.models.length > 0) {

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/ActivityService.java

@@ -210,6 +210,14 @@ public static ActivityList getActivities(PerformanceFilterParameters config, Lis
                     }
                 }
             }
+            // If the AMP ID text cell was absent (activity has no AMP ID value), the id and
+            // ampUrl were never set in the loop above. Fall back to AreaOwner.id, which is
+            // always populated for every leaf row regardless of column configuration.
+            if (activity.getId() == null && reportArea.getOwner() != null && reportArea.getOwner().id > 0) {
+                long ownerId = reportArea.getOwner().id;
+                activity.setId(ownerId);
+                activity.setAmpUrl(ActivityGatekeeper.buildPreviewUrl(String.valueOf(ownerId)));
+            }
             matchesFilters.put("Programs",programs);
             activity.setMatchesFilters(matchesFilters);
             activities.add(activity);

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/LocationService.java

@@ -33,7 +33,6 @@
 import org.dgfoundation.amp.newreports.ReportAreaImpl;
 import org.dgfoundation.amp.newreports.ReportCell;
 import org.dgfoundation.amp.newreports.ReportColumn;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
 import org.dgfoundation.amp.newreports.ReportSettingsImpl;
 import org.dgfoundation.amp.newreports.ReportSpecification;
 import org.dgfoundation.amp.newreports.ReportSpecificationImpl;
@@ -303,25 +302,17 @@ private static Set<Long> getActivitiesForFiltering(PerformanceFilterParameters c
             for (ReportArea reportArea : ll) {
                 if (implementationLevelColumn != null) {
                     List<ReportArea> childrenHierarchy = reportArea.getChildren();
-
                     for (ReportArea reportAreachi : childrenHierarchy) {
-                        Map<ReportOutputColumn, ReportCell> row = reportAreachi.getContents();
-                        Set<ReportOutputColumn> col = row.keySet();
-                        for (ReportOutputColumn reportOutputColumn : col) {
-                            if (reportOutputColumn.originalColumnName.equals(ColumnConstants.AMP_ID)) {
-                                activitiesId.add(((IdentifiedReportCell) row.get(reportOutputColumn)).entityId);
-                            }
+                        // Use AreaOwner.id — always populated for every leaf row regardless of
+                        // whether the activity has an AMP ID text value assigned.
+                        if (reportAreachi.getOwner() != null && reportAreachi.getOwner().id > 0) {
+                            activitiesId.add(reportAreachi.getOwner().id);
                         }
                     }
-
                 } else {
                     // we don't have hierarchy
-                    Map<ReportOutputColumn, ReportCell> row = reportArea.getContents();
-                    Set<ReportOutputColumn> col = row.keySet();
-                    for (ReportOutputColumn reportOutputColumn : col) {
-                        if (reportOutputColumn.originalColumnName.equals(ColumnConstants.AMP_ID)) {
-                            activitiesId.add(((IdentifiedReportCell) row.get(reportOutputColumn)).entityId);
-                        }
+                    if (reportArea.getOwner() != null && reportArea.getOwner().id > 0) {
+                        activitiesId.add(reportArea.getOwner().id);
                     }
                 }
             }

amp/src/main/java/org/digijava/module/aim/action/EditActivity.java

@@ -1634,7 +1634,8 @@ public final static ArrayList<AmpStructure> eager_copy(Set<AmpStructure> structu
       for(AmpStructure struc:structures)
       {
           AmpStructure z = (AmpStructure) struc.clone();
-          z.setImages(new HashSet(struc.getImages()));
+          z.getImages().clear();
+          z.getImages().addAll(struc.getImages());
           /*z.setActivities(new HashSet(struc.getActivities()));
           z.setAmpStructureId(struc.getAmpStructureId());
           z.setCreationdate(struc.getCreationdate());

amp/src/main/java/org/digijava/module/aim/dbentity/AmpStructure.java

@@ -62,7 +62,7 @@ public class AmpStructure implements Serializable, Comparable<Object>, Versionab
     @InterchangeableBackReference
     private AmpActivityVersion activity;
 
-    private Set<AmpStructureImg> images;
+    private Set<AmpStructureImg> images = new HashSet<>();
 
     @Interchangeable(fieldTitle = "Coordinates", importable = true, fmPath = "/Activity Form/Structures/Map")
     private List<AmpStructureCoordinate> coordinates = new ArrayList<>();
@@ -194,9 +194,12 @@ public Object prepareMerge(AmpActivityVersion newActivity) throws CloneNotSuppor
                 auxImg.setStructure(aux);
                 auxSetImages.add(auxImg);
             }
-            aux.setImages(auxSetImages);
+            aux.getImages().clear();
+            aux.getImages().addAll(auxSetImages);
         } else {
-            aux.setImages(new HashSet<>());
+
+            aux.getImages().clear();
+            aux.getImages().addAll(new HashSet<>());
         }
 
         if (aux.getCoordinates() != null && !aux.getCoordinates().isEmpty()) {

amp/src/main/resources/xmlpatches/4.0/GGW-207-Require-Login-For-GIS.xml

@@ -10,7 +10,7 @@
             <lang delimiter=";" type="postgres"><![CDATA[
             SELECT setval('amp_global_settings_seq', (SELECT MAX(id) FROM amp_global_settings));
 				INSERT INTO amp_global_settings(id, settingsname, settingsvalue, possiblevalues, description, section, value_translatable, internal)
-				VALUES (nextval('amp_global_settings_seq'), 'Login Required For GIS', 'true', 't_Boolean', 'Login Required For GIS', 'gis', null, FALSE);
+				VALUES ((select max(id) + 1 FROM amp_global_settings), 'Login Required For GIS', 'true', 't_Boolean', 'Login Required For GIS', 'gis', null, FALSE);
 			]]></lang>
         </script>
     </apply>

amp/src/main/resources/xmlpatches/4.0/GGW-Prod-change-report-generator-path.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:patch closeOnSuccess="true" retryOnFail="true"
+           xmlns:tns="http://docs.ampdev.net/schemas/xmlpatcher" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://docs.ampdev.net/schemas/xmlpatcher ../../schemas/xmlpatcher.xsd ">
+    <jira>AMP</jira>
+    <keyword>Change url to old report generator</keyword>
+    <author>bmokandu</author>
+    <description>Change menu entry for report generator.</description>
+    <apply>
+        <script>
+            <lang delimiter=";" type="postgres">
+                UPDATE amp_menu_entry SET url = '/TEMPLATE/reampv2/packages/container/build/index.html#/reampv2-app/report_generator?profile=R' WHERE url LIKE '%report_generator?profile=R%';
+                UPDATE amp_menu_entry SET url = '/TEMPLATE/reampv2/packages/container/build/index.html#/reampv2-app/report_generator?profile=T' WHERE url LIKE '%report_generator?profile=T%';
+            </lang>
+        </script>
+    </apply>
+</tns:patch>
+
+

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_0.xml

@@ -34,8 +34,9 @@
 								JOIN ni_all_programs_with_levels apl ON a.amp_program_id = apl.amp_theme_id
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id0
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
+
 	   						WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id0, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id0, level.amp_theme_id, level.name
                     ) v
                     ON aav.amp_activity_id = v.amp_activity_id;
 			]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_1.xml

@@ -35,7 +35,8 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id1
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id1, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id1, level.amp_theme_id, level.name
+
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
          	]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_2.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id2
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id2, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id2, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
          	]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_3.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id3
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id3, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id3, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
          	]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_4.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id4
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id4, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id4, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
  			]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_5.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id5
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id5, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id5, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
  			]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_6.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id6
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id6, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id6, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
  			]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_7.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id7
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id7, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id7, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
          	]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_8.xml

@@ -35,7 +35,7 @@
 								LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id8
 								JOIN amp_program_settings aps ON aps.amp_program_settings_id = a.program_setting
 							WHERE aps.name = 'National Plan Objective' AND a.program_percentage <> 0
-						GROUP BY a.amp_activity_id, apl.id8, level.amp_theme_id
+						GROUP BY a.amp_activity_id, apl.id8, level.amp_theme_id, level.name
 					) v
 					ON aav.amp_activity_id = v.amp_activity_id;
          	]]></lang>

amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_3.xml

@@ -39,7 +39,7 @@
 							JOIN all_programs_with_levels oapl ON afpp.amp_program_id = oapl.amp_theme_id
 							LEFT JOIN amp_theme level ON level.amp_theme_id = apl.id3
 						WHERE oapl.program_setting_name = 'Tertiary Program'
-						GROUP BY afpp.pledge_id, apl.id3, level.amp_theme_id,level.name
+				GROUP BY afpp.pledge_id, apl.id3, level.amp_theme_id,level.name
 					) v
 					ON afp.id = v.pledge_id;
        		</lang>