Merge branch 'tom-184__vpp__team_view_absence_summary'

Author: vpp

lib/model/db/leave_type.js

@@ -43,6 +43,7 @@ module.exports = function(sequelize, DataTypes) {
                         color : '#459FF3',
                         companyId : company.id,
                         limit : 10,
+                        use_allowance : 0,
                     },
                 ])
             },

lib/model/team_view.js

@@ -1,9 +1,11 @@
 
 'use strict';
 
-var moment = require('moment'),
-Promise    = require('bluebird'),
-_          = require('underscore');
+const
+  moment  = require('moment'),
+  Promise = require('bluebird'),
+  Joi     = require('joi'),
+  _       = require('underscore');
 
 function TeamView(args) {
   var me = this;
@@ -87,4 +89,114 @@ TeamView.prototype.promise_team_view_details = function(args){
 
 };
 
+// Experimenting with parameter validation done with Joi.js
+const inject_statistics_args_schema = Joi.object()
+  .keys({
+    leave_types : Joi.array().items(
+      Joi.object().keys({
+        id            : Joi.number().required(),
+        use_allowance : Joi.boolean().required(),
+      })
+    ),
+    team_view_details : Joi.object().required().keys({
+      users_and_leaves : Joi.array().required().items(
+        Joi.object().keys()
+      )
+    }),
+  });
+
+/*
+ * Takes "team view details" and enrich them with statistics about absences
+ * each employee has for given month
+ *
+ * */
+
+TeamView.prototype.inject_statistics = function(args){
+
+  // Validate parameters
+  let param_validation = Joi.validate(args, inject_statistics_args_schema, { allowUnknown : true });
+  if (param_validation.error) {
+    console.log('An error occured when trying to validate args in inject_statistics.');
+    console.dir(param_validation.error);
+    throw new Error('Failed to validate parameters in TeamView.inject_statistics');
+  }
+
+  let
+    team_view_details = args.team_view_details,
+    leave_types = args.leave_types || [];
+
+  // Convert leave types array into look-up map
+  let leave_types_map = {};
+  leave_types.forEach( lt => leave_types_map[lt.id] = lt );
+
+
+  team_view_details
+    .users_and_leaves
+    .forEach(node => {
+
+      let deducted_days = 0;
+
+      node
+        .days
+        // Consider only those days that have any leave objects
+        .filter( day => !! day.leave_obj )
+        // Ignore those days which were not approved yet
+        .filter( day => !! day.leave_obj.is_approved_leave() )
+        // Ignore weekends
+        .filter( day => ! day.is_weekend )
+        // Ignore bank holidays
+        .filter( day => ! day.is_bank_holiday )
+        .forEach( day => {
+          let leave_type = leave_types_map[  day.leave_obj.leaveTypeId ];
+
+          if (! (leave_type && leave_type.use_allowance)) {
+            return;
+          }
+
+          if (day.is_leave_afternoon && day.is_leave_morning){
+            deducted_days++;
+          } else {
+            deducted_days = deducted_days + 0.5;
+          }
+        });
+
+      let statistics = {
+        deducted_days : deducted_days,
+      };
+
+      node.statistics = statistics;
+    });
+
+  return Promise.resolve( team_view_details );
+};
+
+/*
+ *  Take "team view details" and user for whom them were generated
+ *  and ensure the details contain statisticts for only those employees
+ *  current user has access to.
+ *
+ * */
+
+TeamView.prototype.restrainStatisticsForUser = function(args){
+
+  // TODO Consider parameters validation in the same fashion as in inject_statistics method
+
+  let
+    team_view_details = args.team_view_details,
+    observer_user     = args.user;
+
+  let supervised_user_map = {};
+  observer_user.supervised_users.forEach( u => supervised_user_map[ u.id ] = u);
+
+  team_view_details
+    .users_and_leaves
+    .forEach(item => {
+      if (item.statistics && ! supervised_user_map[ item.user.id ]) {
+        delete item.statistics;
+      }
+    });
+
+  return Promise.resolve( team_view_details );
+};
+
 module.exports = TeamView;

lib/route/calendar.js

@@ -157,18 +157,38 @@ router.get('/teamview/', function(req, res){
       department_id : current_deparment_id,
     }),
     req.user.get_company_with_all_leave_types(),
-    function(team_view_details, company){
-
-      return res.render('team_view', {
-        base_date           : base_date,
-        prev_date           : moment(base_date).add(-1,'month'),
-        next_date           : moment(base_date).add(1,'month'),
-        users_and_leaves    : team_view_details.users_and_leaves,
-        related_departments : team_view_details.related_departments,
-        current_department  : team_view_details.current_department,
-        company             : company,
-      });
-
+    (team_view_details, company) => {
+      // Enrich "team view details" with statistics as how many deducted days each employee spent current month
+      team_view
+        .inject_statistics({
+          team_view_details : team_view_details,
+          leave_types       : company.leave_types,
+        })
+        .then( team_view_details => team_view.restrainStatisticsForUser({
+          team_view_details : team_view_details,
+          user              : req.user,
+        }))
+        .then(team_view_details => res.render('team_view', {
+            base_date           : base_date,
+            prev_date           : moment(base_date).add(-1,'month'),
+            next_date           : moment(base_date).add(1,'month'),
+            users_and_leaves    : team_view_details.users_and_leaves,
+            related_departments : team_view_details.related_departments,
+            current_department  : team_view_details.current_department,
+            company             : company,
+          })
+        );
+    })
+    .catch(error => {
+      console.error(
+        'An error occured when user '+req.user.id+
+        ' tried to access Teamview page: '+error
+      );
+      req.session.flash_error('Failed to access Teamview page. Please contact administrator.');
+      if (error.hasOwnProperty('user_message')) {
+        req.session.flash_error(error.user_message);
+      }
+      return res.redirect_with_session('/');
     });
 
 });

