0003-manager-choose-time-period-weekday-indexes-45159.patch

Valentin Deniaud, 15 mars 2022 13:39

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

Subject: [PATCH 3/5] manager: choose time period weekday indexes (#45159)

 chrono/agendas/models.py                      | 13 ++++-
 chrono/manager/forms.py                       | 49 ++++++++++++++-----
 .../manager_meetings_agenda_settings.html     |  3 +-
 .../chrono/manager_time_period_form.html      | 16 +++++-
 .../manager_virtual_agenda_settings.html      |  3 +-
 chrono/manager/views.py                       |  1 +
 chrono/settings.py                            |  1 +
 tests/manager/test_timeperiod.py              | 18 ++++++-
 8 files changed, 83 insertions(+), 21 deletions(-)

     from dateutil.rrule import DAILY, WEEKLY, rrule, rruleset
     from django.conf import settings
     from django.contrib.auth.models import Group
     from django.contrib.humanize.templatetags.humanize import ordinal
     from django.contrib.postgres.fields import ArrayField, JSONField
     from django.core.exceptions import FieldDoesNotExist, ValidationError
     from django.core.validators import MaxValueValidator, MinValueValidator
-...
             ordering = ['weekday', 'start_time']
         def __str__(self):
             return '%s / %s → %s' % (
                 force_text(WEEKDAYS[self.weekday]),
             label = force_text(WEEKDAYS[self.weekday])
             if self.weekday_indexes:
                 label = _('%(weekday)s (%(ordinals)s of the month)') % {
                     'weekday': label,
                     'ordinals': ', '.join(ordinal(i) for i in self.weekday_indexes),
+                }
             label = '%s / %s → %s' % (
                 label,
                 date_format(self.start_time, 'TIME_FORMAT'),
                 date_format(self.end_time, 'TIME_FORMAT'),
+            )
             return mark_safe(label)
         def save(self, *args, **kwargs):
             if self.agenda:

     from django.utils.translation import ugettext_lazy as _
     from chrono.agendas.models import (
         WEEK_CHOICES,
         WEEKDAY_CHOICES,
         WEEKDAYS_LIST,
         AbsenceReason,
-...
+                        )
     class TimePeriodAddForm(forms.Form):
     class TimePeriodFormBase(forms.Form):
         repeat = forms.ChoiceField(
             label=_('Repeat'),
             widget=forms.RadioSelect,
             choices=(
                 ('every-week', _('Every week')),
                 ('custom', _('Custom')),
             ),
             initial='every-week',
+        )
         weekday_indexes = forms.TypedMultipleChoiceField(
             choices=WEEK_CHOICES,
             coerce=int,
             required=False,
             label='',
+        )
         def clean(self):
             cleaned_data = super().clean()
             if cleaned_data['end_time'] <= cleaned_data['start_time']:
                 raise ValidationError(_('End time must come after start time.'))
             if cleaned_data['repeat'] == 'every-week':
                 cleaned_data['weekday_indexes'] = None
             return cleaned_data
     class TimePeriodAddForm(TimePeriodFormBase):
         field_order = ['weekdays', 'start_time', 'end_time', 'repeat', 'weekday_indexes']
         weekdays = forms.MultipleChoiceField(
             label=_('Days'), widget=forms.CheckboxSelectMultiple(), choices=WEEKDAYS_LIST
+        )
         start_time = forms.TimeField(label=_('Start Time'), widget=widgets.TimeWidget())
         end_time = forms.TimeField(label=_('End Time'), widget=widgets.TimeWidget())
         def clean_end_time(self):
             if self.cleaned_data['end_time'] <= self.cleaned_data['start_time']:
                 raise ValidationError(_('End time must come after start time.'))
             return self.cleaned_data['end_time']
     class TimePeriodForm(forms.ModelForm):
     class TimePeriodForm(TimePeriodFormBase, forms.ModelForm):
         class Meta:
             model = TimePeriod
             widgets = {
                 'start_time': widgets.TimeWidget(),
                 'end_time': widgets.TimeWidget(),
+            }
             exclude = ['agenda', 'desk']
             fields = ['weekday', 'start_time', 'end_time', 'repeat', 'weekday_indexes']
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
-...
             self.old_start_time = self.instance.start_time
             self.old_end_time = self.instance.end_time
         def clean_end_time(self):
             if self.cleaned_data['end_time'] <= self.cleaned_data['start_time']:
                 raise ValidationError(_('End time must come after start time.'))
             return self.cleaned_data['end_time']
             if self.instance.weekday_indexes:
                 self.fields['repeat'].initial = 'custom'
         def save(self):
             super().save()

                     </li>
                     {% endif %}
                     {% for time_period in desk.timeperiod_set.all %}
                     <li><a rel="popup" href="{% url 'chrono-manager-time-period-edit' pk=time_period.id %}">
                     {{time_period.weekday_str}} / {{time_period.start_time}} → {{time_period.end_time}}</a>
                     <li><a rel="popup" href="{% url 'chrono-manager-time-period-edit' pk=time_period.id %}">{{ time_period }}</a>
                     <a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-delete' pk=time_period.id %}">{% trans "remove" %}</a>
                     </li>

     {% extends "chrono/manager_agenda_view.html" %}
     {% load i18n %}
     {% load i18n gadjo %}
     {% block extrascripts %}
     {{ block.super }}
-...
     <form method="post" enctype="multipart/form-data">
       {% csrf_token %}
       {{ form.as_p }}
       {{ form|with_template }}
       <div class="buttons">
         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{% url 'chrono-manager-agenda-settings' pk=agenda.id %}">{% trans 'Cancel' %}</a>
       </div>
       <script>
         $('input[type=radio][name=repeat]').change(function() {
           if(!this.checked)
             return;
           if(this.value == 'every-week') {
             $('select#id_weekday_indexes').hide();
           } else {
             $('select#id_weekday_indexes').show();
+          }
         }).change();
       </script>
     </form>
     {% endblock %}

     <div>
       <ul class="objects-list single-links">
         {% for time_period in agenda.excluded_timeperiods.all %}
         <li><a rel="popup" href="{% url 'chrono-manager-time-period-edit' pk=time_period.id %}">
             {{time_period.weekday_str}} / {{time_period.start_time}} → {{time_period.end_time}}</a>
         <li><a rel="popup" href="{% url 'chrono-manager-time-period-edit' pk=time_period.id %}">{{ time_period }}</a>
           <a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-delete' pk=time_period.id %}">{% trans "remove" %}</a>
         </li>
         {% endfor %}

chrono/manager/views.py
2494	2494	weekday=weekday,
2495	2495	start_time=form.cleaned_data['start_time'],
2496	2496	end_time=form.cleaned_data['end_time'],
	2497	weekday_indexes=form.cleaned_data['weekday_indexes'],
2497	2498	)
2498	2499	if desk:
2499	2500	period.desk = desk

chrono/settings.py
52	52	'django.contrib.sessions',
53	53	'django.contrib.messages',
54	54	'django.contrib.staticfiles',
	55	'django.contrib.humanize',
55	56	'gadjo',
56	57	'chrono.agendas',
57	58	'chrono.api',

         assert TimePeriod.objects.get(desk=desk).start_time.minute == 0
         assert TimePeriod.objects.get(desk=desk).end_time.hour == 17
         assert TimePeriod.objects.get(desk=desk).end_time.minute == 0
         assert TimePeriod.objects.get(desk=desk).weekday_indexes is None
         assert desk2.timeperiod_set.exists() is False
         resp = resp.follow()
-...
         resp.form.get('weekdays', index=0).checked = True
         resp.form['start_time'] = '10:00'
         resp.form['end_time'] = '13:00'
         resp.form['repeat'] = 'custom'
         resp.form['weekday_indexes'] = [1, 3]
         resp = resp.form.submit()
         resp = resp.follow()
         assert 'Monday / 10 a.m. → 1 p.m.' in resp.text
         assert 'Monday (1st, 3rd of the month) / 10 a.m. → 1 p.m.' in resp.text
         assert 'Wednesday / 10 a.m. → 5 p.m.' in resp.text
         assert resp.text.index('Monday') < resp.text.index('Wednesday')
-...
         time_period2.refresh_from_db()
         assert time_period2.start_time.hour == 9
         resp = resp.click('Monday / 10 a.m. → noon')
         resp.form['repeat'] = 'custom'
         resp.form['weekday_indexes'] = [5]
         resp = resp.form.submit().follow()
         time_period.refresh_from_db()
         assert time_period.weekday_indexes == [5]
         resp = resp.click('Monday \\(5th of the month\\) / 10 a.m. → noon')
         resp.form['repeat'] = 'every-week'
         resp = resp.form.submit().follow()
         time_period.refresh_from_db()
         assert time_period.weekday_indexes is None
         # edit with inverted start/end
         resp2 = resp.click('Monday / 10 a.m. → noon')
         resp2.form['start_time'] = '18:00'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0003-manager-choose-time-period-weekday-indexes-45159.patch