Marcelo Puebla / foca-modal-domicilio

Commit 0ef5d3052c0653add9ae829248ea101666b85525

Authored by Marcelo Puebla 2019-11-11 17:08:53 -0300

Exists in develop

Merge branch 'master' into 'develop'

Master(benjamin)

See merge request !21

Showing 3 changed files Show diff stats

gulpfile.js

Diff comments View file @ 0ef5d30

1	const templateCache = require('gulp-angular-templatecache');	1	const templateCache = require('gulp-angular-templatecache');
2	const concat = require('gulp-concat');	2	const concat = require('gulp-concat');
3	const htmlmin = require('gulp-htmlmin');	3	const htmlmin = require('gulp-htmlmin');
4	const rename = require('gulp-rename');	4	const rename = require('gulp-rename');
5	const uglify = require('gulp-uglify');	5	const uglify = require('gulp-uglify');
6	const gulp = require('gulp');	6	const gulp = require('gulp');
7	const pump = require('pump');	7	const pump = require('pump');
8	const jshint = require('gulp-jshint');	8	const jshint = require('gulp-jshint');
9	const replace = require('gulp-replace');	9	const replace = require('gulp-replace');
10	const connect = require('gulp-connect');	10	const connect = require('gulp-connect');
11	const clean = require('gulp-clean');	11	const clean = require('gulp-clean');
12		12
13	var paths = {	13	var paths = {
14	srcJS: 'src/js/*.js',	14	srcJS: 'src/js/*.js',
15	srcViews: 'src/views/*.html',	15	srcViews: 'src/views/*.html',
16	tmp: 'tmp',	16	tmp: 'tmp',
17	dist: 'dist/'	17	dist: 'dist/'
18	};	18	};
19		19
20	gulp.task('templates', function() {	20	gulp.task('templates', function() {
21	return pump(	21	return pump(
22	[	22	[
23	gulp.src(paths.srcViews),	23	gulp.src(paths.srcViews),
24	htmlmin(),	24	htmlmin(),
25	templateCache('views.js', {	25	templateCache('views.js', {
26	module: 'focaModalDomicilio',	26	module: 'focaModalDomicilio',
27	root: ''	27	root: ''
28	}),	28	}),
29	gulp.dest(paths.tmp)	29	gulp.dest(paths.tmp)
30	]	30	]
31	);	31	);
32	});	32	});
33		33
34	gulp.task('uglify', ['templates'], function() {	34	gulp.task('uglify', ['templates'], function() {
35	return pump(	35	return pump(
36	[	36	[
37	gulp.src([	37	gulp.src([
38	paths.srcJS,	38	paths.srcJS,
39	'tmp/views.js'	39	'tmp/views.js'
40	]),	40	]),
41	concat('foca-modal-domicilios.js'),	41	concat('foca-modal-domicilio.js'),
42	replace('src/views/', ''),	42	replace('src/views/', ''),
43	replace("['ui.bootstrap', 'focaDirectivas', 'focaModal']", '[]'),	43	replace("['ui.bootstrap', 'focaDirectivas', 'focaModal']", '[]'),
44	gulp.dest(paths.tmp),	44	gulp.dest(paths.tmp),
45	rename('foca-modal-domicilios.min.js'),	45	rename('foca-modal-domicilio.min.js'),
46	uglify(),	46	uglify(),
47	gulp.dest(paths.dist)	47	gulp.dest(paths.dist)
48	]	48	]
49	);	49	);
50	});	50	});
51		51
52	gulp.task('pre-commit', function() {	52	gulp.task('pre-commit', function() {
53	return pump(	53	return pump(
54	[	54	[
55	gulp.src(paths.srcJS),	55	gulp.src(paths.srcJS),
56	jshint('.jshintrc'),	56	jshint('.jshintrc'),
57	jshint.reporter('default'),	57	jshint.reporter('default'),
58	jshint.reporter('fail')	58	jshint.reporter('fail')
59	]	59	]
60	);	60	);
61		61
62	gulp.start('uglify');	62	gulp.start('uglify');
63	});	63	});
64		64
65	gulp.task('webserver', function() {	65	gulp.task('webserver', function() {
66	pump [	66	pump [
67	connect.server({port: 3000})	67	connect.server({port: 3000})
68	]	68	]
69	});	69	});
70		70
71	gulp.task('clean-post-install', function(){	71	gulp.task('clean-post-install', function(){
72	return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',	72	return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
73	'index.html'], {read: false})	73	'index.html'], {read: false})
74	.pipe(clean());	74	.pipe(clean());
75	});	75	});
76		76
77	gulp.task('default', ['webserver']);	77	gulp.task('default', ['webserver']);
78		78
79	gulp.task('watch', function() {	79	gulp.task('watch', function() {
80	gulp.watch([paths.srcJS, paths.srcViews], ['uglify'])	80	gulp.watch([paths.srcJS, paths.srcViews], ['uglify'])
81	});	81	});
82		82

