M&E disaggregation#4501
Open
brianbrix wants to merge 30 commits into
Open
Conversation
# Conflicts: # amp/src/main/java/org/digijava/module/aim/helper/GlobalSettingsConstants.java # amp/src/main/resources/xmlpatches/4.0/AMP-31057-Add-Currecies-for-dashboard.xml # amp/src/main/resources/xmlpatches/4.0/AMP-31057-Donor-Funding-Admin-Levels-v1.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_0.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_1.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_2.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_3.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_4.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_5.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_6.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_7.xml # amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_8.xml # amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_2.xml # amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_3.xml # amp/src/main/webapp/WEB-INF/jsp/esrigis/view/mainmapPopup.jsp
Missing gazeteer
fix/GGW/GGW-issues
# Conflicts: # .github/workflows/deploy.yml # amp/pom.xml # amp/src/main/java/org/dgfoundation/amp/onepager/util/ActivityUtil.java # amp/src/main/java/org/digijava/module/message/jobs/AmpDonorFundingJob.java # amp/src/main/resources/org/digijava/module/aim/dbentity/AmpStructure.hbm.xml # amp/src/main/webapp/WEB-INF/jsp/esrigis/view/mainmapPopup.jsp
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves how AMP activity IDs are derived and used across reporting/grid and GIS endpoints (particularly when the AMP ID “text cell” is missing), and includes a few related operational fixes (map tile URL protocol, SQL view adjustments, and menu/global-setting patches).
Changes:
- Update tab grid rendering to extract and sanitize activity IDs more robustly, and add a fallback entityId extraction when the AMP ID column is absent.
- Update GIS services to use
ReportArea.owner.idfor activity IDs when AMP ID cells aren’t present. - Adjust several SQL view definitions (GROUP BY) and update OSM basemap URL to HTTPS; add XML patches for report-generator menu URL and GIS login requirement setting.
Reviewed changes
Copilot reviewed 17 out of 19 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js | More resilient activity-id extraction for row actions/preview links; fallback entityId extraction when AMP ID column isn’t included. |
| amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js | Switch OSM tiles + attribution links to HTTPS; simplify OSM subdomain configuration. |
| amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_3.xml | Minor SQL view formatting tweak (GROUP BY alignment). |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_0.xml | Expand GROUP BY to include level.name (and minor whitespace changes). |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_1.xml | Expand GROUP BY to include level.name (plus whitespace). |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_2.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_3.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_4.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_5.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_6.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_7.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_8.xml | Expand GROUP BY to include level.name. |
| amp/src/main/resources/xmlpatches/4.0/GGW-Prod-change-report-generator-path.xml | New patch to update report-generator menu URLs. |
| amp/src/main/resources/xmlpatches/4.0/GGW-207-Require-Login-For-GIS.xml | Patch modifies how a new amp_global_settings row id is generated. |
| amp/src/main/java/org/digijava/module/aim/dbentity/AmpStructure.java | Initialize images and adjust merge-prep behavior for structure images. |
| amp/src/main/java/org/digijava/module/aim/action/EditActivity.java | Update structure copy logic for images on cloned structures. |
| amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/LocationService.java | Use ReportArea.owner.id for collecting activity ids; remove column-walk logic. |
| amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/ActivityService.java | Add fallback to ReportArea.owner.id when AMP ID cell is absent. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
189
to
203
| if (aux.getImages() != null && !aux.getImages().isEmpty()) { | ||
| Set<AmpStructureImg> auxSetImages = new HashSet<>(); | ||
| for (AmpStructureImg img : aux.getImages()) { | ||
| AmpStructureImg auxImg = (AmpStructureImg) img.clone(); | ||
| auxImg.setId(null); | ||
| 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<>()); | ||
| } |
Comment on lines
1636
to
+1638
| AmpStructure z = (AmpStructure) struc.clone(); | ||
| z.setImages(new HashSet(struc.getImages())); | ||
| z.getImages().clear(); | ||
| z.getImages().addAll(struc.getImages()); |
Comment on lines
11
to
+13
| 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); |
Comment on lines
+253
to
255
| 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>"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.