From 002272b6c596001ba2b97842f18098605c2b42a5 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Mon, 11 Feb 2019 23:21:27 +1100 Subject: [PATCH] user-add fix --- .../company-details/company-details.html | 3 +- src/assets/scripts/dashboard/dashboard.html | 2 +- .../scripts/user-add/user-add.controller.js | 7 +- src/assets/scripts/user-add/user-add.html | 545 +++++++++++++----- src/assets/styles/nomit.scss | 1 + 5 files changed, 408 insertions(+), 150 deletions(-) diff --git a/src/assets/scripts/company-details/company-details.html b/src/assets/scripts/company-details/company-details.html index cf86cdd..1a23b5c 100644 --- a/src/assets/scripts/company-details/company-details.html +++ b/src/assets/scripts/company-details/company-details.html @@ -2,7 +2,8 @@
- Company's Profile +

Company's Profile

+
diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index 2ff3a2e..d8d6aae 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -195,7 +195,7 @@
- +
diff --git a/src/assets/scripts/user-add/user-add.controller.js b/src/assets/scripts/user-add/user-add.controller.js index b67e3e3..139ba48 100644 --- a/src/assets/scripts/user-add/user-add.controller.js +++ b/src/assets/scripts/user-add/user-add.controller.js @@ -1,11 +1,10 @@ /** @ngInject */ +import visas from "../profile/visa.type" + const UserAddController = ($scope,UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; - $scope.classifications = ['class1', 'class2']; - $scope.skills = ['s1', 's2']; - $scope.tab = 1; $scope.setTab = (newTab) => { @@ -18,6 +17,8 @@ const UserAddController = ($scope,UserService) => { }); UserService.loadUser(); + + $scope.visas = visas; } export default UserAddController; diff --git a/src/assets/scripts/user-add/user-add.html b/src/assets/scripts/user-add/user-add.html index 14f50d2..1fde923 100644 --- a/src/assets/scripts/user-add/user-add.html +++ b/src/assets/scripts/user-add/user-add.html @@ -2,7 +2,8 @@
- Add a new User / Referee +

Add a new User / Referee

+
@@ -35,34 +36,34 @@
+
First Name - +
Middle Name - +
Last Name - +
Email Address - +
Phone Number - +
State - @@ -76,35 +77,293 @@
Nationality - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Visa Type - +
Language (Select one or more) - +
Education - +
@@ -112,157 +371,153 @@
Main Classification: - +
Skills: - +
-
-
-
Graphic Design
-
Adobe Creaetive CC
-
Illustration
-
-
Password: - +
Confirm Password - +
- - + +
- - +
-
+
-
- -
-
- -
-
New Referee
-
-
-
-
-
-
- Name - -
-
- Business Type - -
-
- ABN - -
-
- -
-
- Email Address - -
-
- Phone Number - -
-
- Website - -
-
- - -
-
- Address - -
-
- City - -
-
- State - -
-
- Zip - -
-
- -
-
- Description - -
-
-
-
- Twitter - -
-
- Facebook - -
-
- Instagram - -
-
- Linkedin - +
+ +
+
+ +
+
New Referee
+
+
+
+
+
+
+
+ Name + +
+
+ Business Type + +
+
+ ABN + +
+
+ +
+
+ Email Address + +
+
+ Phone Number + +
+
+ Website + +
+
+ + +
+
+ Address + +
+
+ City + +
+
+ State + +
+
+ Zip + +
+
+ +
+
+ Description +
-
+
+
+
+ Twitter + +
+
+ Facebook + +
+
+ Instagram + +
+
+ Linkedin + +
+
-
-
- Password: - -
-
- Confirm Password - -
+
+
+ Password: + +
+
+ Confirm Password +
- - -
+ + + + +
-
-
+
+
+
diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index a5615cc..6f3087d 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -17,6 +17,7 @@ .main-content{ padding-left: 80px; padding-right: 80px; + padding-bottom: 100px; } .mx-auto {