Commit d5cb584de9f84828366c9d97d0a0911b240b7847
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Calendario bootstrap See merge request !2
Showing
3 changed files
Show diff stats
package.json
... | ... | @@ -24,8 +24,8 @@ |
24 | 24 | "angular-ladda": "^0.4.3", |
25 | 25 | "angular-route": "^1.7.5", |
26 | 26 | "bootstrap": "^4.1.3", |
27 | - "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas", | |
28 | - "foca-filtros": "git+ssh://git@git.focasoftware.com:npm/foca-filtros", | |
27 | + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", | |
28 | + "foca-filtros": "git+http://git.focasoftware.com/npm/foca-filtros.git", | |
29 | 29 | "font-awesome": "^4.7.0", |
30 | 30 | "gulp": "^3.9.1", |
31 | 31 | "gulp-angular-templatecache": "^2.2.5", |
src/js/controller.js
... | ... | @@ -20,6 +20,9 @@ angular.module('focaModalCobranza') |
20 | 20 | $scope.filteredCobranzas = []; |
21 | 21 | $scope.currentPageCobranzas = []; |
22 | 22 | $scope.selectedCobranza = -1; |
23 | + $scope.dateOptions = { | |
24 | + maxDate: new Date() | |
25 | + }; | |
23 | 26 | |
24 | 27 | //METODOS |
25 | 28 | $scope.busquedaPress = function(key) { |
src/views/foca-modal-cobranza.html
... | ... | @@ -46,10 +46,15 @@ |
46 | 46 | class="form-control form-control-sm" |
47 | 47 | id="inlineFormInputGroup" |
48 | 48 | ladda="searchLoading" |
49 | - type="date" | |
49 | + type="text" | |
50 | 50 | ng-model="fechaDesde" |
51 | - hasta-hoy | |
52 | 51 | ng-required="true" |
52 | + uib-datepicker-popup="dd/MM/yyyy" | |
53 | + show-button-bar="false" | |
54 | + is-open="datepickerOpen" | |
55 | + on-open-focus="false" | |
56 | + ng-focus="datepickerOpen = true" | |
57 | + datepicker-options="dateOptions" | |
53 | 58 | /> |
54 | 59 | </div> |
55 | 60 | <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small> |
... | ... | @@ -63,10 +68,15 @@ |
63 | 68 | class="form-control form-control-sm" |
64 | 69 | id="inlineFormInputGroup" |
65 | 70 | ladda="searchLoading" |
66 | - type="date" | |
71 | + type="text" | |
67 | 72 | ng-model="fechaHasta" |
68 | 73 | ng-required="true" |
69 | - hasta-hoy | |
74 | + uib-datepicker-popup="dd/MM/yyyy" | |
75 | + show-button-bar="false" | |
76 | + is-open="datepicker2Open" | |
77 | + on-open-focus="false" | |
78 | + ng-focus="datepicker2Open = true" | |
79 | + datepicker-options="dateOptions" | |
70 | 80 | /> |
71 | 81 | </div> |
72 | 82 | </div> |