Commit cc38b7c96e7f482554bfd3283d646e2f30c6200b
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Calendario bootstrap See merge request !3
Showing
2 changed files
Show diff stats
src/js/controller.js
| 1 | angular.module('focaModalCheque') | 1 | angular.module('focaModalCheque') |
| 2 | .controller('focaModalChequeController', | 2 | .controller('focaModalChequeController', |
| 3 | [ | 3 | [ |
| 4 | '$filter', | 4 | '$filter', |
| 5 | '$scope', | 5 | '$scope', |
| 6 | '$uibModalInstance', | 6 | '$uibModalInstance', |
| 7 | '$uibModal', | 7 | '$uibModal', |
| 8 | function($filter, $scope, $uibModalInstance, $uibModal) { | 8 | function($filter, $scope, $uibModalInstance, $uibModal) { |
| 9 | $scope.cheque = { | 9 | $scope.cheque = { |
| 10 | banco: { | 10 | banco: { |
| 11 | desbco: ''//Nombre del banco | 11 | desbco: ''//Nombre del banco |
| 12 | }, | 12 | }, |
| 13 | provincia: { | 13 | provincia: { |
| 14 | NOMBRE:'' | 14 | NOMBRE:'' |
| 15 | }, | 15 | }, |
| 16 | localidad: { | 16 | localidad: { |
| 17 | NOMBRE: '' | 17 | NOMBRE: '' |
| 18 | }, | 18 | }, |
| 19 | fechaEmision: new Date() | 19 | fechaEmision: new Date() |
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | |||
| 23 | |||
| 24 | $scope.seleccionarBanco = function(key) { | 22 | $scope.seleccionarBanco = function(key) { |
| 25 | if(key === 13) { | 23 | if(key === 13) { |
| 26 | var modalInstance = $uibModal.open( | 24 | var modalInstance = $uibModal.open( |
| 27 | { | 25 | { |
| 28 | ariaLabelledBy: 'Busqueda de Bancos', | 26 | ariaLabelledBy: 'Busqueda de Bancos', |
| 29 | templateUrl: 'modal-bancos.html', | 27 | templateUrl: 'modal-bancos.html', |
| 30 | controller: 'focaModalBancoController', | 28 | controller: 'focaModalBancoController', |
| 31 | size: 'md', | 29 | size: 'md', |
| 32 | resolve: {filters: function() {return $scope.cheque.banco.desbco;}} | 30 | resolve: {filters: function() {return $scope.cheque.banco.desbco;}} |
| 33 | } | 31 | } |
| 34 | ); | 32 | ); |
| 35 | modalInstance.result.then(function(banco) { | 33 | modalInstance.result.then(function(banco) { |
| 36 | $scope.cheque.banco = banco; | 34 | $scope.cheque.banco = banco; |
| 37 | }, function() { | 35 | }, function() { |
| 38 | //TODO: función llamada cuando cancela el modal | 36 | //TODO: función llamada cuando cancela el modal |
| 39 | }); | 37 | }); |
| 40 | } | 38 | } |
| 41 | }; | 39 | }; |
| 42 | 40 | ||
| 43 | $scope.seleccionarProvincia = function(key) { | 41 | $scope.seleccionarProvincia = function(key) { |
| 44 | if(key === 13) { | 42 | if(key === 13) { |
| 45 | var modalInstance = $uibModal.open( | 43 | var modalInstance = $uibModal.open( |
| 46 | { | 44 | { |
| 47 | ariaLabelledBy: 'Busqueda de Provincias', | 45 | ariaLabelledBy: 'Busqueda de Provincias', |
| 48 | templateUrl: 'modal-provincias.html', | 46 | templateUrl: 'modal-provincias.html', |
| 49 | controller: 'focaModalProvinciaController', | 47 | controller: 'focaModalProvinciaController', |
| 50 | size: 'md', | 48 | size: 'md', |
| 51 | resolve: {filters: function() { | 49 | resolve: {filters: function() { |
| 52 | return $scope.cheque.provincia.NOMBRE; | 50 | return $scope.cheque.provincia.NOMBRE; |
| 53 | }} | 51 | }} |
| 54 | } | 52 | } |
| 55 | ); | 53 | ); |
| 56 | modalInstance.result.then(function(provincia) { | 54 | modalInstance.result.then(function(provincia) { |
| 57 | $scope.cheque.provincia = provincia; | 55 | $scope.cheque.provincia = provincia; |
| 58 | }, function() { | 56 | }, function() { |
| 59 | //TODO: función llamada cuando cancela el modal | 57 | //TODO: función llamada cuando cancela el modal |
| 60 | }); | 58 | }); |
| 61 | } | 59 | } |
| 62 | }; | 60 | }; |
| 63 | 61 | ||
| 64 | $scope.seleccionarLocalidad = function(key) { | 62 | $scope.seleccionarLocalidad = function(key) { |
| 65 | if($scope.cheque.provincia.ID === undefined) { | 63 | if($scope.cheque.provincia.ID === undefined) { |
| 66 | //TODO: Poner modal alert de foca | 64 | //TODO: Poner modal alert de foca |
| 67 | alert('Seleccione una provincia'); | 65 | alert('Seleccione una provincia'); |
| 68 | return; | 66 | return; |
| 69 | } | 67 | } |
| 70 | if(key === 13) { | 68 | if(key === 13) { |
| 71 | var modalInstance = $uibModal.open( | 69 | var modalInstance = $uibModal.open( |
| 72 | { | 70 | { |
| 73 | ariaLabelledBy: 'Busqueda de Localidades', | 71 | ariaLabelledBy: 'Busqueda de Localidades', |
| 74 | templateUrl: 'modal-localidades.html', | 72 | templateUrl: 'modal-localidades.html', |
| 75 | controller: 'focaModalLocalidadController', | 73 | controller: 'focaModalLocalidadController', |
| 76 | size: 'md', | 74 | size: 'md', |
| 77 | resolve: { | 75 | resolve: { |
| 78 | filters: { | 76 | filters: { |
| 79 | idProvincia: $scope.cheque.provincia.ID, | 77 | idProvincia: $scope.cheque.provincia.ID, |
| 80 | busqueda: $scope.cheque.localidad.nombre | 78 | busqueda: $scope.cheque.localidad.nombre |
| 81 | } | 79 | } |
| 82 | } | 80 | } |
| 83 | } | 81 | } |
| 84 | ); | 82 | ); |
| 85 | modalInstance.result.then(function(localidad) { | 83 | modalInstance.result.then(function(localidad) { |
| 86 | $scope.cheque.localidad = localidad; | 84 | $scope.cheque.localidad = localidad; |
| 87 | }, function() { | 85 | }, function() { |
| 88 | //TODO: función llamada cuando cancela el modal | 86 | //TODO: función llamada cuando cancela el modal |
| 89 | }); | 87 | }); |
| 90 | } | 88 | } |
| 91 | }; | 89 | }; |
| 92 | 90 | ||
| 93 | $scope.aceptar = function() { | 91 | $scope.aceptar = function() { |
| 94 | delete $scope.cheque.provincia.localidades; | 92 | delete $scope.cheque.provincia.localidades; |
| 95 | //TODO: al enviar el importe con punto se pone como mil, no como decimal | 93 | //TODO: al enviar el importe con punto se pone como mil, no como decimal |
| 96 | $scope.cheque.importe = parseFloat($scope.cheque.importe); | 94 | $scope.cheque.importe = parseFloat($scope.cheque.importe); |
| 97 | $uibModalInstance.close($scope.cheque); | 95 | $uibModalInstance.close($scope.cheque); |
| 98 | }; | 96 | }; |
| 99 | 97 | ||
| 100 | $scope.cancel = function() { | 98 | $scope.cancel = function() { |
| 101 | $uibModalInstance.dismiss('cancel'); | 99 | $uibModalInstance.dismiss('cancel'); |
| 102 | }; | 100 | }; |
| 103 | } | 101 | } |
| 104 | ] | 102 | ] |
| 105 | ); | 103 | ); |
| 106 | 104 |
src/views/modal-cheque.html
| 1 | <div class="modal-header"> | 1 | <div class="modal-header"> |
| 2 | <h3 class="modal-title">Cobro con cheques</h3> | 2 | <h3 class="modal-title">Cobro con cheques</h3> |
| 3 | </div> | 3 | </div> |
| 4 | <div class="modal-body" id="modal-body"> | 4 | <div class="modal-body" id="modal-body"> |
| 5 | <form name="formCheque"> | 5 | <form name="formCheque"> |
| 6 | <div class="row"> | 6 | <div class="row"> |
| 7 | <div class="col-12 col-md-2"> | 7 | <div class="col-12 col-md-2"> |
| 8 | <label class="form-control-sm">Banco:</label> | 8 | <label class="form-control-sm">Banco:</label> |
| 9 | </div> | 9 | </div> |
| 10 | <div class="col-12 col-md-10 input-group"> | 10 | <div class="col-12 col-md-10 input-group"> |
| 11 | <input | 11 | <input |
| 12 | type="text" | 12 | type="text" |
| 13 | foca-focus="true" | 13 | foca-focus="true" |
| 14 | teclado-virtual | 14 | teclado-virtual |
| 15 | class="form-control form-control-sm" | 15 | class="form-control form-control-sm" |
| 16 | placeholder="Nombre del banco o código" | 16 | placeholder="Nombre del banco o código" |
| 17 | ng-model="cheque.banco.desbco" | 17 | ng-model="cheque.banco.desbco" |
| 18 | ng-required="true" | 18 | ng-required="true" |
| 19 | ng-keypress="seleccionarBanco($event.keyCode)" | 19 | ng-keypress="seleccionarBanco($event.keyCode)" |
| 20 | /> | 20 | /> |
| 21 | <div class="input-group-append"> | 21 | <div class="input-group-append"> |
| 22 | <button | 22 | <button |
| 23 | ladda="searchLoading" | 23 | ladda="searchLoading" |
| 24 | class="btn btn-outline-secondary form-control-sm" | 24 | class="btn btn-outline-secondary form-control-sm" |
| 25 | type="button" | 25 | type="button" |
| 26 | ng-click="seleccionarBanco(13)" | 26 | ng-click="seleccionarBanco(13)" |
| 27 | > | 27 | > |
| 28 | <i class="fa fa-search" aria-hidden="true"></i> | 28 | <i class="fa fa-search" aria-hidden="true"></i> |
| 29 | </button> | 29 | </button> |
| 30 | </div> | 30 | </div> |
| 31 | </div> | 31 | </div> |
| 32 | <div class="col-12 col-md-2"> | 32 | <div class="col-12 col-md-2"> |
| 33 | <label class="form-control-sm">Provincia:</label> | 33 | <label class="form-control-sm">Provincia:</label> |
| 34 | </div> | 34 | </div> |
| 35 | <div class="col-12 col-md-5 input-group"> | 35 | <div class="col-12 col-md-5 input-group"> |
| 36 | <input | 36 | <input |
| 37 | type="text" | 37 | type="text" |
| 38 | teclado-virtual | 38 | teclado-virtual |
| 39 | class="form-control form-control-sm" | 39 | class="form-control form-control-sm" |
| 40 | placeholder="Nombre o Código de Provincia " | 40 | placeholder="Nombre o Código de Provincia " |
| 41 | ng-model="cheque.provincia.NOMBRE" | 41 | ng-model="cheque.provincia.NOMBRE" |
| 42 | ng-required="true" | 42 | ng-required="true" |
| 43 | ng-keypress="seleccionarProvincia($event.keyCode)"/> | 43 | ng-keypress="seleccionarProvincia($event.keyCode)"/> |
| 44 | <div class="input-group-append"> | 44 | <div class="input-group-append"> |
| 45 | <button | 45 | <button |
| 46 | ladda="searchLoading" | 46 | ladda="searchLoading" |
| 47 | class="btn btn-outline-secondary form-control-sm" | 47 | class="btn btn-outline-secondary form-control-sm" |
| 48 | type="button" | 48 | type="button" |
| 49 | ng-click="seleccionarProvincia(13)" | 49 | ng-click="seleccionarProvincia(13)" |
| 50 | > | 50 | > |
| 51 | <i class="fa fa-search" aria-hidden="true"></i> | 51 | <i class="fa fa-search" aria-hidden="true"></i> |
| 52 | </button> | 52 | </button> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| 55 | <div class="col-12 col-md-1"> | 55 | <div class="col-12 col-md-1"> |
| 56 | <label class="form-control-sm">Lugar:</label> | 56 | <label class="form-control-sm">Lugar:</label> |
| 57 | </div> | 57 | </div> |
| 58 | <div class="col-12 col-md-4 input-group"> | 58 | <div class="col-12 col-md-4 input-group"> |
| 59 | <input | 59 | <input |
| 60 | type="text" | 60 | type="text" |
| 61 | teclado-virtual | 61 | teclado-virtual |
| 62 | class="form-control form-control-sm" | 62 | class="form-control form-control-sm" |
| 63 | placeholder="Nombre o código del lugar" | 63 | placeholder="Nombre o código del lugar" |
| 64 | ng-model="cheque.localidad.NOMBRE" | 64 | ng-model="cheque.localidad.NOMBRE" |
| 65 | ng-required="true" | 65 | ng-required="true" |
| 66 | ng-keypress="seleccionarLocalidad($event.keyCode)"/> | 66 | ng-keypress="seleccionarLocalidad($event.keyCode)"/> |
| 67 | <div class="input-group-append"> | 67 | <div class="input-group-append"> |
| 68 | <button | 68 | <button |
| 69 | ladda="searchLoading" | 69 | ladda="searchLoading" |
| 70 | class="btn btn-outline-secondary form-control-sm" | 70 | class="btn btn-outline-secondary form-control-sm" |
| 71 | type="button" | 71 | type="button" |
| 72 | ng-click="seleccionarLocalidad(13)" | 72 | ng-click="seleccionarLocalidad(13)" |
| 73 | > | 73 | > |
| 74 | <i class="fa fa-search" aria-hidden="true"></i> | 74 | <i class="fa fa-search" aria-hidden="true"></i> |
| 75 | </button> | 75 | </button> |
| 76 | </div> | 76 | </div> |
| 77 | </div> | 77 | </div> |
| 78 | <div class="col-12 col-md-2"> | 78 | <div class="col-12 col-md-2"> |
| 79 | <label class="form-control-sm">Librador:</label> | 79 | <label class="form-control-sm">Librador:</label> |
| 80 | </div> | 80 | </div> |
| 81 | <div class="col-12 col-md-10"> | 81 | <div class="col-12 col-md-10"> |
| 82 | <input | 82 | <input |
| 83 | type="text" | 83 | type="text" |
| 84 | teclado-virtual | 84 | teclado-virtual |
| 85 | class="form-control form-control-sm" | 85 | class="form-control form-control-sm" |
| 86 | placeholder="Librador" | 86 | placeholder="Librador" |
| 87 | ng-model="cheque.librador" | 87 | ng-model="cheque.librador" |
| 88 | ng-required="true"/> | 88 | ng-required="true"/> |
| 89 | </div> | 89 | </div> |
| 90 | <div class="col-12 col-md-2"> | 90 | <div class="col-12 col-md-2"> |
| 91 | <label class="form-control-sm">Cheque:</label> | 91 | <label class="form-control-sm">Cheque:</label> |
| 92 | </div> | 92 | </div> |
| 93 | <div class="col-6 col-md-3"> | 93 | <div class="col-6 col-md-3"> |
| 94 | <input | 94 | <input |
| 95 | foca-tipo-input | 95 | foca-tipo-input |
| 96 | teclado-virtual | 96 | teclado-virtual |
| 97 | class="form-control form-control-sm" | 97 | class="form-control form-control-sm" |
| 98 | placeholder="Número" | 98 | placeholder="Número" |
| 99 | ng-model="cheque.numero" | 99 | ng-model="cheque.numero" |
| 100 | ng-required="true"/> | 100 | ng-required="true"/> |
| 101 | </div> | 101 | </div> |
| 102 | <div class="col-6 col-md-7 input-group mb-2"> | 102 | <div class="col-6 col-md-7 input-group mb-2"> |
| 103 | <div class="input-group-prepend"> | 103 | <div class="input-group-prepend"> |
| 104 | <div class="input-group-text form-control form-control-sm">$</div> | 104 | <div class="input-group-text form-control form-control-sm">$</div> |
| 105 | </div> | 105 | </div> |
| 106 | <input | 106 | <input |
| 107 | foca-tipo-input | 107 | foca-tipo-input |
| 108 | teclado-virtual | 108 | teclado-virtual |
| 109 | class="form-control form-control-sm" | 109 | class="form-control form-control-sm" |
| 110 | placeholder="Importe" | 110 | placeholder="Importe" |
| 111 | ng-model="cheque.importe" | 111 | ng-model="cheque.importe" |
| 112 | ng-required="true"/> | 112 | ng-required="true"/> |
| 113 | </div> | 113 | </div> |
| 114 | <div class="col-12 col-md-2"> | 114 | <div class="col-12 col-md-2"> |
| 115 | <label class="form-control-sm">Emisión:</label> | 115 | <label class="form-control-sm">Emisión:</label> |
| 116 | </div> | 116 | </div> |
| 117 | <div class="col-12 col-md-4 input-group"> | 117 | <div class="col-12 col-md-4 input-group"> |
| 118 | <div class="input-group-prepend"> | 118 | <div class="input-group-prepend"> |
| 119 | <div class="input-group-text form-control form-control-sm"> | 119 | <div class="input-group-text form-control form-control-sm"> |
| 120 | <i class="fa fa-calendar"></i> | 120 | <i class="fa fa-calendar"></i> |
| 121 | </div> | 121 | </div> |
| 122 | </div> | 122 | </div> |
| 123 | <input | 123 | <input |
| 124 | type="date" | 124 | type="text" |
| 125 | class="form-control form-control-sm" | 125 | class="form-control form-control-sm" |
| 126 | placeholder="Fecha" | 126 | placeholder="Fecha" |
| 127 | ng-model="cheque.fechaEmision" | 127 | ng-model="cheque.fechaEmision" |
| 128 | uib-datepicker-popup="dd/MM/yyyy" | ||
| 129 | show-button-bar="false" | ||
| 130 | is-open="datepickerOpen" | ||
| 131 | on-open-focus="false" | ||
| 132 | ng-focus="datepickerOpen = true" | ||
| 128 | ng-required="true"/> | 133 | ng-required="true"/> |
| 129 | </div> | 134 | </div> |
| 130 | <div class="col-12 col-md-2"> | 135 | <div class="col-12 col-md-2"> |
| 131 | <label class="form-control-sm">Presentación:</label> | 136 | <label class="form-control-sm">Presentación:</label> |
| 132 | </div> | 137 | </div> |
| 133 | <div class="col-12 col-md-4 input-group"> | 138 | <div class="col-12 col-md-4 input-group"> |
| 134 | <div class="input-group-prepend"> | 139 | <div class="input-group-prepend"> |
| 135 | <div class="input-group-text form-control form-control-sm"> | 140 | <div class="input-group-text form-control form-control-sm"> |
| 136 | <i class="fa fa-calendar"></i> | 141 | <i class="fa fa-calendar"></i> |
| 137 | </div> | 142 | </div> |
| 138 | </div> | 143 | </div> |
| 139 | <input | 144 | <input |
| 140 | type="date" | 145 | type="text" |
| 141 | class="form-control form-control-sm" | 146 | class="form-control form-control-sm" |
| 142 | placeholder="Fecha" | 147 | placeholder="Fecha" |
| 143 | ng-model="cheque.fechaPresentacion" | 148 | ng-model="cheque.fechaPresentacion" |
| 149 | uib-datepicker-popup="dd/MM/yyyy" | ||
| 150 | show-button-bar="false" | ||
| 151 | is-open="datepicker2Open" | ||
| 152 | on-open-focus="false" | ||
| 153 | ng-focus="datepicker2Open = true" | ||
| 144 | ng-required="true"/> | 154 | ng-required="true"/> |
| 145 | </div> | 155 | </div> |
| 146 | <div class="col-12 col-md-2"> | 156 | <div class="col-12 col-md-2"> |
| 147 | <label class="form-control-sm">Observaciones:</label> | 157 | <label class="form-control-sm">Observaciones:</label> |
| 148 | </div> | 158 | </div> |
| 149 | <div class="col-12 col-md-10"> | 159 | <div class="col-12 col-md-10"> |
| 150 | <textarea teclado-virtual ng-model="cheque.observaciones" class="form-control form-control-sm"></textarea> | 160 | <textarea teclado-virtual ng-model="cheque.observaciones" class="form-control form-control-sm"></textarea> |
| 151 | </div> | 161 | </div> |
| 152 | </div> | 162 | </div> |
| 153 | </form> | 163 | </form> |
| 154 | </div> | 164 | </div> |
| 155 | <div class="modal-footer"> | 165 | <div class="modal-footer"> |
| 156 | <button | 166 | <button |
| 157 | class="btn btn-primary" | 167 | class="btn btn-primary" |
| 158 | type="button" | 168 | type="button" |
| 159 | ng-click="aceptar()" | 169 | ng-click="aceptar()" |
| 160 | ng-disabled="!formCheque.$valid" | 170 | ng-disabled="!formCheque.$valid" |
| 161 | >Aceptar</button> | 171 | >Aceptar</button> |
| 162 | <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> | 172 | <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> |
| 163 | </div> | 173 | </div> |
| 164 | 174 |