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
a81c3dce
Verified
Commit
a81c3dce
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix imports of TimetableType
parent
de2befd3
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/apps/chronos/model_extensions.py
+2
-1
2 additions, 1 deletion
aleksis/apps/chronos/model_extensions.py
aleksis/apps/chronos/util/build.py
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/util/build.py
aleksis/apps/chronos/views.py
+2
-1
2 additions, 1 deletion
aleksis/apps/chronos/views.py
with
5 additions
and
3 deletions
aleksis/apps/chronos/model_extensions.py
+
2
−
1
View file @
a81c3dce
...
...
@@ -5,7 +5,8 @@ from jsonstore import BooleanField
from
aleksis.core.models
import
Person
,
Group
,
Announcement
from
.models
import
Lesson
,
LessonPeriod
,
TimetableType
from
.managers
import
TimetableType
from
.models
import
Lesson
,
LessonPeriod
@Person.property
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/util/build.py
+
1
−
1
View file @
a81c3dce
...
...
@@ -6,7 +6,7 @@ from calendarweek import CalendarWeek
from
django.apps
import
apps
from
django.db.models
import
QuerySet
from
aleksis.apps.chronos.m
odel
s
import
TimetableType
from
aleksis.apps.chronos.m
anager
s
import
TimetableType
from
aleksis.core.models
import
Person
LessonPeriod
=
apps
.
get_model
(
"
chronos
"
,
"
LessonPeriod
"
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/views.py
+
2
−
1
View file @
a81c3dce
...
...
@@ -15,7 +15,8 @@ from rules.contrib.views import permission_required
from
aleksis.core.models
import
Person
,
Group
,
Announcement
from
aleksis.core.util
import
messages
from
.forms
import
LessonSubstitutionForm
from
.models
import
LessonPeriod
,
LessonSubstitution
,
TimePeriod
,
Room
,
Holiday
,
Absence
,
TimetableType
from
.managers
import
TimetableType
from
.models
import
LessonPeriod
,
LessonSubstitution
,
TimePeriod
,
Room
,
Holiday
,
Absence
from
.tables
import
LessonsTable
from
.util.build
import
build_timetable
,
build_substitutions_list
,
build_weekdays
from
.util.js
import
date_unix
...
...
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