Jose Pinto / foca-modal-nota-pedido

Commit 1f343e7653db07e2557230cffefebd3c11e9667c

Authored by Pablo Marco del Pont 2018-11-08 17:15:45 -0300

Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request modulos-npm/foca-modal-nota-pedido!1

Showing 4 changed files Show diff stats

gulpfile.js

Diff comments View file @ 1f343e7

 const templateCache = require('gulp-angular-templatecache');
 const concat        = require('gulp-concat');
 const htmlmin       = require('gulp-htmlmin');
 const rename        = require('gulp-rename');
 const uglify        = require('gulp-uglify');
 const gulp          = require('gulp');
 const pump          = require('pump');
 const jshint        = require('gulp-jshint');
 const replace       = require('gulp-replace');
 const connect       = require('gulp-connect');
 const clean         = require('gulp-clean');
 var paths = {
     srcJS:    'src/js/*.js',
     srcViews: 'src/views/*.html',
     tmp:      'tmp',
     dist:     'dist/'
 };
 gulp.task('clean', function() {
     return gulp.src(['tmp', 'dist'], {read: false})
     .pipe(clean());
 });
 gulp.task('templates', ['clean'], function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaModalNotaPedido',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-modal-nota-pedido.js'),
             replace('src/views/', ''),
             replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda']", '[]'),
             gulp.dest(paths.tmp),
             rename('foca-modal-nota-pedido.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('pre-commit', function() {
     return pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
     gulp.start('uglify');
 });
 gulp.task('webserver', function() {
     pump [
         connect.server({port: 3000})
     ]
 });
-gulp.task('clean-post-install', function(){
+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('default', ['webserver']);
 gulp.task('watch', function() {
-    gulp.watch([paths.srcJS, paths.srcViews], ['copy'])
+    gulp.watch([paths.srcJS, paths.srcViews], ['uglify'])
 });
-gulp.task('copy', ['uglify'], function(){
+gulp.task('copy', ['uglify'], function() {
     gulp.src('dist/*.js')
     .pipe(gulp.dest('../../wrapper-demo/node_modules/foca-modal-nota-pedido/dist'));
 });
+gulp.task('watchAndCopy', function() {
+    return gulp.watch([paths.srcJS, paths.srcViews], ['copy']);
+});

src/js/controller.js

Diff comments View file @ 1f343e7

 angular.module('focaModalNotaPedido')
     .controller('focaModalNotaPedidoController',
         [
             '$filter',
             '$scope',
             '$uibModalInstance',
             'parametroNotaPedido',
             'focaModalNotaPedidoService',
             function($filter, $scope, $uibModalInstance, parametroNotaPedido,
                 focaModalNotaPedidoService
             ) {
                 $scope.simbolo = parametroNotaPedido.simbolo;
                 $scope.filters = '';
                 $scope.notasPedido = [];
                 $scope.primerBusqueda = false;
                 $scope.searchLoading = false;
                 // pagination
                 $scope.numPerPage = 10;
                 $scope.currentPage = 1;
                 $scope.filteredNotasPedido = [];
                 $scope.currentPageNotasPedido = [];
                 $scope.selectedNotaPedido = -1;
                 //METODOS
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
                         $scope.searchLoading = true;
-                        if(parametroNotaPedido.idLista > 0) {
+                        focaModalNotaPedidoService.getNotasPedido().then(llenarDatos);
-                            focaModalNotaPedidoService
-                                .getNotasPedidoByIdLista(parametroNotaPedido.idLista, $scope.filters)
-                                .then(llenarDatos);
-                        } else if(parametroNotaPedido.idLista === -1) {
-                            focaModalNotaPedidoService.getNotasPedido()
-                                                        .then(llenarDatos);
-                        }
                     }
                 };
                 function llenarDatos(res) {
                     for(var i = 0; i < res.data.length; i++) {
-                            res.data[i].precio = res.data[i].precio / parametroNotaPedido.cotizacion;
+                            res.data[i].precio =
+                                res.data[i].precio / parametroNotaPedido.cotizacion;
                     }
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
                     $scope.notasPedido = res.data;
                     $scope.search();
                     primera();
                 }
                 $scope.search = function() {
                     if($scope.notasPedido.length > 0) {
                         $scope.filteredNotasPedido = $filter('filter')(
                             $scope.notasPedido,
                             {$: $scope.filters}
                         );
                         $scope.lastPage = Math.ceil(
                             $scope.filteredNotasPedido.length / $scope.numPerPage
                         );
                         $scope.resetPage();
                     }
                 };
                 $scope.resetPage = function() {
                     $scope.currentPage = 1;
                     $scope.selectPage(1);
                 };
                 $scope.selectPage = function(page) {
                     var start = (page - 1) * $scope.numPerPage;
                     var end = start + $scope.numPerPage;
                     $scope.paginas = [];
                     $scope.paginas = calcularPages(page);
                     $scope.currentPageNotasPedido = $scope.filteredNotasPedido.slice(start, end);
                     $scope.currentPage = page;
                 };
                 $scope.select = function(notaPedido) {
                     $uibModalInstance.close(notaPedido);
                 };
                 $scope.cancel = function() {
                     $uibModalInstance.dismiss('cancel');
                 };
                 $scope.busquedaDown = function(key) {
                     if (key === 40) {
                         primera(key);
                     }
                 };
                 $scope.itemNotaPedido = function(key) {
                     if (key === 38) {
                         anterior(key);
                     }
                     if (key === 40) {
                         siguiente(key);
                     }
                     if (key === 37) {
                         retrocederPagina();
                     }
                     if (key === 39) {
                         avanzarPagina();
                     }
                 };
                 function calcularPages(paginaActual) {
                     var paginas = [];
                     paginas.push(paginaActual);
                     if (paginaActual - 1 > 1) {
                         paginas.unshift(paginaActual - 1);
                         if (paginaActual - 2 > 1) {
                             paginas.unshift(paginaActual - 2);
                         }
                     }
                     if (paginaActual + 1 < $scope.lastPage) {
                         paginas.push(paginaActual + 1);
                         if (paginaActual + 2 < $scope.lastPage) {
                             paginas.push(paginaActual + 2);
                         }
                     }
                     if (paginaActual !== 1) {
                         paginas.unshift(1);
                     }
                     if (paginaActual !== $scope.lastPage) {
                         paginas.push($scope.lastPage);
                     }
                     return paginas;
                 }
                 function primera() {
                     $scope.selectedNotaPedido = 0;
                 }
                 function anterior() {
                     if ($scope.selectedNotaPedido === 0 && $scope.currentPage > 1) {
                         retrocederPagina();
                     } else {
                         $scope.selectedNotaPedido--;
                     }
                 }
                 function siguiente() {
                     if ($scope.selectedNotaPedido < $scope.currentPageNotasPedido.length - 1 ) {
                         $scope.selectedNotaPedido++;
                     } else {
                             avanzarPagina();
                     }
                 }
                 function retrocederPagina() {
                     if ($scope.currentPage > 1) {
                         $scope.selectPage($scope.currentPage - 1);
                         $scope.selectedNotaPedido = $scope.numPerPage - 1;
                     }
                 }
                 function avanzarPagina() {
                     if ($scope.currentPage < $scope.lastPage) {
                         $scope.selectPage($scope.currentPage + 1);
                         $scope.selectedNotaPedido = 0;
                     }
                 }
             }
         ]
     );

src/js/service.js

Diff comments View file @ 1f343e7

 angular.module('focaModalNotaPedido')
     .service('focaModalNotaPedidoService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getNotasPedido: function() {
-                    return $http.get(API_ENDPOINT.URL + '/articulos');
+                    return $http.get(API_ENDPOINT.URL + '/nota-pedido');
-                },
-                getNotasPedidoByIdLista: function(id, filters) {
-                    return $http.post(API_ENDPOINT.URL + '/articulos/lista',
-                        {filters: filters, id: id});
                 }
             };
         }
     ]);

