DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Publish workflow is now fully functional.

Browse Source
This commit is contained in:
heinzel
2018-02-26 14:44:30 +01:00
parent 87787c5eea
commit 69204a6d0d
16 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dav_events/forms/events.py
View File

@@ -71,7 +71,7 @@ class EventUpdateForm(forms.ModelForm):
model = models.Event
fields = '__all__'
exclude = ('accepted', 'accepted_at', 'accepted_by',
'published', 'published_at', 'published_by',)
'publication_confirmed', 'publication_confirmed_at', 'publication_confirmed_by',)
class EventCreateForm(ModelMixin, ChainedForm):
@@ -815,10 +815,10 @@ class ChargesForm(EventCreateForm):
class SummaryForm(EventCreateForm):
_form_title = _(u'Zusammenfassung')
planned_publish_date = forms.DateField(required=False,
label=_(u'Voraussichtliche Veröffentlichung'),
widget=forms.HiddenInput())
planned_publish_issue = forms.CharField(required=False)
planned_publication_date = forms.DateField(required=False,
label=_(u'Voraussichtliche Veröffentlichung'),
widget=forms.HiddenInput())
planned_publication_issue = forms.CharField(required=False)
internal_note = forms.CharField(required=False,
label=_(u'Bearbeitungshinweis'),
@@ -841,10 +841,10 @@ class SummaryForm(EventCreateForm):
deadline = None
if deadline:
publish_deadline = deadline - datetime.timedelta(app_config.settings.publish_before_deadline_days)
publication_deadline = deadline - datetime.timedelta(app_config.settings.publish_before_deadline_days)
else:
first_day = self._session_data.get('first_day')
publish_deadline = first_day - datetime.timedelta(app_config.settings.publish_before_begin_days)
publication_deadline = first_day - datetime.timedelta(app_config.settings.publish_before_begin_days)
today = datetime.date.today()
@@ -863,9 +863,9 @@ class SummaryForm(EventCreateForm):
if issue_deadline > issue_release:
issue_deadline = datetime.date(year - 1, issue['deadline'][1], issue['deadline'][0])
if publish_deadline > issue_release and today < issue_deadline:
self.fields['planned_publish_date'].initial = issue_release
self.fields['planned_publish_issue'].initial = u'%s/%s' % (issue['issue'], year)
if publication_deadline > issue_release and today < issue_deadline:
self.fields['planned_publication_date'].initial = issue_release
self.fields['planned_publication_issue'].initial = u'%s/%s' % (issue['issue'], year)
break_outer_loop = True
break