esdrt.content 1.74.5__zip → 1.75.0__zip

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: esdrt.content
-Version: 1.74.5
+Version: 1.75.0
 Summary: Content-types for ESD Review Tool
 Home-page: https://github.com/eea/esdrt.content/
 Author: Mikel Larreategi
@@ -15,6 +15,16 @@ Description: Introduction
         Changelog
         =========
         
+        1.75.0 (2024-12-05)
+        -------------------
+        - Task: #277396 - Only notify author SE.
+          [batradav]
+        
+        1.74.6 (2024-07-01)
+        -------------------
+        - Task: #272010 - ESD EMRT extract error
+          [batradav]
+        
         1.74.5 (2024-02-16)
         -------------------
         - Task: #265134 - Adding flags to the export function

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/docs/HISTORY.txt

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+1.75.0 (2024-12-05)
+-------------------
+- Task: #277396 - Only notify author SE.
+  [batradav]
+
+1.74.6 (2024-07-01)
+-------------------
+- Task: #272010 - ESD EMRT extract error
+  [batradav]
+
 1.74.5 (2024-02-16)
 -------------------
 - Task: #265134 - Adding flags to the export function

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/browser/statisticsview.py

@@ -20,7 +20,7 @@ class StatisticsView(grok.View):
     grok.require('cmf.ManagePortal')
 
     def update(self):
-        
+
         self.observations = self.get_all_observations()
         self.questions = self.get_all_questions()
 
@@ -74,7 +74,7 @@ class StatisticsView(grok.View):
         return step
 
     def _generic_getter(self, objs, key, value, columns=[], filter_fun=None):
-        
+
         """
          Generic function to get items for later rendering.
          Parameters:
@@ -258,7 +258,7 @@ class DownloadStatisticsView(grok.View):
         return step
 
     def _generic_getter(self, objs, key, value, columns=[], filter_fun=None):
-        
+
         """
          Generic function to get items for later rendering.
          Parameters:
@@ -359,15 +359,15 @@ class DownloadStatisticsView(grok.View):
             columns=['SRRE', 'LRQE', 'MSC', 'answered', 'conclusions', 'finalised']
         )
         for observation in observations:
