From 3011e0a3f126ede6779593e52716828cc8930dfb Mon Sep 17 00:00:00 2001
From: Pablo Marco del Pont <pmarco@focasoftware.com>
Date: Fri, 26 Oct 2018 11:25:10 -0300
Subject: [PATCH] =?UTF-8?q?-=20Cambi=C3=A9=20la=20estructura=20de=20la=20b?=
 =?UTF-8?q?otonera=20secundaria.=20-=20Unifiqu=C3=A9=20sector=20y=20c?=
 =?UTF-8?q?=C3=B3digo.=20-=20Invert=C3=AD=20el=20orden=20de=20cantidad=20y?=
 =?UTF-8?q?=20precio=20unitario.=20-=20Aline=C3=A9=20a=20la=20derecha=20ca?=
 =?UTF-8?q?ntidad,=20precio=20unitario=20y=20subtotal.=20-=20Agregu=C3=A9?=
 =?UTF-8?q?=20task=20watch.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js                |  4 ++++
 src/views/nota-pedido.html | 54 ++++++++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index dd5a19a..d715d46 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -82,3 +82,7 @@ gulp.task('clean-post-install', function() {
 });
 
 gulp.task('default', ['webserver']);
+
+gulp.task('watch', function() {
+    gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
+});
diff --git a/src/views/nota-pedido.html b/src/views/nota-pedido.html
index 6e7c009..78bc9b1 100644
--- a/src/views/nota-pedido.html
+++ b/src/views/nota-pedido.html
@@ -22,13 +22,20 @@
                     </div>
                 </div>
                 <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 class="col-12">
+                        <div class="row">
+                            <div class="col-3 px-0 py-0" ng-repeat="boton in botonera">
+                                <button
+                                    type="button"
+                                    class="btn btn-default btn-block btn-xs text-left py-2"
+                                    ng-click="boton.accion()"
+                                >
+                                    <i class="fa fa-arrow-circle-right"></i>
+                                    &nbsp;
+                                    {{boton.texto}}
+                                </button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -40,11 +47,10 @@
                 <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>Precio Unitario</th>
                             <th>SubTotal</th>
                             <th>
                                 <button
@@ -71,21 +77,13 @@
                         <tr ng-show="!cargando">
                             <td><input
                                     class="form-control"
-                                    ng-model="articuloACargar.sector"
-                                    readonly></td>
-                            <td><input
-                                    class="form-control"
-                                    ng-model="articuloACargar.codigo"
+                                    ng-model="articuloACargar.sector + '-' + 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
+                            <td class="text-right"><input
                                     class="form-control"
                                     type="number"
                                     min="1"
@@ -93,7 +91,11 @@
                                     foca-focus="!cargando"
                                     esc-key="resetFilter()"
                                     ng-keypress="agregarATabla($event.keyCode)"></td>
-                            <td><input
+                            <td class="text-right"><input
+                                    class="form-control"
+                                    ng-value="articuloACargar.precio | currency: '$'"
+                                    readonly></td>
+                            <td class="text-right"><input
                                     class="form-control"
                                     ng-value="getSubTotal() | currency: '$'"
                                     readonly></td>
@@ -107,11 +109,9 @@
                             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.sector + '-' + articulo.codigo"></td>
                             <td ng-bind="articulo.descripcion"></td>
-                            <td ng-bind="articulo.precio | currency: '$'"></td>
-                            <td><input
+                            <td class="text-right"><input
                                     ng-show="articulo.edit"
                                     ng-model="articulo.cantidad"
                                     class="form-control"
@@ -128,7 +128,9 @@
                                     ng-bind="articulo.cantidad">
                                 </i>
                             </td>
+                            <td class="text-right" ng-bind="articulo.precio | currency: '$'"></td>
                             <td
+                                class="text-right"
                                 ng-bind="(articulo.precio * articulo.cantidad) | currency: '$'">
                             </td>
                             <td class="text-center">
@@ -141,7 +143,7 @@
                             </td>
                         </tr>
                         <tr ng-show="cargando">
-                            <td colspan="7">
+                            <td colspan="6">
                                 <input
                                     placeholder="Seleccione Articulo"
                                     class="form-control form-control-sm"
@@ -153,7 +155,7 @@
                     </tbody>
                     <tfoot>
                         <tr class="">
-                            <td colspan="4">
+                            <td colspan="3">
                                 <strong>Cantidad Items:</strong>
                                 <a ng-bind="articulosTabla.length"></a>
                             </td>
-- 
1.9.1