Luigi / foca-agendar-visita

Browse Code »

Commit 443e05cbae1cccb59b049a85298a5dabff631bef

Authored by Jose Pinto 2019-02-22 17:03:17 -0300

1 parent 9374474ca0

Exists in master

ok package json, ok idVisita

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

package.json

Diff comments View file @ 443e05c

 {
-    "name": "foca-activar-hoja-ruta",
+    "name": "foca-agendar-visita",
     "version": "0.0.1",
     "description": "",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "compile": "gulp uglify",
         "gulp-pre-commit": "gulp pre-commit",
         "postinstall": "npm run compile && gulp clean-post-install",
         "install-dev": "npm install -D jasmine-core pre-commit angular angular-ladda ladda@1.0.6 angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
+    "repository": {
+        "type": "git",
+        "url": "http://git.focasoftware.com/npm/foca-agendar-visita.git"
+    },
     "author": "",
     "license": "ISC",
     "devDependencies": {
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.6",
         "gulp-clean": "^0.4.0",
         "gulp-connect": "^5.7.0",
         "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",
         "jshint": "^2.9.7",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/js/controller.js

Diff comments View file @ 443e05c

 angular.module('focaAgendarVisita')
     .controller('focaAgendarVisitaController', [
         '$scope', 'focaAgendarVisitaService', '$location', '$timeout',
         '$uibModal', 'focaBotoneraLateralService', '$filter', 'focaLoginService',
         'focaModalService', 'focaSeguimientoService',
         function($scope, focaAgendarVisitaService, $location, $timeout,
             $uibModal, focaBotoneraLateralService, $filter, focaLoginService,
             focaModalService, focaSeguimientoService
         ) {
             $scope.focused = 0;
             $scope.rol = 1;
             $scope.visita = {};
             $scope.now = new Date();
             $scope.botonera = [
                 {
                     label: 'Agendar',
                     image: 'precios-condiciones.png'
                 }
             ];
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(true);
                 focaBotoneraLateralService.showPausar(true);
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
             });
             $scope.seleccionarCliente = function() {
                 var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Busqueda de Cliente',
                         templateUrl: 'foca-busqueda-cliente-modal.html',
                         controller: 'focaBusquedaClienteModalController',
                         resolve: {
                             vendedor: function() { return null; }
                         },
                         size: 'lg'
                     }
                 );
                 modalInstance.result.then(
                     function(cliente) {
                         $scope.visita.cliente = cliente;
                     }
                 );
             };
             $scope.seleccionarVisitante = function() {
                 var parametrosModal = {
                     query: '/vendedor-cobrador',
                     columnas: [
                         {
                             propiedad: 'NUM',
                             nombre: 'Codigo',
                             filtro: {
                                 nombre: 'rellenarDigitos',
                                 parametro: 3
                             }
                         },
                         {
                             propiedad: 'NOM',
                             nombre: 'Nombre'
                         }
                     ],
                     titulo:'Búsqueda de vendedores y cobradores',
                     size: 'md'
                 };
                 focaModalService.modal(parametrosModal).then(function(vendedorCobrador) {
                     $scope.visita.visitante = vendedorCobrador;
                 });
             };
             $scope.next = function(key) {
                 if (key === 13) $scope.focused ++;
             };
             $scope.guardar = function() {
                 var rol;
                 if ($scope.visita.visitante.rol === 1) {
                     rol = 'Nota de pedido';
                 } else if ($scope.visita.visitante.rol === 2) {
                     rol = 'Cobranza';
                 } else {
                     rol = ($scope.rol === 1) ? 'Nota de pedido' : 'Cobranza';
                 }
                 focaAgendarVisitaService
                     .guardarVisita({
                         idVisitante: $scope.visita.visitante.NUM,
-                        tipoVisitante: ($scope.visita.visitante.rol !== 3) ?
-                            $scope.visita.visitante.rol : $scope.rol,
                         idCliente: $scope.visita.cliente.cod
                     })
                     .then(function(data) {
                         focaSeguimientoService.guardarPosicion(
                             rol,
                             data.data.id,
                             $scope.visita.observacion,
-                            true
+                            data.data.id
                         );
                     })
                     .then(function() {
                         $location.path('/');
                     });
             };
         }
     ]);

src/views/agendar-visita.html

Diff comments View file @ 443e05c

