Merge branch 'master' into test-fix-env-server

7 years ago · d965aa7227
--- a/src/assets/scripts/ads-details/ads-details.html
+++ b/src/assets/scripts/ads-details/ads-details.html
@ -51,7 +51,7 @@
      </div>

      <!-- ### Buttons ### -->
      <div class="masonry-item  w-50 m-auto btn-centered-container ">
      <div class="masonry-item  w-50 m-auto btn-centered-container visible-user" ng-show="profile.role =='user'">
        <button type="button" href="#" class="col-5 mr-1 btn btn-gradient btn-centered">Apply Now</button>
        <button type="button" href="#" class="col-5 ml-1 btn btn-border  btn-centered">Save</button>

--- a/src/assets/scripts/ads/ads.html
+++ b/src/assets/scripts/ads/ads.html
@ -1,8 +1,11 @@
 <main class='main-content bgc-grey-300'>
    <div id='mainContent row'>
      <div class="row content-title mT-60">
      <div class="row content-title mT-60  visible-admin visible-nomit visible-referee" ng-show="user.role =='admin' || user.role =='nomit' || user.role =='referee' ">
        <h1 class="col-8 ml-1 mb-4">All Published Ads</h1>            
      </div>
      <div class="row content-title mT-60 visible-user visible-company" ng-show="user.role =='user' || user.role =='company' ">
          <h1 class="col-8 ml-1 mb-4">Your Ads</h1>            
        </div>
      <div class=" gap-20 masonry pos-r"> <!-- #content container ===== -->
        <div class="masonry-sizer col-md-6"></div>

--- 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: '/' 
        }); 
--- a/src/assets/scripts/company-detail/company-detail.html
+++ b/src/assets/scripts/company-detail/company-detail.html
@ -0,0 +1,113 @@
 <main class='main-content bgc-grey-300'>
        <div id='mainContent row'>
          <div class="content-title mT-60">
            <div class="ml-1 mb-3">
              Company's Profile
            </div>
          </div>
      
          <div class=" gap-30 masonry pos-r">
            <!-- #content container ===== -->
            <div class="masonry-sizer col-md-6"></div>
      
            <!-- #company profile ========= -->
            <div class="masonry-item  w-100  visible-admin visible-nomit visible-referee visible-user" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee' || profile.role =='user' ">
              <div class="card item-box">
                <div class="user-data-title">
                  <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
                  <div class="testo">
                    <h5>Leonardo</h5> A global high-tech company and one of the key players in Aerospace, Defence and
                    Security
                  </div>
                </div>
                <div class="card-body-profile">
                  <div class="profile-forms">
      
                    <div class="row ">
                      <div class="col-4 profile-form-row">
                        <h9 class="">Name</h9>
                        <input type="text" class="form-control" placeholder="Leonardo" value="" disabled>
                      </div>
                      <div class="col-4 profile-form-row">
                        <h9 class="">Business Type</h9>
                        <input type="text" class="form-control" placeholder="Technological Innovation" value="" disabled>
                      </div>
                      <div class="col-4 profile-form-row">
                        <h9 class="">ABN</h9>
                        <input type="text" class="form-control" placeholder="Last name" value="66 942 977 659" disabled>
                      </div>
                    </div>
      
                    <div class="row ">
                      <div class="col-4 profile-form-row">
                        <h9 class="">Email Address</h9>
                        <input type="text" class="form-control" placeholder="Email" value="ir@leonardocompany" disabled>
                      </div>
                      <div class="col-4 profile-form-row">
                        <h9 class="">Phone Number</h9>
                        <input type="text" class="form-control" placeholder="Phone" value="+39 06.324731" disabled>
                      </div>
                      <div class="col-4 profile-form-row">
                        <h9 class="">Website</h9>
                        <input type="text" class="form-control" placeholder="Phone" value="https://www.leonardocompany.com" disabled>
                      </div>
                    </div>
      
      
                    <div class="row">
                      <div class="form-group col-md-4 profile-form-row">
                        <h9 class="">Address</h9>
                        <input type="text" class="form-control" id="inputAddress" placeholder="Piazza Monte Grappa, 4" disabled>
                      </div>
                      <div class="form-group col-md-4 profile-form-row">
                        <h9 class="">City</h9>
                        <input type="text" class="form-control" id="inputCity0" placeholder="Roma" disabled>
                      </div>
                      <div class="form-group col-md-2 profile-form-row">
                        <h9 class="">State</h9>
                        <input type="text" class="form-control" id="validationCustom04" placeholder="Italia" disabled>
                      </div>
                      <div class="form-group col-md-2 profile-form-row">
                        <h9 class="">Zip</h9>
                        <input type="text" class="form-control" id="inputZip" placeholder="00195" disabled>
                      </div>
                    </div>
      
                    <div class="row">
                      <div class="col-12 profile-form-row">
                        <h9 class="">Description</h9>
                        <textarea id="description" class="company-description" name="story" rows="5" disabled>We constantly explore new ideas to turn them into new technologies that improve our world and design the future one. We invest in research and development to provide sustainable and competitive solutions. Wherever defence and security are needed:  land, sea, sky, Space and cyberspace.
                              </textarea>
                      </div>
                    </div>
                    <div class="row ">
                      <div class="col-3 profile-form-row">
                        <h9 class="">Twitter</h9>
                        <input type="text" class="form-control" placeholder="Facebook" value="https://twitter.com/leonardo_it" disabled>
                      </div>
                      <div class="col-3 profile-form-row">
                        <h9 class="">Facebook</h9>
                        <input type="text" class="form-control" placeholder="Facebook" value="https://www.facebook.com/Leonardo-Company-473417172849580/" disabled>
                      </div>
                      <div class="col-3 profile-form-row">
                        <h9 class="">Instagram</h9>
                        <input type="text" class="form-control" placeholder="Instagram" value="https://www.instagram.com/leonardo_company/?hl=it" disabled>
                      </div>
                      <div class="col-3 profile-form-row">
                        <h9 class="">Linkedin</h9>
                        <input type="text" class="form-control" placeholder="Linkedin" value="https://www.linkedin.com/company/drs-defense-solutions-llc/life/" disabled>
                      </div>
                    </div>
      
                  </div>
                </div>
              </div>
            </div>
      
          </div>
          <!--content container-->
        </div>
        <!--page container-->
      
      </main>
      
