From 47fefe50fbc6fd8bbdf6945559cfc7f23fdfbf26 Mon Sep 17 00:00:00 2001
From: Mohammed Tantawy <6102@ait.nsw.edu.au>
Date: Sat, 9 Feb 2019 14:00:04 +1100
Subject: [PATCH] user page logo
---
src/assets/scripts/app/index.js | 9 +-
src/assets/scripts/history/index.js | 4 +-
src/assets/scripts/index.js | 1 +
src/assets/scripts/reports/index.js | 10 +
.../scripts/reports/reports.controller.js | 11 +
src/assets/scripts/reports/reports.html | 349 ++++++++++++++++++
src/assets/scripts/users/users.controller.js | 16 +-
src/assets/scripts/users/users.html | 9 +-
8 files changed, 397 insertions(+), 12 deletions(-)
create mode 100644 src/assets/scripts/reports/index.js
create mode 100644 src/assets/scripts/reports/reports.controller.js
create mode 100644 src/assets/scripts/reports/reports.html
diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js
index 9f3c876..8a68b57 100644
--- a/src/assets/scripts/app/index.js
+++ b/src/assets/scripts/app/index.js
@@ -20,6 +20,7 @@ angular.module('NomitWisp',
'nwUsers',
'nwCompanies',
'nwReferees',
+ 'nwReports',
ngRoute
])
.factory(UserService.name, UserService)
@@ -74,10 +75,10 @@ angular.module('NomitWisp',
controller: 'RefereesController',
templateUrl: 'assets/scripts/referees/referees.html'
})
- // .when('/reports', {
- // controller: 'ReportsController',
- // templateUrl: ''
- // })
+ .when('/reports', {
+ controller: 'ReportsController',
+ templateUrl: 'assets/scripts/reports/reports.html'
+ })
.otherwise({
redirectTo: '/'
});
diff --git a/src/assets/scripts/history/index.js b/src/assets/scripts/history/index.js
index 58fdc44..b20349c 100644
--- a/src/assets/scripts/history/index.js
+++ b/src/assets/scripts/history/index.js
@@ -1,10 +1,10 @@
import angular from 'angular';
import HistoryController from './history.controller';
-//import ProfileService from './profile.service';
+//import HistoryService from './history.service';
angular.module('nwHistory', [])
.config(['$httpProvider', function($httpProvider) {
$httpProvider.defaults.withCredentials = true;
}])
.controller(HistoryController.name, HistoryController)
- //.factory(ProfileService.name, ProfileService);
\ No newline at end of file
+ //.factory(HistoryService.name, HistoryService);
\ No newline at end of file
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js
index 230cfc4..6c40505 100755
--- a/src/assets/scripts/index.js
+++ b/src/assets/scripts/index.js
@@ -33,5 +33,6 @@ import './user-add';
import './users';
import './companies';
import './referees';
+import './reports';
import './app';
\ No newline at end of file
diff --git a/src/assets/scripts/reports/index.js b/src/assets/scripts/reports/index.js
new file mode 100644
index 0000000..736d7a9
--- /dev/null
+++ b/src/assets/scripts/reports/index.js
@@ -0,0 +1,10 @@
+import angular from 'angular';
+import ReportsController from './reports.controller';
+//import ReportsService from './reports.service';
+
+angular.module('nwReports', [])
+ .config(['$httpProvider', function($httpProvider) {
+ $httpProvider.defaults.withCredentials = true;
+ }])
+ .controller(ReportsController.name, ReportsController)
+ //.factory(HistoryService.name, HistoryService);
\ No newline at end of file
diff --git a/src/assets/scripts/reports/reports.controller.js b/src/assets/scripts/reports/reports.controller.js
new file mode 100644
index 0000000..8412a7c
--- /dev/null
+++ b/src/assets/scripts/reports/reports.controller.js
@@ -0,0 +1,11 @@
+/** @ngInject */
+const ReportsController = ($scope, UserService) => {
+ $scope.$on('loadUserSuccess', function (event, user) {
+ $scope.user = user;
+ });
+ // Service to fetch reports
+
+ UserService.loadUser();
+}
+
+export default ReportsController;
\ No newline at end of file
diff --git a/src/assets/scripts/reports/reports.html b/src/assets/scripts/reports/reports.html
new file mode 100644
index 0000000..1f14cfd
--- /dev/null
+++ b/src/assets/scripts/reports/reports.html
@@ -0,0 +1,349 @@
+
+
+
+
+ Reports
+
+
+
+
All Applications (Last month)
+
+
+
+ | # |
+ Position |
+ Company |
+ Industry |
+ Submitted By (ID) |
+ Submission Date |
+ Application Status |
+
+
+
+
+ | 1 |
+ Graphic Design Intern |
+ Sierra Delta Creative |
+ Design |
+ davidchan |
+ 07 Jan 2019 |
+
+
+ ON
+
+ |
+
+
+ | 2 |
+ Barista Intern |
+ Brunetti |
+ Hospitality |
+ jenniferbrown |
+ 21 Jan 2019 |
+
+
+ OFF
+
+ |
+
+
+ | 3 |
+ Web Developer Intern |
+ Agile Talent |
+ IT / Software Engineering |
+ christhomson |
+ 23 Jan 2019 |
+
+
+ CLOSED
+
+ |
+
+
+ | 4 |
+ Kitchen Hand Intern |
+ Yarra River Grill |
+ Hospitality |
+ johndoe |
+ 25 Jan 2019 |
+
+
+ CANCELLED
+
+ |
+
+
+
+
+
+
New Registered Users (Last month)
+
+
+
+ | # |
+ First Name |
+ Last Name |
+ Username |
+ Industry |
+ Member Since |
+
+
+
+
+ | 1 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+ | 2 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+ | 3 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+
+
+
+
+
New Ads (Last month)
+
+
+
+ | # |
+ Position |
+ Company |
+ Industry |
+ Posted Date |
+ Application Status |
+
+
+
+
+ | 1 |
+ Graphic Design Intern |
+ Sierra Delta Creative |
+ Design |
+ 07 Jan 2019 |
+
+
+ ON
+
+ |
+
+
+ | 2 |
+ Barista Intern |
+ Brunetti |
+ Hospitality |
+ 21 Jan 2019 |
+
+
+ OFF
+
+ |
+
+
+ | 3 |
+ Web Developer Intern |
+ Agile Talent |
+ IT / Software Engineering |
+ 23 Jan 2019 |
+
+
+ CLOSED
+
+ |
+
+
+ | 4 |
+ Kitchen Hand Intern |
+ Yarra River Grill |
+ Hospitality |
+ 25 Jan 2019 |
+
+
+ CANCELLED
+
+ |
+
+
+
+
+
+
Successful Matches (Last month)
+
+
+
+ | # |
+ Position |
+ Company |
+ Industry |
+ Matched User(ID) |
+ Matched Date |
+
+
+
+
+ | 1 |
+ Graphic Design Intern |
+ Sierra Delta Creative |
+ Design |
+ davidchan |
+ 07 Jan 2019 |
+
+
+ | 2 |
+ Barista Intern |
+ Brunetti |
+ Hospitality |
+ jenniferbrown |
+ 21 Jan 2019 |
+
+
+ | 3 |
+ Web Developer Intern |
+ Agile Talent |
+ IT / Software Engineering |
+ christhomson |
+ 23 Jan 2019 |
+
+
+ | 4 |
+ Kitchen Hand Intern |
+ Yarra River Grill |
+ Hospitality |
+ johndoe |
+ 25 Jan 2019 |
+
+
+
+
+
+
Unmatched Users (Last month)
+
+
+
+ | # |
+ First Name |
+ Last Name |
+ Username |
+ Industry |
+ Member Since |
+
+
+
+
+ | 1 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+ | 2 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+ | 3 |
+ David |
+ Chan |
+ davidchan |
+ Design(Graphic, digital, textile, UX/UI) |
+ 21 Jan 2019 |
+
+
+
+
+
+
+
Unmatched Ads (Last month)
+
+
+
+ | # |
+ Position |
+ Company |
+ Industry |
+ Posted Date |
+ Application Status |
+
+
+
+
+ | 1 |
+ Graphic Design Intern |
+ Sierra Delta Creative |
+ Design |
+ 07 Jan 2019 |
+
+
+ ON
+
+ |
+
+
+ | 2 |
+ Barista Intern |
+ Brunetti |
+ Hospitality |
+ 21 Jan 2019 |
+
+
+ OFF
+
+ |
+
+
+ | 3 |
+ Web Developer Intern |
+ Agile Talent |
+ IT / Software Engineering |
+ 23 Jan 2019 |
+
+
+ OFF
+
+ |
+
+
+ | 4 |
+ Kitchen Hand Intern |
+ Yarra River Grill |
+ Hospitality |
+ 25 Jan 2019 |
+
+
+ ON
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/assets/scripts/users/users.controller.js b/src/assets/scripts/users/users.controller.js
index 7e9bad2..295a7a3 100644
--- a/src/assets/scripts/users/users.controller.js
+++ b/src/assets/scripts/users/users.controller.js
@@ -1,9 +1,23 @@
+import Avatar from 'avatar-initials';
+
/** @ngInject */
const UsersController = ($scope, UsersService, UserService) => {
$scope.$on('loadUserSuccess', async (event, user) => {
$scope.user = user;
await UsersService.fetchUsersService()
- .then( (result) => { $scope.users = result; })
+ .then( (result) => {
+ $scope.users = result;
+
+ $scope.avatar = function(index) {
+ const first_name = result[index].personal.first_name[0];
+ const last_name = result[index].personal.last_name[0];
+ new Avatar(document.getElementById('user'+index), {
+ 'useGravatar': false,
+ 'initials': first_name + last_name,
+ 'initial_weight': 300,
+ });
+ }
+ })
.catch( (error) => { console.log(error); })
});
UserService.loadUser();
diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html
index 4664902..9092231 100644
--- a/src/assets/scripts/users/users.html
+++ b/src/assets/scripts/users/users.html
@@ -12,12 +12,11 @@
-

+
-
{{user.fullname}}
-
Victoria
-
Mobile: 0414987654
+
{{user.personal.first_name}} {{user.personal.last_name}}
+
{{user.personal.city}}
+
{{user.personal.phone}}
view user profile
ban
user