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

Download as
Browse Code »

Commit 44201c911e884eca130b6611dff2b38cbb02ae08

Authored by Eric Fernandez
2 parents f0c3ab6a6a b8d7ebcfe8
Exists in master

Merge branch 'master' into 'master' 

Master

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