Jose Pinto / foca-abm-plazo-pago

Commit 2ee7e088211b797156b35d9847bd42d7d163d3ed

Authored by Eric Fernandez 2018-10-17 10:54:56 -0300

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

gulpfile.js

Diff comments View file @ 2ee7e08

 const clean         = require('gulp-clean');
 const concat        = require('gulp-concat');
 const connect       = require('gulp-connect');
 const gulp          = require('gulp');
 const htmlmin       = require('gulp-htmlmin');
 const jshint        = require('gulp-jshint');
 const pump          = require('pump');
 const rename        = require('gulp-rename');
 const replace       = require('gulp-replace');
 const templateCache = require('gulp-angular-templatecache');
 const uglify        = require('gulp-uglify-es').default;
 var paths = {
     dist:  'dist/',
     srcJS: 'src/js/*.js',
     srcViews: 'src/views/*.html',
     tmp:   'tmp'
 };
 gulp.task('templates', ['clean'], function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaAbmPlazoPago',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-abm-plazo-pago.js'),
+            replace("['ngRoute', 'ui.bootstrap', 'focaModal']", '[]'),
             replace('src/views/', ''),
             replace("['ngRoute', 'ui.bootstrap']", '[]'),
             gulp.dest(paths.tmp),
             rename('foca-abm-plazo-pago.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('clean', function(){
     return gulp.src(['tmp', 'dist'], {read: false})
     .pipe(clean());
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
 });
 gulp.task('clean-post-install', function() {
     return gulp.src([
         'src', 'tmp', '.jshintrc', 'readme.md', '.gitignore', 'gulpfile.js', 'index.html'
     ], {read: false})
     .pipe(clean());
 });
 gulp.task('webserver', function() {
     pump [
         connect.server({port: 3000})
     ]
 });
 gulp.task('default', ['webserver']);

index.html

Diff comments View file @ 2ee7e08

 <html ng-app="focaAbmPlazoPago">
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <!--CSS-->
         <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
         <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
         <!--VENDOR JS-->
         <script src="node_modules/jquery/dist/jquery.min.js"></script>
         <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="node_modules/angular/angular.min.js"></script>
         <script src="node_modules/angular-route/angular-route.min.js"></script>
         <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
+        <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
         <!-- BUILD -->
         <script src="src/js/app.js"></script>
         <script src="src/js/route.js"></script>
         <script src="src/js/controller.js"></script>
         <script src="src/js/service.js"></script>
         <script src="src/etc/develop.js"></script>
         <!-- /BUILD -->
     </head>
     <body>
         <div ng-view></div>
     </body>
 </html>

package.json

Diff comments View file @ 2ee7e08

 {
     "name": "foca-abm-plazo-pago",
     "version": "1.0.0",
     "description": "ABM de Plazos de Pago",
     "main": "dist/foca-abm-plazo-pago.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "compile": "gulp uglify",
         "gulp-pre-commit": "gulp pre-commit",
         "postinstall": "npm run compile && gulp clean-post-install",
-        "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"
+        "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"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "https://192.168.0.11/modulos-npm/foca-abm-plazo-pago.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "angular": "^1.7.x",
         "bootstrap": "^4.1.x",
         "jquery": "^3.3.x",
         "font-awesome": "^4.7.x",
         "gulp": "^3.9.x",
         "gulp-concat": "2.6.x",
         "gulp-jshint": "^2.1.x",
         "gulp-rename": "^1.4.x",
         "gulp-replace": "^1.0.x",
         "gulp-uglify-es": "^1.0.x",
         "jshint": "^2.9.x",
         "pump": "^3.0.x"
     },
     "devDependencies": {
         "angular": "^1.7.5",
         "angular-route": "^1.7.5",
         "bootstrap": "^4.1.3",
+        "foca-modal": "git+https://192.168.0.11/modulos-npm/foca-modal.git",
         "font-awesome": "^4.7.0",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.2",
         "gulp-clean": "^0.4.0",
         "gulp-connect": "^5.6.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-jshint": "^2.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-sequence": "^1.0.0",
+        "gulp-uglify": "^3.0.1",
         "gulp-uglify-es": "^1.0.4",
         "jasmine-core": "^3.2.1",
         "jquery": "^3.3.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0",
         "ui-bootstrap4": "^3.0.5"
     }
 }

