Eric Fernandez / foca-modal-detalle-hoja-ruta

Download as
Browse Code »

Commit b8d7ebcfe87ed3451da15a39ea5b62de4e850fdd

Authored by Nicolás Guarnieri
1 parent f0c3ab6a6a
Exists in master

observaciones para carga de entrega de carga

Showing 3 changed files with 116 additions and 113 deletions   Show diff stats
1 { 1 {
2 "name": "foca-modal-detalle-hoja-ruta", 2 "name": "foca-modal-detalle-hoja-ruta",
3 "version": "0.0.1", 3 "version": "0.0.2",
4 "description": "Modal de búsqueda de detalles de hoja de ruta", 4 "description": "Modal de búsqueda de detalles de hoja de ruta",
5 "main": "index.js", 5 "main": "index.js",
6 "scripts": { 6 "scripts": {
7 "test": "echo \"Error: no test specified\" && exit 1", 7 "test": "echo \"Error: no test specified\" && exit 1",
8 "gulp-pre-commit": "gulp pre-commit", 8 "gulp-pre-commit": "gulp pre-commit",
9 "compile": "gulp uglify", 9 "compile": "gulp uglify",
10 "postinstall": "npm run compile && gulp clean-post-install", 10 "postinstall": "npm run compile && gulp clean-post-install",
11 "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git" 11 "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+ssh://git@git.focasoftware.com:npm/foca-directivas.git"
12 }, 12 },
13 "pre-commit": [ 13 "pre-commit": [
14 "gulp-pre-commit" 14 "gulp-pre-commit"
15 ], 15 ],
16 "repository": { 16 "repository": {
17 "type": "git", 17 "type": "git",
18 "url": "https://debo.suite.repo/modulos-npm/foca-modal-detalle-hoja-ruta.git" 18 "url": "https://debo.suite.repo/modulos-npm/foca-modal-detalle-hoja-ruta.git"
19 }, 19 },
20 "author": "Foca Software", 20 "author": "Foca Software",
21 "license": "ISC", 21 "license": "ISC",
22 "devDependencies": { 22 "devDependencies": {
23 "angular": "1.7.5", 23 "angular": "^1.7.5",
24 "bootstrap": "4.1.3", 24 "bootstrap": "^4.1.3",
25 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", 25 "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git",
26 "font-awesome": "4.7.0", 26 "font-awesome": "^4.7.0",
27 "gulp": "^3.9.1", 27 "gulp": "^3.9.1",
28 "gulp-angular-templatecache": "^2.2.2", 28 "gulp-angular-templatecache": "^2.2.5",
29 "gulp-clean": "^0.4.0", 29 "gulp-clean": "^0.4.0",
30 "gulp-concat": "^2.6.1", 30 "gulp-concat": "^2.6.1",
31 "gulp-connect": "^5.6.1", 31 "gulp-connect": "^5.6.1",
32 "gulp-htmlmin": "^5.0.1", 32 "gulp-htmlmin": "^5.0.1",
33 "gulp-jshint": "^2.1.0", 33 "gulp-jshint": "^2.1.0",
34 "gulp-rename": "^1.4.0", 34 "gulp-rename": "^1.4.0",
35 "gulp-replace": "^1.0.0", 35 "gulp-replace": "^1.0.0",
36 "gulp-uglify": "^3.0.1", 36 "gulp-uglify": "^3.0.1",
37 "jquery": "3.3.1", 37 "jquery": "^3.3.1",
38 "jshint": "^2.9.6", 38 "jshint": "^2.9.6",
39 "pump": "^3.0.0", 39 "pump": "^3.0.0",
40 "ui-bootstrap4": "3.0.5" 40 "ui-bootstrap4": "^3.0.5"
41 } 41 }
42 } 42 }
43 43
src/js/controller.js
Diff comments   View file @ b8d7ebc
1 angular.module('focaModalDetalleHojaRuta') 1 angular.module('focaModalDetalleHojaRuta')
2 .controller('focaModalDetalleHojaRutaController', 2 .controller('focaModalDetalleHojaRutaController',
3 [ 3 [
4 '$filter', 4 '$filter',
5 '$scope', 5 '$scope',
6 '$uibModalInstance', 6 '$uibModalInstance',
7 'parametrosDetalleHojaRuta', 7 'parametrosDetalleHojaRuta',
8 function($filter, $scope, $uibModalInstance, parametrosDetalleHojaRuta) { 8 function($filter, $scope, $uibModalInstance, parametrosDetalleHojaRuta) {
9 $scope.paso = 0; 9 $scope.paso = 0;
10 $scope.parametrosDetalleHojaRuta = parametrosDetalleHojaRuta; 10 $scope.parametrosDetalleHojaRuta = parametrosDetalleHojaRuta;
11 $scope.aceptar = function() { 11 $scope.aceptar = function() {
12 var parametrosDetalleHojaRuta = { 12 var parametrosDetalleHojaRuta = {
13 remito: $scope.parametrosDetalleHojaRuta.remito, 13 remito: $scope.parametrosDetalleHojaRuta.remito,
14 cliente: $scope.parametrosDetalleHojaRuta.cliente, 14 cliente: $scope.parametrosDetalleHojaRuta.cliente,
15 domicilio: $scope.parametrosDetalleHojaRuta.domicilio, 15 domicilio: $scope.parametrosDetalleHojaRuta.domicilio,
16 producto: $scope.parametrosDetalleHojaRuta.producto, 16 producto: $scope.parametrosDetalleHojaRuta.producto,
17 litros: $scope.parametrosDetalleHojaRuta.litros, 17 litros: $scope.parametrosDetalleHojaRuta.litros,
18 litrosDescargados: $scope.parametrosDetalleHojaRuta.litrosDescargados, 18 litrosDescargados: $scope.parametrosDetalleHojaRuta.litrosDescargados,
19 numeroRecibo: $scope.parametrosDetalleHojaRuta.numeroRecibo 19 numeroRecibo: $scope.parametrosDetalleHojaRuta.numeroRecibo,
20 observaciones: $scope.parametrosDetalleHojaRuta.observaciones
20 }; 21 };
21 $uibModalInstance.close(parametrosDetalleHojaRuta); 22 $uibModalInstance.close(parametrosDetalleHojaRuta);
22 }; 23 };
23 24
24 $scope.cancel = function() { 25 $scope.cancel = function() {
25 $uibModalInstance.dismiss('cancel'); 26 $uibModalInstance.dismiss('cancel');
26 }; 27 };
27 28
28 $scope.validar = function() { 29 $scope.validar = function() {
29 return $scope.formDetalleHojaRuta.$pristine || 30 return $scope.formDetalleHojaRuta.$pristine ||
30 !$scope.parametrosDetalleHojaRuta.litrosDescargados || 31 !$scope.parametrosDetalleHojaRuta.litrosDescargados ||
31 $scope.parametrosDetalleHojaRuta.litrosDescargados < 1 || 32 $scope.parametrosDetalleHojaRuta.litrosDescargados < 1 ||
32 !$scope.parametrosDetalleHojaRuta.numeroRecibo || 33 !$scope.parametrosDetalleHojaRuta.numeroRecibo ||
33 $scope.parametrosDetalleHojaRuta.numeroRecibo < 1; 34 $scope.parametrosDetalleHojaRuta.numeroRecibo < 1;
34 }; 35 };
35 36
36 $scope.irPaso = function(paso) { 37 $scope.irPaso = function(paso) {
37 $scope.paso = paso; 38 $scope.paso = paso;
38 }; 39 };
39 } 40 }
40 ] 41 ]
41 ); 42 );
42 43
src/views/modal-detalle-hoja-ruta.html
Diff comments   View file @ b8d7ebc
1 <div class="modal-header py-1"> 1 <div class="modal-header py-1">
2 <h5 class="modal-title">Detalle de hoja de ruta</h5> 2 <h5 class="modal-title">Detalle de hoja de ruta</h5>
3 </div> 3 </div>
4 <div class="modal-body" id="modal-body"> 4 <div class="modal-body" id="modal-body">
5 <form name="formDetalleHojaRuta"> 5 <form name="formDetalleHojaRuta">
6 <div class="form-group row"> 6 <div class="form-group row">
7 <div class="col-12"> 7 <div class="col-6 px-2">
8 <div class="form-group row"> 8 <label class="col-12 col-sm-6 px-0 mb-0">
9 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Remito</label> 9 <b>Remito</b>
10 <div class="col-sm-3"> 10 </label>
11 <input 11 <div class="col-12 col-sm-6 px-0">
12 type="text" 12 <span ng-bind="parametrosDetalleHojaRuta.remito"/>
13 class="form-control form-control-sm"
14 ng-model="parametrosDetalleHojaRuta.remito"
15 readonly disabled
16 />
17 </div>
18 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Cliente</label>
19 <div class="col-sm-3">
20 <input
21 type="text"
22 class="form-control form-control-sm"
23 ng-model="parametrosDetalleHojaRuta.cliente"
24 readonly disabled
25 />
26 </div>
27 </div> 13 </div>
28 <div class="form-group row"> 14 </div>
29 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Domicilio</label> 15 <div class="col-6 px-2">
30 <div class="col-sm-3"> 16 <label class="col-12 col-sm-6 px-0 mb-0">
31 <input 17 <b>Cliente</b>
32 type="text" 18 </label>
33 class="form-control form-control-sm" 19 <div class="col-12 col-sm-6 px-0">
34 ng-model="parametrosDetalleHojaRuta.domicilio" 20 <span ng-bind="parametrosDetalleHojaRuta.cliente"/>
35 readonly disabled 21 </div>
36 /> 22 </div>
37 </div> 23 <div class="col-6 px-2">
38 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Contacto</label> 24 <label class="col-12 col-sm-6 px-0 mb-0">
39 <div class="col-sm-3"> 25 <b>Domicilio</b>
40 <input 26 </label>
41 type="text" 27 <div class="col-12 col-sm-6 px-0">
42 class="form-control form-control-sm" 28 <span ng-bind="parametrosDetalleHojaRuta.domicilio"/>
43 ng-model="parametrosDetalleHojaRuta.contacto" 29 </div>
44 readonly disabled 30 </div>
45 /> 31 <div class="col-6 px-2">
46 </div> 32 <label class="col-12 col-sm-6 px-0 mb-0">
33 <b>Contacto</b>
34 </label>
35 <div class="col-12 col-sm-6 px-0">
36 <span ng-bind="parametrosDetalleHojaRuta.contacto"/>
37 </div>
38 </div>
39 <div class="col-6 px-2">
40 <label class="col-12 col-sm-6 px-0 mb-0">
41 <b>Teléfono</b>
42 </label>
43 <div class="col-12 col-sm-6 px-0">
44 <span ng-bind="parametrosDetalleHojaRuta.telefonoContacto"/>
47 </div> 45 </div>
48 <div class="form-group row"> 46 </div>
49 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Teléfono</label> 47 <div class="col-6 px-2">
50 <div class="col-sm-3"> 48 <label class="col-12 col-sm-6 px-0 mb-0">
51 <input 49 <b>Producto</b>
52 type="text" 50 </label>
53 class="form-control form-control-sm" 51 <div class="col-12 col-sm-6 px-0">
54 ng-model="parametrosDetalleHojaRuta.telefonoContacto" 52 <span ng-bind="parametrosDetalleHojaRuta.producto"/>
55 readonly disabled 53 </div>
56 /> 54 </div>
57 </div> 55 <div class="col-6 px-2">
58 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Producto</label> 56 <label class="col-12 col-sm-6 px-0 mb-0">
59 <div class="col-sm-3"> 57 <b>Litros</b>
60 <input 58 </label>
61 type="text" 59 <div class="col-12 col-sm-6 px-0">
62 class="form-control form-control-sm" 60 <span ng-bind="parametrosDetalleHojaRuta.litros"/>
63 ng-model="parametrosDetalleHojaRuta.producto"
64 readonly disabled
65 />
66 </div>
67 </div> 61 </div>
68 <div class="form-group row"> 62 </div>
69 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Litros</label> 63 <div class="w-100"></div>
70 <div class="col-sm-3"> 64 <div class="form-group col-6 px-0">
71 <input 65 <label
72 type="text" 66 class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
73 class="form-control form-control-sm" 67 >Litros descargados</label>
74 ng-model="parametrosDetalleHojaRuta.litros" 68 <div class="col-12 col-sm-3 px-2">
75 readonly disabled 69 <input
76 /> 70 type="number"
77 </div> 71 min="0"
72 step="1"
73 class="form-control form-control-sm"
74 id="litrosDescargados"
75 name="litrosDescargados"
76 placeholder="Litros descargados"
77 ng-model="parametrosDetalleHojaRuta.litrosDescargados"
78 foca-focus="paso === 0"
79 ng-keypress="$event.keyCode === 13 && irPaso(1)"
80 foca-tipo-input
81 teclado-virtual
82 />
78 </div> 83 </div>
79 <div class="form-group row"> 84 </div>
80 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Litros descargados</label> 85 <div class="form-group col-6 px-0">
81 <div class="col-sm-3"> 86 <label
82 <input 87 class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
83 type="number" 88 >Nº recibo</label>
84 min="0" 89 <div class="col-12 col-sm-33 px-2">
85 step="0.01" 90 <input
86 class="form-control form-control-sm" 91 type="number"
87 id="litrosDescargados" 92 min="0"
88 name="litrosDescargados" 93 step="0.01"
89 placeholder="Litros descargados" 94 class="form-control form-control-sm"
90 ng-model="parametrosDetalleHojaRuta.litrosDescargados" 95 id="numeroRecibo"
91 foca-focus="paso === 0" 96 name="numeroRecibo"
92 ng-keypress="$event.keyCode === 13 && irPaso(1)" 97 placeholder="Nº Recibo"
93 foca-tipo-input 98 ng-model="parametrosDetalleHojaRuta.numeroRecibo"
94 teclado-virtual 99 foca-focus="paso === 1"
95 /> 100 ng-keypress="$event.keyCode == 13 && validar() && aceptar()"
96 </div> 101 foca-tipo-input
97 <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Nº recibo</label> 102 teclado-virtual
98 <div class="col-sm-3"> 103 />
99 <input 104 </div>
100 type="number" 105 </div>
101 min="0" 106 <div class="row">
102 step="0.01" 107 <div class="form-group col-12 pr-0">
103 class="form-control form-control-sm" 108 <label
104 id="numeroRecibo" 109 class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
105 name="numeroRecibo" 110 >Observaciones</label>
106 placeholder="Nº Recibo" 111 <textarea
107 ng-model="parametrosDetalleHojaRuta.numeroRecibo" 112 ng-model="parametrosDetalleHojaRuta.observaciones"