Commit c1bacd3f4292c905e42ca2fee277a6e0c46f0df9
Exists in
master
Merge branch 'master' into 'master'
master(efernandez) See merge request modulos-npm/foca-modal-flete!5
Showing
2 changed files
Show diff stats
src/js/controller.js
1 | angular.module('focaModalFlete') | 1 | angular.module('focaModalFlete') |
2 | .controller('focaModalFleteController', | 2 | .controller('focaModalFleteController', |
3 | [ | 3 | [ |
4 | '$filter', | 4 | '$filter', |
5 | '$scope', | 5 | '$scope', |
6 | '$uibModalInstance', | 6 | '$uibModalInstance', |
7 | 'parametrosFlete', | 7 | 'parametrosFlete', |
8 | function($filter, $scope, $uibModalInstance, parametrosFlete) { | 8 | function($filter, $scope, $uibModalInstance, parametrosFlete) { |
9 | $scope.parametrosFlete = parametrosFlete; | 9 | $scope.parametrosFlete = parametrosFlete; |
10 | $scope.aceptar = function() { | 10 | $scope.aceptar = function() { |
11 | var parametrosFlete = { | 11 | var parametrosFlete = { |
12 | flete: $scope.parametrosFlete.flete === '1' ? '1' : '0', | 12 | flete: $scope.parametrosFlete.flete === '1' ? true : false, |
13 | FOB: $scope.parametrosFlete.flete === 'FOB' ? '1' : '0', | 13 | FOB: $scope.parametrosFlete.flete === 'FOB' ? true : false, |
14 | bomba: $scope.parametrosFlete.bomba === '1' ? '1' : '0', | 14 | bomba: $scope.parametrosFlete.bomba === '1' ? true : false, |
15 | kilometros: $scope.parametrosFlete.kilometros | 15 | kilometros: $scope.parametrosFlete.kilometros |
16 | }; | 16 | }; |
17 | $uibModalInstance.close(parametrosFlete); | 17 | $uibModalInstance.close(parametrosFlete); |
18 | }; | 18 | }; |
19 | 19 | ||
20 | $scope.cancel = function() { | 20 | $scope.cancel = function() { |
21 | $uibModalInstance.dismiss('cancel'); | 21 | $uibModalInstance.dismiss('cancel'); |
22 | }; | 22 | }; |
23 | 23 | ||
24 | $scope.validar = function() { | 24 | $scope.validar = function() { |
25 | return $scope.formFlete.$pristine || | 25 | return $scope.formFlete.$pristine || |
26 | ( | 26 | ( |
27 | $scope.parametrosFlete.flete === '1' && | 27 | $scope.parametrosFlete.flete === '1' && |
28 | ( | 28 | ( |
29 | ( | 29 | ( |
30 | $scope.parametrosFlete.bomba !== '1' && | 30 | $scope.parametrosFlete.bomba !== '1' && |
31 | $scope.parametrosFlete.bomba !== '0' | 31 | $scope.parametrosFlete.bomba !== '0' |
32 | ) || | 32 | ) || |
33 | ( | 33 | ( |
34 | !$scope.parametrosFlete.kilometros || | 34 | !$scope.parametrosFlete.kilometros || |
35 | $scope.parametrosFlete.kilometros < 1 | 35 | $scope.parametrosFlete.kilometros < 1 |
36 | ) | 36 | ) |
37 | ) | 37 | ) |
38 | ); | 38 | ); |
39 | } | 39 | } |
40 | } | 40 | } |
41 | ] | 41 | ] |
42 | ); | 42 | ); |
43 | 43 |
src/views/modal-flete.html
1 | <div class="modal-header"> | 1 | <div class="modal-header"> |
2 | <h3 class="modal-title">Opciones de Flete</h3> | 2 | <h3 class="modal-title">Opciones de Flete</h3> |
3 | </div> | 3 | </div> |
4 | <div class="modal-body" id="modal-body"> | 4 | <div class="modal-body" id="modal-body"> |
5 | <form name="formFlete"> | 5 | <form name="formFlete"> |
6 | <div class="form-group row"> | 6 | <div class="form-group row"> |
7 | <div class="col-6"> | 7 | <div class="col-6"> |
8 | <div class="row"> | 8 | <div class="row"> |
9 | <legend class="col-form-label col-sm-4 pt-0">Flete</legend> | 9 | <legend class="col-form-label col-sm-4 pt-0">Flete</legend> |
10 | <div class="col-sm-8"> | 10 | <div class="col-sm-8"> |
11 | <div class="form-check"> | 11 | <div class="form-check"> |
12 | <input | 12 | <input |
13 | class="form-check-input" | 13 | class="form-check-input" |
14 | type="radio" | 14 | type="radio" |
15 | name="flete" | 15 | name="flete" |
16 | id="fleteSi" | 16 | id="fleteSi" |
17 | value="1" | 17 | value="1" |
18 | checked | 18 | checked |
19 | ng-model="parametrosFlete.flete" | 19 | ng-model="parametrosFlete.flete" |
20 | /> | 20 | /> |
21 | <label class="form-check-label" for="fleteSi">Si</label> | 21 | <label class="form-check-label" for="fleteSi">Si</label> |
22 | </div> | 22 | </div> |
23 | <div class="form-check"> | 23 | <div class="form-check"> |
24 | <input | 24 | <input |
25 | class="form-check-input" | 25 | class="form-check-input" |
26 | type="radio" | 26 | type="radio" |
27 | name="flete" | 27 | name="flete" |
28 | id="fleteNo" | 28 | id="fleteNo" |
29 | value="0" | 29 | value="0" |
30 | ng-model="parametrosFlete.flete" | 30 | ng-model="parametrosFlete.flete" |
31 | /> | 31 | /> |
32 | <label class="form-check-label" for="fleteNo">No</label> | 32 | <label class="form-check-label" for="fleteNo">No</label> |
33 | </div> | 33 | </div> |
34 | <div class="form-check"> | 34 | <div class="form-check"> |
35 | <input | 35 | <input |
36 | class="form-check-input" | 36 | class="form-check-input" |
37 | type="radio" | 37 | type="radio" |
38 | name="flete" | 38 | name="flete" |
39 | id="fleteFub" | 39 | id="fleteFub" |
40 | value="FOB" | 40 | value="FOB" |
41 | ng-model="parametrosFlete.flete" | 41 | ng-model="parametrosFlete.flete" |
42 | /> | 42 | /> |
43 | <label class="form-check-label" for="fleteFub">FOB</label> | 43 | <label class="form-check-label" for="fleteFub">FOB</label> |
44 | </div> | 44 | </div> |
45 | </div> | 45 | </div> |
46 | <span ng-show="formFlete.flete.$error.required">Debe seleccionar un flete.</span> | 46 | <span ng-show="formFlete.flete.$error.required">Debe seleccionar un flete.</span> |
47 | </div> | 47 | </div> |
48 | </div> | 48 | </div> |
49 | <div class="col-6"> | 49 | <div class="col-6"> |
50 | <div class="form-group row" ng-show="parametrosFlete.flete == '1'"> | 50 | <div class="form-group row" ng-show="parametrosFlete.flete == '1'"> |
51 | <legend class="col-form-label col-sm-4 pt-0">Bomba</legend> | 51 | <legend class="col-form-label col-sm-4 pt-0">Bomba</legend> |
52 | <div class="col-sm-8"> | 52 | <div class="col-sm-8"> |
53 | <div class="form-check"> | 53 | <div class="form-check"> |
54 | <input | 54 | <input |
55 | class="form-check-input" | 55 | class="form-check-input" |
56 | type="radio" | 56 | type="radio" |
57 | name="bomba" | 57 | name="bomba" |
58 | id="bombaSi" | 58 | id="bombaSi" |
59 | value="1" | 59 | value="1" |
60 | checked | 60 | checked |
61 | ng-model="parametrosFlete.bomba" | 61 | ng-model="parametrosFlete.bomba" |
62 | /> | 62 | /> |
63 | <label class="form-check-label" for="bombaSi">Si</label> | 63 | <label class="form-check-label" for="bombaSi">Si</label> |
64 | </div> | 64 | </div> |
65 | <div class="form-check"> | 65 | <div class="form-check"> |
66 | <input | 66 | <input |
67 | class="form-check-input" | 67 | class="form-check-input" |
68 | type="radio" | 68 | type="radio" |
69 | name="bomba" | 69 | name="bomba" |
70 | id="bombaNo" | 70 | id="bombaNo" |
71 | value="0" | 71 | value="0" |
72 | ng-model="parametrosFlete.bomba" | 72 | ng-model="parametrosFlete.bomba" |
73 | /> | 73 | /> |
74 | <label class="form-check-label" for="bombaNo">No</label> | 74 | <label class="form-check-label" for="bombaNo">No</label> |
75 | </div> | 75 | </div> |
76 | </div> | 76 | </div> |
77 | </div> | 77 | </div> |
78 | <div class="form-group row" ng-show="parametrosFlete.flete == '1'"> | 78 | <div class="form-group row" ng-show="parametrosFlete.flete == '1'"> |
79 | <label for="kilometros" class="col-sm-4 col-form-label">Kilometros</label> | 79 | <label for="kilometros" class="col-sm-4 col-form-label">Kilometros</label> |
80 | <div class="col-sm-8"> | 80 | <div class="col-sm-8"> |
81 | <input | 81 | <input |
82 | type="number" | 82 | type="number" |
83 | min="0" | ||
84 | step="0.01" | ||
83 | class="form-control" | 85 | class="form-control" |
84 | id="kilometros" | 86 | id="kilometros" |
85 | name="kilometros" | 87 | name="kilometros" |
86 | placeholder="Kilómetros" | 88 | placeholder="Kilómetros" |
87 | ng-model="parametrosFlete.kilometros" | 89 | ng-model="parametrosFlete.kilometros" |
88 | /> | 90 | /> |
89 | </div> | 91 | </div> |
90 | </div> | 92 | </div> |
91 | </div> | 93 | </div> |
92 | </div> | 94 | </div> |
93 | </form> | 95 | </form> |
94 | </div> | 96 | </div> |
95 | <div class="modal-footer"> | 97 | <div class="modal-footer"> |
96 | <button | 98 | <button |
97 | class="btn btn-secondary" | 99 | class="btn btn-secondary" |
98 | type="button" | 100 | type="button" |
99 | ng-click="aceptar()" | 101 | ng-click="aceptar()" |
100 | ng-disabled="validar()" | 102 | ng-disabled="validar()" |
101 | >Aceptar</button> | 103 | >Aceptar</button> |
102 | <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> | 104 | <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> |
103 | </div> | 105 | </div> |
104 | 106 |