Marcelo Puebla / foca-modal-domicilio

Download as
Browse Code »

Commit 9faff659aa30c8dd5d1b3404550721e2732f177b

Authored by Marcelo Puebla
2 parents c60e7f675c f1ab2d8407
Exists in develop

Merge branch 'develop' of git.focasoftware.com:npm/foca-modal-domicilio into develop

Showing 4 changed files   Show diff stats
... ... @@ -38,11 +38,11 @@ gulp.task('uglify', ['templates'], function() {
38 38 paths.srcJS,
39 39 'tmp/views.js'
40 40 ]),
41   - concat('foca-modal-domicilios.js'),
  41 + concat('foca-modal-domicilio.js'),
42 42 replace('src/views/', ''),
43 43 replace("['ui.bootstrap', 'focaDirectivas', 'focaModal']", '[]'),
44 44 gulp.dest(paths.tmp),
45   - rename('foca-modal-domicilios.min.js'),
  45 + rename('foca-modal-domicilio.min.js'),
46 46 uglify(),
47 47 gulp.dest(paths.dist)
48 48 ]
... ... @@ -3,11 +3,12 @@
3 3 "version": "v0.1.2A",
4 4 "description": "Modal para busqueda de domicilios",
5 5 "scripts": {
  6 + "refresh": "gulp uglify && cp tmp/foca-modal-domicilio.js ../wrapper-demo/node_modules/foca-modal-domicilio/dist/foca-modal-domicilio.min.js",
6 7 "test": "echo \"Error: no test specified\" && exit 1",
7 8 "gulp-pre-commit": "gulp pre-commit",
8 9 "compile": "gulp uglify",
9 10 "postinstall": "npm run compile && gulp clean-post-install",
10   - "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@git.focasoftware.com:npm/foca-directivas"
  11 + "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"
11 12 },
12 13 "pre-commit": [
13 14 "gulp-pre-commit"
... ... @@ -33,12 +34,12 @@
33 34 "gulp-uglify": "^3.0.1",
34 35 "jquery": "^3.3.1",
35 36 "pump": "^3.0.0",
36   - "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
  37 + "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas"
37 38 },
38 39 "devDependencies": {
39 40 "angular": "^1.7.5",
40 41 "bootstrap": "^4.1.3",
41   - "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
  42 + "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas",
42 43 "font-awesome": "^4.7.0",
43 44 "gulp": "^3.9.1",
44 45 "gulp-angular-templatecache": "^2.2.3",
src/js/controller.js
Diff comments   View file @ 9faff65
... ... @@ -51,7 +51,7 @@ angular.module('focaModalDomicilio')
51 51 angular.element('#search')[0].focus();
52 52 $scope.filters = '';
53 53 });
54   - }else {
  54 + } else {
55 55 primera();
56 56 }
57 57 }
... ... @@ -201,7 +201,7 @@ angular.module('focaModalDomicilio')
201 201  
202 202 $scope.localizarDomicilio = function(localizar) {
203 203 var direccion = null;
204   - if(localizar) {
  204 + if (localizar) {
205 205 direccion = {
206 206 calle: $scope.domicilio.calle,
207 207 numero: $scope.domicilio.numeroCalle,
... ... @@ -216,7 +216,11 @@ angular.module('focaModalDomicilio')
216 216 controller: 'focaModalLocalizarController',
217 217 size: 'lg',
218 218 resolve: {
219   - direccion: direccion
  219 + parametros: {
  220 + direccion: direccion,
  221 + latitud: $scope.domicilio.latitud,
  222 + longitud: $scope.domicilio.longitud
  223 + }
220 224 }
221 225 }
222 226 );
src/views/modal-domicilio.html
Diff comments   View file @ 9faff65
1 1 <div class="modal-header py-1">
2   - <div class="row w-100">
3   - <div class="col-lg-6">
  2 + <div class="row w-100 justify-content-between">
  3 + <div class="col-auto">
4 4 <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5>
5   - <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilio</h5>
  5 + <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5>
6 6 </div>
7   - <div class="input-group col-lg-6 pr-0 my-2">
  7 + <div class="col-auto pr-0 my-2">
8 8 <button
9 9 class="btn btn-outline-debo mr-2"
10 10 ng-click="ingreso = true"
... ... @@ -12,29 +12,6 @@
12 12 title="Nuevo">
13 13 <i class="fa fa-plus" aria-hidden="true"></i>
14 14 </button>
15   - <input
16   - type="text"
17   - class="form-control form-control-sm"
18   - id="search"
19   - placeholder="Búsqueda"
20   - ng-model="filters"
21   - ng-change="search()"
22   - ng-keydown="busquedaDown($event.keyCode)"
23   - ng-keypress="busquedaPress($event.keyCode)"
24   - foca-focus="selectedDomicilio == -1"
25   - ng-focus="selectedDomicilio = -1"
26   - teclado-virtual
27   - >
28   - <div class="input-group-append">
29   - <button
30   - ladda="searchLoading"
31   - class="btn btn-outline-secondary"
32   - type="button"
33   - ng-click="busquedaPress(13)"
34   - >
35   - <i class="fa fa-search" aria-hidden="true"></i>
36   - </button>
37   - </div>
38 15 </div>
39 16 </div>
40 17 </div>
... ... @@ -205,11 +182,11 @@
205 182 <div class="col-12">
206 183 <button
207 184 type="button"
208   - class="btn btn-primary float-right ml-3"
  185 + class="btn btn-outline-debo float-right ml-3"
209 186 ng-click="localizarDomicilio()">Buscar</button>
210 187 <button
211 188 type="button"
212   - class="btn btn-primary float-right"
  189 + class="btn btn-outline-debo float-right"
213 190 ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia"
214 191 ng-click="localizarDomicilio(true)">Localizar</button>
215 192 </div>