Merge remote-tracking branch 'upstream/master'

Nicolás Guarnieri
2 parents d0dd33ae49 887652239f
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-admin-seguimiento.html
@@ -3,6 +3,8 @@ angular.module(&#39;focaAdminSeguimiento&#39;) .controller(&#39;focaAdminSeguimientoControll
     function($scope, focaAdminSeguimientoService, $location, $routeParams) {
         $scope.actividad = '';
  
+        $scope.now = new Date();
+
         if ($routeParams.parametro === 'nota-pedido') {
             $scope.actividad = 'Nota de pedido';
         } 
@@ -9,6 +9,13 @@
             />
         </div>
         <div class="col-2 pl-0">
+            <input
+                type="date"
+                ng-model="now"
+                class="btn col-12 my-1"
+                foca-focus="true"
+                hasta-hoy
+            />
             <button 
                 type="button" 
                 ng-class="{'active': general}"
...	...	@@ -3,6 +3,8 @@ angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoControll
3	3	function($scope, focaAdminSeguimientoService, $location, $routeParams) {
4	4	$scope.actividad = '';
5	5
	6	+ $scope.now = new Date();
	7	+
6	8	if ($routeParams.parametro === 'nota-pedido') {
7	9	$scope.actividad = 'Nota de pedido';
8	10	}
...	...	@@ -9,6 +9,13 @@
9	9	/>
10	10	</div>
11	11	<div class="col-2 pl-0">
	12	+ <input
	13	+ type="date"
	14	+ ng-model="now"
	15	+ class="btn col-12 my-1"
	16	+ foca-focus="true"
	17	+ hasta-hoy
	18	+ />
12	19	<button
13	20	type="button"
14	21	ng-class="{'active': general}"