Skip to content

Commit

Permalink
Fix budget_range (#167)
Browse files Browse the repository at this point in the history
Co-authored-by: dorutrip <dorutrip@gmail.com>
  • Loading branch information
tiberiuichim and dorutrip authored Oct 2, 2024
1 parent 9a849ff commit e7c4035
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 25 deletions.
32 changes: 16 additions & 16 deletions eea/climateadapt/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<metadata>
<version>73</version>
<dependencies>
<dependency>profile-plone.app.dexterity:default</dependency>
<dependency>profile-plone.app.contenttypes:default</dependency>
<dependency>profile-collective.cover:default</dependency>
<dependency>profile-collective.geolocationbehavior:default</dependency>
<dependency>profile-plone.app.theming:default</dependency>
<dependency>profile-eea.facetednavigation:default</dependency>
<dependency>profile-collective.js.datatables:default</dependency>
<dependency>profile-collective.easyform:default</dependency>
<dependency>profile-plone.formwidget.recaptcha:default</dependency>
<dependency>profile-collective.sweeteditor:default</dependency>
<dependency>profile-plone.app.ldap:ldap</dependency>
<dependency>profile-plone.app.querystring:default</dependency>
<dependency>profile-Products.CMFPlacefulWorkflow:CMFPlacefulWorkflow</dependency>
</dependencies>
<version>77</version>
<dependencies>
<dependency>profile-plone.app.dexterity:default</dependency>
<dependency>profile-plone.app.contenttypes:default</dependency>
<dependency>profile-collective.cover:default</dependency>
<dependency>profile-collective.geolocationbehavior:default</dependency>
<dependency>profile-plone.app.theming:default</dependency>
<dependency>profile-eea.facetednavigation:default</dependency>
<dependency>profile-collective.js.datatables:default</dependency>
<dependency>profile-collective.easyform:default</dependency>
<dependency>profile-plone.formwidget.recaptcha:default</dependency>
<dependency>profile-collective.sweeteditor:default</dependency>
<dependency>profile-plone.app.ldap:ldap</dependency>
<dependency>profile-plone.app.querystring:default</dependency>
<dependency>profile-Products.CMFPlacefulWorkflow:CMFPlacefulWorkflow</dependency>
</dependencies>
</metadata>
10 changes: 10 additions & 0 deletions eea/climateadapt/upgrades/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
i18n_domain="eea.climateadapt">

<genericsetup:upgradeSteps
source="76"
destination="77"
profile="eea.climateadapt:default">
<genericsetup:upgradeStep
title="Migrate budget_range for Mission Funding"
handler=".update.update_budget_ranges"
/>
</genericsetup:upgradeSteps>

<genericsetup:upgradeSteps
source="75"
destination="76"
Expand Down
28 changes: 25 additions & 3 deletions eea/climateadapt/upgrades/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ def _fix_covers(self):
"""Fix tags in all cover tiles"""
# TODO: rename this function, needs better name

covers = self.portal_catalog.searchResults(portal_type="collective.cover.content")
covers = self.portal_catalog.searchResults(
portal_type="collective.cover.content")

for cover in covers:
cover = cover.getObject()
Expand Down Expand Up @@ -206,7 +207,8 @@ def update_to_23(context):
"AGRI_AND_FOREST": ["FORESTRY", "AGRICULTURE"],
}

profiles = catalog.searchResults(portal_type="eea.climateadapt.city_profile")
profiles = catalog.searchResults(
portal_type="eea.climateadapt.city_profile")

for b in profiles:
obj = b.getObject()
Expand Down Expand Up @@ -575,7 +577,8 @@ def update_to_37(context):
logger.info("Setting the proper effective date for some aceprojects")

catalog = portal.get_tool(name="portal_catalog")
query = {"portal_type": "eea.climateadapt.aceproject", "review_state": "published"}
query = {"portal_type": "eea.climateadapt.aceproject",
"review_state": "published"}
brains = catalog.searchResults(**query)

for brain in brains:
Expand Down Expand Up @@ -910,3 +913,22 @@ def update_transnational_regions(context):
alsoProvides(obj, IMainTransnationalRegionMarker)
obj.reindexObject()
logger.info("Remarked transnational region: %s", obj.absolute_url())


def update_budget_ranges(context):
catalog = portal.get_tool(name="portal_catalog")
from eea.climateadapt.vocabulary import budget_ranges_reverse_map

brains = catalog.searchResults(portal_type="mission_funding_cca")
for brain in brains:
obj = brain.getObject()
ranges = getattr(obj, "budget_range", None)
if ranges:
obj.budget_range = [budget_ranges_reverse_map[x]
for x in obj.budget_range]
obj._p_changed = True
logger.info(
"Migrated budget_range for %s, %r", obj.absolute_url(), obj.budget_range
)

logger.info("Done migrating budget_range")
25 changes: 19 additions & 6 deletions eea/climateadapt/vocabulary.py
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,11 @@ def __call__(self, context, query=None):

REMAPED_BIOREGIONS = {
# 'TRANS_MACRO_MED_BASIN': 'Mediterranean',
'TRANS_MACRO_BLACKSEA_BASIN': 'Black Sea Basin',
'TRANS_MACRO_DANUBE': "Danube",
'TRANS_MACRO_MED': 'Mediterranean',
'TRANS_MACRO_MED_BASIN': 'Mediterranean Sea Basin',
'TRANS_MACRO_NORTHPERI': 'Northern Periphery',
"TRANS_MACRO_BLACKSEA_BASIN": "Black Sea Basin",
"TRANS_MACRO_DANUBE": "Danube",
"TRANS_MACRO_MED": "Mediterranean",
"TRANS_MACRO_MED_BASIN": "Mediterranean Sea Basin",
"TRANS_MACRO_NORTHPERI": "Northern Periphery",
}


Expand Down Expand Up @@ -1360,7 +1360,20 @@ def __call__(self, context, query=None):
"1M € - 10M €",
"> 10M €",
]
budget_ranges_vocabulary = generic_vocabulary(budget_ranges)

budget_ranges_map = [
("lt50k", "< 50.000 €"),
("50k-100k", "50.000 - 100.000 €"),
("100k-1M", "100.001 € - 1M €"),
("1M-10M", "1M € - 10M €"),
("gt10M", "> 10M €"),
]

budget_ranges_reverse_map = {}
for token, label in budget_ranges_map:
budget_ranges_reverse_map[label] = token

budget_ranges_vocabulary = generic_vocabulary(budget_ranges_map)
alsoProvides(budget_ranges_vocabulary, IVocabularyFactory)


Expand Down

0 comments on commit e7c4035

Please sign in to comment.