From 83b9e26caf5b266cbb3b745a490671359e1e9955 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 12 Mar 2019 17:38:05 -0300 Subject: [PATCH] agrego cabeceras --- package.json | 6 +++--- src/js/controller.js | 42 ++++++++++++++++++++++++++++++++++++++---- src/js/service.js | 6 ++++++ 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9c5fd11..42f1328 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "author": "", "license": "ISC", "devDependencies": { - "angular": "^1.7.5", + "angular": "^1.7.7", "angular-route": "^1.7.5", - "bootstrap": "^4.2.1", + "bootstrap": "^4.3.1", "gulp": "^3.9.1", "gulp-angular-templatecache": "^2.2.6", "gulp-clean": "^0.4.0", @@ -32,7 +32,7 @@ "gulp-uglify-es": "^1.0.4", "jasmine-core": "^3.3.0", "jquery": "^3.3.1", - "jshint": "^2.9.7", + "jshint": "^2.10.1", "pre-commit": "^1.2.2", "pump": "^3.0.0" } diff --git a/src/js/controller.js b/src/js/controller.js index 0601b9b..c5dd406 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -5,12 +5,15 @@ angular.module('focaConfigurarTerminal') '$location', 'focaConfigurarTerminalService', 'focaBotoneraLateralService', + 'focaModalService', function( $scope, $timeout, $location, focaConfigurarTerminalService, - focaBotoneraLateralService) { + focaBotoneraLateralService, + focaModalService) { + $scope.now = new Date(); $scope.focused = 1; $scope.terminal = { @@ -25,15 +28,46 @@ angular.module('focaConfigurarTerminal') }); $scope.guardar = function() { + focaConfigurarTerminalService - .configTerminal($scope.terminal) - .then(function() { - $location.path('/'); + .nombreEmpresa() + .then(function(res) { + + var json = { + terminal: $scope.terminal, + empresa: res.data.NOM, + idEmpresa: res.data.idEmpresa + }; + + focaConfigurarTerminalService + .guardarTerminalBase(json) + .then(terminalLocal) + .catch(function(err) { + + if(err.status === 404) { + focaModalService.alert('Empresa no configurada'); + return; + } + + focaModalService + .alert('Hubo un error al dar de alta esta terminal'); + }); + }); }; $scope.next = function(key) { + if(key === 13) $scope.focused ++; }; + + function terminalLocal() { + focaConfigurarTerminalService.configTerminal($scope.terminal).then(terminar); + } + + function terminar() { + + $location.path('/'); + } } ]); diff --git a/src/js/service.js b/src/js/service.js index c89747c..cf4148b 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -3,6 +3,12 @@ angular.module('focaConfigurarTerminal') return { configTerminal: function(terminal) { return $http.post(API_ENDPOINT.URL + '/config/terminal', terminal); + }, + nombreEmpresa: function() { + return $http.get(API_ENDPOINT.URL + '/empresa/obtener/primera'); + }, + guardarTerminalBase: function(json) { + return $http.post(API_ENDPOINT.ENDPOINT_BASE + '/terminal/agregar', json); } }; }]); -- 1.9.1