emrt.necd.content 2.5.47__zip → 2.5.49__zip

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.47
+Version: 2.5.49
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,6 +15,15 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.49 (2024-04-25)
+        
+        - Task #260971 - Add "Description flags" to carryover
+        
+        2.5.48 (2024-04-11)
+        
+        - Feature #260968 - Reminder button: allow user / country selection
+        - Task #260971 - Review if flags need updating/ all are still relevant
+        
         2.5.47 (2024-04-11)
         
         - Bug #268428 - Unable to take extract from test site

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/docs/HISTORY.txt

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+2.5.49 (2024-04-25)
+
+- Task #260971 - Add "Description flags" to carryover
+
+2.5.48 (2024-04-11)
+
+- Feature #260968 - Reminder button: allow user / country selection
+- Task #260971 - Review if flags need updating/ all are still relevant
+
 2.5.47 (2024-04-11)
 
 - Bug #268428 - Unable to take extract from test site

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/browser/carryover.py

@@ -50,6 +50,14 @@ def get_vocabulary_values(context, name):
     except:
         return []
 
+def get_vocabulary_titles(context, name):
+    try:
+        factory = getUtility(IVocabularyFactory, name)
+        vocabulary = factory(context)
+        return [x.title for x in vocabulary.by_value.values()]
+    except:
+        return []
+
 
 def read_int(value):
     result = 0
@@ -100,6 +108,7 @@ EXTRA_FIELDS = (
     ("year", read_inventory_year),
     ("nfr_code", read_unicode),
     ("pollutants", read_list),
+    ("highlight", read_list),
 )
 
 EXTRA_FIELDS_PROJECTION = (
@@ -108,6 +117,31 @@ EXTRA_FIELDS_PROJECTION = (
     ("year", read_projection_year),
     ("nfr_code", read_unicode),
     ("pollutants", read_list),
+    ("highlight", read_list),
+)
+
+
+def transform_title_to_vocabulary_value(vocab_name):
+    def context_aware(context):
+        factory = getUtility(IVocabularyFactory, vocab_name)
+        vocabulary = factory(context)
+        title_to_value = dict([(v.title, k) for k, v in vocabulary.by_value.items()])
+        def vocab_aware(title):
+            return title_to_value.get(title, title)
+        return vocab_aware
+    return context_aware
+
+
+def transform_higlight_value_from_title(context):
+    context_aware = transform_title_to_vocabulary_value("emrt.necd.content.highlight")
+    vocab_aware = context_aware(context)
+    def title_list_to_values(titles):
+        return [vocab_aware(title) for title in titles]
+    return title_list_to_values
+
+
+TRANSFORM_EXTRA_FIELDS = (
+    ("highlight", transform_higlight_value_from_title),
 )
 
 
@@ -255,11 +289,20 @@ def read_extra_fields(row, row_nr, start_at, context):
         if context.type == "projection"
         else EXTRA_FIELDS
     )
+    transform_extra_fields = {
+        fname: transform(context)
+        for fname, transform
+        in TRANSFORM_EXTRA_FIELDS
+    }
     result = dict()
     for idx, (fname, reader) in enumerate(extra_fields):
         col_idx = start_at + idx
         try:
-            result[fname] = reader(_read_col(row, col_idx))
+            read_value = reader(_read_col(row, col_idx))
+            if fname in transform_extra_fields:
+                result[fname] = transform_extra_fields[fname](read_value)
+            else:
+                result[fname] = read_value
         except IndexError:
             msg = "Cannot read field {} on column {}, row {}.".format(
                 fname, col_idx + 1, row_nr
@@ -332,9 +375,13 @@ class CarryOverView(BrowserView):
         values_for_nfr_code = get_vocabulary_values(
             self.context, "emrt.necd.content.nfr_code"
         )
+        titles_for_highlight = get_vocabulary_titles(
+            self.context, "emrt.necd.content.highlight"
+        )
         return self.index(
             values_for_nfr_code=u", ".join(values_for_nfr_code),
             values_for_pollutants=u", ".join(values_for_pollutants),
+            titles_for_highlight=u", ".join(titles_for_highlight),
             is_projection=self.context.type == "projection",
         )
 

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/browser/reminder.py

@@ -1,8 +1,12 @@
 import os
 from operator import attrgetter
 from collections import namedtuple
+from collections import defaultdict
 
 from zope.component import getMultiAdapter
+from zope.component import getUtility
+
+from zope.schema.interfaces import IVocabularyFactory
 
 from chameleon.zpt.template import PageTextTemplate
 
@@ -34,8 +38,15 @@ with open(DEFAULT_CONTENT_PATH) as default_content:
 
 
 
-UserData = namedtuple("UserData", ["name", "email", "roles"])
+UserData = namedtuple(
+    "UserData",
+    ["user_id", "name", "email", "roles", "country_a2", "country_name"]
+)
 
+CountryData = namedtuple(
+    "CountryData",
+    ["a2", "name", "user_count"]
+)
 
 class ReminderView(BrowserView):
 
@@ -44,6 +55,10 @@ class ReminderView(BrowserView):
         ("tool_url", "The absolute URL of this review folder.", ),
     )
 
