new integration with apis

Rishav
1 parent feacde5ffa
Showing 80 changed files with 3898 additions and 1570 deletions Show diff stats
app/css/custom.css
app/css/main.css
app/img/images.jpg
app/index.html
app/js/angular-cookies.js
app/js/angular-loader.js
app/js/angular-resource.js
app/js/app.constant.js
app/js/app.js
app/js/helpers.js
app/js/multi-step-modal.js
app/js/plugins/example.js
app/partials/Accept/Accept.controller.js
app/partials/Accept/Accept.html
app/partials/Accept/Accept.service.js
app/partials/AirList/AirList.controller.js
app/partials/AirList/AirList.html
app/partials/AirList/AirList.service.js
app/partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js
app/partials/AntiochFlightDepartment/AntiochFlightDepartment.html
@@ -69,4 +69,90 @@ table th, td{
 	background-color: #ff9900 !important;
 	color: #fff !important;
 	border: 1px solid #ff9900 !important;
-}
 \ No newline at end of file
+}
+.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;
+}*/
 \ No newline at end of file
@@ -24,9 +24,6 @@ background: #f3f3f3;
  
 }
  
-
-
-
 .account-container {
 	width: 390px; 
 	display: block;
@@ -14,6 +14,9 @@
       <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/>
       <link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>
       <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>
+      <link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">
+      <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
+
  
       <link rel="stylesheet" href="css/main.css"/>
       <link rel="stylesheet" href="css/base-admin-3.css"/>
@@ -33,7 +36,7 @@
       <link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
       <link href="css/pages/pricing.css" rel="stylesheet">
       <link href="css/pages/reports.css" rel="stylesheet">
-     
+
  
  
    </head>
@@ -54,18 +57,27 @@
  
       <script src="bower_components/angular/angular.min.js"></script>
       <script src="bower_components/angular-route/angular-route.js"></script>
+      <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
+      <script src="bower_components/angular-resource/angular-resource.min.js"></script>
       <script src="bower_components/angular-animate/angular-animate.js"></script>
       <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
       <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
       <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
       <script src='bower_components/moment/min/moment.min.js'></script>
       <script src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
-      
       <script src='bower_components/toastr/toastr.min.js'></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+      <script src="bower_components/jqGrid/js/i18n/grid.locale-en.js"></script>
+      <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script>
+      <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
  
  
+      <!-- 
+      <script src="scripts/inspinia.js"></script>
+      <script src="plugins/iCheck/icheck.min.js"></script>
+       -->
+      
 <!--       <script src="./js/Application.js"></script>
      <script src="js/charts/area.js"></script>
       <script src="js/charts/donut.js"></script>
@@ -75,23 +87,17 @@
       <script src="js/charts/line.js"></script> --> 
       <script src="js/demo/faq.js"></script>
       <script src="js/plugins/faq/faq.js"></script>
-      
       <script src="js/demo/gallery.js"></script>
       <script src="js/demo/sliders.js"></script>
       <script src="js/plugins/msgGrowl/js/msgGrowl.js"></script>
-      
       <script src="js/demo/notifications.js"></script>
-      
-      
-      
       <script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
       <script src="https://code.highcharts.com/maps/highmaps.js"></script>
       <script src="https://code.highcharts.com/maps/modules/data.js"></script>
       <script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script>
-      
-
-
+ <!-- Controllers -->
       <script src="js/app.js"></script>
+      <script src="js/app.constant.js"></script>
       <script src="partials/login/login.controller.js"></script>
       <script src="partials/customers/customers.controller.js"></script>
       <script src="partials/analytics/analytics.controller.js"></script>
@@ -112,7 +118,58 @@
       <script src="partials/viewCompany/viewCompany.controller.js"></script>
       <script src="partials/widgetTemplate/widgetTemplate.controller.js"></script>
       <script src="partials/dashboard/dashboard.controller.js"></script>
+      <script src="partials/AirList/AirList.controller.js"></script>
+      <script src="partials/fuelOrders/fuelOrders.controller.js"></script>
+      <script src="partials/DispatchFuel/DispatchFuel.controller.js"></script>
+      <script src="partials/searchDispatchFuel/searchDispatchFuel.controller.js"></script>
+      <script src="partials/NewCompany/NewCompany.controller.js"></script>
+      <script src="partials/Accept/Accept.controller.js"></script>
+      <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
+      <script src="partials/ContactView/ContactView.controller.js"></script>
+      <script src="partials/FuelVendors/FuelVendors.controller.js"></script>
+      <script src="partials/delselected/delselected.controller.js"></script>
+      <script src="partials/pricingcontact/pricingcontact.controller.js"></script>
+      <script src="partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js"></script>
+
       <script src="partials/main/main.controller.js"></script>
       <div ui-view></div>
+ <!-- End controllers -->
+
+
+ <!-- services -->
+      <script src="partials/login/login.service.js"></script>
+      <script src="partials/customers/customers.service.js"></script>
+      <script src="partials/analytics/analytics.service.js"></script>
+      <script src="partials/account/account.service.js"></script>
+      <script src="partials/elements/elements.service.js"></script>
+      <script src="partials/error/error.service.js"></script>
+      <script src="partials/faq/faq.service.js"></script>
+      <script src="partials/forms/forms.service.js"></script>
+      <script src="partials/fuelManager/fuelManager.service.js"></script>
+      <script src="partials/gallery/gallery.service.js"></script>
+      <script src="partials/jqueryui/jqueryui.service.js"></script>
+      <script src="partials/popups/popups.service.js"></script>
+      <script src="partials/pricing/pricing.service.js"></script>
+      <script src="partials/reports/reports.service.js"></script>
+      <script src="partials/scheduler/scheduler.service.js"></script>
+      <script src="partials/signup/signup.service.js"></script>
+      <script src="partials/updateFuelManager/updateFuelManager.service.js"></script>
+      <script src="partials/viewCompany/viewCompany.service.js"></script>
+      <script src="partials/widgetTemplate/widgetTemplate.service.js"></script>
+      <script src="partials/dashboard/dashboard.service.js"></script>
+      <script src="partials/AirList/AirList.service.js"></script>
+      <script src="partials/fuelOrders/fuelOrders.service.js"></script>
+      <script src="partials/DispatchFuel/DispatchFuel.service.js"></script>
+      <script src="partials/searchDispatchFuel/searchDispatchFuel.service.js"></script>
+      <script src="partials/NewCompany/NewCompany.service.js"></script>
+      <script src="partials/Accept/Accept.service.js"></script>
+      <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
+      <script src="partials/ContactView/ContactView.service.js"></script>
+      <script src="partials/FuelVendors/FuelVendors.service.js"></script>
+      <script src="partials/delselected/delselected.service.js"></script>
+      <script src="partials/pricingcontact/pricingcontact.service.js"></script>
+      <script src="partials/AntiochFlightDepartment/AntiochFlightDepartment.service.js"></script>
+
+      <script src="partials/main/main.service.js"></script>
    </body>
 </html>
 \ No newline at end of file
@@ -1,320 +0,0 @@
-/**
- * @license AngularJS v1.4.0
- * (c) 2010-2015 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/**
- * @ngdoc module
- * @name ngCookies
- * @description
- *
- * # ngCookies
- *
- * The `ngCookies` module provides a convenient wrapper for reading and writing browser cookies.
- *
- *
- * <div doc-module-components="ngCookies"></div>
- *
- * See {@link ngCookies.$cookies `$cookies`} and
- * {@link ngCookies.$cookieStore `$cookieStore`} for usage.
- */
-
-
-angular.module('ngCookies', ['ng']).
-  /**
-   * @ngdoc provider
-   * @name $cookiesProvider
-   * @description
-   * Use `$cookiesProvider` to change the default behavior of the {@link ngCookies.$cookies $cookies} service.
-   * */
-   provider('$cookies', [function $CookiesProvider() {
-    /**
-     * @ngdoc property
-     * @name $cookiesProvider#defaults
-     * @description
-     *
-     * Object containing default options to pass when setting cookies.
-     *
-     * The object may have following properties:
-     *
-     * - **path** - `{string}` - The cookie will be available only for this path and its
-     *   sub-paths. By default, this would be the URL that appears in your base tag.
-     * - **domain** - `{string}` - The cookie will be available only for this domain and
-     *   its sub-domains. For obvious security reasons the user agent will not accept the
-     *   cookie if the current domain is not a sub domain or equals to the requested domain.
-     * - **expires** - `{string|Date}` - String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT"
-     *   or a Date object indicating the exact date/time this cookie will expire.
-     * - **secure** - `{boolean}` - The cookie will be available only in secured connection.
-     *
-     * Note: by default the address that appears in your <base> tag will be used as path.
-     * This is import so that cookies will be visible for all routes in case html5mode is enabled
-     *
-     **/
-    var defaults = this.defaults = {};
-
-    function calcOptions(options) {
-      return options ? angular.extend({}, defaults, options) : defaults;
-    }
-
-    /**
-     * @ngdoc service
-     * @name $cookies
-     *
-     * @description
-     * Provides read/write access to browser's cookies.
-     *
-     * BREAKING CHANGE: `$cookies` no longer exposes properties that represent the
-     * current browser cookie values. Now you must use the get/put/remove/etc. methods
-     * as described below.
-     *
-     * Requires the {@link ngCookies `ngCookies`} module to be installed.
-     *
-     * @example
-     *
-     * ```js
-     * angular.module('cookiesExample', ['ngCookies'])
-     *   .controller('ExampleController', ['$cookies', function($cookies) {
-     *     // Retrieving a cookie
-     *     var favoriteCookie = $cookies.get('myFavorite');
-     *     // Setting a cookie
-     *     $cookies.put('myFavorite', 'oatmeal');
-     *   }]);
-     * ```
-     */
-    this.$get = ['$$cookieReader', '$$cookieWriter', function($$cookieReader, $$cookieWriter) {
-      return {
-        /**
-         * @ngdoc method
-         * @name $cookies#get
-         *
-         * @description
-         * Returns the value of given cookie key
-         *
-         * @param {string} key Id to use for lookup.
-         * @returns {string} Raw cookie value.
-         */
-        get: function(key) {
-          return $$cookieReader()[key];
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#getObject
-         *
-         * @description
-         * Returns the deserialized value of given cookie key
-         *
-         * @param {string} key Id to use for lookup.
-         * @returns {Object} Deserialized cookie value.
-         */
-        getObject: function(key) {
-          var value = this.get(key);
-          return value ? angular.fromJson(value) : value;
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#getAll
-         *
-         * @description
-         * Returns a key value object with all the cookies
-         *
-         * @returns {Object} All cookies
-         */
-        getAll: function() {
-          return $$cookieReader();
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#put
-         *
-         * @description
-         * Sets a value for given cookie key
-         *
-         * @param {string} key Id for the `value`.
-         * @param {string} value Raw value to be stored.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        put: function(key, value, options) {
-          $$cookieWriter(key, value, calcOptions(options));
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#putObject
-         *
-         * @description
-         * Serializes and sets a value for given cookie key
-         *
-         * @param {string} key Id for the `value`.
-         * @param {Object} value Value to be stored.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        putObject: function(key, value, options) {
-          this.put(key, angular.toJson(value), options);
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#remove
-         *
-         * @description
-         * Remove given cookie
-         *
-         * @param {string} key Id of the key-value pair to delete.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        remove: function(key, options) {
-          $$cookieWriter(key, undefined, calcOptions(options));
-        }
-      };
-    }];
-  }]);
-
-angular.module('ngCookies').
-/**
- * @ngdoc service
- * @name $cookieStore
- * @deprecated
- * @requires $cookies
- *
- * @description
- * Provides a key-value (string-object) storage, that is backed by session cookies.
- * Objects put or retrieved from this storage are automatically serialized or
- * deserialized by angular's toJson/fromJson.
- *
- * Requires the {@link ngCookies `ngCookies`} module to be installed.
- *
- * <div class="alert alert-danger">
- * **Note:** The $cookieStore service is deprecated.
- * Please use the {@link ngCookies.$cookies `$cookies`} service instead.
- * </div>
- *
- * @example
- *
- * ```js
- * angular.module('cookieStoreExample', ['ngCookies'])
- *   .controller('ExampleController', ['$cookieStore', function($cookieStore) {
- *     // Put cookie
- *     $cookieStore.put('myFavorite','oatmeal');
- *     // Get cookie
- *     var favoriteCookie = $cookieStore.get('myFavorite');
- *     // Removing a cookie
- *     $cookieStore.remove('myFavorite');
- *   }]);
- * ```
- */
- factory('$cookieStore', ['$cookies', function($cookies) {
-
-    return {
-      /**
-       * @ngdoc method
-       * @name $cookieStore#get
-       *
-       * @description
-       * Returns the value of given cookie key
-       *
-       * @param {string} key Id to use for lookup.
-       * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist.
-       */
-      get: function(key) {
-        return $cookies.getObject(key);
-      },
-
-      /**
-       * @ngdoc method
-       * @name $cookieStore#put
-       *
-       * @description
-       * Sets a value for given cookie key
-       *
-       * @param {string} key Id for the `value`.
-       * @param {Object} value Value to be stored.
-       */
-      put: function(key, value) {
-        $cookies.putObject(key, value);
-      },
-
-      /**
-       * @ngdoc method
-       * @name $cookieStore#remove
-       *
-       * @description
-       * Remove given cookie
-       *
-       * @param {string} key Id of the key-value pair to delete.
-       */
-      remove: function(key) {
-        $cookies.remove(key);
-      }
-    };
-
-  }]);
-
-/**
- * @name $$cookieWriter
- * @requires $document
- *
- * @description
- * This is a private service for writing cookies
- *
- * @param {string} name Cookie name
- * @param {string=} value Cookie value (if undefined, cookie will be deleted)
- * @param {Object=} options Object with options that need to be stored for the cookie.
- */
-function $$CookieWriter($document, $log, $browser) {
-  var cookiePath = $browser.baseHref();
-  var rawDocument = $document[0];
-
-  function buildCookieString(name, value, options) {
-    var path, expires;
-    options = options || {};
-    expires = options.expires;
-    path = angular.isDefined(options.path) ? options.path : cookiePath;
-    if (value === undefined) {
-      expires = 'Thu, 01 Jan 1970 00:00:00 GMT';
-      value = '';
-    }
-    if (angular.isString(expires)) {
-      expires = new Date(expires);
-    }
-
-    var str = encodeURIComponent(name) + '=' + encodeURIComponent(value);
-    str += path ? ';path=' + path : '';
-    str += options.domain ? ';domain=' + options.domain : '';
-    str += expires ? ';expires=' + expires.toUTCString() : '';
-    str += options.secure ? ';secure' : '';
-
-    // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-    // - 300 cookies
-    // - 20 cookies per unique domain
-    // - 4096 bytes per cookie
-    var cookieLength = str.length + 1;
-    if (cookieLength > 4096) {
-      $log.warn("Cookie '" + name +
-        "' possibly not set or overflowed because it was too large (" +
-        cookieLength + " > 4096 bytes)!");
-    }
-
-    return str;
-  }
-
-  return function(name, value, options) {
-    rawDocument.cookie = buildCookieString(name, value, options);
-  };
-}
-
-$$CookieWriter.$inject = ['$document', '$log', '$browser'];
-
-angular.module('ngCookies').provider('$$cookieWriter', function $$CookieWriterProvider() {
-  this.$get = $$CookieWriter;
-});
-
-
-})(window, window.angular);
@@ -1,429 +0,0 @@
-/**
- * @license AngularJS v1.4.0
- * (c) 2010-2015 Google, Inc. http://angularjs.org
- * License: MIT
- */
-
-(function() {'use strict';
-
-/**
- * @description
- *
- * This object provides a utility for producing rich Error messages within
- * Angular. It can be called as follows:
- *
- * var exampleMinErr = minErr('example');
- * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
- *
- * The above creates an instance of minErr in the example namespace. The
- * resulting error will have a namespaced error code of example.one.  The
- * resulting error will replace {0} with the value of foo, and {1} with the
- * value of bar. The object is not restricted in the number of arguments it can
- * take.
- *
- * If fewer arguments are specified than necessary for interpolation, the extra
- * interpolation markers will be preserved in the final string.
- *
- * Since data will be parsed statically during a build step, some restrictions
- * are applied with respect to how minErr instances are created and called.
- * Instances should have names of the form namespaceMinErr for a minErr created
- * using minErr('namespace') . Error codes, namespaces and template strings
- * should all be static strings, not variables or general expressions.
- *
- * @param {string} module The namespace to use for the new minErr instance.
- * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
- *   error from returned function, for cases when a particular type of error is useful.
- * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
- */
-
-function minErr(module, ErrorConstructor) {
-  ErrorConstructor = ErrorConstructor || Error;
-  return function() {
-    var SKIP_INDEXES = 2;
-
-    var templateArgs = arguments,
-      code = templateArgs[0],
-      message = '[' + (module ? module + ':' : '') + code + '] ',
-      template = templateArgs[1],
-      paramPrefix, i;
-
-    message += template.replace(/\{\d+\}/g, function(match) {
-      var index = +match.slice(1, -1),
-        shiftedIndex = index + SKIP_INDEXES;
-
-      if (shiftedIndex < templateArgs.length) {
-        return toDebugString(templateArgs[shiftedIndex]);
-      }
-
-      return match;
-    });
-
-    message += '\nhttp://errors.angularjs.org/1.4.0/' +
-      (module ? module + '/' : '') + code;
-
-    for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
-      message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
-        encodeURIComponent(toDebugString(templateArgs[i]));
-    }
-
-    return new ErrorConstructor(message);
-  };
-}
-
-/**
- * @ngdoc type
- * @name angular.Module
- * @module ng
- * @description
- *
- * Interface for configuring angular {@link angular.module modules}.
- */
-
-function setupModuleLoader(window) {
-
-  var $injectorMinErr = minErr('$injector');
-  var ngMinErr = minErr('ng');
-
-  function ensure(obj, name, factory) {
-    return obj[name] || (obj[name] = factory());
-  }
-
-  var angular = ensure(window, 'angular', Object);
-
-  // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
-  angular.$$minErr = angular.$$minErr || minErr;
-
-  return ensure(angular, 'module', function() {
-    /** @type {Object.<string, angular.Module>} */
-    var modules = {};
-
-    /**
-     * @ngdoc function
-     * @name angular.module
-     * @module ng
-     * @description
-     *
-     * The `angular.module` is a global place for creating, registering and retrieving Angular
-     * modules.
-     * All modules (angular core or 3rd party) that should be available to an application must be
-     * registered using this mechanism.
-     *
-     * When passed two or more arguments, a new module is created.  If passed only one argument, an
-     * existing module (the name passed as the first argument to `module`) is retrieved.
-     *
-     *
-     * # Module
-     *
-     * A module is a collection of services, directives, controllers, filters, and configuration information.
-     * `angular.module` is used to configure the {@link auto.$injector $injector}.
-     *
-     * ```js
-     * // Create a new module
-     * var myModule = angular.module('myModule', []);
-     *
-     * // register a new service
-     * myModule.value('appName', 'MyCoolApp');
-     *
-     * // configure existing services inside initialization blocks.
-     * myModule.config(['$locationProvider', function($locationProvider) {
-     *   // Configure existing providers
-     *   $locationProvider.hashPrefix('!');
-     * }]);
-     * ```
-     *
-     * Then you can create an injector and load your modules like this:
-     *
-     * ```js
-     * var injector = angular.injector(['ng', 'myModule'])
-     * ```
-     *
-     * However it's more likely that you'll just use
-     * {@link ng.directive:ngApp ngApp} or
-     * {@link angular.bootstrap} to simplify this process for you.
-     *
-     * @param {!string} name The name of the module to create or retrieve.
-     * @param {!Array.<string>=} requires If specified then new module is being created. If
-     *        unspecified then the module is being retrieved for further configuration.
-     * @param {Function=} configFn Optional configuration function for the module. Same as
-     *        {@link angular.Module#config Module#config()}.
-     * @returns {module} new module with the {@link angular.Module} api.
-     */
-    return function module(name, requires, configFn) {
-      var assertNotHasOwnProperty = function(name, context) {
-        if (name === 'hasOwnProperty') {
-          throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
-        }
-      };
-
-      assertNotHasOwnProperty(name, 'module');
-      if (requires && modules.hasOwnProperty(name)) {
-        modules[name] = null;
-      }
-      return ensure(modules, name, function() {
-        if (!requires) {
-          throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
-             "the module name or forgot to load it. If registering a module ensure that you " +
-             "specify the dependencies as the second argument.", name);
-        }
-
-        /** @type {!Array.<Array.<*>>} */
-        var invokeQueue = [];
-
-        /** @type {!Array.<Function>} */
-        var configBlocks = [];
-
-        /** @type {!Array.<Function>} */
-        var runBlocks = [];
-
-        var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
-
-        /** @type {angular.Module} */
-        var moduleInstance = {
-          // Private state
-          _invokeQueue: invokeQueue,
-          _configBlocks: configBlocks,
-          _runBlocks: runBlocks,
-
-          /**
-           * @ngdoc property
-           * @name angular.Module#requires
-           * @module ng
-           *
-           * @description
-           * Holds the list of modules which the injector will load before the current module is
-           * loaded.
-           */
-          requires: requires,
-
-          /**
-           * @ngdoc property
-           * @name angular.Module#name
-           * @module ng
-           *
-           * @description
-           * Name of the module.
-           */
-          name: name,
-
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#provider
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} providerType Construction function for creating new instance of the
-           *                                service.
-           * @description
-           * See {@link auto.$provide#provider $provide.provider()}.
-           */
-          provider: invokeLater('$provide', 'provider'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#factory
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} providerFunction Function for creating new instance of the service.
-           * @description
-           * See {@link auto.$provide#factory $provide.factory()}.
-           */
-          factory: invokeLater('$provide', 'factory'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#service
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} constructor A constructor function that will be instantiated.
-           * @description
-           * See {@link auto.$provide#service $provide.service()}.
-           */
-          service: invokeLater('$provide', 'service'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#value
-           * @module ng
-           * @param {string} name service name
-           * @param {*} object Service instance object.
-           * @description
-           * See {@link auto.$provide#value $provide.value()}.
-           */
-          value: invokeLater('$provide', 'value'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#constant
-           * @module ng
-           * @param {string} name constant name
-           * @param {*} object Constant value.
-           * @description
-           * Because the constant are fixed, they get applied before other provide methods.
-           * See {@link auto.$provide#constant $provide.constant()}.
-           */
-          constant: invokeLater('$provide', 'constant', 'unshift'),
-
-           /**
-           * @ngdoc method
-           * @name angular.Module#decorator
-           * @module ng
-           * @param {string} The name of the service to decorate.
-           * @param {Function} This function will be invoked when the service needs to be
-           *                                    instantiated and should return the decorated service instance.
-           * @description
-           * See {@link auto.$provide#decorator $provide.decorator()}.
-           */
-          decorator: invokeLater('$provide', 'decorator'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#animation
-           * @module ng
-           * @param {string} name animation name
-           * @param {Function} animationFactory Factory function for creating new instance of an
-           *                                    animation.
-           * @description
-           *
-           * **NOTE**: animations take effect only if the **ngAnimate** module is loaded.
-           *
-           *
-           * Defines an animation hook that can be later used with
-           * {@link $animate $animate} service and directives that use this service.
-           *
-           * ```js
-           * module.animation('.animation-name', function($inject1, $inject2) {
-           *   return {
-           *     eventName : function(element, done) {
-           *       //code to run the animation
-           *       //once complete, then run done()
-           *       return function cancellationFunction(element) {
-           *         //code to cancel the animation
-           *       }
-           *     }
-           *   }
-           * })
-           * ```
-           *
-           * See {@link ng.$animateProvider#register $animateProvider.register()} and
-           * {@link ngAnimate ngAnimate module} for more information.
-           */
-          animation: invokeLater('$animateProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#filter
-           * @module ng
-           * @param {string} name Filter name - this must be a valid angular expression identifier
-           * @param {Function} filterFactory Factory function for creating new instance of filter.
-           * @description
-           * See {@link ng.$filterProvider#register $filterProvider.register()}.
-           *
-           * <div class="alert alert-warning">
-           * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
-           * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
-           * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-           * (`myapp_subsection_filterx`).
-           * </div>
-           */
-          filter: invokeLater('$filterProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#controller
-           * @module ng
-           * @param {string|Object} name Controller name, or an object map of controllers where the
-           *    keys are the names and the values are the constructors.
-           * @param {Function} constructor Controller constructor function.
-           * @description
-           * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
-           */
-          controller: invokeLater('$controllerProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#directive
-           * @module ng
-           * @param {string|Object} name Directive name, or an object map of directives where the
-           *    keys are the names and the values are the factories.
-           * @param {Function} directiveFactory Factory function for creating new instance of
-           * directives.
-           * @description
-           * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
-           */
-          directive: invokeLater('$compileProvider', 'directive'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#config
-           * @module ng
-           * @param {Function} configFn Execute this function on module load. Useful for service
-           *    configuration.
-           * @description
-           * Use this method to register work which needs to be performed on module loading.
-           * For more about how to configure services, see
-           * {@link providers#provider-recipe Provider Recipe}.
-           */
-          config: config,
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#run
-           * @module ng
-           * @param {Function} initializationFn Execute this function after injector creation.
-           *    Useful for application initialization.
-           * @description
-           * Use this method to register work which should be performed when the injector is done
-           * loading all modules.
-           */
-          run: function(block) {
-            runBlocks.push(block);
-            return this;
-          }
-        };
-
-        if (configFn) {
-          config(configFn);
-        }
-
-        return moduleInstance;
-
-        /**
-         * @param {string} provider
-         * @param {string} method
-         * @param {String=} insertMethod
-         * @returns {angular.Module}
-         */
-        function invokeLater(provider, method, insertMethod, queue) {
-          if (!queue) queue = invokeQueue;
-          return function() {
-            queue[insertMethod || 'push']([provider, method, arguments]);
-            return moduleInstance;
-          };
-        }
-      });
-    };
-  });
-
-}
-
-setupModuleLoader(window);
-})(window);
-
-/**
- * Closure compiler type information
- *
- * @typedef { {
- *   requires: !Array.<string>,
- *   invokeQueue: !Array.<Array.<*>>,
- *
- *   service: function(string, Function):angular.Module,
- *   factory: function(string, Function):angular.Module,
- *   value: function(string, *):angular.Module,
- *
- *   filter: function(string, Function):angular.Module,
- *
- *   init: function(Function):angular.Module
- * } }
- */
-angular.Module;
-
@@ -1,668 +0,0 @@
-/**
- * @license AngularJS v1.4.0
- * (c) 2010-2015 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-var $resourceMinErr = angular.$$minErr('$resource');
-
-// Helper functions and regex to lookup a dotted path on an object
-// stopping at undefined/null.  The path must be composed of ASCII
-// identifiers (just like $parse)
-var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;
-
-function isValidDottedPath(path) {
-  return (path != null && path !== '' && path !== 'hasOwnProperty' &&
-      MEMBER_NAME_REGEX.test('.' + path));
-}
-
-function lookupDottedPath(obj, path) {
-  if (!isValidDottedPath(path)) {
-    throw $resourceMinErr('badmember', 'Dotted member path "@{0}" is invalid.', path);
-  }
-  var keys = path.split('.');
-  for (var i = 0, ii = keys.length; i < ii && obj !== undefined; i++) {
-    var key = keys[i];
-    obj = (obj !== null) ? obj[key] : undefined;
-  }
-  return obj;
-}
-
-/**
- * Create a shallow copy of an object and clear other fields from the destination
- */
-function shallowClearAndCopy(src, dst) {
-  dst = dst || {};
-
-  angular.forEach(dst, function(value, key) {
-    delete dst[key];
-  });
-
-  for (var key in src) {
-    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-      dst[key] = src[key];
-    }
-  }
-
-  return dst;
-}
-
-/**
- * @ngdoc module
- * @name ngResource
- * @description
- *
- * # ngResource
- *
- * The `ngResource` module provides interaction support with RESTful services
- * via the $resource service.
- *
- *
- * <div doc-module-components="ngResource"></div>
- *
- * See {@link ngResource.$resource `$resource`} for usage.
- */
-
-/**
- * @ngdoc service
- * @name $resource
- * @requires $http
- *
- * @description
- * A factory which creates a resource object that lets you interact with
- * [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer) server-side data sources.
- *
- * The returned resource object has action methods which provide high-level behaviors without
- * the need to interact with the low level {@link ng.$http $http} service.
- *
- * Requires the {@link ngResource `ngResource`} module to be installed.
- *
- * By default, trailing slashes will be stripped from the calculated URLs,
- * which can pose problems with server backends that do not expect that
- * behavior.  This can be disabled by configuring the `$resourceProvider` like
- * this:
- *
- * ```js
-     app.config(['$resourceProvider', function($resourceProvider) {
-       // Don't strip trailing slashes from calculated URLs
-       $resourceProvider.defaults.stripTrailingSlashes = false;
-     }]);
- * ```
- *
- * @param {string} url A parameterized URL template with parameters prefixed by `:` as in
- *   `/user/:username`. If you are using a URL with a port number (e.g.
- *   `http://example.com:8080/api`), it will be respected.
- *
- *   If you are using a url with a suffix, just add the suffix, like this:
- *   `$resource('http://example.com/resource.json')` or `$resource('http://example.com/:id.json')`
- *   or even `$resource('http://example.com/resource/:resource_id.:format')`
- *   If the parameter before the suffix is empty, :resource_id in this case, then the `/.` will be
- *   collapsed down to a single `.`.  If you need this sequence to appear and not collapse then you
- *   can escape it with `/\.`.
- *
- * @param {Object=} paramDefaults Default values for `url` parameters. These can be overridden in
- *   `actions` methods. If any of the parameter value is a function, it will be executed every time
- *   when a param value needs to be obtained for a request (unless the param was overridden).
- *
- *   Each key value in the parameter object is first bound to url template if present and then any
- *   excess keys are appended to the url search query after the `?`.
- *
- *   Given a template `/path/:verb` and parameter `{verb:'greet', salutation:'Hello'}` results in
- *   URL `/path/greet?salutation=Hello`.
- *
- *   If the parameter value is prefixed with `@` then the value for that parameter will be extracted
- *   from the corresponding property on the `data` object (provided when calling an action method).  For
- *   example, if the `defaultParam` object is `{someParam: '@someProp'}` then the value of `someParam`
- *   will be `data.someProp`.
- *
- * @param {Object.<Object>=} actions Hash with declaration of custom actions that should extend
- *   the default set of resource actions. The declaration should be created in the format of {@link
- *   ng.$http#usage $http.config}:
- *
- *       {action1: {method:?, params:?, isArray:?, headers:?, ...},
- *        action2: {method:?, params:?, isArray:?, headers:?, ...},
- *        ...}
- *
- *   Where:
- *
- *   - **`action`** – {string} – The name of action. This name becomes the name of the method on
- *     your resource object.
- *   - **`method`** – {string} – Case insensitive HTTP method (e.g. `GET`, `POST`, `PUT`,
- *     `DELETE`, `JSONP`, etc).
- *   - **`params`** – {Object=} – Optional set of pre-bound parameters for this action. If any of
- *     the parameter value is a function, it will be executed every time when a param value needs to
- *     be obtained for a request (unless the param was overridden).
- *   - **`url`** – {string} – action specific `url` override. The url templating is supported just
- *     like for the resource-level urls.
- *   - **`isArray`** – {boolean=} – If true then the returned object for this action is an array,
- *     see `returns` section.
- *   - **`transformRequest`** –
- *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     request body and headers and returns its transformed (typically serialized) version.
- *     By default, transformRequest will contain one function that checks if the request data is
- *     an object and serializes to using `angular.toJson`. To prevent this behavior, set
- *     `transformRequest` to an empty array: `transformRequest: []`
- *   - **`transformResponse`** –
- *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     response body and headers and returns its transformed (typically deserialized) version.
- *     By default, transformResponse will contain one function that checks if the response looks like
- *     a JSON string and deserializes it using `angular.fromJson`. To prevent this behavior, set
- *     `transformResponse` to an empty array: `transformResponse: []`
- *   - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
- *     GET request, otherwise if a cache instance built with
- *     {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
- *     caching.
- *   - **`timeout`** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} that
- *     should abort the request when resolved.
- *   - **`withCredentials`** - `{boolean}` - whether to set the `withCredentials` flag on the
- *     XHR object. See
- *     [requests with credentials](https://developer.mozilla.org/en/http_access_control#section_5)
- *     for more information.
- *   - **`responseType`** - `{string}` - see
- *     [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
- *   - **`interceptor`** - `{Object=}` - The interceptor object has two optional methods -
- *     `response` and `responseError`. Both `response` and `responseError` interceptors get called
- *     with `http response` object. See {@link ng.$http $http interceptors}.
- *
- * @param {Object} options Hash with custom settings that should extend the
- *   default `$resourceProvider` behavior.  The only supported option is
- *
- *   Where:
- *
- *   - **`stripTrailingSlashes`** – {boolean} – If true then the trailing
- *   slashes from any calculated URL will be stripped. (Defaults to true.)
- *
- * @returns {Object} A resource "class" object with methods for the default set of resource actions
- *   optionally extended with custom `actions`. The default set contains these actions:
- *   ```js
- *   { 'get':    {method:'GET'},
- *     'save':   {method:'POST'},
- *     'query':  {method:'GET', isArray:true},
- *     'remove': {method:'DELETE'},
- *     'delete': {method:'DELETE'} };
- *   ```
- *
- *   Calling these methods invoke an {@link ng.$http} with the specified http method,
- *   destination and parameters. When the data is returned from the server then the object is an
- *   instance of the resource class. The actions `save`, `remove` and `delete` are available on it
- *   as  methods with the `$` prefix. This allows you to easily perform CRUD operations (create,
- *   read, update, delete) on server-side data like this:
- *   ```js
- *   var User = $resource('/user/:userId', {userId:'@id'});
- *   var user = User.get({userId:123}, function() {
- *     user.abc = true;
- *     user.$save();
- *   });
- *   ```
- *
- *   It is important to realize that invoking a $resource object method immediately returns an
- *   empty reference (object or array depending on `isArray`). Once the data is returned from the
- *   server the existing reference is populated with the actual data. This is a useful trick since
- *   usually the resource is assigned to a model which is then rendered by the view. Having an empty
- *   object results in no rendering, once the data arrives from the server then the object is
- *   populated with the data and the view automatically re-renders itself showing the new data. This
- *   means that in most cases one never has to write a callback function for the action methods.
- *
- *   The action methods on the class object or instance object can be invoked with the following
- *   parameters:
- *
- *   - HTTP GET "class" actions: `Resource.action([parameters], [success], [error])`
- *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
- *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
- *
- *
- *   Success callback is called with (value, responseHeaders) arguments. Error callback is called
- *   with (httpResponse) argument.
- *
- *   Class actions return empty instance (with additional properties below).
- *   Instance actions return promise of the action.
- *
- *   The Resource instances and collection have these additional properties:
- *
- *   - `$promise`: the {@link ng.$q promise} of the original server interaction that created this
- *     instance or collection.
- *
- *     On success, the promise is resolved with the same resource instance or collection object,
- *     updated with data from server. This makes it easy to use in
- *     {@link ngRoute.$routeProvider resolve section of $routeProvider.when()} to defer view
- *     rendering until the resource(s) are loaded.
- *
- *     On failure, the promise is resolved with the {@link ng.$http http response} object, without
- *     the `resource` property.
- *
- *     If an interceptor object was provided, the promise will instead be resolved with the value
- *     returned by the interceptor.
- *
- *   - `$resolved`: `true` after first server interaction is completed (either with success or
- *      rejection), `false` before that. Knowing if the Resource has been resolved is useful in
- *      data-binding.
- *
- * @example
- *
- * # Credit card resource
- *
- * ```js
-     // Define CreditCard class
-     var CreditCard = $resource('/user/:userId/card/:cardId',
-      {userId:123, cardId:'@id'}, {
-       charge: {method:'POST', params:{charge:true}}
-      });
-
-     // We can retrieve a collection from the server
-     var cards = CreditCard.query(function() {
-       // GET: /user/123/card
-       // server returns: [ {id:456, number:'1234', name:'Smith'} ];
-
-       var card = cards[0];
-       // each item is an instance of CreditCard
-       expect(card instanceof CreditCard).toEqual(true);
-       card.name = "J. Smith";
-       // non GET methods are mapped onto the instances
-       card.$save();
-       // POST: /user/123/card/456 {id:456, number:'1234', name:'J. Smith'}
-       // server returns: {id:456, number:'1234', name: 'J. Smith'};
-
-       // our custom method is mapped as well.
-       card.$charge({amount:9.99});
-       // POST: /user/123/card/456?amount=9.99&charge=true {id:456, number:'1234', name:'J. Smith'}
-     });
-
-     // we can create an instance as well
-     var newCard = new CreditCard({number:'0123'});
-     newCard.name = "Mike Smith";
-     newCard.$save();
-     // POST: /user/123/card {number:'0123', name:'Mike Smith'}
-     // server returns: {id:789, number:'0123', name: 'Mike Smith'};
-     expect(newCard.id).toEqual(789);
- * ```
- *
- * The object returned from this function execution is a resource "class" which has "static" method
- * for each action in the definition.
- *
- * Calling these methods invoke `$http` on the `url` template with the given `method`, `params` and
- * `headers`.
- * When the data is returned from the server then the object is an instance of the resource type and
- * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD
- * operations (create, read, update, delete) on server-side data.
-
-   ```js
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123}, function(user) {
-       user.abc = true;
-       user.$save();
-     });
-   ```
- *
- * It's worth noting that the success callback for `get`, `query` and other methods gets passed
- * in the response that came from the server as well as $http header getter function, so one
- * could rewrite the above example and get access to http headers as:
- *
-   ```js
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123}, function(u, getResponseHeaders){
-       u.abc = true;
-       u.$save(function(u, putResponseHeaders) {
-         //u => saved user object
-         //putResponseHeaders => $http header getter
-       });
-     });
-   ```
- *
- * You can also access the raw `$http` promise via the `$promise` property on the object returned
- *
-   ```
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123})
-         .$promise.then(function(user) {
-           $scope.user = user;
-         });
-   ```
-
- * # Creating a custom 'PUT' request
- * In this example we create a custom method on our resource to make a PUT request
- * ```js
- *    var app = angular.module('app', ['ngResource', 'ngRoute']);
- *
- *    // Some APIs expect a PUT request in the format URL/object/ID
- *    // Here we are creating an 'update' method
- *    app.factory('Notes', ['$resource', function($resource) {
- *    return $resource('/notes/:id', null,
- *        {
- *            'update': { method:'PUT' }
- *        });
- *    }]);
- *
- *    // In our controller we get the ID from the URL using ngRoute and $routeParams
- *    // We pass in $routeParams and our Notes factory along with $scope
- *    app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes',
-                                      function($scope, $routeParams, Notes) {
- *    // First get a note object from the factory
- *    var note = Notes.get({ id:$routeParams.id });
- *    $id = note.id;
- *
- *    // Now call update passing in the ID first then the object you are updating
- *    Notes.update({ id:$id }, note);
- *
- *    // This will PUT /notes/ID with the note object in the request payload
- *    }]);
- * ```
- */
-angular.module('ngResource', ['ng']).
-  provider('$resource', function() {
-    var provider = this;
-
-    this.defaults = {
-      // Strip slashes by default
-      stripTrailingSlashes: true,
-
-      // Default actions configuration
-      actions: {
-        'get': {method: 'GET'},
-        'save': {method: 'POST'},
-        'query': {method: 'GET', isArray: true},
-        'remove': {method: 'DELETE'},
-        'delete': {method: 'DELETE'}
-      }
-    };
-
-    this.$get = ['$http', '$q', function($http, $q) {
-
-      var noop = angular.noop,
-        forEach = angular.forEach,
-        extend = angular.extend,
-        copy = angular.copy,
-        isFunction = angular.isFunction;
-
-      /**
-       * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
-       * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set
-       * (pchar) allowed in path segments:
-       *    segment       = *pchar
-       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-       *    pct-encoded   = "%" HEXDIG HEXDIG
-       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-       *                     / "*" / "+" / "," / ";" / "="
-       */
-      function encodeUriSegment(val) {
-        return encodeUriQuery(val, true).
-          replace(/%26/gi, '&').
-          replace(/%3D/gi, '=').
-          replace(/%2B/gi, '+');
-      }
-
-
-      /**
-       * This method is intended for encoding *key* or *value* parts of query component. We need a
-       * custom method because encodeURIComponent is too aggressive and encodes stuff that doesn't
-       * have to be encoded per http://tools.ietf.org/html/rfc3986:
-       *    query       = *( pchar / "/" / "?" )
-       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-       *    pct-encoded   = "%" HEXDIG HEXDIG
-       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-       *                     / "*" / "+" / "," / ";" / "="
-       */
-      function encodeUriQuery(val, pctEncodeSpaces) {
-        return encodeURIComponent(val).
-          replace(/%40/gi, '@').
-          replace(/%3A/gi, ':').
-          replace(/%24/g, '$').
-          replace(/%2C/gi, ',').
-          replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
-      }
-
-      function Route(template, defaults) {
-        this.template = template;
-        this.defaults = extend({}, provider.defaults, defaults);
-        this.urlParams = {};
-      }
-
-      Route.prototype = {
-        setUrlParams: function(config, params, actionUrl) {
-          var self = this,
-            url = actionUrl || self.template,
-            val,
-            encodedVal;
-
-          var urlParams = self.urlParams = {};
-          forEach(url.split(/\W/), function(param) {
-            if (param === 'hasOwnProperty') {
-              throw $resourceMinErr('badname', "hasOwnProperty is not a valid parameter name.");
-            }
-            if (!(new RegExp("^\\d+$").test(param)) && param &&
-              (new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
-              urlParams[param] = true;
-            }
-          });
-          url = url.replace(/\\:/g, ':');
-
-          params = params || {};
-          forEach(self.urlParams, function(_, urlParam) {
-            val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
-            if (angular.isDefined(val) && val !== null) {
-              encodedVal = encodeUriSegment(val);
-              url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function(match, p1) {
-                return encodedVal + p1;
-              });
-            } else {
-              url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W|$)", "g"), function(match,
-                  leadingSlashes, tail) {
-                if (tail.charAt(0) == '/') {
-                  return tail;
-                } else {
-                  return leadingSlashes + tail;
-                }
-              });
-            }
-          });
-
-          // strip trailing slashes and set the url (unless this behavior is specifically disabled)
-          if (self.defaults.stripTrailingSlashes) {
-            url = url.replace(/\/+$/, '') || '/';
-          }
-
-          // then replace collapse `/.` if found in the last URL path segment before the query
-          // E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
-          url = url.replace(/\/\.(?=\w+($|\?))/, '.');
-          // replace escaped `/\.` with `/.`
-          config.url = url.replace(/\/\\\./, '/.');
-
-
-          // set params - delegate param encoding to $http
-          forEach(params, function(value, key) {
-            if (!self.urlParams[key]) {
-              config.params = config.params || {};
-              config.params[key] = value;
-            }
-          });
-        }
-      };
-
-
-      function resourceFactory(url, paramDefaults, actions, options) {
-        var route = new Route(url, options);
-
-        actions = extend({}, provider.defaults.actions, actions);
-
-        function extractParams(data, actionParams) {
-          var ids = {};
-          actionParams = extend({}, paramDefaults, actionParams);
-          forEach(actionParams, function(value, key) {
-            if (isFunction(value)) { value = value(); }
-            ids[key] = value && value.charAt && value.charAt(0) == '@' ?
-              lookupDottedPath(data, value.substr(1)) : value;
-          });
-          return ids;
-        }
-
-        function defaultResponseInterceptor(response) {
-          return response.resource;
-        }
-
-        function Resource(value) {
-          shallowClearAndCopy(value || {}, this);
-        }
-
-        Resource.prototype.toJSON = function() {
-          var data = extend({}, this);
-          delete data.$promise;
-          delete data.$resolved;
-          return data;
-        };
-
-        forEach(actions, function(action, name) {
-          var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
-
-          Resource[name] = function(a1, a2, a3, a4) {
-            var params = {}, data, success, error;
-
-            /* jshint -W086 */ /* (purposefully fall through case statements) */
-            switch (arguments.length) {
-              case 4:
-                error = a4;
-                success = a3;
-              //fallthrough
-              case 3:
-              case 2:
-                if (isFunction(a2)) {
-                  if (isFunction(a1)) {
-                    success = a1;
-                    error = a2;
-                    break;
-                  }
-
-                  success = a2;
-                  error = a3;
-                  //fallthrough
-                } else {
-                  params = a1;
-                  data = a2;
-                  success = a3;
-                  break;
-                }
-              case 1:
-                if (isFunction(a1)) success = a1;
-                else if (hasBody) data = a1;
-                else params = a1;
-                break;
-              case 0: break;
-              default:
-                throw $resourceMinErr('badargs',
-                  "Expected up to 4 arguments [params, data, success, error], got {0} arguments",
-                  arguments.length);
-            }
-            /* jshint +W086 */ /* (purposefully fall through case statements) */
-
-            var isInstanceCall = this instanceof Resource;
-            var value = isInstanceCall ? data : (action.isArray ? [] : new Resource(data));
-            var httpConfig = {};
-            var responseInterceptor = action.interceptor && action.interceptor.response ||
-              defaultResponseInterceptor;
-            var responseErrorInterceptor = action.interceptor && action.interceptor.responseError ||
-              undefined;
-
-            forEach(action, function(value, key) {
-              if (key != 'params' && key != 'isArray' && key != 'interceptor') {
-                httpConfig[key] = copy(value);
-              }
-            });
-
-            if (hasBody) httpConfig.data = data;
-            route.setUrlParams(httpConfig,
-              extend({}, extractParams(data, action.params || {}), params),
-              action.url);
-
-            var promise = $http(httpConfig).then(function(response) {
-              var data = response.data,
-                promise = value.$promise;
-
-              if (data) {
-                // Need to convert action.isArray to boolean in case it is undefined
-                // jshint -W018
-                if (angular.isArray(data) !== (!!action.isArray)) {
-                  throw $resourceMinErr('badcfg',
-                      'Error in resource configuration for action `{0}`. Expected response to ' +
-                      'contain an {1} but got an {2} (Request: {3} {4})', name, action.isArray ? 'array' : 'object',
-                    angular.isArray(data) ? 'array' : 'object', httpConfig.method, httpConfig.url);
-                }
-                // jshint +W018
-                if (action.isArray) {
-                  value.length = 0;
-                  forEach(data, function(item) {
-                    if (typeof item === "object") {
-                      value.push(new Resource(item));
-                    } else {
-                      // Valid JSON values may be string literals, and these should not be converted
-                      // into objects. These items will not have access to the Resource prototype
-                      // methods, but unfortunately there
-                      value.push(item);
-                    }
-                  });
-                } else {
-                  shallowClearAndCopy(data, value);
-                  value.$promise = promise;
-                }
-              }
-
-              value.$resolved = true;
-
-              response.resource = value;
-
-              return response;
-            }, function(response) {
-              value.$resolved = true;
-
-              (error || noop)(response);
-
-              return $q.reject(response);
-            });
-
-            promise = promise.then(
-              function(response) {
-                var value = responseInterceptor(response);
-                (success || noop)(value, response.headers);
-                return value;
-              },
-              responseErrorInterceptor);
-
-            if (!isInstanceCall) {
-              // we are creating instance / collection
-              // - set the initial promise
-              // - return the instance / collection
-              value.$promise = promise;
-              value.$resolved = false;
-
-              return value;
-            }
-
-            // instance call
-            return promise;
-          };
-
-
-          Resource.prototype['$' + name] = function(params, success, error) {
-            if (isFunction(params)) {
-              error = success; success = params; params = {};
-            }
-            var result = Resource[name].call(this, params, this, success, error);
-            return result.$promise || result;
-          };
-        });
-
-        Resource.bind = function(additionalParamDefaults) {
-          return resourceFactory(url, extend({}, paramDefaults, additionalParamDefaults), actions);
-        };
-
-        return Resource;
-      }
-
-      return resourceFactory;
-    }];
-  });
-
-
-})(window, window.angular);
@@ -0,0 +1,21 @@
+(function(){
+'use strict';
+
+	angular.module('acufuel')
+	
+	.constant('BASE_URL', {
+		//url: 'http://54.149.169.33:8080/ws'
+        url: 'http://192.168.1.226:8080/ws'
+	})
+
+	.constant('AUTH_EVENTS', {
+        updateUser: 'update-user',
+        notAuthorized: 'auth-not-authorized'
+    })
+
+    .constant('USER_ROLES', {
+        user : 'user',
+        admin: 'admin'
+    });
+    
+})();
 \ No newline at end of file
-
 'use strict';
  
  
-  angular.module('acufuel', ['ui.router', 'ngAnimate', 'ui.bootstrap'])
+  angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable'])
+
+    .config(['$httpProvider', function($httpProvider) {
+      $httpProvider.defaults.withCredentials = true;
+      $httpProvider.interceptors.push('myCSRF');
+      $httpProvider.interceptors.push('httpRequestInterceptor');
+    }])
+
+
+    .factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {
+       return {
+           request: function($config) {
+             return $config;
+           },
+           responseError: function(rejection) {
+             if (rejection.status === 401) {
+               if($location.path() != "/login"){
+                   localStorage.clear();
+                   window.location.reload();
+               }  
+             }
+             return $q.reject(rejection);
+           }
+         }
+     }])
+    
+    .provider('myCSRF',[function(){
+      var headerName = 'X-CSRFToken';
+      var cookieName = 'csrftoken';
+      var allowedMethods = ['GET'];
+
+      this.setHeaderName = function(n) {
+        headerName = n;
+      }
+      this.setCookieName = function(n) {
+        cookieName = n;
+      }
+      this.setAllowedMethods = function(n) {
+        allowedMethods = n;
+      }
+      this.$get = ['$cookies', function($cookies){
+        return {
+          'request': function(config) {
+            if(allowedMethods.indexOf(config.method) === -1) {
+              // do something on success
+              config.headers[headerName] = $cookies[cookieName];
+            }
+            return config;
+          }
+        }
+      }];
+    }])
  
   .config(
       ['$locationProvider', '$stateProvider', '$urlRouterProvider',
@@ -32,6 +82,16 @@
               templateUrl: "partials/customers/customers.html",
               controller: "customersController"
             })
+            .state("app.ContactView", {
+              url: "/ContactView",
+              templateUrl: "partials/ContactView/ContactView.html",
+              controller: "ContactViewController"
+            })
+            .state("app.FuelVendors", {
+              url: "/FuelVendors",
+              templateUrl: "partials/FuelVendors/FuelVendors.html",
+              controller: "FuelVendorsController"
+            })
  
             .state("app.analytics", {
               url: "/analytics",
@@ -51,6 +111,11 @@
               controller: "dashboardController"
             })
  
+              .state("app.AirList", {
+              url: "/AirList",
+              templateUrl: "partials/AirList/AirList.html",
+              controller: "AirListController"
+            })
  
             .state("app.elements", {
               url: "/elements",
@@ -133,7 +198,10 @@
             .state("app.updateFuelManager", {
               url: "/updateFuelManager",
               templateUrl: "partials/updateFuelManager/updateFuelManager.html",
-              controller: "updateFuelManagerController"
+              controller: "updateFuelManagerController",
+              // data: {
+              //     authorizedRoles: ["fbo"],
+              // }
             })
  
              .state("app.viewCompany", {
@@ -147,8 +215,89 @@
               templateUrl: "partials/widgetTemplate/widgetTemplate.html",
               controller: "widgetTemplateController"
             })
+
+             .state("app.fuelOrders", {
+              url: "/fuelOrders",
+              templateUrl: "partials/fuelOrders/fuelOrders.html",
+              controller: "fuelOrdersController"
+            })
+
+             .state("app.DispatchFuel", {
+              url: "/DispatchFuel",
+              templateUrl: "partials/DispatchFuel/DispatchFuel.html",
+              controller: "DispatchFuelController"
+            })
+
+             .state("app.searchDispatchFuel", {
+              url: "/searchDispatchFuel",
+              templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",
+              controller: "searchDispatchFuelController"
+            })
+
+             .state("app.NewCompany", {
+              url: "/NewCompany",
+              templateUrl: "partials/NewCompany/NewCompany.html",
+              controller: "NewCompanyController"
+            })
+
+             .state("app.Accept", {
+              url: "/Accept",
+              templateUrl: "partials/Accept/Accept.html",
+              controller: "AcceptController"
+            })
+             .state("app.delselected", {
+              url: "/delselected",
+              templateUrl: "partials/delselected/delselected.html",
+              controller: "delselectedController"
+            })
+            
+            .state("app.pricingcontact", {
+              url: "/pricingcontact",
+              templateUrl: "partials/pricingcontact/pricingcontact.html",
+              controller: "pricingcontactController"
+            })
+
+             .state("app.AntiochFlightDepartment", {
+              url: "/AntiochFlightDepartment",
+              templateUrl: "partials/AntiochFlightDepartment/AntiochFlightDepartment.html",
+              controller: "AntiochFlightDepartmentcontroller"
+            })
         }
-  ]);
+  ])
+
+  .run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {
+      $rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {
+          $rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));
+
+          LoginService.isAuthorized = function (authorizedRoles) {
+              if (!angular.isArray(authorizedRoles)) {
+                  authorizedRoles = [authorizedRoles];
+              }
+              var userdata = JSON.parse(window.localStorage.getItem('currentUser'));
+              return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);
+          }
+          
+          if ('data' in next && 'authorizedRoles' in next.data) {
+            var authorizedRoles = next.data.authorizedRoles;
+            if (!LoginService.isAuthorized(authorizedRoles)) {
+              event.preventDefault();
+              if($state.current.name.length == 0) {
+                $state.go('login')
+              } else {
+                $state.go($state.current, {}, {reload: true});
+                $rootScope.$broadcast(AUTH_EVENTS.notAuthorized); 
+              }
+            }
+          }
+
+          if (LoginService.isAuthenticated()) {
+            if (next.name == 'login') {
+              event.preventDefault();
+              $state.go('app.dashboard');
+            }
+          }
+      });
+  }])
  
  
  
