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
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
Maximilian Marx
AKPlanning
Commits
f937ba46
Verified
Commit
f937ba46
authored
Nov 27, 2022
by
Maximilian Marx
Browse files
Options
Downloads
Patches
Plain Diff
Add JSON import form
parent
edffc9e3
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#117729
passed
Nov 27, 2022
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
AKModel/forms.py
+9
-0
9 additions, 0 deletions
AKModel/forms.py
AKModel/urls.py
+4
-1
4 additions, 1 deletion
AKModel/urls.py
AKModel/views.py
+11
-1
11 additions, 1 deletion
AKModel/views.py
with
24 additions
and
2 deletions
AKModel/forms.py
+
9
−
0
View file @
f937ba46
...
@@ -101,3 +101,12 @@ class SlideExportForm(AdminIntermediateForm):
...
@@ -101,3 +101,12 @@ class SlideExportForm(AdminIntermediateForm):
coerce
=
lambda
x
:
x
==
"
True
"
,
coerce
=
lambda
x
:
x
==
"
True
"
,
help_text
=
_
(
"
Create symbols indicating space to note down owners and timeslots for wishes, e.g., to be filled
"
help_text
=
_
(
"
Create symbols indicating space to note down owners and timeslots for wishes, e.g., to be filled
"
"
out on a touch screen while presenting?
"
))
"
out on a touch screen while presenting?
"
))
class
JSONImportForm
(
AdminIntermediateForm
):
json_data
=
forms
.
CharField
(
required
=
True
,
widget
=
forms
.
Textarea
,
label
=
_
(
"
JSON data
"
),
help_text
=
_
(
"
JSON data from the scheduling solver
"
),
)
This diff is collapsed.
Click to expand it.
AKModel/urls.py
+
4
−
1
View file @
f937ba46
...
@@ -6,7 +6,8 @@ from rest_framework.routers import DefaultRouter
...
@@ -6,7 +6,8 @@ from rest_framework.routers import DefaultRouter
from
AKModel
import
views
from
AKModel
import
views
from
AKModel.views
import
NewEventWizardStartView
,
NewEventWizardSettingsView
,
NewEventWizardPrepareImportView
,
\
from
AKModel.views
import
NewEventWizardStartView
,
NewEventWizardSettingsView
,
NewEventWizardPrepareImportView
,
\
NewEventWizardImportView
,
NewEventWizardActivateView
,
NewEventWizardFinishView
,
EventStatusView
,
\
NewEventWizardImportView
,
NewEventWizardActivateView
,
NewEventWizardFinishView
,
EventStatusView
,
\
AKRequirementOverview
,
AKCSVExportView
,
AKWikiExportView
,
AKJSONExportView
,
AKMessageDeleteView
,
ExportSlidesView
AKRequirementOverview
,
AKCSVExportView
,
AKWikiExportView
,
AKJSONExportView
,
AKJSONImportView
,
\
AKMessageDeleteView
,
ExportSlidesView
api_router
=
DefaultRouter
()
api_router
=
DefaultRouter
()
api_router
.
register
(
'
akowner
'
,
views
.
AKOwnerViewSet
,
basename
=
'
AKOwner
'
)
api_router
.
register
(
'
akowner
'
,
views
.
AKOwnerViewSet
,
basename
=
'
AKOwner
'
)
...
@@ -79,6 +80,8 @@ def get_admin_urls_event(admin_site):
...
@@ -79,6 +80,8 @@ def get_admin_urls_event(admin_site):
name
=
"
ak_csv_export
"
),
name
=
"
ak_csv_export
"
),
path
(
'
<slug:event_slug>/ak-json-export/
'
,
admin_site
.
admin_view
(
AKJSONExportView
.
as_view
()),
path
(
'
<slug:event_slug>/ak-json-export/
'
,
admin_site
.
admin_view
(
AKJSONExportView
.
as_view
()),
name
=
"
ak_json_export
"
),
name
=
"
ak_json_export
"
),
path
(
'
<slug:event_slug>/ak-json-import/
'
,
admin_site
.
admin_view
(
AKJSONImportView
.
as_view
()),
name
=
"
ak_json_import
"
),
path
(
'
<slug:slug>/ak-wiki-export/
'
,
admin_site
.
admin_view
(
AKWikiExportView
.
as_view
()),
path
(
'
<slug:slug>/ak-wiki-export/
'
,
admin_site
.
admin_view
(
AKWikiExportView
.
as_view
()),
name
=
"
ak_wiki_export
"
),
name
=
"
ak_wiki_export
"
),
path
(
'
<slug:event_slug>/delete-orga-messages/
'
,
admin_site
.
admin_view
(
AKMessageDeleteView
.
as_view
()),
path
(
'
<slug:event_slug>/delete-orga-messages/
'
,
admin_site
.
admin_view
(
AKMessageDeleteView
.
as_view
()),
...
...
This diff is collapsed.
Click to expand it.
AKModel/views.py
+
11
−
1
View file @
f937ba46
...
@@ -15,7 +15,7 @@ from rest_framework import viewsets, permissions, mixins
...
@@ -15,7 +15,7 @@ from rest_framework import viewsets, permissions, mixins
from
AKModel.forms
import
NewEventWizardStartForm
,
NewEventWizardSettingsForm
,
NewEventWizardPrepareImportForm
,
\
from
AKModel.forms
import
NewEventWizardStartForm
,
NewEventWizardSettingsForm
,
NewEventWizardPrepareImportForm
,
\
NewEventWizardImportForm
,
NewEventWizardActivateForm
,
AdminIntermediateForm
,
SlideExportForm
,
\
NewEventWizardImportForm
,
NewEventWizardActivateForm
,
AdminIntermediateForm
,
SlideExportForm
,
\
AdminIntermediateActionForm
AdminIntermediateActionForm
,
JSONImportForm
from
AKModel.models
import
Event
,
AK
,
AKSlot
,
Room
,
AKTrack
,
AKCategory
,
AKOwner
,
AKOrgaMessage
,
AKRequirement
,
\
from
AKModel.models
import
Event
,
AK
,
AKSlot
,
Room
,
AKTrack
,
AKCategory
,
AKOwner
,
AKOrgaMessage
,
AKRequirement
,
\
ConstraintViolation
ConstraintViolation
from
AKModel.serializers
import
AKSerializer
,
AKSlotSerializer
,
RoomSerializer
,
AKTrackSerializer
,
AKCategorySerializer
,
\
from
AKModel.serializers
import
AKSerializer
,
AKSlotSerializer
,
RoomSerializer
,
AKTrackSerializer
,
AKCategorySerializer
,
\
...
@@ -575,3 +575,13 @@ class PlanUnpublishView(IntermediateAdminActionView):
...
@@ -575,3 +575,13 @@ class PlanUnpublishView(IntermediateAdminActionView):
def
action
(
self
,
form
):
def
action
(
self
,
form
):
self
.
entities
.
update
(
plan_published_at
=
None
,
plan_hidden
=
True
)
self
.
entities
.
update
(
plan_published_at
=
None
,
plan_hidden
=
True
)
class
AKJSONImportView
(
EventSlugMixin
,
IntermediateAdminView
):
form_class
=
JSONImportForm
title
=
_
(
"
AK JSON Import
"
)
def
form_valid
(
self
,
form
):
self
.
event
.
schedule_from_json
(
form
.
data
[
"
json_data
"
])
return
redirect
(
"
admin:event_status
"
,
self
.
event
.
slug
)
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