+    @property
+    def mail_from_address(self):
+        return api.portal.get().email_from_address
+
     @property
     def default_content(self):
         return DEFAULT_CONTENT
@@ -60,31 +75,76 @@ class ReminderView(BrowserView):
 
     @property
     def manager_users_to_notify(self):
+        v_ms = getUtility(
+            IVocabularyFactory,
+            name='emrt.necd.content.eea_member_states')(self.context)
+
         if "Manager" in api.user.get_roles():
             result = []
-            for user in self._get_users_to_notify():
+            for user, country_a2 in self._get_users_to_notify():
                 roles = api.user.get_roles(user=user, obj=self.context)
                 user_data = (
+                    user.getId(),
                     safer_unicode(user.getProperty("fullname", user.getId())),
                     user.getProperty("email", "-"),
                     [r for r in roles if r != "Authenticated"],
+                    country_a2,
+                    v_ms.getTerm(country_a2).title
                 )
                 result.append(UserData(*user_data))
             return sorted(result, key=attrgetter("name"))
 
 
+    @property
+    def countries_to_notify(self):
+        v_ms = getUtility(
+            IVocabularyFactory,
+            name='emrt.necd.content.eea_member_states')(self.context)
+
+        result = defaultdict(set)
+        for user, country_a2 in self._get_users_to_notify():
+            result[country_a2].add(user.getId())
+
+        return sorted(
+            [
+                CountryData(a2, v_ms.getTerm(a2).title, len(users))
+                for a2, users
+                in result.items()
+            ],
+            key=attrgetter("name")
+        )
+
+
     def send_reminder(self):
         subject = self.request.get("subject", self.default_subject)
         content = self.request.get("content", self.default_content)
+        countries_a2 = self.request.get("countries_a2", [])
+        user_ids = (
+            self.request.get("user_ids", [])
+            if "Manager" in api.user.get_roles()
+            else []
+        )
 
         template = PageTextTemplate(content)
 
-        to_notify = self._get_users_to_notify()
+        if user_ids:
+            to_notify = [
+                user for user, _ in self._get_users_to_notify()
+                if user.getId() in user_ids
+            ]
+        else:
+            to_notify = [
+                user for user, a2 in self._get_users_to_notify()
+                if a2 in countries_a2
+            ]
 
         for user in to_notify:
             self._send_email(subject, template, user)
 
-        portal_message = "Notified {} users.".format(len(to_notify))
+        if to_notify:
+            portal_message = "Notified {} users.".format(len(to_notify))
+        else:
+            portal_message = "Nothing selected, nobody was notified."
         api.portal.show_message(portal_message, request=self.request)
 
         return self.request.RESPONSE.redirect(self.context.absolute_url())
@@ -116,10 +176,14 @@ class ReminderView(BrowserView):
         to_notify = set()
 
         for obs in observations:
-            msa_users = get_users_in_context(obs, ROLE_MSA, "reminder")
+            msa_users = [
+                (user, obs.country)
+                for user
+                in get_users_in_context(obs, ROLE_MSA, "reminder")
+            ]
             to_notify.update(msa_users)
 
         return [
-            user for user in to_notify
+            (user, a2) for user, a2 in to_notify
             if "Manager" not in api.user.get_roles(user=user)
-        ]
+        ]

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/browser/templates/carryover.pt

@@ -36,6 +36,7 @@
                   <th tal:condition="is_projection">Projection year</th>
                   <th>NFR Code</th>
                   <th>Pollutants</th>
+                  <th>Description flags</th>
                 </tr>
               </thead>
               <tbody><tr>
@@ -48,6 +49,7 @@
                   <td tal:condition="is_projection">2025<br />2030<br />2040<br />2050</td>
                   <td>1A2d</td>
                   <td>PCBs<br />HCB<br />SO2</td>
