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
50fd338d
Commit
50fd338d
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '90-change-weekselect-js-to-js-template-strings' into 'master'
Resolve "Use JS template strings in weekselect.js" Closes
#90
See merge request
!72
parents
7006fdd6
2c7c489a
No related branches found
No related tags found
1 merge request
!72
Resolve "Use JS template strings in weekselect.js"
Pipeline
#3329
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/static/js/chronos/week_select.js
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/static/js/chronos/week_select.js
aleksis/apps/chronos/views.py
+6
-1
6 additions, 1 deletion
aleksis/apps/chronos/views.py
with
7 additions
and
2 deletions
aleksis/apps/chronos/static/js/chronos/week_select.js
+
1
−
1
View file @
50fd338d
var
data
=
getJSONScript
(
"
week_select
"
);
var
data
=
getJSONScript
(
"
week_select
"
);
function
goToCalendarWeek
(
cw
,
year
)
{
function
goToCalendarWeek
(
cw
,
year
)
{
window
.
location
.
href
=
data
.
dest
+
year
+
"
/
"
+
cw
;
window
.
location
.
href
=
data
.
dest
.
replace
(
"
year
"
,
year
).
replace
(
"
cw
"
,
cw
)
;
}
}
function
onCalendarWeekChanged
(
where
)
{
function
onCalendarWeekChanged
(
where
)
{
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/views.py
+
6
−
1
View file @
50fd338d
...
@@ -150,7 +150,12 @@ def timetable(
...
@@ -150,7 +150,12 @@ def timetable(
context
[
"
smart
"
]
=
is_smart
context
[
"
smart
"
]
=
is_smart
context
[
"
week_select
"
]
=
{
context
[
"
week_select
"
]
=
{
"
year
"
:
wanted_week
.
year
,
"
year
"
:
wanted_week
.
year
,
"
dest
"
:
reverse
(
"
timetable
"
,
args
=
[
type_
.
value
,
pk
]),
"
dest
"
:
reverse
(
"
timetable_by_week
"
,
args
=
[
type_
.
value
,
pk
,
wanted_week
.
year
,
wanted_week
.
week
],
)
.
replace
(
str
(
wanted_week
.
year
),
"
year
"
)
.
replace
(
str
(
wanted_week
.
week
),
"
cw
"
),
}
}
if
is_smart
:
if
is_smart
:
...
...
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