package.json

Diff comments View file @ 0ef5d30

 {
   "name": "foca-modal-domicilio",
   "version": "0.0.1",
   "description": "Modal para busqueda de domicilios",
   "scripts": {
+    "refresh": "gulp uglify && cp tmp/foca-modal-domicilio.js ../wrapper-demo/node_modules/foca-modal-domicilio/dist/foca-modal-domicilio.min.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
     "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@debonline.dyndns.org:npm/foca-directivas"
   },
   "pre-commit": [
     "gulp-pre-commit"
   ],
   "repository": {
     "type": "git",
     "url": "http://git.focasoftware.com/npm/foca-modal-domicilio.git"
   },
   "author": "Foca Software",
   "license": "ISC",
   "peerDependencies": {
     "angular": "^1.7.4",
     "bootstrap": "^4.1.3",
     "font-awesome": "^4.7.0",
     "ui-bootstrap4": "^3.0.4",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.1",
     "gulp-concat": "^2.6.1",
     "gulp-connect": "^5.6.1",
     "gulp-htmlmin": "^5.0.1",
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
     "gulp-uglify": "^3.0.1",
     "jquery": "^3.3.1",
     "pump": "^3.0.0",
     "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas"
   },
   "devDependencies": {
     "angular": "^1.7.5",
     "bootstrap": "^4.1.3",
     "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas",
     "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.3",
     "gulp-clean": "^0.4.0",
     "gulp-concat": "^2.6.1",
     "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-uglify": "^3.0.1",
     "jasmine-core": "^3.3.0",
     "jquery": "^3.3.1",
     "jshint": "^2.9.6",
     "pre-commit": "^1.2.2",
     "pump": "^3.0.0",
     "ui-bootstrap4": "^3.0.5"
   }
 }

src/views/modal-domicilio.html

Diff comments View file @ 0ef5d30

 <div class="modal-header py-1">
-    <div class="row w-100">
+    <div class="row w-100 justify-content-between">
-        <div class="col-lg-6">
+        <div class="col-auto">
             <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5>
             <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5>
         </div>
-        <div class="input-group col-lg-6 pr-0 my-2">
+        <div class="col-auto pr-0 my-2">
             <button
                 class="btn btn-outline-debo mr-2"
                 ng-click="ingreso = true"
                 ng-show="!ingreso"
                 title="Nuevo">
                 <i class="fa fa-plus" aria-hidden="true"></i>
             </button>