--- 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);
    //.factory(HistoryService.name, HistoryService);
--- 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';
--- a/src/assets/scripts/profile/profile.html
+++ b/src/assets/scripts/profile/profile.html
@ -314,7 +314,7 @@
      </div>

      <!-- #nomit profile ========= -->
      <div class="masonry-item w-100 visible-nomit" ng-show="{{profile.role}} =='nomit'">
      <div class="masonry-item w-100 visible-nomit" ng-show="profile.role =='nomit'">
        <div class="card item-box">
          <div class="user-data-title">
            <img class="user-update-img" src="assets/static/images/nomit-logo.png" alt="">
@ -412,7 +412,7 @@
      </div>

      <!-- #referee profile ========= -->
      <div class="masonry-item w-100 visible-nomit" ng-show="'{{profile.role}}' =='nomit'">
      <div class="masonry-item w-100 visible-nomit" ng-show="'profile.role' =='nomit'">
        <div class="card item-box">
          <div class="user-data-title">
            <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
@ -528,7 +528,7 @@
                  <input type="password" class="form-control" placeholder="New Password" required>
                </div>
                <div class="col-4 profile-form-row">
                  <h9 class="">Confirm New urrent Password</h9>
                  <h9 class="">Confirm New Password</h9>
                  <input type="password" class="form-control" placeholder="New Password" required>

                </div>
