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
d9e4b432
Verified
Commit
d9e4b432
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix verbose_name_plural
parent
4778dcc1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!39
Resolve "Models for advanced features from SchoolApps (imported from Untis)"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+6
-0
6 additions, 0 deletions
...pps/chronos/migrations/0007_advanced_models_from_untis.py
aleksis/apps/chronos/models.py
+5
-1
5 additions, 1 deletion
aleksis/apps/chronos/models.py
with
11 additions
and
1 deletion
aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+
6
−
0
View file @
d9e4b432
...
...
@@ -24,6 +24,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Absence
'
,
'
verbose_name_plural
'
:
'
Absences
'
,
'
ordering
'
:
[
'
date_start
'
],
},
),
...
...
@@ -37,6 +38,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Absence reason
'
,
'
verbose_name_plural
'
:
'
Absence reasons
'
,
},
),
migrations
.
CreateModel
(
...
...
@@ -50,6 +52,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Events
'
,
'
verbose_name_plural
'
:
'
Events
'
,
'
ordering
'
:
[
'
date_start
'
],
},
),
...
...
@@ -64,6 +67,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Exam
'
,
'
verbose_name_plural
'
:
'
Exams
'
,
'
ordering
'
:
[
'
date
'
],
},
),
...
...
@@ -79,6 +83,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Holiday
'
,
'
verbose_name_plural
'
:
'
Holidays
'
,
'
ordering
'
:
[
'
date_start
'
],
},
),
...
...
@@ -94,6 +99,7 @@ class Migration(migrations.Migration):
],
options
=
{
'
verbose_name
'
:
'
Supervision areas
'
,
'
verbose_name_plural
'
:
'
Supervision areas
'
,
'
ordering
'
:
[
'
name
'
],
},
),
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/models.py
+
5
−
1
View file @
d9e4b432
...
...
@@ -599,6 +599,7 @@ class AbsenceReason(ExtensibleModel):
class
Meta
:
verbose_name
=
_
(
"
Absence reason
"
)
verbose_name_plural
=
_
(
"
Absence reasons
"
)
class
Absence
(
ExtensibleModel
):
reason
=
models
.
ForeignKey
(
"
AbsenceReason
"
,
on_delete
=
models
.
CASCADE
,
related_name
=
"
absences
"
)
...
...
@@ -614,6 +615,7 @@ class Absence(ExtensibleModel):
ordering
=
[
"
date_start
"
]
indexes
=
[
models
.
Index
(
fields
=
[
"
date_start
"
,
"
date_end
"
])]
verbose_name
=
_
(
"
Absence
"
)
verbose_name_plural
=
_
(
"
Absences
"
)
class
Exam
(
ExtensibleModel
):
...
...
@@ -630,6 +632,7 @@ class Exam(ExtensibleModel):
ordering
=
[
"
date
"
]
indexes
=
[
models
.
Index
(
fields
=
[
"
date
"
])]
verbose_name
=
_
(
"
Exam
"
)
verbose_name_plural
=
_
(
"
Exams
"
)
class
Holiday
(
ExtensibleModel
):
...
...
@@ -642,6 +645,7 @@ class Holiday(ExtensibleModel):
ordering
=
[
"
date_start
"
]
indexes
=
[
models
.
Index
(
fields
=
[
"
date_start
"
,
"
date_end
"
])]
verbose_name
=
_
(
"
Holiday
"
)
verbose_name_plural
=
_
(
"
Holidays
"
)
class
SupervisionArea
(
ExtensibleModel
):
...
...
@@ -708,4 +712,4 @@ class Event(ExtensibleModel):
ordering
=
[
"
date_start
"
]
indexes
=
[
models
.
Index
(
fields
=
[
"
period_from
"
,
"
period_to
"
,
"
date_start
"
,
"
date_end
"
])]
verbose_name
=
_
(
"
Event
"
)
verbose_name
=
_
(
"
Events
"
)
verbose_name
_plural
=
_
(
"
Events
"
)
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