@@ -0,0 +1,21 @@
+angular
+  .module('mwl.calendar.docs')
+  .factory('alert', function($uibModal) {
+
+    function show(action, event) {
+      return $uibModal.open({
+        templateUrl: 'modalContent.html',
+        controller: function() {
+          var vm = this;
+          vm.action = action;
+          vm.event = event;
+        },
+        controllerAs: 'vm'
+      });
+    }
+
+    return {
+      show: show
+    };
+
+  }); 
@@ -0,0 +1,127 @@
++function($) {
+    'use strict';
+
+    var modals = $('.modal.multi-step');
+
+    modals.each(function(idx, modal) {
+        var $modal = $(modal);
+        var $buttons = $modal.find('button.step');
+        var total_num_steps = $buttons.length;
+        var $progress = $modal.find('.m-progress');
+        var $progress_bar = $modal.find('.m-progress-bar');
+        var $progress_stats = $modal.find('.m-progress-stats');
+        var $progress_current = $modal.find('.m-progress-current');
+        var $progress_total = $modal.find('.m-progress-total');
+        var $progress_complete  = $modal.find('.m-progress-complete');
+        var reset_on_close = $modal.attr('reset-on-close') === 'true';
+
+        function reset() {
+            $modal.find('.step').hide();
+            $modal.find('[data-step]').hide();
+        }
+
+        function completeSteps() {
+            $progress_stats.hide();
+            $progress_complete.show();
+            $modal.find('.progress-text').animate({
+                top: '-2em'
+            });
+            $modal.find('.complete-indicator').animate({
+                top: '-2em'
+            });
+            $progress_bar.addClass('completed');
+        }
+
+        function getPercentComplete(current_step, total_steps) {
+            return Math.min(current_step / total_steps * 100, 100) + '%';
+        }
+
+        function updateProgress(current, total) {
+            $progress_bar.animate({
+                width: getPercentComplete(current, total)
+            });
+            if (current - 1 >= total_num_steps) {
+                completeSteps();
+            } else {
+                $progress_current.text(current);
+            }
+
+            $progress.find('[data-progress]').each(function() {
+                var dp = $(this);
+                if (dp.data().progress <= current - 1) {
+                    dp.addClass('completed');
+                } else {
+                    dp.removeClass('completed');
+                }
+            });
+        }
+
+        function goToStep(step) {
+            reset();
+            var to_show = $modal.find('.step-' + step);
+            if (to_show.length === 0) {
+                // at the last step, nothing else to show
+                return;
+            }
+            to_show.show();
+            var current = parseInt(step, 10);
+            updateProgress(current, total_num_steps);
+            findFirstFocusableInput(to_show).focus();
+        }
+
+        function findFirstFocusableInput(parent) {
+            var candidates = [parent.find('input'), parent.find('select'),
+                              parent.find('textarea'),parent.find('button')],
+                winner = parent;
+            $.each(candidates, function() {
+                if (this.length > 0) {
+                    winner = this[0];
+                    return false;
+                }
+            });
+            return $(winner);
+        }
+
+        function bindEventsToModal($modal) {
+            var data_steps = [];
+            $('[data-step]').each(function() {
+                var step = $(this).data().step;
+                if (step && $.inArray(step, data_steps) === -1) {
+                    data_steps.push(step);
+                }
+            });
+
+            $.each(data_steps, function(i, v) {
+                $modal.on('next.m.' + v, {step: v}, function(e) {
+                    goToStep(e.data.step);
+                });
+            });
+        }
+
+        function initialize() {
+            reset();
+            updateProgress(1, total_num_steps);
+            $modal.find('.step-1').show();
+            $progress_complete.hide();
+            $progress_total.text(total_num_steps);
+            bindEventsToModal($modal, total_num_steps);
+            $modal.data({
+                total_num_steps: $buttons.length,
+            });
+            if (reset_on_close){
+                //Bootstrap 2.3.2
+                $modal.on('hidden', function () {
+                    reset();
+                    $modal.find('.step-1').show();
+                })
+                //Bootstrap 3
+                $modal.on('hidden.bs.modal', function () {
+                    reset();
+                    $modal.find('.step-1').show();
+                })
+            }
+        }
+
+        initialize();
+    })
+}(jQuery);
 \ No newline at end of file
