Jose Pinto / foca-modal-flete

Download as
Browse Code »

Commit b49a510e34f44d50267d455da9ab9d8e932d8b19

Authored by Nicolás Guarnieri
2 parents e84e56b901 bc62d1be04
Exists in master

Merge branch 'master' into 'master' 

Modal devuelve objeto(EFERNANDEZ)

See merge request modulos-npm/foca-modal-flete!4
Showing 3 changed files   Show diff stats
... ... @@ -25,18 +25,18 @@
25 25 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
26 26 "font-awesome": "^4.7.0",
27 27 "gulp": "^3.9.1",
28   - "gulp-angular-templatecache": "2.2.2",
29   - "gulp-clean": "0.4.0",
  28 + "gulp-angular-templatecache": "^2.2.2",
  29 + "gulp-clean": "^0.4.0",
30 30 "gulp-concat": "^2.6.1",
31 31 "gulp-connect": "^5.6.1",
32   - "gulp-htmlmin": "5.0.1",
33   - "gulp-jshint": "2.1.0",
34   - "gulp-rename": "1.4.0",
35   - "gulp-replace": "1.0.0",
36   - "gulp-uglify": "3.0.1",
  32 + "gulp-htmlmin": "^5.0.1",
  33 + "gulp-jshint": "^2.1.0",
  34 + "gulp-rename": "^1.4.0",
  35 + "gulp-replace": "^1.0.0",
  36 + "gulp-uglify": "^3.0.1",
37 37 "jquery": "^3.3.1",
38   - "jshint": "2.9.6",
39   - "pump": "3.0.0",
  38 + "jshint": "^2.9.6",
  39 + "pump": "^3.0.0",
40 40 "ui-bootstrap4": "^3.0.5"
41 41 }
42 42 }
src/js/controller.js
Diff comments   View file @ b49a510
... ... @@ -8,7 +8,13 @@ angular.module('focaModalFlete')
8 8 function($filter, $scope, $uibModalInstance, parametrosFlete) {
9 9 $scope.parametrosFlete = parametrosFlete;
10 10 $scope.aceptar = function() {
11   - $uibModalInstance.close($scope.parametrosFlete);
  11 + var parametrosFlete = {
  12 + flete: $scope.parametrosFlete.flete === '1' ? '1' : '0',
  13 + FOB: $scope.parametrosFlete.flete === 'FOB' ? '1' : '0',
  14 + bomba: $scope.parametrosFlete.bomba === '1' ? '1' : '0',
  15 + kilometros: $scope.parametrosFlete.kilometros
  16 + };
  17 + $uibModalInstance.close(parametrosFlete);
12 18 };
13 19  
14 20 $scope.cancel = function() {
... ... @@ -18,11 +24,11 @@ angular.module('focaModalFlete')
18 24 $scope.validar = function() {
19 25 return $scope.formFlete.$pristine ||
20 26 (
21   - $scope.parametrosFlete.flete === 'si' &&
  27 + $scope.parametrosFlete.flete === '1' &&
22 28 (
23 29 (
24   - $scope.parametrosFlete.bomba !== 'si' &&
25   - $scope.parametrosFlete.bomba !== 'no'
  30 + $scope.parametrosFlete.bomba !== '1' &&
  31 + $scope.parametrosFlete.bomba !== '0'
26 32 ) ||
27 33 (
28 34 !$scope.parametrosFlete.kilometros ||
src/views/modal-flete.html
Diff comments   View file @ b49a510
... ... @@ -14,7 +14,7 @@
14 14 type="radio"
15 15 name="flete"
16 16 id="fleteSi"
17   - value="si"
  17 + value="1"
18 18 checked
19 19 ng-model="parametrosFlete.flete"
20 20 />
... ... @@ -26,7 +26,7 @@
26 26 type="radio"
27 27 name="flete"
28 28 id="fleteNo"
29   - value="no"
  29 + value="0"
30 30 ng-model="parametrosFlete.flete"
31 31 />
32 32 <label class="form-check-label" for="fleteNo">No</label>
... ... @@ -47,7 +47,7 @@
47 47 </div>
48 48 </div>
49 49 <div class="col-6">
50   - <div class="form-group row" ng-show="parametrosFlete.flete == 'si'">
  50 + <div class="form-group row" ng-show="parametrosFlete.flete == '1'">
51 51 <legend class="col-form-label col-sm-4 pt-0">Bomba</legend>
52 52 <div class="col-sm-8">
53 53 <div class="form-check">
... ... @@ -56,7 +56,7 @@
56 56 type="radio"
57 57 name="bomba"
58 58 id="bombaSi"
59   - value="si"
  59 + value="1"
60 60 checked
61 61 ng-model="parametrosFlete.bomba"
62 62 />
... ... @@ -68,14 +68,14 @@
68 68 type="radio"
69 69 name="bomba"
70 70 id="bombaNo"
71   - value="no"
  71 + value="0"
72 72 ng-model="parametrosFlete.bomba"
73 73 />
74 74 <label class="form-check-label" for="bombaNo">No</label>
75 75 </div>
76 76 </div>
77 77 </div>
78   - <div class="form-group row" ng-show="parametrosFlete.flete == 'si'">
  78 + <div class="form-group row" ng-show="parametrosFlete.flete == '1'">
79 79 <label for="kilometros" class="col-sm-4 col-form-label">Kilometros</label>
80 80 <div class="col-sm-8">
81 81 <input