0001-backoffice-add-a-360-User-View-2125.patch

Frédéric Péters, 13 novembre 2015 11:37

Voir les différences: en ligne côte à côte

Subject: [PATCH] =?UTF-8?q?backoffice:=20add=20a=20"360=C2=B0=20User=20Vie?=
 =?UTF-8?q?w"=20(#2125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 tests/test_backoffice_pages.py      |  31 +++++
 wcs/backoffice/management.py        | 220 +++++++++++++++++++++++++++++++++++-
 wcs/qommon/static/css/dc2/admin.css |   4 +
 3 files changed, 253 insertions(+), 2 deletions(-)

             user1.store()
             return user1
         user1 = pub.user_class(name='admin')
         user1.email = 'admin@localhost'
         user1.is_admin = is_admin
         user1.store()
-...
             assert 'Justificatif de domicile validated by Jean Bono on 2014-01-01T01:01:01' in resp.body
             assert 'Code postal: 13400' in resp.body
             assert 'Valid from 2014-01-01T01:01:01 to 2014-01-01T01:01:01' in resp.body
     def test_360_user_view(pub):
         if not pub.is_using_postgresql():
             pytest.skip('this requires SQL')
             return
         user = create_user(pub)
         create_environment(pub)
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/')
         assert '360 User View' in resp.body
         resp = resp.click('360 User View')
         assert 'Use the search field on the right' in resp.body
         resp.form['q'] = 'admin'
         resp = resp.form.submit()
         assert resp.body.count('<tr') == 2 # header + user
         form_class = FormDef.get_by_urlname('form-title').data_class()
         to_match = []
         for formdata in form_class.select():
             if formdata.data['1'] in ('FOO BAR 30', 'FOO BAR 33'):
                 formdata.user_id = user.id
                 formdata.store()
                 to_match.append('/management/form-title/%s/' % formdata.id)
         resp = app.get('/backoffice/management/users/%s/' % user.id)
         for item in to_match:
             assert item in resp.body

     from qommon import errors
     from qommon import ods
     from qommon.form import *
     from qommon.storage import Equal, NotEqual, LessOrEqual, GreaterOrEqual, Or, Intersects
     from qommon.storage import (Equal, NotEqual, LessOrEqual, GreaterOrEqual, Or,
             Intersects, ILike)
     from wcs.forms.backoffice import FormDefUI
     from wcs.forms.common import FormStatusPage
     from wcs.admin.settings import UserFieldsFormDef
     from wcs.categories import Category
     from wcs.formdef import FormDef
     from wcs.roles import logged_users_role
     class UserViewDirectory(Directory):
         _q_exports = ['']
         user = None
         def __init__(self, user):
             self.user = user
         def _q_index(self):
             get_response().breadcrumb.append(('%s/' % self.user.id, self.user.display_name))
             html_top('management', _('Management'))
             # display list of open formdata for the user
             user_roles = [logged_users_role().id] + (get_request().user.roles or [])
             criterias = [Equal('is_at_endpoint', False),
                          Equal('user_id', str(self.user.id)),
                          Intersects('concerned_roles_array', user_roles),
+                        ]
             from wcs import sql
             formdatas = sql.AnyFormData.select(criterias, order_by='-receipt_time', limit=50)
             r = TemplateIO(html=True)
             r += htmltext('<div class="bo-block">')
             r += htmltext('<h2>%s</h2>') % self.user.display_name
             formdef = UserFieldsFormDef()
             r += htmltext('<div class="form">')
             for field in formdef.fields:
                 if not hasattr(field, str('get_view_value')):
                     continue
                 value = self.user.form_data.get(field.id)
                 if not value:
                     continue
                 r += htmltext('<div class="title">')
                 r += field.label
                 r += htmltext('</div>')
                 r += htmltext('<div class="StringWidget content">')
                 r += field.get_view_value(value)
                 r += htmltext('</div>')
             r += htmltext('</div>')
             r += htmltext('</div>')
             if formdatas:
                 categories = {}
                 formdata_by_category = {}
                 for formdata in formdatas:
                     if not formdata.formdef.category_id in categories:
                         categories[formdata.formdef.category_id] = formdata.formdef.category
                         formdata_by_category[formdata.formdef.category_id] = []
                     formdata_by_category[formdata.formdef.category_id].append(formdata)
                 cats = categories.values()
                 Category.sort_by_position(cats)
                 for cat in cats:
                     r += htmltext('<div class="bo-block">')
                     if len(cats) > 1:
                         if cat is None:
                             r += htmltext('<h2>%s</h2>') % _('Misc')
                             cat_formdatas = formdata_by_category[None]
                         else:
                             r += htmltext('<h2>%s</h2>') % cat.name
                             cat_formdatas = formdata_by_category[cat.id]
                     else:
                         cat_formdatas = formdatas
                     r += htmltext('<ul class="biglist">')
                     for formdata in cat_formdatas:
                         status = formdata.get_status()
                         if status:
                             status_label = status.name
                         else:
                             status_label = _('Unknown')
                         submit_date = misc.strftime.strftime(
                                 misc.date_format(), formdata.receipt_time)
                         r += htmltext('<li><a href="%s">%s, '
                                       '<span class="datetime">%s</span> '
                                       '<span class="status">(%s)</span></a>' % (
                                 formdata.get_url(backoffice=True),
                                 formdata.formdef.name,
                                 submit_date, status_label))
                     r += htmltext('</ul>')
                     r += htmltext('</div>')
                 r += htmltext('</div>')
             return r.getvalue()
     class UsersViewDirectory(Directory):
         _q_exports = ['']
         def _q_traverse(self, path):
             if not get_publisher().is_using_postgresql():
                 raise errors.TraversalError()
             get_response().breadcrumb.append(('users', _('360 User View')))
             return super(UsersViewDirectory, self)._q_traverse(path)
         def get_search_sidebar(self, offset=None, limit=None, order_by=None):
             get_response().add_javascript(['jquery.js', 'jquery-ui.js', 'wcs.listing.js'])
             get_response().add_css_include('../js/smoothness/jquery-ui-1.10.0.custom.min.css')
             r = TemplateIO(html=True)
             r += htmltext('<form id="listing-settings" action=".">')
             if offset or limit:
                 if not offset:
                     offset = 0
                 r += htmltext('<input type="hidden" name="offset" value="%s"/>') % offset
             if limit:
                 r += htmltext('<input type="hidden" name="limit" value="%s"/>') % limit
             if order_by is None:
                 order_by = ''
             r += htmltext('<input type="hidden" name="order_by" value="%s"/>') % order_by
             r += htmltext('<h3>%s</h3>') % _('Search')
             if get_request().form.get('q'):
                 q = get_request().form.get('q')
                 if type(q) is not unicode:
                     q = unicode(q, get_publisher().site_charset)
                 r += htmltext('<input name="q" value="%s">') % q.encode(get_publisher().site_charset)
             else:
                 r += htmltext('<input name="q">')
             r += htmltext('<input type="submit" value="%s"/>') % _('Search')
             return r.getvalue()
         def _q_index(self):
             html_top('management', _('Management'))
             r = TemplateIO(html=True)
             limit = int(get_request().form.get('limit',
                     get_publisher().get_site_option('default-page-size')) or 20)
             offset = int(get_request().form.get('offset', 0))
             order_by = get_request().form.get('order_by', None) or 'name'
             query = get_request().form.get('q')
             get_response().filter['sidebar'] = self.get_search_sidebar(
                     limit=limit, offset=offset, order_by=order_by)
             if not query:
                 r += htmltext('<div id="listing">')
                 r += htmltext('<div class="big-msg-info">')
                 r += htmltext('<p>%s</p>') % _('Use the search field on the right '
                                                'to look for an user.')
                 r += htmltext('</div>')
                 r += htmltext('</div>')
                 if get_request().form.get('ajax') == 'true':
                     get_response().filter = None
                 return r.getvalue()
             criterias = []
             criteria_fields = [ILike('name', query), ILike('email', query)]
             formdef = UserFieldsFormDef()
             for field in formdef.fields:
                 if field.type in ('string', 'text', 'email'):
                     criteria_fields.append(ILike('f%s' % field.id, query))
             criterias.append(Or(criteria_fields))
             users = get_publisher().user_class.select(order_by=order_by,
                     clause=criterias, limit=limit, offset=offset)
             total_count = get_publisher().user_class.count(criterias)
             users_cfg = get_cfg('users', {})
             include_name_column = not(users_cfg.get('field_name'))
             include_email_column = not(users_cfg.get('field_email'))
             r += htmltext('<div id="listing">')
             r += htmltext('<table class="main">')
             r += htmltext('<thead>')
             r += htmltext('<tr>')
             if include_name_column:
                 r += htmltext('<th data-field-sort-key="name"><span>%s</span></th>') % _('Name')
             if include_email_column:
                 r += htmltext('<th data-field-sort-key="email"><span>%s</span></th>') % _('Email')
             for field in formdef.fields:
                 if field.in_listing:
                     r += htmltext('<th data-field-sort-key="f%s"><span>%s</span></th>') % (
                             field.id, field.label)
             r += htmltext('</tr>')
             r += htmltext('</thead>')
             r += htmltext('<tbody>')
             for user in users:
                 r += htmltext('<tr data-link="%s/">') % user.id
                 if include_name_column:
                     r += htmltext('<td>%s</td>') % (user.name or '')
                 if include_email_column:
                     r += htmltext('<td>%s</td>') % (user.email or '')
                 for field in formdef.fields:
                     if field.in_listing:
                         r += htmltext('<td>%s</td>') % (user.form_data.get(field.id) or '')
                 r += htmltext('</tr>')
             r += htmltext('</tbody>')
             r += htmltext('</table>')
             if (offset > 0) or (total_count > limit > 0):
                 r += pagination_links(offset, limit, total_count)
             r += htmltext('</div>')
             if get_request().form.get('ajax') == 'true':
                 get_response().filter = None
                 return r.getvalue()
             return r.getvalue()
         def _q_lookup(self, component):
             try:
                 user = get_publisher().user_class.get(component)
                 return UserViewDirectory(user)
             except KeyError:
                 pass
             raise errors.TraversalError()
     class ManagementDirectory(Directory):
         _q_exports = ['', 'listing', 'statistics', 'code', 'count']
         _q_exports = ['', 'listing', 'statistics', 'code', 'count', 'users']
         users = UsersViewDirectory()
         def is_accessible(self, user):
             return user.can_go_in_backoffice()
-...
             if get_publisher().is_using_postgresql() and \
                     get_publisher().get_site_option('postgresql_views') != 'false':
                 r += htmltext('<li><a href="listing">%s</a></li>') % _('Global View')
                 r += htmltext('<li><a href="users/">%s</a></li>') % _('360 User View')
             r += htmltext('</ul>')
             r += htmltext('</div>')
             r += self.get_tracking_code_sidebox()

     	background-image: none;
+    }
     #listing {
     	margin-bottom: 1em;
+    }
     ul.biglist, table#listing {
     	-webkit-transition: opacity 500ms ease-out;
     	-moz-transition: opacity 500ms ease-out;
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s. » Au quotidien

0001-backoffice-add-a-360-User-View-2125.patch