diff --git a/app/index.html b/app/index.html index 2e262ef..a9b233d 100644 --- a/app/index.html +++ b/app/index.html @@ -114,7 +114,6 @@ - @@ -124,7 +123,7 @@ - +
@@ -148,7 +147,6 @@ - @@ -158,7 +156,7 @@ - + diff --git a/app/js/app.js b/app/js/app.js index 7f3e7e0..51b13d6 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -111,12 +111,6 @@ controller: "dashboardController" }) - .state("app.AirList", { - url: "/AirList", - templateUrl: "partials/AirList/AirList.html", - controller: "AirListController" - }) - .state("app.elements", { url: "/elements", templateUrl: "partials/elements/elements.html", @@ -227,10 +221,10 @@ controller: "pricingcontactController" }) - .state("app.AntiochFlightDepartment", { - url: "/AntiochFlightDepartment", - templateUrl: "partials/AntiochFlightDepartment/AntiochFlightDepartment.html", - controller: "AntiochFlightDepartmentcontroller" + .state("app.viewContact", { + url: "/viewContact/:id", + templateUrl: "partials/viewcontact/viewcontact.html", + controller: "viewcontactController" }) } ]) diff --git a/app/partials/AirList/AirList.controller.js b/app/partials/AirList/AirList.controller.js deleted file mode 100644 index bcc4684..0000000 --- a/app/partials/AirList/AirList.controller.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - - //Load controller - angular.module('acufuel') - - .controller('AirListController', ['$scope',function($scope) { - - $scope.test = "Testing..."; - - }]); \ No newline at end of file diff --git a/app/partials/AirList/AirList.html b/app/partials/AirList/AirList.html deleted file mode 100644 index c64d2d4..0000000 --- a/app/partials/AirList/AirList.html +++ /dev/null @@ -1,195 +0,0 @@ -
-
-
-
-
- - -

Add a New Company

-
-
-
-
-
-
- -

Aircraft List

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TailMakeModelSizeMargin
- - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - -
-
-
-
-
- - - - -
- -
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/app/partials/AirList/AirList.service.js b/app/partials/AirList/AirList.service.js deleted file mode 100644 index 810a610..0000000 --- a/app/partials/AirList/AirList.service.js +++ /dev/null @@ -1,13 +0,0 @@ -(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 diff --git a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js b/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js deleted file mode 100644 index a547326..0000000 --- a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.controller.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - - //Load controller - angular.module('acufuel') - - .controller('AntiochFlightDepartmentcontroller', ['$scope',function($scope) { - - $scope.test = "Testing..."; - - $(function() { - $('#toggle-five').bootstrapToggle(); - console.log("hello"); - }) - - - }]); diff --git a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.html b/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.html deleted file mode 100644 index d7dcac9..0000000 --- a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.html +++ /dev/null @@ -1,64 +0,0 @@ -
-
-
-
-
- - -

Antioch Flight Department

-
-
-
-
-
-
-
- -

Contact Detail

-
-
-
-
-
-
-
-
-

- Monica Smith -

-
-
- - - -
-
-
-

Reviera State Rd32

-

(310) 2342-3433

-

freed@gmail.com

-
-
-
-

Company Notes

-

This is the test data. note will be written in this

- -
- -
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.service.js b/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.service.js deleted file mode 100644 index 1544413..0000000 --- a/app/partials/AntiochFlightDepartment/AntiochFlightDepartment.service.js +++ /dev/null @@ -1,13 +0,0 @@ -(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 diff --git a/app/partials/fuelManager/fuelManager.html b/app/partials/fuelManager/fuelManager.html index 32c9298..6b2f158 100644 --- a/app/partials/fuelManager/fuelManager.html +++ b/app/partials/fuelManager/fuelManager.html @@ -360,7 +360,7 @@
- {{jets.rampFeesAndAvoidance.aircraftType}} + {{jets.size}}
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 09554ab..ade8838 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -294,7 +294,11 @@ - {{contact.firstName}} + + + {{contact.firstName}} + + {{contact.lastName}} {{contact.title}} diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index cefd13f..267cf44 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -26,7 +26,7 @@ var deferred = $q.defer(); $http({ method : 'GET', - url : BASE_URL.url +'/company/contact/'+id, + url : BASE_URL.url +'/company/contacts/'+id, headers : {'Content-Type': 'application/json'}, }) .then(function (result){ diff --git a/app/partials/viewcontact/viewcontact.controller.js b/app/partials/viewcontact/viewcontact.controller.js new file mode 100644 index 0000000..03d47f3 --- /dev/null +++ b/app/partials/viewcontact/viewcontact.controller.js @@ -0,0 +1,17 @@ +'use strict'; + + //Load controller + angular.module('acufuel') + + .controller('viewcontactController', ['$scope', '$stateParams', 'ViewcontactService', function($scope, $stateParams, ViewcontactService) { + + $(function() { + $('#toggle-five').bootstrapToggle(); + }) + + var contactId = $stateParams.id; + ViewcontactService.getContact(contactId).then(function(result) { + $scope.contactDetail = result; + }) + + }]); diff --git a/app/partials/viewcontact/viewcontact.html b/app/partials/viewcontact/viewcontact.html new file mode 100644 index 0000000..39bca8b --- /dev/null +++ b/app/partials/viewcontact/viewcontact.html @@ -0,0 +1,66 @@ +
+
+
+
+
+ + +

Antioch Flight Department

+
+
+
+
+
+
+
+ +

Contact Detail

+
+
+
+
+
+
+
+
+

+ {{contactDetail.firstName}} {{contactDetail.lastName}} +   +

+ {{contactDetail.owner.companyName}} +
+
+ + + +
+
+
+

{{contactDetail.address}}  

+

(310) 2342-3433  

+

{{contactDetail.email}}  

+
+
+
+

Contact Notes   +

{{contactDetail.note}}

+ +
+ +
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/app/partials/viewcontact/viewcontact.service.js b/app/partials/viewcontact/viewcontact.service.js new file mode 100644 index 0000000..3a62620 --- /dev/null +++ b/app/partials/viewcontact/viewcontact.service.js @@ -0,0 +1,26 @@ +(function(){ + 'use strict'; + angular.module('acufuel') + .service('ViewcontactService', ['$q', '$http', 'BASE_URL', ViewcontactService]); + + function ViewcontactService($q, $http, BASE_URL) { + + this.getContact = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/company/contact/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + } + +})(); \ No newline at end of file