-            <input
-                type="text"
-                class="form-control form-control-sm"
-                id="search"
-                placeholder="Búsqueda"
-                ng-model="filters"
-                ng-change="search()"
-                ng-keydown="busquedaDown($event.keyCode)"
-                ng-keypress="busquedaPress($event.keyCode)"
-                foca-focus="selectedDomicilio == -1"
-                ng-focus="selectedDomicilio = -1"
-                teclado-virtual
-            >
-            <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>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div ng-show="!primerBusqueda">
         Debe realizar una primer búsqueda.
     </div>
     <div ng-show="!ingreso">
         <table ng-show="!ingreso" class="table table-striped table-sm">
             <thead>
                 <tr>
                     <th>Titulo</th>
                     <th>Calle</th>
                     <th>Localidad</th>
                     <th>Provincia</th>
                     <th></th>
                     <th></th>
                 </tr>
             </thead>
             <tbody>
                 <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda">
                     <td colspan="5">
                         No se encontraron resultados.
                     </td>
                 </tr>
                 <tr class="selectable"
                     ng-repeat="(key,domicilio) in currentPageDomicilios">
                     <td
                         ng-bind="domicilio.titulo"
                         ng-click="select(domicilio)"
                         ></td>
                     <td
                         ng-bind="domicilio.Calle + ' ' + domicilio.Numero"
                         ng-click="select(domicilio)"
                         ></td>
                     <td
                         ng-bind="domicilio.Localidad"
                         ng-click="select(domicilio)"
                         ></td>
                     <td
                         ng-bind="domicilio.Provincia"
                         ng-click="select(domicilio)"
                         ></td>
                     <td>
                         <button
                             type="button"
                             class="btn btn-sm p-1 float-right btn-secondary"
                             ng-click="verPuntosDescarga(key)"
                             title="Puntos de descarga"
                         >
                             <small>PD</small>
                         </button>
                     </td>
                     <td>
                         <button
                             type="button"
                             class="btn btn-sm p-1 float-right"
                             ng-class="{
                                 'btn-secondary': selectedDomicilio != key + 1,
                                 'btn-primary': selectedDomicilio == key + 1
                             }"
                             foca-focus="selectedDomicilio == {{key + 1}}"
                             ng-keydown="itemDomicilio($event.keyCode)"
                             ng-click="select(domicilio)"
                             title="Seleccionar"
                         >
                             <i class="fa fa-circle-thin" aria-hidden="true"></i>
                         </button>
                     </td>
                 </tr>
             </tbody>
         </table>
     </div>
     <form name="formDomicilio" ng-show="ingreso">
         <input
             type="hidden"
             ng-model="domicilio.latitud"
             ng-required="true">
         <input
             type="hidden"
             ng-model="domicilio.longitud"
             ng-required="true">
         <div class="row">
             <div class="col-4">
                 <label>Tipo</label>
                 <select
                     class="form-control"
                     ng-disabled="true"
                     >
                     <option ng-value="2">Entrega</option>
                 </select>
             </div>
             <div class="col-8">
                 <label>Titulo</label>
                 <input
                     type="text"
                     foca-focus="ingreso"
                     class="form-control"
                     ng-model="domicilio.titulo"
                     placeholder="Ingrese título"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 1"
                     foca-focus="focused == 1"
                     teclado-virtual
                 />
             </div>
             <div class="col-9">
                 <label>Calle</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.calle"
                     placeholder="Ingrese calle"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 2"
                     foca-focus="focused == 2"
                     teclado-virtual
                 />
             </div>
             <div class="col-3">
                 <label>Nº</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.numeroCalle"
                     placeholder="Ingrese Numero"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 3"
                     foca-focus="focused == 3"
                     teclado-virtual
                 />
             </div>
             <div class="col-6">
                 <label>Localidad</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.localidad"
                     placeholder="Ingrese localidad"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 4"
                     foca-focus="focused == 4"
                     teclado-virtual
                 />
             </div>
             <div class="col-6">
                 <label>Provincia</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.provincia"
                     placeholder="Ingrese provincia"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 5"
                     foca-focus="focused == 5"
                     teclado-virtual
                 />
             </div>
         </div>
         <div class="row mt-3">
             <div class="col-12">
                 <button
                     type="button"
                     class="btn btn-outline-debo float-right ml-3"
                     ng-click="localizarDomicilio()">Buscar</button>
                 <button
                     type="button"
                     class="btn btn-outline-debo float-right"
                     ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia"
                     ng-click="localizarDomicilio(true)">Localizar</button>
             </div>
         </div>
     </form>
 </div>
 <div class="modal-footer">
     <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto">
         <ul class="pagination pagination-sm mb-0 justify-content-end">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" 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="javascript:void();"
                     ng-click="selectPage(pagina)"
                     ng-bind="pagina"
                 ></a>
             </li>
             <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Siguiente</span>
                 </a>
             </li>
         </ul>
     </nav>
     <button
         ng-show="!ingreso"
         class="btn btn-sm btn-secondary"
         type="button"
         ng-click="cancel()"
     >Volver
     </button>
     <button
         ng-show="ingreso"
         class="btn btn-secondary btn-sm"
         type="button"
         ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]"
     >Cancelar
     </button>
     <button
         ng-show="ingreso"
         class="btn btn-sm btn-primary"
         type="button"
         ng-click="agregarDomicilio()"
     >Agregar domicilio
     </button>
 </div>