Merge branch 'master' into 'develop'

Master See merge request !52

Merge branch 'master' into 'develop'
Master See merge request !52
Eric Fernandez
2 parents b7e3fec132 46c0bf3b04
Showing 3 changed files Show diff stats
src/js/controller.js
src/js/service.js
src/views/modal-detalle-carga.html
@@ -546,6 +546,15 @@ angular.module(&#39;focaCrearHojaRuta&#39;).controller(&#39;hojaRutaCtrl&#39;,
                 }
             };
  
+            $scope.seleccionarDetalleDeCarga = function () {
+                if ($scope.hojaRuta.vehiculo.capacidad === 0) {
+                    focaModalService.alert('Debe ingresar vehiculo');
+                    return;
+                } else {
+                    $scope.mostrarDetalle($scope.hojaRuta);
+                }
+            };
+
             function getCabeceraPuntoDescarga(puntosDescarga) {
                 var puntosStamp = '';
                 puntosDescarga.forEach(function (punto, idx, arr) {
@@ -159,6 +159,10 @@ angular.module(&#39;focaCrearHojaRuta&#39;)
                     {
                         label: 'Cliente',
                         image: 'cliente.png'
+                    },
+                    {
+                        label: 'Detalle de Carga',
+                        image: 'detalleDeCarga.png'
                     }
                 ];
             },
@@ -70,6 +70,6 @@
     </div>
     <div class="modal-footer py-1">
         <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
-        <button class="btn btn-sm btn-secondary" type="button" ng-click="guardar()">Guardar</button>
+        <button class="btn btn-sm btn-primary" type="button" ng-click="guardar()">Guardar</button>
     </div>
 </div>
 \ No newline at end of file
...	...	@@ -546,6 +546,15 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl',
546	546	}
547	547	};
548	548
	549	+ $scope.seleccionarDetalleDeCarga = function () {
	550	+ if ($scope.hojaRuta.vehiculo.capacidad === 0) {
	551	+ focaModalService.alert('Debe ingresar vehiculo');
	552	+ return;
	553	+ } else {
	554	+ $scope.mostrarDetalle($scope.hojaRuta);
	555	+ }
	556	+ };
	557	+
549	558	function getCabeceraPuntoDescarga(puntosDescarga) {
550	559	var puntosStamp = '';
551	560	puntosDescarga.forEach(function (punto, idx, arr) {
...	...	@@ -159,6 +159,10 @@ angular.module('focaCrearHojaRuta')
159	159	{
160	160	label: 'Cliente',
161	161	image: 'cliente.png'
	162	+ },
	163	+ {
	164	+ label: 'Detalle de Carga',
	165	+ image: 'detalleDeCarga.png'
162	166	}
163	167	];
164	168	},
...	...	@@ -70,6 +70,6 @@
70	70	</div>
71	71	<div class="modal-footer py-1">
72	72	<button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
73		- <button class="btn btn-sm btn-secondary" type="button" ng-click="guardar()">Guardar</button>
	73	+ <button class="btn btn-sm btn-primary" type="button" ng-click="guardar()">Guardar</button>
74	74	</div>
75	75	</div>
76	76	\ No newline at end of file