Skip to content

yotta / pictogram

Go to a project
Commit ebae9049 by Arturo Montejo Ráez
Options

Corregido un bug al actualizar method 

Uso de directiva footerTranslate en subviews de páginas de login
parent 1aebd6b3
Inline Side-by-side
Showing with 45 additions and 67 deletions
sails/src/assets/app/index.html
...@@ -8,33 +8,29 @@ ...@@ -8,33 +8,29 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap-theme.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="bower_components/ngtoast/dist/ngToast.min.css"> <link rel="stylesheet" href="bower_components/ngtoast/dist/ngToast.min.css">
<link rel="stylesheet" href="bower_components/ngtoast/dist/ngToast-animations.min.css"> <link rel="stylesheet" href="bower_components/ngtoast/dist/ngToast-animations.min.css">
<link rel="stylesheet" href="bower_components/angular-chart.js/dist/angular-chart.css"> <link rel="stylesheet" href="bower_components/angular-chart.js/dist/angular-chart.css">
<!-- <link rel="stylesheet" href="css/cropper.css"> --> <!-- <link rel="stylesheet" href="css/cropper.css"> -->
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
<script src="bower_components/ng-file-upload/angular-file-upload-shim.min.js"></script>
<script src="bower_components/angular/angular.min.js"></script> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script> <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
<script src="bower_components/angular-translate/angular-translate.min.js"></script> <script src="bower_components/angular-translate/angular-translate.min.js"></script>
<script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script> <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
<script type="text/javascript" src="bower_components/angular-re-captcha/angular-re-captcha.js"></script> <script src="bower_components/angular-re-captcha/angular-re-captcha.js"></script>
<script src="bower_components/ng-file-upload/angular-file-upload.min.js"></script> <script src="bower_components/ng-file-upload/angular-file-upload.min.js"></script>
<script src="bower_components/angular-filter/dist/angular-filter.min.js"></script> <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
<script src="js/lib/sails.io.js"></script> <script src="js/lib/sails.io.js"></script>
<!-- Timer scripts --> <!-- Timer scripts -->
<script type="text/javascript" src="bower_components/angular-timer/dist/assets/js/angular-timer-bower.js"></script>
<script type="text/javascript" src="bower_components/angular-timer/dist/assets/js/angular-timer-all.min.js"></script>
<script type="text/javascript" src="bower_components/momentjs/min/moment.min.js"></script> <script type="text/javascript" src="bower_components/momentjs/min/moment.min.js"></script>
<script type="text/javascript" src="bower_components/momentjs/min/locales.min.js"></script> <script type="text/javascript" src="bower_components/momentjs/min/locales.min.js"></script>
<script type="text/javascript" src="bower_components/humanize-duration/humanize-duration.js"></script> <script type="text/javascript" src="bower_components/humanize-duration/humanize-duration.js"></script>
<script type="text/javascript" src="bower_components/angular-timer/dist/assets/js/angular-timer-bower.js"></script>
<script type="text/javascript" src="bower_components/angular-timer/dist/assets/js/angular-timer-all.min.js"></script>
<!-- End timer scripts --> <!-- End timer scripts -->
<!-- Scripts for notifications --> <!-- Scripts for notifications -->
...@@ -44,11 +40,11 @@ ...@@ -44,11 +40,11 @@
<!-- End of scripts for notifications --> <!-- End of scripts for notifications -->
<script src="bower_components/ng-context-menu/dist/ng-context-menu.min.js"></script> <script src="bower_components/ng-context-menu/dist/ng-context-menu.min.js"></script>
<script src="bower_components/Chart.js/Chart.min.js"></script> <script src="bower_components/Chart.js/Chart.min.js"></script>
<script src="bower_components/angular-chart.js/dist/angular-chart.min.js"></script> <script src="bower_components/angular-chart.js/dist/angular-chart.min.js"></script>
<script src="bower_components/ng-lodash/build/ng-lodash.min.js"></script> <script src="bower_components/ng-lodash/build/ng-lodash.min.js"></script>
<script src="bower_components/ng-file-upload/angular-file-upload-shim.min.js"></script>
<!-- <!--
<script src="bower_components/ngImgCrop/compile/minified/ng-img-crop.js"></script> <script src="bower_components/ngImgCrop/compile/minified/ng-img-crop.js"></script>
<link rel="stylesheet" type="text/css" href="bower_components/ngImgCrop/compile/minified/ng-img-crop.css">--> <link rel="stylesheet" type="text/css" href="bower_components/ngImgCrop/compile/minified/ng-img-crop.css">-->
......
sails/src/assets/app/js/app.js
...@@ -55,17 +55,7 @@ dashboardApp.config(function($translateProvider) { ...@@ -55,17 +55,7 @@ dashboardApp.config(function($translateProvider) {
/* /*
* ui-routes is used to implement a PAC pattern so views and related controllers are * ui-routes is used to implement a PAC pattern so views and related controllers are
* hierarchically arranged. * hierarchically arranged.
* *
* LoginCtrl
* - login.hmtl
* LoginSettingPasswodrCtrl
* - login_setting_password.html
* LoginAdminCtrl
* - login_admin.html
* SignInCtrl
* - signing.html
* SupervisorCtrl
* - supervisor.html
*/ */
......
sails/src/assets/app/js/controllers/main.js
...@@ -12,17 +12,19 @@ String.prototype.hashCode = function() { ...@@ -12,17 +12,19 @@ String.prototype.hashCode = function() {
return hash; return hash;
}; };
//------------------
// Main Controller
//------------------
// Creamos el módulo dashboardControllers, de donde colgarán todos los controladores // Creamos el módulo dashboardControllers, de donde colgarán todos los controladores
var dashboardControllers = angular.module('dashboardControllers', ['dashboardConfig']); var dashboardControllers = angular.module('dashboardControllers', ['dashboardConfig']);
// Creamos el controlador principal ////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Main Controller
//
//
dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $location, $translate) { dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $location, $translate) {
// Always use objects if we want to modify this scope in the childs // Always use objects if we want to modify this scope in the childs
// Save name and surname in global scope // Save name and surname in global scope
$scope.user = { $scope.user = {
id: '', id: '',
...@@ -33,23 +35,33 @@ dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $ ...@@ -33,23 +35,33 @@ dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $
lang: '' lang: ''
}; };
// Get browser language // Use browser language as default
var lang = $window.navigator.language || $window.navigator.userLanguage; var lang = $window.navigator.language || $window.navigator.userLanguage;
console.log("lang: " + lang);
if (lang === 'en-US' || lang === 'en') if (lang === 'en-US' || lang === 'en')
lang = 'en-gb'; lang = 'en-gb';
if (lang === 'es-ES' || lang === 'es') if (lang === 'es-ES' || lang === 'es')
lang = 'es-es'; lang = 'es-es';
$translate.use(lang); $translate.use(lang);
//$translateProvider.preferredLanguage('es-es'); //$translateProvider.preferredLanguage('es-es');
//---------------------------------------------------------------
// Events to listen to
//
// catch logout event wherever it is produced (usually generated by the authInterceptor service) // catch logout event wherever it is produced (usually generated by the authInterceptor service)
$scope.$on('logout', function(event, data) { $scope.$on('logout', function(event, data) {
console.log("caught logout event"); console.log("caught logout event");
$scope.logout(); $scope.logout();
}); });
//---------------------------------------------------------------
// Controller's functions
//
// Returns the full name of the user
$scope.user.getFullName = function(){ $scope.user.getFullName = function(){
return $scope.user.name + " " + $scope.user.surname; return $scope.user.name + " " + $scope.user.surname;
}; };
......
sails/src/assets/app/js/services/services.js
...@@ -16,13 +16,13 @@ angular.module('dashboardServices', []) ...@@ -16,13 +16,13 @@ angular.module('dashboardServices', [])
config.headers = config.headers || {}; config.headers = config.headers || {};
if ($window.sessionStorage.token) { if ($window.sessionStorage.token) {
config.headers.Authorization = 'Bearer ' + $window.sessionStorage.token; config.headers.Authorization = 'Bearer ' + $window.sessionStorage.token;
} else }
$rootScope.$broadcast('logout', null);
return config; return config;
}, },
responseError: function (rejection) { responseError: function (rejection) {
if (rejection.status === 401) { if (rejection.status === 401) {
// handle the case where the user is not authenticated // handle the case where the user is not authenticated
console.log("eerrrorrrrr 401");
// send "logout" to children controllers so main.js controller can catch it and logout // send "logout" to children controllers so main.js controller can catch it and logout
$rootScope.$broadcast('logout', null); $rootScope.$broadcast('logout', null);
......
sails/src/assets/app/modules/login/views/login.html
...@@ -44,10 +44,5 @@ ...@@ -44,10 +44,5 @@
</div> </div>
<!-- Fin de row --> <!-- Fin de row -->
<div class="languages"> <footer-translate></footer-translate>
<div ng-controller="TranslateController" class="btn-group" role="group" aria-label="">
<button type="button" class="btn btn-link" ng-click="changeLanguage('es-es')">Español</button>
<button type="button" class="btn btn-link">|</button>
<button type="button" class="btn btn-link" ng-click="changeLanguage('en-gb')">English</button>
</div>
</div>
\ No newline at end of file
sails/src/assets/app/modules/login/views/login_admin.html
...@@ -40,10 +40,4 @@ ...@@ -40,10 +40,4 @@
</div> </div>
<!-- Fin de row --> <!-- Fin de row -->
<div class="languages"> <footer-translate></footer-translate>
<div ng-controller="TranslateController" class="btn-group" role="group" aria-label=""> \ No newline at end of file
<button type="button" class="btn btn-link" ng-click="changeLanguage('es-es')">Español</button>
<button type="button" class="btn btn-link">|</button>
<button type="button" class="btn btn-link" ng-click="changeLanguage('en-gb')">English</button>
</div>
</div>
\ No newline at end of file
sails/src/assets/app/modules/login/views/login_setting_password.html
...@@ -45,10 +45,4 @@ ...@@ -45,10 +45,4 @@
</div> </div>
<!-- Fin de row --> <!-- Fin de row -->
<div class="languages"> <footer-translate></footer-translate>
<div ng-controller="TranslateController" class="btn-group" role="group" aria-label=""> \ No newline at end of file
<button type="button" class="btn btn-link" ng-click="changeLanguage('es-es')">Español</button>
<button type="button" class="btn btn-link">|</button>
<button type="button" class="btn btn-link" ng-click="changeLanguage('en-gb')">English</button>
</div>
</div>
\ No newline at end of file
sails/src/assets/app/modules/login/views/signin.html
...@@ -101,10 +101,4 @@ ...@@ -101,10 +101,4 @@
</div> </div>
<!-- Fin de container --> <!-- Fin de container -->
<div class="languages"> <footer-translate></footer-translate>
<div ng-controller="TranslateController" class="btn-group" role="group" aria-label=""> \ No newline at end of file
<button type="button" class="btn btn-link" ng-click="changeLanguage('es-es')">Español</button>
<button type="button" class="btn btn-link">|</button>
<button type="button" class="btn btn-link" ng-click="changeLanguage('en-gb')">English</button>
</div>
</div>
\ No newline at end of file
sails/src/assets/app/modules/student/controllers/instructions.js
...@@ -101,13 +101,17 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr ...@@ -101,13 +101,17 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr
// Update method // Update method
$scope.update_method = function(method){ $scope.update_method = function(method){
// Remove instructions as we only update title or description
delete method.instructions;
console.log(JSON.stringify(method));
$http $http
.put(config.backend+'/method/' + method.id, method) .put(config.backend+'/method/' + method.id, method)
.success(function(data, status, headers, config) { .success(function(data, status, headers, config) {
console.log('Updated method:' + JSON.stringify(data)); console.log('Updated method:' + JSON.stringify(data));
}) })
.error(function(data, status, headers, config) { .error(function(data, status, headers, config) {
console.log("Error from API: " + data.error); console.log("Error from API: " + JSON.stringify(data));
}); });
}; };
......
sails/src/assets/app/modules/student/views/instructions.html
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<!-- Method instructions --> <!-- Method instructions -->
<div class="method_details" ng-repeat="m in methods"> <div class="method_details" ng-repeat="m in methods">
<input type="text" class="editable title" ng-model="m.name " ng-change="update_method(m)"/> <input type="text" class="editable title" ng-model="m.name " ng-blur="update_method(m)"/>
<div class="options"> <div class="options">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<a ng-click="delete_method(m)" popover="{{ 'delete' | translate}}" popover-trigger="mouseenter"><span class="text_medium delete color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span></a> <a ng-click="delete_method(m)" popover="{{ 'delete' | translate}}" popover-trigger="mouseenter"><span class="text_medium delete color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span></a>
</div> </div>
<textarea class="editable" ng-model="m.description " placeholder="{{'description' | translate}}" ng-change="update_method(m)"></textarea> <textarea class="editable" ng-model="m.description " placeholder="{{'description' | translate}}" ng-blur="update_method(m)"></textarea>
<!-- Tabla método --> <!-- Tabla método -->
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<td> <td>
<a ng-click="open_instruction(i)"><span class="glyphicon glyphicon-file text_medium" aria-hidden="true"></span></a> <a ng-click="open_instruction(i)"><span class="glyphicon glyphicon-file text_medium" aria-hidden="true"></span></a>
</td> </td>
<td><input class="editable" type="text" ng-model="i.name" ng-change="update_instruction(i)" /></td> <td><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" /></td>
<td><input class="elipsis editable" type="text" ng-model="i.objective" ng-change="update_instruction(i)" /></td> <td><input class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" /></td>
<td class="editable"> <td class="editable">
<div class="text-center"> <div class="text-center">
<span class="color_blue">{{ i.begin | date:"dd-MM-yyyy" }}</span> <span class="color_blue">{{ i.begin | date:"dd-MM-yyyy" }}</span>
......
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