src/views/foca-modal-nota-pedido.html

Diff comments View file @ 1f343e7

 <div class="modal-header py-1">
     <h5 class="modal-title">Busqueda de Nota de Pedido</h5>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group">
         <input
             ladda="searchLoading"
             type="text"
             class="form-control"
             placeholder="Busqueda"
             ng-model="filters"
             ng-change="search()"
             ng-keydown="busquedaDown($event.keyCode)"
             ng-keypress="busquedaPress($event.keyCode)"
             foca-focus="selectedNotaPedido == -1"
             ng-focus="selectedNotaPedido = -1"
         >
         <div class="input-group-append">
             <button
                 ladda="searchLoading"
                 class="btn btn-outline-secondary"
                 type="button"
                 ng-click="busquedaPress(13)"
             >
                 <i class="fa fa-search" aria-hidden="true"></i>
             </button>
         </div>
     </div>
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
-                <th>Sec.</th>
+                <th>Fecha</th>
-                <th>Cod.</th>
+                <th>Cliente</th>
-                <th>Descripción</th>
+                <th>Comprobante</th>
-                <th>P. Base</th>
                 <th></th>
             </tr>
         </thead>
         <tbody>
             <tr ng-show="currentPageNotasPedido.length == 0 && primerBusqueda">
                 <td colspan="5">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr class="selectable"
                 ng-repeat="(key,notaPedido) in currentPageNotasPedido"
                 ng-click="select(notaPedido)">
-                <td ng-bind="notaPedido.sector"></td>
+                <td ng-bind="notaPedido.fechaCarga | date : 'dd/MM/yyyy'"></td>
-                <td ng-bind="notaPedido.codigo"></td>
+                <td ng-bind="notaPedido.nombreCliente"></td>
-                <td ng-bind="notaPedido.descripcion"></td>
+                <td ng-bind="[notaPedido.sucursal, notaPedido.numeroNotaPedido] | comprobante"></td>
-                <td ng-bind="notaPedido.precio | currency: simbolo : 4"></td>
                 <td>
                     <button
                         type="button"
                         class="btn btn-xs p-1 float-right"
                         ng-class="{
                             'btn-secondary': selectedNotaPedido != key,
                             'btn-primary': selectedNotaPedido == key
                         }"
                         foca-focus="selectedNotaPedido == {{key}}"
                         ng-keydown="itemNotaPedido($event.keyCode)"
                     >
                         <i class="fa fa-arrow-right" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
     <nav ng-show="currentPageNotasPedido.length > 0 && primerBusqueda">
         <ul class="pagination pagination-sm justify-content mb-0">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)">
                     <span aria-hidden="true">&laquo;</span>
                     <span class="sr-only">Anterior</span>
                 </a>
             </li>
             <li
                 class="page-item"
                 ng-repeat="pagina in paginas"
                 ng-class="{'active': pagina == currentPage}"
             >
                 <a
                     class="page-link"
                     href="#"
                     ng-click="selectPage(pagina)"
                     ng-bind="pagina"
                 ></a>
             </li>
             <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
                 <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)">
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Siguiente</span>
                 </a>
             </li>
         </ul>
     </nav>
 </div>
 <div class="modal-footer py-1">
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
 </div>