@@ -0,0 +1,106 @@
+angular.module('mwl.calendar.docs', ['mwl.calendar', 'ngAnimate', 'ui.bootstrap', 'colorpicker.module']);
+angular
+  .module('mwl.calendar.docs') //you will need to declare your module with the dependencies ['mwl.calendar', 'ui.bootstrap', 'ngAnimate']
+  .controller('KitchenSinkCtrl', function(moment, alert, calendarConfig) {
+
+    var vm = this;
+
+    //These variables MUST be set as a minimum for the calendar to work
+    vm.calendarView = 'month';
+    vm.viewDate = new Date();
+    var actions = [{
+      label: '<i class=\'glyphicon glyphicon-pencil\'></i>',
+      onClick: function(args) {
+        alert.show('Edited', args.calendarEvent);
+      }
+    }, {
+      label: '<i class=\'glyphicon glyphicon-remove\'></i>',
+      onClick: function(args) {
+        alert.show('Deleted', args.calendarEvent);
+      }
+    }];
+    vm.events = [
+      {
+        title: 'An event',
+        color: calendarConfig.colorTypes.warning,
+        startsAt: moment().startOf('week').subtract(2, 'days').add(8, 'hours').toDate(),
+        endsAt: moment().startOf('week').add(1, 'week').add(9, 'hours').toDate(),
+        draggable: true,
+        resizable: true,
+        actions: actions
+      }, {
+        title: '<i class="glyphicon glyphicon-asterisk"></i> <span class="text-primary">Another event</span>, with a <i>html</i> title',
+        color: calendarConfig.colorTypes.info,
+        startsAt: moment().subtract(1, 'day').toDate(),
+        endsAt: moment().add(5, 'days').toDate(),
+        draggable: true,
+        resizable: true,
+        actions: actions
+      }, {
+        title: 'This is a really long event title that occurs on every year',
+        color: calendarConfig.colorTypes.important,
+        startsAt: moment().startOf('day').add(7, 'hours').toDate(),
+        endsAt: moment().startOf('day').add(19, 'hours').toDate(),
+        recursOn: 'year',
+        draggable: true,
+        resizable: true,
+        actions: actions
+      }
+    ];
+
+    vm.cellIsOpen = true;
+
+    vm.addEvent = function() {
+      vm.events.push({
+        title: 'New event',
+        startsAt: moment().startOf('day').toDate(),
+        endsAt: moment().endOf('day').toDate(),
+        color: calendarConfig.colorTypes.important,
+        draggable: true,
+        resizable: true
+      });
+    };
+
+    vm.eventClicked = function(event) {
+      alert.show('Clicked', event);
+    };
+
+    vm.eventEdited = function(event) {
+      alert.show('Edited', event);
+    };
+
+    vm.eventDeleted = function(event) {
+      alert.show('Deleted', event);
+    };
+
+    vm.eventTimesChanged = function(event) {
+      alert.show('Dropped or resized', event);
+    };
+
+    vm.toggle = function($event, field, event) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      event[field] = !event[field];
+    };
+
+    vm.timespanClicked = function(date, cell) {
+
+      if (vm.calendarView === 'month') {
+        if ((vm.cellIsOpen && moment(date).startOf('day').isSame(moment(vm.viewDate).startOf('day'))) || cell.events.length === 0 || !cell.inMonth) {
+          vm.cellIsOpen = false;
+        } else {
+          vm.cellIsOpen = true;
+          vm.viewDate = date;
+        }
+      } else if (vm.calendarView === 'year') {
+        if ((vm.cellIsOpen && moment(date).startOf('month').isSame(moment(vm.viewDate).startOf('month'))) || cell.events.length === 0) {
+          vm.cellIsOpen = false;
+        } else {
+          vm.cellIsOpen = true;
+          vm.viewDate = date;
+        }
+      }
+
+    };
+
+  }); 
@@ -0,0 +1,11 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('AcceptController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+ 
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,24 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-4">
+        <div class="widget stacked">
+         <!-- <div class="widget-header"></div> -->
+         <div class="widget-content" style="padding-left: 0; padding-right: 0; padding-bottom: 0;">
+            <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
+            <div class="col-md-10">
+                <form>
+                  Title:<br>
+                  <input type="text" name="firstname"><br>
+                  Content:<br>
+                  <input type="text" name="lastname">
+                </form>
+            </div>
+            <div class="col-xs-12" style="background-color: #eee; padding: 15px; text-align: right;">
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">Accept</button>
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">Cancel</button>
+            </div>
+        </div>
+        </div>
+	</div>
+</div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('acceptService', ['$q', '$http', 'BE', acceptService]);
+
+      function acceptService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,10 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('AirListController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,195 @@
+<div class="container">
+   <div class="row">
+      <div class="col-md-7" style="padding-right: 60px;">
+         <div class="widget">
+            <div class="widget-header">
+               <i class="icon-pencil"></i>
+               <i class="fa fa-tasks" aria-hidden="true"></i>
+               <h3>Add a New Company</h3>
+            </div>
+            <div class="widget-content" style="padding-left: 0; padding-right: 0;">
+               <div class="container">
+                  <div class="row">
+                     <div class="col-md-6" style="margin-left: 20px;">
+                           <div class="widget-header">
+                              <i class="fa fa-plane"></i>
+                              <h3>Aircraft List</h3>
+                           </div>
+                           <div class="widget-content" style="padding:0px">
+                              <div class="table-responsive">
+                                 <table class="table table-bordered table-hover table-striped">
+                                    <thead>
+                                       <tr>
+                                          <th>Tail</th>
+                                          <th>Make</th>
+                                          <th>Model</th>
+                                          <th>Size</th>
+                                          <th>Margin</th>
+                                       </tr>
+                                    </thead>
+                                    <tbody>
+                                       <tr>
+                                          <td>
+                                             <input type="text" style="width:100px;" class="form-control">
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                       </tr>
+                                       <tr>
+                                          <td>
+                                             <input type="text" style="width:100px;" class="form-control">
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                       </tr>
+                                       <tr>
+                                          <td>
+                                             <input type="text" style="width:100px;" class="form-control">
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                       </tr>
+                                       <tr>
+                                          <td>
+                                             <input type="text" style="width:100px;" class="form-control">
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                       </tr>
+                                       <tr>
+                                          <td>
+                                             <input type="text" style="width:100px;" class="form-control">
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                          <td>
+                                             <select class="form-control" style="height:31px;">
+                                                <option>Margin1</option>
+                                                <option>Margin2</option>
+                                             </select>
+                                          </td>
+                                       </tr>
+                                    </tbody>
+                                 </table>
+                              </div>
+                              <div class="clearfix"></div>
+                           </div>
+                         <div class="col-xs-12" style=" padding: 15px; text-align: right;">
+                              <button type="button" class="btn btn-default">Cancel</button>
+                              <button type="button" class="btn btn-warning">Go Back</button>
+                              <button type="button" class="btn btn-success">Save</button>
+                              <!-- <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">Cancel</button> -->
+                         </div>
+                       
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('AirListService', ['$q', '$http', 'BE', AirListService]);
+
+      function AirListService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,16 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('AntiochFlightDepartmentcontroller', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+      $(function() {
+         $('#toggle-five').bootstrapToggle();
+    console.log("hello");
+    })
+
+  
+    }]);
@@ -0,0 +1,64 @@
+<div class="container">
+   <div class="row">
+      <div class="col-md-10" style="padding-right: 60px; margin-bottom: 30px;">
+         <div class="widget">
+            <div class="widget-header">
+               <i class="icon-pencil"></i>
+                <i class="fa fa-building-o" aria-hidden="true"></i>
+               <h3>Antioch Flight Department</h3>
+            </div>
+            <div class="widget-content" style="padding-left: 0; padding-right: 0; ">
+               <div class="container">
+                  <div class="row">
+                     <div class="col-md-6" style="margin-left: 20px;">
+                     <div class="widget stacked">
+                        <div class="widget-header">
+                           <i class="fa fa-building-o" aria-hidden="true"></i>
+                           <h3>Contact Detail</h3>
+                           <div class="pull-right my-toggle-switch" style="margin-top: 10px; margin-right: 30px;">
+               <div><input id="toggle-five" checked type="checkbox" data-size="mini" data-width="110" data-toggle="toggle" data-on="PRICE EMAIL ON" data-off="PRICE EMAIL OFF">
+               </div>
+            </div>
+                        </div>
+                        <div class="widget-content">
+                           <div class="row" style="margin-left:0px">
+                              <div class="col-md-6">
+                                 <h3 style="color:#F90;">
+                                    <b>Monica Smith</b>
+                                 </h3>
+                              </div>
+                              <div class="col-md-6">
+                                  <div style="margin-bottom: 10px" class="input-group email-password">
+                                        <span class="input-group-addon email-password"><i class="glyphicon glyphicon-user email-password-icon"></i></span>
+                                        <input id="login-username" type="text" class="form-control email-password" name="username" value="" placeholder="username or email">                                        
+                                    </div>
+                                
+                                  <div class="input-group email-password">
+                                        <span class="input-group-addon email-password"><i class="fa fa-key" aria-hidden="true"></i></span>
+                                        <input id="login-password" type="password" class="form-control email-password" name="password" placeholder="password">
+                                    </div>
+                              </div>
+                           </div>
+                           <div>
+                              <p><i class="fa fa-map-marker"></i> Reviera State Rd32 <input type="checkbox"></p>
+                              <p><i class="fa fa-phone"></i> (310) 2342-3433 <input type="checkbox"></p>
+                              <p><i class="fa fa-envelope"></i> freed@gmail.com <input type="checkbox"></p>
+                           </div>
+                           </br>
+                           <div>
+                              <p><b>Company Notes</b> <input type="checkbox"></p>
+                              <p>This is the test data. note will be written in this</p>
+                              <button type="button" class="btn btn-primary">Send Price to This Contacts</button>
+                           </div>
+                           <!-- <div class="col-md-6">
+                              <button type="button" class="btn btn-primary">Send Price to This Contacts</button>
+                           </div> -->
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('AntiochFlightDepartmentService', ['$q', '$http', 'BE', AntiochFlightDepartmentService]);
+
+      function AntiochFlightDepartmentService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,15 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('ContactViewController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+      $(function() {
+      $('#toggle-one12').bootstrapToggle();
+      $('#toggle-two21').bootstrapToggle();
+        }) 
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,243 @@
+<style>
+   .subnavbar .mainnav > li:nth-child(3) > a{
+   color: #ff9900;
+   }
+</style>
+<div class="main">
+   <div class="container">
+      <div class="row">
+         <div class="col-md-12">
+            <div class="widget stacked ">
+               <div class="widget-content">
+                  <div class="tabbable">
+                     <ul class="nav nav-tabs">
+                        <li>
+                           <a ui-sref="app.customers">Company View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li class="active">
+                           <a ui-sref="app.ContactView">Contact View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li>
+                           <a ui-sref="app.FuelVendors">Fuel Vendors 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li>
+                        <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
+                        <li style="float:right"><button type="submit" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>
+                     </ul>
+                     <br>  
+                     <div class="tab-content customer-table" style="margin:0px">
+                        <div class="tab-pane active" id="companyView">
+                           <table class="table table-striped">
+                              <thead>
+                                 <tr>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Last Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">First Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Work Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Mobile Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company"> Title <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Username <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       
+                                       <label class="font-company">Pricing Email <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Password <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <!-- <th></th>
+                                    <th></th> -->
+                                 </tr>
+                              </thead>
+                              <tbody>
+                                 <tr>
+                                    <td class="font-company">colony</td>
+                                    <td class="font-company">Gerry</td>
+                                    <td class="font-company">Est LLC</td>
+                                    <td class="font-company">(310) 555-1212</td>
+                                    <td class="font-company">(310) 555-1212</td>
+                                    <td class="font-company">Acufuel</td>
+                                    <td class="font-company">Usel 1</td>
+                                    <td class="font-company"><input id="toggle-one12" checked type="checkbox" data-size="mini" data-toggle="toggle">
+                                    </td>
+                                    <td class="font-company">Password 123</td>
+                                    <!-- <td ></td>
+                                    <td></td> -->
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">colony</td>
+                                    <td class="font-company">Gerry</td>
+                                    <td class="font-company">Est LLC</td>
+                                    <td class="font-company">(310) 555-1212</td>
+                                    <td class="font-company">(310) 555-1212</td>
+                                    <td class="font-company">Acufuel</td>
+                                    <td class="font-company">Usel 1</td>
+                                    <td class="font-company"><input id="toggle-two21" checked type="checkbox" data-size="mini" data-toggle="toggle">
+                                       
+                                    </td>
+                                    <td class="font-company">Password 123</td>
+                                    <!-- <td></td>
+                                    <td></td> -->
+                                 </tr>
+                              </tbody>
+                           </table>
+                           <div class="row" style="margin-left: 0px;">
+                              <div class="col-md-2">
+                                 <button type="button" class="btn btn-warning">Export Customers</button>
+                              </div>
+                              <div class="col-md-10">
+                                 <div class="row" style="margin-left: 0px;">
+                                    <div class="col-md-6">
+                                    </div>
+                                    <div class="col-md-2">
+                                       <select class="form-control">
+                                          <option>20 Records Per Page</option>
+                                          <option>50 Records Per Page</option>
+                                          <option>100 Records Per Page</option>
+                                       </select>
+                                    </div>
+                                    <div class="col-md-4">
+                                       <ul class="pagination" style="margin:0px">
+                                          <li><a href="javascript:;">«</a></li>
+                                          <li class="active"><a href="#">1</a></li>
+                                          <li><a href="javascript:;">2</a></li>
+                                          <li><a href="javascript:;">3</a></li>
+                                          <li><a href="javascript:;">4</a></li>
+                                          <li><a href="javascript:;">5</a></li>
+                                          <li><a href="javascript:;">»</a></li>
+                                       </ul>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="tab-pane" id="contactView">
+                           <table class="table table-striped">
+                              <thead>
+                                 <tr>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name"> Last Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">First Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Company Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Work Phone</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Mobile Phone</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Title</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Pricing Email</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Username</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Password</th>
+                                    <th></th>
+                                    <th></th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                                 <tr>
+                                    <td>Name and inc.</td>
+                                    <td>3</td>
+                                    <td>03423233</td>
+                                    <td>Jemmy</td>
+                                    <td>KIAD</td>
+                                    <td></td>
+                                    <td><input id="toggle-one12" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>                                    <td></td>
+                                    <td>$123</td>
+                                    <td></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td>Name and inc.</td>
+                                    <td>3</td>
+                                    <td>03423233</td>
+                                    <td>Jemmy</td>
+                                    <td>KIAD</td>
+                                    <td></td>
+                                    <td><input id="toggle-two21" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
+                                    <td></td>
+                                    <td>$123</td>
+                                    <td></td>
+                                    <td></td>
+                                 </tr>
+                              </tbody>
+                           </table>
+                           <div class="row" style="margin-left: 0px;">
+                              <div class="col-md-2">
+                              <button type="button" class="btn btn-info">Export CSV</button>
+
+                              </div>
+                              <div class="col-md-10">
+                                 <div class="row" style="margin-left: 0px;">
+                                    <div class="col-md-6">
+                                    </div>
+                                    <div class="col-md-2">
+                                       <select class="form-control">
+                                          <option>20 Records Per Page</option>
+                                          <option>50 Records Per Page</option>
+                                          <option>100 Records Per Page</option>
+                                       </select>
+                                    </div>
+                                    <div class="col-md-4">
+                                       <ul class="pagination" style="margin:0px">
+                                          <li><a href="javascript:;">«</a></li>
+                                          <li class="active"><a href="#">1</a></li>
+                                          <li><a href="javascript:;">2</a></li>
+                                          <li><a href="javascript:;">3</a></li>
+                                          <li><a href="javascript:;">4</a></li>
+                                          <li><a href="javascript:;">5</a></li>
+                                          <li><a href="javascript:;">»</a></li>
+                                       </ul>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="tab-pane" id="fuelVendors">
+                           <table class="table table-striped table-bordered">
+                              <thead>
+                                 <tr>
+                                    <th>Engine</th>
+                                    <th>Browser</th>
+                                    <th class="td-actions"></th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                              </tbody>
+                           </table>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <!-- /widget-content -->
+            </div>
+            <!-- /widget -->
+         </div>
+         <!-- /span8 -->
+      </div>
+      <!-- /row -->
+   </div>
+   <!-- /container -->
+</div>
+<!-- /main -->
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('ContactViewService', ['$q', '$http', 'BE', ContactViewService]);
+
+      function ContactViewService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,10 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('DispatchFuelController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
@@ -0,0 +1,57 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-5">
+      <div class="widget stacked">
+         <div class="widget-header">
+            <i class="icon-pencil"></i>
+            <span class="glyphicon glyphicon-search"></span>
+            <h3>Search & Dispatch Fuel</h3>
+         </div>
+         <!-- /widget-header -->
+         <div class="widget-content" style="padding-left: 0; padding-right: 0;">
+            <div class="col-xs-12">
+               <div class="col-md-2">Company</div>
+               <div class="col-md-10">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport">Airport</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+                  <span style="font-size: 9px;">Formats: IATA,ICAO,City or Airport Name</span>
+               </div>
+               <div class="col-md-2 Airport">Aircraft</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport">Requested<br>Volume</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+               <div class="col-md-6 Airport " style= "text-align: right;"><button type="button" class="btn btn-warning">Get Quote </button></div>
+            </div>
+         </div>
+      </div>
+      <!-- /widget-content -->
+   </div>
+   <!-- /widget -->  
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('DispatchFuelService', ['$q', '$http', 'BE', DispatchFuelService]);
+
+      function DispatchFuelService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,40 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('FuelVendorsController', ['$scope',function($scope) {
+
+      $scope.vendorList = [{
+			"companyName": "Name and inc",
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "Fleet": 3,
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "Base":"Kiad",
+		    "status":'Inactive',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		}]
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,222 @@
+<style>
+   .subnavbar .mainnav > li:nth-child(3) > a{
+   color: #ff9900;
+   }
+</style>
+<div class="main">
+   <div class="container">
+      <div class="row">
+         <div class="col-md-12">
+            <div class="widget stacked ">
+               <div class="widget-content">
+                  <div class="tabbable">
+                     <ul class="nav nav-tabs">
+                        <li>
+                           <a ui-sref="app.customers">Company View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li>
+                           <a ui-sref="app.ContactView">Contact View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li class="active">
+                           <a ui-sref="app.FuelVendors">Fuel Vendors 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li>
+                        <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
+                        <li style="float:right"><button type="submit" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>
+                     </ul>
+                     <br>  
+                     <div class="tab-content customer-table" style="margin:0px">
+                        <div class="tab-pane active" id="companyView">
+                           <table class="table table-striped">
+                              <thead>
+                                 <tr>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Source <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                    </th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                                 <tr ng-repeat="vendor in vendorList">
+                                    <td class="font-company">{{vendor.companyName}}</td>
+                                    <td class="font-company">{{vendor.phone}}</td>
+                                    <td class="font-company">{{vendor.contact}}</td>
+                                    <td class="font-company">
+                                       <button type="button" ng-if="vendor.status == 'Active'" class="btn btn-success btn-xs">{{vendor.status}}</button>
+                                       <button type="button" ng-if="vendor.status == 'Inactive'" class="btn btn-warning btn-xs">{{vendor.status}}</button>
+                                    </td>
+                                    <td class="font-company">{{vendor.source}}</td>
+                                    <td class="font-company">
+                                       <select class="form-control" style="height:31px;">
+                                          <option>Margin1</option>
+                                          <option>Margin2</option>
+                                       </select>
+                                    </td>
+                                    <td class="font-company">{{vendor.allIn}}</td>
+                                 </tr>
+                              </tbody>
+                           </table>
+                           <div class="row" style="margin-left: 0px;">
+                              <div class="col-md-2">
+                                 <button type="button" class="btn btn-warning">Export Customers</button>
+                              </div>
+                              <div class="col-md-10">
+                                 <div class="row" style="margin-left: 0px;">
+                                    <div class="col-md-6">
+                                    </div>
+                                    <div class="col-md-2">
+                                       <select class="form-control">
+                                          <option>20 Records Per Page</option>
+                                          <option>50 Records Per Page</option>
+                                          <option>100 Records Per Page</option>
+                                       </select>
+                                    </div>
+                                    <div class="col-md-4">
+                                       <ul class="pagination" style="margin:0px">
+                                          <li><a href="javascript:;">«</a></li>
+                                          <li class="active"><a href="#">1</a></li>
+                                          <li><a href="javascript:;">2</a></li>
+                                          <li><a href="javascript:;">3</a></li>
+                                          <li><a href="javascript:;">4</a></li>
+                                          <li><a href="javascript:;">5</a></li>
+                                          <li><a href="javascript:;">»</a></li>
+                                       </ul>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="tab-pane" id="contactView">
+                           <table class="table table-striped">
+                              <thead>
+                                 <tr>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name"> Last Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">First Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Company Name</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Work Phone</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Mobile Phone</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Title</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Pricing Email</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Username</th>
+                                    <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Password</th>
+                                    <th></th>
+                                    <th></th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                                 <tr>
+                                    <td>Name and inc.</td>
+                                    <td>3</td>
+                                    <td>03423233</td>
+                                    <td>Jemmy</td>
+                                    <td>KIAD</td>
+                                    <td></td>
+                                    <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                    <td></td>
+                                    <td>$123</td>
+                                    <td></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td>Name and inc.</td>
+                                    <td>3</td>
+                                    <td>03423233</td>
+                                    <td>Jemmy</td>
+                                    <td>KIAD</td>
+                                    <td></td>
+                                    <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                    <td></td>
+                                    <td>$123</td>
+                                    <td></td>
+                                    <td></td>
+                                 </tr>
+                              </tbody>
+                           </table>
+                           <div class="row" style="margin-left: 0px;">
+                              <div class="col-md-2">
+                                 <button type="button" class="btn btn-info">Export CSV</button>
+                              </div>
+                              <div class="col-md-10">
+                                 <div class="row" style="margin-left: 0px;">
+                                    <div class="col-md-6">
+                                    </div>
+                                    <div class="col-md-2">
+                                       <select class="form-control">
+                                          <option>20 Records Per Page</option>
+                                          <option>50 Records Per Page</option>
+                                          <option>100 Records Per Page</option>
+                                       </select>
+                                    </div>
+                                    <div class="col-md-4">
+                                       <ul class="pagination" style="margin:0px">
+                                          <li><a href="javascript:;">«</a></li>
+                                          <li class="active"><a href="#">1</a></li>
+                                          <li><a href="javascript:;">2</a></li>
+                                          <li><a href="javascript:;">3</a></li>
+                                          <li><a href="javascript:;">4</a></li>
+                                          <li><a href="javascript:;">5</a></li>
+                                          <li><a href="javascript:;">»</a></li>
+                                       </ul>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="tab-pane" id="fuelVendors">
+                           <table class="table table-striped table-bordered">
+                              <thead>
+                                 <tr>
+                                    <th>Engine</th>
+                                    <th>Browser</th>
+                                    <th class="td-actions"></th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                              </tbody>
+                           </table>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <!-- /widget-content -->
+            </div>
+            <!-- /widget -->
+         </div>
+         <!-- /span8 -->
+      </div>
+      <!-- /row -->
+   </div>
+   <!-- /container -->
+</div>
+<!-- /main -->
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('FuelVendorsService', ['$q', '$http', 'BE', FuelVendorsService]);
+
+      function FuelVendorsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,12 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('NewCompanyController', ['$scope','$uibModal', function($scope , $uibModal) {
+
+
+    $(function() {
+    $('#toggle-one2').bootstrapToggle();
+  })
+    }]);
 \ No newline at end of file
@@ -0,0 +1,121 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-7">
+      <div class="widget" style="margin-bottom: 0;">
+         <div class="widget-header">
+            <i class="icon-pencil"></i>
+            <i class="fa fa-tasks" aria-hidden="true"></i>
+            <h3>Add a New Company</h3>
+            <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
+               <div style="color: #ff9a01;">Activate &nbsp &nbsp
+                  <!-- <input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle"> -->
+                  <input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="Active" data-off="Dactive">
+               </div>
+            </div>
+            <div class="clearfix"></div>
+         </div>
+         <div class="widget-content" style="padding-left: 0; padding-right: 0;">
+            <div class="col-xs-12">
+               <div class="col-md-8">
+                  <div class="pull-left">
+                     <label class="new-input-label"><b>Company Name</b></label>&nbsp;&nbsp;
+                  </div>
+                  <div class="pull-left">
+                     <input type="Address" ng-model="data.company" class="form-control" id="Address" placeholder="">
+                  </div>
+                  <div class="clearfix"></div>
+               </div>
+               <div class="col-md-4">
+                  <div class="pull-left">
+                     <label class="new-input-label"><b>Base ICAO</b></label>
+                  </div>
+                  <div class="pull-right">
+                     <input type="Address" style="width: 100px;" class="form-control" id="Address" placeholder="">
+                  </div>
+                  <div class="clearfix"></div>
+               </div>
+            </div>
+            <div class="clearfix"></div><br>
+            <div class="col-xs-12">
+               <div class="col-md-2">
+                  <b>Relationship</b>
+               </div>
+               <div class="col-md-10"><input type="checkbox" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
+                  <input type="checkbox" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
+                  <input type="checkbox" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
+               </div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-3 Airport">
+                  <b>Master Margin</b>
+               </div>
+               <div class="col-md-3 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+               <div class="col-md-3 Airport">
+                  <b>Certificate Type</b>
+               </div>
+               <div class="col-md-3 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport"><b>Address</b></div>
+               <div class="col-md-10 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport"><b>Address2</b></div>
+               <div class="col-md-10 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport"><b>City</b></div>
+               <div class="col-md-3 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+               <div class="col-md-1 Airport"><b class="pull-right">State</b></div>
+               <div class="col-md-2 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+               <div class="col-md-2 Airport"><b class="pull-right">Zip Code</b></div>
+               <div class="col-md-2 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport"><b>Country</b></div>
+               <div class="col-md-3 Airport"><input type="Address" class="form-control" id="Address" placeholder=""></div>
+               <div class="col-md-3 Airport"><b>Internal Note</b></div>
+               <div class="col-md-4 Airport">
+                  <form action="/action_page.php">
+                     <textarea  name="message" rows="4" cols="20"></textarea>
+                  </form>
+               </div>
+            </div>
+            <div class="clearfix"></div>
+            <br/>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport"></div>
+               <div class="col-md-10 Airport">
+                  <div class="pull-right">
+                     <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
+                     <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="clearfix"></div>
+   </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('NewCompanyService', ['$q', '$http', 'BE', NewCompanyService]);
+
+      function NewCompanyService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,156 @@
+<style>
+   
+.button1 {
+  display: inline-block;
+  height: 35px;
+  line-height: 35px;
+  padding-right: 15px;
+  padding-left: 50px;
+  position: relative;
+  background-color:rgb(41,127,184);
+  color:rgb(255,255,255);
+  text-decoration: none;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  margin-bottom: 15px;
+  border: 0;
+  
+  
+     border-radius: 5px;
+     -moz-border-radius: 5px;
+     -webkit-border-radius: 5px;
+     text-shadow:0px 1px 0px rgba(0,0,0,0.5);
+   -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
+   filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
+
+     -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+     -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+     box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+     -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
+   filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
+}
+
+.button1 span {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 35px;
+  background-color:rgba(0,0,0,0.5);
+  
+  -webkit-border-top-left-radius: 5px;
+-webkit-border-bottom-left-radius: 5px;
+-moz-border-radius-topleft: 5px;
+-moz-border-radius-bottomleft: 5px;
+border-top-left-radius: 5px;
+border-bottom-left-radius: 5px;
+border-right: 1px solid  rgba(0,0,0,0.15);
+}
+
+.button1:hover span, .button1.active span {
+  background-color:rgb(0,102,26);
+  border-right: 1px solid  rgba(0,0,0,0.3);
+}
+
+.button1:active {
+  margin-top: 2px;
+  margin-bottom: 13px;
+
+  -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
+filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
+}
+
+.button1.turquoise {
+  background: #449d44;
+}
+
+</style>
+<div class="container">
+<div class="row">
+   <div class="col-md-7">
+      <div class="widget" style="margin-bottom: 0;">
+         <div class="widget-header">
+            <i class="icon-pencil"></i>
+            <i class="fa fa-tasks" aria-hidden="true"></i>
+            <h3>Add a New Company</h3>
+            <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
+               <div style="color: #ff9a01;">Activate &nbsp &nbsp
+                  <!-- <input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle"> -->
+                  <input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="Active" data-off="Dactive">
+               </div>
+            </div>
+            <div class="clearfix"></div>
+         </div>
+         <div class="widget-content" style="padding-left: 0; padding-right: 0;">
+            <div class="col-xs-12">
+               <div class="widget-header">
+                  <i class="fa fa-list"></i>
+                  <h3>Aircraft List</h3>
+               </div>
+               <div class="widget-content" style="padding:0px;border: 0px; ">
+                  <div class="table-responsive">
+                     <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
+                        <thead>
+                           <tr>
+                              <th>Tail</th>
+                              <th>Make</th>
+                              <th>Model</th>
+                              <th>Size</th>
+                              <th>Margin</th>
+                           </tr>
+                        </thead>
+                        <tbody id="assqwe">
+                           <tr>
+                              <td>
+                                 <input type="text" style="width:100px;" class="form-control">
+                              </td>
+                              <td>
+                                 <select class="form-control" style="height:31px;">
+                                    <option>Margin1</option>
+                                    <option>Margin2</option>
+                                 </select>
+                              </td>
+                              <td>
+                                 <select class="form-control" style="height:31px;">
+                                    <option>Margin1</option>
+                                    <option>Margin2</option>
+                                 </select>
+                              </td>
+                              <td>
+                                 <select class="form-control" style="height:31px;">
+                                    <option>Margin1</option>
+                                    <option>Margin2</option>
+                                 </select>
+                              </td>
+                              <td>
+                                 <select class="form-control" style="height:31px;">
+                                    <option>Margin1</option>
+                                    <option>Margin2</option>
+                                 </select>
+                              </td>
+                           </tr>
+                        </tbody>
+
+                     </table>
+                  </div>
+                  <div class="clearfix"></div>
+               </div>
+            </div>
+            <div class="clearfix"></div>
+            <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
+               <button ng-click="appendText()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
+            </div>
+            <div class="col-xs-12" style="margin-bottom: 20px;">
+               <div class="pull-right">
+                  <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
+                  <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
+                  <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="clearfix"></div>
+   </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('accountService', ['$q', '$http', 'BE', accountService]);
+
+      function accountService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('analyticsService', ['$q', '$http', 'BE', analyticsService]);
+
+      function analyticsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('chartsService', ['$q', '$http', 'BE', chartsService]);
+
+      function chartsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -2,9 +2,228 @@
  
  //Load controller
   angular.module('acufuel')
+	.controller('customersController', ['$scope', '$rootScope', '$uibModal', '$filter', 'CustomersService', customersController]);
  
-	.controller('customersController', ['$scope',function($scope) {
+ 	function customersController($scope, $rootScope, $uibModal, $filter, CustomersService) {
+		$(document).ready(function() {
+		    $('#example').DataTable();
+		});
+		$scope.data = {};
+		$scope.aircraft = {};
+		$scope.data.activate = true;
+		$scope.customerList = [{
+			"companyName": "Name and inc",
+		    "Fleet": 3,
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "Base":"Kiad",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "Fleet": 3,
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "Base":"Kiad",
+		    "status":'Inactive',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "Fleet": 3,
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "Base":"Kiad",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		},{
+			"companyName": "Name and inc",
+		    "Fleet": 3,
+		    "phone":"1010101010",
+		    "contact":"jimmy",
+		    "Base":"Kiad",
+		    "status":'Active',
+		    "source": "tenant",
+		    "allIn" : "$123"
+		}]
  
-      $scope.test = "Testing...";
+        $(function() {
+	     	$('#toggle-one2').bootstrapToggle();
+	     	$('#toggle-one2').change(function() {
+		      $('#console-event').html('Toggle: ' + $(this).prop('checked'));
+		      $scope.data.activate = $(this).prop('checked');
+		    })
+        })
  
-    }]);
 \ No newline at end of file
+        
+
+        getData();
+    	function getData(){
+			CustomersService.getAircraftMake().then(function(result) {
+				console.log("result", result)
+			  $scope.aircraftMakeList = result;
+			  $scope.aircraft.make = $scope.aircraftMakeList[0];
+			  CustomersService.getModal($scope.aircraft.make).then(function(result) {
+			    $scope.aircraftModalList = result;
+			    $scope.aircraft.model = $scope.aircraftModalList[0];
+			      CustomersService.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+			        $scope.aircraftSizeList = result;
+			        $scope.aircraft.size = $scope.aircraftSizeList[0];
+			      })
+			  })
+			    
+			})
+		}
+      
+
+      	$scope.getModal = function(){
+	        var makeId = $scope.aircraft.make;
+	        CustomersService.getModal(makeId).then(function(result) {
+	          $scope.aircraftModalList = result;
+	          $scope.aircraft.model = $scope.aircraftModalList[0];
+	            CustomersService.getAircraftSize(makeId, $scope.aircraft.model).then(function(result) {
+	              $scope.aircraftSizeList = result;
+	              $scope.aircraft.size = $scope.aircraftSizeList[0];
+	            })
+	        })
+	      }
+
+	      $scope.getSize = function(){
+	        CustomersService.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+	          $scope.aircraftSizeList = result;
+	          $scope.aircraft.size = $scope.aircraftSizeList[0];
+	        })
+	      }
+
+	    $scope.addFirstData = function(sel, step){
+	    	// console.log($scope.data)
+
+	    	// var companyData = "companyName=" + $scope.data.companyName + "&masterMargin=" + $scope.data.masterMargin 
+	    	// + "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state=" 
+	    	// + $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote=" 
+	    	// + $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant
+	    	// + "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor 
+	    	// + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao;
+
+	    	// CustomersService.addCompany(companyData).then(function(result) {
+      //       	console.log(result)
+      //       	$scope.accountId = result;
+      			//$scope.aircraft.accountId = $scope.accountId;
+      //     	})
+    	 	$(sel).trigger('next.m.' + step);
+    	 	getData();
+	    }
+
+	    $scope.users = [
+    {id: 1, name: 'awesome user1', status: 2, group: 4, groupName: 'admin'},
+    {id: 2, name: 'awesome user2', status: undefined, group: 3, groupName: 'vip'},
+    {id: 3, name: 'awesome user3', status: 2, group: null}
+  ]; 
+
+  $scope.statuses = [
+    {value: 1, text: 'status1'},
+    {value: 2, text: 'status2'},
+    {value: 3, text: 'status3'},
+    {value: 4, text: 'status4'}
+  ]; 
+
+  $scope.groups = [];
+  $scope.loadGroups = function() {
+    return $scope.groups.length ? null : $http.get('/groups').success(function(data) {
+      $scope.groups = data;
+    });
+  };
+
+  $scope.showGroup = function(user) {
+    if(user.group && $scope.groups.length) {
+      var selected = $filter('filter')($scope.groups, {id: user.group});
+      return selected.length ? selected[0].text : 'Not set';
+    } else {
+      return user.groupName || 'Not set';
+    }
+  };
+
+  $scope.showStatus = function(user) {
+    var selected = [];
+    if(user.status) {
+      selected = $filter('filter')($scope.statuses, {value: user.status});
+    }
+    return selected.length ? selected[0].text : 'Not set';
+  };
+
+  $scope.checkName = function(data, id) {
+    if (id === 2 && data !== 'awesome') {
+      return "Username 2 should be `awesome`";
+    }
+  };
+
+  // filter users to show
+  $scope.filterUser = function(user) {
+    return user.isDeleted !== true;
+  };
+
+  // mark user as deleted
+  $scope.deleteUser = function(id) {
+    var filtered = $filter('filter')($scope.users, {id: id});
+    if (filtered.length) {
+      filtered[0].isDeleted = true;
+    }
+  };
+
+  // add user
+  $scope.addUser = function() {
+    $scope.users.push({
+      id: $scope.users.length+1,
+      name: '',
+      status: null,
+      group: null,
+      isNew: true
+    });
+  };
+
+  // cancel all changes
+  $scope.cancel = function() {
+    for (var i = $scope.users.length; i--;) {
+      var user = $scope.users[i];    
+      // undelete
+      if (user.isDeleted) {
+        delete user.isDeleted;
+      }
+      // remove new 
+      if (user.isNew) {
+        $scope.users.splice(i, 1);
+      }      
+    };
+  };
+
+  // save edits
+  $scope.saveTable = function() {
+    var results = [];
+    for (var i = $scope.users.length; i--;) {
+      var user = $scope.users[i];
+      // actually delete user
+      if (user.isDeleted) {
+        $scope.users.splice(i, 1);
+      }
+      // mark as not new 
+      if (user.isNew) {
+        user.isNew = false;
+      }
+
+      // send on server
+      results.push($http.post('/saveUser', user));      
+    }
+
+    return $q.all(results);
+  };
+
+	    $scope.appendText = function() {
+          getData();
+	      var newRow =  $('<tr> <td> <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control"> </td> <td style="width: 25%;"> <select class="form-control" ng-model="aircraft.make" ng-change="getModal()"> <option ng-repeat="make in aircraftMakeList">{{make}}</option> </select> </td> <td style="width: 20%;"> <select class="form-control" ng-model="aircraft.model" ng-change="getSize()"> <option ng-repeat="model in aircraftModalList">{{model}}</option> </select> </td> <td style="width: 25%;"> <select class="form-control" ng-model="aircraft.size"> <option ng-repeat="size in aircraftSizeList">{{size}}</option> </select> </td> <td> <select class="form-control"> <option>Margin1</option> <option>Margin2</option> </select> </td> </tr>');  
+	      $('table.addRow').append(newRow);
+	    }
+
+
+    }
 \ No newline at end of file
