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
891584bf
Commit
891584bf
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '91-add-task-for-checking-plausibility-of-data' into 'master'
Resolve "Add task for checking plausibility of data" Closes
#91
See merge request
!92
parents
98f99670
1b44092a
No related branches found
No related tags found
1 merge request
!92
Resolve "Add task for checking plausibility of data"
Pipeline
#5296
failed
4 years ago
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/data_checks.py
+189
-0
189 additions, 0 deletions
aleksis/apps/alsijil/data_checks.py
aleksis/apps/alsijil/models.py
+33
-0
33 additions, 0 deletions
aleksis/apps/alsijil/models.py
with
222 additions
and
0 deletions
aleksis/apps/alsijil/data_checks.py
0 → 100644
+
189
−
0
View file @
891584bf
import
logging
from
django.db.models
import
F
from
django.db.models.expressions
import
ExpressionWrapper
,
Func
,
Value
from
django.db.models.fields
import
DateField
from
django.db.models.functions
import
Concat
from
django.db.models.query_utils
import
Q
from
django.utils.translation
import
gettext
as
_
from
aleksis.core.data_checks
import
DataCheck
,
IgnoreSolveOption
,
SolveOption
class
DeleteRelatedObjectSolveOption
(
SolveOption
):
name
=
"
delete
"
verbose_name
=
_
(
"
Delete object
"
)
@classmethod
def
solve
(
cls
,
check_result
:
"
DataCheckResult
"
):
check_result
.
related_object
.
delete
()
check_result
.
delete
()
class
SetGroupsWithCurrentGroupsSolveOption
(
SolveOption
):
name
=
"
set_groups_of_person
"
verbose_name
=
_
(
"
Set current groups
"
)
@classmethod
def
solve
(
cls
,
check_result
:
"
DataCheckResult
"
):
person
=
check_result
.
related_object
.
person
check_result
.
related_object
.
groups_of_person
.
set
(
person
.
member_of
.
all
())
check_result
.
delete
()
class
ResetPersonalNoteSolveOption
(
SolveOption
):
name
=
"
reset_personal_note
"
verbose_name
=
_
(
"
Reset personal note to defaults
"
)
@classmethod
def
solve
(
cls
,
check_result
:
"
DataCheckResult
"
):
note
=
check_result
.
related_object
note
.
reset_values
()
note
.
save
()
check_result
.
delete
()
class
NoPersonalNotesInCancelledLessonsDataCheck
(
DataCheck
):
name
=
"
no_personal_notes_in_cancelled_lessons
"
verbose_name
=
_
(
"
Ensure that there are no personal notes in cancelled lessons
"
)
problem_name
=
_
(
"
The personal note is related to a cancelled lesson.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
}
@classmethod
def
check_data
(
cls
):
from
.models
import
PersonalNote
personal_notes
=
PersonalNote
.
objects
.
filter
(
lesson_period__substitutions__cancelled
=
True
,
lesson_period__substitutions__week
=
F
(
"
week
"
),
lesson_period__substitutions__year
=
F
(
"
year
"
),
).
prefetch_related
(
"
lesson_period
"
,
"
lesson_period__substitutions
"
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Check personal note
{
note
}
"
)
cls
.
register_result
(
note
)
class
NoGroupsOfPersonsSetInPersonalNotesDataCheck
(
DataCheck
):
name
=
"
no_groups_of_persons_set_in_personal_notes
"
verbose_name
=
_
(
"
Ensure that
'
groups_of_person
'
is set for every personal note
"
)
problem_name
=
_
(
"
The personal note has no group in
'
groups_of_person
'
.
"
)
solve_options
=
{
SetGroupsWithCurrentGroupsSolveOption
.
name
:
SetGroupsWithCurrentGroupsSolveOption
,
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
}
@classmethod
def
check_data
(
cls
):
from
.models
import
PersonalNote
personal_notes
=
PersonalNote
.
objects
.
filter
(
groups_of_person__isnull
=
True
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Check personal note
{
note
}
"
)
cls
.
register_result
(
note
)
weekday_to_date
=
ExpressionWrapper
(
Func
(
Concat
(
F
(
"
year
"
),
F
(
"
week
"
)),
Value
(
"
IYYYIW
"
),
output_field
=
DateField
(),
function
=
"
TO_DATE
"
)
+
F
(
"
lesson_period__period__weekday
"
),
output_field
=
DateField
(),
)
class
LessonDocumentationOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for lesson documentation objects on holidays.
This ignores empty lesson documentation as they are created by default.
"""
name
=
"
lesson_documentation_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no filled out lesson documentations on holidays
"
)
problem_name
=
_
(
"
The lesson documentation is on holidays.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
}
@classmethod
def
check_data
(
cls
):
from
aleksis.apps.chronos.models
import
Holiday
from
.models
import
LessonDocumentation
holidays
=
Holiday
.
objects
.
all
()
documentations
=
LessonDocumentation
.
objects
.
filter
(
~
Q
(
topic
=
""
)
|
~
Q
(
group_note
=
""
)
|
~
Q
(
homework
=
""
)
).
annotate
(
actual_date
=
weekday_to_date
)
q
=
Q
()
for
holiday
in
holidays
:
q
=
q
|
Q
(
actual_date__gte
=
holiday
.
date_start
,
actual_date__lte
=
holiday
.
date_end
)
documentations
=
documentations
.
filter
(
q
)
for
doc
in
documentations
:
logging
.
info
(
f
"
Lesson documentation
{
doc
}
is on holidays
"
)
cls
.
register_result
(
doc
)
class
PersonalNoteOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for personal note objects on holidays.
This ignores empty personal notes as they are created by default.
"""
name
=
"
personal_note_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no filled out personal notes on holidays
"
)
problem_name
=
_
(
"
The personal note is on holidays.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
}
@classmethod
def
check_data
(
cls
):
from
aleksis.apps.chronos.models
import
Holiday
from
.models
import
PersonalNote
holidays
=
Holiday
.
objects
.
all
()
personal_notes
=
PersonalNote
.
objects
.
filter
(
~
Q
(
remarks
=
""
)
|
Q
(
absent
=
True
)
|
~
Q
(
late
=
0
)
|
Q
(
extra_marks__isnull
=
False
)
).
annotate
(
actual_date
=
weekday_to_date
)
q
=
Q
()
for
holiday
in
holidays
:
q
=
q
|
Q
(
actual_date__gte
=
holiday
.
date_start
,
actual_date__lte
=
holiday
.
date_end
)
personal_notes
=
personal_notes
.
filter
(
q
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Personal note
{
note
}
is on holidays
"
)
cls
.
register_result
(
note
)
class
ExcusesWithoutAbsences
(
DataCheck
):
name
=
"
excuses_without_absences
"
verbose_name
=
_
(
"
Ensure that there are no excused personal notes without an absence
"
)
problem_name
=
_
(
"
The personal note is marked as excused, but not as absent.
"
)
solve_options
=
{
ResetPersonalNoteSolveOption
.
name
:
ResetPersonalNoteSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
}
@classmethod
def
check_data
(
cls
):
from
.models
import
PersonalNote
personal_notes
=
PersonalNote
.
objects
.
filter
(
excused
=
True
,
absent
=
False
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Check personal note
{
note
}
"
)
cls
.
register_result
(
note
)
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/models.py
+
33
−
0
View file @
891584bf
from
django.db
import
models
from
django.db
import
models
from
django.urls
import
reverse
from
django.utils.formats
import
date_format
from
django.utils.formats
import
date_format
from
django.utils.translation
import
gettext_lazy
as
_
from
django.utils.translation
import
gettext_lazy
as
_
from
calendarweek
import
CalendarWeek
from
calendarweek
import
CalendarWeek
from
aleksis.apps.alsijil.data_checks
import
(
ExcusesWithoutAbsences
,
LessonDocumentationOnHolidaysDataCheck
,
NoGroupsOfPersonsSetInPersonalNotesDataCheck
,
NoPersonalNotesInCancelledLessonsDataCheck
,
PersonalNoteOnHolidaysDataCheck
,
)
from
aleksis.apps.alsijil.managers
import
PersonalNoteManager
from
aleksis.apps.alsijil.managers
import
PersonalNoteManager
from
aleksis.apps.chronos.mixins
import
WeekRelatedMixin
from
aleksis.apps.chronos.mixins
import
WeekRelatedMixin
from
aleksis.apps.chronos.models
import
LessonPeriod
from
aleksis.apps.chronos.models
import
LessonPeriod
...
@@ -45,6 +53,13 @@ class PersonalNote(ExtensibleModel, WeekRelatedMixin):
...
@@ -45,6 +53,13 @@ class PersonalNote(ExtensibleModel, WeekRelatedMixin):
and remarks about a student in a single lesson period.
and remarks about a student in a single lesson period.
"""
"""
data_checks
=
[
NoPersonalNotesInCancelledLessonsDataCheck
,
NoGroupsOfPersonsSetInPersonalNotesDataCheck
,
PersonalNoteOnHolidaysDataCheck
,
ExcusesWithoutAbsences
,
]
objects
=
PersonalNoteManager
()
objects
=
PersonalNoteManager
()
person
=
models
.
ForeignKey
(
"
core.Person
"
,
models
.
CASCADE
,
related_name
=
"
personal_notes
"
)
person
=
models
.
ForeignKey
(
"
core.Person
"
,
models
.
CASCADE
,
related_name
=
"
personal_notes
"
)
...
@@ -97,6 +112,14 @@ class PersonalNote(ExtensibleModel, WeekRelatedMixin):
...
@@ -97,6 +112,14 @@ class PersonalNote(ExtensibleModel, WeekRelatedMixin):
def
__str__
(
self
):
def
__str__
(
self
):
return
f
"
{
date_format
(
self
.
date
)
}
,
{
self
.
lesson_period
}
,
{
self
.
person
}
"
return
f
"
{
date_format
(
self
.
date
)
}
,
{
self
.
lesson_period
}
,
{
self
.
person
}
"
def
get_absolute_url
(
self
):
return
(
reverse
(
"
lesson_by_week_and_period
"
,
args
=
[
self
.
year
,
self
.
week
,
self
.
lesson_period
.
pk
],
)
+
"
#personal-notes
"
)
class
Meta
:
class
Meta
:
verbose_name
=
_
(
"
Personal note
"
)
verbose_name
=
_
(
"
Personal note
"
)
verbose_name_plural
=
_
(
"
Personal notes
"
)
verbose_name_plural
=
_
(
"
Personal notes
"
)
...
@@ -117,6 +140,8 @@ class LessonDocumentation(ExtensibleModel, WeekRelatedMixin):
...
@@ -117,6 +140,8 @@ class LessonDocumentation(ExtensibleModel, WeekRelatedMixin):
Non-personal, includes the topic and homework of the lesson.
Non-personal, includes the topic and homework of the lesson.
"""
"""
data_checks
=
[
LessonDocumentationOnHolidaysDataCheck
]
week
=
models
.
IntegerField
()
week
=
models
.
IntegerField
()
year
=
models
.
IntegerField
(
verbose_name
=
_
(
"
Year
"
),
default
=
get_current_year
)
year
=
models
.
IntegerField
(
verbose_name
=
_
(
"
Year
"
),
default
=
get_current_year
)
...
@@ -160,6 +185,14 @@ class LessonDocumentation(ExtensibleModel, WeekRelatedMixin):
...
@@ -160,6 +185,14 @@ class LessonDocumentation(ExtensibleModel, WeekRelatedMixin):
if
changed
:
if
changed
:
lesson_documentation
.
save
()
lesson_documentation
.
save
()
def
__str__
(
self
):
return
f
"
{
self
.
lesson_period
}
,
{
date_format
(
self
.
date
)
}
"
def
get_absolute_url
(
self
):
return
reverse
(
"
lesson_by_week_and_period
"
,
args
=
[
self
.
year
,
self
.
week
,
self
.
lesson_period
.
pk
],
)
def
save
(
self
,
*
args
,
**
kwargs
):
def
save
(
self
,
*
args
,
**
kwargs
):
if
get_site_preferences
()[
"
alsijil__carry_over
"
]
and
(
if
get_site_preferences
()[
"
alsijil__carry_over
"
]
and
(
self
.
topic
or
self
.
homework
or
self
.
group_note
self
.
topic
or
self
.
homework
or
self
.
group_note
...
...
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