viithiisys / Acufuel

Download as
Browse Code ยป

Commit 97f8c67f9112e9a6e96104a2b5abc565a9319439

Authored by Rishav Singla
1 parent a9aef0b1c2
Exists in master

ui select impplement in view company page

Showing 5 changed files with 83 additions and 3 deletions   Show diff stats
... ... @@ -24,6 +24,8 @@
24 24 <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
25 25 <link href="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.css"
26 26 rel="stylesheet">
  27 + <link href="bower_components/angular-ui-select/dist/select.css"
  28 + rel="stylesheet">
27 29  
28 30  
29 31 <link rel="stylesheet" href="css/main.css"/>
... ... @@ -87,6 +89,7 @@
87 89 <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
88 90 <script src="bower_components/angular-resource/angular-resource.min.js"></script>
89 91 <script src="bower_components/angular-animate/angular-animate.js"></script>
  92 + <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
90 93 <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
91 94 <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
92 95 <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
... ... @@ -100,6 +103,7 @@
100 103 <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
101 104 <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
102 105 <script src="bower_components/select2/select2.js"></script>
  106 + <script src="bower_components/angular-ui-select/dist/select.js"></script>
103 107 <script src="bower_components/angular-ui-select2/src/select2.js"></script>
104 108 <script src="bower_components/angular-ckeditor/angular-ckeditor.js"></script>
105 109 <script src="bower_components/angular-dragdrop/src/angular-dragdrop.min.js"></script>
... ...
1 1 'use strict';
2 2  
3 3  
4   - angular.module('acufuel', ['nvd3', 'ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor', 'ui.calendar', 'ngDragDrop'])
  4 + angular.module('acufuel', ['nvd3', 'ngCookies', 'ngResource', 'ngSanitize', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor', 'ui.calendar', 'ngDragDrop', 'ui.select'])
5 5  
6 6 .config(['$httpProvider', function($httpProvider) {
7 7 $httpProvider.defaults.withCredentials = true;
... ...
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @97f8c67
... ... @@ -12,6 +12,7 @@
12 12 $scope.showLoader = false;
13 13 $scope.showUpdateBtn = false;
14 14 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
  15 + $scope.selected = [];
15 16  
16 17 $(document).ready(function() {
17 18 $("#reset").click(function() {
... ... @@ -19,6 +20,46 @@
19 20 });
20 21 });
21 22  
  23 + $scope.values = [
  24 + {'id': 1, 'first': 'Tenant/Base Customer'},
  25 + {'id': 2, 'first': 'FuelerLinx Customer'},
  26 + {'id': 3, 'first': 'CAA Member'}
  27 + ];
  28 +
  29 + $scope.changeValue = function(selected){
  30 + $scope.showUpdateBtn = true;
  31 + console.log("data to be true", selected);
  32 + for (var i=0;i<selected.length;i++){
  33 + console.log(selected[i])
  34 + if(selected[i] == 'Tenant/Base Customer'){
  35 + $scope.companyData.baseTenant = true;
  36 + }else{
  37 + $scope.companyData.baseTenant = false;
  38 + }
  39 + if(selected[i] == 'FuelerLinx Customer'){
  40 + $scope.companyData.fuelerlinxCustomer = true;
  41 + }else{
  42 + $scope.companyData.fuelerlinxCustomer = false;
  43 + }
  44 +
  45 + if(selected[i] == 'CAA Member'){
  46 + $scope.companyData.contractFuelVendor = true;
  47 + }else{
  48 + $scope.companyData.contractFuelVendor = false;
  49 + }
  50 +
  51 + console.log($scope.companyData)
  52 +
  53 + }
  54 +
  55 + }
  56 +
  57 + // $scope.selected =[
  58 + // {'id': 1, 'first': 'Tenant/Base Customer'},
  59 + // {'id': 2, 'first': 'FuelerLinx Customer'},
  60 + // {'id': 3, 'first': 'CAA Member'}
  61 + // ];
  62 +
22 63 // CustomersService.getMargin().then(function(result) {
23 64 // $scope.marginList = result;
24 65 // })
... ... @@ -35,12 +76,36 @@
35 76 ViewCompanyService.getCompany(companyId).then(function(result) {
36 77 $scope.companyData = result;
37 78 $scope.isGlobal = result.global;
  79 + if(result.global == true){
  80 + $scope.companyData.global = true;
  81 + }
38 82 if(result.margin != null){
39 83 $scope.companyData.masterMargin = result.margin.id;
40 84 }
41 85 if(result.marginAVGAS != null){
42 86 $scope.companyData.avgasMargin = result.marginAVGAS.id;
43 87 }
  88 +
  89 +
  90 +
  91 + if($scope.companyData.baseTenant){
  92 +
  93 + $scope.selected.push({'first': 'Tenant/Base Customer'})
  94 + console.log("$scope.selected",$scope.selected)
  95 +
  96 + }
  97 +
  98 + if($scope.companyData.fuelerlinxCustomer){
  99 + $scope.selected.push({'first': 'FuelerLinx Customer'})
  100 + console.log("$scope.selected",$scope.selected)
  101 + }
  102 +
  103 + if($scope.companyData.contractFuelVendor){
  104 + $scope.selected.push({'first': 'CAA Member'})
  105 + console.log("$scope.selected",$scope.selected)
  106 + }
  107 +
  108 + console.log("$scope.companyData",$scope.companyData)
44 109 getAircraftList();
45 110 $scope.showLoader = false;
46 111 })
... ... @@ -262,7 +327,7 @@
262 327 + $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote="
263 328 + $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant
264 329 + "&fuelerlinxCustomer=" + $scope.companyData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.companyData.contractFuelVendor
265   - + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId;
  330 + + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId + "&global=" + $scope.companyData.global;
266 331  
267 332 ViewCompanyService.updateCompany(companyData).then(function(result) {
268 333 if(result != null && result.success){
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @97f8c67
... ... @@ -188,6 +188,15 @@
188 188 <div class="clearfix"></div>
189 189 </p>
190 190 </div>
  191 + <div>
  192 + <ui-select multiple class="form-control" ng-model="selected" name="name" ng-change="changeValue(selected)">
  193 + <ui-select-match placeholder="Select or Search">{{$item.first}}</ui-select-match>
  194 + <ui-select-choices repeat="val.first as val in values | filter: $select.search">
  195 + {{val.first}}
  196 + <!-- <div ng-bind-html="val | highlight: $select"></div> -->
  197 + </ui-select-choices>
  198 + </ui-select>
  199 + </div>
191 200 </br>
192 201 <div class="new-address">
193 202 </div>
... ...
... ... @@ -38,6 +38,8 @@
38 38 "angular-ckeditor": "^1.0.3",
39 39 "angular-ui-calendar": "^1.0.2",
40 40 "angular-dragdrop": "^1.0.13",
41   - "angular-nvd3": "^1.0.9"
  41 + "angular-nvd3": "^1.0.9",
  42 + "angular-ui-select": "~0.19.8",
  43 + "angular-sanitize": "~1.6.6"
42 44 }
43 45 }
... ...