@@ -2,6 +2,73 @@
    .subnavbar .mainnav > li:nth-child(3) > a{
    color: #ff9900;
    }
+   
+   .button1 {
+     display: inline-block;
+     height: 35px;
+     line-height: 35px;
+     padding-right: 15px;
+     padding-left: 50px;
+     position: relative;
+     background-color:rgb(41,127,184);
+     color:rgb(255,255,255);
+     text-decoration: none;
+     text-transform: uppercase;
+     letter-spacing: 1px;
+     margin-bottom: 15px;
+     border: 0;
+     
+     
+        border-radius: 5px;
+        -moz-border-radius: 5px;
+        -webkit-border-radius: 5px;
+        text-shadow:0px 1px 0px rgba(0,0,0,0.5);
+      -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
+      filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
+
+        -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
+      filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
+   }
+
+   .button1 span {
+     position: absolute;
+     left: 0;
+     top: 0;
+     width: 35px;
+     background-color:rgba(0,0,0,0.5);
+     
+     -webkit-border-top-left-radius: 5px;
+   -webkit-border-bottom-left-radius: 5px;
+   -moz-border-radius-topleft: 5px;
+   -moz-border-radius-bottomleft: 5px;
+   border-top-left-radius: 5px;
+   border-bottom-left-radius: 5px;
+   border-right: 1px solid  rgba(0,0,0,0.15);
+   }
+
+   .button1:hover span, .button1.active span {
+     background-color:rgb(0,102,26);
+     border-right: 1px solid  rgba(0,0,0,0.3);
+   }
+
+   .button1:active {
+     margin-top: 2px;
+     margin-bottom: 13px;
+
+     -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
+   filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
+   }
+
+   .button1.turquoise {
+     background: #449d44;
+   }
+
 </style>
 <div class="main">
    <div class="container">