+                  <td>Adjustment<br />Revised Estimate</td>
               </tr></tbody>
             </table>
 
@@ -66,6 +68,7 @@
                     <li tal:condition="is_projection">Field: Projection year (list) - multiple values, separated by newline. Valid values: 2025, 2030, 2040, 2050</li>
                     <li>Field: NFR category code (string) - single value.</li>
                     <li>Field: Pollutants (list) - multiple values, separated by newline.</li>
+                    <li>Field: Description flags (list) - multiple values, separated by newline.</li>
                 </ul>
                 If provided, the conclusion text will replace the existing conclusion text.
             </p>
@@ -82,6 +85,7 @@
                   <th tal:condition="is_projection">Projection year</th>
                   <th>NFR Code</th>
                   <th>Pollutants</th>
+                  <th>Description flags</th>
                 </tr>
               </thead>
               <tbody><tr>
@@ -95,6 +99,7 @@
                   <td tal:condition="is_projection">2025<br />2030<br />2040<br />2050</td>
                   <td>1A2d</td>
                   <td>PCBs<br />HCB<br />SO2</td>
+                  <td>Adjustment<br />Revised Estimate</td>
               </tr></tbody>
             </table>
 
@@ -107,6 +112,8 @@
             <dd>${python:options.get('values_for_nfr_code')}</dd>
             <dt>Pollutants</dt>
             <dd>${python:options.get('values_for_pollutants')}</dd>
+            <dt>Description flags</dt>
+            <dd>${python:options.get('titles_for_highlight')}</dd>
           </dl>
         </div>
 

emrt.necd.content-2.5.49/emrt/necd/content/browser/templates/reminder.pt

@@ -0,0 +1,109 @@
+<metal:page use-macro="here/main_template/macros/master">
+  <tal:block metal:fill-slot="style_slot">
+    <style type="text/css">
+      .field input[type="text"] {
+        padding: 0.5em 0.3em;
+        width: 100%;
+      }
+      .field textarea {
+        padding: 1em;
+      }
+
+      form button[disabled] {
+        background-color: #b3b3b3;
+        border-color: #f3f3f3;
+      }
+      form button[disabled]:hover {
+        cursor: not-allowed;
+      }
+    </style>
+  </tal:block>
+<metal:content fill-slot="main"
+  tal:define="is_projection python:options.get('is_projection');
+              will_notify_num python:view.will_notify_num_users;
+              countries_to_notify python:view.countries_to_notify;
+              manager_users_to_notify python:view.manager_users_to_notify;">
+<h1 class="documentFirstHeading">Send reminder</h1>
+<p class="discreet">Send email reminder to MS coordinators</p>
+
+<p>Submitting this form will send an email to <strong>${will_notify_num}</strong> MS coordinators which have outstanding questions.</p>
+
+<form action="./reminder" method="POST" enctype="multipart/form-data">
+  <tal:manager condition="manager_users_to_notify">
+  <p><strong>NOTE:</strong> The table below displays the users that will be notified and <strong>is only visible to Secretariat</strong></p>
+  <table class="listing">
+    <thead>
+      <tr>
+        <th>Notify?</th>
+        <th>Name</th>
+        <th>e-Mail</th>
+        <th>Roles</th>
+        <th>Country</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="user_data manager_users_to_notify">
+        <td><input type="checkbox" name="user_ids:list" value="${python:user_data.user_id}" checked="checked" /></td>
+        <td>${python:user_data.name}</td>
+        <td>${python:user_data.email}</td>
+        <td>${python:", ".join(user_data.roles)}</td>
+        <td>${python:user_data.country_name}</td>
+      </tr>
+    </tbody>
+  </table>
+  </tal:manager>
+
+  <tal:user condition="not:manager_users_to_notify">
+  <p><strong>NOTE:</strong> The table below displays the countries that will be notified, and the number of users for each country.</p>
+  <table class="listing">
+    <thead>
+      <tr>
+        <th>Notify?</th>
+        <th>Name</th>
+        <th>Number of users</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="country_data countries_to_notify">
+        <td><input type="checkbox" name="countries_a2:list" value="${python:country_data.a2}" checked="checked" /></td>
+        <td>${python:country_data.name}</td>
+        <td>${python:country_data.user_count}</td>
+      </tr>
+    </tbody>
+  </table>
+  </tal:user>
+
+  <div class="field">
+    <label for="mailFrom">From</label>
+    <div class="formHelp">The email address from which the email will be sent. <strong>This cannot be changed.</strong></div>
+    <input id="mailFrom" type="text" value="${python:view.mail_from_address}" disabled="disabled" readonly="readonly" />
+  </div>
+
+  <div class="field">
+    <label for="mailSubject">Message subject</label>
+    <div class="formHelp">The subject that will be used in the email.</div>
+    <input id="mailSubject" type="text" name="subject" value="${python:view.default_subject}" disabled="${python:not(will_notify_num) and 'disabled' or None}" />
+  </div>
+
+  <div class="field">
+    <label for="mailContent">Message content</label>
+    <div class="formHelp">
+      You can customise the message being sent, below. There are some parameters that you can use, described below:
+      <dl>
+        <tal:ditem repeat="param python:view.known_parameters">
+          <dt>${python:param[0]}</dt>
+          <dd>${python:param[1]}</dd>
+        </tal:ditem>
+      </dl>
+    </div>
+    <textarea id="mailContent" name="content" rows="15" disabled="${python:not(will_notify_num) and 'disabled' or None}">${python:view.default_content}</textarea>
+  </div>
+
+  <button type="submit" class="standardButton" disabled="${python:not(will_notify_num) and 'disabled' or None}">Confirm sending reminder</button>
+  <strong tal:condition="python:not(will_notify_num)">Sending disabled as it will not notify anyone (there are no observations in the required state).</strong>
+
+</form>
+
+</metal:content>
+
+</metal:page>

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/browser/templates/reviewfolderview.pt

