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
b32599e8
Commit
b32599e8
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Use CalendarWeek from calendarweek.
parent
dfba5000
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!38
Resolve "ImportError: cannot import name 'CalendarWeek' from 'aleksis.apps.chronos.util' (unknown location)"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/model_extensions.py
+1
-1
1 addition, 1 deletion
aleksis/apps/alsijil/model_extensions.py
aleksis/apps/alsijil/views.py
+1
-1
1 addition, 1 deletion
aleksis/apps/alsijil/views.py
with
2 additions
and
2 deletions
aleksis/apps/alsijil/model_extensions.py
+
1
−
1
View file @
b32599e8
from
datetime
import
date
from
calendarweek
import
CalendarWeek
from
django.db.models
import
Exists
,
F
,
OuterRef
from
aleksis.apps.chronos.models
import
LessonPeriod
from
aleksis.apps.chronos.util
import
CalendarWeek
from
aleksis.core.models
import
Group
,
Person
from
.models
import
PersonalNote
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/views.py
+
1
−
1
View file @
b32599e8
from
calendarweek
import
CalendarWeek
from
datetime
import
date
,
datetime
,
timedelta
from
typing
import
Optional
...
...
@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _
from
django_tables2
import
RequestConfig
from
aleksis.apps.chronos.models
import
LessonPeriod
from
aleksis.apps.chronos.util
import
CalendarWeek
from
aleksis.core.decorators
import
admin_required
from
aleksis.core.models
import
Group
,
Person
,
School
from
aleksis.core.util
import
messages
...
...
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