@@ -12,96 +79,90 @@
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li class="active">
-                           <a href="#companyView" data-toggle="tab">Company View</a>
+                           <a ui-sref="app.customers">Company View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li>
+                           <a ui-sref="app.ContactView">Contact View 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
+                        </li>
+                        <li>
+                           <a ui-sref="app.FuelVendors">Fuel Vendors 
+                              <i class="fa fa-caret-down" aria-hidden="true"></i>
+                           </a>
                         </li>
-                        <li><a href="#contactView" data-toggle="tab">Contact View</a></li>
-                        <li><a href="#fuelVendors" data-toggle="tab">Fuel Vendors</a></li>
                         <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li>
-                        <li><button type="button" class="btn btn-info btn-sm">Clear Search And Filters</button></li>
-                        <li style="float:right"><button type="submit" class="btn btn-success btn-sm"><i class="icon-ok"></i> Add Company</button></li>
+                        <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
+                        <li style="float:right"><button type="submit"  data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>
                      </ul>
-                     <br>
-                     <div class="tab-content" style="margin:0px">
+                     <br>  
+                     <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
-                           <table class="table table-striped">
+                           <table id="example" class="table table-striped">
                               <thead>
                                  <tr>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Company Name</lable>
-                                    </th>
-                                    <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Fleet</lable>
+                                       <input type="text" class="form-control" name="name" id="name">
+                                       <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Main Phone</lable>
+                                       <input type="text" class="form-control" name="name" id="name">
+                                       <label class="font-company">Fleet <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Primary Contact</lable>
+                                       <input type="text" class="form-control" name="name" id="name">
+                                       <label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Base</lable>
+                                       <input type="text" class="form-control" name="name" id="name">
+                                       <label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Status</lable>
+                                       <input type="text" class="form-control" name="name" id="name">
+                                       <label class="font-company">Base <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Source</lable>
+                                       <select class="form-control">
+                                          <option value="showAll" selected>Show All</option>
+                                       </select>
+                                       <label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">Margin Setting</lable>
+                                       <select class="form-control">
+                                          <option value="showAll" selected>Show All</option>
+                                       </select>
+                                       <label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
-                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <lable class="font-company">All In</lable>
+                                       <input type="text" class="form-control"  name="name" id="name">
+                                       <label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
-                                    <th></th>
-                                    <th></th>
-                                 </tr>
+                                    <th> &nbsp; </th>
                               </thead>
                               <tbody>
-                                 <tr>
-                                    <td class="font-company">Name and inc.</td>
-                                    <td class="font-company">3</td>
-                                    <td class="font-company">03423233</td>
-                                    <td class="font-company">Jemmy</td>
-                                    <td class="font-company">KIAD</td>
-                                    <td class="font-company"><button type="button" class="btn btn-success btn-xs">Active</button></td>
-                                    <td class="font-company">Tenant</td>
+                                 <tr ng-repeat="customer in customerList">
+                                    <td class="font-company">{{customer.companyName}}</td>
+                                    <td class="font-company">{{customer.Fleet}}</td>
+                                    <td class="font-company">{{customer.phone}}</td>
+                                    <td class="font-company">{{customer.contact}}</td>
+                                    <td class="font-company">{{customer.Base}}</td>
                                     <td class="font-company">
-                                       <select class="form-control" style="height:31px;">
-                                          <option>Margin1</option>
-                                          <option>Margin2</option>
-                                       </select>
+                                       <button type="button" ng-if="customer.status == 'Active'" class="btn btn-success btn-xs">{{customer.status}}</button>
+                                       <button type="button" ng-if="customer.status == 'Inactive'" class="btn btn-warning btn-xs">{{customer.status}}</button>
+                                    </td>
                                     </td>
-                                    <td class="font-company">$123</td>
-                                    <td ></td>
-                                    <td></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="font-company">Name and inc.</td>
-                                    <td class="font-company">3</td>
-                                    <td class="font-company">03423233</td>
-                                    <td class="font-company">Jemmy</td>
-                                    <td class="font-company">KIAD</td>
-                                    <td class="font-company"><button type="button" class="btn btn-danger btn-xs">Inactive</button></td>
-                                    <td class="font-company">Tenant</td>
                                     <td class="font-company">
                                        <select class="form-control" style="height:31px;">
                                           <option>Margin1</option>
                                           <option>Margin2</option>
                                        </select>
                                     </td>
-                                    <td class="font-company">$123</td>
-                                    <td></td>
-                                    <td></td>
+                                    <td class="font-company">{{customer.allIn}}</td>
+                                    <td>
+                                       <button type="button" class="btn btn-info btn-xs">Setup Fuel</button>
+                                    </td>
                                  </tr>
                               </tbody>
                            </table>
@@ -237,4 +298,333 @@
    </div>
    <!-- /container -->
 </div>
-<!-- /main -->
 \ No newline at end of file
+<!-- /main -->
+
+<form class="modal multi-step" id="demo-modal-3" editable-form name="tableform" onaftersave="saveTable()" oncancel="cancel()">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body step-1" data-step="1" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <div>
+                        <div class="widget" style="margin-bottom: 0;">
+                           <div class="widget-header">
+                              <i class="icon-pencil"></i>
+                              <i class="fa fa-tasks" aria-hidden="true"></i>
+                              <h3>Add a New Company</h3>
+                              <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
+                                 <div style="color: #ff9a01;">Activate &nbsp &nbsp
+                                    <input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="On" data-off="Off">
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                           </div>
+                           <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
+                              <div class="col-xs-12">
+                                 <div class="col-md-8">
+                                    <div class="pull-left">
+                                       <label class="new-input-label"><b>Company Name</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="text" ng-model="data.companyName" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-4">
+                                    
+                                    <div class="pull-right">
+                                       <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="pull-right">
+                                       <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                              <div class="col-xs-12">
+                                 <div class="col-md-8">
+                                    <div class="pull-left">
+                                       <label class="new-input-label"><b>Relationship&nbsp;</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 32px;">
+                                       <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
+                                       <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
+                                       <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <b>Master Margin</b>
+                                    </div>
+                                    <div class="pull-left">
+                                       <select required class="form-control" style="max-width: 250px;" ng-model="data.masterMargin">
+                                          <option value="" disabled selected hidden>Select </option>
+                                          <option value="good">Open when powered (most valves do this)</option>
+                                          <option value="perfect">Closed when powered, auto-opens when power is cut</option>
+                                       </select>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 
+                                 <div class="col-md-3 Airport" style="text-align: right;">
+                                    <b>Certificate Type</b>
+                                 </div>
+                                 <div class="col-md-3 Airport">
+                                    <select required class="form-control" ng-model="data.certificateType">
+                                       <option value="" disabled selected hidden>Select </option>
+                                       <option value="good">Open when powered (most valves do this)</option>
+                                       <option value="perfect">Closed when powered, auto-opens when power is cut</option>
+                                    </select>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+                                  <div class="col-md-12">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Address</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <input type="text" class="form-control" ng-model="data.addressOne" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+                                  <div class="col-md-12">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Address2</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <input type="text" ng-model="data.addressTwo" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>City</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <input type="text" ng-model="data.city" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-3">
+                                    <div class="pull-left" style="width: 40px;">
+                                       <label class="new-input-label"><b>State</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <input type="text" ng-model="data.state" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-3">
+                                    <div class="pull-left">
+                                       <label class="new-input-label"><b>Zip Code</b></label>
+                                    </div>
+                                    <div class="pull-right" style="width: calc(100% - 60px);">
+                                       <input type="tel" ng-model="data.zipcode" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Country</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <input type="text" ng-model="data.country" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Internal Note</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <textarea  name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                             <!--  <br/>
+                              <div class="col-xs-12">
+                                 <div class="col-md-2 Airport"></div>
+                                 <div class="col-md-10 Airport">
+                                    <div class="pull-right">
+                                       <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
+                                       <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
+                                    </div>
+                                 </div>
+                              </div> -->
+                           </div>
+                        </div>
+                        <div class="clearfix"></div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div class="modal-body step-2" data-step="2" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <div>
+                        <div class="widget" style="margin-bottom: 0;">
+                           <div class="widget-header">
+                              <i class="icon-pencil"></i>
+                              <i class="fa fa-tasks" aria-hidden="true"></i>
+                              <h3>Add a New Company</h3>
+                              <div class="clearfix"></div>
+                           </div>
+                           <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
+                              <div class="col-xs-12">
+                                 <div class="widget-header">
+                                    <i class="fa fa-list"></i>
+                                    <h3>Aircraft List</h3>
+                                 </div>
+                                 <div class="widget-content" style="padding:0px;border: 0px; ">
+                                    <div class="table-responsive">
+                                       <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
+                                          <thead>
+                                             <tr>
+                                                <th>Tail</th>
+                                                <th>Make</th>
+                                                <th>Model</th>
+                                                <th>Size</th>
+                                                <th>Margin</th>
+                                             </tr>
+                                          </thead>
+                                          <tbody>
+                                             <tr>
+                                                <td>
+                                                   <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
+                                                </td>
+                                                <td style="width: 25%;">
+                                                   <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
+                                                      <option ng-repeat="make in aircraftMakeList">{{make}}</option>
+                                                   </select>
+                                                </td>
+                                                <td style="width: 20%;">
+                                                   <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
+                                                      <option ng-repeat="model in aircraftModalList">{{model}}</option>
+                                                   </select>
+                                                </td>
+                                                <td style="width: 25%;">
+                                                   <select class="form-control" ng-model="aircraft.size">
+                                                      <option ng-repeat="size in aircraftSizeList">{{size}}</option>
+                                                   </select>
+                                                </td>
+                                                <td>
+                                                   <select class="form-control">
+                                                      <option>Margin1</option>
+                                                      <option>Margin2</option>
+                                                   </select>
+                                                </td>
+                                             </tr>
+                                          </tbody>
+
+                                       </table> -->
+                                       <table class="table table-bordered table-hover table-condensed">
+                                  <tr style="font-weight: bold">
+                                    <td style="width:40%">Name</td>
+                                    <td style="width:30%">Status</td>
+                                    <td style="width:30%">Group</td>
+                                    <td style="width:30%"><span ng-show="tableform.$visible">Action</span></td>
+                                  </tr>
+                                  <tr ng-repeat="user in users | filter:filterUser">
+                                    <td>
+                                      <!-- editable username (text with validation) -->
+                                      <span editable-text="user.name" e-form="tableform" onbeforesave="checkName($data, user.id)">
+                                        {{ user.name || 'empty' }}
+                                      </span>
+                                    </td>
+                                    <td>
+                                      <!-- editable status (select-local) -->
+                                      <span editable-select="user.status" e-form="tableform" e-ng-options="s.value as s.text for s in statuses">
+                                        {{ showStatus(user) }}
+                                      </span>
+                                    </td>
+                                    <td>
+                                      <!-- editable group (select-remote) -->
+                                      <span editable-select="user.group" e-form="tableform" onshow="loadGroups()" e-ng-options="g.id as g.text for g in groups">
+                                        {{ showGroup(user) }}
+                                      </span>
+                                    </td>
+                                    <td><button type="button" ng-show="tableform.$visible" ng-click="deleteUser(user.id)" class="btn btn-danger pull-right">Del</button></td>
+                                  </tr>
+                                </table>
+
+                                <!-- buttons -->
+                                <div class="btn-edit">
+                                  <button type="button" class="btn btn-default" ng-show="!tableform.$visible" ng-click="tableform.$show()">
+                                    edit
+                                  </button>
+                                </div>
+                                <div class="btn-form" ng-show="tableform.$visible">
+                                  <button type="button" ng-disabled="tableform.$waiting" ng-click="addUser()" class="btn btn-default pull-right">add row</button>
+                                  <button type="submit" ng-disabled="tableform.$waiting" class="btn btn-primary">save</button>
+                                  <button type="button" ng-disabled="tableform.$waiting" ng-click="tableform.$cancel()" class="btn btn-default">cancel</button>
+                                </div> 
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
+                                 <button ng-click="appendText()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
+                              </div>
+                              <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
+                                 <div class="pull-right">
+                                    <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
+                                    <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
+                                    <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
+                                 </div>
+                              </div> -->
+                           </div>
+                        </div>
+                        <div class="clearfix"></div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <!-- <div class="modal-body step-3" data-step="3">
+                This is the final step.
+            </div> -->
+            <div class="modal-footer" style="border-top: 0;">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
+                <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
+                <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
+                <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
+            </div>
+        </div>
+    </div>
+</form>
+
+<script src="js/multi-step-modal.js"></script>
+<script>
+sendEvent = function(sel, step) {
+    $(sel).trigger('next.m.' + step);
+}
+</script>
+
+
+
+
@@ -0,0 +1,77 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('CustomersService', ['$q', '$http', 'BASE_URL', CustomersService]);
+
+      function CustomersService($q, $http, BASE_URL) {        
+    
+      	this.addCompany = function(data) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'POST',
+              url : BASE_URL.url +'/company',
+              headers : {'Content-Type': 'application/json'},
+              data: data
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getAircraftMake = function(){
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/fuelerlinx/acufuel/getAircraftMake',
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+            console.log(result)
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getAircraftSize = function(makeId, modelId){
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/fuelerlinx/acufuel/getAircraftSize/' +makeId + '/' +modelId,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+            console.log(result)
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getModal = function(id){
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/fuelerlinx/acufuel/getAircraftModel/' + id,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+            console.log(result)
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -42,7 +42,7 @@
                         <div>
                            <div class="col-xs-12">
                               <span class="pull-left">Pending</span>
-                              <button class="btn btn-success btn-xs pull-right">
+                              <button class="btn btn-success btn-xs pull-right pull-right-color ">
                               <span style="font-size:9px;">Monthly</span>
                               </button>
                               <div class="clearfix"></div>
@@ -90,8 +90,8 @@
                <div class="row">
                   <div class="col-md-12">
                      <div class="widget-header">
-                        <i class="fa fa-star"></i>
-                        <h3>Chart</h3>
+                        <i class="fa fa-signal" aria-hidden="true"></i>
+                      <h3>Chart</h3>
                      </div>
                      <!-- /widget-header -->
                      <div class="widget-content">
@@ -139,7 +139,7 @@
             <div class="widget stacked">
                <div class="widget-header">
                   <i class="fa fa-pencil"></i>
-                  <h3>Quick Shortcuts</h3>
+                  <h3>Price Manager</h3>
                </div>
                <!-- /widget-header -->
                <div class="widget-content" style="padding-top:10px;">
@@ -196,7 +196,7 @@
             <!-- /widget -->
             <div class="widget widget-nopad stacked">
                <div class="widget-header">
-                  <i class="fa fa-list-alt"></i>
+                  <i class="fa fa-comment" aria-hidden="true"></i>
                   <h3>Messages</h3>
                </div>
                <!-- /widget-header -->
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('dashboardService', ['$q', '$http', 'BE', dashboardService]);
+
+      function dashboardService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,11 @@
+
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('delselectedController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
@@ -0,0 +1,20 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-4">
+        <div class="widget">
+         <!-- <div class="widget-header"></div> -->
+         <div class="widget-content" style="padding-left: 0; padding-right: 0; padding-bottom: 0;">
+            <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
+            <div class="col-md-10">
+                <p> Aer you sure that you want to permanently delete the selected element</p>
+            </div>
+            <div class="col-xs-12" style="background-color: #eee; padding: 15px; text-align: right;">
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">yes</button>
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">No</button>
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">Cancel</button>
+            </div>
+        </div>
+        </div>
+	</div>
+</div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('delselectedService', ['$q', '$http', 'BE', delselectedService]);
+
+      function delselectedService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('elementsService', ['$q', '$http', 'BE', elementsService]);
+
+      function elementsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('errorService', ['$q', '$http', 'BE', errorService]);
+
+      function errorService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('faqService', ['$q', '$http', 'BE', faqService]);
+
+      function faqService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('formsService', ['$q', '$http', 'BE', formsService]);
+
+      function formsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -8,7 +8,7 @@
       <div class="col-md-10">
          <div class="widget stacked">
             <div class="widget-header">
-               <i class="icon-calendar"></i>
+               <i class="fa fa-pencil"></i>
                <h3>Ramp Fee Manager</h3>
                <select>
                   <option>Ramp Fee By Category</option>
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('fuelManagerService', ['$q', '$http', 'BE', fuelManagerService]);
+
+      function fuelManagerService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,11 @@
+
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('fuelOrdersController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,234 @@
+<style>
+   .subnavbar .mainnav > li:nth-child(3) > a{
+   color: #ff9900;
+   }
+</style>
+<div class="main">
+   <div class="container">
+      <div class="row">
+         <div class="col-md-12">
+            <div class="widget stacked ">
+               <div class="widget-content">
+                  <div class="tabbable">
+                     <ul class="nav nav-tabs Search-tabs">
+                        <h2> Corman Air Coeporation</h2>
+                        <li style="margin: 0px 10px 0px 0px;"><input type="text" style="height:31px;" class="form-control" name="name" id="name" placeholder="Search In Table"></li>
+                        <li><button type="button" class="btn btn-default">Clear Search & Filters</button></li>
+                        
+                        <!-- <li style="float:right"></li> -->
+                     </ul>
+                     <br>  
+                     <div class="tab-content" style="margin:0px">
+                        <div class="tab-pane active" id="companyView">
+                           <table class="table table-striped">
+                              <thead>
+                                 <tr>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Fueling date</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Tail #</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">FBO Name</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Volume</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Quoted</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Invoiced</lable>
+                                    </th>
+                                    <th>
+                                       <input type="text" class="form-control" style="height:31px;" name="name" id="name">
+                                       <lable class="font-company">Total</lable>
+                                    </th>
+                                    <th>
+                                       <select style="float: right;margin:7px;">
+                                          <option>Show all</option>
+                                          <option>paid</option>
+                                          <option>pending</option>
+                                          <option>cancelled</option>
+                                       </select>
+                                       <lable class="font-company">Status</lable>
+                                    </th>
+                                    <th>
+                                    <select style="float: right;margin:7px;">
+                                       <option>Show all</option>
+                                       <option>Attachmens</option>
+                                       <option>No Attachmens</option>
+                                    </select>
+                                       <lable class="font-company">Attachmens</lable>
+                                    </th>
+                                    <th></th>
+                                    <th></th>
+                                 </tr>
+                              </thead>
+                              <tbody>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N500HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">paid</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N968HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">pending</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N300HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">Cancelled</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td></td>
+                                    <td ></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N500HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">pending</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N600HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">paid</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N500HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">Cancelled</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N900HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">paid</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N500HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">pending</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="font-company">04/05/2017</td>
+                                    <td class="font-company">N580HG</td>
+                                    <td class="font-company">TBase FBO</td>
+                                    <td class="font-company">1000</td>
+                                    <td class="font-company">$4.4500</td>
+                                    <td class="font-company">$0.000</td>
+                                    <td class="font-company">$691.42</td>
+                                    <td class="font-company">Cancelled</td>
+                                    <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
+                                    <td ></td>
+                                    <td></td>
+                                 </tr>
+                              </tbody>
+                           </table>
+                           <div class="row" style="margin-left: 0px;">
+                              <div class="col-md-2">
+                                 <button type="button" class="btn btn-warning">Export Fuel Orders</button>
+                              </div>
+                              <div class="col-md-10">
+                                 <div class="row" style="margin-left: 0px;">
+                                    <div class="col-md-6">
+                                    </div>
+                                    <div class="col-md-2">
+                                       <select class="form-control">
+                                          <option>20 Records Per Page</option>
+                                          <option>50 Records Per Page</option>
+                                          <option>100 Records Per Page</option>
+                                       </select>
+                                    </div>
+                                    <div class="col-md-4">
+                                       <ul class="pagination" style="margin:0px">
+                                          <li><a href="javascript:;">«</a></li>
+                                          <li class="active"><a href="#">1</a></li>
+                                          <li><a href="javascript:;">2</a></li>
+                                          <li><a href="javascript:;">3</a></li>
+                                          <li><a href="javascript:;">4</a></li>
+                                          <li><a href="javascript:;">5</a></li>
+                                          <li><a href="javascript:;">»</a></li>
+                                       </ul>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        
+            </div>
+      
+         </div>
+         
+      </div>
+      
+   </div>
+   
+</div>
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('fuelOrdersService', ['$q', '$http', 'BE', fuelOrdersService]);
+
+      function fuelOrdersService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('galleryService', ['$q', '$http', 'BE', galleryService]);
+
+      function galleryService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('jqueryuiService', ['$q', '$http', 'BE', jqueryuiService]);
+
+      function jqueryuiService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -3,23 +3,19 @@
     'use strict'
  
     angular.module('acufuel')
-        .controller('LoginController', [ '$scope', '$filter', '$rootScope', '$state', LoginController]);
+        .controller('LoginController', [ '$scope', '$filter', '$rootScope', '$state', 'LoginService', LoginController]);
  
-    function LoginController($scope, $filter, $rootScope, $state) {
+    function LoginController($scope, $filter, $rootScope, $state, LoginService) {
     	$scope.data = {};
-        $scope.submitLogin = function() {
-
-        	$scope.data.username;
-        	$scope.data.password;
-            $state.go('app.dashboard');
-        	// if($scope.data.username == "acufuel" && $scope.data.password == "Acufuelelite123") {
-        	// 	localStorage.setItem('loginStatus', true);
-         //    	$state.go('#/main/dashboard');
-        	// } else {
-        	// 	alert('Invalid credentials');
-        	// }
-        	
-        }
+      $scope.submitLogin = function() {
+          var loginData = "username=" + $scope.data.username + "&password=" + $scope.data.password;
+          LoginService.loginUser(loginData).then(function(result) {
+                LoginService.authenticate();
+                //LoginService.setAuth(true);
+                
+          })
+          //$state.go('app.dashboard');
+      }
     }
 })();
  
@@ -0,0 +1,122 @@
+(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)
+        if (currentUserDetail) {
+            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)
+              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));
+            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;
+    }
+      
+})();
 \ No newline at end of file
