Skip to content

yotta / pictogram

Go to a project
Commit 0481ccc2 by Fernando Martínez Santiago
Options

Dashboard interface improvmeement (supervisor header, student header and working sessions

parent 0ee98866
Inline Side-by-side
Showing with 58 additions and 57 deletions
sails/conf/pictodb-data.sql
......@@ -118,7 +118,7 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(156, 5393, NULL, 4, 0, '#F4FA58'), -- Furniture
(157, 11368,NULL, 4, 1, '#F4FA58'), -- Kitchen items
(159, 2547,NULL, 4, 9, '#2E9AFE'), -- Articles and determinants
(190, 4687,NULL, 4, 7, '#F4FA58'), -- Body parts
(190, 4721,NULL, 4, 7, '#F4FA58'), -- Body parts
(191, 50956,NULL, 4, 8, '#F4FA58'), -- Stuff
(192, 51336,NULL, 1, 7, '#008000'), -- Animals_and_plants
(25, 676, 376, 2, 2, NULL), -- Desiring.want
......@@ -301,7 +301,9 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(220, 1206,51336, 1, 8, NULL), -- Animals_and_plants.cat
(221, 853,51336, 1, 9, NULL), -- Animals_and_plants.bird
(222, 57236,51336, 1, 5, NULL), -- Animals_and_plants.tree
(223, 57384,51336, 1, 6, NULL); -- Animals_and_plants.plant
(223, 57384,51336, 1, 6, NULL), -- Animals_and_plants.plant
(224, 50956,50956, 4, 8, '#F4FA58'); -- Stuff.stuff
......@@ -868,9 +870,9 @@ UPDATE picto_exp SET text='encender' WHERE id_pic=325 and lang='es-es';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-us';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-gb';
UPDATE picto_exp SET text='apagar' WHERE id_pic=328 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4687 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4687 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4687 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4721 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4721 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4721 and lang='es-es';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-us';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-gb';
UPDATE picto_exp SET text='Cosas' WHERE id_pic=50956 and lang='es-es';
......
sails/n2ymetadata.xml deleted 100644 → 0
This diff could not be displayed because it is too large.
sails/src/assets/app/modules/student/controllers/session.js
......@@ -56,7 +56,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
$scope.numPerPage = 5;
$scope.totalPages = Math.ceil($scope.wsessions.length / $scope.numPerPage);
$scope.ws_recover = $scope.wsessions[0]!=null && $scope.wsessions[0].end==null;
console.log("tries: " + $scope.wsessions.length);
console.log("sessions: " + $scope.wsessions.length);
console.log("numPerPage: " + $scope.numPerPage);
console.log("pages: " + $scope.totalPages);
......@@ -267,7 +267,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
$scope.stop_ws = function (){
// For view
$scope.sessionRunning = false;
$scope.wsessions[$scope.wsessions.length-1].tries.pop();
$scope.ws.end = new Date();
$http
......
sails/src/assets/app/modules/student/views/header.html
......@@ -13,15 +13,14 @@
</div>
<!-- Agrupar los enlaces de navegación, los formularios y cualquier otro elemento que se pueda ocultar al minimizar la barra -->
<div class="collapse navbar-collapse navbar-ex16-collapse">
<div class="row">
<div class="nav navbar-nav navbar-left thumbnail img_profile">
<div class="col-md-3 thumbnail img_profile">
<img ng-src="{{studentData.pic}}" alt="" title="" />
</div>
<div class="nav navbar-nav navbar-left navbar-text">
<div class="col-md-6 ">
<h4>{{studentData.name}} {{studentData.surname}}</h4>
<p>{{studentData.current_method | translate}} | {{studentData.current_instruction | translate}}</p>
<p>{{studentData.current_method | translate}}</p><p>{{studentData.current_instruction | translate}}</p>
</div>
<div class="nav navbar-nav navbar-right tabs_student">
......
sails/src/assets/app/modules/student/views/session.html
......@@ -10,7 +10,7 @@
</li>
</ul>
</div>
-->
<!-- Fin de listado de dispositivos -->
<!-- Select con Instrucciones -->
<div class="col-md-6">
......@@ -24,40 +24,36 @@
<option value="">-- Select an instruction --</option>
</select>
</form>
<!-- wsessions navigation info -->
<div ng-hide="!selectedIns">
<h4>{{ 'sessions' | translate}}: {{wsessions.length}}</h4>
<p>{{ 'pages' | translate}}: {{ totalPages }}</p>
</div>
</div>
<!-- Fin de select con Instrucciones -->
<!-- Temporizador Sesión de trabajo -->
<div class="col-md-6">
<p class="session_controls text-right">
<a ng-click="startTimer(); new_ws()" ng-disabled="!selectedIns" ng-hide="sessionRunning" class="btn btn-success btn-sm" role="button" id="session_new">Nueva sesión</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="Pausar sesión"></span>
</a>
<a class="text_large" ng-click="resume_ws(); resumeTimer();" ng-hide="!sessionRunning || !paused" id="session_continue" popover="{{ 'continue_session' | translate}}" popover-trigger="mouseenter">
<span class="glyphicon glyphicon-play" aria-hidden="true" title="Reanudar sesión"></span>
</a>
</div> <!--row -->
<!-- wsessions navigation info -->
<div class="row" ng-hide="!selectedIns">
<!-- Fin de select con Instrucciones -->
<!-- Temporizador Sesión de trabajo -->
<p/><p class="session_controls">
<div class="col-md-4">
<a ng-click="startTimer(); new_ws()" ng-disabled="!selectedIns" ng-hide="sessionRunning" class="btn btn-success btn-sm" role="button" id="session_new">Nueva sesión</a>
<a class="text_large" ng-click="stopTimer(); stop_ws()" ng-hide="!sessionRunning" id="session_stop" popover="{{ 'finish_session' | translate}}" popover-trigger="mouseenter">
<span class="glyphicon glyphicon-stop color_black" aria-hidden="true" title="Terminar sesión"></span>
</a>
</p>
</div>
<!-- Fin temporizador sesión de trabajo -->
</div>
<!-- Fin de row -->
<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="Pausar sesión"></span>
</a>
<!-- Title for list of sessions -->
<a class="text_large" ng-click="resume_ws(); resumeTimer();" ng-hide="!sessionRunning || !paused" id="session_continue" popover="{{ 'continue_session' | translate}}" popover-trigger="mouseenter">
<span class="glyphicon glyphicon-play" aria-hidden="true" title="Reanudar sesión"></span>
</a>
<a class="text_large" ng-click="stopTimer(); stop_ws()" ng-hide="!sessionRunning" id="session_stop" popover="{{ 'finish_session' | translate}}" popover-trigger="mouseenter">
<span class="glyphicon glyphicon-stop color_black" aria-hidden="true" title="Terminar sesión"></span>
</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></span>
</div>
</div>
<!-- Title for list of sessions FERNANDO: No necesario, ya aparece en la lista
<div class="page-header" ng-show="selectedIns"><h2 id="try_title">{{ 'sessions_of' | translate}} {{ selectedIns.name }}</h2></div>
-->
<!-- Tries panel with actual try and wsessions list -->
......
sails/src/assets/app/modules/supervisor/views/header.html
......@@ -10,29 +10,33 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/app/#/students"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="height: 70px;" /></a>
<h4 class="navbar-brand navbar-left text-left">{{user.office.name}}</h4>
</div>
<!-- Agrupar los enlaces de navegación, los formularios y cualquier otro elemento que se pueda ocultar al minimizar la barra -->
<div class="collapse navbar-collapse navbar-ex6-collapse">
<div class="nav navbar-nav navbar-right thumbnail img_profile">
<div class="nav navbar-nav navbar-right thumbnail img_profile" context-menu data-target="menu-sup">
<img id="supervisor_profile" ng-src="{{user.pic}}" alt="Supervisor" title="Supervisor" />
</div>
<div class="dropdown position-fixed" id="menu-sup" style="z-index:10">
<ul class="dropdown-menu" role="menu">
<li>
<a class="pointer" role="menuitem" tabindex="0" href="/app/#/setup">
<span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}
</a>
</li>
<li>
<a class="pointer" role="menuitem" tabindex="0" ng-click="logout()">
<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> {{ 'logout' | translate }}
</a>
</li>
</ul>
</div>
<div class="nav navbar-nav navbar-right navbar-text">
<h5 class="text-right">{{user.getFullName()}}</h5>
<p class="text-right">
<!-- Botón configuración -->
<a href="/app/#/setup" class="btn btn-default btn-sm" role="button">
<span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}
</a>
<!-- Botón salir -->
<a ng-click="logout()" class="btn btn-default btn-sm" role="button">
<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> {{ 'logout' | translate }}
</a>
</p>
<h4 class="text-right">{{user.getFullName()}}</h4>
<h5 class="text-right">{{user.office.name}}</h5>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment