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
6c8dadf0
authored
Jan 23, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on sessions UI
parent
6a9cfc82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 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 @
6c8dadf0
...
...
@@ -36,6 +36,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
//
$scope
.
methods
=
[];
// Visibility of the list of stored sessions
$scope
.
showSessions
=
false
;
// Query to obtain an array of student methods
$http
.
get
(
config
.
backend
+
'/stu/'
+
$scope
.
studentData
.
id
+
'/methods'
)
...
...
sails/src/assets/scripts/modules/student/views/session.html
View file @
6c8dadf0
...
...
@@ -20,7 +20,7 @@
<div
class=
"row"
ng-hide=
"!selectedIns"
>
<p
class=
"session_controls"
>
<div
class=
"col-md-4"
>
<a
ng-click=
"startTimer(); new_ws()"
ng-disabled=
"!selectedIns "
ng-hide=
"sessionRunning || studentData.num_peers<2"
class=
"btn btn-success btn-sm"
role=
"button"
id=
"session_new"
translate
>
new_session
</a>
<a
ng-click=
"startTimer(); new_ws()"
ng-disabled=
"!selectedIns "
ng-hide=
"sessionRunning || studentData.num_peers<2"
class=
"btn btn-success btn-sm"
role=
"button"
id=
"session_new"
translate
>
new_session
</a>
<a
class=
"text_large"
ng-click=
"pause_ws(); pauseTimer();"
ng-hide=
"!sessionRunning || paused"
id=
"session_pause"
popover=
"{{ 'pause_session' | translate}}"
popover-trigger=
"mouseenter"
>
<span
class=
"glyphicon glyphicon-pause"
aria-hidden=
"true"
title=
"{{ 'pause_session' | translate }}"
></span>
</a>
...
...
@@ -32,7 +32,7 @@
</a>
</div>
<div
class=
"col-md-2"
style=
"text-align: right"
>
<
span
class=
"label label-success"
style=
"font-size: 10pt"
>
{{ 'sessions' | translate}}
<span
class=
"badge"
style=
"font-size: 10pt"
>
{{wsessions.length}}
</span></spa
n>
<
button
ng-click=
"showSessions = !showSessions"
class=
"btn btn-success btn-sm"
style=
"font-size: 10pt"
>
{{ 'sessions' | translate}}
<span
class=
"badge"
style=
"font-size: 10pt"
>
{{wsessions.length}}
</span>
<span
class=
"glyphicon glyphicon-menu-down"
ng-show=
"!showSessions"
></span></butto
n>
</div>
</p>
</div>
...
...
@@ -127,7 +127,7 @@
<button
class=
"btn btn-warning btn-sm"
type=
"button"
ng-click=
"close_ws()"
translate
>
close_session
</button>
</div>
<div
class=
"list-group"
>
<div
class=
"list-group"
ng-show=
"showSessions"
>
<div
class=
"list-group-item"
ng-repeat=
"s in wsessions | orderBy: '-begin' | limitTo: numPerPage:(currentPage-1)*numPerPage"
>
<div
ng-show=
"showLastTry && wsessions.length > 0"
>
<h4><strong>
{{ 'last_session' | translate}}
</strong>
: {{ studentData.current_method }}, {{ studentData.current_instruction }}
</h4>
...
...
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