@@ -65,10 +65,10 @@
                      <li class="dropdown-submenu">
                         <a tabindex="-1" href="#">Fuel Orders</a>
                         <ul class="dropdown-menu">
-                           <li><a tabindex="-1" href="#">Pending</a></li>
-                           <li><a href="#">Invoiced</a></li>
-                           <li><a href="#">Canceled</a></li>
-                           <li><a href="#">Archived</a></li>
+                           <li><a ui-sref="app.fuelOrders">Pending</a></li>
+                           <li><a ui-sref="app.fuelOrders">Invoiced</a></li>
+                           <li><a ui-sref="app.fuelOrders">Canceled</a></li>
+                           <li><a ui-sref="app.fuelOrders">Archived</a></li>
                         </ul>
                      </li>
                   </ul>
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('mainService', ['$q', '$http', 'BE', mainService]);
+
+      function mainService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('popupsService', ['$q', '$http', 'BE', popupsService]);
+
+      function popupsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('pricingService', ['$q', '$http', 'BE', pricingService]);
+
+      function pricingService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,11 @@
+
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('pricingcontactController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
@@ -0,0 +1,19 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-4">
+        <div class="widget">
+         <!-- <div class="widget-header"></div> -->
+         <div class="widget-content" style="padding-left: 0; padding-right: 0; padding-bottom: 0;">
+            <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
+            <div class="col-md-10">
+                <p> Aer you sure that you want to email pricing to everyone in your contact list</p>
+            </div>
+            <div class="col-xs-12" style="background-color: #eee; padding: 15px; text-align: right;">
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">yes</button>
+                  <button type="button" class="btn btn-default" style="padding: 3px 12px; border-radius: 0;">Cancel</button>
+            </div>
+        </div>
+        </div>
+	</div>
+</div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('pricingcontactService', ['$q', '$http', 'BE', pricingcontactService]);
+
+      function pricingcontactService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('reportsService', ['$q', '$http', 'BE', reportsService]);
+
+      function reportsService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -41,12 +41,14 @@
                         </li>
                      </ul>
                   </div>
+                  <button type="reset" style="margin-left: 145px;" class="btn btn-default btn-default-bottom"> Add Event</button>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->  
          </div>
          <!-- /span6 -->
+
          <div class="col-md-9">
             <div class="widget stacked">
                <div class="widget-header">
@@ -63,6 +65,7 @@
             <!-- /widget -->
          </div>
          <!-- /span6 -->
+
       </div>
       <!-- /row -->
    </div>
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('schedulerService', ['$q', '$http', 'BE', schedulerService]);
+
+      function schedulerService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,10 @@
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('searchDispatchFuelController', ['$scope',function($scope) {
+
+      $scope.test = "Testing...";
+
+    }]);
 \ No newline at end of file
@@ -0,0 +1,101 @@
+<div class="container">
+<div class="row">
+   <div class="col-md-5">
+      <div class="widget stacked">
+         <div class="widget-header">
+            <i class="icon-pencil"></i>
+            <span class="glyphicon glyphicon-search"></span>
+            <h3>Search & Dispatch Fuel</h3>
+         </div>
+         <!-- /widget-header -->
+         <div class="widget-content" style="padding-left: 0; padding-right: 0;">
+            <div class="col-xs-12">
+               <div class="col-md-2">Company</div>
+               <div class="col-md-10">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport">Airport</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+                  <span style="font-size: 9px;">Formats: IATA,ICAO,City or Airport Name</span>
+               </div>
+               <div class="col-md-2 Airport">Aircraft</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport">Requested<br>Volume</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2">FBO Name</div>
+               <div class="col-md-10">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2">Tier Break</div>
+               <div class="col-md-10">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>Select </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-md-2 Airport">Uplift Date</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>03/20/2017 </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+               <div class="col-md-2 Airport">Departing FBO</div>
+               <div class="col-md-4 Airport">
+                  <select required class="form-control">
+                     <option value="" disabled selected hidden>03/23/2017 </option>
+                     <option value="0">Open when powered (most valves do this)</option>
+                     <option value="1">Closed when powered, auto-opens when power is cut</option>
+                  </select>
+               </div>
+            </div>
+            <div class="col-xs-12">
+               <div class="col-xs-2 Airport"></div>
+               <div class="col-md-10" style= "text-align: right;">
+                  <button type="button" class="btn btn-default">Cancel</button>
+                  <button type="button" class="btn btn-warning">Dispatch</button>
+               </div>
+            </div>
+         </div>
+      </div>
+      <!-- /widget-content -->
+   </div>
+   <!-- /widget -->  
+</div>
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('searchDispatchFuelService', ['$q', '$http', 'BE', searchDispatchFuelService]);
+
+      function searchDispatchFuelService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('signupService', ['$q', '$http', 'BE', signupService]);
+
+      function signupService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -4,9 +4,19 @@
  //Load controller
   angular.module('acufuel')
  
-	.controller('updateFuelManagerController', ['$scope',function($scope) {
  
-      $scope.test = "Testing...";
+      .controller('updateFuelManagerController', ['$scope','$uibModal', function($scope , $uibModal) {
+		console.log("$uibModal",$uibModal);
+        $scope.yes = function(data){
+            console.log('========');
+            console.log('value', data);
+            $uibModal.yes({
+                templateUrl: 'partials/pricingcontact/pricingcontact.html',
+                backdrop: true,
+                scope: $scope,
+            })
+        }
+
  
     }]);
  
@@ -8,13 +8,13 @@
       <div class="col-md-5">
          <div class="widget stacked">
             <div class="widget-header">
-               <i class="icon-pencil"></i>
+               <i class="fa fa-pencil"></i>
                <h3>Price Manager</h3>
-               <select style="float: right;margin:10px">
-                  <option>Ramp Fee By Category</option>
-                  <option>Make And Model</option>
-                  <option>Weight</option>
-                  <option>Wingspan</option>
+               <select style="float: right;margin:10px;" ng-model="priceManager" ng-change="yes(priceManager)">
+                  <option value="1">Send Pricing Email</option>
+                  <option value="2">Margin 1</option>
+                  <option value="3">Margin 2</option>
+                  <option value="4">Margin Tenants</option>
                </select>
             </div>
             <!-- /widget-header -->
@@ -57,11 +57,15 @@
          </div>
          <!-- /widget -->  
       </div>
+
       <div class="col-md-7">
          <div class="widget stacked">
             <div class="widget-header">
-               <i class="icon-pencil"></i>
+               <i class="fa fa-pencil"></i>
                <h3><b>JET-A</b> Customer Margin Template</h3>
+               <div class="pull-right">
+                  <button type="submit" class="btn btn-success btn-sm"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>
+               </div>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
@@ -234,13 +238,246 @@
    <!-- /span12 -->
 </div>
 <!-- /row -->
+<div class="container">
+<div class="row">
+   <div class="col-md-5">
+         <div class="widget stacked">
+            <div class="widget-header">
+               <i class="fa fa-pencil"></i>
+               <h3>Queue Future Pricing </h3>
+               <!-- <select style="float: right;margin:10px;background-color:#cd7b00;">
+                  <option>Send Pricing Email</option>
+                  <option>Margin 1</option>
+                  <option>Margin 2</option>
+                  <option>Margin Tenants</option>
+               </select> -->
+            </div>
+            <!-- /widget-header -->
+            <div class="widget-content">
+               <h6>Queue Future Fuel Pricing Here</h6>
+               <table class="table table-striped">
+                  <thead>
+                     <tr>
+                        <th> Product</th>
+                        <th> Cost</th>
+                        <th>PAP(Total)</th>
+                        <th>Deploy</th>
+                        <th>Next Expiration</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>Name and inc.</td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                        <td>Jemmy</td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                     </tr>
+                     <tr>
+                        <td>Name and inc.</td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                        <td>Jemmy</td>
+                        <td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
+                     </tr>
+                  </tbody>
+               </table>
+               <div class="row" style="margin-left: 0px;">
+                  <div class="col-md-12" style= "text-align: right;">
+                     <button type="button" class="btn btn-success btn-xs">Save</button>
+                  </div>
+               </div>
+            </div>
+            <!-- /widget-content -->
+         </div>
+         <!-- /widget -->  
+   </div>
+   <div class="col-md-7">
+         <div class="widget stacked">
+            <div class="widget-header">
+               <i class="fa fa-pencil"></i>
+               <h3><b>JET-A</b> Customer Margin Template</h3>
+               <div class="pull-right">
+                  <button type="submit" class="btn btn-success btn-sm"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>
+               </div>
+            </div>
+            <!-- /widget-header -->
+            <div class="widget-content">
+               <!-- <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" style="float:left;" data-toggle="collapse" data-parent=".accordion" href="#collapseOne">
+                              Margin 1  
+                              </a>
+                              <span style="color:#ff9900;font-size:12px;margin-left:50px">Retail- (minus) </span><span style="font-size:12px">$1.1500</span>
+                           </h4>
+                        </div>
+                        <div id="collapseOne" class="panel-collapse collapse in">
+                           <div class="panel-body">
+                              <div id="editor2" style="visibility: hidden;">
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="panel panel-default">
+                        <div class="panel-heading">
+                           <h4 class="panel-title">
+                              <a class="accordion-toggle" data-toggle="collapse" data-parent=".accordion" href="#collapseTwo">
+                              TurboPop AirCraft
+                              </a>
+                           </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" data-toggle="collapse" data-parent=".accordion" href="#collapseThree">
+                              Collapsible Group Item #3
+                              </a>
+                           </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>
+                  </section> -->
+               <uib-accordion close-others="oneAtATime">
+                  <div uib-accordion-group class="panel-default" heading="Margin 1 Retail- (minus) $1.1500">
+                     <div id="editor2" style="visibility: hidden;"></div>
+                  </div>
+                  <div uib-accordion-group class="panel-default" heading="TurboPop AirCraft">
+                     <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 uib-accordion-group class="panel-default" heading="Collapsible Group Item #3">
+                     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>
+               </uib-accordion>
+            </div>
+            <!-- /widget-content -->
+         </div>
+         <!-- /widget -->
+   </div>
+      <!-- /span6 -->
+</div>
+</div>
+</div>
 </div> <!-- /container -->
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script>
+<!-- <script>
    CKEDITOR.replace( 'editor2', {
       height: 250,
       extraPlugins: 'divarea'
    } );
-</script>
 \ No newline at end of file
+</script> -->
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('updateFuelManagerService', ['$q', '$http', 'BE', updateFuelManagerService]);
+
+      function updateFuelManagerService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -4,10 +4,33 @@
  //Load controller
   angular.module('acufuel')
  
-	.controller('viewCompanyController', ['$scope',function($scope) {
+	.controller('viewCompanyController', ['$scope','$uibModal', function($scope , $uibModal) {
+		console.log("$uibModal",$uibModal);
+        $scope.open = function(){
+            console.log("asndfsahdasd");
+            $scope.editSmsModal = $uibModal.open({
+                templateUrl: 'partials/NewCompany/NewCompany.html',
+                backdrop: true,
+                scope: $scope,
+            })
+        }
+        $(function() {
+         $('#toggle-one2').bootstrapToggle();
+        })
  
-      $scope.test = "Testing...";
+        $(function() {
+         $('#toggle-one1').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-two').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-three').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-four').bootstrapToggle();
+        })   
+            
  
     }]);
  
-
@@ -2,47 +2,104 @@
    .subnavbar .mainnav > li:nth-child(3) > a{
    color: #ff9900;
    }
+   .widget-content{
+      padding: 10px !important;
+   }
+   .widget-content input[type="text"], .widget-content select{
+      height: 31px;
+      padding: 0;
+   }
+   .new-label span{
+      float: left;
+      line-height: 31px;
+   }
+   .new-label span:first-child{
+      margin-right: 5px;
+      font-weight: bold;
+   }
+   .new-label span:last-child{
+      margin-left: 5px;
+   }
+   .new-label select{
+      display: -webkit-inline-box;
+      display: inline-box;
+      float: left;
+   }
+   .new-address p{
+      margin-bottom: 0;
+   }
+   .new-add-select{
+      padding-left: 15px;
+      margin: 10px 0;
+   }
+   .new-add-select select{
+      width: 100px;
+   }
+   .widget{
+      -moz-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+      -webkit-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+      box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+   }
+   .optionclass {
+      background: #fff;
+   }
+   .timess {
+      float: right !important;
+      margin-top: 10px !important;
+      margin-right: 10px !important;
+      color: #999 !important;
+      cursor: pointer !important;
+   }
 </style>
-<div class="container">
+<div class="col-xs-12 col-md-11">
    <div class="row" style="margin-left:0px">
       <div class="col-md-12">
-         <div class="widget stacked">
+         <div class="widget">
             <div class="widget-header">
-               <i class="fa fa-building"></i>
-               <h3>Schedule</h3>
+               <i class="fa fa-building-o" aria-hidden="true"></i>
+               <h3>Antioch Flight Department</h3>
+               <i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
                <div class="row" style="margin-left:0px">
                   <div class="col-md-6">
-                     <div class="widget stacked">
+                     <div class="widget">
                         <div class="widget-header">
-                           <i class="fa fa-building"></i>
+                           <i class="fa fa-building-o" aria-hidden="true"></i>
                            <h3>Company Details</h3>
-                           <div style="float:right;margin-right:15px;"><input type="checkbox" style="margin-top: 13px;" data-toggle="toggle" data-size="mini"></div>
+                           <div class="pull-right my-toggle-switch" style="margin-top: 10px; margin-right: 10px;">
+                              <div><input id="toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="Active" data-off="Dactive">
+                              </div>
+                           </div>
                         </div>
                         <div class="widget-content">
                            <div class="row" style="margin-left:0px">
-                              <div class="col-md-9">
+                              <div class="col-md-8" style="padding-left: 0;">
                                  <h3 style="color:#F90;">
                                     <b>Antioch Flight Department</b>
                                  </h3>
                               </div>
-                              <div class="col-md-3">
-                                 <select class="form-control" style="height:31px;">
-                                    <option>Margin1</option>
-                                    <option>Margin2</option>
+                              <div class="col-md-4">
+                                 <select class="form-control" style="height:31px;background: #ebebeb;">
+                                    <option class="optionclass" disabled selected>Certificate Type</option>
+                                    <option class="optionclass">Part 91 (Corporate)</option>
+                                    <option class="optionclass">Part 135 (Charter)</option>
+                                    <option class="optionclass">Part 121 (Scheduled)</option>
+                                    <option class="optionclass">Military</option>
+                                    <option class="optionclass">Government</option>
                                  </select>
                               </div>
                            </div>
                            <div>
-                              <p>
-                                 <b>Master Margin Setting </b> 
-                                 <select>
+                              <p class="new-label">
+                                 <span>Master Margin Setting </span> 
+                                 <select class="form-control" style="width: 100px;">
                                     <option>Margin1</option>
                                     <option>Margin2</option>
                                  </select>
-                                 See Aircrart List
+                                 <span>See Aircrart List</span>
+                                 <div class="clearfix"></div>
                               </p>
                            </div>
                            <div>
@@ -52,27 +109,37 @@
                               <input type="checkbox" name=""> CAA Member
                            </div>
                            </br>
-                           <div>
-                              <p><i class="fa fa-map-marker"></i> Reviera State Rd32 </p>
-                              <p><i class="fa fa-phone"></i> (310) 2342-3433 </p>
-                              <p><i class="fa fa-envelope"></i> freed@gmail.com</p>
+                           <div class="new-address">
+                              <p><i class="fa fa-map-marker"></i> Reviera State Rd32 <input type="checkbox"> </p>
+                              <p><i class="fa fa-phone"></i> (310) 2342-3433 <input type="checkbox"></p>
+                              <p><i class="fa fa-envelope"></i> freed@gmail.com <input type="checkbox"></p>
+                           </div>
+                           <div class="new-add-select">
+                              <select class="form-control" style="background: #ebebeb;">
+                                 <option disabled selected>Add Field</option>
+                                 <option class="optionclass">Add Phone</option>
+                                 <option class="optionclass">Add Email</option>
+                              </select>
                            </div>
-                           </br>
                            <div>
-                              <p><b>Company Notes</b></p>
+                              <p style="margin-bottom: 0;"><b>Company Notes</b> <input type="checkbox"></p>
                               <p>This is the test data. note will be written in this</p>
                            </div>
-                           <div>
+                           <div class="dis">
                               <button type="button" class="btn btn-primary">Distribute Price to Company Contacts</button>
                            </div>
+                           <div><button type="button" class="btn btn-info">Setup Fuel</button></div>
                         </div>
                      </div>
                   </div>
                   <div class="col-md-6">
-                     <div class="widget stacked">
+                     <div class="widget">
                         <div class="widget-header">
                            <i class="fa fa-plane"></i>
                            <h3>Aircraft List</h3>
+                           <div class="pull-right">
+                              <button type="submit" class="btn btn-success btn-sm" ng-click="open()" style="margin-top: 4px; margin-right: 9px;"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>
+                           </div>
                         </div>
                         <div class="widget-content" style="padding:0px">
                            <div class="table-responsive">
@@ -83,8 +150,10 @@
                                        <th>Make</th>
                                        <th>Model</th>
                                        <th>JET-A</th>
-                                       <th>JET-A(All in)</th>
+                                       <th>All in</th>
                                        <th>AVGAS</th>
+                                       <th>All in</th>
+                                       <th></th>
                                     </tr>
                                  </thead>
                                  <tbody>
@@ -105,6 +174,8 @@
                                              <option>Margin2</option>
                                           </select>
                                        </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td></td>
                                     </tr>
                                     <tr>
                                        <td>N817C6</td>
@@ -123,6 +194,8 @@
                                              <option>Margin2</option>
                                           </select>
                                        </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td></td>
                                     </tr>
                                     <tr>
                                        <td>N817C6</td>
@@ -141,6 +214,8 @@
                                              <option>Margin2</option>
                                           </select>
                                        </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td></td>
                                     </tr>
                                     <tr>
                                        <td>N817C6</td>
@@ -159,6 +234,8 @@
                                              <option>Margin2</option>
                                           </select>
                                        </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td></td>
                                     </tr>
                                  </tbody>
                               </table>
@@ -169,10 +246,13 @@
                </div>
                <div class="row" style="margin-left:0px">
                   <div class="col-md-6">
-                     <div class="widget stacked">
+                     <div class="widget">
                         <div class="widget-header">
                            <i class="fa fa-user"></i>
                            <h3>Contact List</h3>
+                           <div class="pull-right">
+                              <button type="submit" class="btn btn-success btn-sm" style="margin-top: 4px; margin-right: 9px;"><i class="icon-ok"></i>+ &nbsp Add Contact</button>
+                           </div>
                         </div>
                         <div class="widget-content" style="padding:0px">
                            <div class="table-responsive">
@@ -187,25 +267,25 @@
                                  </thead>
                                  <tbody>
                                     <tr>
-                                       <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                       <td><input id="toggle-one1" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
                                        <td>Mark</td>
                                        <td>Otto</td>
                                        <td>Dispatcher</td>
                                     </tr>
                                     <tr>
-                                       <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                       <td><input id="toggle-two" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
                                        <td>Mark</td>
                                        <td>Otto</td>
                                        <td>Dispatcher</td>
                                     </tr>
                                     <tr>
-                                       <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                       <td><input id="toggle-three" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
                                        <td>Mark</td>
                                        <td>Otto</td>
                                        <td>Dispatcher</td>
                                     </tr>
                                     <tr>
-                                       <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
+                                       <td><input id="toggle-four" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
                                        <td>Mark</td>
                                        <td>Otto</td>
                                        <td>Dispatcher</td>
@@ -217,7 +297,7 @@
                      </div>
                   </div>
                   <div class="col-md-6">
-                     <div class="widget stacked">
+                     <div class="widget">
                         <div class="widget-header">
                            <i class="fa fa-pencil"></i>
                            <h3>Price Manager Reference</h3>
@@ -286,12 +366,13 @@
    <!-- /widget -->
 </div>
 <!-- /container -->
+<div class="clearfix"></div>
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script>
+<!-- <script
    CKEDITOR.replace( 'editor2', {
       height: 250,
       extraPlugins: 'divarea'
    } );
-</script>
 \ No newline at end of file
+   </script> -->
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('viewCompanyService', ['$q', '$http', 'BE', viewCompanyService]);
+
+      function viewCompanyService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -0,0 +1,13 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('widgetTemplateService', ['$q', '$http', 'BE', widgetTemplateService]);
+
+      function widgetTemplateService($q, $http, BE) {        
+        var temp = {};
+
+        
+        
+      }
+      
+})();
 \ No newline at end of file
@@ -25,6 +25,13 @@
     "angular-ui-router": "^0.4.2",
     "bootstrap-toggle": "^2.2.2",
     "fullcalendar": "^3.2.0",
-    "toastr": "^2.1.3"
+    "toastr": "^2.1.3",
+    "angular-bootstrap": "^2.5.0",
+    "jqGrid": "^5.2.0",
+    "Autocomplete": "autocomplete#^2.0.5",
+    "DataTables": "~1.10.15",
+    "angular-cookies": "~1.6.4",
+    "angular-resource": "~1.6.4",
+    "angular-xeditable": "~0.7.1"
   }
 }
...	...	@@ -69,4 +69,90 @@ table th, td{
69	69	background-color: #ff9900 !important;
70	70	color: #fff !important;
71	71	border: 1px solid #ff9900 !important;
72		-}
73	72	\ No newline at end of file
	73	+}
	74	+.pull-right-color{
	75	+ background-image: linear-gradient(to bottom, #1c84c6 0%, #1c84c6 100%);
	76	+}
	77	+.pull-right-setup{
	78	+ margin-bottom: 10px;
	79	+ background-image: linear-gradient(to bottom, #1c84c6 0%, #1c84c6 100%);
	80	+}
	81	+.Airport{
	82	+ padding-top: 5px;
	83	+}
	84	+.src-image{
	85	+ width: 50px;
	86	+ height: 50px;
	87	+}
	88	+.Accept{
	89	+ padding-top: 25px;
	90	+}
	91	+.dis{
	92	+ float: left;
	93	+ margin-right:100px;
	94	+}
	95	+/*.email-password{
	96	+ width: 40px;
	97	+ height: 24px;
	98	+}*/
	99	+.email-password-icon{
	100	+ width: 10px;
	101	+ height: 10px;
	102	+}
	103	+@media( max-width: 768px;){
	104	+.btn{
	105	+font-size: 10px !important;
	106	+}
	107	+.dis{
	108	+ float: none;
	109	+ margin-right: 0px;
	110	+}
	111	+}
	112	+.Search-tabs{
	113	+ border-bottom: 0px solid #ddd; */
	114	+}
	115	+
	116	+.customer-table table{
	117	+ width: 100%;
	118	+}
	119	+.customer-table input{
	120	+ border-radius: 0;
	121	+ box-shadow: none;
	122	+ border: 1px solid #e4e3e3;
	123	+ padding: 0px;
	124	+ font-size: 10px;
	125	+ display: -webkit-inline-box;
	126	+ display: inline-box;
	127	+ height: 31px;
	128	+}
	129	+.customer-table select{
	130	+ border-radius: 0;
	131	+ box-shadow: none;
	132	+ border: 1px solid #e4e3e3;
	133	+ padding: 0px;
	134	+ font-size: 10px;
	135	+ height: 31px;
	136	+ display: -webkit-inline-box;
	137	+ display: inline-box;
	138	+}
	139	+.customer-table th > label{
	140	+ font-weight: bold;
	141	+ padding: 10px 5px 2px 5px;
	142	+ margin-bottom: 0;
	143	+}
	144	+.customer-table td{
	145	+ padding: 5px !important;
	146	+ height: auto !important;
	147	+ vertical-align: middle !important;
	148	+}
	149	+.customer-table td > select{
	150	+ height: 22px !important;
	151	+}
	152	+.customer-table td > button{
	153	+ font-size: 10px;
	154	+}
	155	+
	156	+/*.new-input-label{
	157	+ margin-bottom: 0;
	158	+ line-height: 34px;
	159	+}*/
74	160	\ No newline at end of file
...	...
...	...	@@ -24,9 +24,6 @@ background: #f3f3f3;
24	24
25	25	}
26	26
27		-
28		-
29		-
30	27	.account-container {
31	28	width: 390px;
32	29	display: block;
...	...
...	...	@@ -14,6 +14,9 @@
14	14	<link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/>
15	15	<link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>
16	16	<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>
	17	+ <link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">
	18	+ <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
	19	+
17	20
18	21	<link rel="stylesheet" href="css/main.css"/>
19	22	<link rel="stylesheet" href="css/base-admin-3.css"/>
...	...	@@ -33,7 +36,7 @@
33	36	<link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
34	37	<link href="css/pages/pricing.css" rel="stylesheet">
35	38	<link href="css/pages/reports.css" rel="stylesheet">
36		-
	39	+
37	40
38	41
39	42	</head>
...	...	@@ -54,18 +57,27 @@
54	57
55	58	<script src="bower_components/angular/angular.min.js"></script>
56	59	<script src="bower_components/angular-route/angular-route.js"></script>
	60	+ <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
	61	+ <script src="bower_components/angular-resource/angular-resource.min.js"></script>
57	62	<script src="bower_components/angular-animate/angular-animate.js"></script>
58	63	<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
59	64	<script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
60	65	<script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
61	66	<script src='bower_components/moment/min/moment.min.js'></script>
62	67	<script src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
63		-
64	68	<script src='bower_components/toastr/toastr.min.js'></script>
65	69	<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
66	70	<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
	71	+ <script src="bower_components/jqGrid/js/i18n/grid.locale-en.js"></script>
	72	+ <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script>
	73	+ <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
67	74
68	75
	76	+ <!--
	77	+ <script src="scripts/inspinia.js"></script>
	78	+ <script src="plugins/iCheck/icheck.min.js"></script>
	79	+ -->
	80	+
69	81	<!-- <script src="./js/Application.js"></script>
70	82	<script src="js/charts/area.js"></script>
71	83	<script src="js/charts/donut.js"></script>
...	...	@@ -75,23 +87,17 @@
75	87	<script src="js/charts/line.js"></script> -->
76	88	<script src="js/demo/faq.js"></script>
77	89	<script src="js/plugins/faq/faq.js"></script>
78		-
79	90	<script src="js/demo/gallery.js"></script>
80	91	<script src="js/demo/sliders.js"></script>
81	92	<script src="js/plugins/msgGrowl/js/msgGrowl.js"></script>
82		-
83	93	<script src="js/demo/notifications.js"></script>
84		-
85		-
86		-
87	94	<script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
88	95	<script src="https://code.highcharts.com/maps/highmaps.js"></script>
89	96	<script src="https://code.highcharts.com/maps/modules/data.js"></script>
90	97	<script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script>
91		-
92		-
93		-
	98	+ <!-- Controllers -->
94	99	<script src="js/app.js"></script>
	100	+ <script src="js/app.constant.js"></script>
95	101	<script src="partials/login/login.controller.js"></script>
96	102	<script src="partials/customers/customers.controller.js"></script>
97	103	<script src="partials/analytics/analytics.controller.js"></script>
...	...	@@ -112,7 +118,58 @@
112	118	<script src="partials/viewCompany/viewCompany.controller.js"></script>
113	119	<script src="partials/widgetTemplate/widgetTemplate.controller.js"></script>
114	120	<script src="partials/dashboard/dashboard.controller.js"></script>
	121	+ <script src="partials/AirList/AirList.controller.js"></script>
	122	+ <script src="partials/fuelOrders/fuelOrders.controller.js"></script>
	123	+ <script src="partials/DispatchFuel/DispatchFuel.controller.js"></script>
	124	+ <script src="partials/searchDispatchFuel/searchDispatchFuel.controller.js"></script>
	125	+ <script src="partials/NewCompany/NewCompany.controller.js"></script>
	126	+ <script src="partials/Accept/Accept.controller.js"></script>
	127	+ <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
	128	+ <script src="partials/ContactView/ContactView.controller.js"></script>
	129	+ <script src="partials/FuelVendors/FuelVendors.controller.js"></script>
	130	+ <script src="partials/delselected/delselected.controller.js"></script>
	131	+ <script src="partials/pricingcontact/pricingcontact.controller.js"></script>
	132	+ <script src="partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js"></script>
	133	+
115	134	<script src="partials/main/main.controller.js"></script>
116	135	<div ui-view></div>
	136	+ <!-- End controllers -->
	137	+
	138	+
	139	+ <!-- services -->
	140	+ <script src="partials/login/login.service.js"></script>
	141	+ <script src="partials/customers/customers.service.js"></script>
	142	+ <script src="partials/analytics/analytics.service.js"></script>
	143	+ <script src="partials/account/account.service.js"></script>
	144	+ <script src="partials/elements/elements.service.js"></script>
	145	+ <script src="partials/error/error.service.js"></script>
	146	+ <script src="partials/faq/faq.service.js"></script>
	147	+ <script src="partials/forms/forms.service.js"></script>
	148	+ <script src="partials/fuelManager/fuelManager.service.js"></script>
	149	+ <script src="partials/gallery/gallery.service.js"></script>
	150	+ <script src="partials/jqueryui/jqueryui.service.js"></script>
	151	+ <script src="partials/popups/popups.service.js"></script>
	152	+ <script src="partials/pricing/pricing.service.js"></script>
	153	+ <script src="partials/reports/reports.service.js"></script>
	154	+ <script src="partials/scheduler/scheduler.service.js"></script>
	155	+ <script src="partials/signup/signup.service.js"></script>
	156	+ <script src="partials/updateFuelManager/updateFuelManager.service.js"></script>
	157	+ <script src="partials/viewCompany/viewCompany.service.js"></script>
	158	+ <script src="partials/widgetTemplate/widgetTemplate.service.js"></script>
	159	+ <script src="partials/dashboard/dashboard.service.js"></script>
	160	+ <script src="partials/AirList/AirList.service.js"></script>
	161	+ <script src="partials/fuelOrders/fuelOrders.service.js"></script>
	162	+ <script src="partials/DispatchFuel/DispatchFuel.service.js"></script>
	163	+ <script src="partials/searchDispatchFuel/searchDispatchFuel.service.js"></script>
	164	+ <script src="partials/NewCompany/NewCompany.service.js"></script>
	165	+ <script src="partials/Accept/Accept.service.js"></script>
	166	+ <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
	167	+ <script src="partials/ContactView/ContactView.service.js"></script>
	168	+ <script src="partials/FuelVendors/FuelVendors.service.js"></script>
	169	+ <script src="partials/delselected/delselected.service.js"></script>
	170	+ <script src="partials/pricingcontact/pricingcontact.service.js"></script>
	171	+ <script src="partials/AntiochFlightDepartment/AntiochFlightDepartment.service.js"></script>
	172	+
	173	+ <script src="partials/main/main.service.js"></script>
117	174	</body>
118	175	</html>
119	176	\ No newline at end of file
...	...
...	...	@@ -1,320 +0,0 @@
1		-/**
2		- * @license AngularJS v1.4.0
3		- * (c) 2010-2015 Google, Inc. http://angularjs.org
4		- * License: MIT
5		- */
6		-(function(window, angular, undefined) {'use strict';
7		-
8		-/**
9		- * @ngdoc module
10		- * @name ngCookies
11		- * @description
12		- *
13		- * # ngCookies
14		- *
15		- * The `ngCookies` module provides a convenient wrapper for reading and writing browser cookies.
16		- *
17		- *
18		- * <div doc-module-components="ngCookies"></div>
19		- *
20		- * See {@link ngCookies.$cookies `$cookies`} and
21		- * {@link ngCookies.$cookieStore `$cookieStore`} for usage.
22		- */
23		-
24		-
25		-angular.module('ngCookies', ['ng']).
26		- /**
27		- * @ngdoc provider
28		- * @name $cookiesProvider
29		- * @description
30		- * Use `$cookiesProvider` to change the default behavior of the {@link ngCookies.$cookies $cookies} service.
31		- * */
32		- provider('$cookies', [function $CookiesProvider() {
33		- /**
34		- * @ngdoc property
35		- * @name $cookiesProvider#defaults
36		- * @description
37		- *
38		- * Object containing default options to pass when setting cookies.
39		- *
40		- * The object may have following properties:
41		- *
42		- * - path - `{string}` - The cookie will be available only for this path and its
43		- * sub-paths. By default, this would be the URL that appears in your base tag.
44		- * - domain - `{string}` - The cookie will be available only for this domain and
45		- * its sub-domains. For obvious security reasons the user agent will not accept the
46		- * cookie if the current domain is not a sub domain or equals to the requested domain.
47		- * - expires - `{string\|Date}` - String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT"
48		- * or a Date object indicating the exact date/time this cookie will expire.
49		- * - secure - `{boolean}` - The cookie will be available only in secured connection.
50		- *
51		- * Note: by default the address that appears in your <base> tag will be used as path.
52		- * This is import so that cookies will be visible for all routes in case html5mode is enabled
53		- *
54		- **/
55		- var defaults = this.defaults = {};
56		-
57		- function calcOptions(options) {
58		- return options ? angular.extend({}, defaults, options) : defaults;
59		- }
60		-
61		- /**
62		- * @ngdoc service
63		- * @name $cookies
64		- *
65		- * @description
66		- * Provides read/write access to browser's cookies.
67		- *
68		- * BREAKING CHANGE: `$cookies` no longer exposes properties that represent the
69		- * current browser cookie values. Now you must use the get/put/remove/etc. methods
70		- * as described below.
71		- *
72		- * Requires the {@link ngCookies `ngCookies`} module to be installed.
73		- *
74		- * @example
75		- *
76		- * ```js
77		- * angular.module('cookiesExample', ['ngCookies'])
78		- * .controller('ExampleController', ['$cookies', function($cookies) {
79		- * // Retrieving a cookie
80		- * var favoriteCookie = $cookies.get('myFavorite');
81		- * // Setting a cookie
82		- * $cookies.put('myFavorite', 'oatmeal');
83		- * }]);
84		- * ```
85		- */
86		- this.$get = ['$$cookieReader', '$$cookieWriter', function($$cookieReader, $$cookieWriter) {
87		- return {
88		- /**
89		- * @ngdoc method
90		- * @name $cookies#get
91		- *
92		- * @description
93		- * Returns the value of given cookie key
94		- *
95		- * @param {string} key Id to use for lookup.
96		- * @returns {string} Raw cookie value.
97		- */
98		- get: function(key) {
99		- return $$cookieReader()[key];
100		- },
101		-
102		- /**
103		- * @ngdoc method
104		- * @name $cookies#getObject
105		- *
106		- * @description
107		- * Returns the deserialized value of given cookie key
108		- *
109		- * @param {string} key Id to use for lookup.
110		- * @returns {Object} Deserialized cookie value.
111		- */
112		- getObject: function(key) {
113		- var value = this.get(key);
114		- return value ? angular.fromJson(value) : value;
115		- },
116		-
117		- /**
118		- * @ngdoc method
119		- * @name $cookies#getAll
120		- *
121		- * @description
122		- * Returns a key value object with all the cookies
123		- *
124		- * @returns {Object} All cookies
125		- */
126		- getAll: function() {
127		- return $$cookieReader();
128		- },
129		-
130		- /**
131		- * @ngdoc method
132		- * @name $cookies#put
133		- *
134		- * @description
135		- * Sets a value for given cookie key
136		- *
137		- * @param {string} key Id for the `value`.
138		- * @param {string} value Raw value to be stored.
139		- * @param {Object=} options Options object.
140		- * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
141		- */
142		- put: function(key, value, options) {
143		- $$cookieWriter(key, value, calcOptions(options));
144		- },
145		-
146		- /**
147		- * @ngdoc method
148		- * @name $cookies#putObject
149		- *
150		- * @description
151		- * Serializes and sets a value for given cookie key
152		- *
153		- * @param {string} key Id for the `value`.
154		- * @param {Object} value Value to be stored.
155		- * @param {Object=} options Options object.
156		- * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
157		- */
158		- putObject: function(key, value, options) {
159		- this.put(key, angular.toJson(value), options);
160		- },
161		-
162		- /**
163		- * @ngdoc method
164		- * @name $cookies#remove
165		- *
166		- * @description
167		- * Remove given cookie
168		- *
169		- * @param {string} key Id of the key-value pair to delete.
170		- * @param {Object=} options Options object.
171		- * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
172		- */
173		- remove: function(key, options) {
174		- $$cookieWriter(key, undefined, calcOptions(options));
175		- }
176		- };
177		- }];
178		- }]);
179		-
180		-angular.module('ngCookies').
181		-/**
182		- * @ngdoc service
183		- * @name $cookieStore
184		- * @deprecated
185		- * @requires $cookies
186		- *
187		- * @description
188		- * Provides a key-value (string-object) storage, that is backed by session cookies.
189		- * Objects put or retrieved from this storage are automatically serialized or
190		- * deserialized by angular's toJson/fromJson.
191		- *
192		- * Requires the {@link ngCookies `ngCookies`} module to be installed.
193		- *
194		- * <div class="alert alert-danger">
195		- * Note: The $cookieStore service is deprecated.
196		- * Please use the {@link ngCookies.$cookies `$cookies`} service instead.
197		- * </div>
198		- *
199		- * @example
200		- *
201		- * ```js
202		- * angular.module('cookieStoreExample', ['ngCookies'])
203		- * .controller('ExampleController', ['$cookieStore', function($cookieStore) {
204		- * // Put cookie
205		- * $cookieStore.put('myFavorite','oatmeal');
206		- * // Get cookie
207		- * var favoriteCookie = $cookieStore.get('myFavorite');
208		- * // Removing a cookie
209		- * $cookieStore.remove('myFavorite');
210		- * }]);
211		- * ```
212		- */
213		- factory('$cookieStore', ['$cookies', function($cookies) {
214		-
215		- return {
216		- /**
217		- * @ngdoc method
218		- * @name $cookieStore#get
219		- *
220		- * @description
221		- * Returns the value of given cookie key
222		- *
223		- * @param {string} key Id to use for lookup.
224		- * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist.
225		- */
226		- get: function(key) {
227		- return $cookies.getObject(key);
228		- },
229		-
230		- /**
231		- * @ngdoc method
232		- * @name $cookieStore#put
233		- *
234		- * @description
235		- * Sets a value for given cookie key
236		- *
237		- * @param {string} key Id for the `value`.
238		- * @param {Object} value Value to be stored.
239		- */
240		- put: function(key, value) {
241		- $cookies.putObject(key, value);
242		- },
243		-
244		- /**
245		- * @ngdoc method
246		- * @name $cookieStore#remove
247		- *
248		- * @description
249		- * Remove given cookie
250		- *
251		- * @param {string} key Id of the key-value pair to delete.
252		- */
253		- remove: function(key) {
254		- $cookies.remove(key);
255		- }
256		- };
257		-
258		- }]);
259		-
260		-/**
261		- * @name $$cookieWriter
262		- * @requires $document
263		- *
264		- * @description
265		- * This is a private service for writing cookies
266		- *
267		- * @param {string} name Cookie name
268		- * @param {string=} value Cookie value (if undefined, cookie will be deleted)
269		- * @param {Object=} options Object with options that need to be stored for the cookie.
270		- */
271		-function $$CookieWriter($document, $log, $browser) {
272		- var cookiePath = $browser.baseHref();
273		- var rawDocument = $document[0];
274		-
275		- function buildCookieString(name, value, options) {
276		- var path, expires;
277		- options = options \|\| {};
278		- expires = options.expires;
279		- path = angular.isDefined(options.path) ? options.path : cookiePath;
280		- if (value === undefined) {
281		- expires = 'Thu, 01 Jan 1970 00:00:00 GMT';
282		- value = '';
283		- }
284		- if (angular.isString(expires)) {
285		- expires = new Date(expires);
286		- }
287		-
288		- var str = encodeURIComponent(name) + '=' + encodeURIComponent(value);
289		- str += path ? ';path=' + path : '';
290		- str += options.domain ? ';domain=' + options.domain : '';
291		- str += expires ? ';expires=' + expires.toUTCString() : '';
292		- str += options.secure ? ';secure' : '';
293		-
294		- // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
295		- // - 300 cookies
296		- // - 20 cookies per unique domain
297		- // - 4096 bytes per cookie
298		- var cookieLength = str.length + 1;
299		- if (cookieLength > 4096) {
300		- $log.warn("Cookie '" + name +
301		- "' possibly not set or overflowed because it was too large (" +
302		- cookieLength + " > 4096 bytes)!");
303		- }
304		-
305		- return str;
306		- }
307		-
308		- return function(name, value, options) {
309		- rawDocument.cookie = buildCookieString(name, value, options);
310		- };
311		-}
312		-
313		-$$CookieWriter.$inject = ['$document', '$log', '$browser'];
314		-
315		-angular.module('ngCookies').provider('$$cookieWriter', function $$CookieWriterProvider() {
316		- this.$get = $$CookieWriter;
317		-});
318		-
319		-
320		-})(window, window.angular);
...	...	@@ -1,429 +0,0 @@
1		-/**
2		- * @license AngularJS v1.4.0
3		- * (c) 2010-2015 Google, Inc. http://angularjs.org
4		- * License: MIT
5		- */
6		-
7		-(function() {'use strict';
8		-
9		-/**
10		- * @description
11		- *
12		- * This object provides a utility for producing rich Error messages within
13		- * Angular. It can be called as follows:
14		- *
15		- * var exampleMinErr = minErr('example');
16		- * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
17		- *
18		- * The above creates an instance of minErr in the example namespace. The
19		- * resulting error will have a namespaced error code of example.one. The
20		- * resulting error will replace {0} with the value of foo, and {1} with the
21		- * value of bar. The object is not restricted in the number of arguments it can
22		- * take.
23		- *
24		- * If fewer arguments are specified than necessary for interpolation, the extra
25		- * interpolation markers will be preserved in the final string.
26		- *
27		- * Since data will be parsed statically during a build step, some restrictions
28		- * are applied with respect to how minErr instances are created and called.
29		- * Instances should have names of the form namespaceMinErr for a minErr created
30		- * using minErr('namespace') . Error codes, namespaces and template strings
31		- * should all be static strings, not variables or general expressions.
32		- *
33		- * @param {string} module The namespace to use for the new minErr instance.
34		- * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
35		- * error from returned function, for cases when a particular type of error is useful.
36		- * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
37		- */
38		-
39		-function minErr(module, ErrorConstructor) {
40		- ErrorConstructor = ErrorConstructor \|\| Error;
41		- return function() {
42		- var SKIP_INDEXES = 2;
43		-
44		- var templateArgs = arguments,
45		- code = templateArgs[0],
46		- message = '[' + (module ? module + ':' : '') + code + '] ',
47		- template = templateArgs[1],
48		- paramPrefix, i;
49		-
50		- message += template.replace(/\{\d+\}/g, function(match) {
51		- var index = +match.slice(1, -1),
52		- shiftedIndex = index + SKIP_INDEXES;
53		-
54		- if (shiftedIndex < templateArgs.length) {
55		- return toDebugString(templateArgs[shiftedIndex]);
56		- }
57		-
58		- return match;
59		- });
60		-
61		- message += '\nhttp://errors.angularjs.org/1.4.0/' +
62		- (module ? module + '/' : '') + code;
63		-
64		- for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
65		- message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
66		- encodeURIComponent(toDebugString(templateArgs[i]));
67		- }
68		-
69		- return new ErrorConstructor(message);
70		- };
71		-}
72		-
73		-/**
74		- * @ngdoc type
75		- * @name angular.Module
76		- * @module ng
77		- * @description
78		- *
79		- * Interface for configuring angular {@link angular.module modules}.
80		- */
81		-
82		-function setupModuleLoader(window) {
83		-
84		- var $injectorMinErr = minErr('$injector');
85		- var ngMinErr = minErr('ng');
86		-
87		- function ensure(obj, name, factory) {
88		- return obj[name] \|\| (obj[name] = factory());
89		- }
90		-
91		- var angular = ensure(window, 'angular', Object);
92		-
93		- // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
94		- angular.$$minErr = angular.$$minErr \|\| minErr;
95		-
96		- return ensure(angular, 'module', function() {
97		- /** @type {Object.<string, angular.Module>} */
98		- var modules = {};
99		-
100		- /**
101		- * @ngdoc function
102		- * @name angular.module
103		- * @module ng
104		- * @description
105		- *
106		- * The `angular.module` is a global place for creating, registering and retrieving Angular
107		- * modules.
108		- * All modules (angular core or 3rd party) that should be available to an application must be
109		- * registered using this mechanism.
110		- *
111		- * When passed two or more arguments, a new module is created. If passed only one argument, an
112		- * existing module (the name passed as the first argument to `module`) is retrieved.
113		- *
114		- *
115		- * # Module
116		- *
117		- * A module is a collection of services, directives, controllers, filters, and configuration information.
118		- * `angular.module` is used to configure the {@link auto.$injector $injector}.
119		- *
120		- * ```js
121		- * // Create a new module
122		- * var myModule = angular.module('myModule', []);
123		- *
124		- * // register a new service
125		- * myModule.value('appName', 'MyCoolApp');
126		- *
127		- * // configure existing services inside initialization blocks.
128		- * myModule.config(['$locationProvider', function($locationProvider) {
129		- * // Configure existing providers
130		- * $locationProvider.hashPrefix('!');
131		- * }]);
132		- * ```
133		- *
134		- * Then you can create an injector and load your modules like this:
135		- *
136		- * ```js
137		- * var injector = angular.injector(['ng', 'myModule'])
138		- * ```
139		- *
140		- * However it's more likely that you'll just use
141		- * {@link ng.directive:ngApp ngApp} or
142		- * {@link angular.bootstrap} to simplify this process for you.
143		- *
144		- * @param {!string} name The name of the module to create or retrieve.
145		- * @param {!Array.<string>=} requires If specified then new module is being created. If
146		- * unspecified then the module is being retrieved for further configuration.
147		- * @param {Function=} configFn Optional configuration function for the module. Same as
148		- * {@link angular.Module#config Module#config()}.
149		- * @returns {module} new module with the {@link angular.Module} api.
150		- */
151		- return function module(name, requires, configFn) {
152		- var assertNotHasOwnProperty = function(name, context) {
153		- if (name === 'hasOwnProperty') {
154		- throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
155		- }
156		- };
157		-
158		- assertNotHasOwnProperty(name, 'module');
159		- if (requires && modules.hasOwnProperty(name)) {
160		- modules[name] = null;
161		- }
162		- return ensure(modules, name, function() {
163		- if (!requires) {
164		- throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
165		- "the module name or forgot to load it. If registering a module ensure that you " +
166		- "specify the dependencies as the second argument.", name);
167		- }
168		-
169		- /** @type {!Array.<Array.<>>} /
170		- var invokeQueue = [];
171		-
172		- /** @type {!Array.<Function>} */
173		- var configBlocks = [];
174		-
175		- /** @type {!Array.<Function>} */
176		- var runBlocks = [];
177		-
178		- var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
179		-
180		- /** @type {angular.Module} */
181		- var moduleInstance = {
182		- // Private state
183		- _invokeQueue: invokeQueue,
184		- _configBlocks: configBlocks,
185		- _runBlocks: runBlocks,
186		-
187		- /**
188		- * @ngdoc property
189		- * @name angular.Module#requires
190		- * @module ng
191		- *
192		- * @description
193		- * Holds the list of modules which the injector will load before the current module is
194		- * loaded.
195		- */
196		- requires: requires,
197		-
198		- /**
199		- * @ngdoc property
200		- * @name angular.Module#name
201		- * @module ng
202		- *
203		- * @description
204		- * Name of the module.
205		- */
206		- name: name,
207		-
208		-
209		- /**
210		- * @ngdoc method
211		- * @name angular.Module#provider
212		- * @module ng
213		- * @param {string} name service name
214		- * @param {Function} providerType Construction function for creating new instance of the
215		- * service.
216		- * @description
217		- * See {@link auto.$provide#provider $provide.provider()}.
218		- */
219		- provider: invokeLater('$provide', 'provider'),
220		-
221		- /**
222		- * @ngdoc method
223		- * @name angular.Module#factory
224		- * @module ng
225		- * @param {string} name service name
226		- * @param {Function} providerFunction Function for creating new instance of the service.
227		- * @description
228		- * See {@link auto.$provide#factory $provide.factory()}.
229		- */
230		- factory: invokeLater('$provide', 'factory'),
231		-
232		- /**
233		- * @ngdoc method
234		- * @name angular.Module#service
235		- * @module ng
236		- * @param {string} name service name
237		- * @param {Function} constructor A constructor function that will be instantiated.
238		- * @description
239		- * See {@link auto.$provide#service $provide.service()}.
240		- */
241		- service: invokeLater('$provide', 'service'),
242		-
243		- /**
244		- * @ngdoc method
245		- * @name angular.Module#value
246		- * @module ng
247		- * @param {string} name service name
248		- * @param {*} object Service instance object.
249		- * @description
250		- * See {@link auto.$provide#value $provide.value()}.
251		- */
252		- value: invokeLater('$provide', 'value'),
253		-
254		- /**
255		- * @ngdoc method
256		- * @name angular.Module#constant
257		- * @module ng
258		- * @param {string} name constant name
259		- * @param {*} object Constant value.
260		- * @description
261		- * Because the constant are fixed, they get applied before other provide methods.
262		- * See {@link auto.$provide#constant $provide.constant()}.
263		- */
264		- constant: invokeLater('$provide', 'constant', 'unshift'),
265		-
266		- /**
267		- * @ngdoc method
268		- * @name angular.Module#decorator
269		- * @module ng
270		- * @param {string} The name of the service to decorate.
271		- * @param {Function} This function will be invoked when the service needs to be
272		- * instantiated and should return the decorated service instance.
273		- * @description
274		- * See {@link auto.$provide#decorator $provide.decorator()}.
275		- */
276		- decorator: invokeLater('$provide', 'decorator'),
277		-
278		- /**
279		- * @ngdoc method
280		- * @name angular.Module#animation
281		- * @module ng
282		- * @param {string} name animation name
283		- * @param {Function} animationFactory Factory function for creating new instance of an
284		- * animation.
285		- * @description
286		- *
287		- * NOTE: animations take effect only if the ngAnimate module is loaded.
288		- *
289		- *
290		- * Defines an animation hook that can be later used with
291		- * {@link $animate $animate} service and directives that use this service.
292		- *
293		- * ```js
294		- * module.animation('.animation-name', function($inject1, $inject2) {
295		- * return {
296		- * eventName : function(element, done) {
297		- * //code to run the animation
298		- * //once complete, then run done()
299		- * return function cancellationFunction(element) {
300		- * //code to cancel the animation
301		- * }
302		- * }
303		- * }
304		- * })
305		- * ```
306		- *
307		- * See {@link ng.$animateProvider#register $animateProvider.register()} and
308		- * {@link ngAnimate ngAnimate module} for more information.
309		- */
310		- animation: invokeLater('$animateProvider', 'register'),
311		-
312		- /**
313		- * @ngdoc method
314		- * @name angular.Module#filter
315		- * @module ng
316		- * @param {string} name Filter name - this must be a valid angular expression identifier
317		- * @param {Function} filterFactory Factory function for creating new instance of filter.
318		- * @description
319		- * See {@link ng.$filterProvider#register $filterProvider.register()}.
320		- *
321		- * <div class="alert alert-warning">
322		- * Note: Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
323		- * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
324		- * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
325		- * (`myapp_subsection_filterx`).
326		- * </div>
327		- */
328		- filter: invokeLater('$filterProvider', 'register'),
329		-
330		- /**
331		- * @ngdoc method
332		- * @name angular.Module#controller
333		- * @module ng
334		- * @param {string\|Object} name Controller name, or an object map of controllers where the
335		- * keys are the names and the values are the constructors.
336		- * @param {Function} constructor Controller constructor function.
337		- * @description
338		- * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
339		- */
340		- controller: invokeLater('$controllerProvider', 'register'),
341		-
342		- /**
343		- * @ngdoc method
344		- * @name angular.Module#directive
345		- * @module ng
346		- * @param {string\|Object} name Directive name, or an object map of directives where the
347		- * keys are the names and the values are the factories.
348		- * @param {Function} directiveFactory Factory function for creating new instance of
349		- * directives.
350		- * @description
351		- * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
352		- */
353		- directive: invokeLater('$compileProvider', 'directive'),
354		-
355		- /**
356		- * @ngdoc method
357		- * @name angular.Module#config
358		- * @module ng
359		- * @param {Function} configFn Execute this function on module load. Useful for service
360		- * configuration.
361		- * @description
362		- * Use this method to register work which needs to be performed on module loading.
363		- * For more about how to configure services, see
364		- * {@link providers#provider-recipe Provider Recipe}.
365		- */
366		- config: config,
367		-
368		- /**
369		- * @ngdoc method
370		- * @name angular.Module#run
371		- * @module ng
372		- * @param {Function} initializationFn Execute this function after injector creation.
373		- * Useful for application initialization.
374		- * @description
375		- * Use this method to register work which should be performed when the injector is done
376		- * loading all modules.
377		- */
378		- run: function(block) {
379		- runBlocks.push(block);
380		- return this;
381		- }
382		- };
383		-
384		- if (configFn) {
385		- config(configFn);
386		- }
387		-
388		- return moduleInstance;
389		-
390		- /**
391		- * @param {string} provider
392		- * @param {string} method
393		- * @param {String=} insertMethod
394		- * @returns {angular.Module}
395		- */
396		- function invokeLater(provider, method, insertMethod, queue) {
397		- if (!queue) queue = invokeQueue;
398		- return function() {
399		- queue[insertMethod \|\| 'push']([provider, method, arguments]);
400		- return moduleInstance;
401		- };
402		- }
403		- });
404		- };
405		- });
406		-
407		-}
408		-
409		-setupModuleLoader(window);
410		-})(window);
411		-
412		-/**
413		- * Closure compiler type information
414		- *
415		- * @typedef { {
416		- * requires: !Array.<string>,
417		- * invokeQueue: !Array.<Array.<*>>,
418		- *
419		- * service: function(string, Function):angular.Module,
420		- * factory: function(string, Function):angular.Module,
421		- * value: function(string, *):angular.Module,
422		- *
423		- * filter: function(string, Function):angular.Module,
424		- *
425		- * init: function(Function):angular.Module
426		- * } }
427		- */
428		-angular.Module;
429		-
...	...	@@ -0,0 +1,21 @@
	1	+(function(){
	2	+'use strict';
	3	+
	4	+ angular.module('acufuel')
	5	+
	6	+ .constant('BASE_URL', {
	7	+ //url: 'http://54.149.169.33:8080/ws'
	8	+ url: 'http://192.168.1.226:8080/ws'
	9	+ })
	10	+
	11	+ .constant('AUTH_EVENTS', {
	12	+ updateUser: 'update-user',
	13	+ notAuthorized: 'auth-not-authorized'
	14	+ })
	15	+
	16	+ .constant('USER_ROLES', {
	17	+ user : 'user',
	18	+ admin: 'admin'
	19	+ });
	20	+
	21	+})();
0	22	\ No newline at end of file
...	...
1		-
2	1	'use strict';
3	2
4	3
5		- angular.module('acufuel', ['ui.router', 'ngAnimate', 'ui.bootstrap'])
	4	+ angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable'])
	5	+
	6	+ .config(['$httpProvider', function($httpProvider) {
	7	+ $httpProvider.defaults.withCredentials = true;
	8	+ $httpProvider.interceptors.push('myCSRF');
	9	+ $httpProvider.interceptors.push('httpRequestInterceptor');
	10	+ }])
	11	+
	12	+
	13	+ .factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {
	14	+ return {
	15	+ request: function($config) {
	16	+ return $config;
	17	+ },
	18	+ responseError: function(rejection) {
	19	+ if (rejection.status === 401) {
	20	+ if($location.path() != "/login"){
	21	+ localStorage.clear();
	22	+ window.location.reload();
	23	+ }
	24	+ }
	25	+ return $q.reject(rejection);
	26	+ }
	27	+ }
	28	+ }])
	29	+
	30	+ .provider('myCSRF',[function(){
	31	+ var headerName = 'X-CSRFToken';
	32	+ var cookieName = 'csrftoken';
	33	+ var allowedMethods = ['GET'];
	34	+
	35	+ this.setHeaderName = function(n) {
	36	+ headerName = n;
	37	+ }
	38	+ this.setCookieName = function(n) {
	39	+ cookieName = n;
	40	+ }
	41	+ this.setAllowedMethods = function(n) {
	42	+ allowedMethods = n;
	43	+ }
	44	+ this.$get = ['$cookies', function($cookies){
	45	+ return {
	46	+ 'request': function(config) {
	47	+ if(allowedMethods.indexOf(config.method) === -1) {
	48	+ // do something on success
	49	+ config.headers[headerName] = $cookies[cookieName];
	50	+ }
	51	+ return config;
	52	+ }
	53	+ }
	54	+ }];
	55	+ }])
