emrt.necd.content 2.5.48__zip → 2.5.49__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.48
+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,10 @@ 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

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

@@ -1,6 +1,10 @@
 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

{emrt.necd.content-2.5.48 → 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.48 → 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.48 → emrt.necd.content-2.5.49}/emrt/necd/content/profiles/default/metadata.xml

@@ -1,5 +1,5 @@
 <metadata>
-  <version>2.5.48</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.48 → 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.48 → 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.48
+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,10 @@ 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

{emrt.necd.content-2.5.48 → 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.48"
+VERSION = "2.5.49"
 
 
 setup(