From b8d7ebcfe87ed3451da15a39ea5b62de4e850fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s?= <nguarnieri@focasoftware.com>
Date: Wed, 21 Nov 2018 18:31:10 -0300
Subject: [PATCH] observaciones para carga de entrega de carga

---
 package.json                           |  18 +--
 src/js/controller.js                   |   3 +-
 src/views/modal-detalle-hoja-ruta.html | 208 +++++++++++++++++----------------
 3 files changed, 116 insertions(+), 113 deletions(-)

diff --git a/package.json b/package.json
index 6fcaf3a..92a8d21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foca-modal-detalle-hoja-ruta",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Modal de búsqueda de detalles de hoja de ruta",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
-    "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"
+    "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"
   },
   "pre-commit": [
     "gulp-pre-commit"
@@ -20,12 +20,12 @@
   "author": "Foca Software",
   "license": "ISC",
   "devDependencies": {
-    "angular": "1.7.5",
-    "bootstrap": "4.1.3",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
-    "font-awesome": "4.7.0",
+    "angular": "^1.7.5",
+    "bootstrap": "^4.1.3",
+    "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git",
+    "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
-    "gulp-angular-templatecache": "^2.2.2",
+    "gulp-angular-templatecache": "^2.2.5",
     "gulp-clean": "^0.4.0",
     "gulp-concat": "^2.6.1",
     "gulp-connect": "^5.6.1",
@@ -34,9 +34,9 @@
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
     "gulp-uglify": "^3.0.1",
-    "jquery": "3.3.1",
+    "jquery": "^3.3.1",
     "jshint": "^2.9.6",
     "pump": "^3.0.0",
-    "ui-bootstrap4": "3.0.5"
+    "ui-bootstrap4": "^3.0.5"
   }
 }
diff --git a/src/js/controller.js b/src/js/controller.js
index cf7bf91..e30717b 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -16,7 +16,8 @@ angular.module('focaModalDetalleHojaRuta')
                         producto: $scope.parametrosDetalleHojaRuta.producto,
                         litros: $scope.parametrosDetalleHojaRuta.litros,
                         litrosDescargados: $scope.parametrosDetalleHojaRuta.litrosDescargados,
-                        numeroRecibo: $scope.parametrosDetalleHojaRuta.numeroRecibo
+                        numeroRecibo: $scope.parametrosDetalleHojaRuta.numeroRecibo,
+                        observaciones: $scope.parametrosDetalleHojaRuta.observaciones
                     };
                     $uibModalInstance.close(parametrosDetalleHojaRuta);
                 };
diff --git a/src/views/modal-detalle-hoja-ruta.html b/src/views/modal-detalle-hoja-ruta.html
index d70e091..48c86bc 100644
--- a/src/views/modal-detalle-hoja-ruta.html
+++ b/src/views/modal-detalle-hoja-ruta.html
@@ -4,113 +4,115 @@
 <div class="modal-body" id="modal-body">
     <form name="formDetalleHojaRuta">
         <div class="form-group row">
-            <div class="col-12">
-                <div class="form-group row">
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Remito</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.remito"
-                            readonly disabled
-                        />
-                    </div>
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Cliente</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.cliente"
-                            readonly disabled
-                        />
-                    </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Remito</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.remito"/>
                 </div>
-                <div class="form-group row">
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Domicilio</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.domicilio"
-                            readonly disabled
-                        />
-                    </div>
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Contacto</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.contacto"
-                            readonly disabled
-                        />
-                    </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Cliente</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.cliente"/>
+                </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Domicilio</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.domicilio"/>
+                </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Contacto</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.contacto"/>
+                </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Teléfono</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.telefonoContacto"/>
                 </div>
-                <div class="form-group row">
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Teléfono</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.telefonoContacto"
-                            readonly disabled
-                        />
-                    </div>
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Producto</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.producto"
-                            readonly disabled
-                        />
-                    </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Producto</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.producto"/>
+                </div>
+            </div>
+            <div class="col-6 px-2">
+                <label class="col-12 col-sm-6 px-0 mb-0">
+                    <b>Litros</b>
+                </label>
+                <div class="col-12 col-sm-6 px-0">
+                    <span ng-bind="parametrosDetalleHojaRuta.litros"/>
                 </div>
-                <div class="form-group row">
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Litros</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="text"
-                            class="form-control form-control-sm"
-                            ng-model="parametrosDetalleHojaRuta.litros"
-                            readonly disabled
-                        />
-                    </div>
+            </div>
+            <div class="w-100"></div>
+            <div class="form-group col-6 px-0">
+                <label 
+                    class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
+                >Litros descargados</label>
+                <div class="col-12 col-sm-3 px-2">
+                    <input
+                        type="number"
+                        min="0"
+                        step="1"
+                        class="form-control form-control-sm"
+                        id="litrosDescargados"
+                        name="litrosDescargados"
+                        placeholder="Litros descargados"
+                        ng-model="parametrosDetalleHojaRuta.litrosDescargados"
+                        foca-focus="paso === 0"
+                        ng-keypress="$event.keyCode === 13 && irPaso(1)"
+                        foca-tipo-input
+                        teclado-virtual
+                    />
                 </div>
-                <div class="form-group row">
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Litros descargados</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="number"
-                            min="0"
-                            step="0.01"
-                            class="form-control form-control-sm"
-                            id="litrosDescargados"
-                            name="litrosDescargados"
-                            placeholder="Litros descargados"
-                            ng-model="parametrosDetalleHojaRuta.litrosDescargados"
-                            foca-focus="paso === 0"
-                            ng-keypress="$event.keyCode === 13 && irPaso(1)"
-                            foca-tipo-input
-                            teclado-virtual
-                        />
-                    </div>
-                    <label for="costo" class="col-sm-3 col-form-label col-form-label-sm">Nº recibo</label>
-                    <div class="col-sm-3">
-                        <input
-                            type="number"
-                            min="0"
-                            step="0.01"
-                            class="form-control form-control-sm"
-                            id="numeroRecibo"
-                            name="numeroRecibo"
-                            placeholder="Nº Recibo"
-                            ng-model="parametrosDetalleHojaRuta.numeroRecibo"
-                            foca-focus="paso === 1"
-                            ng-keypress="$event.keyCode == 13 && validar() && aceptar()"
-                            foca-tipo-input
-                            teclado-virtual
-                        />
-                    </div>
+            </div>
+            <div class="form-group col-6 px-0">
+                <label 
+                    class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
+                >Nº recibo</label>
+                <div class="col-12 col-sm-33 px-2">
+                    <input
+                        type="number"
+                        min="0"
+                        step="0.01"
+                        class="form-control form-control-sm"
+                        id="numeroRecibo"
+                        name="numeroRecibo"
+                        placeholder="Nº Recibo"
+                        ng-model="parametrosDetalleHojaRuta.numeroRecibo"
+                        foca-focus="paso === 1"
+                        ng-keypress="$event.keyCode == 13 && validar() && aceptar()"
+                        foca-tipo-input
+                        teclado-virtual
+                    />
+                </div>
+            </div>
+            <div class="row">
+                <div class="form-group col-12 pr-0">
+                    <label 
+                        class="col-12 col-sm-3 col-form-label col-form-label-sm px-2"
+                    >Observaciones</label>
+                    <textarea 
+                        ng-model="parametrosDetalleHojaRuta.observaciones"
+                        class="form-control mx-2"
+                        rows="5"
+                    ></textarea>
                 </div>
             </div>
         </div>
-- 
1.9.1