Jose Pinto / foca-abm-precios-condiciones

Download as
Browse Code ยป

Commit 24e882ee92c0a2bc5655208f0da87f7fc4a053d7

Authored by Jose Pinto
1 parent 75d79b6832
Exists in master

agrego foca-botonera-lateral

Showing 5 changed files with 32 additions and 25 deletions   Show diff stats
... ... @@ -8,7 +8,7 @@
8 8 "compile": "gulp uglify",
9 9 "gulp-pre-commit": "gulp pre-commit",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "install-dev": "npm install -D jasmine-core pre-commit angular angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify gulp-replace jquery jshint pump git+https://192.168.0.11/modulos-npm/foca-modal.git"
  11 + "install-dev": "npm install -D jasmine-core pre-commit angular angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify gulp-replace jquery jshint pump git+http://git.focasoftware.com/npm/foca-modal.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -37,7 +37,7 @@
37 37 "angular": "^1.7.4",
38 38 "angular-route": "^1.7.5",
39 39 "bootstrap": "^4.1.3",
40   - "foca-modal": "git+https://192.168.0.11/modulos-npm/foca-modal.git",
  40 + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git",
41 41 "font-awesome": "^4.7.0",
42 42 "gulp": "^3.9.1",
43 43 "gulp-angular-templatecache": "^2.2.1",
1   -angular.module('focaAbmPreciosCondiciones', ['ngRoute', 'ui.bootstrap', 'focaModal']);
  1 +angular.module('focaAbmPreciosCondiciones', [
  2 + 'ngRoute',
  3 + 'ui.bootstrap',
  4 + 'focaModal',
  5 + 'focaBotoneraLateral'
  6 +]);
src/js/controller.js
Diff comments   View file @ 24e882e
1 1 angular.module('focaAbmPreciosCondiciones')
2 2 .controller('focaAbmPreciosCondicionesController', [
3   - '$scope', 'focaAbmPreciosCondicionesService', '$location', 'focaModalService',
4   - function($scope, focaAbmPreciosCondicionesService, $location, focaModalService) {
  3 + '$scope', 'focaAbmPreciosCondicionesService', '$location',
  4 + 'focaModalService', 'focaBotoneraLateralService', '$timeout',
  5 + function($scope, focaAbmPreciosCondicionesService, $location,
  6 + focaModalService, focaBotoneraLateralService, $timeout) {
5 7 focaAbmPreciosCondicionesService.obtenerPreciosCondiciones().then(function(datos) {
6 8 $scope.preciosCondiciones = datos.data;
7 9 });
  10 +
  11 + $timeout(function() {
  12 + focaBotoneraLateralService.showSalir(true);
  13 + focaBotoneraLateralService.showPausar(false);
  14 + focaBotoneraLateralService.showCancelar(false);
  15 + focaBotoneraLateralService.showGuardar(false);
  16 + });
  17 +
8 18 $scope.editar = function(id) {
9 19 $location.path('/precio-condicion/' + id);
10 20 };
... ... @@ -25,11 +35,11 @@ angular.module('focaAbmPreciosCondiciones')
25 35 }
26 36 ])
27 37 .controller('focaAbmPrecioCondicionController', [
28   - '$scope', 'focaAbmPreciosCondicionesService',
29   - '$routeParams', '$location', 'focaModalService',
  38 + '$scope', 'focaAbmPreciosCondicionesService', 'focaBotoneraLateralService',
  39 + '$routeParams', '$location', 'focaModalService', '$timeout',
30 40 function(
31   - $scope, focaAbmPreciosCondicionesService,
32   - $routeParams, $location, focaModalService
  41 + $scope, focaAbmPreciosCondicionesService, focaBotoneraLateralService,
  42 + $routeParams, $location, focaModalService, $timeout
33 43 ) {
34 44 $scope.mostrarPlazos = $routeParams.id > 0;
35 45 focaAbmPreciosCondicionesService.obtenerPrecioCondicion($routeParams.id)
... ... @@ -50,6 +60,14 @@ angular.module('focaAbmPreciosCondiciones')
50 60 });
51 61 }
52 62 });
  63 +
  64 + $timeout(function() {
  65 + focaBotoneraLateralService.showSalir(false);
  66 + focaBotoneraLateralService.showPausar(true);
  67 + focaBotoneraLateralService.showCancelar(true);
  68 + focaBotoneraLateralService.showGuardar(true, $scope.guardar);
  69 + });
  70 +
53 71 $scope.cancelar = function() {
54 72 $location.path('/precio-condicion');
55 73 };
src/views/foca-abm-precios-condiciones-item.html
Diff comments   View file @ 24e882e
... ... @@ -87,15 +87,4 @@
87 87 </table>
88 88 </div>
89 89 </div>
90   - <div class="form-group row">
91   - <div class="col-sm-7 text-right">
92   - <button class="btn btn-primary" ng-click="guardar(precioCondicion)">Guardar</button>
93   - <button class="btn btn-default" ng-click="cancelar()">Cancelar</button>
94   - </div>
95   - </div>
96 90 </form>
97   -<a href="#!/" title="Salir"
98   - class="btn btn-secondary btn-block float-right col-md-2"
99   ->
100   - Salir
101   -</a>
102 91 \ No newline at end of file
src/views/foca-abm-precios-condiciones-listado.html
Diff comments   View file @ 24e882e
... ... @@ -28,8 +28,3 @@
28 28 </tbody>
29 29 </table>
30 30 </div>
31   -<a href="#!/" title="Salir"
32   - class="btn btn-secondary btn-block float-right col-md-2"
33   ->
34   - Salir
35   -</a>