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
4d8c5de1
Verified
Commit
4d8c5de1
authored
3 years ago
by
Julian
Committed by
Jonathan Weth
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Toggle week_view filters
(cherry picked from commit
7aa0d336
)
parent
d054834d
No related branches found
Branches containing commit
No related tags found
1 merge request
!246
Prepare release 2.0rc7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/static/css/alsijil/week_view.css
+7
-0
7 additions, 0 deletions
aleksis/apps/alsijil/static/css/alsijil/week_view.css
aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+15
-2
15 additions, 2 deletions
...s/alsijil/templates/alsijil/class_register/week_view.html
with
22 additions
and
2 deletions
aleksis/apps/alsijil/static/css/alsijil/week_view.css
+
7
−
0
View file @
4d8c5de1
@media
screen
and
(
max-width
:
600px
)
{
#toggle-row
button
[
type
=
submit
]
{
width
:
100%
;
margin-bottom
:
1em
;
}
}
.horizontal-scroll-container
{
.horizontal-scroll-container
{
overflow-x
:
scroll
;
overflow-x
:
scroll
;
display
:
flex
;
display
:
flex
;
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+
15
−
2
View file @
4d8c5de1
...
@@ -45,15 +45,23 @@
...
@@ -45,15 +45,23 @@
{{ week_select|json_script:"week_select" }}
{{ week_select|json_script:"week_select" }}
<script
type=
"text/javascript"
src=
"{% static "
js
/
chronos
/
week_select.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static "
js
/
chronos
/
week_select.js
"
%}"
></script>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col s12
"
>
<div
id=
"toggle-row"
class=
"col s12 m8 l10 {% if lesson_periods %}pre-hidden{% endif %}
"
>
<form
method=
"post"
action=
""
>
<form
method=
"post"
action=
""
>
{% csrf_token %}
{% csrf_token %}
{% form form=select_form %}{% endform %}
{% form form=select_form %}{% endform %}
<button
type=
"submit"
class=
"btn waves-effect waves-light"
>
<button
type=
"submit"
class=
"btn waves-effect waves-light primary-color"
>
<i
class=
"material-icons left"
>
check
</i>
{% blocktrans %}Select{% endblocktrans %}
{% blocktrans %}Select{% endblocktrans %}
</button>
</button>
</form>
</form>
</div>
</div>
<div
class=
"col s12 m4 l2 right"
>
<button
type=
"button"
class=
"btn waves-effect waves-light hundred-percent"
id=
"toggle-button"
>
<i
class=
"material-icons left"
>
filter_alt
</i>
{% trans "Toggle filters" %}
</button>
</div>
</div>
</div>
...
@@ -439,7 +447,12 @@
...
@@ -439,7 +447,12 @@
$
(
"
#id_teacher
"
).
change
(
function
()
{
$
(
"
#id_teacher
"
).
change
(
function
()
{
$
(
"
#id_group
"
).
val
(
""
).
formSelect
();
$
(
"
#id_group
"
).
val
(
""
).
formSelect
();
});
});
$
(
"
#toggle-row.pre-hidden
"
).
hide
();
});
});
$
(
"
#toggle-button
"
).
click
(
function
()
{
$
(
"
#toggle-row
"
).
toggle
();
})
$
(
"
.unfold-trigger
"
).
click
(
function
(
event
)
{
$
(
"
.unfold-trigger
"
).
click
(
function
(
event
)
{
console
.
log
(
event
);
console
.
log
(
event
);
let
target
=
event
.
target
;
let
target
=
event
.
target
;
...
...
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