Merge pull request #485 from timeoff-management/tom-xxx-leave-type-sorting

Fix issues with sorting of leave types

Author: vpp

README.md

@@ -146,4 +146,3 @@ 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/db/company.js

@@ -7,6 +7,7 @@ const
   moment_tz = require('moment-timezone'),
   _         = require('underscore'),
   uuidv4    = require('uuid/v4');
+const { sorter } = require("../../util");
 
 
 module.exports = function(sequelize, DataTypes) {
@@ -413,6 +414,14 @@ module.exports = function(sequelize, DataTypes) {
         return this.mode === Company.get_mode_readonly_holidays();
       },
 
+      getSortedLeaveTypes: function() {
+        const self = this;
+
+        const leaveTypes = self.leave_types || [];
+
+        return leaveTypes.sort((a, b) => sorter(a.name, b.name));
+      },
+
     }
   });
 

lib/model/mixin/user/company_aware.js

@@ -14,6 +14,8 @@ var
   Promise = require("bluebird"),
   moment  = require('moment');
 
+const { sorter } = require("../../../util");
+
 module.exports = function(sequelize){
 
   /* Fetch company object associated with current user, the company object
@@ -130,17 +132,15 @@ module.exports = function(sequelize){
   };
 
 
-  this.get_company_with_all_leave_types = function() {
-    return this.getCompany({
-      include : [{
-        model : sequelize.models.LeaveType,
-        as    : 'leave_types',
-      }],
-      order : [
-        [{ model : sequelize.models.LeaveType, as : 'leave_types' }, 'sort_order', 'DESC'],
-        [{ model : sequelize.models.LeaveType, as : 'leave_types' }, 'name']
-      ]
+  this.get_company_with_all_leave_types = async function() {
+    const company = await this.getCompany({
+      scope: ['with_leave_types'],
     });
+
+    company.leave_types = company.leave_types
+      .sort((a, b) => b.sort_order - a.sort_order || sorter(a.name, b.name));
+
+    return company;
   };
 
 };

lib/route/calendar.js

@@ -21,11 +21,12 @@ router.post('/bookleave/', function(req, res){
       req.user.promise_users_I_can_manage(),
       req.user.get_company_with_all_leave_types(),
       Promise.try( () => get_and_validate_leave_params({req})),
-      (users, company, valide_attributes) => {
+      (users, company, valid_attributes) => {
 
         // Make sure that indexes submitted map to existing objects
-        var employee = users[valide_attributes.user] || req.user,
-          leave_type = company.leave_types[valide_attributes.leave_type];
+        const employee = users[valid_attributes.user] || req.user;
+        const [leave_type] = company.leave_types
+          .filter(lt => `${lt.id}` === `${valid_attributes.leave_type}`);
 
         if (!employee) {
           req.session.flash_error('Incorrect employee');
@@ -48,7 +49,7 @@ router.post('/bookleave/', function(req, res){
         return createNewLeave({
           for_employee    : employee,
           of_type         : leave_type,
-          with_parameters : valide_attributes,
+          with_parameters : valid_attributes,
         });
       }
     )

lib/route/settings.js

@@ -21,13 +21,13 @@ const
 
 const
   CompanyExporter = require('../model/company/exporter');
+const { sorter } = require('../util');
 
 // Make sure that current user is authorized to deal with settings
 router.all(/.*/, require('../middleware/ensure_user_is_admin'));
 
 
