From 5860b1ef94d2ca258d7259f6f7be489d500d8712 Mon Sep 17 00:00:00 2001
From: Pablo Marco del Pont <pmarco@focasoftware.com>
Date: Wed, 24 Oct 2018 15:58:17 -0300
Subject: [PATCH] =?UTF-8?q?-=20Agregu=C3=A9=20botones=20Vendedor=20y=20Cli?=
 =?UTF-8?q?ente.=20-=20Modifiqu=C3=A9=20los=20botones,=20primera=20letra?=
 =?UTF-8?q?=20en=20may=C3=BAsculas.=20-=20Agregue=20los=20m=C3=A9todos=20r?=
 =?UTF-8?q?elacionados=20con=20cada=20bot=C3=B3n.=20-=20Agregu=C3=A9=20la?=
 =?UTF-8?q?=20l=C3=B3gica=20para=20selecci=C3=B3n=20de=20moneda.=20-=20Rem?=
 =?UTF-8?q?ov=C3=AD=20la=20llamada=20a=20limpiarPantalla.=20-=20Modifiqu?=
 =?UTF-8?q?=C3=A9=20la=20estructura=20de=20los=20componentes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/controller.js       |  24 +--
 src/views/nota-pedido.html | 356 +++++++++++++++++++++------------------------
 2 files changed, 180 insertions(+), 200 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 7a63ce4..a3d29e9 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -3,14 +3,16 @@ angular.module('focaCrearNotaPedido')
         ['$scope', '$uibModal', 'crearNotaPedidoService', 'focaModalService',
             function($scope, $uibModal, crearNotaPedidoService, focaModalService) {
                 $scope.botonera = [
-                    {texto: 'moneda', accion: function() {$scope.abrirModalMoneda();}},
+                    {texto: 'Vendedor', accion: function() {$scope.seleccionarVendedor();}},
+                    {texto: 'Cliente', accion: function() {$scope.seleccionarCliente();}},
+                    {texto: 'Moneda', accion: function() {$scope.abrirModalMoneda();}},
                     {
-                        texto: 'precios y condiciones',
+                        texto: 'Precios y condiciones',
                         accion: function() {$scope.abrirModalListaPrecio();}},
-                    {texto: 'flete', accion: function() {$scope.abrirModalFlete();}},
-                    {texto: 'bomba', accion: function() {}},
-                    {texto: 'detalle', accion: function() {}},
-                    {texto: 'totales', accion: function() {}}
+                    {texto: 'Flete', accion: function() {$scope.abrirModalFlete();}},
+                    {texto: 'Bomba', accion: function() {}},
+                    {texto: 'Detalle', accion: function() {}},
+                    {texto: 'Totales', accion: function() {}}
                 ];
                 $scope.show = false;
                 $scope.cargando = true;
@@ -21,7 +23,8 @@ angular.module('focaCrearNotaPedido')
                 $scope.notaPedido = {
                     vendedor: {},
                     cliente: {},
-                    domicilio: { dom: ''}
+                    domicilio: {dom: ''},
+                    moneda: {detalle: ''}
                 };
                 $scope.articulosTabla = [];
                 var idLista;
@@ -196,7 +199,6 @@ angular.module('focaCrearNotaPedido')
                     );
                     modalInstance.result.then(
                         function(cliente) {
-                            $scope.limpiarPantalla();
                             $scope.notaPedido.cliente.nombre = cliente.nom;
                             $scope.notaPedido.cliente.id = cliente.cod;
                             crearNotaPedidoService.getDomiciliosByIdCliente(cliente.cod).then(
@@ -294,7 +296,11 @@ angular.module('focaCrearNotaPedido')
                     );
                     modalInstance.result.then(
                         function(moneda) {
-                            console.log('moneda', moneda);
+                            $scope.notaPedido.moneda = {
+                                id: moneda.ID,
+                                detalle: moneda.DETALLE,
+                                simbolo: moneda.SIMBOLO
+                            };
                         }, function() {
 
                         }
diff --git a/src/views/nota-pedido.html b/src/views/nota-pedido.html
index faca52d..8c08500 100644
--- a/src/views/nota-pedido.html
+++ b/src/views/nota-pedido.html
@@ -1,208 +1,182 @@
-<form name="formCrearNota" ng-submit="crearNotaPedido()">
-    <div class="row">
-        <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
-            <div class="row p-2 panel-informativo">
-                <div class="col">
-                    <div class="row">
-                        <div class="form-group col-12 col-sm-6 col-md-4">
-                            <div class="input-group">
-                                <input
-                                    class="form-control form-control-sm selectable"
-                                    type="text"
-                                    ng-model="notaPedido.cliente.nombre"
-                                    placeholder="Seleccione Cliente"
-                                    readonly="true"
-                                    ng-click="seleccionarCliente()"
-                                    ng-required="true"
-                                    foca-focus="true"
-                                >
-                                <span class="input-group-append">
-                                    <button
-                                        type="button"
-                                        class="btn btn-default"
-                                        ng-click="seleccionarCliente()"
-                                    >
-                                        <i class="fa fa-search"></i>
-                                    </button>
-                                </span>
+<div class="crear-nota-pedido">
+    <form name="formCrearNota" ng-submit="crearNotaPedido()">
+        <div class="row">
+            <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
+                <div class="row p-1 panel-informativo">
+                    <div class="col-12">
+                        <div class="row">
+                            <div class="col-5">
+                                <span class="label">Vendedor:</span>
+                                <span class="valor" ng-bind="notaPedido.vendedor.nombre"></span>
+                            </div>
+                            <div class="col-4">
+                                <span class="label">Moneda:</span>
+                                <span class="valor" ng-bind="notaPedido.moneda.detalle"></span>
+                            </div>
+                            <div class="col-3">
+                                <span class="label">Flete:</span>
+                                <span class="valor" ng-bind="notaPedido.flete"></span>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-12 col-sm-6 col-md-4">
-                            <div class="input-group">
-                                <input
-                                    class="form-control form-control-sm"
-                                    type="text"
-                                    ng-model="notaPedido.vendedor.nombre"
-                                    placeholder="Seleccione Vendedor"
-                                    readonly="true"
-                                >
-                                <span class="input-group-append">
-                                    <button
-                                        type="button"
-                                        class="btn btn-default"
-                                        ng-click="seleccionarVendedor()"
-                                    >
-                                        <i class="fa fa-search"></i>
-                                    </button>
-                                </span>
+                        <div class="row">
+                            <div class="col-5">
+                                <span class="label">Cliente:</span>
+                                <span class="valor" ng-bind="notaPedido.cliente.nombre"></span>
+                            </div>
+                            <div class="col-5">
+                                <span class="label">Precios y condiciones:</span>
+                                <span class="valor" ng-bind="notaPedido.cliente.nombre"></span>
+                            </div>
+                            <div class="col-3">
+                                <span class="label">Bomba:</span>
+                                <span class="valor" ng-bind="notaPedido.bomba"></span>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="row p-2 botonera-secundaria">
-                <div class=" col-12 col-sm-6 col-md-3 botonera" ng-repeat="boton in botonera">
-                    <button
-                        type="button"
-                        class="btn btn-default btn-block btn-sm"
-                        ng-bind="boton.texto"
-                        ng-click="boton.accion()"
-                    ></button>
+                <div class="row p-1 botonera-secundaria">
+                    <div class=" col-12 col-sm-6 col-md-3 botonera" ng-repeat="boton in botonera">
+                        <button
+                            type="button"
+                            class="btn btn-default btn-block btn-xs"
+                            ng-bind="boton.texto"
+                            ng-click="boton.accion()"
+                        ></button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</form>
-<div class="row">
-    <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
-        <div class="row">
-        </div>
-        <div class="row">
-            <table class="table table-striped table-sm">
-                <thead>
-                    <tr>
-                        <th>Sector</th>
-                        <th>Código</th>
-                        <th>Descripción</th>
-                        <th>Precio Unitario</th>
-                        <th>Cantidad</th>
-                        <th>SubTotal</th>
-                        <th>
-                            <button
-                                class="btn btn-outline-secondary selectable"
-                                style="float: right;"
-                                ng-click="show = !show; masMenos()"
-                            >
-                                <i
-                                    class="fa fa-chevron-down"
-                                    ng-hide="show"
-                                    aria-hidden="true"
+    </form>
+    <div class="row">
+        <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
+            <div class="row grilla-articulos align-items-end">
+                <table class="table table-striped table-sm table-dark">
+                    <thead>
+                        <tr>
+                            <th>Sector</th>
+                            <th>Código</th>
+                            <th>Descripción</th>
+                            <th>Precio Unitario</th>
+                            <th>Cantidad</th>
+                            <th>SubTotal</th>
+                            <th>
+                                <button
+                                    class="btn btn-outline-secondary selectable"
+                                    style="float: right;"
+                                    ng-click="show = !show; masMenos()"
                                 >
+                                    <i
+                                        class="fa fa-chevron-down"
+                                        ng-hide="show"
+                                        aria-hidden="true"
+                                    >
+                                    </i>
+                                    <i class="fa fa-chevron-up" ng-show="show" aria-hidden="true"></i>
+                                </button>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-show="!cargando">
+                            <td><input
+                                    class="form-control"
+                                    ng-model="articuloACargar.sector"
+                                    readonly></td>
+                            <td><input
+                                    class="form-control"
+                                    ng-model="articuloACargar.codigo"
+                                    readonly></td>
+                            <td><input
+                                    class="form-control"
+                                    ng-model="articuloACargar.descripcion"
+                                    readonly></td>
+                            <td><input
+                                    class="form-control"
+                                    ng-value="articuloACargar.precio | currency:'$'"
+                                    readonly></td>
+                            <td><input
+                                    class="form-control"
+                                    type="number"
+                                    min="1"
+                                    ng-model="articuloACargar.cantidad"
+                                    foca-focus="!cargando"
+                                    esc-key="resetFilter()"
+                                    ng-keypress="agregarATabla($event.keyCode)"></td>
+                            <td><input
+                                    class="form-control"
+                                    ng-value="getSubTotal() | currency:'$'"
+                                    readonly></td>
+                            <td class="text-center"><button
+                                    class="btn btn-outline-secondary btn-sm"
+                                    ng-click="agregarATabla(13)">
+                                <i class="fa fa-save"></i>
+                            </button></td>
+                        </tr>
+                        <tr ng-repeat="(key, articulo) in articulosTabla" ng-show="show || key == 0">
+                            <td ng-bind="articulo.sector"></td>
+                            <td ng-bind="articulo.codigo"></td>
+                            <td ng-bind="articulo.descripcion"></td>
+                            <td ng-bind="articulo.precio | currency:'$'"></td>
+                            <td><input
+                                    ng-show="articulo.edit"
+                                    ng-model="articulo.cantidad"
+                                    class="form-control"
+                                    type="number"
+                                    min="1"
+                                    foca-focus="articulo.edit"
+                                    ng-keypress="editarArticulo($event.keyCode, articulo)"
+                                    ng-focus="selectFocus($event)"
+                                >
+                                <i
+                                    class="selectable"
+                                    ng-click="cambioEdit(articulo)"
+                                    ng-hide="articulo.edit"
+                                    ng-bind="articulo.cantidad">
                                 </i>
-                                <i class="fa fa-chevron-up" ng-show="show" aria-hidden="true"></i>
-                            </button>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr ng-show="cargando">
-                        <td colspan="2">
-                            <input
-                                placeholder="Seleccione Articulo"
-                                class="form-control"
-                                readonly
-                                ng-click="seleccionarArticulo()"
-                            />
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr ng-show="!cargando">
-                        <td><input
-                                class="form-control"
-                                ng-model="articuloACargar.sector"
-                                readonly></td>
-                        <td><input
-                                class="form-control"
-                                ng-model="articuloACargar.codigo"
-                                readonly></td>
-                        <td><input
-                                class="form-control"
-                                ng-model="articuloACargar.descripcion"
-                                readonly></td>
-                        <td><input
-                                class="form-control"
-                                ng-value="articuloACargar.precio | currency:'$'"
-                                readonly></td>
-                        <td><input
-                                class="form-control"
-                                type="number"
-                                min="1"
-                                ng-model="articuloACargar.cantidad"
-                                foca-focus="!cargando"
-                                esc-key="resetFilter()"
-                                ng-keypress="agregarATabla($event.keyCode)"></td>
-                        <td><input
-                                class="form-control"
-                                ng-value="getSubTotal() | currency:'$'"
-                                readonly></td>
-                        <td class="text-center"><button
-                                class="btn btn-outline-secondary btn-sm"
-                                ng-click="agregarATabla(13)">
-                            <i class="fa fa-save"></i>
-                        </button></td>
-                    </tr>
-                    <tr ng-repeat="(key, articulo) in articulosTabla" ng-show="show || key == 0">
-                        <td ng-bind="articulo.sector"></td>
-                        <td ng-bind="articulo.codigo"></td>
-                        <td ng-bind="articulo.descripcion"></td>
-                        <td ng-bind="articulo.precio | currency:'$'"></td>
-                        <td><input
-                                ng-show="articulo.edit"
-                                ng-model="articulo.cantidad"
-                                class="form-control"
-                                type="number"
-                                min="1"
-                                foca-focus="articulo.edit"
-                                ng-keypress="editarArticulo($event.keyCode, articulo)"
-                                ng-focus="selectFocus($event)"
-                            >
-                            <i
-                                class="selectable"
-                                ng-click="cambioEdit(articulo)"
-                                ng-hide="articulo.edit"
-                                ng-bind="articulo.cantidad">
-                            </i>
-                        </td>
-                        <td ng-bind="(articulo.precio * articulo.cantidad) | currency: '$'"></td>
-                        <td class="text-center">
-                            <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo(key)">
-                                <i class="fa fa-trash"></i>
-                            </button>
-                        </td>
-                    </tr>
-                </tbody>
-                <tfoot>
-                    <tr class="table-secondary">
-                        <td colspan="4">
-                            <strong>Cantidad Items:</strong>
-                            <a ng-bind="articulosTabla.length"></a>
-                        </td>
-                        <td class="text-right"><strong>Total:</strong></td>
-                        <td colspan="3">{{getTotal() | currency:'$'}}</td>
-                    </tr>
-                </tfoot>
-            </table>
+                            </td>
+                            <td ng-bind="(articulo.precio * articulo.cantidad) | currency: '$'"></td>
+                            <td class="text-center">
+                                <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo(key)">
+                                    <i class="fa fa-trash"></i>
+                                </button>
+                            </td>
+                        </tr>
+                        <tr ng-show="cargando">
+                            <td colspan="7">
+                                <input
+                                    placeholder="Seleccione Articulo"
+                                    class="form-control form-control-sm"
+                                    readonly
+                                    ng-click="seleccionarArticulo()"
+                                />
+                            </td>
+                        </tr>
+                    </tbody>
+                    <tfoot>
+                        <tr class="">
+                            <td colspan="4">
+                                <strong>Cantidad Items:</strong>
+                                <a ng-bind="articulosTabla.length"></a>
+                            </td>
+                            <td class="text-right table-celda-total"><h3>Total:</h3></td>
+                            <td class="table-celda-total text-right" colspan="1"><h3>{{getTotal() | currency:'$'}}</h3></td>
+                            <td colspan="2"></td>
+                        </tr>
+                    </tfoot>
+                </table>
+            </div>
+        </div>
+        <div class="col-auto my-2">
+            <button
+                ng-click="crearNotaPedido()"
+                type="submit"
+                title="Crear nota pedido"
+                class="btn btn-primary float-right">
+                Guardar
+            </button>
         </div>
     </div>
 </div>
-<div class="row">
-    <div class="col-auto my-2">
-        <button
-            ng-click="crearNotaPedido()"
-            type="submit"
-            title="Crear nota pedido"
-            class="btn btn-primary float-right">
-            Guardar
-        </button>
-    </div>
-</div>
-
 <!--
 <form name="formCrearNota">
     <uib-tabset active="active">
-- 
1.9.1