emrt.necd.content 2.5.48__zip → 2.5.50__zip

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.48
+Version: 2.5.50
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,6 +15,16 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.50 (2024-04-30)
+        
+        - Task #260973 - Add formatting
+        - Task #260971 - Review if flags need updating/ all are still relevant
+        - Bug #269439 - Error when editing conclusion text
+        
+        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

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/docs/HISTORY.txt

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+2.5.50 (2024-04-30)
+
+- Task #260973 - Add formatting
+- Task #260971 - Review if flags need updating/ all are still relevant
+- Bug #269439 - Error when editing conclusion text
+
+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

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/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.48 → emrt.necd.content-2.5.50}/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.48 → emrt.necd.content-2.5.50}/emrt/necd/content/conclusions.py

@@ -1,5 +1,3 @@
-import datetime
-from copy import copy
 from logging import getLogger
 from AccessControl import getSecurityManager
 from Acquisition import aq_base
@@ -12,9 +10,7 @@ from emrt.necd.content import MessageFactory as _
 from emrt.necd.content.utils import hidden
 from emrt.necd.content.utils import get_vocabulary_value
 from plone import api
-import plone.z3cform.templates
 from plone.app.dexterity.behaviors.discussion import IAllowDiscussion
-from plone.app.textfield import RichText
 from plone.dexterity.browser import add
 from plone.dexterity.browser import edit
 from plone.dexterity.content import Container
@@ -70,7 +66,7 @@ class IConclusions(form.Schema, IImageScaleTraversable):
         required=True,
     )
 
