Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Chronos
Commits
f138d585
Verified
Commit
f138d585
authored
7 months ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix URLs and view for substitutions print
parent
c9a56bb2
No related branches found
No related tags found
1 merge request
!315
Resolve "Substitutions PDF for new data model"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/apps/chronos/frontend/index.js
+16
-0
16 additions, 0 deletions
aleksis/apps/chronos/frontend/index.js
aleksis/apps/chronos/urls.py
+5
-0
5 additions, 0 deletions
aleksis/apps/chronos/urls.py
aleksis/apps/chronos/views.py
+4
-6
4 additions, 6 deletions
aleksis/apps/chronos/views.py
with
25 additions
and
6 deletions
aleksis/apps/chronos/frontend/index.js
+
16
−
0
View file @
f138d585
...
@@ -32,5 +32,21 @@ export default {
...
@@ -32,5 +32,21 @@ export default {
fullWidth
:
true
,
fullWidth
:
true
,
},
},
},
},
{
path
:
"
substitutions/print/
"
,
component
:
()
=>
import
(
"
aleksis.core/components/LegacyBaseTemplate.vue
"
),
name
:
"
chronos.substitutions
"
,
props
:
{
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate
:
true
,
},
},
{
path
:
"
substitutions/print/:date/
"
,
component
:
()
=>
import
(
"
aleksis.core/components/LegacyBaseTemplate.vue
"
),
name
:
"
chronos.substitutionsByDate
"
,
props
:
{
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate
:
true
,
},
},
],
],
};
};
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/urls.py
+
5
−
0
View file @
f138d585
...
@@ -8,4 +8,9 @@ urlpatterns = [
...
@@ -8,4 +8,9 @@ urlpatterns = [
views
.
substitutions_print
,
views
.
substitutions_print
,
name
=
"
substitutions_print
"
,
name
=
"
substitutions_print
"
,
),
),
path
(
"
substitutions/print/<str:day>/
"
,
views
.
substitutions_print
,
name
=
"
substitutions_print
"
,
),
]
]
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/views.py
+
4
−
6
View file @
f138d585
from
datetime
import
date
,
datetime
from
typing
import
Optional
from
typing
import
Optional
from
django.http
import
HttpRequest
,
HttpResponse
from
django.http
import
HttpRequest
,
HttpResponse
from
rules.contrib.views
import
permission_required
from
rules.contrib.views
import
permission_required
from
aleksis.core.decorators
import
pwa_cache
from
aleksis.core.util.pdf
import
render_pdf
from
aleksis.core.util.pdf
import
render_pdf
from
.util.chronos_helpers
import
(
from
.util.chronos_helpers
import
(
...
@@ -12,14 +12,12 @@ from .util.chronos_helpers import (
...
@@ -12,14 +12,12 @@ from .util.chronos_helpers import (
)
)
@pwa_cache
@permission_required
(
"
chronos.view_substitutions_rule
"
)
@permission_required
(
"
chronos.view_substitutions_rule
"
)
def
substitutions_print
(
def
substitutions_print
(
request
:
HttpRequest
,
request
:
HttpRequest
,
year
:
Optional
[
int
]
=
None
,
day
:
Optional
[
str
]
=
None
,
month
:
Optional
[
int
]
=
None
,
day
:
Optional
[
int
]
=
None
,
)
->
HttpResponse
:
)
->
HttpResponse
:
"""
View all substitutions on a specified day.
"""
"""
View all substitutions on a specified day.
"""
context
=
get_substitutions_context_data
(
request
,
year
,
month
,
day
,
is_print
=
True
)
day
=
datetime
.
strptime
(
day
,
"
%Y-%m-%d
"
).
date
()
if
day
else
date
.
today
()
context
=
get_substitutions_context_data
(
day
)
return
render_pdf
(
request
,
"
chronos/substitutions_print.html
"
,
context
)
return
render_pdf
(
request
,
"
chronos/substitutions_print.html
"
,
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