From 89b3cbab3d0f3dc2a5a219c62442c5902b39d36b Mon Sep 17 00:00:00 2001 From: Mohammed Tantawy <6102@ait.nsw.edu.au> Date: Sat, 9 Feb 2019 20:45:05 +1100 Subject: [PATCH 1/2] Added route to company details --- src/assets/scripts/app/index.js | 5 +++++ src/assets/scripts/companies/companies.html | 2 +- .../company-details/company-details.controller.js | 12 ++++++++++++ .../company-details.html} | 2 +- .../company-details/company-details.service.js | 13 +++++++++++++ src/assets/scripts/company-details/index.js | 11 +++++++++++ src/assets/scripts/index.js | 1 + 7 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/assets/scripts/company-details/company-details.controller.js rename src/assets/scripts/{company-detail/company-detail.html => company-details/company-details.html} (97%) create mode 100644 src/assets/scripts/company-details/company-details.service.js create mode 100644 src/assets/scripts/company-details/index.js diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index 32a9fb5..bc25fd6 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -20,6 +20,7 @@ angular.module('NomitWisp', 'nwUsers', 'nwUserDetails', 'nwCompanies', + 'nwCompanyDetails', 'nwReferees', 'nwReports', ngRoute @@ -72,6 +73,10 @@ angular.module('NomitWisp', controller: 'CompaniesController', templateUrl: 'assets/scripts/companies/companies.html' }) + .when('/company/:id', { + controller: 'CompanyDetailsController', + templateUrl: 'assets/scripts/company-details/company-details.html' + }) .when('/referees', { controller: 'RefereesController', templateUrl: 'assets/scripts/referees/referees.html' diff --git a/src/assets/scripts/companies/companies.html b/src/assets/scripts/companies/companies.html index 475ab92..d2081d0 100644 --- a/src/assets/scripts/companies/companies.html +++ b/src/assets/scripts/companies/companies.html @@ -18,7 +18,7 @@
{{company.name}}
Victoria
{{companies.email}}
- view company profile + view company profile ban company diff --git a/src/assets/scripts/company-details/company-details.controller.js b/src/assets/scripts/company-details/company-details.controller.js new file mode 100644 index 0000000..7e99b3d --- /dev/null +++ b/src/assets/scripts/company-details/company-details.controller.js @@ -0,0 +1,12 @@ +/** @ngInject */ +const CompanyDetailsController = ($scope, $routeParams, CompanyDetailsService, UserService) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + CompanyDetailsService.fetchCompanyDetails($routeParams) + .then( (result) => { console.log(result); $scope.company = result; }) + .catch( (error) => { console.log(error); }) + }); + UserService.loadUser(); +} + +export default CompanyDetailsController; \ No newline at end of file diff --git a/src/assets/scripts/company-detail/company-detail.html b/src/assets/scripts/company-details/company-details.html similarity index 97% rename from src/assets/scripts/company-detail/company-detail.html rename to src/assets/scripts/company-details/company-details.html index ab3f03d..238183d 100644 --- a/src/assets/scripts/company-detail/company-detail.html +++ b/src/assets/scripts/company-details/company-details.html @@ -11,7 +11,7 @@
-
+
diff --git a/src/assets/scripts/company-details/company-details.service.js b/src/assets/scripts/company-details/company-details.service.js new file mode 100644 index 0000000..8345a36 --- /dev/null +++ b/src/assets/scripts/company-details/company-details.service.js @@ -0,0 +1,13 @@ +/** @ngInject */ +const CompanyDetailsService = ($http) => { + let serv = {}; + + serv.fetchCompanyDetails = (route) => { + return $http.get(`${process.env.RESTAPI_URL}/api/user/${route.id}`) + .then( (result) => { console.log(result); return result.data; }) + .catch( (error) => { return error; }) + } + return serv; +} + +export default CompanyDetailsService; \ No newline at end of file diff --git a/src/assets/scripts/company-details/index.js b/src/assets/scripts/company-details/index.js new file mode 100644 index 0000000..91bf1bd --- /dev/null +++ b/src/assets/scripts/company-details/index.js @@ -0,0 +1,11 @@ +import * as angular from 'angular'; +import ngRoute from 'angular-route'; +import CompanyDetailsController from './company-details.controller'; +import CompanyDetailsService from './company-details.service'; + +angular.module('nwCompanyDetails', [ngRoute]) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(CompanyDetailsController.name, CompanyDetailsController) + .factory(CompanyDetailsService.name, CompanyDetailsService); \ No newline at end of file diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 31c9a1f..83eaaa7 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -35,5 +35,6 @@ import './companies'; import './referees'; import './reports'; import './user-details'; +import './company-details'; import './app'; \ No newline at end of file From 9158609d46536939f222826d010bec8efbfbeb4c Mon Sep 17 00:00:00 2001 From: Mohammed Tantawy <6102@ait.nsw.edu.au> Date: Sun, 10 Feb 2019 00:28:54 +1100 Subject: [PATCH 2/2] Modified topbar to get first char of user --- .../scripts/dashboard/dashboard.controller.js | 10 ++++----- src/assets/scripts/nwTopbar/nwTopbar.html | 2 +- .../scripts/nwTopbar/topbar.controller.js | 21 +++++++++---------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 8fbde3d..433dff8 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -1,14 +1,14 @@ -import * as $ from 'jquery'; -import masonry from '../masonry'; +import masonry from "../masonry"; /** @ngInject */ const DashboardController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function(event, user) { $scope.user = user; + window.dispatchEvent(window.EVENT); }); - // tutte le funzioni del controller - masonry(); - + + // tutte le funzioni del controller + masonry(); UserService.loadUser(); } diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html index 630cd76..5a8e98f 100644 --- a/src/assets/scripts/nwTopbar/nwTopbar.html +++ b/src/assets/scripts/nwTopbar/nwTopbar.html @@ -40,7 +40,7 @@
{{user.role}} - {{user.fullname}} + {{user.name}}
diff --git a/src/assets/scripts/nwTopbar/topbar.controller.js b/src/assets/scripts/nwTopbar/topbar.controller.js index 1690024..143a072 100644 --- a/src/assets/scripts/nwTopbar/topbar.controller.js +++ b/src/assets/scripts/nwTopbar/topbar.controller.js @@ -8,20 +8,19 @@ import masonry from '../masonry'; const TopbarController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; - }); - $scope.avatar = new Avatar(document.getElementById('avatar'), { - 'useGravatar': false, - 'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}` - 'initial_weight': 300, - }); + $scope.avatar = new Avatar(document.getElementById('avatar'), { + 'useGravatar': false, + 'initials': user.name[0], + 'initial_weight': 300, + }); - $scope.$on('needReload', function(event){ - console.log("NEED RELOAD!"); - functionSearch(); - masonry(); + $scope.$on('needReload', function(event){ + console.log("NEED RELOAD!"); + functionSearch(); + masonry(); + }); }); - UserService.loadUser();