@@ -321,8 +321,8 @@
                                   id python:item[0]"/>
                 <label tal:attributes="for python:item[0];"
                   tal:content="python:item[1]"></label><br/>
-                  <br tal:condition="python:item[0] in ['unece','acc']"/>
-                <div tal:condition="python:item[0] in ['unece','acc']" class="esdLabel">Draft/final conclusion flags</div>
+                  <br tal:condition="python:item[0] in ['unece', 'acc', 'comparability']"/>
+                <div tal:condition="python:item[0] in ['unece', 'acc', 'comparability']" class="esdLabel">Draft/final conclusion flags</div>
 
               </tal:block>
             </tal:block>

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/profiles/default/metadata.xml

@@ -1,5 +1,5 @@
 <metadata>
-  <version>2.5.47</version>
+  <version>2.5.49</version>
     <dependencies>
         <dependency>profile-plone.app.dexterity:default</dependency>
         <dependency>profile-plone.app.ldap:ldap</dependency>

emrt.necd.content-2.5.49/emrt/necd/content/profiles/default/necdvocabularies/highlight_2024_onwards.csv

@@ -0,0 +1,17 @@
+rec-fu,Recommendation follow-up
+re-fu,RE follow-up
+tc-fu,TC follow-up
+adjustment,Adjustment
+guidebook-2019,Guidebook 2019 Finding
+ptc,Potential technical correction (PTC)
+transparency,Transparency
+cccuracy,Accuracy
+completeness,Completeness
+consistency,Consistency
+comparability,Comparability
+nsms,Not sent to Member State
+tc,Technical Correction (TC)
+rev-est,Revised Estimate
+recommendation,Recommendation
+unquantified-potential-technical-correction,Unquantified Potential Technical Correction
+proxy-solution,Proxy Solution (PS)

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/reviewfolder.py

@@ -79,6 +79,12 @@ REVIEWFOLDER_TYPES = SimpleVocabulary.fromItems((
     (u'Projection', 'projection')))
 
 
+HIGHLIGHT_VOCABULARY_TYPES = SimpleVocabulary.fromItems((
+    (u'Default: Projection or Inventory pre 2024', ''),
+    (u'Inventory 2024 onwards', 'highlight_2024_onwards'),
+    (u'Inventory pre 2024', 'highlight'),
+    (u'Projection', 'highlight_projection')))
+
 # Cache helper methods
 def _user_name(fun, self, userid):
     return (userid, time.time() // 86400)
@@ -201,6 +207,13 @@ class IReviewFolder(directives.form.Schema, IImageScaleTraversable):
         required=True,
     )
 