6	56
7	57	.config(
8	58	['$locationProvider', '$stateProvider', '$urlRouterProvider',
...	...	@@ -32,6 +82,16 @@
32	82	templateUrl: "partials/customers/customers.html",
33	83	controller: "customersController"
34	84	})
	85	+ .state("app.ContactView", {
	86	+ url: "/ContactView",
	87	+ templateUrl: "partials/ContactView/ContactView.html",
	88	+ controller: "ContactViewController"
	89	+ })
	90	+ .state("app.FuelVendors", {
	91	+ url: "/FuelVendors",
	92	+ templateUrl: "partials/FuelVendors/FuelVendors.html",
	93	+ controller: "FuelVendorsController"
	94	+ })
35	95
36	96	.state("app.analytics", {
37	97	url: "/analytics",
...	...	@@ -51,6 +111,11 @@
51	111	controller: "dashboardController"
52	112	})
53	113
	114	+ .state("app.AirList", {
	115	+ url: "/AirList",
	116	+ templateUrl: "partials/AirList/AirList.html",
	117	+ controller: "AirListController"
	118	+ })
54	119
55	120	.state("app.elements", {
56	121	url: "/elements",
...	...	@@ -133,7 +198,10 @@
133	198	.state("app.updateFuelManager", {
134	199	url: "/updateFuelManager",
135	200	templateUrl: "partials/updateFuelManager/updateFuelManager.html",
136		- controller: "updateFuelManagerController"
	201	+ controller: "updateFuelManagerController",
	202	+ // data: {
	203	+ // authorizedRoles: ["fbo"],
	204	+ // }
137	205	})
138	206
139	207	.state("app.viewCompany", {
...	...	@@ -147,8 +215,89 @@
147	215	templateUrl: "partials/widgetTemplate/widgetTemplate.html",
148	216	controller: "widgetTemplateController"
149	217	})
	218	+
	219	+ .state("app.fuelOrders", {
	220	+ url: "/fuelOrders",
	221	+ templateUrl: "partials/fuelOrders/fuelOrders.html",
	222	+ controller: "fuelOrdersController"
	223	+ })
	224	+
	225	+ .state("app.DispatchFuel", {
	226	+ url: "/DispatchFuel",
	227	+ templateUrl: "partials/DispatchFuel/DispatchFuel.html",
	228	+ controller: "DispatchFuelController"
	229	+ })
	230	+
	231	+ .state("app.searchDispatchFuel", {
	232	+ url: "/searchDispatchFuel",
	233	+ templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",
	234	+ controller: "searchDispatchFuelController"
	235	+ })
	236	+
	237	+ .state("app.NewCompany", {
	238	+ url: "/NewCompany",
	239	+ templateUrl: "partials/NewCompany/NewCompany.html",
	240	+ controller: "NewCompanyController"
	241	+ })
	242	+
	243	+ .state("app.Accept", {
	244	+ url: "/Accept",
	245	+ templateUrl: "partials/Accept/Accept.html",
	246	+ controller: "AcceptController"
	247	+ })
	248	+ .state("app.delselected", {
	249	+ url: "/delselected",
	250	+ templateUrl: "partials/delselected/delselected.html",
	251	+ controller: "delselectedController"
	252	+ })
	253	+
	254	+ .state("app.pricingcontact", {
	255	+ url: "/pricingcontact",
	256	+ templateUrl: "partials/pricingcontact/pricingcontact.html",
	257	+ controller: "pricingcontactController"
	258	+ })
	259	+
	260	+ .state("app.AntiochFlightDepartment", {
	261	+ url: "/AntiochFlightDepartment",
	262	+ templateUrl: "partials/AntiochFlightDepartment/AntiochFlightDepartment.html",
	263	+ controller: "AntiochFlightDepartmentcontroller"
	264	+ })
150	265	}
151		- ]);
	266	+ ])
	267	+
	268	+ .run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {
	269	+ $rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {
	270	+ $rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));
	271	+
	272	+ LoginService.isAuthorized = function (authorizedRoles) {
	273	+ if (!angular.isArray(authorizedRoles)) {
	274	+ authorizedRoles = [authorizedRoles];
	275	+ }
	276	+ var userdata = JSON.parse(window.localStorage.getItem('currentUser'));
	277	+ return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);
	278	+ }
	279	+
	280	+ if ('data' in next && 'authorizedRoles' in next.data) {
	281	+ var authorizedRoles = next.data.authorizedRoles;
	282	+ if (!LoginService.isAuthorized(authorizedRoles)) {
	283	+ event.preventDefault();
	284	+ if($state.current.name.length == 0) {
	285	+ $state.go('login')
	286	+ } else {
	287	+ $state.go($state.current, {}, {reload: true});
	288	+ $rootScope.$broadcast(AUTH_EVENTS.notAuthorized);
	289	+ }
	290	+ }
	291	+ }
	292	+
	293	+ if (LoginService.isAuthenticated()) {
	294	+ if (next.name == 'login') {
	295	+ event.preventDefault();
	296	+ $state.go('app.dashboard');
	297	+ }
	298	+ }
	299	+ });
	300	+ }])
