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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KIF
AKPlanning
Commits
5a5cfd88
Commit
5a5cfd88
authored
4 years ago
by
Benjamin Hättasch
Committed by
Nadja Geisler
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Allow to mark availabilites for rooms
Implements
#92
parent
9f8de915
No related branches found
No related tags found
1 merge request
!53
Drag and drop based plan for scheduling
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
AKModel/admin.py
+29
-0
29 additions, 0 deletions
AKModel/admin.py
AKModel/templates/admin/AKModel/room_change_form.html
+16
-0
16 additions, 0 deletions
AKModel/templates/admin/AKModel/room_change_form.html
with
45 additions
and
0 deletions
AKModel/admin.py
+
29
−
0
View file @
5a5cfd88
...
@@ -2,6 +2,7 @@ from django.apps import apps
...
@@ -2,6 +2,7 @@ from django.apps import apps
from
django.contrib
import
admin
from
django.contrib
import
admin
from
django.contrib.admin
import
SimpleListFilter
from
django.contrib.admin
import
SimpleListFilter
from
django.db.models
import
Count
,
F
from
django.db.models
import
Count
,
F
from
django
import
forms
from
django.shortcuts
import
render
from
django.shortcuts
import
render
from
django.urls
import
path
,
reverse_lazy
from
django.urls
import
path
,
reverse_lazy
from
django.utils
import
timezone
from
django.utils
import
timezone
...
@@ -9,6 +10,7 @@ from django.utils.html import format_html
...
@@ -9,6 +10,7 @@ from django.utils.html import format_html
from
django.utils.translation
import
gettext_lazy
as
_
from
django.utils.translation
import
gettext_lazy
as
_
from
simple_history.admin
import
SimpleHistoryAdmin
from
simple_history.admin
import
SimpleHistoryAdmin
from
AKModel.availability.forms
import
AvailabilitiesFormMixin
from
AKModel.availability.models
import
Availability
from
AKModel.availability.models
import
Availability
from
AKModel.models
import
Event
,
AKOwner
,
AKCategory
,
AKTrack
,
AKTag
,
AKRequirement
,
AK
,
AKSlot
,
Room
,
AKOrgaMessage
from
AKModel.models
import
Event
,
AKOwner
,
AKCategory
,
AKTrack
,
AKTag
,
AKRequirement
,
AK
,
AKSlot
,
Room
,
AKOrgaMessage
from
AKModel.views
import
EventStatusView
,
AKCSVExportView
,
AKWikiExportView
,
AKMessageDeleteView
from
AKModel.views
import
EventStatusView
,
AKCSVExportView
,
AKWikiExportView
,
AKMessageDeleteView
...
@@ -158,6 +160,27 @@ class AKAdmin(SimpleHistoryAdmin):
...
@@ -158,6 +160,27 @@ class AKAdmin(SimpleHistoryAdmin):
return
super
(
AKAdmin
,
self
).
formfield_for_foreignkey
(
db_field
,
request
,
**
kwargs
)
return
super
(
AKAdmin
,
self
).
formfield_for_foreignkey
(
db_field
,
request
,
**
kwargs
)
class
RoomForm
(
AvailabilitiesFormMixin
,
forms
.
ModelForm
):
class
Meta
:
model
=
Room
fields
=
[
'
name
'
,
'
location
'
,
'
capacity
'
,
'
properties
'
,
'
event
'
,
]
widgets
=
{
'
properties
'
:
forms
.
CheckboxSelectMultiple
,
}
def
__init__
(
self
,
*
args
,
**
kwargs
):
# Init availability mixin
kwargs
[
'
initial
'
]
=
dict
()
super
().
__init__
(
*
args
,
**
kwargs
)
self
.
initial
=
{
**
self
.
initial
,
**
kwargs
[
'
initial
'
]}
@admin.register
(
Room
)
@admin.register
(
Room
)
class
RoomAdmin
(
admin
.
ModelAdmin
):
class
RoomAdmin
(
admin
.
ModelAdmin
):
model
=
Room
model
=
Room
...
@@ -165,6 +188,12 @@ class RoomAdmin(admin.ModelAdmin):
...
@@ -165,6 +188,12 @@ class RoomAdmin(admin.ModelAdmin):
list_filter
=
[
'
location
'
,
'
properties
'
,
'
event
'
]
list_filter
=
[
'
location
'
,
'
properties
'
,
'
event
'
]
list_editable
=
[]
list_editable
=
[]
ordering
=
[
'
location
'
,
'
name
'
]
ordering
=
[
'
location
'
,
'
name
'
]
change_form_template
=
"
admin/AKModel/room_change_form.html
"
def
get_form
(
self
,
request
,
obj
=
None
,
change
=
False
,
**
kwargs
):
if
obj
is
not
None
:
return
RoomForm
return
super
().
get_form
(
request
,
obj
,
change
,
**
kwargs
)
def
formfield_for_foreignkey
(
self
,
db_field
,
request
,
**
kwargs
):
def
formfield_for_foreignkey
(
self
,
db_field
,
request
,
**
kwargs
):
if
db_field
.
name
==
'
event
'
:
if
db_field
.
name
==
'
event
'
:
...
...
This diff is collapsed.
Click to expand it.
AKModel/templates/admin/AKModel/room_change_form.html
0 → 100644
+
16
−
0
View file @
5a5cfd88
{% extends "admin/change_form.html" %}
{% load i18n admin_urls %}
{% load static %}
{% load bootstrap4 %}
{% block extrahead %}
{{ block.super }}
{% bootstrap_javascript jquery='slim' %}
<link
href=
'{% static '
AKSubmission
/
vendor
/
fullcalendar3
/
fullcalendar.min.css
'
%}'
rel=
'stylesheet'
/>
<link
href=
'{% static '
AKSubmission
/
css
/
availabilities.css
'
%}'
rel=
'stylesheet'
/>
<script
src=
"{% static "
AKSubmission
/
vendor
/
moment
/
moment-with-locales.js
"
%}"
></script>
<script
src=
"{% static "
AKSubmission
/
vendor
/
moment-timezone
/
moment-timezone-with-data-10-year-range.js
"
%}"
></script>
<script
src=
'{% static '
AKSubmission
/
vendor
/
fullcalendar3
/
fullcalendar.min.js
'
%}'
></script>
<script
src=
"{% static "
common
/
js
/
availabilities.js
"
%}"
></script>
{% endblock %}
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