viithiisys / Acufuel

Browse Code »

Commit 4bda5699a87832a31c19e8586dfeca8aaa07f0f7

Authored by Swarn Singh 2017-05-12 09:13:08 -0400

1 parent a167a2312c

Exists in master

fuel manager designs and api integration

Showing 5 changed files with 338 additions and 175 deletions Show diff stats

app/css/custom.css

Diff comments View file @4bda569

 /*------------------------------------------------------------------
 [Custom Stylesheet]
 Last change:	03/25/2013
 Assigned to:	You
 -------------------------------------------------------------------*/
 body{
 	color: #333;
 }
 .custom-widget-content{
 	width: 100%;
 	height: auto;
 	padding: 15px 0;
 	background-color: #fff;
 	border: 1px solid #D5D5D5;
 	border-radius: 0 0 5px 5px;
 }
 .hr{
 	margin: 5px 0;
 }
 .disableSelect:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #f90;
 	box-shadow: none;
 	-webkit-appearance: none;
     appearance: none;
 }
 .disableInput:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #222;
 	box-shadow: none;
 }
 .img-logo{
 	height: 25px;
 	padding-left: 10%;
 }
 .widget-header > i{
 	display: inline-block;
     margin-top: -3px;
     margin-left: 13px;
     margin-right: -2px;
     font-size: 16px;
     color: #555;
     vertical-align: middle;
 }
 table{
 	width: 100%;
 }
 table th, td{
 	font-size: 13px;
 }
 .navbar-brand{
 	height: auto;
 }
 .custom-widget-content .btn-xs{
 	padding: 3px 5px;
 }
 .fc-event{
 	background-color: #ff9900 !important;
 	color: #fff !important;
 	border: 1px solid #ff9900 !important;
 }
 .pull-right-color{
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .pull-right-setup{
 	margin-bottom: 10px;
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .Airport{
 	padding-top: 5px;
 }
 .src-image{
 	width: 50px;
 	height: 50px;
 }
 .Accept{
 	padding-top: 25px;
 }
 .dis{
 	float: left;
 	margin-right:100px;
 }
 /*.email-password{
 	width: 40px;
 	height: 24px;
 }*/
 .email-password-icon{
 	width: 10px;
 	height: 10px;
 }
 @media( max-width: 768px;){
 .btn{
 font-size: 10px !important;
 }
 .dis{
 	float: none;
 	margin-right: 0px;
 }
 }
 .Search-tabs{
 	border-bottom: 0px solid #ddd; */
 }
 .customer-table table{
 	width: 100%;
 }
 .customer-table input{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	display: -webkit-inline-box;
 	display: inline-box;
 	height: 31px;
 }
 .customer-table select{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	height: 31px;
 	display: -webkit-inline-box;
 	display: inline-box;
 }
 .customer-table th > label{
 	font-weight: bold;
 	padding: 10px 5px 2px 5px;
 	margin-bottom: 0;
 }
 .customer-table td{
 	padding: 5px !important;
 	height: auto !important;
 	vertical-align: middle !important;
 }
 .customer-table td > select{
 	height: 22px !important;
 }
 .customer-table td > button{
 	font-size: 10px;
 }
 /*.new-input-label{
 	margin-bottom: 0;
 	line-height: 34px;
 }*/
 /*  new custom css for accrodian tabs */
 .customAccordianHeader{
 	width: 100%;
 	height: auto;
 	background-color: #F3F3F3;
 	border: 1px solid #ddd;
     color: #333;
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
     border-radius: 3px 3px 3px 3px;
     padding: 10px 15px;
     margin-top: 10px;
 }
 .customAccordianHeader.customActive{
 	background-image: -webkit-gradient(linear, left 0%, left 100%, from(#555555), to(#3b3b3b));
 	background-image: linear-gradient(to bottom, #555555 0%, #3b3b3b 100%);
 	background-repeat: repeat-x;
 	border: 1px solid #222222;
     color: #FFF;
     border-radius: 3px 3px 0 0;
 }
 .customAccordianHeader > span{
 	font-size: 15px;
 	margin-right: 20px;
 	line-height: 22px;
 	float: left;
 }
 .customAccordianHeader .btn{
 	padding: 2px 12px;
 }
 .customAccordianHeader > .form-control{
 	outline: none;
 	box-shadow: none;
 }
 .customAccordianHeader > select.form-control{
 	width: 150px;
 	height: 26px;
 	padding: 0 6px;
 	margin-right: 20px;
 	float: left;
 }
 .customAccordianHeader > select.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #f90;
 	width: auto;
 }
 .customAccordianHeader > input.form-control{
 	width: 80px;
 	height: 26px;
 	padding: 0 6px;
 	float: left;
 }
 .customAccordianHeader > input.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #333;
 }
 .customAccordianTabBody{
 	width: 100%;
 	height: auto;
 	padding: 15px;
 	border: 1px solid #ddd;
 	border-top: 0;
 	border-radius: 0 0 3px 3px;
 }
 .customTableWithFilter{
 	width: auto;
 	height: auto;
 }
 .customTableWithFilter th{
 	padding: 5px;
 	background-color: #f3f3f3;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter th i{
 	margin-top: 3px;
 }
 .customTableWithFilter th span{
 	font-size: 11px;
 	color: #222;
 }
 .customTableWithFilter th input{
 	width: 50px;
 }
 .customTableWithFilter td{
 	padding: 5px;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter td span{
 	font-size: 11px;
 }
 .customTableWithFilter td span:first-child{
 	color: #449d44;
 	font-weight: bold;
 }
 .customTableWithFilter td span:last-child{
 	color: #c9302c;
 	font-style: italic;
 	font-weight: bold;
 }
 .customTableWithFilter td .tierTextBox{
 	width: 70px;
 }
 .customTableWithFilter .addTierButton{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 3px 5px;
 }
 .customTableWithFilter td .fa-trash-o{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .resizeTextarea{
 	resize: vertical;
 	margin-top: 20px;
+}
+.new-widget-content{
+	padding: 0 0 0 0 !important;
+}
+.new-tab-heading{
+	padding: 5px;
+	color: #333;
+	background-color: #fcfcfc;
+	border-bottom: 1px solid #d5d5d5;
+	border-right: 1px solid #d5d5d5;
+}
+.new-tab-body{
+	border-right: 1px solid #d5d5d5;
+	border-bottom: 1px solid #d5d5d5;
+	padding-left: 15px;
+	padding-bottom: 5px;
+}
+.new-tab-heading i.fa{
+	font-size: 16px;
+	cursor: pointer;
+}
+.new-tab-heading span{
+	font-size: 14px;
+	margin-left: 5px;
+}
+.new-tab-heading i.fa-plus-circle{
+	color: #067dfc;
+}
+.new-tab-heading i.fa-minus-circle{
+	color: #d00d09;
+}
+.new-tab-body-th{
+	color: #333;
+}
+.new-tab-body-th > div{
+	font-size: 12px;
+	font-weight: bold;
+	padding-right: 5px;
+	padding-left: 5px;
+	text-align: center;
+}
+.new-tab-body-th > div:first-child{
+	font-size: 14px;
+	font-weight: bold;
+	text-align: left;
+}
+.new-tab-body-td i.fa-plus-circle{
+	color: #067dfc;
+}
+.new-tab-body-td i.fa-minus-circle{
+	color: #d00d09;
+}
+.new-tab-body-td input{
+	width: 50px;
+	height: 24px;
+}
+.new-tab-body-td .fa{
+	font-size: 14px;
+}
+.new-tab-body-td > div:first-child > div{
+	padding-right: 5px;
+	padding-left: 5px;
+	text-align: center;
+}
+.new-tab-body-td > div:first-child > div:first-child{
+	text-align: left;
+}
+.appliesTableHeading{
+	border: 1px solid #d5d5d5;
+	padding: 5px;
+	color: #333;
+	font-weight: bold;
+	background-color: #fcfcfc;
+	margin: 10px 0 0 0;
+}
+.appliesTableBody{
+	border: 1px solid #d5d5d5;
+	border-top: 0;
+	background-color: #ffffe0;
+	margin-bottom: 10px;
+	height: auto;
+}
+.appliesTableBody > div.firstDiv{
+	height: 100px;
+	float: left;
+	width: 40%;
+	border-right: 1px solid #d5d5d5;
+	overflow: auto;
+	padding: 5px;
+}
+.appliesTableBody > div.lastDiv{
+	width: 59%;
+	height: 100px;
+	padding: 5px;
+	float: left;
+}
+.appliesTableBody > div.lastDiv textarea{
+	width: 100%;
+	height: 60px;
+	margin: 15px 0;
+	resize: none;
 }

app/partials/fuelManager/fuelManager.controller.js

Diff comments View file @4bda569

 'use strict';
  //Load controller
   angular.module('acufuel')
-	.controller('fuelManagerController', ['$scope',function($scope) {
+	//.controller('fuelManagerController', ['$scope', 'fuelManagerService',function($scope, fuelManagerService) {
+  .controller('fuelManagerController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'fuelManagerService', fuelManagerController]);
-      $scope.test = "Testing...";
+  function fuelManagerController($scope, $rootScope, $uibModal, $filter, $http, fuelManagerService) {
+      $scope.currentUserData = JSON.parse(localStorage.getItem('userProfileId'));
+      fuelManagerService.getFullList().then(function(result) {
+        console.log('result', result)
+        $scope.fullJetList = result;
+      })
+      $scope.avoidanceList = {};
+      $scope.updateList = function(fullJetList){
+        $scope.addData = [];
+        $scope.newJetList = fullJetList;
+        if ($scope.currentUserData == undefined || $scope.currentUserData == null) {
+        }else{
+          for(var i=0; i<$scope.newJetList.length;i++){
+              for(var j = 0; j < $scope.newJetList[i].aircraftsSize.length; j++){
+                if($scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null){
+                  console.log('fullJetList', $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance);
+                  $scope.addData.push({
+                      //'aircraftType': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.aircraftType,
+                      'id': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.id,
+                      'aircraftSizeId': $scope.newJetList[i].aircraftsSize[j].id,
+                      'rampFees': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.rampFees,
+                      'avoidance' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.avoidance,
+                      'applicable' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.applicable,
+                      'expirationDate' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate,
+                      'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes
+                    });
+                }
+              }
+          }
+          $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.addData;
+          $scope.avoidanceList.fboUserId = $scope.currentUserData;
+          console.log('data', $scope.avoidanceList);
+          fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
+            fuelManagerService.getFullList().then(function(result) {
+              $scope.fullJetList = result;
+            })
+          })
+        }
+      }
+      $scope.parentOpen = function(index){
+        $('#parentOpen'+index).css('display', 'none');
+        $('#parentClose'+index).css('display', 'initial');
+        $('#parentTogglebody'+index).slideDown();
+      }
+      $scope.parentClose = function(index){
+        $('#parentOpen'+index).css('display', 'initial');
+        $('#parentClose'+index).css('display', 'none');
+        $('#parentTogglebody'+index).slideUp();
+      }
+      $scope.toggleChild = function(id){
+        if ($('.'+id).hasClass('fa-plus-circle')) {
+          $('.'+id).removeClass('fa-plus-circle');
+          $('.'+id).addClass('fa-minus-circle');
+        }else{
+          $('.'+id).removeClass('fa-minus-circle');
+          $('.'+id).addClass('fa-plus-circle');
+        }
+        $('#'+id).slideToggle();
+      }
       $(document).ready(function(){
         $('#customTabToggle1').click(function(){
           console.log('tab 1');
           $('#customTabsBody1').slideDown();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').addClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle2').click(function(){
           console.log('tab 2');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideDown();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').addClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle3').click(function(){
           console.log('tab 3');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideDown();
           $('#customTabsBody4').slideUp();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').addClass('customActive');
           $('#customTabs4').removeClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none');
         })
         $('#customTabToggle4').click(function(){
           console.log('tab 4');
           $('#customTabsBody1').slideUp();
           $('#customTabsBody2').slideUp();
           $('#customTabsBody3').slideUp();
           $('#customTabsBody4').slideDown();
           $('#customTabs1').removeClass('customActive');
           $('#customTabs2').removeClass('customActive');
           $('#customTabs3').removeClass('customActive');
           $('#customTabs4').addClass('customActive');
           $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true);
           $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false);
           $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs1 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs2 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block');
           $('#customTabs3 > .pull-right > .btn-success').css('display', 'none');
           $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-default').css('display', 'none');
           $('#customTabs4 > .pull-right > .btn-success').css('display', 'inline-block');
           $('#customTabs4 > .pull-right > .btn-danger').css('display', 'inline-block');
         })
       })
-  }]);
+  }

app/partials/fuelManager/fuelManager.html

Diff comments View file @4bda569

 <style>
    .subnavbar .mainnav > li:nth-child(2) > a{
    color: #ff9900;
    }
 </style>
-<div class="container">
+<div class="container" style="display: none;">
    <div class="row">
       <div class="col-md-10">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3>Ramp Fee Manager</h3>
                <select>
                   <option>Ramp Fee By Category</option>
                   <option>Make And Model</option>
                   <option>Weight</option>
                   <option>Wingspan</option>
                </select>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
                <h3>Ramp Fees & Avoidance</h3>
                <section id="accordions">
-                  <!-- <div class="panel-group accordion">
-                     <div class="panel panel-default open">
-                        <div class="panel-heading">
-                           <h4 class="panel-title">
-                              <a class="accordion-toggle" id="jaTab1" data-toggle="collapse" data-parent=".accordion" href="#collapseOne">
-                              <span style="float: left; margin-right: 20px; line-height: 22px;">Jet Aircraft</span>
-                              </a>
-                              <select class="form-control" id="ja1" style="width: 150px; margin-right: 20px; float: left; height: 26px; padding: 0 6px;">
-                                 <option value="" disabled selected>Pricing Structure</option>
-                                 <option value="">Retail-(minus)</option>
-                                 <option value="">Cost+(plus)</option>
-                                 <option value="">Direct=(equals)</option>
-                              </select>
-                              <input type="text" id="ja2" class="form-control" value="$1.7500" style="width: 80px; height: 26px; padding: 0 6px;" name="">
-                           </h4>
-                        </div>
-                        <div id="collapseOne" class="panel-collapse collapse in">
-                           <div class="panel-body">
-                              <div class="row" style="margin-left: 0px;">
-                                 <div class="col-md-8">
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <h5 style="color: blue;font-weight: bold;">Omit</h5>
-                                       </div>
-                                       <div class="col-md-5">
-                                          <h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <h5 style="color: blue;font-weight: bold;">Avoidance</h5>
-                                       </div>
-                                    </div>
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <input type="checkbox" name="validateCheckbox" value="1">
-                                       </div>
-                                       <div class="col-md-5">
-                                          <p>Very Light Jet</p>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                    </div>
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <input type="checkbox" name="validateCheckbox" value="1">
-                                       </div>
-                                       <div class="col-md-5">
-                                          <p> Light Jet</p>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                    </div>
-                                 </div>
-                                 <div class="col-md-4">
-                                 </div>
-                              </div>
-                           </div>
-                        </div>
-                     </div>
-                     <div class="panel panel-default">
-                        <div class="panel-heading">
-                           <h4 class="panel-title">
-                              <a class="accordion-toggle" id="jaTab2" data-toggle="collapse" data-parent=".accordion" href="#collapseTwo">
-                              <span style="float: left; margin-right: 20px; line-height: 22px;">TurboPop AirCraft</span>
-                              </a>
-                              <select class="form-control disableSelect" disabled="true" id="ja11" style="width: 150px; margin-right: 20px; float: left; height: 26px; padding: 0 6px;">
-                                 <option value="" disabled selected>Pricing Structure</option>
-                                 <option value="">Retail-(minus)</option>
-                                 <option value="">Cost+(plus)</option>
-                                 <option value="">Direct=(equals)</option>
-                              </select>
-                              <input type="text" id="ja22" class="form-control disableInput" disabled="true" value="$1.7500" style="width: 80px; height: 26px; padding: 0 6px;" name="">
-                           </h4>
-                        </div>
-                        <div id="collapseTwo" class="panel-collapse collapse">
-                           <div class="panel-body">
-                              <div class="row" style="margin-left: 0px;">
-                                 <div class="col-md-8">
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <h5 style="color: blue;font-weight: bold;">Omit</h5>
-                                       </div>
-                                       <div class="col-md-5">
-                                          <h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <h5 style="color: blue;font-weight: bold;">Avoidance</h5>
-                                       </div>
-                                    </div>
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <input type="checkbox" name="validateCheckbox" value="1">
-                                       </div>
-                                       <div class="col-md-5">
-                                          <p>Very Light Jet</p>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                    </div>
-                                    <div class="row" style="margin-bottom: 5px;">
-                                       <div class="col-md-1" style="text-align: right;">
-                                          <input type="checkbox" name="validateCheckbox" value="1">
-                                       </div>
-                                       <div class="col-md-5">
-                                          <p> Light Jet</p>
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                       <div class="col-md-3">
-                                          <input type="text" class="form-control" name="name" id="name">
-                                       </div>
-                                    </div>
-                                 </div>
-                                 <div class="col-md-4">
-                                 </div>
-                              </div>
-                           </div>
-                        </div>
-                     </div>
-                     <div class="panel panel-default">
-                        <div class="panel-heading">
-                           <h4 class="panel-title">
-                              <a class="accordion-toggle" id="jaTab3" data-toggle="collapse" data-parent=".accordion" href="#collapseThree">
-                              <span style="float: left; margin-right: 20px; line-height: 22px;">Collapsible Group Item #3</span>
-                              </a>
-                              <select class="form-control disableSelect" id="ja111" disabled="true" style="width: 150px; margin-right: 20px; float: left; height: 26px; padding: 0 6px;">
-                                 <option value="" disabled selected>Pricing Structure</option>
-                                 <option value="">Retail-(minus)</option>
-                                 <option value="">Cost+(plus)</option>
-                                 <option value="">Direct=(equals)</option>
-                              </select>
-                              <input type="text" id="ja222" disabled="true" class="form-control disableInput" value="$1.7500" style="width: 80px; height: 26px; padding: 0 6px;" name="">
-                           </h4>
-                        </div>
-                        <div id="collapseThree" class="panel-collapse collapse">
-                           <div class="panel-body">
-                              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-                           </div>
-                        </div>
-                     </div>
-                  </div> -->
                   <div class="newCustomAccordian">
                      <!-- tab 1 -->
                      <div class="customAccordianHeader customActive" id="customTabs1">
                         <span>Jet Aircraft</span>
                         <select class="form-control">
                            <option>Pricing Structure</option>
                            <option>Retail-(minus)</option>
                            <option>Cost+(plus)</option>
                            <option>Direct=(equals)</option>
                         </select>
                         <input type="text" name="" class="form-control" value="$1.7500">
                         <div class="pull-right">
                            <button class="btn btn-success">Save</button>
                            <button class="btn btn-danger">Delete</button>
                            <button class="btn btn-default" id="customTabToggle1" style="display: none;">Edit</button>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                      <div class="customAccordianTabBody" id="customTabsBody1">
                         <table class="customTableWithFilter">
                            <thead>
                               <tr>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <input type="text" placeholder="min" name=""> -
                                     <input type="text" placeholder="max" name="">
                                     <span>gal.</span>
                                  </th>
                                  <th> &nbsp; </th>
                               </tr>
                            </thead>
                            <tbody>
                               <tr>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span>$</span>
                                     <input type="text" placeholder="margin" class="tierTextBox" name="">
                                     <button class="addTierButton">Add Tier</button>
                                  </td>
                                  <td>
                                     <i class="fa fa-trash-o" aria-hidden="true"></i>
                                  </td>
                               </tr>
                            </tbody>
                         </table>
                         <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
                      </div>
                      <!--  tab 2  -->
                      <div class="customAccordianHeader" id="customTabs2">
                         <span>Jet Aircraft</span>
                         <select class="form-control" disabled="true">
                            <option>Pricing Structure</option>
                            <option>Retail-(minus)</option>
                            <option>Cost+(plus)</option>
                            <option>Direct=(equals)</option>
                         </select>
                         <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
                         <div class="pull-right">
                            <button class="btn btn-success" style="display: none;">Save</button>
                            <button class="btn btn-danger" style="display: none;">Delete</button>
                            <button class="btn btn-default" id="customTabToggle2">Edit</button>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                      <div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">
                         <table class="customTableWithFilter">
                            <thead>
                               <tr>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <input type="text" placeholder="min" name=""> -
                                     <input type="text" placeholder="max" name="">
                                     <span>gal.</span>
                                  </th>
                                  <th> &nbsp; </th>
                               </tr>
                            </thead>
                            <tbody>
                               <tr>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span>$</span>
                                     <input type="text" placeholder="margin" class="tierTextBox" name="">
                                     <button class="addTierButton">Add Tier</button>
                                  </td>
                                  <td>
                                     <i class="fa fa-trash-o" aria-hidden="true"></i>
                                  </td>
                               </tr>
                            </tbody>
                         </table>
                         <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
                      </div>
                      <!--  tab 3  -->
                      <div class="customAccordianHeader" id="customTabs3">
                         <span>Jet Aircraft</span>
                         <select class="form-control" disabled="true">
                            <option>Pricing Structure</option>
                            <option>Retail-(minus)</option>
                            <option>Cost+(plus)</option>
                            <option>Direct=(equals)</option>
                         </select>
                         <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
                         <div class="pull-right">
                            <button class="btn btn-success" style="display: none;">Save</button>
                            <button class="btn btn-danger" style="display: none;">Delete</button>
                            <button class="btn btn-default" id="customTabToggle3">Edit</button>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                      <div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">
                         <table class="customTableWithFilter">
                            <thead>
                               <tr>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <input type="text" placeholder="min" name=""> -
                                     <input type="text" placeholder="max" name="">
                                     <span>gal.</span>
                                  </th>
                                  <th> &nbsp; </th>
                               </tr>
                            </thead>
                            <tbody>
                               <tr>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span>$</span>
                                     <input type="text" placeholder="margin" class="tierTextBox" name="">
                                     <button class="addTierButton">Add Tier</button>
                                  </td>
                                  <td>
                                     <i class="fa fa-trash-o" aria-hidden="true"></i>
                                  </td>
                               </tr>
                            </tbody>
                         </table>
                         <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
                      </div>
                      <!--  tab 4  -->
                      <div class="customAccordianHeader" id="customTabs4">
                         <span>Jet Aircraft</span>
                         <select class="form-control" disabled="true">
                            <option>Pricing Structure</option>
                            <option>Retail-(minus)</option>
                            <option>Cost+(plus)</option>
                            <option>Direct=(equals)</option>
                         </select>
                         <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
                         <div class="pull-right">
                            <button class="btn btn-success" style="display: none;">Save</button>
                            <button class="btn btn-danger" style="display: none;">Delete</button>
                            <button class="btn btn-default" id="customTabToggle4">Edit</button>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                      <div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">
                         <table class="customTableWithFilter">
                            <thead>
                               <tr>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <span class="pull-left">1-250 gal.</span>
                                     <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
                                  </th>
                                  <th>
                                     <input type="text" placeholder="min" name=""> -
                                     <input type="text" placeholder="max" name="">
                                     <span>gal.</span>
                                  </th>
                                  <th> &nbsp; </th>
                               </tr>
                            </thead>
                            <tbody>
                               <tr>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span class="pull-left">-$0.0000</span> &nbsp;
                                     <span class="pull-right">($1.7500)</span>
                                  </td>
                                  <td>
                                     <span>$</span>
                                     <input type="text" placeholder="margin" class="tierTextBox" name="">
                                     <button class="addTierButton">Add Tier</button>
                                  </td>
                                  <td>
                                     <i class="fa fa-trash-o" aria-hidden="true"></i>
                                  </td>
                               </tr>
                            </tbody>
                         </table>
                         <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
                      </div>
                   </div>
                </section>
                <div class="row">&nbsp;</div>
                <div class="row">
                   <div class="col-md-7">
                   </div>
                   <div class="col-md-5">
                      <div class="form-group">
                         <div class="col-lg-4"></div>
                         <div class="col-lg-8">
                            <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
                            <button type="reset" class="btn btn-default">Cancel</button>
                         </div>
                      </div>
                   </div>
                </div>
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
       </div>
       <!-- /span6 -->
    </div>
    <!-- /span12 -->
-</div>
+</div> <!-- /container 1 -->
-<!-- /row -->
-</div> <!-- /container -->
 <!-- Le javascript
    ================================================== -->
-<!-- Placed at the end of the document so the pages load faster -->

app/partials/fuelManager/fuelManager.service.js

Diff comments View file @4bda569

1	(function(){	1	(function(){
2	'use strict';	2	'use strict';
3	angular.module('acufuel')	3	angular.module('acufuel')
4	.service('fuelManagerService', ['$q', '$http', 'BE', fuelManagerService]);	4	.service('fuelManagerService', ['$q', '$http', 'BASE_URL', fuelManagerService]);
5
6	function fuelManagerService($q, $http, BE) {
7	var temp = {};
8		5
		6	function fuelManagerService($q, $http, BASE_URL) {
9		7
		8	this.getFullList = function() {
		9
		10	var deferred = $q.defer();
		11	$http({
		12	method : 'GET',
		13	url : BASE_URL.url +'/rampFeesAndAvoidance/getAll',
		14	headers : {'Content-Type': 'application/json'},
		15	})
		16	.then(function (result){
		17	deferred.resolve(result.data);
		18	},function (result){
		19	deferred.resolve(result.data);
		20	})
		21	return deferred.promise;
		22	}
		23
		24	//this.addCompany = function(data) {
		25	this.updateFullList = function(data){
		26
		27	var deferred = $q.defer();
		28	$http({
		29	method : 'POST',
		30	url : BASE_URL.url +'/rampFeesAndAvoidance',
		31	headers : {'Content-Type': 'application/json'},
		32	data: data
		33	})
		34	.then(function (result){
		35	deferred.resolve(result.data);
		36	},function (result){
		37	deferred.resolve(result.data);
		38	})
		39	return deferred.promise;
		40	}
10		41

app/partials/login/login.service.js

Diff comments View file @4bda569

 (function(){
  'use strict';
     angular.module('acufuel')
       .service('LoginService', ['$rootScope', '$q', '$http', '$state', 'BASE_URL', 'AUTH_EVENTS', 'USER_ROLES', LoginService]);
       function LoginService($rootScope, $q, $http, $state, BASE_URL, AUTH_EVENTS, USER_ROLES) {
         var authService     = {},
             username        = '',
             role            = '',
             isAuthenticated = false;
         var currentUserDetail = JSON.parse(window.localStorage.getItem("currentUser"));
-        console.log(currentUserDetail)
+       // console.log(currentUserDetail)
         if (currentUserDetail) {
-            console.log('aaya')
+            //console.log('aaya')
             if(currentUserDetail.type == 'ADMIN' || currentUserDetail.type == 'FBO'){
                 $rootScope.isAuthenticated = true;
                 role = USER_ROLES.admin;
             }else if(currentUserDetail.type == 'FLIGHT_DEPT'){
                 $rootScope.isAuthenticated = false;
                 role = USER_ROLES.user;
             }
         }
         authService.loginUser = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BASE_URL.url +'/login',
               headers : {'Content-Type': 'application/x-www-form-urlencoded'},
               data : data
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
-            console.log(result.data)
+            //console.log(result.data)
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
         authService.authenticate = function() {
             var deferred = $q.defer();
             $http({
                method : 'GET',
                url : BASE_URL.url+'/user/authenticate',
                headers : {'Content-Type': 'application/x-www-form-urlencoded'}
             }).then(function (result){
                 if(result.data.userProfile.userType.type == 'ADMIN' || result.data.userProfile.userType.type == 'FBO' || result.data.userProfile.userType.type == 'FLIGHT_DEPT'){
                   authService.setUser(result.data);
                   $state.go('app.dashboard')
                 }else{
                   localStorage.clear();
                   toastr.info("Please check username and password");
                 }
                 deferred.resolve(result.data);
             },function (result){
                 deferred.resolve(result.data);
             });
             return deferred.promise;
         }
         // authService.setAuth = function(data) {
         //     localStorage.setItem('loginStatus', data);
         // }
         authService.logout = function(data) {
           // localStorage.clear();
           // $rootScope.isAuthenticated = false;
           // $rootScope.$broadcast(AUTH_EVENTS.updateUser);
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BASE_URL.url +'/user/logout',
               headers : {'Content-Type': 'application/json'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
         authService.getUser = function () {
           return JSON.parse(window.localStorage.getItem("currentUser"));
         }
         authService.setUser = function (authData) {
             window.localStorage.setItem("currentUser", JSON.stringify(authData.userProfile.userType));
+            window.localStorage.setItem("userProfileId", JSON.stringify(authData.userProfile.id));
             if(authData.userProfile.userType.type == 'ADMIN' || authData.userProfile.userType.type == 'FBO'){
                 role = USER_ROLES.admin;
                 $rootScope.isAuthenticated = true;
             }else if(authData.userProfile.userType.type == 'FLIGHT_DEPT'){
                 role = USER_ROLES.user;
                 $rootScope.isAuthenticated = false;
             }
         }
         authService.isAuthenticated = function () {
           return isAuthenticated;
         }
         authService.role = function () {
           return role;
         }
         authService.isAuthorized = function (authorizedRoles) {
           if (!angular.isArray(authorizedRoles)) {
             authorizedRoles = [authorizedRoles];
           }
           return (authService.isAuthenticated() && authorizedRoles.indexOf(role) !== -1);
         }
         return authService;
     }
 })();