1	<div class="row">	1	<div class="row">
2	<foca-cabecera-facturador	2	<foca-cabecera-facturador
3	titulo="'Agendar visita'"	3	titulo="'Agendar visita'"
4	fecha="now"	4	fecha="now"
5	class="mb-0 col-lg-12"	5	class="mb-0 col-lg-12"
6	></foca-cabecera-facturador>	6	></foca-cabecera-facturador>
7	</div>	7	</div>
8	<div class="row">	8	<div class="row">
9	<div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">	9	<div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
10	<form class="row py-2 mt-3 botonera-secundaria">	10	<form class="row py-2 mt-3 botonera-secundaria">
11	<div class="col-md-6">	11	<div class="col-md-6">
12	<div class="form-group mb-2 col-md-12 d-md-flex">	12	<div class="form-group mb-2 col-md-12 d-md-flex">
13	<label class="col-form-label col-md-4 col-12">Cliente</label>	13	<label class="col-form-label col-md-4 col-12">Cliente</label>
14	<div class="input-group col-md-8 col-12 pl-0">	14	<div class="input-group col-md-8 col-12 pl-0">
15	<input	15	<input
16	class="form-control"	16	class="form-control"
17	type="text"	17	type="text"
18	teclado-virtual	18	teclado-virtual
19	ng-model="visita.cliente.nom"	19	ng-model="visita.cliente.nom"
20	foca-focus="focused == 1"	20	foca-focus="focused == 1"
21	ng-focus="focused = 1"	21	ng-focus="focused = 1"
22	ng-keypress="next($event.keyCode)"	22	ng-keypress="next($event.keyCode)"
23	disabled>	23	disabled>
24	<div class="input-group-append">	24	<div class="input-group-append">
25	<button	25	<button
26	class="btn btn-outline-secondary form-control"	26	class="btn btn-outline-secondary form-control"
27	title="Buscar"	27	title="Buscar"
28	type="button"	28	type="button"
29	ng-click="seleccionarCliente()">	29	ng-click="seleccionarCliente()">
30	<i class="fa fa-search" aria-hidden="true"></i>	30	<i class="fa fa-search" aria-hidden="true"></i>
31	</button>	31	</button>
32	</div>	32	</div>
33	</div>	33	</div>
34	</div>	34	</div>
35	<div class="form-group mb-2 col-md-12 d-md-flex">	35	<div class="form-group mb-2 col-md-12 d-md-flex">
36	<label class="col-form-label col-md-4 col-12">Visitante</label>	36	<label class="col-form-label col-md-4 col-12">Visitante</label>
37	<div class="input-group col-md-8 col-12 pl-0">	37	<div class="input-group col-md-8 col-12 pl-0">
38	<input	38	<input
39	class="form-control"	39	class="form-control"
40	type="text"	40	type="text"
41	teclado-virtual	41	teclado-virtual
42	ng-model="visita.visitante.NOM"	42	ng-model="visita.visitante.NOM"
43	foca-focus="focused == 1"	43	foca-focus="focused == 1"
44	ng-focus="focused = 1"	44	ng-focus="focused = 1"
45	ng-keypress="next($event.keyCode)"	45	ng-keypress="next($event.keyCode)"
46	disabled>	46	disabled>
47	<div class="input-group-append">	47	<div class="input-group-append">
48	<button	48	<button
49	class="btn btn-outline-secondary form-control"	49	class="btn btn-outline-secondary form-control"
50	title="Buscar"	50	title="Buscar"
51	type="button"	51	type="button"
52	ng-click="seleccionarVisitante()">	52	ng-click="seleccionarVisitante()">
53	<i class="fa fa-search" aria-hidden="true"></i>	53	<i class="fa fa-search" aria-hidden="true"></i>
54	</button>	54	</button>
55	</div>	55	</div>
56	</div>	56	</div>
57	</div>	57	</div>
58	<div	58	<div
59	class="form-group mb-2 col-md-12 d-md-flex"	59	class="form-group mb-2 col-md-12 d-md-flex"
60	ng-show="visita.visitante.rol === 3">	60	ng-show="visita.visitante.rol === 3">
61	<label class="col-form-label col-md-4 col-12">Tipo</label>	61	<label class="col-form-label col-md-4 col-12">Tipo</label>
62	<div class="input-group col-md-8 col-12 pl-0">	62	<div class="input-group col-md-8 col-12 pl-0">
63	<select class="form-control" ng-model="rol">	63	<select class="form-control" ng-model="rol">
64	<option value="1">Vendedor</option>	64	<option value="1">Vendedor</option>
65	<option value="2">Cobrador</option>	65	<option value="2">Cobrador</option>
66	</select>	66	</select>
67	</div>	67	</div>
68	</div>	68	</div>
69	</div>	69	</div>
70	<div class="form-group mb-2 col-md-6 d-md-flex">	70	<div class="form-group mb-2 col-md-6 d-md-flex">
71	<label class="col-form-label col-md-4 col-12">Observaciones</label>	71	<label class="col-form-label col-md-4 col-12">Observaciones</label>
72	<div class="input-group col-md-8 col-12 pl-0">	72	<div class="input-group col-md-8 col-12">
73	<textarea	73	<textarea
74	rows="5"	74	rows="5"
75	class="form-control"	75	class="form-control"
76	teclado-virtual	76	teclado-virtual
77	ng-model="visita.observacion"	77	ng-model="visita.observacion"
78	foca-focus="focused == 1"	78	foca-focus="focused == 1"
79	ng-focus="focused = 1"	79	ng-focus="focused = 1"
80	ng-keypress="next($event.keyCode)">	80	ng-keypress="next($event.keyCode)">
81	</div>	81	</div>
82	</div>	82	</div>
83	</form>	83	</form>
84	</div>	84	</div>
85	</div>	85	</div>
86		86