-            data.append([observation['country'], 
+            data.append([observation['country'],
                 observation['SRRE'],
                 observation['LRQE'],
                 observation['MSC'],
-                observation['answered'], 
-                observation['conclusions'], 
-                observation['finalised'], 
+                observation['answered'],
+                observation['conclusions'],
+                observation['finalised'],
                 observation['sum']])
-        data.headers = ['Country', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']  
+        data.headers = ['Country', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']
 
         return data
 
@@ -379,19 +379,19 @@ class DownloadStatisticsView(grok.View):
             key='sector',
             value='status',
             columns=['SRRE', 'LRQE', 'MSC', 'answered', 'conclusions', 'finalised']
-        ) 
+        )
         for observation in observations:
-            data.append([observation['sector'], 
+            data.append([observation['sector'],
                 observation['SRRE'],
                 observation['LRQE'],
                 observation['MSC'],
-                observation['answered'], 
-                observation['conclusions'], 
-                observation['finalised'], 
+                observation['answered'],
+                observation['conclusions'],
+                observation['finalised'],
                 observation['sum']])
-        data.headers = ['Sector', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']  
+        data.headers = ['Sector', 'SR/RE', 'LR/QE', 'MSC', 'Answer received', 'Conclusions', 'Finalised', 'Sum']
 
-        return data   
+        return data
 
     def finalised_reason_per_country(self):
         data = tablib.Dataset()
@@ -401,19 +401,19 @@ class DownloadStatisticsView(grok.View):
             key='country',
             value='finalisation_reason',
             columns=['no-conclusion-yet', 'no-response-needed', 'partly-resolved', 'resolved', 'unresolved', 'significant-issue']
-        ) 
+        )
         for observation in observations:
-            data.append([observation['country'], 
+            data.append([observation['country'],
                 observation['no-conclusion-yet'],
                 observation['no-response-needed'],
                 observation['partly-resolved'],
-                observation['resolved'], 
+                observation['resolved'],
                 observation['unresolved'],
                 observation['significant-issue'],
                 observation['sum']])
-        data.headers = ['Country', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']  
+        data.headers = ['Country', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']
 
-        return data 
+        return data
 
     def finalised_reason_per_sector(self):
         data = tablib.Dataset()
@@ -425,17 +425,17 @@ class DownloadStatisticsView(grok.View):
             columns=['no-conclusion-yet', 'no-response-needed', 'partly-resolved', 'resolved', 'unresolved', 'significant-issue']
         )
         for observation in observations:
-            data.append([observation['sector'], 
+            data.append([observation['sector'],
                 observation['no-conclusion-yet'],
                 observation['no-response-needed'],
                 observation['partly-resolved'],
-                observation['resolved'], 
+                observation['resolved'],
                 observation['unresolved'],
                 observation['significant-issue'],
                 observation['sum']])
-        data.headers = ['Sector', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']  
+        data.headers = ['Sector', 'No conclusion yet', 'No response needed', 'Party resolved', 'Resolved', 'Unresolved', 'Significant issue', 'Sum']
 
-        return data                 
+        return data
 
 
     def observation_highlights_pgf(self):

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/browser/templates/inboxreviewfolderview.pt

@@ -8,6 +8,12 @@
   <tal:block metal:fill-slot="javascript_head_slot">
     <script tal:attributes="src string:${portal_url}/++resource++esdrt.content/cookies.js"></script>
     <script tal:attributes="src string:${portal_url}/++resource++esdrt.content/inbox_view.js"></script>
+    <script type="text/javascript" src="++resource++orderedselect_input.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function(){
+        $(".chosen-select").chosen({width: "100%", allow_single_deselect: true});
+      })
+    </script>
   </tal:block>
   <tal:block metal:fill-slot="style_slot">
     <link rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/++resource++esdrt.content/inbox_view.css" />
@@ -49,16 +55,29 @@
 
   <div id="filters">
     <div class="row" style="padding-top:30px">
-      <div class="cell position-1 width-3 esdLabel">Free text</div>
+      <div class="cell position-1 width-9 esdLabel">Free text</div>
+      <div class="cell position-10 width-3 esdLabel">Author</div>
     </div>
     <div class="row">
       <form action="./inboxview" method="GET" tal:define="freeText request/freeText|nothing">
-        <div class="cell position-1 width-12 esdLabel">
-          <tal:params repeat="req_param python:[x for x in req_params if x[0] != 'freeText']">
+        <div class="cell position-1 width-9">
+          <tal:params repeat="req_param python:[x for x in req_params if x[0] not in ['freeText', 'obsAuthor']]">
             <input type="hidden" tal:attributes="name python:req_param[0]; value python:req_param[1]" />
           </tal:params>
           <input type="text" style="width:100%;border-radius:5px;height:21px" name="freeText" tal:attributes="value freeText" />
         </div>
+        <div class="cell position-10 width-3 esdLabel">
+           <select id="obsAuthorFilter" name="obsAuthor" class="chosen-select" data-placeholder="Select author"
+                tal:define="obsAuthor python:'';
+                            obsAuthor request/obsAuthor | obsAuthor">
+              <option></option>
+              <tal:option repeat="author python:view.get_indexed_authors()">
+                <option
+                  tal:attributes="value python:author[0]; selected python:author[0] == obsAuthor"
+                  tal:content="python:author[1]"></option>
+              </tal:option>
+            </select>
+        </div>
         <div class="cell position-14 width-1">
           <input type="submit" class="standardButton" id="btnFilter" value="Search" />
         </div>

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/browser/templates/reviewfolderview.pt

@@ -175,6 +175,16 @@
                   }
                   filter += "wfStatus=" + $('#wfStatusFilter').val();
                 }
+                // Commented so that empty value cand be used to show all available if desired.
+                // This is handled in reviewfolder.py by checking if obsAuthorFilter is None.
+                // if ($('#obsAuthorFilter').val() != ""){
+                  if (filter == ""){
+                    filter += "?";
+                  }else{
+                    filter += "&";
+                  }
+                  filter += "obsAuthor=" + $('#obsAuthorFilter').val();
+                // }
                 if ($('#crfFilter').val() != ""){
                   if (filter == ""){
                     filter += "?";
@@ -380,7 +390,8 @@
         </div>
         <div class="row" style="padding-top:20px">
           <div class="cell position-1 width-3 esdLabel" tal:condition="here/enable_steps">Step</div>
-          <div class="cell position-4 width-6 esdLabel">Workflow</div>
+          <div class="cell position-4 width-3 esdLabel">Workflow</div>
+          <div class="cell position-7 width-3 esdLabel">Author</div>
         </div>
         <div class="row">
           <div class="cell position-1 width-3" tal:condition="here/enable_steps">
@@ -394,7 +405,7 @@
                 value="step2">Step2</option>
             </select>
           </div>
-          <div class="cell position-4 width-6">
+          <div class="cell position-4 width-3">
             <select id="wfStatusFilter"  class="chosen-select" data-placeholder="Select status"
                 tal:define="wfStatus python:'';
                             wfStatus request/wfStatus | wfStatus">
@@ -415,6 +426,18 @@
                 value="finalised">Finalised</option>
             </select>
           </div>
+          <div class="cell position-7 width-3">
+           <select id="obsAuthorFilter"  class="chosen-select" data-placeholder="Select author"
+                tal:define="obsAuthor python:'';
+                            obsAuthor request/obsAuthor | obsAuthor">
+              <option></option>
+              <tal:option repeat="author python:view.get_indexed_authors()">
+                <option
+                  tal:attributes="value python:author[0]; selected python:author[0] == obsAuthor"
+                  tal:content="python:author[1]"></option>
+              </tal:option>
+            </select>
+          </div>
         </div>
         <div class="row" style="padding-top:30px">
           <div class="cell position-1 width-1">

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/ldap_utils.py

@@ -29,7 +29,7 @@ def query_group_members(portal, query):
             q_ldap.query_groups(query, ('uniqueMember', ))
         )
 
-        unique_users = set(chain(*res_groups.values()))
+        unique_users = [v for v in set(chain(*res_groups.values())) if v]
         user_names = format_users(
             'cn',
             q_ldap.query_users(
@@ -38,6 +38,6 @@ def query_group_members(portal, query):
         )
 
         return {
-            gname: [user_names[muid] for muid in muids]
+            gname: [user_names[muid] for muid in muids if muid]
             for gname, muids in res_groups.items()
         }

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/notifications/utils.py

@@ -98,12 +98,20 @@ def get_users_in_context(observation, role, notification_name):
 
 
 def exclude_user_from_notification(observation, user, role, notification):
+    user_id = user.getId()
     adapted = INotificationUnsubscriptions(observation)
-    data = adapted.get_user_data(user.getId())
+    data = adapted.get_user_data(user_id)
     if not data:
         area = aq_parent(aq_inner(observation))
         if IReviewFolder.providedBy(area):
             adapted = INotificationUnsubscriptions(area)
-            data = adapted.get_user_data(user.getId())
+            data = adapted.get_user_data(user_id)
     excluded_notifications = data.get(role, [])
-    return notification in excluded_notifications
+    exclude_based_on_notification = notification in excluded_notifications
+    if exclude_based_on_notification:
+        return exclude_based_on_notification
+
+    if role in ["ReviewerPhase1", "ReviewerPhase2"] and "config_only_where_author" not in excluded_notifications:
+        owner = observation.getOwner()
+        return user_id != owner.getId() if owner else False
+

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/reviewfolder.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 import itertools
 import time
 from datetime import datetime
@@ -54,6 +55,7 @@ from esdrt.content.crf_code_matching import get_category_ldap_from_crf_code
 from esdrt.content.timeit import timeit
 from esdrt.content.utilities.interfaces import ISetupReviewFolderRoles
 from esdrt.content.utilities.ms_user import IUserIsMS
+from esdrt.content.utils import get_userid_name
 
 
 LOG = logging.getLogger(__name__)
@@ -85,6 +87,31 @@ LDAP_QUERY_GROUPS = (
 )
 
 
+def get_indexed_authors(context):
+    catalog = api.portal.get_tool("portal_catalog")
+    path = "/".join(context.getPhysicalPath())
+    query = {
+        "path": path,
+        "portal_type": "Observation",
+    }
+    authors = set([b.Creator for b in catalog.searchResults(query)])
+    return authors
+
+
+def get_indexed_authors_with_names(context):
+    authors = get_indexed_authors(context)
+    return [(v, get_userid_name(v)) for v in authors]
+
+
+def get_indexed_authors_for_select(context):
+    authors_with_names = get_indexed_authors_with_names(context)
+    user = api.user.get_current()
+    if (user):
+        userId = user.getId()
+        authors_with_names = [(uid, "Me ({})".format(uname)) if uid == userId else (uid, uname) for uid, uname in authors_with_names]
+    return sorted(authors_with_names, key=lambda x: float("-inf") if x[1][:2] == "Me" else x[1])
+
+
 def get_observation_phase(brain):
     result = ""
     state = brain["observation_questions_workflow"]
@@ -162,6 +189,22 @@ def _user_name(fun, self, userid):
     return (userid, time.time() // 86400)
 
 
+def redirect_for_author(context, request):
+    obsAuthor = request.get("obsAuthor", None)
+    missing_author_filter = obsAuthor is None
+    user = api.user.get_current()
+    is_user = not api.user.is_anonymous() and "Manager" not in user.getRoles()
+    if missing_author_filter and is_user:
+        user_id = user.getId()
+        if user_id in get_indexed_authors(context):
+            new_url = "%s?%s&obsAuthor=%s" % (
+                request["ACTUAL_URL"],
+                request["QUERY_STRING"],
+                user_id,
+            )
+            return request.response.redirect(new_url)
+
+
 class IReviewFolder(plone.directives.form.Schema, IImageScaleTraversable):
     """
     Folder to have all observations together
@@ -235,6 +278,17 @@ class ReviewFolder(Container):
 
 
 class ReviewFolderMixin(BrowserView):
+
+    def get_current_user_id(self):
+        result = ""
+        user = api.user.get_current()
+        if user:
+            result = user.getId()
+        return result
+
+    def get_indexed_authors(self):
+        return get_indexed_authors_for_select(self.context)
+
     @memoize
     def get_questions(self, sort_on="modified", sort_order="reverse"):
         country = self.request.form.get("country", "")
@@ -245,6 +299,7 @@ class ReviewFolderMixin(BrowserView):
         freeText = self.request.form.get("freeText", "")
         step = self.request.form.get("step", "")
         wfStatus = self.request.form.get("wfStatus", "")
+        obsAuthor = self.request.form.get("obsAuthor", "")
         crfCode = self.request.form.get("crfCode", "")
         gas = self.request.form.get("gas", self.request.form.get("gas[]", []))
         gas = gas if isinstance(gas, list) else [gas]
@@ -289,6 +344,8 @@ class ReviewFolderMixin(BrowserView):
             query["observation_step"] = step
         if wfStatus != "":
             query["observation_status"] = wfStatus
+        if obsAuthor != "":
+            query["Creator"] = obsAuthor
         if crfCode != "":
             query["crf_code"] = crfCode
         if gas != "":
@@ -503,6 +560,7 @@ class ReviewFolderBrowserView(ReviewFolderMixin):
         return table.render(table)
 
     def render(self):
+        redirect_for_author(self.context, self.request)
         sort_on = self.request.get("sort_on", "modified")
         sort_order = self.request.get("sort_order", "reverse")
         pagenumber = self.request.get("pagenumber", "1")
@@ -988,6 +1046,9 @@ class InboxReviewFolderView(BrowserView):
     def get_current_user(self):
         return api.user.get_current()
 
+    def get_indexed_authors(self):
+        return get_indexed_authors_for_select(self.context)
+
     def get_sections(self):
         is_sec = self.is_secretariat()
         viewable = [sec for sec in SECTIONS if is_sec or sec["check"](self)]
@@ -1015,6 +1076,7 @@ class InboxReviewFolderView(BrowserView):
 
     def __call__(self):
         self.rolemap_observations = {}
+        redirect_for_author(self.context, self.request)
         return super(InboxReviewFolderView, self).__call__()
 
     def batch(self, observations, b_size, b_start, orphan, b_start_str):
@@ -1027,6 +1089,7 @@ class InboxReviewFolderView(BrowserView):
 
     def get_observations(self, rolecheck=None, **kw):
         freeText = self.request.form.get("freeText", "")
+        obsAuthor = self.request.form.get("obsAuthor", "")
         catalog = api.portal.get_tool("portal_catalog")
         path = "/".join(self.context.getPhysicalPath())
         query = {
@@ -1037,6 +1100,8 @@ class InboxReviewFolderView(BrowserView):
         }
         if freeText:
             query["SearchableText"] = freeText
+        if obsAuthor != "":
+            query["Creator"] = obsAuthor
 
         query.update(kw)
         # from logging import getLogger

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/subscriptionconfiguration.py

@@ -32,6 +32,7 @@ NOTIFICATIONS_PER_ROLE = {
         'observation_finalised': True,
         'question_answered': True,
         'question_to_ms': True,
+        'config_only_where_author': True,
     },
     'ReviewerPhase2': {
         'observation_finalisation_denied': True,
@@ -39,6 +40,7 @@ NOTIFICATIONS_PER_ROLE = {
         'observation_to_phase2': True,
         'question_answered': True,
         'question_to_ms': True,
+        'config_only_where_author': True,
     },
     'QualityExpert': {
         'conclusion_to_comment': True,
@@ -76,6 +78,7 @@ NOTIFICATION_NAMES = {
         'observation_finalised': 'Observation finalised by QE',
         'question_answered': 'Question answered by MS',
         'question_to_ms': 'Question sent to MS by QE',
+        'config_only_where_author': 'Only notify me about observations I authored',
     },
     'ReviewerPhase2': {
         'observation_finalisation_denied': 'Observation finalisation denied by LR',
@@ -83,6 +86,7 @@ NOTIFICATION_NAMES = {
         'observation_to_phase2': 'Observation handed over to step 2',
         'question_answered': 'Question answered by MS',
         'question_to_ms': 'Question sent to MS by LR',
+        'config_only_where_author': 'Only notify me about observations I authored',
     },
     'QualityExpert': {
         'conclusion_to_comment': 'Conclusion to comment by you as QE',
@@ -213,6 +217,8 @@ class SaveSubscriptionsReview(SubscriptionConfigurationMixin):
     grok.require('zope2.View')
     grok.name('save-subscriptions')
 
+
+
     def render(self):
         user_roles = []
         if self.request.get('REQUEST_METHOD') == 'POST':

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/templates/subscriptionconfigurationreview.pt

@@ -66,33 +66,40 @@
         <input type="hidden" name="subscription_data.name:records"
           tal:attributes="value python:item[0]" />
 
-        <table class="listing">
-          <thead>
-            <tr>
-              <th>
-                Notification
-              </th>
-              <th>
-                Enabled?
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr tal:repeat="notification python:item[1].items()">
-              <td>
-                <span tal:replace="python:view.notification_name(item[0], notification[0])" />
-              </td>
-              <td>
-                <input type="checkbox"
-                  tal:attributes="checked python:notification[1];
-                                  name python:'subscription_data.' + notification[0] + ':records';
-                  " />
-              </td>
-            </tr>
-          </tbody>
-
-        </table>
-
+        <tal:block define="notifications python:[x for x in item[1].items() if not x[0].startswith('config_')]; settings python:[x for x in item[1].items() if x[0].startswith('config_')]">
+          <table class="listing">
+            <thead>
+              <tr>
+                <th>
+                  Notification
+                </th>
+                <th>
+                  Enabled?
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr tal:repeat="notification notifications">
+                <td>
+                  <span tal:replace="python:view.notification_name(item[0], notification[0])" />
+                </td>
+                <td>
+                  <input type="checkbox"
+                    tal:attributes="checked python:notification[1];
+                                    name python:'subscription_data.' + notification[0] + ':records'" />
+                </td>
+              </tr>
+            </tbody>
+
+          </table>
+
+          <div tal:repeat="setting settings">
+            <input type="checkbox" tal:attributes="id python:setting[0]; name python:'subscription_data.{}:records'.format(setting[0]); checked python:setting[1]" />
+            <label tal:attributes="for python:setting[0]" tal:content="python:view.notification_name(item[0], setting[0])"></label>
+          </div>
+
+          <br />
+        </tal:block>
       </div>
 
       <div class="subscription-actions">

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt/content/utils.py

@@ -3,6 +3,24 @@ import string
 from Products.CMFCore.interfaces._content import IContentish
 from zope.globalrequest import getRequest
 
+import plone.api as api
+
+
+def get_userid_name(userid):
+    result = userid
+
+    user = api.user.get(userid)
+    if (user):
+        result = user.getProperty("fullname", userid)
+
+    return result
+
+
+def get_indexed_values_for_index(index_name):
+    catalog = api.portal.get_tool("portal_catalog")
+    indexes = catalog._catalog.indexes
+    return sorted(set(indexes[index_name]._unindex.itervalues()))
+
 
 def reduce_text(text, limit):
     if len(text) <= limit:

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt.content.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: esdrt.content
-Version: 1.74.5
+Version: 1.75.0
 Summary: Content-types for ESD Review Tool
 Home-page: https://github.com/eea/esdrt.content/
 Author: Mikel Larreategi
@@ -15,6 +15,16 @@ Description: Introduction
         Changelog
         =========
         
+        1.75.0 (2024-12-05)
+        -------------------
+        - Task: #277396 - Only notify author SE.
+          [batradav]
+        
+        1.74.6 (2024-07-01)
+        -------------------
+        - Task: #272010 - ESD EMRT extract error
+          [batradav]
+        
         1.74.5 (2024-02-16)
         -------------------
         - Task: #265134 - Adding flags to the export function

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/esdrt.content.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ docs/HISTORY.txt
 docs/INSTALL.txt
 docs/LICENSE.GPL
 docs/LICENSE.txt
-esdrt/.DS_Store
 esdrt/__init__.py
 esdrt.content.egg-info/PKG-INFO
 esdrt.content.egg-info/SOURCES.txt

{esdrt.content-1.74.5 → esdrt.content-1.75.0}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import find_packages
 from setuptools import setup
 
-version = "1.74.5"
+version = "1.75.0"
 
 setup(
     name="esdrt.content",