src/js/app.js

Diff comments View file @ 2ee7e08

1	angular.module('focaAbmPlazoPago', ['ngRoute', 'ui.bootstrap']);	1	angular.module('focaAbmPlazoPago', ['ngRoute', 'ui.bootstrap', 'focaModal']);
2		2

src/js/controller.js

Diff comments View file @ 2ee7e08

 angular.module('focaAbmPlazoPago')
     .controller('focaAbmPlazosPagoController', [
-        '$scope', 'focaAbmPlazoPagoService', '$location', '$uibModal',
+        '$scope', 'focaAbmPlazoPagoService', '$location', 'focaModalService',
-        function($scope, focaAbmPlazoPagoService, $location, $uibModal) {
+        function($scope, focaAbmPlazoPagoService, $location, focaModalService) {
             focaAbmPlazoPagoService.obtenerPlazosPago().then(function(datos) {
                 $scope.plazosPago = datos.data;
             });
             $scope.editar = function(idPreciosCondiciones, id) {
                 $location.path('/precio-condicion/' + idPreciosCondiciones + '/plazo-pago/' + id);
             };
             $scope.solicitarConfirmacion = function(plazoPago) {
-                $uibModal.open({
+                focaModalService.confirm('¿Está seguro que desea borrar el plazo de pago '+
-                    templateUrl: 'foca-abm-plazos-pago-modal-confirmar.html',
+                plazoPago.item+' '+plazoPago.dias+' ?').then(
-                    controller: 'focaAbmPlazosPagoModalConfirmarController',
+                    function(confirm) {
-                    animation: false,
+                        if(confirm){
-                    backdrop: false,
+                            focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);
-                    resolve: {plazoPago: function(){return plazoPago;}}
+                            $scope.plazosPago.splice(
-                })
+                            $scope.plazosPago.indexOf(plazoPago), 1
-                .result.then(function(plazoPago){
+                        );
-                    focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);
+                        }
-                    $scope.plazosPago.splice(
+                    }
-                        $scope.plazosPago.indexOf(plazoPago), 1
+                );
-                    );
-                });
             };
         }
     ])
     .controller('focaAbmPlazoPagoController', [
         '$scope', 'focaAbmPlazoPagoService',
         '$routeParams', '$location',
         function(
             $scope, focaAbmPlazoPagoService,
             $routeParams, $location
         ) {
             focaAbmPlazoPagoService.obtenerPlazoPago($routeParams.id)
                 .then(function(datos) {
                     $scope.plazoPago = {
                         id: 0,
                         idPreciosCondiciones: $routeParams.idPreciosCondiciones,
                         item: '',
                         dias: ''
                     };
                     if(datos.data.id) {
                         $scope.plazoPago = datos.data;
                     }
                 });
             $scope.cancelar = function() {
                 $location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);
             };
             $scope.guardar = function(plazoPago) {
                 focaAbmPlazoPagoService.guardarPlazoPago(plazoPago)
                     .then(function() {
                         $location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);
                     });
             };
         }
-    ])
-    .controller('focaAbmPlazosPagoModalConfirmarController', [
-        '$uibModalInstance', '$scope', 'plazoPago',
-        function($uibModalInstance, $scope, plazoPago) {
-            $scope.plazoPago = plazoPago;
-            $scope.cancelar = function() {
-                $uibModalInstance.dismiss();
-            };
-            $scope.borrar = function() {
-                $uibModalInstance.close(plazoPago);
-            };
-        }
     ]);

src/views/foca-abm-plazos-pago-modal-confirmar.html

View file @ 2ee7e08

1	<div class="modal-header">		File was deleted
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>
14		1	<div class="modal-header">