package.json

@@ -18,6 +18,7 @@
     "formidable": "~1.0.17",
     "html-to-text": "^3.2.0",
     "ical-generator": "^0.2.7",
+    "joi": "~12.0.0",
     "ldapauth-fork": "^2.5.2",
     "moment": "^2.11.2",
     "moment-timezone": "^0.5.10",

public/css/style.css

@@ -86,6 +86,14 @@ td.leave_cell_pended {
   padding-top: 5px;
   padding-bottom: 5px; }
 
+.team-view-users .user-name-cell {
+  text-overflow: ellipsis;
+  /* Cannot avoid specifying width with pixels... */
+  width: 165px;
+  white-space: nowrap;
+  overflow: hidden;
+  display: inline-block; }
+
 td.team-view-header {
   height: 43px; }
 
@@ -158,6 +166,7 @@ div.feeds-holder {
   body.modal-open {
     position: fixed; } }
 
+/* To be used for selected items in lists */
 .selected-item {
   background: #F5F7F8;
   font-weight: bolder; }

scss/main.scss

@@ -106,8 +106,17 @@ td.leave_cell_pended {
     max-width : 450px;
 }
 .team-view-users td {
-    padding-top    : 5px;
-    padding-bottom : 5px;
+  padding-top    : 5px;
+  padding-bottom : 5px;
+
+}
+.team-view-users .user-name-cell {
+  text-overflow: ellipsis;
+  /* Cannot avoid specifying width with pixels... */
+  width: 165px;
+  white-space: nowrap;
+  overflow: hidden;
+  display: inline-block;
 }
 td.team-view-header {
     height: 43px;

t/integration/crud_leave_type.js

@@ -76,7 +76,7 @@ describe('CRUD for leave types', function(){
       },{
         selector : leave_type_edit_form_id+' input[name="use_allowance__1"]',
         tick     : true,
-        value    : 'on',
+        value    : 'off',
       }],
     })
     .then(function(){ done() });
@@ -88,7 +88,7 @@ describe('CRUD for leave types', function(){
       form_params : [{
         selector : leave_type_edit_form_id+' input[name="use_allowance__1"]',
         tick     : true,
-        value    : 'off',
+        value    : 'on',
       }],
       should_be_successful : true,
       submit_button_selector : leave_type_edit_form_id+' button[type="submit"]',
@@ -106,7 +106,7 @@ describe('CRUD for leave types', function(){
         tick     : true,
       },{
         selector : leave_type_edit_form_id+' input[name="use_allowance__1"]',
-        value    : 'off',
+        value    : 'on',
         tick     : true,
       }],
     })

t/integration/basic_wall_chart.js renamed to t/integration/team_view/basic_wall_chart.js

@@ -8,13 +8,13 @@ var test                 = require('selenium-webdriver/testing'),
   Promise                = require("bluebird"),
   until                  = require('selenium-webdriver').until,
   _                      = require('underscore'),
-  register_new_user_func = require('../lib/register_new_user'),
-  login_user_func        = require('../lib/login_with_user'),
-  open_page_func         = require('../lib/open_page'),
-  submit_form_func       = require('../lib/submit_form'),
-  add_new_user_func      = require('../lib/add_new_user'),
-  logout_user_func       = require('../lib/logout_user'),
-  config                 = require('../lib/config'),
+  register_new_user_func = require('../../lib/register_new_user'),
+  login_user_func        = require('../../lib/login_with_user'),
+  open_page_func         = require('../../lib/open_page'),
+  submit_form_func       = require('../../lib/submit_form'),
+  add_new_user_func      = require('../../lib/add_new_user'),
+  logout_user_func       = require('../../lib/logout_user'),
+  config                 = require('../../lib/config'),
   new_department_form_id = '#add_new_department_form',
   application_host       = config.get_application_host(),
   company_edit_form_id   ='#company_edit_form';
@@ -54,7 +54,7 @@ function check_teamview(data, emails){
   })
   .then(function(data){
     var promise_to_check = data.driver
-      .findElements(By.css( 'tr.teamview-user-list-row > td' ))
+      .findElements(By.css( 'tr.teamview-user-list-row > td.user-name-cell' ))
 
       // Make sure that number of users is as expected
       .then(function(elements){