updated webservice

UPCnet · Jul 11, 2018 · e3e7268 · e3e7268
1 parent 44ac62c
commit e3e7268
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/genweb/organs/browser/views/webservice.pt b/genweb/organs/browser/views/webservice.pt
@@ -69,7 +69,6 @@
   <div style="padding: 10px 20px 40px 20px; background-color:white;">
 
     <div class="clearfix"></div>
-
     <table
           cellpadding="0"
           cellspacing="0"
@@ -83,15 +82,18 @@
                 cellspacing="0">
             <thead>
               <tr>
-                <th style="font-size:13px; text-align:center;" i18n:translate="">Codi d'acord</th>
-                <th style="font-size:13px; width: 7%; padding-left: 10px; text-align:left; display: table-cell; vertical-align: middle;" i18n:translate="">Proposal</th>
+                <th style="font-size:13px; text-align:center;" i18n:translate="">Agreement</th>
+                <th style="font-size:13px; width: 7%; padding-left: 10px; text-align:left; display: table-cell; vertical-align: middle;" i18n:translate="">Num de punt</th>
                 <th style="font-size:13px; width: 6%; padding-left: 10px; text-align:left; display: table-cell; vertical-align: middle;" i18n:translate="">Estat</th>
                 <th style="font-size:13px; white-space: nowrap; text-align:center; display: table-cell; vertical-align: middle;" i18n:translate="">Titol</th>
               </tr>
             </thead>
-            <tbody>
-                <tr vertical-align="top"
-                    tal:repeat="acord view/allAcords">
+            <tbody vertical-align="top"
+                    tal:define="acords view/allAcords">
+                    Acords totals: &nbsp;<span tal:content="acords/all"></span><br/>
+                    Acors visibles: &nbsp;<span tal:content="acords/new"></span>
+                <tr tal:repeat="acord acords/results">
+
                 <td style="font-size:13px; text-align:right;">
                     <a tal:condition="acord/id" href="" tal:content="acord/id" tal:attributes="href string:${context/absolute_url}/acord/${acord/id}"></a>
                     <span style="color:red;" tal:condition="not:acord/id"> [Acord sense numeració] </span>

diff --git a/genweb/organs/browser/webservice.py b/genweb/organs/browser/webservice.py
@@ -56,7 +56,8 @@ def __call__(self):
                 return self.request.response.redirect(api.portal.get().absolute_url())
 
     def allAcords(self):
-        results = api.content.find(portal_type='genweb.organs.acord')
+        results = api.content.find(
+            portal_type='genweb.organs.acord')
         results2 = []
         results3 = []
         if api.user.is_anonymous():
@@ -65,42 +66,36 @@ def allAcords(self):
             username = api.user.get_current().id
         for value in results:
             element = value.getObject()
-            if element.aq_parent.portal_type == 'genweb.organs.organgovern':
+            if element.aq_parent.aq_parent.portal_type == 'genweb.organs.organgovern':
                 if username:
-                    roles = api.user.get_roles(obj=element.aq_parent, username=username)
+                    roles = api.user.get_roles(obj=element.aq_parent.aq_parent, username=username)
                 else:
                     roles = []
-                organType = element.aq_parent.organType
+                organType = element.aq_parent.aq_parent.organType
                 if 'Manager' in roles or (organType == 'open_organ'):
-                    print "1"
                     results2.append(value)
                 elif organType == 'restricted_to_members_organ':
                     if 'OG1-Secretari' in roles or 'OG2-Editor' in roles or 'OG3-Membre' in roles:
-                        print "2"
                         results2.append(value)
                 elif organType == 'restricted_to_affected_organ':
                     if 'OG1-Secretari' in roles or 'OG2-Editor' in roles or 'OG3-Membre' in roles or 'OG4-Afectat' in roles:
-                        print "3"
                         results2.append(value)
                 else:
                     # remove element
                     continue
-            elif element.aq_parent.aq_parent.portal_type == 'genweb.organs.organgovern':
+            elif element.aq_parent.aq_parent.aq_parent.portal_type == 'genweb.organs.organgovern':
                 if username:
-                    roles = api.user.get_roles(obj=element.aq_parent.aq_parent, username=username)
+                    roles = api.user.get_roles(obj=element.aq_parent.aq_parent.aq_parent, username=username)
                 else:
                     roles = []
-                organType = element.aq_parent.aq_parent.organType
+                organType = element.aq_parent.aq_parent.aq_parent.organType
                 if 'Manager' in roles or (organType == 'open_organ'):
-                    print "4"
                     results2.append(value)
                 elif organType == 'restricted_to_members_organ':
                     if 'OG1-Secretari' in roles or 'OG2-Editor' in roles or 'OG3-Membre' in roles:
-                        print "5"
                         results2.append(value)
                 elif organType == 'restricted_to_affected_organ':
                     if 'OG1-Secretari' in roles or 'OG2-Editor' in roles or 'OG3-Membre' in roles or 'OG4-Afectat' in roles:
-                        print "6"
                         results2.append(value)
                 else:
                     # remove element
@@ -113,5 +108,8 @@ def allAcords(self):
                                  path=item.absolute_url(),
                                  state=item.estatsLlista,
                                  title=item.Title(),
-                                 proposal=item.proposalPoint))
-        return results3
+                                 proposal=item.proposalPoint,
+                                 ))
+        return dict(results=results3,
+                    all=len(results),
+                    new=len(results3))