0002-backoffice-divide-submission-screen-in-three-section.patch

Frédéric Péters, 08 novembre 2015 12:34

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

Subject: [PATCH 2/3] backoffice: divide submission screen in three sections
 (#8913)

- create: to create new formdata
- existing: to get back to existing drafts
- empty: to get back empty drafts (typically, mails)

 tests/test_backoffice_pages.py      | 37 ++++++++++++++++++++
 wcs/backoffice/submission.py        | 67 ++++++++++++++++++++++++++++---------
 wcs/formdata.py                     |  6 ++++
 wcs/qommon/static/css/dc2/admin.css |  5 +++
 4 files changed, 99 insertions(+), 16 deletions(-)

         # check it kept the same id
         assert resp.location == 'http://example.net/backoffice/management/form-title/%s/' % formdata_no
     def test_backoffice_submission_sections(pub):
         user = create_user(pub)
         create_environment(pub)
         app = login(get_app(pub))
         formdef = FormDef.get_by_urlname('form-title')
         formdef.enable_tracking_codes = True
         formdef.backoffice_submission_roles = user.roles[:]
         formdef.store()
         data_class = formdef.data_class()
         data_class.wipe()
         resp = app.get('/backoffice/submission/')
         assert not 'Submission to complete' in resp.body
         assert not 'Running submission' in resp.body
         formdata = data_class()
         formdata.data = {}
         formdata.status = 'draft'
         formdata.backoffice_submission = True
         formdata.receipt_time = datetime.datetime(2015, 1, 1).timetuple()
         formdata.store()
         resp = app.get('/backoffice/submission/')
         assert 'Submission to complete' in resp.body
         assert not 'Running submission' in resp.body
         assert '>#%s' % formdata.id in resp.body
         formdata.data = {'1': 'xxx'}
         formdata.store()
         resp = app.get('/backoffice/submission/')
         assert not 'Submission to complete' in resp.body
         assert 'Running submission' in resp.body
         assert '>#%s' % formdata.id in resp.body
     def test_backoffice_submission_prefill_user_via_formula(pub):
         user = create_user(pub)
         create_environment(pub)

             misc_cat.formdefs = [x for x in list_forms if not x.category]
             cats.append(misc_cat)
             for cat in cats:
                 if not cat.formdefs:
             for mode in ['create', 'existing', 'empty']:
                 list_content = TemplateIO()
                 for cat in cats:
                     if not cat.formdefs:
                         continue
                     list_content += self.form_list(cat.formdefs, title=cat.name, mode=mode)
                 if not list_content.getvalue().strip():
                     continue
                 r += self.form_list(cat.formdefs, title=cat.name)
                 r += htmltext('<div class="bo-block">')
                 r += htmltext('<h2>%s</h2>') % {
                         'create': _('Submission'),
                         'existing': _('Running submission'),
                         'empty': _('Submission to complete'),
                         }.get(mode)
                 r += htmltext('<ul class="biglist">')
                 r += htmltext(list_content.getvalue())
                 r += htmltext('</ul>')
                 r += htmltext('</div>')
             return r.getvalue()
         def form_list(self, formdefs, title=None):
         def form_list(self, formdefs, title=None, mode='create'):
             r = TemplateIO(html=True)
             r += htmltext('<div class="bo-block">')
             if title:
                 r += htmltext('<h2>%s</h2>') % title
             if mode != 'create':
                 skip = True
                 for formdef in formdefs:
                     if not hasattr(formdef, '_formdatas'):
                         data_class = formdef.data_class()
                         formdata_ids = data_class.get_ids_with_indexed_value('status', 'draft')
                         formdef._formdatas = [x for x in data_class.get_ids(formdata_ids)
                                 if x.backoffice_submission is True]
                     skip &= not(bool(formdef._formdatas))
                 if skip:
                     return
             first = True
             r += htmltext('<ul class="biglist">')
             for formdef in formdefs:
                 if mode != 'create':
                     formdatas = formdef._formdatas[:]
                     if mode == 'empty':
                         formdatas = [x for x in formdatas if x.has_empty_data()]
                     elif mode == 'existing':
                         formdatas = [x for x in formdatas if not x.has_empty_data()]
                     if not formdatas:
                         continue
                 if first and title:
                     r += htmltext('<li><h3>%s</h3></li>') % title
                     first = False
                 r += htmltext('<li>')
                 r += htmltext('<strong class="label"><a href="%s/">%s</a></strong>') % (
                         formdef.url_name, formdef.name)
                 if mode == 'create':
                     r += htmltext('<strong class="label"><a href="%s/">%s</a></strong>') % (
                             formdef.url_name, formdef.name)
                 else:
                     r += htmltext('<strong class="label"><a class="fake">%s</a></strong>') % formdef.name
                 r += htmltext('</li>')
                 data_class = formdef.data_class()
                 formdata_ids = data_class.get_ids_with_indexed_value('status', 'draft')
                 formdatas = [x for x in data_class.get_ids(formdata_ids)
                         if x.backoffice_submission is True]
                 if mode == 'create':
                     continue
                 for formdata in formdatas:
                     r += htmltext('<li class="smallitem">')
                     label = _('Draft #%s, %s') % (formdata.id,
-...
                             formdef.url_name, formdata.id, label)
                     r += htmltext('</li>')
             r += htmltext('</ul>')
             r += htmltext('</div>')
             return r.getvalue()
         def _q_lookup(self, component):

                     self.user_id = None
         user = property(get_user, set_user)
         def has_empty_data(self):
             empty = True
             for key in self.data or {}:
                 empty &= (self.data.get(key) is None)
             return empty
         def just_created(self):
             self.receipt_time = time.localtime()
             self.status = 'wf-%s' % self.formdef.workflow.possible_status[0].id

     	padding: 1ex;
     	font-weight: normal;
     	margin: 0;
     	font-size: 130%;
+    }
     div.bo-block > h3 {
-...
     	transition: all 0.25s ease 0s;
+    }
     div.bo-block ul.biglist strong a.fake {
     	color: #505050;
+    }
     div.bo-block ul.biglist li.smallitem > a {
     	padding: 0.2ex 1ex 0.2ex 4ex;
+    }
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-backoffice-divide-submission-screen-in-three-section.patch