Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
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-Alsijil
Commits
6978f1c5
Verified
Commit
6978f1c5
authored
1 month ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix PDF generation
parent
52a77a8b
No related branches found
No related tags found
1 merge request
!477
Resolve "Add export functionality to absence statistics page"
Pipeline
#195681
failed
1 month ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/tasks.py
+12
-10
12 additions, 10 deletions
aleksis/apps/alsijil/tasks.py
with
12 additions
and
10 deletions
aleksis/apps/alsijil/tasks.py
+
12
−
10
View file @
6978f1c5
...
...
@@ -17,6 +17,10 @@ from .models import Documentation, ExtraMark, NewPersonalNote, ParticipationStat
from
.util.statistics
import
StatisticsBuilder
class
PDFGenerationError
(
Exception
):
"""
Error in PDF generation.
"""
@recorded_task
def
generate_groups_register_printout
(
groups
:
list
[
int
],
...
...
@@ -134,8 +138,8 @@ def generate_groups_register_printout(
with
allow_join_result
():
result
.
wait
()
file_object
.
refresh_from_db
()
if
not
result
.
status
==
SUCCESS
and
file_object
.
file
:
raise
Exception
(
_
(
"
PDF generation failed
"
))
if
not
(
result
.
status
==
SUCCESS
and
file_object
.
file
)
:
raise
PDFGenerationError
(
_
(
"
PDF generation failed
"
))
recorder
.
set_progress
(
5
+
len
(
groups
),
_number_of_steps
)
...
...
@@ -151,9 +155,7 @@ def generate_person_register_printout(
context
=
{}
_number_of_steps
=
4
recorder
.
set_progress
(
1
,
_number_of_steps
,
_
(
"
Loading data ...
"
))
recorder
.
set_progress
(
1
,
4
,
_
(
"
Loading data ...
"
))
person
=
Person
.
objects
.
get
(
pk
=
person
)
school_term
=
SchoolTerm
.
objects
.
get
(
pk
=
school_term
)
...
...
@@ -184,7 +186,7 @@ def generate_person_register_printout(
)
context
[
"
extra_marks
"
]
=
ExtraMark
.
objects
.
all
()
recorder
.
set_progress
(
2
,
_number_of_steps
,
_
(
"
Generating template ...
"
))
recorder
.
set_progress
(
2
,
4
,
_
(
"
Generating template ...
"
))
file_object
,
result
=
generate_pdf_from_template
(
"
alsijil/print/register_for_person.html
"
,
...
...
@@ -192,12 +194,12 @@ def generate_person_register_printout(
file_object
=
PDFFile
.
objects
.
get
(
pk
=
file_object
),
)
recorder
.
set_progress
(
3
,
_number_of_steps
,
_
(
"
Generating PDF ...
"
))
recorder
.
set_progress
(
3
,
4
,
_
(
"
Generating PDF ...
"
))
with
allow_join_result
():
result
.
wait
()
file_object
.
refresh_from_db
()
if
not
result
.
status
==
SUCCESS
and
file_object
.
file
:
raise
Exception
(
_
(
"
PDF generation failed
"
))
if
not
(
result
.
status
==
SUCCESS
and
file_object
.
file
)
:
raise
PDFGenerationError
(
_
(
"
PDF generation failed
"
))
recorder
.
set_progress
(
4
,
_number_of_steps
)
recorder
.
set_progress
(
4
,
4
)
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