152	301
153	302
154	303
...	...
...	...	@@ -0,0 +1,21 @@
	1	+angular
	2	+ .module('mwl.calendar.docs')
	3	+ .factory('alert', function($uibModal) {
	4	+
	5	+ function show(action, event) {
	6	+ return $uibModal.open({
	7	+ templateUrl: 'modalContent.html',
	8	+ controller: function() {
	9	+ var vm = this;
	10	+ vm.action = action;
	11	+ vm.event = event;
	12	+ },
	13	+ controllerAs: 'vm'
	14	+ });
	15	+ }
	16	+
	17	+ return {
	18	+ show: show
	19	+ };
	20	+
	21	+ });
...	...
...	...	@@ -0,0 +1,127 @@
	1	++function($) {
	2	+ 'use strict';
	3	+
	4	+ var modals = $('.modal.multi-step');
	5	+
	6	+ modals.each(function(idx, modal) {
	7	+ var $modal = $(modal);
	8	+ var $buttons = $modal.find('button.step');
	9	+ var total_num_steps = $buttons.length;
	10	+ var $progress = $modal.find('.m-progress');
	11	+ var $progress_bar = $modal.find('.m-progress-bar');
	12	+ var $progress_stats = $modal.find('.m-progress-stats');
	13	+ var $progress_current = $modal.find('.m-progress-current');
	14	+ var $progress_total = $modal.find('.m-progress-total');
	15	+ var $progress_complete = $modal.find('.m-progress-complete');
	16	+ var reset_on_close = $modal.attr('reset-on-close') === 'true';
	17	+
	18	+ function reset() {
	19	+ $modal.find('.step').hide();
	20	+ $modal.find('[data-step]').hide();
	21	+ }
	22	+
	23	+ function completeSteps() {
	24	+ $progress_stats.hide();
	25	+ $progress_complete.show();
	26	+ $modal.find('.progress-text').animate({
	27	+ top: '-2em'
	28	+ });
	29	+ $modal.find('.complete-indicator').animate({
	30	+ top: '-2em'
	31	+ });
	32	+ $progress_bar.addClass('completed');
	33	+ }
	34	+
	35	+ function getPercentComplete(current_step, total_steps) {
	36	+ return Math.min(current_step / total_steps * 100, 100) + '%';
	37	+ }
	38	+
	39	+ function updateProgress(current, total) {
	40	+ $progress_bar.animate({
	41	+ width: getPercentComplete(current, total)
	42	+ });
	43	+ if (current - 1 >= total_num_steps) {
	44	+ completeSteps();
	45	+ } else {
	46	+ $progress_current.text(current);
	47	+ }
	48	+
	49	+ $progress.find('[data-progress]').each(function() {
	50	+ var dp = $(this);
	51	+ if (dp.data().progress <= current - 1) {
	52	+ dp.addClass('completed');
	53	+ } else {
	54	+ dp.removeClass('completed');
	55	+ }
	56	+ });
	57	+ }
	58	+
	59	+ function goToStep(step) {
	60	+ reset();
	61	+ var to_show = $modal.find('.step-' + step);
	62	+ if (to_show.length === 0) {
	63	+ // at the last step, nothing else to show
	64	+ return;
	65	+ }
	66	+ to_show.show();
	67	+ var current = parseInt(step, 10);
	68	+ updateProgress(current, total_num_steps);
	69	+ findFirstFocusableInput(to_show).focus();
	70	+ }
	71	+
	72	+ function findFirstFocusableInput(parent) {
	73	+ var candidates = [parent.find('input'), parent.find('select'),
	74	+ parent.find('textarea'),parent.find('button')],
	75	+ winner = parent;
	76	+ $.each(candidates, function() {
	77	+ if (this.length > 0) {
	78	+ winner = this[0];
	79	+ return false;
	80	+ }
	81	+ });
	82	+ return $(winner);
	83	+ }
	84	+
	85	+ function bindEventsToModal($modal) {
	86	+ var data_steps = [];
	87	+ $('[data-step]').each(function() {
	88	+ var step = $(this).data().step;
	89	+ if (step && $.inArray(step, data_steps) === -1) {
	90	+ data_steps.push(step);
	91	+ }
	92	+ });
	93	+
	94	+ $.each(data_steps, function(i, v) {
	95	+ $modal.on('next.m.' + v, {step: v}, function(e) {
	96	+ goToStep(e.data.step);
	97	+ });
	98	+ });
	99	+ }
	100	+
	101	+ function initialize() {
	102	+ reset();
	103	+ updateProgress(1, total_num_steps);
	104	+ $modal.find('.step-1').show();
	105	+ $progress_complete.hide();
	106	+ $progress_total.text(total_num_steps);
	107	+ bindEventsToModal($modal, total_num_steps);
	108	+ $modal.data({
	109	+ total_num_steps: $buttons.length,
	110	+ });
	111	+ if (reset_on_close){
	112	+ //Bootstrap 2.3.2
	113	+ $modal.on('hidden', function () {
	114	+ reset();
	115	+ $modal.find('.step-1').show();
	116	+ })
	117	+ //Bootstrap 3
	118	+ $modal.on('hidden.bs.modal', function () {
	119	+ reset();
	120	+ $modal.find('.step-1').show();
	121	+ })
	122	+ }
	123	+ }
	124	+
	125	+ initialize();
	126	+ })
	127	+}(jQuery);
0	128	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,106 @@
	1	+angular.module('mwl.calendar.docs', ['mwl.calendar', 'ngAnimate', 'ui.bootstrap', 'colorpicker.module']);
	2	+angular
	3	+ .module('mwl.calendar.docs') //you will need to declare your module with the dependencies ['mwl.calendar', 'ui.bootstrap', 'ngAnimate']
	4	+ .controller('KitchenSinkCtrl', function(moment, alert, calendarConfig) {
	5	+
	6	+ var vm = this;
	7	+
	8	+ //These variables MUST be set as a minimum for the calendar to work
	9	+ vm.calendarView = 'month';
	10	+ vm.viewDate = new Date();
	11	+ var actions = [{
	12	+ label: '<i class=\'glyphicon glyphicon-pencil\'></i>',
	13	+ onClick: function(args) {
	14	+ alert.show('Edited', args.calendarEvent);
	15	+ }
	16	+ }, {
	17	+ label: '<i class=\'glyphicon glyphicon-remove\'></i>',
	18	+ onClick: function(args) {
	19	+ alert.show('Deleted', args.calendarEvent);
	20	+ }
	21	+ }];
	22	+ vm.events = [
	23	+ {
	24	+ title: 'An event',
	25	+ color: calendarConfig.colorTypes.warning,
	26	+ startsAt: moment().startOf('week').subtract(2, 'days').add(8, 'hours').toDate(),
	27	+ endsAt: moment().startOf('week').add(1, 'week').add(9, 'hours').toDate(),
	28	+ draggable: true,
	29	+ resizable: true,
	30	+ actions: actions
	31	+ }, {
	32	+ title: '<i class="glyphicon glyphicon-asterisk"></i> <span class="text-primary">Another event</span>, with a <i>html</i> title',
	33	+ color: calendarConfig.colorTypes.info,
	34	+ startsAt: moment().subtract(1, 'day').toDate(),
	35	+ endsAt: moment().add(5, 'days').toDate(),
	36	+ draggable: true,
	37	+ resizable: true,
	38	+ actions: actions
	39	+ }, {
	40	+ title: 'This is a really long event title that occurs on every year',
	41	+ color: calendarConfig.colorTypes.important,
	42	+ startsAt: moment().startOf('day').add(7, 'hours').toDate(),
	43	+ endsAt: moment().startOf('day').add(19, 'hours').toDate(),
	44	+ recursOn: 'year',
	45	+ draggable: true,
	46	+ resizable: true,
	47	+ actions: actions
	48	+ }
	49	+ ];
	50	+
	51	+ vm.cellIsOpen = true;
	52	+
	53	+ vm.addEvent = function() {
	54	+ vm.events.push({
	55	+ title: 'New event',
	56	+ startsAt: moment().startOf('day').toDate(),
	57	+ endsAt: moment().endOf('day').toDate(),
	58	+ color: calendarConfig.colorTypes.important,
	59	+ draggable: true,
	60	+ resizable: true
	61	+ });
	62	+ };
	63	+
	64	+ vm.eventClicked = function(event) {
	65	+ alert.show('Clicked', event);
	66	+ };
	67	+
	68	+ vm.eventEdited = function(event) {
	69	+ alert.show('Edited', event);
	70	+ };
	71	+
	72	+ vm.eventDeleted = function(event) {
	73	+ alert.show('Deleted', event);
	74	+ };
	75	+
	76	+ vm.eventTimesChanged = function(event) {
	77	+ alert.show('Dropped or resized', event);
	78	+ };
	79	+
	80	+ vm.toggle = function($event, field, event) {
	81	+ $event.preventDefault();
	82	+ $event.stopPropagation();
	83	+ event[field] = !event[field];
	84	+ };
	85	+
	86	+ vm.timespanClicked = function(date, cell) {
	87	+
	88	+ if (vm.calendarView === 'month') {
	89	+ if ((vm.cellIsOpen && moment(date).startOf('day').isSame(moment(vm.viewDate).startOf('day'))) \|\| cell.events.length === 0 \|\| !cell.inMonth) {
	90	+ vm.cellIsOpen = false;
	91	+ } else {
	92	+ vm.cellIsOpen = true;
	93	+ vm.viewDate = date;
	94	+ }
	95	+ } else if (vm.calendarView === 'year') {
	96	+ if ((vm.cellIsOpen && moment(date).startOf('month').isSame(moment(vm.viewDate).startOf('month'))) \|\| cell.events.length === 0) {
	97	+ vm.cellIsOpen = false;
	98	+ } else {
	99	+ vm.cellIsOpen = true;
	100	+ vm.viewDate = date;
	101	+ }
	102	+ }
	103	+
	104	+ };
	105	+
	106	+ });
...	...