-    text = RichText(
+    text = schema.Text(
         title=_(u'Text'),
         required=True,
         default=u'',
@@ -244,6 +240,7 @@ class PseudoConclusion(object):
     text = u''
     closing_reason = ''
     highlight = ''
+    highlight_vocabulary = ''
 
     def __init__(self, context):
         self.context = context
@@ -258,6 +255,7 @@ class PseudoConclusion(object):
 
     def __call__(self, container):
         self.highlight = container.highlight
+        self.highlight_vocabulary = container.highlight_vocabulary
         # [refs #102793] needed by vocabularies
         self.type = container.type  # inventory/projection
         return self

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt/necd/content/profiles/default/metadata.xml

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

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt/necd/content/reviewfolder.py

@@ -1,3 +1,4 @@
+from collections import namedtuple
 import itertools
 import time
 from StringIO import StringIO
@@ -133,14 +134,17 @@ def get_finalisation_reasons(reviewfolder):
     return reasons
 
 
+MissingHighlight = namedtuple("MissingHighlight", ["title"])
+
 def translate_highlights(vocab, keys):
-    return tuple(vocab.getTerm(x).title for x in keys)
+    return tuple(
+        vocab.by_token.get(x, MissingHighlight(x)).title for x in keys)
 
 
-def get_highlight_vocabs(context):
+def get_highlight_vocabs(context, voc_name=None):
     vocab_highlight = getUtility(
         IVocabularyFactory,
-        name='emrt.necd.content.highlight')(context)
+        name='emrt.necd.content.highlight')(context, voc_name)
 
     vocab_highlight_values = tuple([
         term.value for term in vocab_highlight
@@ -159,6 +163,28 @@ def get_highlight_vocabs(context):
 
     return vocab_description_flags, vocab_conclusion_flags, vocab_highlight
 
+def classify_unknown_highlights(context, unknown_highlights):
+    result = {
+        "description_flags": set(),
+        "conclusion_flags": set()
+    }
+    if context.type == 'inventory':
+        other_highlight_vocabularies = [
+            x for x in HIGHLIGHT_VOCABULARY_TYPES.by_value
+            if x and x != context.highlight_vocabulary 
+            and not x.endswith('projection')
+        ]
+        for voc_name in other_highlight_vocabularies:
+            vocab_description_flags, vocab_conclusion_flags, vocab_highlight = (
+                get_highlight_vocabs(context, voc_name)
+            )
+            highlights = translate_highlights(vocab_highlight, unknown_highlights)
+            description_flags = get_common(highlights, vocab_description_flags)
+            conclusion_flags = get_common(highlights, vocab_conclusion_flags)
+            result["conclusion_flags"].update(conclusion_flags)
+            result["description_flags"].update(description_flags)
+
+    return result
 
 def filter_for_ms(brains, context):
     if api.user.is_anonymous():
@@ -654,6 +680,14 @@ class ExportReviewFolderForm(form.Form, ReviewFolderMixin):
             row = [observation.getId]
             highlights = translate_highlights(
                 vocab_highlight, observation['get_highlight'] or [])
+            description_flags = get_common(highlights, vocab_description_flags)
+            conclusion_flags = get_common(highlights, vocab_conclusion_flags)
+            unknown_flags = classify_unknown_highlights(
+                self.context, 
+                set(highlights).difference(
+                    itertools.chain(description_flags, conclusion_flags)
+                )
+            )
 
             for key in fields_to_export:
                 if key == 'observation_is_potential_technical_correction':
@@ -664,11 +698,11 @@ class ExportReviewFolderForm(form.Form, ReviewFolderMixin):
                     row.append(yes_no_bool(IS_FIELD_MAP[key] in highlights))
                 elif key == 'get_description_flags':
                     row.append(', '.join(
-                        get_common(highlights, vocab_description_flags)
+                        list(itertools.chain(description_flags, unknown_flags["description_flags"]))
                     ))
                 elif key == 'get_conclusion_flags':
                     row.append(', '.join(
-                        get_common(highlights, vocab_conclusion_flags)
+                        list(itertools.chain(conclusion_flags, unknown_flags["conclusion_flags"]))
                     ))
                 elif key == 'get_is_ms_key_category':
                     row.append(
@@ -784,7 +818,7 @@ class ExportReviewFolderForm(form.Form, ReviewFolderMixin):
 
             try:
                 comment_html = comment.text.output_relative_to(context)
-                output_text = html2text.html2text(comment_html)
+                output_text = html2text.html2text(comment_html, bodywidth=0)
             except AttributeError:
                 output_text = comment.text
 

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/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.48 → emrt.necd.content-2.5.50}/emrt/necd/content/upgrades/configure.zcml

@@ -810,5 +810,17 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="2.5.48"
+    destination="2.5.50"
+    profile="emrt.necd.content:default">
+
+    <genericsetup:upgradeStep
+      title="Roll-back formatting for conclusion text."
+      description="[refs #260973] Add formatting."
+      handler=".evolve2550.run"
+      />
+
+  </genericsetup:upgradeSteps>
 
 </configure>

emrt.necd.content-2.5.50/emrt/necd/content/upgrades/evolve2550.py

@@ -0,0 +1,56 @@
+from logging import getLogger
+
+import transaction
+from DateTime import DateTime
+
+from zope.component import getMultiAdapter
+from zope.globalrequest import getRequest
+
+from plone.app.textfield.value import RichTextValue
+
+import plone.api as api
+
+import html2text
+
+
+LOGGER = getLogger(__name__)
+
+
+def filter_is_carried_over(obs):
+    return hasattr(obs, "carryover_from")
+
+
+def filter_has_comments(obs):
+    return (
+        getattr(obs, "closing_comments", None)
+        or getattr(obs, "closing_deny_comments", None)
+    )
+
+def run(_):
+    catalog = api.portal.get_tool("portal_catalog")
+    brains = catalog(portal_type="Conclusions", modified={"range": "min", "query": DateTime("2024/02/19")})
+    brains_len = len(brains)
+    a_tenth = brains_len / 10
+    conclusions = (brain.getObject() for brain in brains)
+    LOGGER.info("Found %s brains. Selecting some...", brains_len)
+    valid_conclusions = (
+        obj
+        for obj in conclusions
+        if isinstance(obj.text, RichTextValue)
+    )
+    for idx, conclusion in enumerate(valid_conclusions, start=1):
+        LOGGER.info(conclusion.absolute_url(1))
+
+        try:
+            conclusion_html = conclusion.text.output_relative_to(conclusion)
+            conclusion.text = html2text.html2text(conclusion_html, bodywidth=0)
+        except Exception:
+            LOGGER.exception("Could not update conclusion text!")
+
+        conclusion.aq_parent.reindexObject()
+        conclusion.reindexObject()
+
+        # log progress
+        if a_tenth and idx % a_tenth == 0:
+            transaction.savepoint(optimistic=True)
+            LOGGER.info("Done %s/ < %s.", idx, brains_len)

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt/necd/content/utils.py

@@ -143,7 +143,7 @@ def render_rich_text_value(context, obj):
 
 def richtext2text(value, context):
     html_value = value.output_relative_to(context)
-    output_text = html2text.html2text(html_value)
+    output_text = html2text.html2text(html_value, bodywidth=0)
     return safe_unicode(output_text)
 
 

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt/necd/content/vocabularies.py

@@ -199,16 +199,17 @@ class Fuel(object):
 @implementer(IVocabularyFactory)
 class Highlight(object):
 
-    def __call__(self, context):
+    def __call__(self, context, voc_name=None):
         pvoc = api.portal.get_tool('portal_vocabularies')
 
-        if context.highlight_vocabulary:
-            voc_name = context.highlight_vocabulary
-        else:
-            voc_name = (
-                'highlight' if context.type == 'inventory'
-                else 'highlight_projection'
-            )
+        if voc_name is None:
+            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:

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt.necd.content.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.48
+Version: 2.5.50
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,6 +15,16 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.50 (2024-04-30)
+        
+        - Task #260973 - Add formatting
+        - Task #260971 - Review if flags need updating/ all are still relevant
+        - Bug #269439 - Error when editing conclusion text
+        
+        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

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/emrt.necd.content.egg-info/SOURCES.txt

@@ -241,6 +241,7 @@ emrt/necd/content/upgrades/evolve2537.py
 emrt/necd/content/upgrades/evolve2538.py
 emrt/necd/content/upgrades/evolve2540.py
 emrt/necd/content/upgrades/evolve2542.py
+emrt/necd/content/upgrades/evolve2550.py
 emrt/necd/content/upgrades/evolve258.py
 emrt/necd/content/upgrades/portal_workflow.py
 emrt/necd/content/upgrades/templates/portal_workflow_apply_and_reindex.pt

{emrt.necd.content-2.5.48 → emrt.necd.content-2.5.50}/setup.py

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