0001-manager-add-widget-to-define-time-periods-for-multip.patch

Frédéric Péters, 22 septembre 2018 18:17

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

Subject: [PATCH] manager: add widget to define time periods for multiple days
 at once (#25970)

 chrono/manager/forms.py              | 11 ++++++++++-
 chrono/manager/static/css/style.scss | 13 +++++++++++++
 chrono/manager/views.py              | 17 +++++++++++++----
 chrono/manager/widgets.py            | 24 +++++++++++++++++++++++-
 tests/test_manager.py                | 15 ++++++++++++---
 5 files changed, 71 insertions(+), 9 deletions(-)

     from django.utils.translation import ugettext_lazy as _
     from chrono.agendas.models import (Agenda, Event, MeetingType, TimePeriod, Desk,
                                        TimePeriodException)
                                        TimePeriodException, WEEKDAYS_LIST)
     from . import widgets
-...
             exclude = []
     class TimePeriodAddForm(forms.Form):
         weekdays = forms.MultipleChoiceField(
                 label=_('Days'),
                 widget=widgets.WeekdaysWidget(),
                 choices=WEEKDAYS_LIST)
         start_time = forms.TimeField(label=_('Start Time'), widget=widgets.TimeWidget())
         end_time = forms.TimeField(label=_('End Time'), widget=widgets.TimeWidget())
     class TimePeriodForm(forms.ModelForm):
         class Meta:
             model = TimePeriod

     	top: 3ex;
     	z-index: 100;
+    }
     ul#id_weekdays {
     	margin: 0;
     	padding: 0;
     	list-style: none;
     	max-width: 42em;
     	li {
     		margin: 0;
     		padding: 0;
     		display: inline-block;
     		width: 10em;
+    	}
+    }

     from .forms import (AgendaAddForm, AgendaEditForm, EventForm, NewMeetingTypeForm, MeetingTypeForm,
                         TimePeriodForm, ImportEventsForm, NewDeskForm, DeskForm, TimePeriodExceptionForm,
                         ExceptionsImportForm, AgendasImportForm)
                         ExceptionsImportForm, AgendasImportForm, TimePeriodAddForm)
     from .utils import import_site
-...
     meeting_type_delete = MeetingTypeDeleteView.as_view()
     class AgendaAddTimePeriodView(ManagedDeskMixin, CreateView):
     class AgendaAddTimePeriodView(ManagedDeskMixin, FormView):
         template_name = 'chrono/manager_time_period_form.html'
         model = TimePeriod
         form_class = TimePeriodForm
         form_class = TimePeriodAddForm
         def form_valid(self, form):
             for weekday in form.cleaned_data.get('weekdays'):
                 period = TimePeriod(
                         weekday=weekday,
                         start_time=form.cleaned_data['start_time'],
                         end_time=form.cleaned_data['end_time'],
                         desk=self.desk)
                 period.save()
             return super(AgendaAddTimePeriodView, self).form_valid(form)
     agenda_add_time_period = AgendaAddTimePeriodView.as_view()

     import re
     import uuid
     from django.forms.widgets import DateTimeInput, DateInput, TimeInput
     from django.forms.widgets import DateTimeInput, DateInput, TimeInput, SelectMultiple
     from django.utils.formats import get_language
     from django.utils.safestring import mark_safe
-...
             options['format'] = options.get('format', 'hh:ii')
             super(TimeWidget, self).__init__(attrs, options, usel10n)
     class WeekdaysWidget(SelectMultiple):
         def render(self, name, value, attrs=None, choices=()):
             s = []
             value = value or []
             for choice_id, choice_label in self.choices:
                 s.append('<li><label><input type="checkbox" '
                          '  name="%(name)s-%(choice_id)s" %(checked)s>'
                          '<span>%(choice_label)s</span></label></li>' % {
                              'name': name,
                              'checked': 'checked' if choice_id in value else '',
                              'choice_id': choice_id,
                              'choice_label': choice_label})
             return mark_safe('<ul id="%(id)s">' % attrs + '\n'.join(s) + '</ul>')
         def value_from_datadict(self, data, files, name):
             choices = []
             for choice_id, choice_label in self.choices:
                 if data.get('%s-%s' % (name, choice_id)):
                     choices.append(choice_id)
             return choices

         resp = app.get('/manage/agendas/%s/' % agenda.id, status=302).follow()
         resp = resp.click('Settings')
         resp = resp.click('Add a time period')
         resp.form['weekday'].select(text='Wednesday')
         resp.form['weekdays-2'].checked = True
         resp.form['start_time'] = '10:00'
         resp.form['end_time'] = '17:00'
         resp = resp.form.submit()
-...
         # add a second time period
         resp = resp.click('Add a time period', index=0)
         resp.form['weekday'].select(text='Monday')
         resp.form['weekdays-0'].checked = True
         resp.form['start_time'] = '10:00'
         resp.form['end_time'] = '13:00'
         resp = resp.form.submit()
-...
         assert 'Edit Time Period' in resp.text
         resp.form['start_time'] = '9:00'
         resp = resp.form.submit()
         resp = resp.follow()
         assert TimePeriod.objects.get(desk=desk, weekday=2).start_time.hour == 9
         # and add same time periods on multiple days
         resp = resp.click('Add a time period', index=0)
         resp.form['weekdays-4'].checked = True
         resp.form['weekdays-5'].checked = True
         resp.form['start_time'] = '10:00'
         resp.form['end_time'] = '13:00'
         resp = resp.form.submit()
         assert TimePeriod.objects.filter(desk=desk).count() == 4
     def test_meetings_agenda_delete_time_period(app, admin_user):
         agenda = Agenda(label=u'Foo bar', kind='meetings')
-...
         resp = resp.form.submit().follow()
         # adding a new time period
         resp = resp.click('Add a time period')
         resp.form['weekday'].select(text='Wednesday')
         resp.form['weekdays-2'].checked = True
         resp.form['start_time'] = '10:00'
         resp.form['end_time'] = '17:00'
         resp = resp.form.submit().follow()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-manager-add-widget-to-define-time-periods-for-multip.patch