Merge branch 'master' into 'develop'

Master(efernandez) See merge request !65

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !65
Jose Pinto
2 parents 8041e9183f 204d9b9e9e
Showing 3 changed files Show diff stats
gulpfile.js
src/js/controller.js
src/views/nota-pedido.html
@@ -21,7 +21,9 @@ var paths = {
     dist:     'dist/'
 };
  
-gulp.task('uglify', gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app'));
+gulp.task('uglify', function(callback) {
+    gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app')(callback);
+});
  
 gulp.task('templates', function() {
     return pump(
@@ -673,10 +673,6 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                 focaModalService
                     .prompt(observacion)
                     .then(function(observaciones) {
-                        $scope.$broadcast('addCabecera', {
-                            label: 'Observaciones:',
-                            valor: observaciones
-                        });
                         $scope.notaPedido.observaciones = observaciones;
                     });
             };
@@ -6,6 +6,12 @@
             class="mb-0 col-lg-12"
             busqueda="seleccionarNotaPedido"
         ></foca-cabecera-facturador>
+        <marquee
+            bgcolor="#FF9900"
+            behavior="scroll"
+            direction="left"
+            ng-bind="notaPedido.observaciones"
+            ></marquee>
     <div class="col-lg-12">
         <div class="row">
             <div class="col-12 col-md-10 col-lg-10  border border-light rounded">
...	...	@@ -21,7 +21,9 @@ var paths = {
21	21	dist: 'dist/'
22	22	};
23	23
24		-gulp.task('uglify', gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app'));
	24	+gulp.task('uglify', function(callback) {
	25	+ gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app')(callback);
	26	+});
25	27
26	28	gulp.task('templates', function() {
27	29	return pump(
...	...	@@ -673,10 +673,6 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
673	673	focaModalService
674	674	.prompt(observacion)
675	675	.then(function(observaciones) {
676		- $scope.$broadcast('addCabecera', {
677		- label: 'Observaciones:',
678		- valor: observaciones
679		- });
680	676	$scope.notaPedido.observaciones = observaciones;
681	677	});
682	678	};
...	...	@@ -6,6 +6,12 @@
6	6	class="mb-0 col-lg-12"
7	7	busqueda="seleccionarNotaPedido"
8	8	></foca-cabecera-facturador>
	9	+ <marquee
	10	+ bgcolor="#FF9900"
	11	+ behavior="scroll"
	12	+ direction="left"
	13	+ ng-bind="notaPedido.observaciones"
	14	+ ></marquee>
9	15	<div class="col-lg-12">
10	16	<div class="row">
11	17	<div class="col-12 col-md-10 col-lg-10 border border-light rounded">