Commit 60ddbf90526acab2dc06fc997154e4404af35c8c
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master See merge request !3
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -23,6 +23,9 @@ angular.module('focaModalNotaPedido') |
| 23 | 23 | $scope.filteredNotasPedido = []; |
| 24 | 24 | $scope.currentPageNotasPedido = []; |
| 25 | 25 | $scope.selectedNotaPedido = -1; |
| 26 | + $scope.dateOptions = { | |
| 27 | + maxDate: new Date() | |
| 28 | + }; | |
| 26 | 29 | |
| 27 | 30 | //METODOS |
| 28 | 31 | $scope.busquedaPress = function(key) { |
src/views/foca-modal-nota-pedido.html
| ... | ... | @@ -45,10 +45,15 @@ |
| 45 | 45 | class="form-control form-control-sm" |
| 46 | 46 | id="inlineFormInputGroup" |
| 47 | 47 | ladda="searchLoading" |
| 48 | - type="date" | |
| 48 | + type="text" | |
| 49 | 49 | ng-model="fechaDesde" |
| 50 | - hasta-hoy | |
| 51 | 50 | ng-required="true" |
| 51 | + uib-datepicker-popup="dd/MM/yyyy" | |
| 52 | + show-button-bar="false" | |
| 53 | + is-open="datepickerOpen" | |
| 54 | + on-open-focus="false" | |
| 55 | + ng-focus="datepickerOpen = true" | |
| 56 | + datepicker-options="dateOptions" | |
| 52 | 57 | /> |
| 53 | 58 | </div> |
| 54 | 59 | <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small> |
| ... | ... | @@ -62,10 +67,15 @@ |
| 62 | 67 | class="form-control form-control-sm" |
| 63 | 68 | id="inlineFormInputGroup" |
| 64 | 69 | ladda="searchLoading" |
| 65 | - type="date" | |
| 70 | + type="text" | |
| 66 | 71 | ng-model="fechaHasta" |
| 67 | 72 | ng-required="true" |
| 68 | - hasta-hoy | |
| 73 | + uib-datepicker-popup="dd/MM/yyyy" | |
| 74 | + show-button-bar="false" | |
| 75 | + is-open="datepicker2Open" | |
| 76 | + on-open-focus="false" | |
| 77 | + ng-focus="datepicker2Open = true" | |
| 78 | + datepicker-options="dateOptions" | |
| 69 | 79 | /> |
| 70 | 80 | </div> |
| 71 | 81 | </div> |