Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
bd0ad3fd
authored
Jan 06, 2018
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on issue
#416
parent
9de1bb2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
sails/src/assets/scripts/modules/student/controllers/session.js
sails/src/assets/scripts/modules/student/views/session.html
sails/src/assets/scripts/modules/student/controllers/session.js
View file @
bd0ad3fd
...
...
@@ -30,7 +30,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
paused
:
false
,
showSessions
:
false
,
showLastTry
:
true
,
showTries
:
false
,
showTries
:
[]
,
tryRunning
:
false
,
section
:
'new'
};
...
...
@@ -65,6 +65,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
// Add to list
$scope
.
wsessions
=
data
;
$scope
.
ws_recover
=
$scope
.
wsessions
[
0
]
!=
null
&&
$scope
.
wsessions
[
0
].
end
==
null
;
$scope
.
flags
.
showTries
=
Array
(
$scope
.
wsessions
.
length
).
fill
(
false
);
})
.
error
(
function
(
data
,
status
,
headers
,
config
)
{
});
...
...
sails/src/assets/scripts/modules/student/views/session.html
View file @
bd0ad3fd
...
...
@@ -194,7 +194,7 @@
<!-- sessions list -->
<div
class=
"list-group pre-scrollable"
ng-show=
"flags.showSessions && flags.section == 'previous' || flags.showLastTry && wsessions.length > 0 || ws_recover || flags.tryRunning"
>
<div
ng-repeat=
"s in wsessions | orderBy: '-begin'"
>
<div
ng-repeat=
"s in wsessions
track by $index
| orderBy: '-begin'"
>
<!-- div class="list-group-item" ng-repeat="s in wsessions | orderBy: '-begin' | limitTo: numPerPage:(currentPage-1)*numPerPage" -->
<div
class=
"list-group-item"
ng-show=
"flags.section == 'previous' || ws.id==s.id || ws_recover"
>
...
...
@@ -212,8 +212,8 @@
<!-- show/hide tries button -->
<div
class=
"form-group pull-right"
ng-show=
"ws.id != s.id && !ws_recover"
>
<span
class=
"control-label"
>
{{ s.tries.length }} {{ 'tries' | translate }}
</span>
<button
ng-click=
"flags.showTries
= !flags.showTries
"
class=
"btn btn-default btn-sm"
>
<div
ng-show=
"!flags.showTries"
>
<button
ng-click=
"flags.showTries
[$index] = !flags.showTries[$index]
"
class=
"btn btn-default btn-sm"
>
<div
ng-show=
"!flags.showTries
[$index]
"
>
{{ 'show' | translate }}
<span
class=
"glyphicon glyphicon-collapse-down"
aria-hidden=
"true"
></span>
</div>
<div
ng-show=
"flags.showTries"
>
...
...
@@ -229,7 +229,7 @@
<button
ng-show=
"ws_recover"
class=
"btn btn-warning btn-sm pull-right"
type=
"button"
ng-click=
"close_ws()"
translate
>
close_session
</button>
<!-- tries list -->
<div
class=
"sessionTries"
ng-show=
"flags.showTries || ws.id == s.id || ws_recover"
>
<div
class=
"sessionTries"
ng-show=
"flags.showTries
[$index]
|| ws.id == s.id || ws_recover"
>
<div
class=
"try"
ng-repeat=
"t in s.tries"
>
<div
ng-show=
"!is_currentOpenTry(t)"
>
<table
width=
"100%"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment