Nicolás Guarnieri / foca-hoja-ruta

Browse Code »

Commit da8c0c2716724cb49aa0d1f46c4c47981437c21d

Authored by Eric Fernandez 2018-11-10 12:17:50 -0300

1 parent f425e3f999

Exists in master

columnas correctas, sucursal, numero hoja de ruta

Showing 2 changed files with 12 additions and 4 deletions Show diff stats

src/js/controller.js

Diff comments View file @ da8c0c2

 angular.module('focaListaHojaRuta')
     .controller('listaHojaRutaCtrl',
         [
         '$scope', '$filter', '$uibModal', 'hojaRutaService',
         function($scope, $filter, $uibModal, hojaRutaService) {
             hojaRutaService.getHojasRuta().then(function(res) {
                 $scope.hojasRuta = res.data;
+                $scope.puntoVenta = rellenar(res.data[0].sucursal, 4);
+                $scope.comprobante = rellenar(res.data[0].numeroHojaRuta, 8);
             });
             $scope.cabecera = [];
             $scope.showCabecera = true;
             addCabecera('Transportista:', 'Andesmar');
             addCabecera('Chofer:', 'Carlos');
             addCabecera('Vehículo:', 'SCANIA');
             $scope.now = new Date();
             $scope.puntoVenta = '0000';
             $scope.comprobante = '00000000';
             $scope.verDetalle = function(hojaRuta) {
                 var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Detalle hoja ruta',
                         templateUrl: 'modal-detalle-hoja-ruta.html',
                         controller: 'focaModalDetalleHojaRutaController',
                         resolve: {
                             parametrosDetalleHojaRuta: function(){
                                 return {
                                     remito: '00001-00000001',
                                     cliente: 'Rubén Gomez',
                                     domicilio: 'Patricias Mendocinas 5050',
                                     producto: 'Super',
                                     litros: 20
                                 };
                             }
                         },
                         size: 'lg'
                     }
                 );
                 modalInstance.result.then(function() {
                 })
             };
             function addCabecera(label, valor) {
                 var propiedad = $filter('filter')($scope.cabecera, {label: label}, true);
                 if(propiedad.length === 1) {
                     propiedad[0].valor = valor;
                 } else {
                     $scope.cabecera.push({label: label, valor: valor});
                 }
             }
             function removeCabecera(label) {
                 var propiedad = $filter('filter')($scope.cabecera, {label: label}, true);
                 if(propiedad.length === 1) {
                     $scope.cabecera.splice($scope.cabecera.indexOf(propiedad[0]), 1);
                 }
             }
             function rellenar(relleno, longitud) {
                 relleno = '' + relleno;
                 while (relleno.length < longitud) {
                     relleno = '0' + relleno;
                 }
                 return relleno;
             }
         }
     ]);

src/views/lista-hoja-ruta.html

Diff comments View file @ da8c0c2

 <div>
     <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-12 col-sm-4 nota-pedido">
                         <h5>Hojas de ruta</h5>
                     </div>
                     <div class="col-5 col-sm-4 numero-pedido"
                         >Nº {{puntoVenta}}-{{comprobante}}
                     </div>
                     <div class="col-7 col-sm-4 text-right">
                         Fecha:
                         <span
                             ng-show="!datepickerAbierto"
                             ng-bind="now | date:'dd/MM/yyyy HH:mm'"
                             ng-click="datepickerAbierto = true"
                         >
                         </span>
                         <input
                             ng-show="datepickerAbierto"
                             type="date"
                             ng-model="now"
                             ng-change="datepickerAbierto = false"
                             ng-blur="datepickerAbierto = false"
                             class="form-control form-control-sm col-8 float-right"
                             foca-focus="datepickerAbierto"
                             hasta-hoy
                         />
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-auto" ng-repeat="cab in cabecera" ng-show="showCabecera">
                         <span class="label" ng-bind="cab.label"></span>
                         <span class="valor" ng-bind="cab.valor"></span>
                     </div>
                     <a
                         class="btn col-12 btn-secondary d-sm-none"
                         ng-show="cabecera.length > 0"
                         ng-click="showCabecera = !showCabecera"
                     >
                         <i
                             class="fa fa-chevron-down"
                             ng-hide="showCabecera"
                             aria-hidden="true"
                         >
                         </i>
                         <i
                             class="fa fa-chevron-up"
                             ng-show="showCabecera"
                             aria-hidden="true">
                         </i>
                     </a>
                 </div>
             </div>
         </div>
         <div class="row p-1 botonera-secundaria">
             <div class="col-12">
                 <div class="row">
                     <div class="col-6 col-sm-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()"
                             ng-class="{'d-none d-sm-block': boton.texto == ''}"
                         >
                             <i
                                 class="fa fa-arrow-circle-right"
                                 ng-show="boton.texto != ''"
                             ></i>
                             &nbsp;
                             {{boton.texto}}
                         </button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
     <div class="col-12 col-md-10 col-lg-8 offset-md-1 offset-lg-2">
         <div class="row grilla-articulo d-none d-sm-flex">
             <table class="table tabla-articulo table-striped table-sm table-dark">
                 <thead>
                     <tr class="d-flex">
                         <th>#</th>
-                        <th>Sucursal</th>
+                        <th>Fecha creacion</th>
-                        <th>#HojaRuta</th>
+                        <th>sucursal</th>
+                        <th>idTransportista</th>
+                        <th>idChofer</th>
+                        <th>idVeh?culo</th>
                         <th></th>
                     </tr>
                 </thead>
                 <tbody class="tabla-articulo-body">
                     <tr
                         ng-repeat="(key, hojaRuta) in hojasRuta" class="d-flex"
                     >
                         <td ng-bind="key + 1"></td>
                         <td ng-bind="hojaRuta.sucursal"></td>
-                        <td ng-bind="hojaRuta.numeroHojaRuta"></td>
+                        <td ng-bind="hojaRuta.fechaCreacion"></td>
+                        <td ng-bind="hojaRuta.sucursal"></td>
+                        <td ng-bind="hojaRuta.transportista[0].nombre"></td>
+                        <td ng-bind="hojaRuta.chofer[0].nombre"></td>
+                        <td ng-bind="hojaRuta.vehiculo[0].tractor"></td>
                         <td>
                             <button
                                 class="btn btn-secondary"
                                 type="button"
                                 ng-click="verDetalle(hojaRuta)"
                             ><i class="fa fa-search" aria-hidden="true"></i>
                             </button>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
     </div>
 </div>