Jose Pinto / foca-abm-plazo-pago

Download as
Browse Code »

Commit 2ee7e088211b797156b35d9847bd42d7d163d3ed

Authored by Eric Fernandez
2 parents 79388fea63 d0f2b9d9f6
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request modulos-npm/foca-abm-plazo-pago!2
Showing 6 changed files   Show diff stats
... ... @@ -39,6 +39,7 @@ gulp.task('uglify', ['templates'], function() {
39 39 'tmp/views.js'
40 40 ]),
41 41 concat('foca-abm-plazo-pago.js'),
  42 + replace("['ngRoute', 'ui.bootstrap', 'focaModal']", '[]'),
42 43 replace('src/views/', ''),
43 44 replace("['ngRoute', 'ui.bootstrap']", '[]'),
44 45 gulp.dest(paths.tmp),
... ... @@ -13,6 +13,7 @@
13 13 <script src="node_modules/angular/angular.min.js"></script>
14 14 <script src="node_modules/angular-route/angular-route.min.js"></script>
15 15 <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
  16 + <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
16 17  
17 18 <!-- BUILD -->
18 19 <script src="src/js/app.js"></script>
... ... @@ -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 jquery jshint pump"
  11 + "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route bootstrap ui-bootstrap4 font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+https://192.168.0.11/modulos-npm/foca-modal.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -37,6 +37,7 @@
37 37 "angular": "^1.7.5",
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 41 "font-awesome": "^4.7.0",
41 42 "gulp": "^3.9.1",
42 43 "gulp-angular-templatecache": "^2.2.2",
... ... @@ -47,6 +48,7 @@
47 48 "gulp-rename": "^1.4.0",
48 49 "gulp-replace": "^1.0.0",
49 50 "gulp-sequence": "^1.0.0",
  51 + "gulp-uglify": "^3.0.1",
50 52 "gulp-uglify-es": "^1.0.4",
51 53 "jasmine-core": "^3.2.1",
52 54 "jquery": "^3.3.1",
1   -angular.module('focaAbmPlazoPago', ['ngRoute', 'ui.bootstrap']);
  1 +angular.module('focaAbmPlazoPago', ['ngRoute', 'ui.bootstrap', 'focaModal']);
src/js/controller.js
Diff comments   View file @ 2ee7e08
1 1 angular.module('focaAbmPlazoPago')
2 2 .controller('focaAbmPlazosPagoController', [
3   - '$scope', 'focaAbmPlazoPagoService', '$location', '$uibModal',
4   - function($scope, focaAbmPlazoPagoService, $location, $uibModal) {
  3 + '$scope', 'focaAbmPlazoPagoService', '$location', 'focaModalService',
  4 + function($scope, focaAbmPlazoPagoService, $location, focaModalService) {
5 5 focaAbmPlazoPagoService.obtenerPlazosPago().then(function(datos) {
6 6 $scope.plazosPago = datos.data;
7 7 });
... ... @@ -9,19 +9,17 @@ angular.module(&#39;focaAbmPlazoPago&#39;)
9 9 $location.path('/precio-condicion/' + idPreciosCondiciones + '/plazo-pago/' + id);
10 10 };
11 11 $scope.solicitarConfirmacion = function(plazoPago) {
12   - $uibModal.open({
13   - templateUrl: 'foca-abm-plazos-pago-modal-confirmar.html',
14   - controller: 'focaAbmPlazosPagoModalConfirmarController',
15   - animation: false,
16   - backdrop: false,
17   - resolve: {plazoPago: function(){return plazoPago;}}
18   - })
19   - .result.then(function(plazoPago){
20   - focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);
21   - $scope.plazosPago.splice(
22   - $scope.plazosPago.indexOf(plazoPago), 1
23   - );
24   - });
  12 + focaModalService.confirm('¿Está seguro que desea borrar el plazo de pago '+
  13 + plazoPago.item+' '+plazoPago.dias+' ?').then(
  14 + function(confirm) {
  15 + if(confirm){
  16 + focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);
  17 + $scope.plazosPago.splice(
  18 + $scope.plazosPago.indexOf(plazoPago), 1
  19 + );
  20 + }
  21 + }
  22 + );
25 23 };
26 24 }
27 25 ])
... ... @@ -54,16 +52,4 @@ angular.module(&#39;focaAbmPlazoPago&#39;)
54 52 });
55 53 };
56 54 }
57   - ])
58   - .controller('focaAbmPlazosPagoModalConfirmarController', [
59   - '$uibModalInstance', '$scope', 'plazoPago',
60   - function($uibModalInstance, $scope, plazoPago) {
61   - $scope.plazoPago = plazoPago;
62   - $scope.cancelar = function() {
63   - $uibModalInstance.dismiss();
64   - };
65   - $scope.borrar = function() {
66   - $uibModalInstance.close(plazoPago);
67   - };
68   - }
69 55 ]);
src/views/foca-abm-plazos-pago-modal-confirmar.html
View file @ 2ee7e08
... ... @@ -1,13 +0,0 @@
1   -<div class="modal-header">
2   - <h4>Confirmar</h4>
3   -</div>
4   -<div class="modal-body">
5   - <p>
6   - ¿Está seguro que desea borrar el plazo de pago
7   - {{plazoPago.item}} {{plazoPago.dias}}?
8   - </p>
9   -</div>
10   -<div class="modal-footer">
11   - <button class="btn btn-danger" ng-click="borrar()">Borrar</button>
12   - <button class="btn btn-default" ng-click="cancelar()">Cancelar</button>
13   -</div>