Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated planning templates #508

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions kn/planning/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,27 @@ def hm2s(hours, minutes=0):
[(hm2s(25), False), (hm2s(28), True), _('derde dienst')]],
'sooscie': [
[(hm2s(20, 30), False), (hm2s(24), False), _('openen')],
[(hm2s(24), False), (hm2s(28), True), _('sluiten')]]},
'borrel_met_avondeten': {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deze moet dan ook toegevoegd worden aan kn/planning/forms.py (zie EventCreateForm), dan wordt hij ook daadwerkelijk zichtbaar in de dropdown.
Daarnaast: de indentation klopt niet helemaal (2 spaties teveel).

'tappers': [
[(hm2s(19), False), (hm2s(21), False), _('nulde dienst')],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation: dit moeten spaties zijn, geen tabs

[(hm2s(21), False), (hm2s(23), False), _('eerste dienst')],
[(hm2s(23), False), (hm2s(25), False), _('tweede dienst')],
[(hm2s(25), False), (hm2s(28), True), _('derde dienst')]],
'sooscie': [
[(hm2s(17), False), (hm2s(20, 30), False), _('openen')],
[(hm2s(20, 30), False), (hm2s(24), False), _('middelste dienst')],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tabs

[(hm2s(24), False), (hm2s(28), True), _('sluiten')]],
'draai': [
[(hm2s(20, 45), False), (hm2s(23), False), _('openen')],
[(hm2s(23), False), (hm2s(24), False), _('prime-time')],
[(hm2s(24), False), (hm2s(25), True), _('sluiten')]]},
'cocks': [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tabs

[(hm2s(17), True), (hm2s(20), False), _('Kok')]],
'wok': [
[(hm2s(17), True), (hm2s(20), False), _('WOKker')]]},
'kleinfeest': {
'tappers': [
[(hm2s(20, 30), False), (hm2s(23), False), _('eerste dienst')],
[(hm2s(23), False), (hm2s(25), False), _('tweede dienst')],
[(hm2s(25), False), (hm2s(28), True), _('derde dienst')]],
'bestuur': [
'sooscie': [
[(hm2s(20, 30), False), (hm2s(24), False), _('openen')],
[(hm2s(24), False), (hm2s(28), True), _('sluiten')]]},
'grootfeest': {
Expand All @@ -60,31 +70,31 @@ def hm2s(hours, minutes=0):
_('derde dienst, tapper 1')],
[(hm2s(25), False), (hm2s(28), True),
_('derde dienst, tapper 2')]],
'bestuur': [
[(hm2s(20, 30), False), (hm2s(24), False), _('openen')],
'sooscie': [
[(hm2s(19), False), (hm2s(24), False), _('openen')],
[(hm2s(24), False), (hm2s(28), True), _('sluiten')]]},
'dranktelling': {
'barco': [
'sooscie': [
[(hm2s(20), True), (hm2s(20, 30), False), _('Teller 1')],
[(hm2s(20), True), (hm2s(20, 30), False), _('Teller 2')]]},
'dranklevering': {
'barco': [
'sooscie': [
[(hm2s(9), False), (hm2s(13), False), _('Persoon 1')],
[(hm2s(9), False), (hm2s(13), False), _('Persoon 2')]]},
'vrijdag_met_tappers': {
'tappers': [
[(hm2s(20, 30), False), (hm2s(23), False), _('eerste dienst')],
[(hm2s(23), False), (hm2s(25), False), _('tweede dienst')],
[(hm2s(25), False), (hm2s(28), True), _('derde dienst')]],
'bestuur': [
'sooscie': [
[(hm2s(17), False), (hm2s(22), False), _('openen')],
[(hm2s(22), False), (hm2s(27), True), _('sluiten')]],
'cocks': [
[(hm2s(16), True), (hm2s(19), False), _('Kok')]],
'wok': [
[(hm2s(16), True), (hm2s(19), False), _('Wokker')]]},
'vrijdag_zonder_tappers': {
'bestuur': [
'sooscie': [
[(hm2s(17), False), (hm2s(22), False), _('openen')],
[(hm2s(22), False), (hm2s(27), True), _('sluiten')]],
'cocks': [
Expand All @@ -98,6 +108,7 @@ def hm2s(hours, minutes=0):
}



@login_required
def planning_view(request):
period = 'now'
Expand Down