Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KIF
AKPlanning
Commits
f01981b9
Commit
f01981b9
authored
1 month ago
by
Felix Blanke
Committed by
Nadja Geisler
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
Set initial availability for full event
parent
e4c6564a
Branches
Branches containing commit
No related tags found
1 merge request
!271
Feature: AK Preference poll
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
AKModel/availability/forms.py
+5
-15
5 additions, 15 deletions
AKModel/availability/forms.py
AKModel/availability/serializers.py
+27
-1
27 additions, 1 deletion
AKModel/availability/serializers.py
AKPreferencePoll/views.py
+15
-1
15 additions, 1 deletion
AKPreferencePoll/views.py
with
47 additions
and
17 deletions
AKModel/availability/forms.py
+
5
−
15
View file @
f01981b9
...
...
@@ -12,7 +12,7 @@ from django.utils.dateparse import parse_datetime
from
django.utils.translation
import
gettext_lazy
as
_
from
AKModel.availability.models
import
Availability
from
AKModel.availability.serializers
import
AvailabilitySerializer
from
AKModel.availability.serializers
import
AvailabilitySerializer
,
AvailabilityFormSerializer
from
AKModel.models
import
Event
...
...
@@ -41,22 +41,11 @@ class AvailabilitiesFormMixin(forms.Form):
:rtype: str
"""
if
instance
:
availabilities
=
AvailabilitySerializer
(
instance
.
availabilities
.
all
(),
many
=
True
).
data
availabilities
=
instance
.
availabilities
.
all
()
else
:
availabilities
=
[]
return
json
.
dumps
(
{
'
availabilities
'
:
availabilities
,
'
event
'
:
{
# 'timezone': event.timezone,
'
date_from
'
:
str
(
event
.
start
),
'
date_to
'
:
str
(
event
.
end
),
},
}
)
return
json
.
dumps
(
AvailabilityFormSerializer
((
availabilities
,
event
)).
data
)
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
().
__init__
(
*
args
,
**
kwargs
)
...
...
@@ -65,6 +54,7 @@ class AvailabilitiesFormMixin(forms.Form):
if
isinstance
(
self
.
event
,
int
):
self
.
event
=
Event
.
objects
.
get
(
pk
=
self
.
event
)
initial
=
kwargs
.
pop
(
'
initial
'
,
{})
if
'
availabilities
'
not
in
initial
:
initial
[
'
availabilities
'
]
=
self
.
_serialize
(
self
.
event
,
kwargs
.
get
(
'
instance
'
))
if
not
isinstance
(
self
,
forms
.
BaseModelForm
):
kwargs
.
pop
(
'
instance
'
)
...
...
This diff is collapsed.
Click to expand it.
AKModel/availability/serializers.py
+
27
−
1
View file @
f01981b9
...
...
@@ -4,9 +4,10 @@
# Documentation was mainly added by us, other changes are marked in the code
from
django.utils
import
timezone
from
rest_framework.fields
import
SerializerMethodField
from
rest_framework.serializers
import
ModelSerializer
from
rest_framework.serializers
import
BaseSerializer
,
ModelSerializer
from
AKModel.availability.models
import
Availability
from
AKModel.models
import
Event
class
AvailabilitySerializer
(
ModelSerializer
):
...
...
@@ -44,3 +45,28 @@ class AvailabilitySerializer(ModelSerializer):
class
Meta
:
model
=
Availability
fields
=
(
'
id
'
,
'
start
'
,
'
end
'
,
'
allDay
'
)
class
AvailabilityFormSerializer
(
BaseSerializer
):
"""
Serializer to configure an availability form.
"""
def
create
(
self
,
validated_data
):
raise
ValueError
(
"
`AvailabilityFormSerializer` is read-only.
"
)
def
to_internal_value
(
self
,
data
):
raise
ValueError
(
"
`AvailabilityFormSerializer` is read-only.
"
)
def
update
(
self
,
instance
,
validated_data
):
raise
ValueError
(
"
`AvailabilityFormSerializer` is read-only.
"
)
def
to_representation
(
self
,
instance
:
tuple
[
Availability
,
Event
],
**
kwargs
):
availabilities
,
event
=
instance
return
{
'
availabilities
'
:
AvailabilitySerializer
(
availabilities
,
many
=
True
).
data
,
'
event
'
:
{
# 'timezone': event.timezone,
'
date_from
'
:
str
(
event
.
start
),
'
date_to
'
:
str
(
event
.
end
),
},
}
This diff is collapsed.
Click to expand it.
AKPreferencePoll/views.py
+
15
−
1
View file @
f01981b9
import
json
from
django
import
forms
from
django.contrib
import
messages
from
django.contrib.messages.views
import
SuccessMessageMixin
...
...
@@ -6,6 +8,8 @@ from django.urls import reverse_lazy
from
django.utils.translation
import
gettext_lazy
as
_
from
django.views.generic
import
FormView
from
AKModel.availability.models
import
Availability
from
AKModel.availability.serializers
import
AvailabilityFormSerializer
from
AKModel.metaviews.admin
import
EventSlugMixin
from
AKModel.models
import
AK
,
AKPreference
...
...
@@ -79,8 +83,18 @@ class PreferencePollCreateView(EventSlugMixin, SuccessMessageMixin, FormView):
)
form
.
ak_obj
=
init
[
"
ak
"
]
availabilities_serialization
=
AvailabilityFormSerializer
(
(
[
Availability
.
with_event_length
(
event
=
self
.
event
)],
self
.
event
,
)
)
context
[
"
participant_form
"
]
=
EventParticipantForm
(
initial
=
{
"
event
"
:
self
.
event
}
initial
=
{
"
event
"
:
self
.
event
,
"
availabilities
"
:
json
.
dumps
(
availabilities_serialization
.
data
),
}
)
return
context
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment