viithiisys / Acufuel

Download as
Browse Code ยป

Commit a9a8f570d78764f55143b55d83a55bc2da007245

Authored by Anchit Jindal
1 parent a7a7cfeca7
Exists in master

new desing implementaion

Showing 2 changed files with 48 additions and 9 deletions   Show diff stats
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @a9a8f57
... ... @@ -26,7 +26,9 @@
26 26  
27 27 var value = "";
28 28 var companyId = $stateParams.id;
29   -
  29 + $scope.companyData = {};
  30 + $scope.multipleMsg = false;
  31 + $scope.companyData.masterMargin = "";
30 32 getCompanyDetail();
31 33 function getCompanyDetail(){
32 34 ViewCompanyService.getCompany(companyId).then(function(result) {
... ... @@ -34,6 +36,9 @@
34 36 if(result.margin != null){
35 37 $scope.companyData.masterMargin = result.margin.id;
36 38 }
  39 + if(result.marginAVGAS != null){
  40 + $scope.companyData.avgasMargin = result.marginAVGAS.id;
  41 + }
37 42 $scope.showLoader = false;
38 43 })
39 44 }
... ... @@ -57,14 +62,31 @@
57 62 $scope.companyContactList = result;
58 63 })
59 64 }
60   -
  65 + $scope.aircraftmargins = [];
61 66 getAircraftList();
62 67 function getAircraftList(){
63 68 ViewCompanyService.getAircraft(companyId).then(function(result) {
64 69 $scope.contactAircraftList = result;
  70 + for (var i = 0; i < $scope.contactAircraftList.length; i++) {
  71 + if($scope.contactAircraftList[i].aircraftsMargin != null){
  72 + $scope.aircraftmargins.push({
  73 + 'id': $scope.contactAircraftList[i].aircraftsMargin.id
  74 + })
  75 + }
  76 + }
  77 + if($scope.aircraftmargins.length > 0) {
  78 + for (var i = 0; i < $scope.aircraftmargins.length; i++) {
  79 + if($scope.aircraftmargins[i].id != $scope.companyData.masterMargin){
  80 + $scope.multiple = true;
  81 + $scope.multipleMsg = true;
  82 + if($scope.multiple) {
  83 + $scope.companyData.masterMargin = "multiple";
  84 + }
  85 + }
  86 + }
  87 + }
65 88 })
66 89 }
67   -
68 90  
69 91 $scope.contactData = {};
70 92 $scope.contactData.contactList = [];
... ... @@ -206,7 +228,7 @@
206 228 $scope.showCompanyName = true;
207 229 $scope.showAddress = true;
208 230  
209   - var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin
  231 + var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin + "&avgasMargin=" + $scope.companyData.avgasMargin
210 232 + "&addressOne=" + $scope.companyData.addressOne + "&addressTwo=" + $scope.companyData.addressTwo + "&city=" + $scope.companyData.city + "&state="
211 233 + $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote="
212 234 + $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant
... ... @@ -397,5 +419,13 @@
397 419 getAircraftList();
398 420 })
399 421 }
  422 +
  423 + CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
  424 + $scope.jetMarginList = result;
  425 + })
  426 +
  427 + CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
  428 + $scope.avgsMarginList = result;
  429 + })
400 430  
401 431 }]);
402 432 \ No newline at end of file
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @a9a8f57
... ... @@ -169,12 +169,21 @@
169 169 </div>
170 170 <div>
171 171 <p class="new-label">
172   - <span>Master Margin Setting </span>
173   - <!-- <select class="form-control" ng-model="companyData.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList"></select> -->
174   - <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="companyData.masterMargin">
175   - <option ng-repeat="margin in marginList" value="{{margin.id}}">{{margin.marginName}}</option>
  172 + <span>JET A Margin </span>
  173 + <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.masterMargin">
  174 + <option ng-if="multiple" value="multiple">Multiple</option>
  175 + <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
  176 + </select>
  177 + <span ng-show="multipleMsg">&nbsp;See Aircrart List</span>
  178 + <div class="clearfix"></div>
  179 + </p>
  180 + </div>
  181 + <div>
  182 + <p class="new-label">
  183 + <span>AVGAS 100LL </span>
  184 + <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.avgasMargin">
  185 + <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
176 186 </select>
177   - <span>&nbsp;See Aircrart List</span>
178 187 <div class="clearfix"></div>
179 188 </p>
180 189 </div>
... ...