Merge branch 'master' into 'master'

Calendario bootstrap See merge request !3

Merge branch 'master' into 'master'
Calendario bootstrap See merge request !3
Eric Fernandez
2 parents 8d9a38514f 4fea86788c
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/cabecera.html
@@ -6,6 +6,9 @@ angular.module(&#39;focaCabeceraFacturador&#39;)
  
             $scope.showCabecera = true;
             $scope.cabecera = [];
+            $scope.dateOptions = {
+                maxDate: new Date()
+            };
  
             $scope.$on('addCabecera', function(event, data) {
                 var propiedad = $filter('filter')($scope.cabecera, {label: data.label}, true);
@@ -28,13 +28,18 @@
                             </span>
                             <input
                                 ng-show="datepickerAbierto"
-                                type="date"
+                                type="text"
                                 ng-model="$ctrl.fecha"
                                 ng-change="datepickerAbierto = false"
                                 ng-blur="datepickerAbierto = false"
                                 class="form-control form-control-sm col-8 float-right"
                                 foca-focus="datepickerAbierto"
-                                hasta-hoy
+                                uib-datepicker-popup="dd/MM/yyyy"
+                                show-button-bar="false"
+                                is-open="datepickerOpen"
+                                on-open-focus="false"
+                                ng-focus="datepickerOpen = true"
+                                datepicker-options="dateOptions"
                             />
                         </div>
                         <div class="col-5 col-sm border border-white border-right-0 align-middle">
...	...	@@ -6,6 +6,9 @@ angular.module('focaCabeceraFacturador')
6	6
7	7	$scope.showCabecera = true;
8	8	$scope.cabecera = [];
	9	+ $scope.dateOptions = {
	10	+ maxDate: new Date()
	11	+ };
9	12
10	13	$scope.$on('addCabecera', function(event, data) {
11	14	var propiedad = $filter('filter')($scope.cabecera, {label: data.label}, true);
...	...	@@ -28,13 +28,18 @@
28	28	</span>
29	29	<input
30	30	ng-show="datepickerAbierto"
31		- type="date"
	31	+ type="text"
32	32	ng-model="$ctrl.fecha"
33	33	ng-change="datepickerAbierto = false"
34	34	ng-blur="datepickerAbierto = false"
35	35	class="form-control form-control-sm col-8 float-right"
36	36	foca-focus="datepickerAbierto"
37		- hasta-hoy
	37	+ uib-datepicker-popup="dd/MM/yyyy"
	38	+ show-button-bar="false"
	39	+ is-open="datepickerOpen"
	40	+ on-open-focus="false"
	41	+ ng-focus="datepickerOpen = true"
	42	+ datepicker-options="dateOptions"
38	43	/>
39	44	</div>
40	45	<div class="col-5 col-sm border border-white border-right-0 align-middle">