+    highlight_vocabulary = schema.Choice(
+        title=u"Highlight vocabulary",
+        source=HIGHLIGHT_VOCABULARY_TYPES,
+        required=True,
+        default='',
+    )
+
     tableau_statistics = schema.Text(
         title=u'Tableau statistics embed code',
         required=False,
@@ -313,17 +326,8 @@ class ReviewFolderMixin(BrowserView):
         return countries
 
     def get_highlights(self):
-        vtool = getToolByName(self, 'portal_vocabularies')
-        if self.context.type == 'inventory':
-            voc = vtool.getVocabularyByName('highlight')
-        else:
-            voc = vtool.getVocabularyByName('highlight_projection')
-        highlights = []
-        voc_terms = voc.getDisplayList(self).items()
-        for term in voc_terms:
-            highlights.append((term[0], term[1]))
-
-        return highlights
+        factory = getUtility(IVocabularyFactory, name='emrt.necd.content.highlight')
+        return [[term.value, term.title] for term in factory(self.context)]
 
     def get_review_years(self):
         catalog = api.portal.get_tool('portal_catalog')

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/setuphandlers.py

@@ -41,9 +41,13 @@ VOCABULARIES = [
      'filename': 'scenario_type.csv',
     },
     {'id': 'highlight',
-     'title': 'Highligt',
+     'title': 'Highlight',
      'filename': 'highlight.csv',
     },
+    {'id': 'highlight_2024_onwards',
+     'title': 'Highlight 2024 onwards',
+     'filename': 'highlight_2024_onwards.csv',
+    },
     {'id': 'highlight_projection',
      'title': 'Highlight Projection',
      'filename': 'highlight_projection.csv',

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/templates/observationview.pt

@@ -376,7 +376,7 @@
                     <span class="eea-icon eea-icon-lg wfRole"><!-- --></span>
                     <span tal:content="item/role"></span><br/>
                     <a
-                      tal:attributes="href python:'http://www.eionet.europa.eu/directory/user?uid='+item['actor']"
+                      tal:attributes="href python:'http://www.eionet.europa.eu/directory/user?uid=' + (item['actor'] or '')"
                       tal:content="item/author"></a>
                     <br/>
                     <span

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/upgrades/configure.zcml

@@ -797,4 +797,18 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="2.5.47"
+    destination="2.5.48"
+    profile="emrt.necd.content:default">
+
+    <genericsetup:upgradeDepends
+      title="Reimport missing vocabularies."
+      description="[refs #260971] Import new highlight_2024_onwards vocabulary"
+      import_steps="emrt.necd.content.setup.vocabularies"
+      />
+
+  </genericsetup:upgradeSteps>
+
+
 </configure>

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt/necd/content/vocabularies.py

@@ -201,10 +201,15 @@ class Highlight(object):
 
     def __call__(self, context):
         pvoc = api.portal.get_tool('portal_vocabularies')
-        voc_name = (
-            'highlight' if context.type == 'inventory'
-            else 'highlight_projection'
-        )
+
+        if context.highlight_vocabulary:
+            voc_name = context.highlight_vocabulary
+        else:
+            voc_name = (
+                'highlight' if context.type == 'inventory'
+                else 'highlight_projection'
+            )
+
         voc = pvoc.getVocabularyByName(voc_name)
         if voc is None:
             return SimpleVocabulary([])

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt.necd.content.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.47
+Version: 2.5.49
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,6 +15,15 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.49 (2024-04-25)
+        
+        - Task #260971 - Add "Description flags" to carryover
+        
+        2.5.48 (2024-04-11)
+        
+        - Feature #260968 - Reminder button: allow user / country selection
+        - Task #260971 - Review if flags need updating/ all are still relevant
+        
         2.5.47 (2024-04-11)
         
         - Bug #268428 - Unable to take extract from test site

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/emrt.necd.content.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@
 MANIFEST.in
 Makefile
 README.txt
-TAGS
 bootstrap.py
 build_manylinux.sh
 buildout.cfg
@@ -155,6 +154,7 @@ emrt/necd/content/profiles/default/necdvocabularies/fuel.csv
 emrt/necd/content/profiles/default/necdvocabularies/ghg_source_category.csv
 emrt/necd/content/profiles/default/necdvocabularies/ghg_source_sectors.csv
 emrt/necd/content/profiles/default/necdvocabularies/highlight.csv
+emrt/necd/content/profiles/default/necdvocabularies/highlight_2024_onwards.csv
 emrt/necd/content/profiles/default/necdvocabularies/highlight_projection.csv
 emrt/necd/content/profiles/default/necdvocabularies/parameter.csv
 emrt/necd/content/profiles/default/necdvocabularies/pollutants.csv

{emrt.necd.content-2.5.47 → emrt.necd.content-2.5.49}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import find_packages
 from setuptools import setup
 
-VERSION = "2.5.47"
+VERSION = "2.5.49"
 
 
 setup(