--- a/src/assets/scripts/reports/index.js
+++ 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);
--- a/src/assets/scripts/reports/reports.controller.js
+++ 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;
--- a/src/assets/scripts/reports/reports.html
+++ b/src/assets/scripts/reports/reports.html
@ -0,0 +1,349 @@
 <main class='main-content'>
  <div id='mainContent row'>
    <div class="row content-title mT-60">
      <h1 class="col-8 ml-1 mb-3">
        Reports
      </h1>
    </div>
    <!-- ### Table 1 ### -->
    <h5>All Applications (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">Position</th>
          <th scope="col">Company</th>
          <th scope="col">Industry</th>
          <th scope="col">Submitted By (ID)</th>
          <th scope="col">Submission Date</th>
          <th scope="col">Application Status</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Graphic Design Intern</a></td>
          <td>Sierra Delta Creative</td>
          <td>Design</td>
          <td>davidchan</td>
          <td>07 Jan 2019</td>
          <td>
            <div class="btn btn-outline-success btn-sm" data-toggle="tooltip" data-placement="right" title="Application is still open">
              ON
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Barista Intern</a></td>
          <td>Brunetti</td>
          <td>Hospitality</td>
          <td>jenniferbrown</td>
          <td>21 Jan 2019</td>
          <td>
            <div class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="right" title="Application has expired">
              OFF
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Web Developer Intern</a></td>
          <td>Agile Talent</td>
          <td>IT / Software Engineering</td>
          <td>christhomson</td>
          <td>23 Jan 2019</td>
          <td>
            <div class="btn btn-outline-info btn-sm" data-toggle="tooltip" data-placement="right" title="Application is closed">
              CLOSED
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">4</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Kitchen Hand Intern</a></td>
          <td>Yarra River Grill</td>
          <td>Hospitality</td>
          <td>johndoe</td>
          <td>25 Jan 2019</td>
          <td>
            <div class="btn btn-outline-danger btn-sm" data-toggle="tooltip" data-placement="right" title="This job listing is removed">
              CANCELLED
            </div>
          </td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Table 2 ### -->
    <h5>New Registered Users (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">First Name</th>
          <th scope="col">Last Name</th>
          <th scope="col">Username</th>
          <th scope="col">Industry</th>
          <th scope="col">Member Since</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
          </td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Table 3 ### -->
    <h5>New Ads (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">Position</th>
          <th scope="col">Company</th>
          <th scope="col">Industry</th>
          <th scope="col">Posted Date</th>
          <th scope="col">Application Status</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Graphic Design Intern</a></td>
          <td>Sierra Delta Creative</td>
          <td>Design</td>
          <td>07 Jan 2019</td>
          <td>
            <div class="btn btn-outline-success btn-sm" data-toggle="tooltip" data-placement="right" title="Application is still open">
              ON
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Barista Intern</a></td>
          <td>Brunetti</td>
          <td>Hospitality</td>
          <td>21 Jan 2019</td>
          <td>
            <div class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="right" title="Application has expired">
              OFF
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Web Developer Intern</a></td>
          <td>Agile Talent</td>
          <td>IT / Software Engineering</td>
          <td>23 Jan 2019</td>
          <td>
            <div class="btn btn-outline-info btn-sm" data-toggle="tooltip" data-placement="right" title="Application is closed">
              CLOSED
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">4</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Kitchen Hand Intern</a></td>
          <td>Yarra River Grill</td>
          <td>Hospitality</td>
          <td>25 Jan 2019</td>
          <td>
            <div class="btn btn-outline-danger btn-sm" data-toggle="tooltip" data-placement="right" title="This job listing is removed">
              CANCELLED
            </div>
          </td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Table 4 ### -->
    <h5>Successful Matches (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">Position</th>
          <th scope="col">Company</th>
          <th scope="col">Industry</th>
          <th scope="col">Matched User(ID)</th>
          <th scope="col">Matched Date</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Graphic Design Intern</a></td>
          <td>Sierra Delta Creative</td>
          <td>Design</td>
          <td>davidchan</td>
          <td>07 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Barista Intern</a></td>
          <td>Brunetti</td>
          <td>Hospitality</td>
          <td>jenniferbrown</td>
          <td>21 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Web Developer Intern</a></td>
          <td>Agile Talent</td>
          <td>IT / Software Engineering</td>
          <td>christhomson</td>
          <td>23 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">4</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Kitchen Hand Intern</a></td>
          <td>Yarra River Grill</td>
          <td>Hospitality</td>
          <td>johndoe</td>
          <td>25 Jan 2019</td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Table 5 ### -->
    <h5>Unmatched Users (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">First Name</th>
          <th scope="col">Last Name</th>
          <th scope="col">Username</th>
          <th scope="col">Industry</th>
          <th scope="col">Member Since</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td>David</td>
          <td>Chan</td>
          <td>davidchan</td>
          <td>Design(Graphic, digital, textile, UX/UI)</td>
          <td>21 Jan 2019</td>
          </td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Table 6 ### -->
    <h5>Unmatched Ads (Last month)</h5>
    <table class="table table-hover mb-30 ml-1">
      <thead class="thead-purple-border">
        <tr>
          <th scope="col">#</th>
          <th scope="col">Position</th>
          <th scope="col">Company</th>
          <th scope="col">Industry</th>
          <th scope="col">Posted Date</th>
          <th scope="col">Application Status</th>
        </tr>
      </thead>
      <tbody>
        <tr>
          <th scope="row">1</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Graphic Design Intern</a></td>
          <td>Sierra Delta Creative</td>
          <td>Design</td>
          <td>07 Jan 2019</td>
          <td>
            <div class="btn btn-outline-success btn-sm" data-toggle="tooltip" data-placement="right" title="Application is still open">
              ON
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">2</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Barista Intern</a></td>
          <td>Brunetti</td>
          <td>Hospitality</td>
          <td>21 Jan 2019</td>
          <td>
            <div class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="right" title="Application has expired">
              OFF
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">3</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Web Developer Intern</a></td>
          <td>Agile Talent</td>
          <td>IT / Software Engineering</td>
          <td>23 Jan 2019</td>
          <td>
            <div class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="right" title="Application has expired">
              OFF
            </div>
          </td>
        </tr>
        <tr>
          <th scope="row">4</th>
          <td style="text-decoration:underline"><a href="ads_1.html">Kitchen Hand Intern</a></td>
          <td>Yarra River Grill</td>
          <td>Hospitality</td>
          <td>25 Jan 2019</td>
          <td>
            <div class="btn btn-outline-success btn-sm" data-toggle="tooltip" data-placement="right" title="Application is still open">
              ON
            </div>
          </td>
        </tr>
      </tbody>
    </table> <!-- End of table-->

    <!-- ### Buttons ### -->
    <div class="masonry-item  w-50 m-auto btn-centered-container ">
      <button type="button" href="src/assets/scripts/dashboard/dashboard.html" class="col-5 mr-1 btn btn-gradient btn-centered">Go
        to Dashboard</button>
      <button type="button" class="col-5 ml-1 btn btn-border  btn-centered" onclick="myFunction()">Print Report</button>
    </div>

  </div>
 </main>
--- a/src/assets/scripts/user-details/user-details.html
+++ b/src/assets/scripts/user-details/user-details.html
@ -0,0 +1,185 @@
 <main class='main-content bgc-grey-300'>
    <div id='mainContent row'>
      <div class="content-title mT-60">
        <div class="ml-1 mb-3">
          User's Profile
        </div>
      </div>
  
      <div class=" gap-30 masonry pos-r">
        <!-- #content container ===== -->
        <div class="masonry-sizer col-md-6"></div>
  
  
        <!-- #user profile ========= -->
        <div class="masonry-item  w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee' || profile.role =='company' ">
  
          <div class="card item-box">
            <div class="user-data-title">
              <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
              <div class="testo">
                <h5>{{ profile.fullname }}</h5> Bla Bla, this is your bio or whatever!
              </div>
            </div>
            <div class="card-body-profile">
              <div class="profile-forms">
                <h5 class="card-title d-flex text-black-bold"> Your Profile</h5>
  
                <div class="row ">
                  <div class="col-4 profile-form-row">
                    <h9 class="">First Name</h9>
                    <input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="Francesca" disabled>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Middle Name</h9>
                    <input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="" disabled>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Last Name</h9>
                    <input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="Sperati" disabled>
                  </div>
                </div>
  
                <div class="row ">
                  <div class="col-4 profile-form-row">
                    <h9 class="">Email Address</h9>
                    <input type="text" class="form-control" placeholder="Email" value="{{ profile.email }}" disabled>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Phone Number</h9>
                    <input type="text" class="form-control" placeholder="Phone" value="{{ profile.fullname }}" disabled>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">State</h9>
                    <select id="inputState" class="form-control" disabled>
                      <option selected>VIC</option>
                      <option>SA</option>
                      <option>WA</option>
                      <option>NSW</option>
                      <option>QLD</option>
                      <option>TAS</option>
                    </select>
                  </div>
                </div>
  
                <div class="row ">
                  <div class="col-4 profile-form-row">
                    <h9 class="">Nationality</h9>
                    <select id="inputNationality" class="form-control" disabled>
                      <option selected>Italian</option>
                      <option>...</option>
                    </select>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Visa Type</h9>
                    <select id="inputVisa" class="form-control" ng-model="user.role" ng-options="visa.name group by visa.type for visa in visas" disabled>
                      <option value="" selected>Choose visa...</option>
                    </select>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Language (Select one or more)</h9>
                    <select id="inputLanguage" class="form-control" disabled>
                      <option selected>English</option>
                      <option>...</option>
                    </select>
                  </div>
                </div>
  
                <div class="row ">
                    <div class="col-4 profile-form-row">
                      <h9 class="">Education</h9>
                      <select class="form-control" disabled>
                        <option selected>Diploma</option>
                        <option>Degree</option>
                        <option>...</option>
                      </select>
                    </div>
                  </div>  
  
                     
                    <div class="row profile-form-row">
                      <div class="mt-4">
                        <h5 class="card-title mt-4 ml-4 mr-4">Main Classification:</h5>
                        <div class=" ml-4 mb-4 btn btn-industry mt-4">Graphic Design</div>
                        <h5 class="card-title mt-4 ml-4 mr-4">Skills:</h5>
                        <div class="ml-1 mb-4 btn btn-skills">Adobe Creaetive CC</div>
                        <div class="ml-1 mb-4 btn btn-skills">Illustration</div>
                      </div>
                    </div>
                    
              </div>
            </div>
          </div>
        </div>
  
        <!-- #extra info for nomit and referees ========= -->
        <div class="masonry-item  w-100 visible-admin visible-nomit visible-referee" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee'">
          <div class="card item-box">
  
            <div class="card-body-profile">
              <div class="profile-forms">
                <h5 class="card-title d-flex text-black-bold">Help NOMIT collecting more data: your information
                  won't be visible!!</h5>
  
                <div class="row ">
                  <div class="col-4 profile-form-row">
                    <h9 class="">Birthdate</h9>
                    <div class="timepicker-input input-icon form-group">
                      <div class="input-group">
                        <div class="input-group-addon bgc-white bd bdwR-0">
                          <i class="ti-calendar"></i>
                        </div>
                        <input type="text" class="form-control bdc-grey-200 start-date" placeholder="Date of Birth"
                          data-provide="datepicker" disabled>
                      </div>
                    </div>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Gender</h9>
                    <select id="inputGender" class="form-control" disabled>
                      <option selected>Male</option>
                      <option>Female</option>
                    </select>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">City of Birth</h9>
                    <input type="text" class="form-control" id="inputCity" disabled>
                  </div>
                </div>
  
                <div class="row ">
                  <div class="col-4 profile-form-row">
                    <h9 class="">Arriving in Australia</h9>
                    <div class="timepicker-input input-icon form-group">
                      <div class="input-group">
                        <div class="input-group-addon bgc-white bd bdwR-0">
                          <i class="ti-calendar"></i>
                        </div>
                        <input type="text" class="form-control bdc-grey-200 start-date" placeholder="Date of Arrive"
                          data-provide="datepicker" disabled>
  
                      </div>
                    </div>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Reason for leaving</h9>
                    <textarea id="leaving" name="story" rows="5" disabled>Tell us something about your old life...</textarea>
                  </div>
                  <div class="col-4 profile-form-row">
                    <h9 class="">Reason for staying in Australia</h9>
                    <textarea id="staying" name="story" rows="5" disabled>Tell us something about your new life...</textarea>
                  </div>
                </div>
  
              </div>
            </div>
          </div>
        </div>
  
      </div>
      <!--content container-->
    </div>
    <!--page container-->
  
  </main>
  
--- 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();
--- a/src/assets/scripts/users/users.html
+++ b/src/assets/scripts/users/users.html
@ -8,19 +8,18 @@
      <!-- #content container ===== -->
      <div class="masonry-sizer col-md-6"></div>

      <div class="masonry-item w-50" ng-repeat="user in users">
      <div class="masonry-item w-50" ng-repeat="u in users">
        <!-- #first user ========= -->
        <div class="card item-box">
          <div class="user-data-title container">
            <img class="user-card-img rounded-circle" src="https://www.monmouth.edu/university-advancement/wp-content/uploads/sites/237/2018/08/person-placeholder.jpg"
              alt="">
            <img id="user{{$index}}" class="user-card-img rounded-circle" ng-src="{{avatar($index)}}" alt="" />
            <div class="user-card-col">
              <div class="user-card-title">{{user.fullname}}</div>
              <div class=" text-size-11">Victoria</div>
              <div class=" text-size-11">Mobile: 0414987654</div>
              <a href="#" id="user-action-fill">view user profile</a>
              <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban
                user</a>
              <div class="user-card-title">{{u.personal.first_name}} {{u.personal.last_name}}</div>
              <div class=" text-size-11">{{u.personal.city}}</div>
              <div class=" text-size-11">{{u.personal.phone}}</div>
              <a href="#!user-details" id="user-action-fill">view user profile</a>
              <a href="#" class="visible-nomit visible-referee visible-admin" ng-show="user.role =='nomit' || user.role =='referee' || user.role =='admin'" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">
                ban user</a>
            </div>
          </div>
          <div class="card-body p-0">