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
8cff5468
Commit
8cff5468
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Allow blank comments
parent
e89558a7
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
+4
-4
4 additions, 4 deletions
...pps/chronos/migrations/0007_advanced_models_from_untis.py
aleksis/apps/chronos/models.py
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/models.py
with
5 additions
and
5 deletions
aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+
4
−
4
View file @
8cff5468
...
...
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
(
'
extended_data
'
,
django
.
contrib
.
postgres
.
fields
.
jsonb
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
date_start
'
,
models
.
DateField
(
null
=
True
,
verbose_name
=
'
Effective start date of absence
'
)),
(
'
date_end
'
,
models
.
DateField
(
null
=
True
,
verbose_name
=
'
Effective end date of absence
'
)),
(
'
comment
'
,
models
.
TextField
(
verbose_name
=
'
Comment
'
)),
(
'
comment
'
,
models
.
TextField
(
verbose_name
=
'
Comment
'
)
,
null
=
True
,
blank
=
True
),
],
options
=
{
'
verbose_name
'
:
'
Absence
'
,
...
...
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
(
'
id
'
,
models
.
AutoField
(
auto_created
=
True
,
primary_key
=
True
,
serialize
=
False
,
verbose_name
=
'
ID
'
)),
(
'
extended_data
'
,
django
.
contrib
.
postgres
.
fields
.
jsonb
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
title
'
,
models
.
CharField
(
max_length
=
50
,
verbose_name
=
'
Title
'
)),
(
'
description
'
,
models
.
TextField
(
verbose_name
=
'
Description
'
)),
(
'
description
'
,
models
.
TextField
(
verbose_name
=
'
Description
'
)
,
null
=
True
,
blank
=
True
),
],
options
=
{
'
verbose_name
'
:
'
Absence reason
'
,
...
...
@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
(
'
extended_data
'
,
django
.
contrib
.
postgres
.
fields
.
jsonb
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
date
'
,
models
.
DateField
(
null
=
True
,
verbose_name
=
'
Date of exam
'
)),
(
'
title
'
,
models
.
CharField
(
max_length
=
50
,
verbose_name
=
'
Title
'
)),
(
'
comment
'
,
models
.
TextField
(
verbose_name
=
'
Comment
'
)),
(
'
comment
'
,
models
.
TextField
(
verbose_name
=
'
Comment
'
)
,
null
=
True
,
blank
=
True
),
],
options
=
{
'
verbose_name
'
:
'
Exam
'
,
...
...
@@ -77,7 +77,7 @@ class Migration(migrations.Migration):
(
'
title
'
,
models
.
CharField
(
max_length
=
50
,
verbose_name
=
'
Title of the holidays
'
)),
(
'
date_start
'
,
models
.
DateField
(
null
=
True
,
verbose_name
=
'
Effective start date of holidays
'
)),
(
'
date_end
'
,
models
.
DateField
(
null
=
True
,
verbose_name
=
'
Effective end date of holidays
'
)),
(
'
comments
'
,
models
.
TextField
(
verbose_name
=
'
Comments
'
)),
(
'
comments
'
,
models
.
TextField
(
verbose_name
=
'
Comments
'
)
,
null
=
True
,
blank
=
True
),
],
options
=
{
'
verbose_name
'
:
'
Holiday
'
,
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/models.py
+
1
−
1
View file @
8cff5468
...
...
@@ -591,7 +591,7 @@ class TimetableWidget(DashboardWidget):
class
AbsenceReason
(
ExtensibleModel
):
title
=
models
.
CharField
(
verbose_name
=
_
(
"
Title
"
),
max_length
=
50
)
description
=
models
.
TextField
(
verbose_name
=
_
(
"
Description
"
))
description
=
models
.
TextField
(
verbose_name
=
_
(
"
Description
"
)
,
blank
=
True
,
null
=
True
)
class
Meta
:
verbose_name
=
_
(
"
Absence reason
"
)
...
...
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