Marcelo Puebla / foca-busqueda-cliente

Commit 8c088fc687f4bcbac401f1e6f08be8df052888ec

Authored by Pablo Marco del Pont 2018-10-03 16:32:41 -0300

- Modifiqué gulp para que uglifique despues de generar templates.

- Agregué método para procesar el cliente seleccionado.
- Agregué on select al componente typeahead.

Showing 3 changed files with 11 additions and 7 deletions Show diff stats

gulpfile.js

Diff comments View file @ 8c088fc

 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-es').default;
 const gulp          = require('gulp');
 const pump          = require('pump');
 const jshint        = require('gulp-jshint');
 var paths = {
     srcJS: 'src/js/*.js',
     srcViews: 'src/views/*.html',
     tmp:   'tmp',
     dist:  'dist/'
 };
 gulp.task('templates', function() {
     pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaBusquedaCliente',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
-gulp.task('uglify', function() {
+gulp.task('uglify', ['templates'], function() {
     pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-busqueda-cliente.js'),
             gulp.dest(paths.tmp),
             rename('foca-busqueda-cliente.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
 });
-gulp.task('compile', ['templates', 'uglify']);

src/js/controller.js

Diff comments View file @ 8c088fc

 angular.module('focaBusquedaCliente')
     .controller('focaBusquedaClienteController', [
         '$scope',
         '$uibModal',
         function($scope, $uibModal) {
             $scope.abrirModal = function() {
                 $uibModal.open({
                     animation: false,
                     templateUrl: 'foca-busqueda-cliente-modal.html',
                     backdrop: false,
                     controller: 'focaBusquedaClienteModalController'
+                }).result.then(function(cliente){
+                    console.log(cliente);
                 });
             };
         }
     ])
     .controller('focaBusquedaClienteModalController', [
         '$uibModalInstance',
         'focaBusquedaClienteService',
         '$scope',
         function($uibModalInstance, focaBusquedaClienteService, $scope) {
             $scope.obtenerClientesPorNombreOCuit = function(textoBusqueda) {
                 return focaBusquedaClienteService
                     .obtenerClientesPorNombreOCuit(textoBusqueda)
                     .then(function(datos) {
                         return datos.data;
                     });
             };
+            $scope.seleccionar = function(cliente) {
+                $scope.cliente = cliente;
+            };
             $scope.cancelar = function() {
-                $uibModalInstance.close();
+                $uibModalInstance.dismiss();
             };
-            $scope.seleccionar = function() {
+            $scope.aceptar = function() {
-                $uibModalInstance.close();
+                $uibModalInstance.close($scope.cliente);
             };
         }
     ]);

src/views/foca-busqueda-cliente-modal.html

Diff comments View file @ 8c088fc

 <div class="modal-header">
     <h3 class="modal-title">Búsqueda de cliente</h3>
 </div>
 <div class="modal-body">
     <form>
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Nombre o CUIT</label>
             <div class="col-sm-8">
                 <input
                     type="text"
                     ng-model="cliente"
                     placeholder="Nombre o CUIT"
                     uib-typeahead="
                         cliente.nom + ' (' + cliente.cuit + ')'
                         for cliente
                         in obtenerClientesPorNombreOCuit($viewValue)
                     "
                     typeahead-loading="cargandoClientes"
                     typeahead-no-results="sinResultados"
                     typeahead-min-length="3"
+                    typeahead-on-select="seleccionar($item)"
                     class="form-control"
                 >
                 <i ng-show="cargandoClientes" class="fas fa-sync"></i>
                 <div ng-show="sinResultados">
                     <i class="fas fa-minus"></i> No se encontraron resultados.
                 </div>
             </div>
         </div>
     </form>
 </div>
 <div class="modal-footer">
-    <button ng-click="seleccionar()">Seleccionar</button>
+    <button ng-click="aceptar()">Aceptar</button>
     <button ng-click="cancelar()">Cancelar</button>
 </div>