Jose Pinto / foca-modal-vendedores

Commit 69a2c562309919b366bdd981510750466306b103

Authored by Pablo Marco del Pont 2018-10-29 12:46:58 -0300

Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request modulos-npm/foca-modal-vendedores!7

Showing 2 changed files Show diff stats

gulpfile.js

Diff comments View file @ 69a2c56

 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('templates', function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             replace('views/', ''),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaModalVendedores',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-modal-vendedores.js'),
             replace('src/views/', ''),
             replace("['ui.bootstrap', 'focaDirectivas']", '[]'),
             gulp.dest(paths.tmp),
             rename('foca-modal-vendedores.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(){
     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], ['uglify'])
+});

src/views/modal-vendedores.html

Diff comments View file @ 69a2c56

-<div class="modal-header">
+<div class="modal-header py-1">
-    <h3 class="modal-title">Búsqueda de vendedores</h3>
+    <h5 class="modal-title">Búsqueda de vendedores</h5>
 </div>
 <div class="modal-body" id="modal-body">
-    <div class="input-group mb-3">
+    <div class="input-group">
         <input
             type="text"
-            class="form-control"
+            class="form-control form-control-sm"
             placeholder="Busqueda"
             ng-model="filters"
             ng-change="search()"
             ng-keydown="busquedaDown($event.keyCode)"
             ng-keypress="busquedaPress($event.keyCode)"
             foca-focus="selectedVendedor == -1"
             ng-focus="selectedVendedor = -1"
         >
         <table class="table table-striped table-sm">
             <thead>
                 <tr>
                     <th>Código</th>
                     <th>Nombre</th>
                     <th></th>
                 </tr>
             </thead>
             <tbody>
                 <tr class="selected"
                     ng-repeat="(key, vendedor) in currentPageVendedores"
                     ng-click="select(vendedor)">
                     <td ng-bind="vendedor.CodVen"></td>
                     <td ng-bind="vendedor.NomVen"></td>
                     <td>
                         <button
                             type="button"
-                            class="btn  p-2 float-right"
+                            class="btn btn-xs p-1 float-right"
                             ng-class="{
                                 'btn-secondary': selectedVendedor != key,
                                 'btn-primary': selectedVendedor == key
                             }"
                             foca-focus="selectedVendedor == {{key}}"
                             ng-keydown="itemVendedor($event.keyCode)">
                             <i class="fa fa-arrow-right" aria-hidden="true"></i>
                         </button>
                     </td>
                 </tr>
             </tbody>
         </table>
         <nav>
-            <ul class="pagination justify-content-end">
+            <ul class="pagination pagination-sm justify-content-end 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>
-<div class="modal-footer">
-    <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
-</div>
+<div class="modal-footer py-1">