-router.get('/general/', function(req, res){
-
+router.get('/general/', async (req, res) => {
   res.locals.custom_java_script.push(
     '/js/settings_general.js'
   );
@@ -36,31 +36,21 @@ router.get('/general/', function(req, res){
     '/css/bootstrap-datepicker3.standalone.css'
   );
 
-  var model = req.app.get('db_model');
-  var company;
-
-  req.user.getCompany({
-    include : [
-      { model : model.LeaveType, as : 'leave_types' },
-    ],
-    order : [
-      [{model: model.LeaveType, as : 'leave_types'}, 'name' ],
-    ],
-  })
-  .then(function(c){
-    company = c;
-    return company.promise_schedule();
-  })
-  .then(function(schedule){
-    res.render('general_settings', {
-      company   : company,
-      schedule  : schedule,
-      countries : config.get('countries'),
-      timezones_available : moment_tz.tz.names(),
-      carryOverOptions : getAvailableCarriedOverOptions(),
-      yearCurrent: moment.utc().year(),
-      yearPrev: moment.utc().add(-1, 'y').year(),
-    });
+  const company = await req.user.getCompany({
+    scope: ['with_leave_types'],
+  });
+
+  const schedule = await company.promise_schedule();
+
+  res.render('general_settings', {
+    company,
+    schedule,
+    countries: config.get('countries'),
+    timezones_available: moment_tz.tz.names(),
+    carryOverOptions: getAvailableCarriedOverOptions(),
+    yearCurrent: moment.utc().year(),
+    yearPrev: moment.utc().add(-1, 'y').year(),
+    leave_types: company.leave_types.sort((a, b) => sorter(a.name, b.name)),
   });
 });
 

public/js/global.js

@@ -219,40 +219,58 @@ $(document).ready(function(){
 });
 
 $(document).ready(function() {
-  if (typeof($.ajax) === 'function') {
-    $.ajax({
-      url: '/api/v1/notifications/',
-      success: function(args){
-        const error = args.error;
-        const data = args.data;
-
-        if (error) {
-          console.log('Failed to fetch notifications');
-          return;
-        }
-
-        if (!data || !data.length) {
-          return;
+  const fetchNotifications = () => {
+    if (typeof($.ajax) === 'function') {
+      $.ajax({
+        url: '/api/v1/notifications/',
+        success: function(args){
+          const error = args.error;
+          const data = args.data;
+
+          if (error) {
+            console.log('Failed to fetch notifications');
+            return;
+          }
+
+          const dropDown = $('#header-notification-dropdown ul.dropdown-menu');
+          const badge = $('#header-notification-dropdown .notification-badge');
+
+          if (!data || !data.length) {
+            badge.addClass('hidden');
+            dropDown.empty();
+            dropDown.append('<li class="dropdown-header">No notifications</li>')
+
+            document.title = document.title.replace(/\(\d+\)\s*/, '');
+
+            return;
+          }
+
+          const numberOfNotifications = data
+            .map(function(d) {return d.numberOfRequests})
+            .reduce(function(acc, it){ return acc + it}, 0)
+
+          badge.removeClass('hidden').html(numberOfNotifications);
+
+          if (!document.title.startsWith('(')) {
+            document.title = '(' + numberOfNotifications + ') ' + document.title;
+          } else {
+            document.title = document.title.replace(/\(\d+\)/, '('+numberOfNotifications+')');
+          }
+
+          dropDown.empty();
+
+          for (var i=0; i<data.length; i++) {
+            const notification = data[i];
+            dropDown.append(
+              '<li><a href="'+notification.link+'">'+notification.label+'</a></li>'
+            );
+          }
         }
+      });
+    }
 
-        $('#header-notification-dropdown .notification-badge')
-          .removeClass('hidden')
-          .html(
-            data
-              .map(function(d) {return d.numberOfRequests})
-              .reduce(function(acc, it){ return acc + it}, 0)
-          );
-
-        const dropDown = $('#header-notification-dropdown ul.dropdown-menu');
-        dropDown.empty();
-
-        for (var i=0; i<data.length; i++) {
-          const notification = data[i];
-          dropDown.append(
-            '<li><a href="'+notification.link+'">'+notification.label+'</a></li>'
-          );
-        }
-      }
-    });
+    setTimeout(fetchNotifications, 30 * 1000);
   }
+
+  fetchNotifications();
 });

t/integration/leave_request/rendering_of_halves.js

@@ -18,6 +18,7 @@ var test             = require('selenium-webdriver/testing'),
     check_elements_func    = require('../../lib/check_elements'),
     add_new_user_func      = require('../../lib/add_new_user');
 
+
 describe('Ensure that leaves with not full days are rendered properly', function(){
 
   this.timeout( config.get_execution_timeout() );
@@ -195,7 +196,7 @@ describe('Ensure that leaves with not full days are rendered properly', function
             value : '2015-06-11',
           },{
             selector : 'select[name="leave_type"]',
-            option_selector : 'option[value="1"]',
+            option_selector : 'option[data-tom-index="1"]',
           }],
           message : /New leave request was added/,
         })

t/integration/leave_type/crud_leave_type.js

@@ -339,7 +339,7 @@ describe('CRUD for leave types', function(){
       .findElements(By.css('select#leave_type option'))
       .then(options => Bluebird.map(options, option => {
         let option_info = {};
-        return option.getAttribute('value')
+        return option.getAttribute('data-tom-index')
           .then(val => Bluebird.resolve(option_info.value = val))
           .then(() => option.getAttribute('data-tom'))
           .then(txt => Bluebird.resolve(option_info.text = txt))
@@ -396,7 +396,7 @@ describe('CRUD for leave types', function(){
       .findElements(By.css('select#leave_type option'))
       .then(options => Bluebird.map(options, option => {
         let option_info = {};
-        return option.getAttribute('value')
+        return option.getAttribute('data-tom-index')
           .then(val => Bluebird.resolve(option_info.value = val))
           .then(() => option.getAttribute('data-tom'))
           .then(txt => Bluebird.resolve(option_info.text = txt))

t/integration/leave_type/remove_used_leave_type.js

@@ -112,7 +112,7 @@ describe('Try to remove used leave type', function(){
             option_selector : 'option[value="2"]',
           },{
             selector : 'select[name="leave_type"]',
-            option_selector : 'option[value="0"]',
+            option_selector : 'option[data-tom-index="0"]',
           },{
             selector : 'input#from',
             value : '2015-06-15',

views/general_settings.hbs

@@ -202,13 +202,13 @@
         <form id="delete_leavetype_form" method="post" action="/settings/leavetypes/delete/"></form>
         <form id="leave_type_edit_form" method="post" action="/settings/leavetypes/">
 
-        {{#unless company.leave_types.length }}
+        {{#unless leave_types.length }}
         <div class="row">
           <div class="col-md-4">No Leave type records</div>
         </div>
         {{/unless}}
 
-        {{#each company.leave_types}}
+        {{#each leave_types}}
         <div class="row">
           <div class="col-md-6">
 

views/partials/book_leave_modal.hbs

@@ -23,8 +23,8 @@
           <div class="form-group">
             <label for="leave_type" class="control-label">Leave type:</label>
             <select class="form-control" id="leave_type" name="leave_type">
-            {{# each logged_user.company.leave_types}}
-                <option value={{@index}} data-tom="{{this.name}}">{{this.name}}</option>
+            {{#each logged_user.company.leave_types }}
+              <option value={{this.id}} data-tom="{{this.name}}" data-tom-index={{@index}}>{{this.name}}</option>
             {{/each}}
             </select>
           </div>