Merge pull request #484 from timeoff-management/tom-xxx-fix-sorting-i…

…ssues

Fix issues with sorting

README.md

@@ -146,3 +146,4 @@ By default the value is `en` (English). One can override it with other locales s
 
 Please report any issues or feedback to <a href="https://twitter.com/FreeTimeOffApp">twitter</a> or Email: pavlo at timeoff.management
 
+

lib/model/Report.js

@@ -89,6 +89,7 @@ const leaveIntoObject = (leave) => {
     id: leave.id,
     employeeId: leave.userId,
     employeeFullName: (leave.user ? leave.user.full_name() : 'N/A'),
+    employeeLastName: (leave.user ? leave.user.lastname : 'N/A'),
     departmentId: (leave.user ? leave.user.departmentId : null),
     departmentName: (leave.user && leave.user.department ? leave.user.department.name : 'N/A'),
     typeId: leave.leaveTypeId,

lib/route/departments.js

@@ -1,6 +1,8 @@
 
 "use strict";
 
+const { sorter } = require('../util');
+
 const express = require('express'),
     router    = express.Router(),
     validator = require('validator'),
@@ -94,13 +96,12 @@ router.get('/departments/', function(req, res){
     company_for_template = company;
     return company.getDepartments({
       scope : ['with_simple_users', 'with_boss'],
-      order : [[ model.Department.default_order_field() ]],
     });
   })
   .then(function(departments){
     res.render('departments_overview', {
       title             : 'Departments settings',
-      departments       : departments,
+      departments       : departments.sort((a, b) => sorter(a.name, b.name)),
       allowance_options : generate_all_department_allowances(),
       company           : company_for_template,
     });

lib/route/reports.js

@@ -205,7 +205,7 @@ const renderLeavesReportAsCsv = async ({res, company, startDate, endDate, leaves
 
 const defaultSortAttributeForLeaveReport = 'employeeFullName';
 const sortersForLeavesReport = {
-  employeeFullName: (a,b) => sorter(a.employeeFullName, b.employeeFullName),
+  employeeFullName: (a,b) => sorter(a.employeeLastName, b.employeeLastName),
   departmentName: (a,b) => sorter(a.departmentName, b.departmentName),
   type: (a,b) => sorter(a.type, b.type),
   startDate: (a,b) => moment.utc(a.startDate).toDate().valueOf() - moment.utc(b.startDate).toDate().valueOf(),

lib/route/users/index.js

@@ -28,6 +28,7 @@ router.get('/add/', function(req, res){
     .then(function(company){
       res.render('user_add', {
         company : company,
+        departments: company.departments.sort((a, b) => sorter(a.name, b.name)),
       });
     });
 });
@@ -239,6 +240,7 @@ router.get('/edit/:user_id/', function(req, res){
           company       : company,
           employee      : employee,
           show_main_tab : true,
+          departments: company.departments.sort((a, b) => sorter(a.name, b.name)),
         });
       });
   })
@@ -805,7 +807,7 @@ router.get('/', function(req, res) {
         })
         // stick departments to company as well
         .then(function(departments){
-          company.departments = departments;
+          company.departments = departments.sort((a,b) => sorter(a.name, b.name));
           return Promise.resolve(company);
         })
     })
@@ -906,7 +908,7 @@ function promise_user_list_data_for_rendering(args) {
   }));
 
   const sortedUsersInfoForRendering = usersInfoForRendering
-    .sort((a, b) => sorter(a.user_full_name, b.user_full_name));
+    .sort((a, b) => sorter(a.user_lastname, b.user_lastname));
 
   return Promise.resolve([company, sortedUsersInfoForRendering]);
 }

views/partials/user_details/general.hbs

@@ -24,7 +24,7 @@
   <div class="form-group">
     <label for="select_inp" class="control-label">Department</label>
     <select class="form-control" id="select_inp" name="department" aria-describedby="department_help">
-      {{#each company.departments}}
+      {{#each departments}}
           <option value="{{this.id}}" {{#if_equal ../employee.DepartmentId this.id}} selected="selected"{{/if_equal}}>{{this.name}} (approver {{this.boss.name}} {{this.boss.lastname}})</option>
       {{/each}}
     </select>

views/user_add.hbs

@@ -56,7 +56,7 @@
         <label for="select_inp" class="col-md-3 control-label">Department</label>
         <div class="col-md-3">
           <select class="form-control" id="select_inp" name="department" aria-describedby="department_help">
-            {{#each company.departments}}
+            {{#each departments}}
                 <option value="{{this.id}}" data-vpp="{{@index}}">{{this.name}}</option>
             {{/each}}
           </select>