Skip to content

yotta / pictogram

Go to a project
Commit 0c3bc699 by Pablo Molina
Options

Merge branch 'issue/236' into 'develop' 

Solved #236
parents fa7af2e6 71361cbe
Inline Side-by-side
Showing with 624 additions and 824 deletions
sails/src/assets/app/i18n/en-gb.json
......@@ -84,6 +84,10 @@
"english": "English",
"enlarge": "Enlarge",
"enormous": "Enormous",
"error_downloading_supervisors": "Error downloading supervisors",
"error_downloading_offices": "Error downloading offices",
"error_only_support_images": "Only images are supported (JPG, PNG or GIF files)",
"error_loading_pictos": "Error loading pictos information",
"expand_navigation": "Expand navigation",
"expand_navigation": "Expand navigation",
"expression": "Expression:",
......@@ -229,9 +233,9 @@
"student_pictograms": "Student's pictograms",
"student_updated": "Student updated",
"students": "Students",
"sup_not_added": "Supervisor not added to the student.",
"sup_not_added": "Supervisor not added to the student",
"sup_not_deleted": "The supervisor couldn't be deleted by the student",
"sup_not_found": "There is no supervisor account in Pictogram with this email.",
"sup_not_found": "There is no supervisor account in Pictogram with this email",
"supervisor_added": "Supervisor added",
"supervisor_deleted": "Supervisor deleted",
"supervisor_not_added": "Supervisor not added",
......@@ -258,8 +262,10 @@
"tries_per_instruction_method": "Tries per instruction of method",
"tries_per_months": "Tries per months in",
"tries_results_instruction": "Tries results in instruction",
"tutor_added": "Tutor added to the student",
"tutor_deleted": "Tutor removed from the student",
"tutor_not_added": "Tutor not added to the student.",
"tutor_not_deleted": "The tutor couldn't be deleted by the student",
"tutor_not_deleted": "Tutor couldn't be removed from the student",
"tutor_not_found": "There is no tutor account in Pictogram with this email.",
"tutors": "Parents or tutors",
"unlink": "Unlink",
......
sails/src/assets/app/i18n/es-es.json
......@@ -87,6 +87,10 @@
"expand_navigation": "Desplegar navegación",
"expand_navigation": "Desplegar navegación",
"expression": "Expresión:",
"error_downloading_supervisors": "Error al descargar los supervisores",
"error_downloading_offices": "Error al descargar las oficinas",
"error_only_support_images": "Sólo se soportan imágenes (ficheros JPG, PNG o GIF)",
"error_loading_pictos": "Error cargando información de los pictos",
"February": "Febrero",
"feedback_picto": "Feedback al colocar un pictograma",
"filter": "Filtrar",
......@@ -258,9 +262,11 @@
"tries_per_instruction_method": "Ensayos por instrucción del método",
"tries_per_months": "Número de ensayos por meses en",
"tries_results_instruction": "Resultados ensayos en instrucción",
"tutor_not_added": "El tutor no se ha podido añadir al estudiante.",
"tutor_not_deleted": "El tutor no se ha podido desvincular del alumno.",
"tutor_not_found": "No hay ningún tutor en Pictoram con ese correo electrónico.",
"tutor_added": "Tutor añadido al estudiante",
"tutor_deleted": "Tutor desvinculado del estudiante",
"tutor_not_added": "El tutor no se ha podido añadir al estudiante",
"tutor_not_deleted": "El tutor no se ha podido desvincular del alumno",
"tutor_not_found": "No hay ningún tutor en Pictoram con ese correo electrónico",
"tutors": "Padres o tutores",
"undefined": "Sin definir",
"unlink": "Desvincular",
......
sails/src/assets/app/index.html
......@@ -81,6 +81,7 @@
<body ng-controller="MainCtrl">
<!-- <div ng-view></div> -->
<toast></toast>
<div ui-view></div>
<!-- Librería jQuery requerida por los plugins de JavaScript
......
sails/src/assets/app/modules/admin/controllers/supervisors.js
......@@ -3,7 +3,7 @@
//--------------------------
// Admin Supervisors Controller
//--------------------------
dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisorsCtrl($scope, $window, $http, config) {
dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisorsCtrl($scope, $window, $http, config, $translate, ngToast) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
// Don't show the message at the begining
......@@ -25,26 +25,24 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$http
.get(config.backend+'/sup')
.success(function(data, status, headers, config) {
// Add to list
$scope.supervisors = data;
console.log("Supervisors listed");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
$translate('error_downloading_supervisors').then(function (translation) {
ngToast.danger({ content: translation });
});
});
// List of offices (for the select form)
$http
.get(config.backend+'/office/get_all')
.success(function(data, status, headers, config) {
// Add to list
$scope.offices = data;
console.log("Offices listed");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
$translate('error_downloading_offices').then(function (translation) {
ngToast.danger({ content: translation });
});
});
// Reset form Supervisor
......@@ -108,9 +106,9 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$http
.put(config.backend+'/supervisor/'+supid, supervisor)
.success(function(data, status, headers, config) {
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-success";
$scope.messagesupervisor = "supervisor_updated";
$translate('supervisor_updated').then(function (translation) {
ngToast.success({ content: translation });
});
// Update the view: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.supervisors.length; i++) {
......@@ -130,15 +128,11 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
// Delete the fields of the form to avoid data binding
// between the new element created and the form fields
$scope.resetForm();
console.log("Supervisor updated");
})
.error(function(data, status, headers, config) {
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-danger";
$scope.messagesupervisor = "supervisor_not_updated";
console.log("Error from API: " + data.error);
$translate('supervisor_not_updated').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
......@@ -153,9 +147,9 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$http
.post(config.backend+'/sup', supervisor)
.success(function(data, status, headers, config) {
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-success";
$scope.messagesupervisor = "supervisor_added";
$translate('supervisor_added').then(function (translation) {
ngToast.success({ content: translation });
});
// Add to the list of supervisors in view
$scope.supervisors.push(data.user);
......@@ -164,15 +158,11 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$scope.resetForm();
// Show the add form to new adding
$scope.hidesupervisoradd = false;
console.log("Supervisor added");
})
.error(function(data, status, headers, config) {
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-danger";
$scope.messagesupervisor = "supervisor_not_added";
console.log("Error from API: " + data.error);
$translate('supervisor_not_added').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
......@@ -189,23 +179,19 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
if(supervisor.id == $scope.supervisors[i].id)
$scope.supervisors.splice(i,1);
}
console.log("Supervisor deleted:" + supervisor.name);
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-success";
$scope.messagesupervisor = "supervisor_deleted";
$translate('supervisor_deleted').then(function (translation) {
ngToast.success({ content: translation });
});
// Empty the form
$scope.resetForm();
})
.error(function(data, status, headers, config) {
console.log("Error deleting supervisor from API: " + data.error);
console.log("It could be students associated");
$scope.showmessagesupervisor = true;
$scope.alertsupervisor = "alert-danger";
$scope.messagesupervisor = "supervisor_not_deleted";
$translate('supervisor_not_deleted').then(function (translation) {
ngToast.danger({ content: translation });
});
});
}
};
});
sails/src/assets/app/modules/admin/views/supervisors.html
<!-- Admin Supervisors -->
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessagesupervisor' }}" class="alert" ng-class="alertsupervisor">{{ messagesupervisor | translate }}</div>
<div class="row">
<div ng-class="{'col-md-12':hidesupervisoradd === true && hidesupervisorupdate === true, 'col-md-8':hidesupervisoradd === false || hidesupervisorupdate === false}">
......
sails/src/assets/app/modules/login/controllers/login.js
/* global dashboardControllers */
'use strict';
//------------------
// Login Controller
//------------------
dashboardControllers.controller('LoginCtrl', function LoginCtrl($scope, $http, $window, $translate, $filter, $location, config, $stateParams) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
dashboardControllers.controller('LoginCtrl',
function LoginCtrl(
$scope,
$http,
$window,
$translate,
$filter,
$location,
config,
$stateParams,
ngToast) {
$scope.credentials = {
email: '',
password: '',
lang: 'es-es'
};
// Pop-up blocker check
// var popup = window.open('http://yottacode.com','','',true);
// setTimeout( function() {
// if(!popup || popup.outerHeight === 0) {
// alert("cáspita");
// } else {
// popup && popup.close();
// }
// }, 100);
// Array of key terms to translate
$translate(['login_success', 'login_fail']).then(function (translations) {
//notification_email = translations.email_match;
$scope.message_success = translations.login_success;
$scope.message_fail = translations.login_fail;
});
// Don't show the message at the begining
$scope.showmessage = false;
// Validation of account
// if the code has been sent in the url "...app/login/code/email"
if($stateParams.code && $stateParams.email){
console.log("Code: " + $stateParams.code + "\nEmail: " + $stateParams.email);
if ($stateParams.code && $stateParams.email) {
$http
.post(config.backend+'/sup/activate', $stateParams)
.success(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.alert = "alert-success";
$scope.message = "account_activate";
console.log("Supervisor: " + data.user.name);
//console.log("Account validated: " + data.user.email + " --> " + data.user.active);
.post(config.backend + '/sup/activate', $stateParams)
.success(function () {
$translate('account_activate').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "account_no_activate";
console.log("Account NOT validated! Error: " + data.error);
.error(function () {
$translate('account_no_activate').then(function (translation) {
ngToast.danger({ content: translation });
});
});
}
$scope.login = function () {
$http
.post(config.backend+'/sup/login', $scope.credentials)
.success(function(data, status, headers, config) {
// Save token and user data y sessionStorage
.post(config.backend + '/sup/login', $scope.credentials)
.success(function (data) {
$window.sessionStorage.token = data.token;
// Adapt language en-us to en-gb (the latter is the one supported for 'en')
if (data.user) {
if (data.user.lang === 'en-us')
if (data.user.lang === 'en-us') {
data.user.lang = 'en-gb';
$scope.lang = data.user.lang;
}
else
console.log("ERROR: no data.user!");
$scope.lang = data.user.lang;
} else {
$translate.use($scope.lang);
}
// Change
$window.sessionStorage.user = JSON.stringify(data.user);
// Quitar 4 líneas siguientes. Al hacer redirección no hace falta
$scope.showmessage = true;
$scope.alert = "alert-success";
$scope.message = "login_success";
$translate('login_success').then(function (translation) {
ngToast.success({ content: translation });
});
// Name in login success message
$scope.name = data.user.name;
console.log("logged in!");
// Redirección
$location.path('/students');
})
.error(function(data, status, headers, config) {
// Delete token if user fails to login
.error(function () {
delete $window.sessionStorage.token;
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "login_fail";
$translate('login_fail').then(function (translation) {
ngToast.danger({ content: translation });
});
}
});
};
});
sails/src/assets/app/modules/login/controllers/login_admin.js
......@@ -3,7 +3,7 @@
//------------------
// Login Controller
//------------------
dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope, $http, $window, $translate, $location, config) {
dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope, $http, $window, $translate, $location, config, ngToast) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
$scope.credentials = {
......@@ -11,16 +11,6 @@ dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope
password: ''
};
// Array of key terms to translate
$translate(['login_success', 'login_fail']).then(function (translations) {
//notification_email = translations.email_match;
$scope.message_success = translations.login_success;
$scope.message_fail = translations.login_fail;
});
// Don't show the message at the begining
$scope.showmessage = false;
$scope.login = function () {
$http
.post(config.backend+'/admin/login', $scope.credentials)
......@@ -29,15 +19,18 @@ dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope
$window.sessionStorage.token = data.token;
// Redirect to admin panel
$location.path('/devices');
$translate('login_success').then(function(translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
// Delete token if user fails to login
delete $window.sessionStorage.token;
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "login_fail";
$translate('login_fail').then(function(translation) {
ngToast.danger({ content: translation });
});
});
};
});
sails/src/assets/app/modules/login/controllers/login_setting_password.js
......@@ -3,33 +3,26 @@
//-----------------------------------
// Login Setting Password Controller
//-----------------------------------
dashboardControllers.controller('LoginSettingPasswordCtrl', function LoginSettingPasswordCtrl($scope, $http, $window, $translate, $location, config, $stateParams) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
// Array of key terms to translate
$translate(['validate_success', 'validate_fail']).then(function (translations) {
//notification_email = translations.email_match;
$scope.message_success = translations.validate_success;
$scope.message_fail = translations.validate_fail;
});
// Don't show the message at the begining
$scope.showmessage = false;
$scope.showlink = false;
dashboardControllers.controller('LoginSettingPasswordCtrl', function LoginSettingPasswordCtrl($scope, $http, $window, $translate, $location, config, $stateParams, ngToast) {
$scope.login_setting_password = function () {
// Validation of account
// if the code has been sent in the url "...app/login/code/email"
if($stateParams.code && $stateParams.email){
console.log("Code: " + $stateParams.code + "\nEmail: " + $stateParams.email);
if ($stateParams.code && $stateParams.email) {
// Validate password match
if($scope.password != $scope.password_confirm){
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "password_match";
if ($scope.password != $scope.password_confirm) {
$translate([
'validate_fail',
'password_match'
], function (translations) {
ngToast.danger({
content: [
translations.validate_fail,
translations.password_match
].join(': ')
});
});
return;
}
......@@ -42,23 +35,15 @@ dashboardControllers.controller('LoginSettingPasswordCtrl', function LoginSettin
$http
.post(config.backend+'/sup/activate', data)
.success(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.showlink = true;
$scope.hideform = true;
$scope.alert = "alert-success";
$scope.message = "validate_success";
console.log("Supervisor: " + data.user.name);
//console.log("Account validated: " + data.user.email + " --> " + data.user.active);
$translate('validate_success').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "validate_fail";
console.log("Account NOT validated! Error: " + data.error);
$translate('validate_fail').then(function (translation) {
ngToast.danger({ content: translation });
});
});
}
};
});
sails/src/assets/app/modules/login/controllers/signin.js
/* global dashboardControllers */
'use strict';
//-------------------
// SignIn Controller
//-------------------
dashboardControllers.controller('SignInCtrl', function SignInCtrl($scope, $http, $window, reCAPTCHA, $translate, config) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
// The previous parameter, $translate, is a dependency injection to translate text in JavaScript controller code
// Data
dashboardControllers.controller('SignInCtrl',
function SignInCtrl($scope,
$http,
$window,
reCAPTCHA,
$translate,
config,
ngToast) {
$scope.formdata = {
name: '',
surname: '',
......@@ -23,69 +27,43 @@ dashboardControllers.controller('SignInCtrl', function SignInCtrl($scope, $http,
reCAPTCHA.setPublicKey('6LdLjh0TAAAAANblo_KUGNnmRZuIetOkdjdhj1b6');
/* NOT NECESSARY
// Array of key terms to translate
$translate(['password_match', 'email_match']).then(function (translations) {
//notification_email = translations.email_match;
$scope.email_message = translations.email_match;
$scope.password_message = translations.password_match;
});
*/
// Verificar. Si no es necesario eliminar
//reCAPTCHA.setPublicKey('gazpacho andaluz');
// Don't show the message at the begining
$scope.showmessage = false;
// Form submit
$scope.signin = function () {
//$scope.showmessage = false;
// Validate email match
if($scope.formdata.email != $scope.formdata.email_confirm){
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "email_match";
if ($scope.formdata.email !== $scope.formdata.email_confirm) {
$translate('email_match').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
// Validate password match
if($scope.formdata.password != $scope.formdata.password_confirm){
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "password_match";
if ($scope.formdata.password !== $scope.formdata.password_confirm) {
$translate('password_match').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
$scope.captcha = "";
$scope.captcha = '';
if($scope.signInForm.$valid) {
if ($scope.signInForm.$valid) {
$scope.showdialog = true;
console.log('Form is valid');
}else{
} else {
return;
}
$http
.post(config.backend+'/sup', $scope.formdata)
.success(function(data, status, headers, config) {
// ToDo: When this run well, redirect to main page
$scope.showmessage = true;
$scope.alert = "alert-success";
$scope.message = "user_created";
console.log("User created");
.post(config.backend + '/sup', $scope.formdata)
.success(function () {
$translate('user_created').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "user_exists";
console.log("Error from API: " + status);
.error(function () {
$translate('user_exists').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
});
sails/src/assets/app/modules/login/views/login.html
......@@ -13,14 +13,11 @@
<!-- LoginCtrl controls here, see app.js -->
<form name="loginForm" ng-submit="login()" novalidate>
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessage' }}" class="alert" ng-class="alert" translate translate-value-name="{{name}}">{{message}}</div>
<div class="form-group">
<input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" ng-focus="showmessage = false" />
<input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" />
</div>
<div class="form-group">
<input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" ng-focus="showmessage = false" />
<input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" />
</div>
<div class="checkbox">
<label>
......
sails/src/assets/app/modules/login/views/login_admin.html
......@@ -12,9 +12,6 @@
<!-- Formulario -->
<!-- LoginAdminCtrl controls here, see app.js -->
<form name="loginForm" ng-submit="login()" novalidate>
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessage' }}" class="alert" ng-class="alert" translate translate-value-name="{{name}}">{{message}}</div>
<h3 class="text-center" translate>admin_login</h3>
<div class="form-group">
......
sails/src/assets/app/modules/login/views/login_setting_password.html
......@@ -11,9 +11,6 @@
<img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
</p>
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessage' }}" class="alert" ng-class="alert" translate translate-value-name="{{name}}">{{message}}</div>
<div ng-show="{{ 'showlink' }}" class="text-center">
<a href="/app/#/login" translate>click_login</a>
</div>
......@@ -22,11 +19,11 @@
<form ng-hide="{{ 'hideform' }}" name="loginSettingPasswordForm" ng-submit="login_setting_password()">
<div class="form-group">
<input type="password" class="form-control" id="login_password" placeholder="{{ 'password_type' | translate}}" required ng-model="password" ng-focus="showmessage = false" />
<input type="password" class="form-control" id="login_password" placeholder="{{ 'password_type' | translate}}" required />
</div>
<div class="form-group">
<input type="password" class="form-control" id="login_password_confirm" placeholder="{{ 'password_confirm' | translate}}" required ng-model="password_confirm" ng-focus="showmessage = false" />
<input type="password" class="form-control" id="login_password_confirm" placeholder="{{ 'password_confirm' | translate}}" required ng-model="password_confirm" />
</div>
<p class="color_red text_sm text-center" ng-show="password != password_confirm" translate>password_match</p>
......
sails/src/assets/app/modules/login/views/signin.html
......@@ -18,10 +18,6 @@
<!-- Formulario -->
<form name="signInForm" role="form" ng-submit="signin()">
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessage' }}" class="alert" ng-class="alert" translate translate-values="{name: formdata.name, surname: formdata.surname, email: formdata.email}">{{message}}</div>
<fieldset>
<legend translate>personal_data</legend>
<div class="form-group">
......
sails/src/assets/app/modules/student/controllers/addpicto.js
/* global dashboardControllers */
'use strict';
// Please note that $modalInstance represents a modal window (instance) dependency.
// It is not the same as the $modal service used above.
dashboardControllers.controller('AddPictoCtrl', function ($scope, $modalInstance, $http, config, $window, $filter, $upload, stu_id, sup, studentPictos, categories, $modal) {
dashboardControllers.controller('AddPictoCtrl', function (
$scope,
$modalInstance,
$http,
config,
$window,
$filter,
$upload,
stu_id,
sup,
studentPictos,
categories,
$modal,
$translate,
ngToast) {
var i;
var cat_id;
// Last 4 parameters passed from collections.js
// Basic data passed from the main window
$scope.sup = sup;
......@@ -11,16 +29,16 @@ dashboardControllers.controller('AddPictoCtrl', function ($scope, $modalInstance
// Initially the source is symbolstx collection
$scope.source = 'symbolstx';
// List of studentPictos
//console.log(JSON.stringify(studentPictos));
$scope.studentPictos = studentPictos;
// List of picto categories
// console.log(JSON.stringify(categories));
$scope.categories = categories;
// Array scope for pictos dragged into categories
$scope.pictos_in_category = {};
for(var i=0; i<$scope.categories.length;i++){
var cat_id = $scope.categories[i].picto.id;
$scope.pictos_in_category['cat'+cat_id]=[];
for (i = 0; i < $scope.categories.length; i++) {
cat_id = $scope.categories[i].picto.id;
$scope.pictos_in_category['cat' + cat_id] = [];
}
// List of actual pictos (showed by navigation)
......@@ -29,37 +47,35 @@ dashboardControllers.controller('AddPictoCtrl', function ($scope, $modalInstance
$scope.symbolstxCats = [];
// List of breadcrumbs to show in navigation
$scope.breadcrumbs = [];
$scope.breadcrumbs.push({ id: 0, exp: 'Inicio', glyphicon: 'glyphicon glyphicon-home'});
$scope.breadcrumbs.push({ id: 0, exp: 'Inicio', glyphicon: 'glyphicon glyphicon-home' });
// Request of general pictos categories (symbolstx)
$http
.get(config.backend+'/sup/'+ $scope.sup.id +'/pic_categories/0')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/sup/' + $scope.sup.id + '/pic_categories/0')
.success(function (data) {
$scope.symbolstxCats = data;
console.log("Symbolstx categories recovered");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('error_loading_pictos').then(function (translation) {
ngToast.danger({ content: translation });
});
});
//
// Load pictos from a category
//
$scope.load_pictos = function (id_cat){
$http
.get(config.backend+'/sup/'+ $scope.sup.id +'/pic_fromcategory/' + id_cat)
.success(function(data, status, headers, config) {
// Add to list
if (data)
$scope.load_pictos = function (id_cat) {
$http.get(config.backend + '/sup/' + $scope.sup.id + '/pic_fromcategory/' + id_cat)
.success(function (data) {
if (data) {
$scope.pictos = data;
else $scope.pictos = [];
//console.log(JSON.stringify($scope.pictos));
console.log("Pictos listed" + JSON.stringify(data));
} else {
$scope.pictos = [];
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('error_loading_pictos').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
......@@ -67,20 +83,20 @@ dashboardControllers.controller('AddPictoCtrl', function ($scope, $modalInstance
// Load pictos from owned by the actual supervisor
// TEST --> change with real supervisor pictos
//
$scope.load_own_pictos = function (){
$scope.load_own_pictos = function () {
$scope.source = 'ownpictos';
$http
.get(config.backend+'/sup/'+ $scope.sup.id +'/pictos')
.success(function(data, status, headers, config) {
// Add to list
if (data)
$http.get(config.backend + '/sup/' + $scope.sup.id + '/pictos')
.success(function (data) {
if (data) {
$scope.pictos = data;
else $scope.pictos = [];
console.log(JSON.stringify($scope.pictos));
console.log("Pictos listed");
} else {
$scope.pictos = [];
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('error_loading_pictos').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
......@@ -88,18 +104,14 @@ dashboardControllers.controller('AddPictoCtrl', function ($scope, $modalInstance
// Load the folders of a category
//
$scope.load_category = function (id_cat){
$http
.get(config.backend+'/sup/'+ $scope.sup.id +'/pic_categories/' + id_cat)
$http.get(config.backend+'/sup/'+ $scope.sup.id +'/pic_categories/' + id_cat)
.success(function(data, status, headers, config) {
// Add to list
if (data)
$scope.symbolstxCats = data;
else $scope.symbolstxCats = [];
console.log("Symbolstx categories recovered");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
});
};
......
sails/src/assets/app/modules/student/controllers/setup.js
/* global dashboardControllers */
'use strict';
//-----------------------
// Student Setup Controller
//-----------------------
dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl($scope, $http, config, $stateParams, $window, $upload) {
dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
$scope,
$http,
config,
$stateParams,
$window,
$upload,
$translate,
ngToast) {
// For tab navigation (here too, if the user refresh the page...)
$scope.nav.tab = 'setup';
// When a picture is selected, launch the request
$scope.onFileSelect = function($files) {
//$files: an array of files selected, each file has name, size, and type.
for (var i = 0; i < $files.length; i++) {
var file = $files[i];
$scope.onFileSelect = function ($files) {
var i;
var file;
var extension;
var filename;
// Check accepted file types
if(file.type == "image/jpeg" || file.type == "image/png" || file.type == "image/gif"){
for (i = 0; i < $files.length; i++) {
file = $files[i]; // { name, size, type }
// Get the file extension
var extension = file.name.split('.').pop();
var filename = $scope.studentData.id + file.name;
console.log("Archivo: " + filename);
// Check accepted file types
if (file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif') {
extension = file.name.split('.').pop();
filename = $scope.studentData.id + file.name;
$upload.upload({
url: '/stu/upload', //upload.php script, node.js route, or servlet url
url: '/stu/upload', // upload.php script, node.js route, or servlet url
method: 'POST', // or 'PUT',
// Fields to sent in the body of the request
fields: {'filename': filename, 'extension': extension, 'folder': 'students', 'id': $scope.studentData.id},
// or ['1.jpg', '2.jpg', ...] // to modify the name of the file(s)
file: file, // or list of files ($files) for html5 only
}).progress(function(evt) {
console.log('percent: ' + parseInt(100.0 * evt.loaded / evt.total));
}).success(function(data, status, headers, config) {
// file is uploaded successfully
console.log(JSON.stringify(data.file));
// Assign the new image with new name
$scope.studentData.pic = "/upload/students/" + data.file.name;
//$scope.picture = user.id + "." + extension + "?t=" + new Date().getTime();
fields: { // Fields to sent in the body of the request
filename: filename,
extension: extension,
folder: 'students',
id: $scope.studentData.id
},
file: file,
}).progress(function () {
// TODO show progress to user
}).success(function (data) {
$translate('student_updated').then(function (translation) {
ngToast.success({ content: translation });
});
$scope.studentData.pic = '/upload/students/' + data.file.name;
});
} else {
$translate('error_only_support_images').then(function (translation) {
ngToast.danger({ content: translation });
});
}else{
alert("It's only supported JPG, PNG and GIF files");
}
}
};
// Open calendar
$scope.open_calendar = function($event) {
$scope.open_calendar = function ($event) {
$event.preventDefault();
$event.stopPropagation();
......@@ -53,33 +66,30 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl($s
};
// Save personal info updated
$scope.update_student = function(){
$scope.update_student = function () {
// Validate password match
if( $scope.formUser.password_confirm &&
if ($scope.formUser.password_confirm &&
!$scope.formUser.password_confirm.length &&
$scope.formUser.password != $scope.formUser.password_confirm) {
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "password_match";
$scope.formUser.password !== $scope.formUser.password_confirm) {
$translate('password_match').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
// password not changed (don't send it to DB)
if ($scope.formUser.password_confirm &&
!$scope.formUser.password_confirm.length) { // password not changed (don't send it to DB)
!$scope.formUser.password_confirm.length) {
delete $scope.formUser.password;
delete $scope.formUser.password_confirm;
}
$http
.put(config.backend+'/stu/'+$scope.studentData.id, $scope.formUser)
.success(function(data, status, headers, config) {
$scope.showmessagestudent = true;
$scope.alertstudent = "alert-success";
$scope.messagestudent = "student_updated";
$http.put(config.backend + '/stu/' + $scope.studentData.id, $scope.formUser)
.success(function (data) {
$translate('student_updated').then(function (translation) {
ngToast.success({ content: translation });
});
// studentData with new values
$scope.studentData.surname = data.surname;
$scope.studentData.birthdate = data.birthdate;
$scope.studentData.country = data.country;
......@@ -87,145 +97,131 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl($s
$scope.studentData.gender = data.gender;
$scope.studentData.lang = data.lang;
$scope.studentData.notes = data.notes;
console.log("Student updated");
})
.error(function(data, status, headers, config) {
$scope.showmessagestudent = true;
$scope.alertstudent = "alert-danger";
$scope.messagestudent = "student_not_updated";
console.log("Error from API: " + data.error);
.error(function () {
$translate.danger('student_not_updated', function (translation) {
ngToast.danger({ content: translation });
});
});
};
// Search supervisor by email
$scope.search_sup = function(){
$scope.search_sup = function () {
// Find tutor by email
$http
.get(config.backend+'/sup?where={"email":"'+ $scope.email_sup +'", "office":{"!": null}}')
.success(function(data, status, headers, config) {
// If it found the length is > 0
if(data.length > 0){
console.log("Supervisor found");
$http.get([
config.backend,
'/sup?where={"email":"',
$scope.email_sup,
'", "office":{"!": null}}'
].join(''))
.success(function (data) {
if (data.length > 0) {
$scope.supToAdd = data[0];
// Show message for validate
$scope.showmessagesupfound = true;
$scope.showmessagesupnotfound = false;
}else{
console.log("Supervisor NOT found");
$scope.showmessagesupnotfound = true;
$scope.messagesup = "sup_not_found";
} else {
$translate('sup_not_found').then(function (translation) {
ngToast.danger({ content: translation });
});
// Hide the success message (if it exists by other query)
$scope.showmessagesupfound = false;
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('sup_not_found').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
// Add supervisor (father or mother)
$scope.add_sup = function(){
$scope.add_sup = function () {
var stusup = {
student: $scope.studentData.id,
supervisor: $scope.supToAdd.id
}
};
$http
.get(config.backend+'/stu/'+ $scope.studentData.id + '/sup/' + $scope.supToAdd.id)
.success(function(data, status, headers, config) {
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/sup/' + $scope.supToAdd.id)
.success(function (data) {
// Assign the info of supervisor to add
stusup.supervisor = $scope.supToAdd;
stusup.id = data.id;
console.log(JSON.stringify(stusup));
// Add to the list of tutors in view
$scope.studentSupervisors.push($scope.supToAdd);
// Delete the email form field
$scope.email_sup = '';
// Hide the message of supervisor founded
$scope.showmessagesupfound = false;
console.log("Supervisor added");
})
.error(function(data, status, headers, config) {
$scope.showmessagesupnotfound = true;
$scope.messagetutor = "sup_not_added";
console.log("Error from API: " + data.error);
.error(function () {
$translate('sup_not_added').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
// Delete tutor
$scope.delete_sup = function (id_sup){
console.log("delete_supervisor:" + id_sup);
$scope.delete_sup = function (id_sup) {
var deleteSup = $window.confirm('Are you absolutely sure you want to delete?');
if(deleteSup){
$http
.delete(config.backend+'/stu/'+ $scope.studentData.id + '/sup/' + id_sup)
.success(function(data, status, headers, config) {
if (deleteSup) {
$http.delete(config.backend + '/stu/' + $scope.studentData.id + '/sup/' + id_sup)
.success(function () {
var i;
// Eliminar de la vista: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.studentSupervisors.length; i++) {
if(id_sup == $scope.studentSupervisors[i].id)
$scope.studentSupervisors.splice(i,1);
for (i = 0; i < $scope.studentSupervisors.length; i++) {
if (id_sup === $scope.studentSupervisors[i].id) {
$scope.studentSupervisors.splice(i, 1);
}
}
console.log("Supervisor deleted");
$translate('supervisor_deleted').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessagesupnotfound = true;
$scope.messagetutor = "sup_not_deleted";
console.log("Error from API: " + data.error);
.error(function () {
$translate('sup_not_deleted').then(function (translation) {
ngToast.error({ content: translation });
});
});
}
};
// Search tutor by email
$scope.search_tutor = function(){
$scope.search_tutor = function () {
// Find tutor by email
$http
.get(config.backend+'/sup?where={"email":"'+ $scope.email_tutor +'", "office":null}')
.success(function(data, status, headers, config) {
$http.get(config.backend + '/sup?where={"email":"' + $scope.email_tutor + '", "office":null}')
.success(function (data) {
// If it found the length is > 0
if(data.length > 0){
console.log("Tutor found");
if (data.length > 0) {
$scope.tutorToAdd = data[0];
// Show message for validate
$scope.showmessagetutorfound = true;
$scope.showmessagetutornotfound = false;
}else{
console.log("Tutor NOT found");
$scope.showmessagetutornotfound = true;
$scope.messagetutor = "tutor_not_found";
} else {
$translate('tutor_not_found').then(function (translation) {
ngToast.danger({ content: translation });
});
// Hide the success message (if it exists by other query)
$scope.showmessagetutorfound = false;
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('tutor_not_found').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
// Add tutor
$scope.add_tutor = function(){
$scope.add_tutor = function () {
var stusup = {
student: $scope.studentData.id,
supervisor: $scope.tutorToAdd.id
}
};
$http
.get(config.backend+'/stu/'+ $scope.studentData.id + '/sup/' + $scope.tutorToAdd.id)
.success(function(data, status, headers, config) {
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/sup/' + $scope.tutorToAdd.id)
.success(function (data) {
// Assign the info of supervisor to add
stusup.supervisor = $scope.tutorToAdd;
stusup.id = data.id;
......@@ -236,55 +232,58 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl($s
// Hide the message of tutor founded
$scope.showmessagetutorfound = false;
console.log("Tutor added");
$translate('tutor_added').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessagetutornotfound = true;
$scope.messagetutor = "tutor_not_added";
console.log("Error from API: " + data.error);
.error(function () {
$translate('tutor_not_added').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
// Delete tutor
$scope.delete_tutor = function (id_sup){
console.log("delete_tutor:" + id_sup);
$scope.delete_tutor = function (id_sup) {
var deleteTutor = $window.confirm('Are you absolutely sure you want to delete?');
if(deleteTutor){
$http
.delete(config.backend+'/stu/'+ $scope.studentData.id + '/sup/' + id_sup)
.success(function(data, status, headers, config) {
if (deleteTutor) {
$http.delete(config.backend + '/stu/' + $scope.studentData.id + '/sup/' + id_sup)
.success(function () {
var i;
// Eliminar de la vista: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.studentTutors.length; i++) {
if(id_sup == $scope.studentTutors[i].id)
$scope.studentTutors.splice(i,1);
for (i = 0; i < $scope.studentTutors.length; i++) {
if (id_sup === $scope.studentTutors[i].id) {
$scope.studentTutors.splice(i, 1);
}
}
console.log("Tutor deleted");
$translate('tutor_deleted').then(function (translation) {
ngToast.success({ content: translation });
});
})
.error(function(data, status, headers, config) {
$scope.showmessagetutornotfound = true;
$scope.messagetutor = "tutor_not_deleted";
console.log("Error from API: " + data.error);
.error(function () {
$translate('tutor_not_deleted').then(function (translation) {
ngToast.danger({ content: translation });
});
});
}
};
// TODO issue/357
$scope.delete_device = function (id_dev){
var deleteDevice = $window.confirm('Are you absolutely sure you want to delete?');
if(deleteDevice){
$http
.delete(config.backend+'/stu/'+ $scope.studentData.id +'/dev/' + id_dev)
if (deleteDevice) {
$http.delete(config.backend + '/stu/' + $scope.studentData.id + '/dev/' + id_dev)
.success(function(data, status, headers, config) {
var i;
// Eliminar de la vista: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.studentDevices.length; i++) {
if(id_dev == $scope.studentDevices[i].id)
for (i = 0; i < $scope.studentDevices.length; i++) {
if (id_dev == $scope.studentDevices[i].id) {
$scope.studentDevices.splice(i,1);
}
}
console.log("Device deleted with id " + id_dev);
})
......@@ -297,6 +296,7 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl($s
}
};
// TODO issue/357
$scope.associate_dev = function(){
var stu_dev = {
"id_stu": $scope.studentData.id,
......
sails/src/assets/app/modules/student/controllers/student.js
/* global dashboardControllers, io */
'use strict';
//-----------------------
// Student Controller
//-----------------------
dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, config, $state, $http, $window, $filter, $rootScope) {
/**
* StudentCtrl
*/
dashboardControllers.controller('StudentCtrl', function StudentCtrl(
$scope,
config,
$state,
$http,
$window,
$filter,
$translate,
ngToast) {
var i;
var j;
$scope.studentData = {
id: '',
......@@ -38,24 +50,24 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, conf
//
// WebSockets communication
//
io.socket.on('update_peers', function(data) {
console.log(data.count + ' peers connected');
io.socket.on('update_peers', function (data) {
$translate('num_peers').then(function (translation) {
ngToast.success(translation + ': ' + data.count);
});
$scope.studentData.num_peers = data.count;
});
io.socket.on('reconnect', function () {
// Subscribe to student's socket room
console.log("reconnecting to socket");
io.socket.post('/stu/subscribe', {
action: 'subscribe',
attributes:{
attributes: {
id_stu: $scope.studentData.id
},
token: $window.sessionStorage.token
},
function(res) {
console.log("Connected to student: " + res.msg);
function () {
// TODO ngToast res.msg (connected to student room)
});
});
......@@ -65,10 +77,8 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, conf
//
//
$http
.get(config.backend+'/stu/' + $scope.studentData.id)
.success(function(data, status, headers, config) {
// studentData
$http.get(config.backend + '/stu/' + $scope.studentData.id)
.success(function (data) {
$scope.studentData.id = data.id;
$scope.studentData.username = data.username;
$scope.studentData.name = data.name;
......@@ -98,42 +108,28 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, conf
$scope.formUser.lang = $scope.studentData.lang;
$scope.formUser.notes = $scope.studentData.notes;
console.log("Student personal data recovered");
console.log(JSON.stringify($scope.studentData));
console.log("Attributes: " + JSON.stringify($scope.studentData.attributes));
console.log("Sups: " + JSON.stringify($scope.studentData.stuSup));
//////////////////////////////////////////////////////////
// Subscribe to student's socket room
console.log("connecting to socket");
io.socket.post('/stu/subscribe', {
action: 'subscribe',
attributes:{
attributes: {
id_stu: $scope.studentData.id
},
token: $window.sessionStorage.token
},
function(res) {
console.log("Connected to student: " + res.msg);
function () {
// TODO ngToast res.msg (connected to student room)
});
//////////////////////////////////////////////////////////
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO ngToast res.msg (cant connect to student room)
});
// For tab navigation, initially blank goes to collections
// Defined as JSON object to be available in in children as the same scope
$scope.nav = {
tab : 'collections'
tab: 'collections'
};
// ----------------------------------------------------------------------
// COLLECTION
// Load student collection
//
// List of all student pictos
$scope.studentPictos = [];
// List of categories pictos
......@@ -148,131 +144,75 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, conf
};
// Initialization of PCB (the tablet view) and PCB-Categories
$scope.pcb_rows = 5, $scope.pcb_cols = 10;
$scope.pcb_rows = 5;
$scope.pcb_cols = 10;
$scope.pcb = [];
$scope.pcb_cat = [];
$scope.pcb = new Array(); $scope.pcb_cat = new Array();
// Set the empty elements
for (var i=0;i<$scope.pcb_rows;i++) {
$scope.pcb[i]=new Array(); $scope.pcb_cat[i]=new Array();
for (var j=0;j<$scope.pcb_cols; j++) {
// Default value
$scope.pcb[i][j]={'picto': {'uri': '/app/img/empty.gif'}, 'attributes': {'coord_x': i, 'coord_y': j}};
$scope.pcb_cat[i][j]={'picto': {'uri': '/app/img/empty.gif'}, 'attributes': {'coord_x': i, 'coord_y': j}};
for (i = 0; i < $scope.pcb_rows; i++) {
$scope.pcb[i] = [];
$scope.pcb_cat[i] = [];
for (j = 0; j < $scope.pcb_cols; j++) {
$scope.pcb[i][j] = {
picto: { uri: '/app/img/empty.gif' },
attributes: { coord_x: i, coord_y: j }
};
$scope.pcb_cat[i][j] = {
picto: { uri: '/app/img/empty.gif' },
attributes: { coord_x: i, coord_y: j }
};
}
}
$http
.get(config.backend+'/stu/'+ $scope.studentData.id +'/pictos')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/pictos')
.success(function (data) {
var k;
var pic;
$scope.studentPictos = data;
//console.log(JSON.stringify($scope.pcb_cat));
$scope.pictosCategory = $filter('filter')($scope.studentPictos, {attributes: { id_cat: null }});
console.log("Pictos Categories: " + JSON.stringify($scope.pictosCategory));
$scope.pictosCategory = $filter('filter')($scope.studentPictos, {
attributes: {
id_cat: null
}
});
// Build the pcb_cat with the coords of the pictos
for(var i=0; i < $scope.pictosCategory.length; i++) {
var pic = $scope.pictosCategory[i];
for (k = 0; k < $scope.pictosCategory.length; k++) {
pic = $scope.pictosCategory[k];
$scope.pcb_cat[pic.attributes.coord_x][pic.attributes.coord_y] = pic;
console.log("Pic " + pic.id + ": " + pic.attributes.color );
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
}); // Filtered only the categories pictos
////////////////////////////////////////////////////////////////////////////
// Devices /////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
/*
// For mark in list the actual device (Received from PCB via websocket)
$scope.active_device = null;
// 1) Leer los dispositivos del alumno y mostrar en listado
// Array with student's devices
$scope.devices = [];
// Query to obtain an array of student devices
$http
.get(config.backend+'/stu/'+ $scope.studentData.id +'/devices')
.success(function(data, status, headers, config) {
// Add to list
$scope.devices = data;
console.log(JSON.stringify($scope.devices));
console.log("Devices recovered");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('error_loading_pictos').then(function (translation) {
ngToast.danger({ content: translation });
});
});
*/
// ----------------------------------------------------------------------
// REPORTS
// Load information for reports
//
//
// NOTE: this information is created when the tab is selected, so information
// is always updated
// ----------------------------------------------------------------------
// SETUP
// Load student configuration
//
// *******************************************************
// Therapists
// List of student's therapists
$scope.studentSupervisors = [];
$http
.get(config.backend+'/stu/'+ $scope.studentData.id +'/therapists')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/therapists')
.success(function (data) {
$scope.studentSupervisors = data;
console.log(JSON.stringify($scope.studentSupervisors));
console.log("Supervisors listed");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
// List of student's tutors (parents)
$scope.studentTutors = [];
$http
.get(config.backend+'/stu/'+ $scope.studentData.id +'/tutors')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/tutors')
.success(function (data) {
$scope.studentTutors = data;
console.log(JSON.stringify($scope.studentTutors));
console.log("Tutors listed");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
// *******************************************************
// Devices
// List of student's devices
$scope.studentDevices = [];
$http
.get(config.backend+'/stu/'+ $scope.studentData.id +'/devices')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/devices')
.success(function (data) {
$scope.studentDevices = data;
console.log("Devices listed: ");
console.log(JSON.stringify($scope.studentDevices));
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
/*
// Events handling
io.socket.on('action', function(data) {
console.log('"action" event received with the following data:');
console.log(data.msg);
});*/
});
sails/src/assets/app/modules/student/controllers/tags.js
'use strict';
// Please note that $modalInstance represents a modal window (instance) dependency.
// It is not the same as the $modal service used above.
/* global dashboardControllers */
dashboardControllers.controller('TagsCtrl', function ($scope, $modalInstance, $http, config, stuPicto, sup) {
// Last parameter passed from collections.js
// Basic data passed from the main window
'use strict';
/**
* TagsCtrl
*/
dashboardControllers.controller('TagsCtrl', function TagsCtrl(
$scope,
$modalInstance,
$http,
config,
stuPicto,
sup,
$translate,
ngToast) {
// Supervisor
$scope.sup = sup;
// List of general tags
......@@ -15,66 +22,62 @@ dashboardControllers.controller('TagsCtrl', function ($scope, $modalInstance, $h
$scope.ownTags = [];
// Request of general tags
$http
.get(config.backend+'/picto/' + stuPicto.picto.id)
.success(function(data, status, headers, config) {
// Add to lists
$http.get(config.backend + '/picto/' + stuPicto.picto.id)
.success(function (data) {
$scope.tags = data.tags;
$scope.ownTags = data.tagsSup;
console.log("Tags recovered");
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
$translate('error_loading_pictos').then(function (translation) {
ngToast.danger({ content: translation });
});
});
// Add own tag
$scope.add = function () {
$http
.post(config.backend+'/picto/tag',
{ 'picto': stuPicto.picto.id,
'supervisor': $scope.sup.id,
'tag': $scope.tagToAdd,
'lang': $scope.sup.lang
})
.success(function(data, status, headers, config) {
console.log("Tag added: " + JSON.stringify(data));
$http.post(config.backend + '/picto/tag',
{
picto: stuPicto.picto.id,
supervisor: $scope.sup.id,
tag: $scope.tagToAdd,
lang: $scope.sup.lang
}
)
.success(function (data) {
$scope.ownTags.push(data);
$scope.tagToAdd = "";
$scope.tagToAdd = '';
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
};
// Destroy own tag
$scope.del = function (tag) {
$http
.delete(config.backend+'/picto/tag/' + tag.id)
.success(function(data, status, headers, config) {
console.log("Tag destroyed: " + JSON.stringify(data));
$http.delete(config.backend + '/picto/tag/' + tag.id)
.success(function () {
var i;
// TODO show success with ngToast
// Eliminar de la vista: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.ownTags.length; i++) {
if(tag.id == $scope.ownTags[i].id)
$scope.ownTags.splice(i,1);
for (i = 0; i < $scope.ownTags.length; i++) {
if (tag.id === $scope.ownTags[i].id) {
$scope.ownTags.splice(i, 1);
}
}
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
};
$scope.close = function () {
$modalInstance.close("Ejemplo de elemento devuelto");
// TODO ¿?¿?
$modalInstance.close('Ejemplo de elemento devuelto');
};
// No usado
$scope.cancel = function () {
// TODO ¿?¿?
$modalInstance.dismiss('cancel');
};
});
sails/src/assets/app/modules/student/views/instructions.html
<toast></toast>
<!-- Instrucction tab-->
<div class="panel panel-default student_tab_panel">
......
sails/src/assets/app/modules/student/views/setup.html
<div class="panel panel-default student_tab_panel">
<div class="panel-body">
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessagestudent' }}" class="alert" ng-class="alertstudent">{{ messagestudent | translate }}</div>
<div class="row">
<!-- Parte izquierda: Datos personales -->
<div class="col-md-6">
......@@ -120,8 +116,6 @@
<img ng-src="{{supToAdd.pic}}" class="profile" alt="" title="" /> {{ supToAdd.name }} {{ supToAdd.surname }}
<a class="btn btn-default btn-lg pull-right" role="button" ng-click="add_sup()" translate>add</a>
</div>
<div ng-show="{{ 'showmessagesupnotfound' }}" class="alert alert-warning">{{ messagesup | translate }}</div>
<!-- Fin de buscador de supervisores -->
<!-- Supervisores asignados -->
......@@ -162,8 +156,6 @@
<img ng-src="{{tutorToAdd.pic}}" class="profile" alt="" title="" /> {{ tutorToAdd.name }} {{ tutorToAdd.surname }}
<a class="btn btn-default btn-sm pull-right" role="button" ng-click="add_tutor()" translate>add</a>
</div>
<div ng-show="{{ 'showmessagetutornotfound' }}" class="alert alert-warning">{{ messagetutor | translate }}</div>
<!-- Fin de buscador de tutores -->
<!-- Tutores asignados -->
......
sails/src/assets/app/modules/supervisor/controllers/setup.js
/* global dashboardControllers */
'use strict';
//------------------
// Setup Controller
//------------------
dashboardControllers.controller('SetupCtrl', function SetupCtrl($scope, $http, $window, $translate, $location, $upload, config) {
// The last parameter, config, is injected from config.js (defined in dashboardConfig module)
/**
* SetupCtrl
*/
dashboardControllers.controller('SetupCtrl', function SetupCtrl(
$scope,
$http,
$window,
$translate,
$location,
$upload,
ngToast,
config) {
var user;
// Don't show the message at the begining
$scope.showmessage = false;
// Restore user values from sessionStorage
var user = JSON.parse($window.sessionStorage.user);
// Fill the form with the user data
user = JSON.parse($window.sessionStorage.user);
$scope.formdata = user;
// Testing --> DELETE
console.log("User id: " + user.id.toString());
console.log("User id to hashcode: " + user.id.toString().hashCode());
// When a picture is selected, launch the request
$scope.onFileSelect = function($files) {
//$files: an array of files selected, each file has name, size, and type.
for (var i = 0; i < $files.length; i++) {
var file = $files[i];
// Check accepted file types
if(file.type == "image/jpeg" || file.type == "image/png" || file.type == "image/gif"){
// Get the file extension
var extension = file.name.split('.').pop();
var filename = user.id + file.name;
console.log("Archivo: " + filename);
$scope.onFileSelect = function ($files) {
var i;
var file;
var extension;
var filename;
for (i = 0; i < $files.length; i++) {
file = $files[i]; // { name, size, type }
if (file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif') {
extension = file.name.split('.').pop();
filename = user.id + file.name;
$upload.upload({
url: '/sup/upload', //upload.php script, node.js route, or servlet url
url: '/sup/upload', // upload.php script, node.js route, or servlet url
method: 'POST', // or 'PUT',
// Fields to sent in the body of the request
fields: {'filename': filename, 'extension': extension, 'folder': 'supervisors', 'id': user.id},
// or ['1.jpg', '2.jpg', ...] // to modify the name of the file(s)
file: file, // or list of files ($files) for html5 only
}).progress(function(evt) {
console.log('percent: ' + parseInt(100.0 * evt.loaded / evt.total));
}).success(function(data, status, headers, config) {
// file is uploaded successfully
console.log(JSON.stringify(data.file));
// Assign the new image with new name
$scope.user.pic = "/upload/supervisors/" + data.file.name;
//$scope.picture = user.id + "." + extension + "?t=" + new Date().getTime();
// Modify the user in session
var user = JSON.parse($window.sessionStorage.user);
fields: {
filename: filename,
extension: extension,
folder: 'supervisors',
id: user.id
},
file: file
})
.progress(function () {
// TODO show file upload progress to user
})
.success(function (data) {
// TODO show success ngToast
$scope.user.pic = '/upload/supervisors/' + data.file.name;
user.pic = $scope.user.pic;
$window.sessionStorage.user = JSON.stringify(user);
});
}else{
alert("It's only supported JPG, PNG and GIF files");
} else {
$translate('error_only_support_images').then(function (translation) {
ngToast.error({ content: translation });
});
}
}
};
// Form submit
$scope.setup = function () {
var supervisor;
var actualEmail;
//$scope.showmessage = false;
// Validate password match
if($scope.formdata.password != $scope.formdata.password_confirm){
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "password_match";
if ($scope.formdata.password !== $scope.formdata.password_confirm) {
$translate('password_match').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
if($scope.setupForm.$valid) {
// $scope.showdialog = true;
console.log('Form is valid');
}else{
if (!$scope.setupForm.$valid) {
$translate('invalid_fields').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
var supervisor = $scope.formdata;
var actual_email = JSON.parse($window.sessionStorage.user).email;
supervisor = $scope.formdata;
actualEmail = JSON.parse($window.sessionStorage.user).email;
// Comprobation for new email
// If no change, it is deleted from supervisor object
if(supervisor.email == actual_email)
if (supervisor.email === actualEmail) {
delete supervisor.email;
}
// console.log($scope.formdata.uploadFile);
$http
.put(config.backend+'/sup', supervisor)
.success(function(data, status, headers, config) {
// ToDo: When this run well, redirect to main page
$scope.showmessage = true;
$scope.alert = "alert-success";
$scope.message = "data_saved";
$http.put(config.backend + '/sup', supervisor)
.success(function (data) {
$translate('data_saved').then(function (translation) {
ngToast.success({ content: translation });
});
// Modify the name in the header
$scope.name = data.name + " " + data.surname;
$scope.name = data.name + ' ' + data.surname;
// Modify the user data in session
user.name = data.name;
user.surname = data.surname;
......@@ -113,16 +114,11 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl($scope, $http, $
delete user.password_confirm;
$window.sessionStorage.user = JSON.stringify(user);
console.log("User modified");
})
.error(function(data, status, headers, config) {
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "data_no_saved";
console.log("Error from API: " + data.error);
.error(function () {
$translate('data_no_saved').then(function (translation) {
ngToast.danger({ content: translation });
});
});
};
});
sails/src/assets/app/modules/supervisor/controllers/students.js
'use strict';
/* global dashboardControllers, io */
//------------------
// Students Controller
//------------------
dashboardControllers.controller('StudentsCtrl', function StudentsCtrl($scope, $state, $http, config, $window, $translate, ngToast) {
'use strict';
/**
* StudentsCtrl
*/
dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
$scope,
$state,
$http,
config,
$window,
$translate,
ngToast) {
$scope.formdatastudent = {
"username": '',
"password": '',
"name": '',
"surname": '',
"birthdate": '',
"country": '',
"gender": 'F',
"lang": 'es-es',
"notes": '',
"pic": "/app/img/default.jpg",
"office": $scope.user.office || {name: ""}
username: '',
password: '',
name: '',
surname: '',
birthdate: '',
country: '',
gender: 'F',
lang: 'es-es',
notes: '',
pic: '/app/img/default.jpg',
office: $scope.user.office || { name: '' }
};
//
// Flags for showing buttons according to role
//
$scope.user = JSON.parse($window.sessionStorage.user);
if ($scope.user.office) {
if ($scope.user.office.admin === $scope.user.id) // The user is administrator of the office
if ($scope.user.office.admin === $scope.user.id) {
$scope.user.isAdmin = true;
}
if ($scope.user.office.currentStudents >= $scope.user.office.maxStudents)
if ($scope.user.office.currentStudents >= $scope.user.office.maxStudents) {
$scope.num_licenses_left = 0;
else
$scope.num_licenses_left = $scope.user.office.maxStudents - $scope.user.office.currentStudents;
} else {
$scope.user.office = {name: ""}
$scope.num_licenses_left =
$scope.user.office.maxStudents -
$scope.user.office.currentStudents;
}
} else {
$scope.user.office = { name: '' };
}
//
// Get list of supervisor's students
//
$http
.get(config.backend+'/sup/' + $scope.user.id + '/students')
.success(function(data, status, headers, config) {
// Add to list
$http.get(config.backend + '/sup/' + $scope.user.id + '/students')
.success(function (data) {
$scope.students = data;
console.log("Students listed:" + JSON.stringify(data));
})
.error(function(data, status, headers, config) {
console.log("Error from API: " + data.error);
.error(function () {
// TODO show error with ngToast
});
// Reset form Student
$scope.resetForm = function(){
$scope.resetForm = function () {
// Empty the form
$scope.formdatastudent = {
"username": '',
"password": '',
"password_confirm": '',
"name": '',
"surname": '',
"birthdate": '',
"country": '',
"gender": 'F',
"lang": 'es-es',
"notes": '',
"pic": "/app/img/default.jpg",
"office": $scope.user.office || {name: ""},
"current_method": "no_method",
"current_instruction": "no_instruction"
username: '',
password: '',
password_confirm: '',
name: '',
surname: '',
birthdate: '',
country: '',
gender: 'F',
lang: 'es-es',
notes: '',
pic: '/app/img/default.jpg',
office: $scope.user.office || { name: '' },
current_method: 'no_method',
current_instruction: 'no_instruction'
};
// Hide the form
......@@ -75,41 +80,31 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl($scope, $s
};
// Add Student
$scope.add_student = function(){
$scope.add_student = function () {
var student = $scope.formdatastudent;
console.log(JSON.stringify(student));
// Validate password match
if(student.password_confirm.length && student.password != student.password_confirm) {
// ToDo: Highlight with Angular the input
$scope.showmessage = true;
$scope.alert = "alert-danger";
$scope.message = "password_match";
if (student.password_confirm.length && student.password !== student.password_confirm) {
$translate('password_match').then(function (translation) {
ngToast.danger({ content: translation });
});
return;
}
if (!student.password_confirm.length) { // password not changed (don't send it to DB)
// password not changed (don't send it to DB)
if (!student.password_confirm.length) {
delete student.password;
delete student.password_confirm;
}
$http
.post(config.backend+'/stu', student)
.success(function(data, status, headers, config) {
// Translate
$http.post(config.backend + '/stu', student)
.success(function (data) {
$translate('student_added').then(function (translation) {
// Show message
ngToast.success({
content: translation,
timeout: 6000 // By default 4000
});
ngToast.success({ content: translation });
});
// default values
data.student.supervision = 0 // by default, only related to office administrator
data.student.supervision = 0; // by default, only related to office administrator
data.student.current_method = 'no_method';
data.student.current_instruction = 'no_instruction';
......@@ -121,106 +116,57 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl($scope, $s
$scope.resetForm();
// Show the add form to new adding
$scope.hidestudentadd = false;
console.log("Student added");
})
.error(function(data, status, headers, config) {
.error(function (data) {
var errorMessage = 'student_not_added';
console.log("Error from API: " + JSON.stringify(data));
var msg = "";
// Custom message for a generic error or for the maximum number of licenses reached by the office
if(data && data.raw && data.raw.sqlState && data.raw.sqlState == "20001") msg = "max_licenses_reached";
else if (data && data.status == 400)
msg = "invalid_fields";
else
msg = "student_not_added";
if (data && data.raw && data.raw.sqlState && data.raw.sqlState === '20001') {
errorMessage = 'max_licenses_reached';
} else if (data && data.status === 400) {
errorMessage = 'invalid_fields';
}
// Translate
$translate(msg).then(function (translation) {
// Show message
ngToast.danger({
content: translation,
timeout: 6000 // By default 4000
$translate(errorMessage).then(function (translation) {
ngToast.danger({ content: translation });
});
});
});
};
// Delete Student
$scope.delete_student = function(student){
$scope.delete_student = function (student) {
var deleteStudent = $window.confirm('Are you absolutely sure you want to delete?');
if(deleteStudent){
$http
.delete(config.backend+'/stu/'+ student.id)
.success(function(data, status, headers, config) {
console.log("Student deleted:" + student.name);
// Eliminar de la vista: Se recorre el array de objetos json para buscarlo
for(var i=0; i < $scope.students.length; i++) {
if(student.id == $scope.students[i].id)
$scope.students.splice(i,1);
}
console.log("Student deleted:" + student.name);
// Translate
if (deleteStudent) {
$http.delete(config.backend + '/stu/' + student.id)
.success(function () {
var i;
for (i = 0; i < $scope.students.length; i++) {
if (student.id === $scope.students[i].id) {
$scope.students.splice(i, 1);
}
}
$translate('student_deleted').then(function (translation) {
// Show message
ngToast.success({
content: translation,
timeout: 6000 // By default 4000
});
ngToast.success({ content: translation });
});
// Empty the form
//$scope.resetForm();
})
.error(function(data, status, headers, config) {
console.log("Error deleting student from API: " + data.error);
//console.log("It could be students associated");
// Translate
.error(function () {
$translate('student_not_deleted').then(function (translation) {
// Show message
ngToast.danger({
content: translation,
timeout: 6000 // By default 4000
});
ngToast.danger({ content: translation });
});
});
//
// Due to a bug with http.delete, callback functions above are not
// called. So we do it again here until the bug is fixed.
//
// for(var i=0; i < $scope.students.length; i++) {
// if(student.id == $scope.students[i].id)
// $scope.students.splice(i,1);
// }
}
};
//////////////////////////////////////////////////////////
// Unsubscribe to student's socket room
io.socket.post('/stu/unsubscribe', {
action: 'unsubscribe'
},
function(res) {
console.log("Disconnected socket: " + res.msg);
});
//////////////////////////////////////////////////////////
io.socket.post('/stu/unsubscribe', { action: 'unsubscribe' });
});
//----------------------------------------------
// Student Add Controller --> Only for calendar
//----------------------------------------------
/**
* StudentAddCtrl
*/
dashboardControllers.controller('StudentAddCtrl', function StudentsCtrl($scope) {
// Open calendar
$scope.open_calendar = function($event) {
$scope.open_calendar = function ($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened_cal_student = true;
};
});
sails/src/assets/app/modules/supervisor/views/setup.html
......@@ -9,9 +9,6 @@
<!-- Formulario -->
<form name="setupForm" enctype="multipart/form-data" role="form" ng-submit="setup()">
<!-- Alert and success messages -->
<div ng-show="{{ 'showmessage' }}" class="alert" ng-class="alert" translate>{{message}}</div>
<!-- Change profile picture -->
<input type="file" ng-file-select="onFileSelect($files)" ng-model="picFile" accept="image/*">
......@@ -102,4 +99,3 @@
</div>
sails/src/assets/app/modules/supervisor/views/students.html
<toast></toast>
<!-- StudentsCtrl controls here, see app.js -->
<div class="panel panel-default">
<!-- Default panel contents -->
......
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