From 715e9182d376e31b35c146766143fdc1af95e68e Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 2 Nov 2017 17:19:59 +0000 Subject: [PATCH 001/539] Ditch support of node.js versions <4.0.0 --- .travis.yml | 2 -- README.md | 2 +- package.json | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c5e501c6..760f3335e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: node_js node_js: - - "0.10" - - "0.12" - "v4.8.3" - "v6.10.1" sudo: false diff --git a/README.md b/README.md index 1233c569a..57348ce55 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Create company account and use cloud based version. Install TimeOff.Management application within your infrastructure: -(make sure you have Node.js and SQLite installed) +(make sure you have Node.js (>=4.0.0) and SQLite installed) ```bash git clone https://github.com/timeoff-management/application.git timeoff-management diff --git a/package.json b/package.json index efe3b3fde..e1378fb2b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,11 @@ { "name": "TimeOff.Management", - "version": "0.6.2", + "version": "0.7.0", "private": false, "description": "Simple yet powerful absence management software for small and medium size business", + "engines": { + "node": ">=4.0.0" + }, "dependencies": { "bluebird": "^2.10.2", "body-parser": "^1.8.4", From 8565b35812d10673b87b4926e828c6e30d5587ec Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 3 Nov 2017 12:17:08 +0000 Subject: [PATCH 002/539] Employe absence page to show leave statistics by leave types --- lib/route/users.js | 21 ++++++++++----------- views/partials/user_details/absences.hbs | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index 144f1e786..d7625b135 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -151,18 +151,16 @@ router.get('/edit/:user_id/absences/', function(req, res){ '/js/inittooltips.js' ); - Promise.try(function(){ - ensure_user_id_is_integer({req : req, user_id : user_id}); - }) - .then(function(){ - return req.user.get_company_for_user_details({ - user_id : user_id, - }); - }) - .then(function(company){ - - var employee = company.users[0]; + Promise + .try( () => ensure_user_id_is_integer({req : req, user_id : user_id}) ) + .then(() => req.user.get_company_for_user_details({ user_id : user_id }) ) + .then(function(company){ + let employee = company.users[0]; + return employee.reload_with_session_details(); + }) + .then( employee => employee.reload_with_leave_details({})) + .then(employee => { return employee .promise_schedule_I_obey() .then(function(){ @@ -173,6 +171,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ employee : employee, leaves : leaves, show_absence_tab : true, + leave_type_statistics : employee.get_leave_statistics_by_types(), }); }); }); diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index c2cbf284b..952f0e605 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -19,6 +19,20 @@ +
+
+
Used so far
+ {{# if leave_type_statistics }} + {{# each leave_type_statistics }} +
{{this.leave_type.name}}: {{this.days_taken}}{{# if this.limit}} out of {{this.limit}}{{/if}}
+ {{/each}} + {{else}} +
No approved requests so far.
+ {{/if}} +
+
+ +
From b2a2f658f6164c73dc2f87daa7231cb6ac855040 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 3 Nov 2017 13:00:55 +0000 Subject: [PATCH 003/539] Littele bit better visualisation of remaining leaves --- lib/route/users.js | 17 +++++++++++++++++ views/partials/user_details/absences.hbs | 21 +++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index d7625b135..5323258bb 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -161,6 +161,22 @@ router.get('/edit/:user_id/absences/', function(req, res){ }) .then( employee => employee.reload_with_leave_details({})) .then(employee => { + + let leave_statistics = { + total_for_current_year : employee.calculate_total_number_of_days_n_allowance(), + remaining : employee.calculate_number_of_days_available_in_allowance(), + }; + + leave_statistics.used_so_far = leave_statistics.total_for_current_year - leave_statistics.remaining; + + leave_statistics.used_so_far_percent = leave_statistics.total_for_current_year > 0 + ? 100 * leave_statistics.used_so_far / leave_statistics.total_for_current_year + : 0; + + leave_statistics.remaining_percent = leave_statistics.total_for_current_year > 0 + ? 100 * leave_statistics.remaining / leave_statistics.total_for_current_year + : 0; + return employee .promise_schedule_I_obey() .then(function(){ @@ -172,6 +188,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ leaves : leaves, show_absence_tab : true, leave_type_statistics : employee.get_leave_statistics_by_types(), + leave_statistics : leave_statistics, }); }); }); diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 952f0e605..7c10cd7c7 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -13,15 +13,28 @@
- -
- + +
+
+ {{ leave_statistics.used_so_far }} days used so far +
+
+ {{ leave_statistics.remaining }} days remaining in current year +
+ +
+ + +
+ + +

{{ leave_statistics.remaining }} out of {{ leave_statistics.total_for_current_year }}

-
Used so far
+
Absences used this year grouped by leave types
{{# if leave_type_statistics }} {{# each leave_type_statistics }}
{{this.leave_type.name}}: {{this.days_taken}}{{# if this.limit}} out of {{this.limit}}{{/if}}
From 5d870a6e378df1112397fce2379415846ba31689 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 3 Nov 2017 13:14:27 +0000 Subject: [PATCH 004/539] Add tooltips to exmplain in detail about absence statistics --- public/js/global.js | 4 ++++ views/partials/user_details/absences.hbs | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/public/js/global.js b/public/js/global.js index b318ee78b..533df54dc 100644 --- a/public/js/global.js +++ b/public/js/global.js @@ -55,3 +55,7 @@ $(document).ready(function(){ format : "dd/mm/yyyy" } }(jQuery); + +$(function () { + $('[data-toggle="popover"]').popover() +}) diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 7c10cd7c7..5336b7689 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -15,17 +15,33 @@
-
+
{{ leave_statistics.used_so_far }} days used so far
-
+
{{ leave_statistics.remaining }} days remaining in current year
- + + +
From eedc838462354b47ff96ba4aa66edf9ea781098c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 3 Nov 2017 13:43:30 +0000 Subject: [PATCH 005/539] Rever deletion of hidden element used in tests --- views/partials/user_details/absences.hbs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 5336b7689..b4f49d2db 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -36,16 +36,12 @@ {{ leave_statistics.remaining }} days remaining in current year
-
- - -
-

{{ leave_statistics.remaining }} out of {{ leave_statistics.total_for_current_year }}

+
@@ -61,7 +57,6 @@
-
From 5bf4564b6de2de41e9936d9d08453f4a9cd8ba17 Mon Sep 17 00:00:00 2001 From: Bernard Badjari Date: Thu, 9 Nov 2017 21:22:33 -0500 Subject: [PATCH 006/539] Fixed some spelling and grammar in README.md file. Also removed duplicate information. --- README.md | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 38a794171..2e770608e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # TimeOff.Management -Web application for managing employees absence. +Web application for managing employee absences. [![Stories in Ready](https://badge.waffle.io/timeoff-management/application.png?label=ready&title=Ready)](https://waffle.io/timeoff-management/application) @@ -9,7 +9,7 @@ Web application for managing employees absence. ## Features -**Multiple views of staff absence** +**Multiple views of staff absences** Calendar view, Team view, or Just plain list. @@ -17,25 +17,25 @@ Calendar view, Team view, or Just plain list. Add custom absence types: Sickness, Maternity, Working from home, Birthday etc. Define if each uses vacation allowance. -Optionally limit the amount of days employee can take for each Leave type. E.g. no more than 10 days of Sick days per year. +Optionally limit the amount of days employees can take for each Leave type. E.g. no more than 10 Sick days per year. Setup public holidays as well as company specific days off. -Group employees by departments: bring your organisation structure into, set the supervisor for every department. +Group employees by departments: bring your organisational structure, set the supervisor for every department. Customisable working schedule for company and individuals. **Third Party Calendar Integration** -Broadcast employees whereabout into external calendar providers: MS Outlook, Google Calendar, and iCal. +Broadcast employee whereabouts into external calendar providers: MS Outlook, Google Calendar, and iCal. -Create calendar feeds for individual, departments or entire company. +Create calendar feeds for individuals, departments or entire company. **Three Steps Workflow** -Employee request time off or revoke existing one. +Employee requests time off or revokes existing one. -Supervisor get email notification and decide about upcoming employee absence. +Supervisor gets email notification and decides about upcoming employee absence. Absence is accounted. Peers are informed via team view or calendar feeds. @@ -43,15 +43,13 @@ Absence is accounted. Peers are informed via team view or calendar feeds. There are following types of users: employees, supervisors, and administrators. -Optional LDAP authentification: configure applicationto use your LDAP server for user authentication. +Optional LDAP authentication: configure application to use your LDAP server for user authentication. **Seamless data migration betweeen different installations** -User friendly and simple work-flow for data migration between different TimeOff.Management installations. +User friendly and simple workflow for data migration between different TimeOff.Management installations. -Admin user can download the entire company data as a single JSON file. - -And then restore the account at different installation by simply uploading the JSON. +Admin user can download the entire company data as a single JSON file and then restore the account at a different installation by simply uploading the JSON. **Works on mobile phones** @@ -63,16 +61,14 @@ The most used customer paths are mobile friendly: **Lots of other little things that would make life easier** -Manually adjust employees allowance +Manually adjust employee allowances e.g. employee has extra day in lieu. -Upon creation employee receives pro rata vacation allowance, depending on start date. - -Users of three types: admins, supervisors, and employees. +Upon creation employee receives pro-rated vacation allowance, depending on start date. Email notification to all involved parties. -Optionally allow employees to see the time off information of entire company regardless the department structure. +Optionally allow employees to see the time off information of entire company regardless of department structure. ## Screenshots @@ -114,7 +110,7 @@ npm test (make sure that application with default settings is up and running) -Any bugfixes or enhancements should have good test coverage to get them into "master" branch. +Any bug fixes or enhancements should have good test coverage to get them into "master" branch. ## Updating existing instance with new code @@ -130,5 +126,4 @@ npm start ## Feedback -Please report any issues or feedback to twitter or Email: pavlo at timeoff.management - +Please report any issues or feedback to twitter or Email: pavlo at timeoff.management \ No newline at end of file From de9c8c54b81709f20e392c8b50046e93ebb74394 Mon Sep 17 00:00:00 2001 From: Bernard Badjari Date: Thu, 9 Nov 2017 21:28:17 -0500 Subject: [PATCH 007/539] Minor spelling correction. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e770608e..af8d5262d 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Supervisor gets email notification and decides about upcoming employee absence. Absence is accounted. Peers are informed via team view or calendar feeds. -**Accesss control** +**Access control** There are following types of users: employees, supervisors, and administrators. From 90f03478c545dfeea725f85d236909adf6c89b5d Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 6 Nov 2017 20:08:09 +0000 Subject: [PATCH 008/539] Prepare bsic front end --- public/css/style.css | 9 +++++++++ scss/main.scss | 13 +++++++++++-- views/team_view.hbs | 7 +++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index e82a3d6fb..c195d4521 100644 --- a/public/css/style.css +++ b/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; } diff --git a/scss/main.scss b/scss/main.scss index 596598c03..116005ffa 100644 --- a/scss/main.scss +++ b/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; diff --git a/views/team_view.hbs b/views/team_view.hbs index a8225eceb..76f0ecf0e 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -28,7 +28,7 @@
- {{# each users_and_leaves}} - + + + + {{/each}}
+
{{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}}
{{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}}
From 099b59f444cc49945c7612e0f3725fa78a0127a2 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 6 Nov 2017 21:59:49 +0000 Subject: [PATCH 009/539] Row implementation --- lib/model/team_view.js | 41 +++++++++++++++++++++++++++++++++++++++++ lib/route/calendar.js | 25 ++++++++++++++----------- views/team_view.hbs | 2 +- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 4030063b3..66ccd72bd 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -87,4 +87,45 @@ TeamView.prototype.promise_team_view_details = function(args){ }; +TeamView.prototype.inject_statistics = function(args){ + 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 ) + .filter( day => !! day.leave_obj.is_approved_leave() ) + .forEach( day => { + let leave_type = leave_types_map[ day.leave_obj.leaveTypeId ]; + + if (! (leave_type && leave_type.use_allowance)) { + return; + } + + deducted_days++ + }); + + let statistics = { + deducted_days : deducted_days, + }; + + node.statistics = statistics; + }); + + return Promise.resolve( team_view_details ); +}; + module.exports = TeamView; diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 15d4fed30..8b7f09fa5 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -158,17 +158,20 @@ router.get('/teamview/', function(req, res){ }), 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, - }); - + return team_view.inject_statistics({ + team_view_details : team_view_details, + leave_types : company.leave_types, + }) + .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, + }) + ); }); }); diff --git a/views/team_view.hbs b/views/team_view.hbs index 76f0ecf0e..2db5dadf6 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -47,7 +47,7 @@ {{# each users_and_leaves}} {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} - + {{ statistics.deducted_days }} {{/each}} From b3ff990b8d09438ac7e4dd0fbce81059edc2d8cd Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 7 Nov 2017 15:53:26 +0000 Subject: [PATCH 010/539] Some more improvements --- lib/model/team_view.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 66ccd72bd..22727fc2e 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -107,7 +107,10 @@ TeamView.prototype.inject_statistics = function(args){ .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() ) + .filter( day => ! day.is_weekend ) + .filter( day => ! day.is_bank_holiday ) .forEach( day => { let leave_type = leave_types_map[ day.leave_obj.leaveTypeId ]; @@ -115,7 +118,11 @@ TeamView.prototype.inject_statistics = function(args){ return; } - deducted_days++ + if (day.is_leave_afternoon && day.is_leave_morning){ + deducted_days++; + } else { + deducted_days = deducted_days + 0.5; + } }); let statistics = { From e9d8022fa552138b55cf5b0ff09f15dbe9621bcf Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 8 Nov 2017 07:15:28 +0000 Subject: [PATCH 011/539] Add new test to cover absence summary on team view --- lib/model/team_view.js | 2 + t/integration/team_view/deducted_column.js | 196 ++++++++++++++++++ .../{ => team_view}/teamview_cross_links.js | 14 +- 3 files changed, 205 insertions(+), 7 deletions(-) create mode 100644 t/integration/team_view/deducted_column.js rename t/integration/{ => team_view}/teamview_cross_links.js (83%) diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 22727fc2e..552f09ef7 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -109,7 +109,9 @@ TeamView.prototype.inject_statistics = function(args){ .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 ]; diff --git a/t/integration/team_view/deducted_column.js b/t/integration/team_view/deducted_column.js new file mode 100644 index 000000000..aed44019d --- /dev/null +++ b/t/integration/team_view/deducted_column.js @@ -0,0 +1,196 @@ + +'use strict'; + +/* + * Scenario 1: + * + * Check that values for new columns are shown only for employess + * currently login user can supervise. + * + * The reason for this sceanrio is because in UK for instance it is illegal to share + * details for employees who are not supervisers. Peers should not know how many days + * their coleagues were off sick for instance. + * + * * create account by admin user A + * * add user B + * * add user C + * * ensure company has "Share absences between all employees" flag ON + * * make user B to be superviser of user C + * * login as user A and ensure team view shows deducted values for all three users + * * login as user B and ensure she sees deducted days only for user B (self) and user C + * but not for user A + * * login as user C and ensure she sees only values for her account + * + * */ + + +/* + * Scenario 2: + * + * Case when holidays spans through more then one month and is devided by bank holiday. + * + * * create new account as admin user A + * * create user B + * * create new bank holiday to be on 2 Aug 2016 + * * as user B create a holiday request from 28 July to morning of 4 Aug 2016 (a) + * + * * as user B create a holiday request from 12 Aug to 15 Aug 2016 (b) + * * as user B create a holiday request from 26 Aug to 2 Sep 2016 (d) + * * as user B create a sick day request from 18 to 18 Aug 2016 (e) + * * as user A approve leaves (a), (b), (d), and (e) + * * as user B cretae a holiday request from 24 Aug to 24 Aug 2016 (c) + * * navigate to team view and ensure that it shows 9.5 days were deducted for Aug 2016 + * * 2 days deducted for July 2016 + * * 2 days deducted for Sept 2016 + * + * */ + +var test = require('selenium-webdriver/testing'), + By = require('selenium-webdriver').By, + Promise = require("bluebird"), + expect = require('chai').expect, + add_new_user_func = require('../../lib/add_new_user'), + check_elements_func = require('../../lib/check_elements'), + config = require('../../lib/config'), + login_user_func = require('../../lib/login_with_user'), + logout_user_func = require('../../lib/logout_user'), + open_page_func = require('../../lib/open_page'), + register_new_user_func = require('../../lib/register_new_user'), + submit_form_func = require('../../lib/submit_form'), + user_info_func = require('../../lib/user_info'), + new_bankholiday_form_id= '#add_new_bank_holiday_form', + application_host = config.get_application_host(); + +describe('Case when holidays spans through more then one month and is devided by bank holiday', function(){ + + this.timeout( config.get_execution_timeout() ); + + let driver, + email_A, user_id_A, + email_B, user_id_B; + + it("Register new company as admin user A", function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(data => { + driver = data.driver; + email_A = data.email; + done(); + }); + }); + + it("Create second user B", function(done){ + add_new_user_func({ + application_host : application_host, + driver : driver, + }) + .then(data => { + email_B = data.new_user_email; + done(); + }); + }); + + it("Obtain information about user A", function(done){ + user_info_func({ + driver : driver, + email : email_A, + }) + .then(data => { + user_id_A = data.user.id; + done(); + }); + }); + + it("Obtain information about user B", function(done){ + user_info_func({ + driver : driver, + email : email_B, + }) + .then(data => { + user_id_B = data.user.id; + done(); + }); + }); + + it("Open page with bank holidays", function(done){ + open_page_func({ + url : application_host + 'settings/general/', + driver : driver, + }) + .then(function(){done()}); + }) + + it("Create new bank holiday to be on 2 Aug 2016", function(done){ + driver.findElement(By.css('#add_new_bank_holiday_btn')) + .then(el => el.click()) + .then(() => { + + // This is very important line when working with Bootstrap modals! + driver.sleep(1000); + + submit_form_func({ + driver : driver, + form_params : [{ + selector : new_bankholiday_form_id+' input[name="name__new"]', + value : 'Some summer holiday', + },{ + selector : new_bankholiday_form_id+' input[name="date__new"]', + value : '2016-08-02', + }], + submit_button_selector: new_bankholiday_form_id+' button[type="submit"]', + message : /Changes to bank holidays were saved/, + }) + .then(() => done()); + }); + }); + + it("Logout from user A (admin)", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user B", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_B, + driver : driver, + }) + .then(() => done()); + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then( el => driver.sleep(1000) ) + .then(() => done()); + }); + + it("As user B create a holiday request from 28 July to morning of 4 Aug 2016 (a)", function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'select[name="from_date_part"]', + option_selector : 'option[value="2"]', + value : "2", + },{ + selector : 'input#from', + value : '2016-07-28', + },{ + selector : 'input#to', + value : '2016-08-04', + }], + message : /New leave request was added/, + }) + .then(function(){done()}); + }); + + after(function(done){ + console.log('>>> ' + email_B); + driver.quit().then(() => done()); + }); +}); diff --git a/t/integration/teamview_cross_links.js b/t/integration/team_view/teamview_cross_links.js similarity index 83% rename from t/integration/teamview_cross_links.js rename to t/integration/team_view/teamview_cross_links.js index f5ce95c50..a7f093f24 100644 --- a/t/integration/teamview_cross_links.js +++ b/t/integration/team_view/teamview_cross_links.js @@ -5,13 +5,13 @@ var test = require('selenium-webdriver/testing'), By = require('selenium-webdriver').By, expect = require('chai').expect, Promise = require("bluebird"), - register_new_user_func = require('../lib/register_new_user'), - login_user_func = require('../lib/login_with_user'), - open_page_func = require('../lib/open_page'), - add_new_user_func = require('../lib/add_new_user'), - logout_user_func = require('../lib/logout_user'), - check_teamview_func = require('../lib/teamview_check_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'), + add_new_user_func = require('../../lib/add_new_user'), + logout_user_func = require('../../lib/logout_user'), + check_teamview_func = require('../../lib/teamview_check_user'), + config = require('../../lib/config'), application_host = config.get_application_host(); /* From 2d88b8750a1b9f3dccd64ac58fb98a52eb13e4e7 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 8 Nov 2017 10:09:43 +0000 Subject: [PATCH 012/539] Fix existing team view test --- .../{ => team_view}/basic_wall_chart.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename t/integration/{ => team_view}/basic_wall_chart.js (95%) diff --git a/t/integration/basic_wall_chart.js b/t/integration/team_view/basic_wall_chart.js similarity index 95% rename from t/integration/basic_wall_chart.js rename to t/integration/team_view/basic_wall_chart.js index 64a407954..e3f41a088 100644 --- a/t/integration/basic_wall_chart.js +++ b/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){ From cbc059d5172a95dc8bb1b3b665234514ecfad711 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 10 Nov 2017 07:28:18 +0000 Subject: [PATCH 013/539] Finish happy path test for deducted column on team view. --- lib/model/db/leave_type.js | 1 + t/integration/crud_leave_type.js | 6 +- t/integration/team_view/deducted_column.js | 199 ++++++++++++++++++++- t/lib/teamview_check_user.js | 2 +- views/team_view.hbs | 4 +- 5 files changed, 202 insertions(+), 10 deletions(-) diff --git a/lib/model/db/leave_type.js b/lib/model/db/leave_type.js index 6d900c4fc..322400b0c 100644 --- a/lib/model/db/leave_type.js +++ b/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, }, ]) }, diff --git a/t/integration/crud_leave_type.js b/t/integration/crud_leave_type.js index 0eba8b1f0..c905386ae 100644 --- a/t/integration/crud_leave_type.js +++ b/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, }], }) diff --git a/t/integration/team_view/deducted_column.js b/t/integration/team_view/deducted_column.js index aed44019d..a39b75d35 100644 --- a/t/integration/team_view/deducted_column.js +++ b/t/integration/team_view/deducted_column.js @@ -33,14 +33,13 @@ * * create user B * * create new bank holiday to be on 2 Aug 2016 * * as user B create a holiday request from 28 July to morning of 4 Aug 2016 (a) - * * * as user B create a holiday request from 12 Aug to 15 Aug 2016 (b) * * as user B create a holiday request from 26 Aug to 2 Sep 2016 (d) * * as user B create a sick day request from 18 to 18 Aug 2016 (e) * * as user A approve leaves (a), (b), (d), and (e) * * as user B cretae a holiday request from 24 Aug to 24 Aug 2016 (c) - * * navigate to team view and ensure that it shows 9.5 days were deducted for Aug 2016 - * * 2 days deducted for July 2016 + * * navigate to team view and ensure that it shows 9 days were deducted for Aug 2016 + * * 1.5 days deducted for July 2016 * * 2 days deducted for Sept 2016 * * */ @@ -189,8 +188,200 @@ describe('Case when holidays spans through more then one month and is devided by .then(function(){done()}); }); + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then( el => driver.sleep(1000) ) + .then(() => done()); + }); + + it('As user B create a holiday request from 12 Aug to 15 Aug 2016 (b)', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'input#from', + value : '2016-08-12', + },{ + selector : 'input#to', + value : '2016-08-15', + }], + message : /New leave request was added/, + }) + .then(function(){done()}); + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then( el => driver.sleep(1000) ) + .then(() => done()); + }); + + it('As user B create a holiday request from 26 Aug to 2 Sep 2016', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'input#from', + value : '2016-08-26', + },{ + selector : 'input#to', + value : '2016-09-02', + }], + message : /New leave request was added/, + }) + .then(() => done()); + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then( el => driver.sleep(1000) ) + .then(() => done()); + }); + + it('As user B create a sick day request from 18 to 18 Aug 2016', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'select[name="leave_type"]', + option_selector : 'option:nth-child(2)', + },{ + selector : 'input#from', + value : '2016-08-18', + },{ + selector : 'input#to', + value : '2016-08-18', + }], + message : /New leave request was added/, + }) + .then(() => done()); + }); + + it("Logout from user B", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user A (admin)", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_A, + driver : driver, + }) + .then(() => done()); + }); + + it("Open requests page", function( done ){ + open_page_func({ + url : application_host + 'requests/', + driver : driver, + }) + .then(() => done()); + }); + + it("Approve newly added leave request", function(done){ + let click_selector = `tr[vpp="pending_for__${email_B}"] .btn-success`; + driver + .findElement(By.css( click_selector )) + .then(el => el.click()) + .then(() => driver.findElement(By.css( click_selector ))) + .then(el => el.click()) + .then(() => driver.findElement(By.css( click_selector ))) + .then(el => el.click()) + .then(() => driver.findElement(By.css( click_selector ))) + .then(el => el.click()) + .then(() => done()); + }); + + it("Logout from user A (admin)", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user B", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_B, + driver : driver, + }) + .then(() => done()); + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then( el => driver.sleep(1000) ) + .then(() => done()); + }); + + it('As user B cretae a holiday request from 24 Aug to 24 Aug 2016', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'input#from', + value : '2016-08-24', + },{ + selector : 'input#to', + value : '2016-08-24', + }], + message : /New leave request was added/, + }) + .then(function(){done()}); + }); + + it('Navigate to team view and ensure that it shows 9 days were deducted for Aug 2016', function(done){ + open_page_func({ + url : application_host + 'calendar/teamview/?date=2016-08', + driver : driver, + }) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt, 'Ensure that system shows 9 days as deducted') + .to.be.eql('9'); + done(); + }); + }); + + it('1.5 days deducted for July 2016', function(done){ + open_page_func({ + url : application_host + 'calendar/teamview/?date=2016-07', + driver : driver, + }) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt, 'Ensure that system shows 1.5 days as deducted') + .to.be.eql('1.5'); + done(); + }); + }); + + it('2 days deducted for Sept 2016', function(done){ + open_page_func({ + url : application_host + 'calendar/teamview/?date=2016-09', + driver : driver, + }) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt, 'Ensure that system shows 2 days as deducted') + .to.be.eql('2'); + done(); + }); + }); + after(function(done){ - console.log('>>> ' + email_B); driver.quit().then(() => done()); }); }); diff --git a/t/lib/teamview_check_user.js b/t/lib/teamview_check_user.js index e254655fd..daa73ff31 100644 --- a/t/lib/teamview_check_user.js +++ b/t/lib/teamview_check_user.js @@ -1,6 +1,6 @@ /* - * Exporst function that checks if given emails of users are shown + * Exports function that checks if given emails of users are shown * on the Teamview page. And if so how they are rendered: as text or link. * * It does not check exact emails, just count numbers. diff --git a/views/team_view.hbs b/views/team_view.hbs index 2db5dadf6..442bcfff9 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -45,9 +45,9 @@ {{# each users_and_leaves}} - + {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} - {{ statistics.deducted_days }} + {{ statistics.deducted_days }} {{/each}} From 6ae8f62c3dacc274bb722e01ecba59995e091b06 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 13 Nov 2017 06:29:04 +0000 Subject: [PATCH 014/539] Add argument validation into newly added method --- lib/model/team_view.js | 43 ++++++- lib/route/calendar.js | 40 ++++-- package.json | 1 + t/integration/team_view/deducted_column.js | 44 +++---- .../team_view/deducted_column__visibility.js | 121 ++++++++++++++++++ views/team_view.hbs | 12 +- 6 files changed, 219 insertions(+), 42 deletions(-) create mode 100644 t/integration/team_view/deducted_column__visibility.js diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 552f09ef7..4109d3241 100644 --- a/lib/model/team_view.js +++ b/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,7 +89,38 @@ 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 || []; @@ -137,4 +170,8 @@ TeamView.prototype.inject_statistics = function(args){ return Promise.resolve( team_view_details ); }; +TeamView.prototype.restrainStatisticsForUser = function(args){ + +}; + module.exports = TeamView; diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 8b7f09fa5..8a55ec0bd 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -157,21 +157,35 @@ 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 team_view.inject_statistics({ - team_view_details : team_view_details, - leave_types : company.leave_types, - }) - .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, + (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 => 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, + show_statistics : (req.user.supervised_users.length > 1), + }) + ); + }) + .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('/'); }); }); diff --git a/package.json b/package.json index e1378fb2b..221921717 100644 --- a/package.json +++ b/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", diff --git a/t/integration/team_view/deducted_column.js b/t/integration/team_view/deducted_column.js index a39b75d35..3d7f409ff 100644 --- a/t/integration/team_view/deducted_column.js +++ b/t/integration/team_view/deducted_column.js @@ -2,30 +2,7 @@ 'use strict'; /* - * Scenario 1: - * - * Check that values for new columns are shown only for employess - * currently login user can supervise. - * - * The reason for this sceanrio is because in UK for instance it is illegal to share - * details for employees who are not supervisers. Peers should not know how many days - * their coleagues were off sick for instance. - * - * * create account by admin user A - * * add user B - * * add user C - * * ensure company has "Share absences between all employees" flag ON - * * make user B to be superviser of user C - * * login as user A and ensure team view shows deducted values for all three users - * * login as user B and ensure she sees deducted days only for user B (self) and user C - * but not for user A - * * login as user C and ensure she sees only values for her account - * - * */ - - -/* - * Scenario 2: + * Scenario: * * Case when holidays spans through more then one month and is devided by bank holiday. * @@ -324,7 +301,7 @@ describe('Case when holidays spans through more then one month and is devided by .then(() => done()); }); - it('As user B cretae a holiday request from 24 Aug to 24 Aug 2016', function(done){ + it('As user B cretae a holiday request from 24 Aug to 24 Aug 2016 (but not approved)', function(done){ submit_form_func({ driver : driver, form_params : [{ @@ -339,6 +316,23 @@ describe('Case when holidays spans through more then one month and is devided by .then(function(){done()}); }); + it("Logout from user B", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user A (admin)", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_A, + driver : driver, + }) + .then(() => done()); + }); + it('Navigate to team view and ensure that it shows 9 days were deducted for Aug 2016', function(done){ open_page_func({ url : application_host + 'calendar/teamview/?date=2016-08', diff --git a/t/integration/team_view/deducted_column__visibility.js b/t/integration/team_view/deducted_column__visibility.js new file mode 100644 index 000000000..95916b21c --- /dev/null +++ b/t/integration/team_view/deducted_column__visibility.js @@ -0,0 +1,121 @@ + +'use strict'; + + +/* + * Scenario: + * + * Check that values for new columns are shown only for employess + * currently login user can supervise. + * + * The reason for this sceanrio is because in UK for instance it is illegal to share + * details for employees who are not supervisers. Peers should not know how many days + * their coleagues were off sick for instance. + * + * * create account by admin user A + * * add user B + * * add user C + * * ensure company has "Share absences between all employees" flag ON + * * make user B to be superviser of user C + * * login as user A and ensure team view shows deducted values for all three users + * * login as user B and ensure she sees deducted days + * * login as user C and ensure she does not see allowance deduction dates + * + * */ + + +const + test = require('selenium-webdriver/testing'), + By = require('selenium-webdriver').By, + Promise = require("bluebird"), + expect = require('chai').expect, + add_new_user_func = require('../../lib/add_new_user'), + check_elements_func = require('../../lib/check_elements'), + config = require('../../lib/config'), + login_user_func = require('../../lib/login_with_user'), + logout_user_func = require('../../lib/logout_user'), + open_page_func = require('../../lib/open_page'), + register_new_user_func = require('../../lib/register_new_user'), + submit_form_func = require('../../lib/submit_form'), + user_info_func = require('../../lib/user_info'), + application_host = config.get_application_host(); + +describe('Check that values for new columns are shown only for employess currently login user can supervise', function(){ + + this.timeout( config.get_execution_timeout() ); + + let driver, + email_A, user_id_A, + email_B, user_id_B, + email_C, user_id_C; + + it("Register new company as admin user A", function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(data => { + driver = data.driver; + email_A = data.email; + done(); + }); + }); + + it("Create second user B", function(done){ + add_new_user_func({ + application_host : application_host, + driver : driver, + }) + .then(data => { + email_B = data.new_user_email; + done(); + }); + }); + + it("Create second user C", function(done){ + add_new_user_func({ + application_host : application_host, + driver : driver, + }) + .then(data => { + email_C = data.new_user_email; + done(); + }); + }); + + it("Obtain information about user A", function(done){ + user_info_func({ + driver : driver, + email : email_A, + }) + .then(data => { + user_id_A = data.user.id; + done(); + }); + }); + + it("Obtain information about user B", function(done){ + user_info_func({ + driver : driver, + email : email_B, + }) + .then(data => { + user_id_B = data.user.id; + done(); + }); + }); + + it("Obtain information about user C", function(done){ + user_info_func({ + driver : driver, + email : email_C, + }) + .then(data => { + user_id_C = data.user.id; + done(); + }); + }); + + after(function(done){ + driver.quit().then(() => done()); + }); +}); diff --git a/views/team_view.hbs b/views/team_view.hbs index 442bcfff9..47610fd9f 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -47,7 +47,17 @@ {{# each users_and_leaves}} {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} - {{ statistics.deducted_days }} + + {{# if ../show_statistics }}{{ statistics.deducted_days }}{{/if}} + {{/each}} From 91f514bf7625d990d6cf6e69484142c7122d4ff5 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 14 Nov 2017 17:09:25 +0000 Subject: [PATCH 015/539] Restrict presentation of allowance usage sattistics Users can see allowance deduction statistic only for employees they can supervise. --- lib/model/team_view.js | 25 ++ lib/route/calendar.js | 5 +- .../team_view/deducted_column__visibility.js | 229 +++++++++++++++++- views/team_view.hbs | 4 +- 4 files changed, 257 insertions(+), 6 deletions(-) diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 4109d3241..e3318aa29 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -170,8 +170,33 @@ TeamView.prototype.inject_statistics = function(args){ 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; diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 8a55ec0bd..c67769e06 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -164,6 +164,10 @@ router.get('/teamview/', function(req, res){ 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'), @@ -172,7 +176,6 @@ router.get('/teamview/', function(req, res){ related_departments : team_view_details.related_departments, current_department : team_view_details.current_department, company : company, - show_statistics : (req.user.supervised_users.length > 1), }) ); }) diff --git a/t/integration/team_view/deducted_column__visibility.js b/t/integration/team_view/deducted_column__visibility.js index 95916b21c..f1d26f452 100644 --- a/t/integration/team_view/deducted_column__visibility.js +++ b/t/integration/team_view/deducted_column__visibility.js @@ -18,8 +18,9 @@ * * ensure company has "Share absences between all employees" flag ON * * make user B to be superviser of user C * * login as user A and ensure team view shows deducted values for all three users - * * login as user B and ensure she sees deducted days - * * login as user C and ensure she does not see allowance deduction dates + * * login as user B and ensure she sees deducted days only for user B (self) and user C + * but not for user A + * * login as user C and ensure she sees only values for her account * * */ @@ -38,7 +39,9 @@ const register_new_user_func = require('../../lib/register_new_user'), submit_form_func = require('../../lib/submit_form'), user_info_func = require('../../lib/user_info'), - application_host = config.get_application_host(); + application_host = config.get_application_host(), + new_department_form_id = '#add_new_department_form', + company_edit_form_id ='#company_edit_form'; describe('Check that values for new columns are shown only for employess currently login user can supervise', function(){ @@ -115,6 +118,226 @@ describe('Check that values for new columns are shown only for employess current }); }); + it("Open page for editing company details", function(done){ + open_page_func({ + url : application_host + 'settings/general/', + driver : driver, + }) + .then(() => done()); + }); + + it('Ensure company has "Share absences between all employees" flag OFF', function( done ){ + check_elements_func({ + driver : driver, + elements_to_check : [{ + selector : company_edit_form_id+' input[name="share_all_absences"]', + value : 'off', + tick : true, + }], + }) + .then(() => done()); + }); + + it('... and tick that box ON', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : company_edit_form_id+' input[name="share_all_absences"]', + tick : true, + value : 'on', + }], + submit_button_selector : company_edit_form_id+' button[type="submit"]', + message : /successfully/i, + should_be_successful : true, + }) + .then(() => done()); + }); + + it("Open department management page", function(done){ + open_page_func({ + url : application_host + 'settings/departments/', + driver : driver, + }) + .then(() => done()); + }); + + it("Add new department and make its approver to be user B", function(done){ + driver + .findElement(By.css('#add_new_department_btn')) + .then(el => el.click()) + .then(function(){ + + // This is very important line when working with Bootstrap modals! + driver.sleep(1000); + + submit_form_func({ + driver : driver, + form_params : [{ + selector : `${ new_department_form_id } input[name="name__new"]`, + // Just to make sure it is always first in the lists + value : 'AAAAA', + },{ + selector : `${ new_department_form_id } select[name="allowance__new"]`, + option_selector : 'option[value="15"]', + value : '15', + },{ + selector : `${ new_department_form_id } select[name="boss_id__new"]`, + option_selector : `select[name="boss_id__new"] option[value="${ user_id_B }"]`, + }], + submit_button_selector : `${ new_department_form_id } button[type="submit"]`, + message : /Changes to departments were saved/, + }) + .then(function(){ done() }); + }); + }); + + it("Open user editing page for user B", function(done){ + open_page_func({ + url : `${ application_host }users/edit/${ user_id_C }/`, + driver : driver, + }) + .then(() => done()); + }); + + it("And make sure it is part of the newly added department", function(done){ + submit_form_func({ + submit_button_selector : 'button#save_changes_btn', + driver : driver, + form_params : [{ + selector : 'select[name="department"]', + // Newly added department should be first in the list as it is + // sorted by AZ and department started with AA + option_selector : 'select[name="department"] option:nth-child(1)', + }], + message : /Details for .* were updated/, + }) + .then(function(){ done() }); + }); + + it('As user A ensure team view shows deducted values for all three users', function(done){ + open_page_func({ + url : `${ application_host }calendar/teamview/`, + driver : driver, + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(function(){ done() }); + }); + + it("Logout from user A (admin)", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user B", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_B, + driver : driver, + }) + .then(() => done()); + }); + + it('Login as user B and ensure she sees deducted days only for user B (self) and user C but not for user A', function(done){ + open_page_func({ + url : `${ application_host }calendar/teamview/`, + driver : driver, + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql(''); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(function(){ done() }); + }); + + it("Logout from user B", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as user C", function(done){ + login_user_func({ + application_host : application_host, + user_email : email_C, + driver : driver, + }) + .then(() => done()); + }); + + it('Login as user C and ensure she sees only values for her account', function(done){ + open_page_func({ + url : `${ application_host }calendar/teamview/`, + driver : driver, + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql(''); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql(''); + return Promise.resolve(1); + }) + + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(el => el.getText()) + .then(txt => { + expect(txt).to.be.eql('0'); + return Promise.resolve(1); + }) + + .then(function(){ done() }); + }); + after(function(done){ driver.quit().then(() => done()); }); diff --git a/views/team_view.hbs b/views/team_view.hbs index 47610fd9f..315ce73d1 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -49,14 +49,14 @@ {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} - {{# if ../show_statistics }}{{ statistics.deducted_days }}{{/if}} + {{# if statistics }}{{ statistics.deducted_days }}{{/if}} {{/each}} From 5b772aefc8e4986e1fa415b0e65d4471da2a8aba Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 15 Nov 2017 16:27:44 +0000 Subject: [PATCH 016/539] Add minor typo in test. --- t/integration/department/one_by_one_crud.js | 1 + 1 file changed, 1 insertion(+) diff --git a/t/integration/department/one_by_one_crud.js b/t/integration/department/one_by_one_crud.js index eabdc012f..831d6d141 100644 --- a/t/integration/department/one_by_one_crud.js +++ b/t/integration/department/one_by_one_crud.js @@ -718,6 +718,7 @@ describe('CRUD for department secondary supervisers', function(){ }], }) .then(function(vals){ done() }); + }); }); after(function(done){ From 8cf9a17644f2e2e7c4caaa5064602d8ad4bf62e0 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 15 Nov 2017 17:29:21 +0000 Subject: [PATCH 017/539] Finish test for editing department's secondary supervisers --- t/integration/department/one_by_one_crud.js | 75 ++++++++++++++++----- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/t/integration/department/one_by_one_crud.js b/t/integration/department/one_by_one_crud.js index 831d6d141..12c610f41 100644 --- a/t/integration/department/one_by_one_crud.js +++ b/t/integration/department/one_by_one_crud.js @@ -33,7 +33,6 @@ var test = require('selenium-webdriver/testing'), * * */ -/* describe('Check departments list page', function(){ var driver; @@ -179,7 +178,6 @@ describe('Check departments list page', function(){ driver.quit().then(function(){ done(); }); }); }); -*/ /* * Scenario: @@ -197,7 +195,6 @@ describe('Check departments list page', function(){ * * */ -/* describe("Edit individual department via department details page", function(){ var driver, email_A, email_B, user_id_A, user_id_B, department_edit_page_url, new_department_id; @@ -491,7 +488,6 @@ describe("Edit individual department via department details page", function(){ driver.quit().then(function(){ done(); }); }); }); -*/ /* * Scenario (edditing secondary supervisers) @@ -505,7 +501,6 @@ describe("Edit individual department via department details page", function(){ * has only user B and C in the list * * tick user B and save changes * * observe that user B appeares on the list of secondary supervisers - * * * open "add supervisors" pop up again and ensure that user B has tick * next to it and user C does not have it * * tick user C and un-tick user B and save changes @@ -678,7 +673,7 @@ describe('CRUD for department secondary supervisers', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : 'input[name="supervisor_id"][value="'+user_id_B+'"]', + selector : 'input[name="supervisor_id"][value="'+user_id_B+'"]', tick : true, value : 'on', }], @@ -686,7 +681,6 @@ describe('CRUD for department secondary supervisers', function(){ message : /Supervisors were added to department/, }) .then(function(){ done() }); - }); it('Observe that user B appeares on the list of secondary supervisers', function(done){ @@ -702,27 +696,74 @@ describe('CRUD for department secondary supervisers', function(){ }); }); - it('open "add supervisors" pop up again and ensure that user B has tick', function(done){ + it('Open "add supervisors" pop up again and ensure that user B has tick next to it and user C does not have it', function(done){ driver .findElement(By.css('a[data-vpp-add-new-secondary-supervisor="1"]')) - .then(function(btn){ return btn.click() }) - .then(function(){ - driver.sleep(1000); - - return check_elements_func({ + .then( btn => btn.click() ) + .then( () => driver.sleep(1000) ) + .then( () => check_elements_func({ driver : driver, elements_to_check : [{ - selector : 'input[name="supervisor_id"][value="'+user_id_B+'"]', + selector : `input[name="supervisor_id"][value="${ user_id_B }"]`, tick : true, value : 'on', }], }) - .then(function(vals){ done() }); - }); + ) + .then( () => check_elements_func({ + driver : driver, + elements_to_check : [{ + selector : `input[name="supervisor_id"][value="${ user_id_C }"]`, + tick : true, + value : 'off', + }], + }) + ) + .then(() => done()); + }); + + it('Tick user C and un-tick user B and save changes', function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : 'input[name="supervisor_id"][value="'+user_id_B+'"]', + tick : true, + },{ + selector : 'input[name="supervisor_id"][value="'+user_id_C+'"]', + tick : true, + }], + submit_button_selector : 'button[name="do_add_supervisors"]', + message : /Supervisors were added to department/, + }) + .then(() => done()); + }); + + it('Observe that "secondary spervisors" section now contains only user C', function(done) { + driver + .findElements(By.css('button[name="remove_supervisor_id"]')) + .then(els => { + expect(els.length).to.be.eql(1, 'No remove buttons for supervisers as there are not any'); + return els[0].getAttribute('value'); + }) + .then(val => { + expect(val).to.be.eql(String(user_id_C), 'It is indeed user C'); + done(); + }); + }); + + it('Click on "Remove" button next to user C and observe that it disappeares from "secondary supervisors" section after page is reloaded', function(done){ + driver + .findElement(By.css(`button[name="remove_supervisor_id"][value="${ user_id_C }"]`)) + .then(el => el.click()) + .then(() => driver.findElements(By.css('button[name="remove_supervisor_id"]'))) + .then(els => { + expect(els.length, 'There is no users in secondary supervisers section').to.be.eql(0); + done(); + }); }); after(function(done){ - driver.quit().then(function(){ done(); }); + driver.quit().then(() => done()); }); }); From d58232963b99a07059534bec1f12678705d38962 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 16 Nov 2017 14:57:54 +0000 Subject: [PATCH 018/539] Replace old get_superviser to be get_boss --- lib/model/db/leave.js | 6 +----- lib/model/db/user.js | 31 +++++++++++++++++++++---------- lib/route/calendar.js | 4 +++- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index 7aa19181d..1bc0811f1 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -126,11 +126,7 @@ module.exports = function(sequelize, DataTypes) { return Promise.try(function(){ return employee.validate_overlapping(valide_attributes); }) - .then(function(){ - // TODO replace it with simply reusing boss_id of department - return employee.promise_superviser(); - }) - + .then(() => employee.promise_boss()) .then(function(superviser){ var start_date = moment(valide_attributes.from_date), diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 0de4ff3c6..68d610291 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -184,18 +184,29 @@ function get_instance_methods(sequelize) { }, // promise_users_I_can_manage - promise_superviser : function(){ - return this.getDepartment({ - include : [{ - model : sequelize.models.User, - as : 'boss', - }] - }) - .then(function(department){ - return Promise.resolve( department.boss ); - }); + /* + * Return user's boss, the head of department user belongs to + * + * */ + promise_boss : function(){ + return this.getDepartment({ + scope : ['with_boss'], + }) + .then(department => Promise.resolve( department.boss )); }, + /* + * Return users who could supervise current user, that is those who could + * approve its leave requests and who can create leave requests on behalf of + * thos user. + * + * */ + promise_supervisers : function(){ + return this.getDepartment({ + scope : ['with_boss', 'with_supervisors'], + }) + .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisers ) ) ); + }, calculate_number_of_days_available_in_allowance : function(year){ if (! year ){ diff --git a/lib/route/calendar.js b/lib/route/calendar.js index c9fa4ae97..cd72b9a4e 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -102,10 +102,12 @@ router.get('/', function(req, res) { }), req.user.get_company_with_all_leave_types(), req.user.reload_with_leave_details({ year : current_year }), - req.user.promise_superviser(), + req.user.promise_boss(), function(calendar, company, user, superviser){ var full_leave_type_statistics = user.get_leave_statistics_by_types(); + // TODO VPP: replace superviser with superviserS + res.render('calendar', { calendar : _.map(calendar, function(c){return c.as_for_template()}), company : company, From 3008893272ce5a26cec41a775206b7c989913fdb Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 16 Nov 2017 15:50:53 +0000 Subject: [PATCH 019/539] Record actual user who processed given leave request --- lib/model/db/leave.js | 52 +++++++++++++++++++++++++++++++++---------- lib/model/db/user.js | 2 +- lib/route/requests.js | 2 +- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index 1bc0811f1..0fb0a7672 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -349,26 +349,56 @@ get_deducted_days : function(args) { }, // End get_deducted_days promise_to_reject : function() { + let self = this; + + if ( ! args ) { + args = {}; + } + + if ( ! args.by_user ) { + throw new Error('promise_to_reject has to have by_user parameter'); + } + + let by_user = args.by_user; + // See explanation to promise_to_approve - this.status = this.is_pended_revoke_leave() ? + self.status = self.is_pended_revoke_leave() ? Leave.status_approved(): Leave.status_rejected(); - return this.save(); + + self.approverId = by_user.id; + + return self.save(); }, -promise_to_approve : function() { +promise_to_approve : function(args) { + let self = this; + + if ( ! args ) { + args = {}; + } + + if ( ! args.by_user ) { + throw new Error('promise_to_approve has to have by_user parameter'); + } + + let by_user = args.by_user; + // If current leave is one with requested revoke, then // approve action set it into Rejected status // otherwise it is approve action for new leave // so put leave into Approved - this.status = this.is_pended_revoke_leave() ? + self.status = self.is_pended_revoke_leave() ? Leave.status_rejected(): Leave.status_approved(); - return this.save(); + + self.approverId = by_user.id; + + return self.save(); }, -promise_to_revoke : function(){ - var self = this; +promise_to_revoke : function(args){ + let self = this; return self.getUser({ include : [ @@ -384,15 +414,13 @@ promise_to_revoke : function(){ ? Leave.status_rejected() : Leave.status_pended_revoke(); - // TODO this needs to be populated based on actual user who performs - // the "revoke" action. - // In fact it needs to be passed as a parameter. - // And if it is an autoapprove case set it as department's boss + // By default it is user main boss is one who has to approve the revoked request self.approverId = user.department.bossId; + self.status = new_leave_status; return self.save(); - }) + }); }, promise_to_cancel : function(){ diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 68d610291..9919f0a95 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -198,7 +198,7 @@ function get_instance_methods(sequelize) { /* * Return users who could supervise current user, that is those who could * approve its leave requests and who can create leave requests on behalf of - * thos user. + * those user. * * */ promise_supervisers : function(){ diff --git a/lib/route/requests.js b/lib/route/requests.js index 390153b18..d8ba0b77d 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -62,7 +62,7 @@ function leave_request_action(args) { was_pended_revoke = leave_to_process.is_pended_revoke_leave(); - return leave_to_process[leave_action_method](); + return leave_to_process[leave_action_method]({ by_user : req.user }); }) .then(function(processed_leave){ return processed_leave.reload({ From 458ef549c0fe52d0bca3a7f0f9408dd9ff96e53a Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 16 Nov 2017 18:25:26 +0000 Subject: [PATCH 020/539] Replace supervised departments implementation --- lib/model/db/user.js | 41 +++++++++++++++++++++++++++-------------- lib/model/team_view.js | 2 +- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 9919f0a95..ec9cd334a 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -150,12 +150,7 @@ function get_instance_methods(sequelize) { // If current user has any departments under supervision then get // all users from those departments plus user himself, // if no supervised users an array with only current user is returned - return this_user.getSupervised_departments({ - include : [{ - model : sequelize.models.User, - as : 'users', - }], - }) + return this_user.promise_supervised_department() .then(function(departments){ var users = _.flatten( _.map( @@ -208,6 +203,29 @@ function get_instance_methods(sequelize) { .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisers ) ) ); }, + promise_supervised_department : function() { + let self = this; + + return sequelize.models.DepartmentSupervisor.findAll({ where : { user_id : self.id } }) + // Obtain departments current user supervises as secondary superviser + .then(department_supervisers => department_supervisers.map( obj => obj.department_id )) + .then( department_ids => { + + if ( department_ids ) { + department_ids = []; + } + + return sequelize.models.Department.scope('with_simple_users').findAll({ + where : { + $or : [ + { id : department_ids }, + { bossId : self.id }, + ] + } + }); + }); + }, + calculate_number_of_days_available_in_allowance : function(year){ if (! year ){ year = moment().format('YYYY'); @@ -271,13 +289,13 @@ function get_instance_methods(sequelize) { } // make sure I am not supervisor, otherwise throw an error - return self.getSupervised_departments() - .then(function(departments){ + return self.promise_supervised_department() + .then(departments => { if (departments.length > 0){ throw new Error("Cannot remove supervisor"); } - return self.getMy_leaves() + return self.getMy_leaves(); }) .then(function(leaves){ // remove all leaves @@ -528,11 +546,6 @@ function withAssociations() { as : 'supervised_leaves', foreignKey : 'approverId', }); - models.User.hasMany(models.Department, { - as : 'supervised_departments', - foreignKey : 'bossId', - constraints: false, - }); models.User.hasMany(models.UserFeed, { as : 'feeds', foreignKey : 'userId', diff --git a/lib/model/team_view.js b/lib/model/team_view.js index e3318aa29..499cab60b 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -63,7 +63,7 @@ TeamView.prototype.promise_team_view_details = function(args){ // Promise departments either supervised by current user or one that she belongs to promise_departments = Promise.join( user.getDepartment(), - user.getSupervised_departments(), + user.promise_supervised_department(), normalise_departments_func ); } From 4615a760df6c48a2c057bc3719c53f57297786ad Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 17 Nov 2017 10:53:53 +0000 Subject: [PATCH 021/539] Allow secondary approvers to process incoming leaves. --- lib/model/db/leave.js | 2 +- lib/model/db/user.js | 21 ++++++-- lib/model/mixin/user/absence_aware.js | 69 +++++++++++++++------------ 3 files changed, 55 insertions(+), 37 deletions(-) diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index 0fb0a7672..cf8048f14 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -348,7 +348,7 @@ get_deducted_days : function(args) { return leave_days; }, // End get_deducted_days -promise_to_reject : function() { +promise_to_reject : function(args) { let self = this; if ( ! args ) { diff --git a/lib/model/db/user.js b/lib/model/db/user.js index ec9cd334a..79cc15bc3 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -135,6 +135,11 @@ function get_instance_methods(sequelize) { return this.name + ' ' + this.lastname; }, + // TODO VPP: rename this method as its name misleading: it returns all users + // managed by current users + user itslef, so it should be something likne + // "promise_all_supervised_users_plus_me" + // In fact this method probably have to be ditched in favour of more granular ones + // promise_users_I_can_manage : function(){ var this_user = this; @@ -211,7 +216,7 @@ function get_instance_methods(sequelize) { .then(department_supervisers => department_supervisers.map( obj => obj.department_id )) .then( department_ids => { - if ( department_ids ) { + if ( ! department_ids ) { department_ids = []; } @@ -226,6 +231,16 @@ function get_instance_methods(sequelize) { }); }, + promise_supervised_users : function () { + let self = this; + + return self + .promise_supervised_department() + .then(departments => { + return self.Model.findAll({ where : { DepartmentId : departments.map(d => d.id ) } }); + }) + }, + calculate_number_of_days_available_in_allowance : function(year){ if (! year ){ year = moment().format('YYYY'); @@ -542,10 +557,6 @@ function withAssociations() { as : 'my_leaves', foreignKey : 'userId', }); - models.User.hasMany(models.Leave, { - as : 'supervised_leaves', - foreignKey : 'approverId', - }); models.User.hasMany(models.UserFeed, { as : 'feeds', foreignKey : 'userId', diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index b8add69c5..5ba7419aa 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -279,40 +279,47 @@ module.exports = function(sequelize){ // Promise leaves that are needed to be Approved/Rejected // this.promise_leaves_to_be_processed = function(){ - return this.getSupervised_leaves({ - include : [{ - model : sequelize.models.LeaveType, - as : 'leave_type', - },{ - model : sequelize.models.User, - as : 'user', - include : [{ - model : sequelize.models.Company, - as : 'company', + let self = this; + + return self + .promise_supervised_users() + .then(users => { + return sequelize.models.Leave.findAll({ include : [{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', + model : sequelize.models.LeaveType, + as : 'leave_type', + },{ + model : sequelize.models.User, + as : 'user', + include : [{ + model : sequelize.models.Company, + as : 'company', + include : [{ + model : sequelize.models.BankHoliday, + as : 'bank_holidays', + }], + },{ + model : sequelize.models.Department, + as : 'department', + }], }], - },{ - model : sequelize.models.Department, - as : 'department', - }], - }], - where : { - status : [ - sequelize.models.Leave.status_new(), - sequelize.models.Leave.status_pended_revoke() - ] - }, - }) - .then(function(leaves){ - return Promise.resolve(leaves).map(function(leave){ - return leave.user.promise_schedule_I_obey(); - },{ - concurrency : 10, + where : { + status : [ + sequelize.models.Leave.status_new(), + sequelize.models.Leave.status_pended_revoke() + ], + userId : users.map(u => u.id), + }, + }) }) - .then(function(){ return Promise.resolve(leaves) }); - }); + .then( leaves => Promise + .resolve(leaves) + .map( + leave => leave.user.promise_schedule_I_obey(), + { concurrency : 10 } + ) + .then( () => Promise.resolve(leaves) ) + ); }; // END of promise_leaves_to_be_processed this.promise_cancelable_leaves = function(){ From 7d4cd6ac21488f2e83b50977fe90ba845e911a5e Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 17 Nov 2017 16:12:12 +0000 Subject: [PATCH 022/539] Some renamings --- lib/model/db/leave.js | 4 ++-- lib/model/db/user.js | 8 ++++---- lib/model/team_view.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index cf8048f14..ea3cc2a4a 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -127,7 +127,7 @@ module.exports = function(sequelize, DataTypes) { return employee.validate_overlapping(valide_attributes); }) .then(() => employee.promise_boss()) - .then(function(superviser){ + .then(function(main_superviser){ var start_date = moment(valide_attributes.from_date), end_date = moment(valide_attributes.to_date); @@ -147,7 +147,7 @@ module.exports = function(sequelize, DataTypes) { userId : employee.id, leaveTypeId : leave_type.id, status : new_leave_status, - approverId : superviser.id, + approverId : main_superviser.id, employee_comment : valide_attributes.reason, date_start : start_date.format('YYYY-MM-DD'), diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 79cc15bc3..8766b5e6c 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -155,7 +155,7 @@ function get_instance_methods(sequelize) { // If current user has any departments under supervision then get // all users from those departments plus user himself, // if no supervised users an array with only current user is returned - return this_user.promise_supervised_department() + return this_user.promise_supervised_departments() .then(function(departments){ var users = _.flatten( _.map( @@ -208,7 +208,7 @@ function get_instance_methods(sequelize) { .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisers ) ) ); }, - promise_supervised_department : function() { + promise_supervised_departments : function() { let self = this; return sequelize.models.DepartmentSupervisor.findAll({ where : { user_id : self.id } }) @@ -235,7 +235,7 @@ function get_instance_methods(sequelize) { let self = this; return self - .promise_supervised_department() + .promise_supervised_departments() .then(departments => { return self.Model.findAll({ where : { DepartmentId : departments.map(d => d.id ) } }); }) @@ -304,7 +304,7 @@ function get_instance_methods(sequelize) { } // make sure I am not supervisor, otherwise throw an error - return self.promise_supervised_department() + return self.promise_supervised_departments() .then(departments => { if (departments.length > 0){ throw new Error("Cannot remove supervisor"); diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 499cab60b..53cbede9c 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -63,7 +63,7 @@ TeamView.prototype.promise_team_view_details = function(args){ // Promise departments either supervised by current user or one that she belongs to promise_departments = Promise.join( user.getDepartment(), - user.promise_supervised_department(), + user.promise_supervised_departments(), normalise_departments_func ); } From 5325c1662e927ef823a6fe275dcd22d2adeb5aa9 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 17 Nov 2017 16:29:03 +0000 Subject: [PATCH 023/539] More renamings - to eradicate supervisEr --- lib/model/db/company.js | 2 +- lib/model/db/leave.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 34ecd86fd..404736fc5 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -263,7 +263,7 @@ module.exports = function(sequelize, DataTypes) { }); }) - // Update departments with correct user IDs for superviser + // Update departments with correct user IDs for supervisor // .then(function(){ return Promise.all( diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index ea3cc2a4a..bbcd55e50 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -127,7 +127,7 @@ module.exports = function(sequelize, DataTypes) { return employee.validate_overlapping(valide_attributes); }) .then(() => employee.promise_boss()) - .then(function(main_superviser){ + .then(function(main_supervisor){ var start_date = moment(valide_attributes.from_date), end_date = moment(valide_attributes.to_date); @@ -147,7 +147,7 @@ module.exports = function(sequelize, DataTypes) { userId : employee.id, leaveTypeId : leave_type.id, status : new_leave_status, - approverId : main_superviser.id, + approverId : main_supervisor.id, employee_comment : valide_attributes.reason, date_start : start_date.format('YYYY-MM-DD'), From 5ba47fed4a3fe408f264006a7954b5064af5591d Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 17 Nov 2017 16:36:31 +0000 Subject: [PATCH 024/539] More supervisers to become supervisors --- lib/model/db/user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 8766b5e6c..a4874fb65 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -201,11 +201,11 @@ function get_instance_methods(sequelize) { * those user. * * */ - promise_supervisers : function(){ + promise_supervisors : function(){ return this.getDepartment({ scope : ['with_boss', 'with_supervisors'], }) - .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisers ) ) ); + .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisors ) ) ); }, promise_supervised_departments : function() { From 180103ad19bd3c0ee8a83b9bb56210a09740802c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 20 Nov 2017 16:57:28 +0000 Subject: [PATCH 025/539] Calendar to show all supervisors --- lib/model/db/user.js | 6 +++--- lib/route/calendar.js | 12 ++++-------- views/calendar.hbs | 7 ++++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index a4874fb65..0e61581d4 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -205,15 +205,15 @@ function get_instance_methods(sequelize) { return this.getDepartment({ scope : ['with_boss', 'with_supervisors'], }) - .then( department => Promise.resolve( Array.concat( [department.boss], department.supervisors ) ) ); + .then( department => Promise.resolve( _.flatten([ department.boss, department.supervisors ]) ) ); }, promise_supervised_departments : function() { let self = this; return sequelize.models.DepartmentSupervisor.findAll({ where : { user_id : self.id } }) - // Obtain departments current user supervises as secondary superviser - .then(department_supervisers => department_supervisers.map( obj => obj.department_id )) + // Obtain departments current user supervises as secondary supervisor + .then(department_supervisors => department_supervisors.map( obj => obj.department_id )) .then( department_ids => { if ( ! department_ids ) { diff --git a/lib/route/calendar.js b/lib/route/calendar.js index cd72b9a4e..ffc6d3028 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -102,25 +102,21 @@ router.get('/', function(req, res) { }), req.user.get_company_with_all_leave_types(), req.user.reload_with_leave_details({ year : current_year }), - req.user.promise_boss(), - function(calendar, company, user, superviser){ + req.user.promise_supervisors(), + function(calendar, company, user, supervisors){ var full_leave_type_statistics = user.get_leave_statistics_by_types(); - // TODO VPP: replace superviser with superviserS - res.render('calendar', { calendar : _.map(calendar, function(c){return c.as_for_template()}), company : company, title : 'Calendar', current_user : user, - superviser : superviser, + supervisors : supervisors, previous_year : moment(current_year).add(-1,'year').format('YYYY'), current_year : current_year.format('YYYY'), next_year : moment(current_year).add(1,'year').format('YYYY'), show_full_year : show_full_year, - leave_type_statistics : _.filter(full_leave_type_statistics, function(st){ - return st.days_taken > 0; - }), + leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), full_leave_type_statistics : full_leave_type_statistics, this_year : moment().format('YYYY'), }); diff --git a/views/calendar.hbs b/views/calendar.hbs index 726eb3265..b7178b704 100644 --- a/views/calendar.hbs +++ b/views/calendar.hbs @@ -57,7 +57,12 @@
- +
    {{# each department.supervisors }} From 2948771aac580bb58c0cf3aeac366bb86aa11069 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 6 Dec 2017 12:47:53 +0000 Subject: [PATCH 028/539] $start migrating blocking functions to async style Migrate promise_number_of_days_available_in_allowance to non blocking version --- lib/model/db/user.js | 20 +++++++++++++ lib/model/mixin/user/absence_aware.js | 30 +++++++++++-------- package.json | 2 +- .../leave_request/basic_leave_request.js | 6 ++-- 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 0e61581d4..39cfbd734 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -241,6 +241,13 @@ function get_instance_methods(sequelize) { }) }, + /* + * DEPRECATED + * + * Consider using non-blocking version: + * promise_number_of_days_available_in_allowance + * + * */ calculate_number_of_days_available_in_allowance : function(year){ if (! year ){ year = moment().format('YYYY'); @@ -249,6 +256,19 @@ function get_instance_methods(sequelize) { - this.calculate_number_of_days_taken_from_allowance({year : year}); }, + /* + * Async version of getting number of days remaining in allowance for + * current user + * + * */ + promise_number_of_days_available_in_allowance : function(year) { + let self = this; + + return Promise.resolve( + self.calculate_number_of_days_available_in_allowance(year) + ); + }, + reload_with_leave_details : function(args){ var year = args.year || moment(), diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 5ba7419aa..027149fd6 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -525,24 +525,30 @@ module.exports = function(sequelize){ return employee.company.reload_with_bank_holidays() .then(function(){ return Promise.resolve(employee); }); }) - .then(function(employee){ + .then(employee => + employee.promise_number_of_days_available_in_allowance( + year.format('YYYY') + ) + .then(number_of_days => Promise.resolve([number_of_days, employee])) + ) + .then(function(args){ + let days_remaining_in_allowance = args[0], + employee = args[1]; - // Throw an exception when less than zero vacation would remain - // if we add currently requested absence - if ( - employee.calculate_number_of_days_available_in_allowance( - year.format('YYYY') - ) - - - leave.get_deducted_days_number({ + let deducted_days = leave.get_deducted_days_number({ year : year.format('YYYY'), user : employee, leave_type : leave_type, - }) - < - 0 + }); + + // Throw an exception when less than zero vacation would remain + // if we add currently requested absence + if ( + days_remaining_in_allowance - deducted_days < 0 ) { + console.log('Days remaining: ' + days_remaining_in_allowance + ', dayes deducted: ' + deducted_days); + var error = new Error('Requested absence is longer than remaining allowance'); error.user_message = error.toString(); throw error; diff --git a/package.json b/package.json index 221921717..03585aeb9 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "chai": "^2.2.0", - "mocha": "^2.2.4", + "mocha": "^3.5.3", "node-sass": "^4.5.3", "selenium-webdriver": "2.45.1" }, diff --git a/t/integration/leave_request/basic_leave_request.js b/t/integration/leave_request/basic_leave_request.js index 756ad7bf3..c25548c73 100644 --- a/t/integration/leave_request/basic_leave_request.js +++ b/t/integration/leave_request/basic_leave_request.js @@ -277,7 +277,7 @@ describe("Use problematic date with non default date format", function(){ it("Open calendar page", function(done){ open_page_func({ - url : application_host + 'calendar/?year=2017&show_full_year=1', + url : application_host + 'calendar/?year=2016&show_full_year=1', driver : driver, }) .then(function(){ done(); }) @@ -302,10 +302,10 @@ describe("Use problematic date with non default date format", function(){ value : "2", },{ selector : 'input#from', - value : '22/08/17', + value : '24/08/16', },{ selector : 'input#to', - value : '23/08/17', + value : '25/08/16', }], message : /New leave request was added/, }) From 9e250e521d89905079ea1ed01f9ac29761482b87 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 6 Dec 2017 14:03:31 +0000 Subject: [PATCH 029/539] Deprecate calculate_number_of_days_available_in_allowance --- lib/model/db/user.js | 9 ++++++-- lib/route/calendar.js | 39 ++++++++++++++++++------------- lib/route/users.js | 54 +++++++++++++++++++++++++++++++++++-------- views/calendar.hbs | 2 +- views/users.hbs | 6 +++-- 5 files changed, 80 insertions(+), 30 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 39cfbd734..8b208ba8d 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -248,7 +248,12 @@ function get_instance_methods(sequelize) { * promise_number_of_days_available_in_allowance * * */ - calculate_number_of_days_available_in_allowance : function(year){ + calculate_number_of_days_available_in_allowance : function(year, deprecate){ + + if ( deprecate !== 'deprecated' ) { + throw new Error('calculate_number_of_days_available_in_allowance is deprecated!'); + } + if (! year ){ year = moment().format('YYYY'); } @@ -265,7 +270,7 @@ function get_instance_methods(sequelize) { let self = this; return Promise.resolve( - self.calculate_number_of_days_available_in_allowance(year) + self.calculate_number_of_days_available_in_allowance(year, 'deprecated') ); }, diff --git a/lib/route/calendar.js b/lib/route/calendar.js index ffc6d3028..45a6eb291 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -104,22 +104,29 @@ router.get('/', function(req, res) { req.user.reload_with_leave_details({ year : current_year }), req.user.promise_supervisors(), function(calendar, company, user, supervisors){ - var full_leave_type_statistics = user.get_leave_statistics_by_types(); - - res.render('calendar', { - calendar : _.map(calendar, function(c){return c.as_for_template()}), - company : company, - title : 'Calendar', - current_user : user, - supervisors : supervisors, - previous_year : moment(current_year).add(-1,'year').format('YYYY'), - current_year : current_year.format('YYYY'), - next_year : moment(current_year).add(1,'year').format('YYYY'), - show_full_year : show_full_year, - leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), - full_leave_type_statistics : full_leave_type_statistics, - this_year : moment().format('YYYY'), - }); + let + full_leave_type_statistics = user.get_leave_statistics_by_types(), + this_year = moment().format('YYYY'); + + user + .promise_number_of_days_available_in_allowance( this_year ) + .then( number_of_days_available_in_allowance => res + .render('calendar', { + calendar : _.map(calendar, function(c){return c.as_for_template()}), + company : company, + title : 'Calendar', + current_user : user, + supervisors : supervisors, + previous_year : moment(current_year).add(-1,'year').format('YYYY'), + current_year : current_year.format('YYYY'), + next_year : moment(current_year).add(1,'year').format('YYYY'), + show_full_year : show_full_year, + leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), + full_leave_type_statistics : full_leave_type_statistics, + this_year : this_year, + number_of_days_available_in_allowance : number_of_days_available_in_allowance, + }) + ); } ); diff --git a/lib/route/users.js b/lib/route/users.js index 791a15697..f2d64c5b2 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -150,11 +150,18 @@ router.get('/edit/:user_id/absences/', function(req, res){ return employee.reload_with_session_details(); }) .then( employee => employee.reload_with_leave_details({})) - .then(employee => { + .then(employee => employee + .promise_number_of_days_available_in_allowance() + .then( days => Promise.resolve([days, employee]) ) + ) + .then(args => { + let + remaining_allowance = args[0], + employee = args[1]; let leave_statistics = { total_for_current_year : employee.calculate_total_number_of_days_n_allowance(), - remaining : employee.calculate_number_of_days_available_in_allowance(), + remaining : remaining_allowance, }; leave_statistics.used_so_far = leave_statistics.total_for_current_year - leave_statistics.remaining; @@ -601,13 +608,42 @@ router.get('/', function(req, res) { .then(function(){ return Promise.resolve(company) }); }) - .then(function(company){ - res.render('users', { - title : company.name + "'s people", - users : company.users, - company : company, - department_id : Number(department_id), - }); + /* + * Following block builds array of object for each user in company. + * Each object consist of following keys: + * - user_row : reference to the sequelize user row object + * - number_of_days_available_in_allowance : number of days remaining in allowance for given user + * + * This step is necessary because we are moving to non-blocking API for libraries, + * so we need to get all data before passing it into template as template + * + * */ + .then(company => Promise + .resolve(company.users) + .map(user => user + .promise_number_of_days_available_in_allowance() + .then(number_of_days => Promise.resolve({ + user_row : user, + number_of_days_available_in_allowance : number_of_days, + })), + { + concurrency : 10 + } + ) + .then(users_info => Promise.resolve([company, users_info])) + ) + + .then(function(args){ + let + company = args[0], + users_info = args[1]; + + res.render('users', { + company : company, + department_id : Number(department_id), + title : company.name + "'s people", + users_info : users_info, + }); }); }); diff --git a/views/calendar.hbs b/views/calendar.hbs index b7178b704..0fa2aad6b 100644 --- a/views/calendar.hbs +++ b/views/calendar.hbs @@ -22,7 +22,7 @@
    {{#with current_user }} -
    {{ this.calculate_number_of_days_available_in_allowance ../this_year }}
    +
    {{ ../number_of_days_available_in_allowance }}
    Days remaining
    out of {{this.calculate_total_number_of_days_n_allowance ../this_year}} in Allowance
    {{/with}} diff --git a/views/users.hbs b/views/users.hbs index 5031cc843..717f8d6c6 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -33,14 +33,16 @@ - {{# each users}} + {{# each users_info}} + {{# with this.user_row}} {{this.full_name}} {{this.department.name}} {{# if this.admin }}Yes{{else}}{{/if}} - {{ this.calculate_number_of_days_available_in_allowance}} + {{ ../number_of_days_available_in_allowance }} {{this.calculate_number_of_days_taken_from_allowance}} + {{/with}} {{/each}} From e0a93d185026aaea878eb35e2039e17e4b05aa07 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 6 Dec 2017 14:16:38 +0000 Subject: [PATCH 030/539] Completely remove promise_number_of_days_available_in_allowance --- lib/model/db/user.js | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 8b208ba8d..4686abbaa 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -242,39 +242,23 @@ function get_instance_methods(sequelize) { }, /* - * DEPRECATED - * - * Consider using non-blocking version: - * promise_number_of_days_available_in_allowance + * Async version of getting number of days remaining in allowance for + * current user * * */ - calculate_number_of_days_available_in_allowance : function(year, deprecate){ - - if ( deprecate !== 'deprecated' ) { - throw new Error('calculate_number_of_days_available_in_allowance is deprecated!'); - } + promise_number_of_days_available_in_allowance : function(year) { + let self = this; if (! year ){ year = moment().format('YYYY'); } - return this.calculate_total_number_of_days_n_allowance(year) - - this.calculate_number_of_days_taken_from_allowance({year : year}); - }, - /* - * Async version of getting number of days remaining in allowance for - * current user - * - * */ - promise_number_of_days_available_in_allowance : function(year) { - let self = this; + let number_of_days = self.calculate_total_number_of_days_n_allowance(year) + - self.calculate_number_of_days_taken_from_allowance({year : year}); - return Promise.resolve( - self.calculate_number_of_days_available_in_allowance(year, 'deprecated') - ); + return Promise.resolve( number_of_days ); }, - reload_with_leave_details : function(args){ var year = args.year || moment(), self = this; From 80073ee8a599ba01a0380f499f6b12eb214ed986 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 18 Dec 2017 12:50:53 +0000 Subject: [PATCH 031/539] Introduce little bit of caching --- lib/model/db/user.js | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 4686abbaa..d2b526971 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -242,20 +242,40 @@ function get_instance_methods(sequelize) { }, /* - * Async version of getting number of days remaining in allowance for - * current user + * Calculate number of days available in allowance for current employee. * * */ promise_number_of_days_available_in_allowance : function(year) { let self = this; - if (! year ){ + if ( ! year ){ year = moment().format('YYYY'); } + // To avoid redundant trips to DB check cached value first + if ( self.tom_cach && + self.tom_cach.hasOwnProperty('number_of_days_available_in_allowance') && + self.tom_cach.number_of_days_available_in_allowance.hasOwnProperty( year ) + ) { + return Promise.resolve( + self.tom_cach.number_of_days_available_in_allowance[year] + ); + } + let number_of_days = self.calculate_total_number_of_days_n_allowance(year) - self.calculate_number_of_days_taken_from_allowance({year : year}); + // Cach calculated value + if ( ! self.hasOwnProperty('tom_cach') ) { + self.tom_cach = {}; + } + + if ( ! self.tom_cach.hasOwnProperty('number_of_days_available_in_allowance')) { + self.tom_cach.number_of_days_available_in_allowance = {}; + } + + self.tom_cach.number_of_days_available_in_allowance[year] = number_of_days; + return Promise.resolve( number_of_days ); }, From a6068f763b8283b01962344d6860f13dfdba61bf Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 18 Dec 2017 16:23:21 +0000 Subject: [PATCH 032/539] Control GA tag over app config --- config/app.json | 1 + lib/view/helpers.js | 10 ++++++++++ views/layouts/main.hbs | 27 +++++++++++++-------------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/config/app.json b/config/app.json index 689890f2d..060c86fa8 100644 --- a/config/app.json +++ b/config/app.json @@ -10,6 +10,7 @@ "pass" : "pass" } }, + "ga_analytics_on" : false, "crypto_secret" : "!2~`HswpPPLa22+=±§sdq qwe,appp qwwokDF_", "application_domain" : "http://app.timeoff.management", "promotion_website_domain" : "http://timeoff.management" diff --git a/lib/view/helpers.js b/lib/view/helpers.js index c6b27d694..b8680b433 100644 --- a/lib/view/helpers.js +++ b/lib/view/helpers.js @@ -91,5 +91,15 @@ module.exports = function(){ return arg.join(''); }, + // Should we include Google Analitics snipet? + // (based on application config) + is_ga_analitics_on : function(options) { + if ( !!config.get('ga_analytics_on') ) { + return options.fn(this); + } + + return options.inverse(this); + }, + }; }; diff --git a/views/layouts/main.hbs b/views/layouts/main.hbs index 500302aa6..3b3c6a8a9 100644 --- a/views/layouts/main.hbs +++ b/views/layouts/main.hbs @@ -29,21 +29,20 @@ - {{#each custom_java_script}} + {{~#each custom_java_script~}} - {{/each}} - + {{~/ is_ga_analitics_on ~}} - From 91b7927d575ed2c2d0bbe8b77ccca4fcb1bb3b85 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 18 Dec 2017 17:22:17 +0000 Subject: [PATCH 033/539] Introduce companywide mesasges --- lib/model/db/company.js | 6 ++++++ views/partials/header.hbs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 404736fc5..209ca54c5 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -60,6 +60,12 @@ module.exports = function(sequelize, DataTypes) { allowNull : false, defaultValue : 'YYYY-MM-DD', }, + company_wide_message : { + type : DataTypes.TEXT, + allowNull : true, + defaultValue : null, + comment : 'Message shown to all users that belong to current company', + }, }, { indexes : [ diff --git a/views/partials/header.hbs b/views/partials/header.hbs index bba2e01b6..f7dce82ef 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -62,6 +62,12 @@
    +{{# if logged_user }} + {{# if logged_user.company.company_wide_message }} + + {{/if}} +{{/if}} +
From cc1be2d8e50913209a8552e8401960ee3242badd Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 18 Dec 2017 17:28:02 +0000 Subject: [PATCH 034/539] Add missing migration --- migrations/20171218-company-wide-message.js | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 migrations/20171218-company-wide-message.js diff --git a/migrations/20171218-company-wide-message.js b/migrations/20171218-company-wide-message.js new file mode 100644 index 000000000..99751b343 --- /dev/null +++ b/migrations/20171218-company-wide-message.js @@ -0,0 +1,27 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + queryInterface.describeTable('Companies').then(function(attributes){ + + if (attributes.hasOwnProperty('company_wide_message')) { + return 1; + } + + return queryInterface.addColumn( + 'Companies', + 'company_wide_message', + models.Company.attributes.company_wide_message + ); + }); + + }, + + down: function (queryInterface, Sequelize) { + return queryInterface.removeColumn('Companies', 'company_wide_message'); + } +}; From 384964f118c457f4f05fdcc2a805dfb0dda85282 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 19 Dec 2017 15:15:47 +0000 Subject: [PATCH 035/539] Add table to track the allowance adjustment per year --- lib/model/db/user_allowance_adjustment.js | 43 +++++++++++++++++++ .../20171219-allowance-adjustment-per-year.js | 36 ++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 lib/model/db/user_allowance_adjustment.js create mode 100644 migrations/20171219-allowance-adjustment-per-year.js diff --git a/lib/model/db/user_allowance_adjustment.js b/lib/model/db/user_allowance_adjustment.js new file mode 100644 index 000000000..e4a471d2f --- /dev/null +++ b/lib/model/db/user_allowance_adjustment.js @@ -0,0 +1,43 @@ + +"use strict"; + +const moment = require('moment'); + +module.exports = function(sequelize, DataTypes){ + let UserAllowanceAdjustment = sequelize.define("UserAllowanceAdjustment", { + year : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : moment().format('YYYY'), + comment : 'Year when adjustment is applied', + }, + adjustment : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : 0, + comment : 'Adjustment to allowance in current year', + }, + }, { + underscored : true, + freezeTableName : true, + timestamps : true, + createdAt : 'created_at', + updatedAt : false, + tableName : 'user_allowance_adjustment', + indexes : [{ + fields : [ 'user_id' ], + }], + + classMethods : { + associate : function(models) { + UserAllowanceAdjustment.belongsTo(models.User, { + as : 'user', + foreignKey : 'user_id', + }); + }, + }, + + }); + + return UserAllowanceAdjustment; +}; diff --git a/migrations/20171219-allowance-adjustment-per-year.js b/migrations/20171219-allowance-adjustment-per-year.js new file mode 100644 index 000000000..a8e54ee3d --- /dev/null +++ b/migrations/20171219-allowance-adjustment-per-year.js @@ -0,0 +1,36 @@ + +'use strict'; + +var models = require('../lib/model/db'), + Promise = require('bluebird'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + queryInterface.describeTable('Users') + .then(function(attributes){ + + if ( ! attributes.hasOwnProperty('adjustment')) { + return 1; + } + + let sql = 'INSERT INTO user_allowance_adjustment (year, adjustment, user_id, created_at) ' + + 'SELECT 2017 AS year, adjustment as adjustment, id as user_id, date() || \' \' || time() as created_at ' + + 'FROM users'; + + console.log(sql); + + return queryInterface.sequelize.query( sql ); + }) + + // TODO remove the users.adjustment column + + .then(() => Promise.resolve()); + + }, + + down: function (queryInterface, Sequelize) { + // No way back! + return Promise.resolve(); + } +}; From ef001b3d7f67118c3c465883f0210f17104920a5 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 09:31:29 +0000 Subject: [PATCH 036/539] Conver one more allawance calculating routine to be async --- lib/model/db/user.js | 30 +++++++++++++++++---------- lib/model/mixin/user/absence_aware.js | 25 +++++++++++++++++++++- lib/route/calendar.js | 8 ++++--- lib/route/users.js | 18 +++++++++++----- views/calendar.hbs | 4 ++-- 5 files changed, 63 insertions(+), 22 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index d2b526971..5bb756358 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -262,21 +262,29 @@ function get_instance_methods(sequelize) { ); } - let number_of_days = self.calculate_total_number_of_days_n_allowance(year) - - self.calculate_number_of_days_taken_from_allowance({year : year}); - // Cach calculated value - if ( ! self.hasOwnProperty('tom_cach') ) { - self.tom_cach = {}; - } - if ( ! self.tom_cach.hasOwnProperty('number_of_days_available_in_allowance')) { - self.tom_cach.number_of_days_available_in_allowance = {}; - } + return self - self.tom_cach.number_of_days_available_in_allowance[year] = number_of_days; + .promise_total_number_of_days_in_allowance(year) - return Promise.resolve( number_of_days ); + .then(total_days_number => total_days_number - self.calculate_number_of_days_taken_from_allowance({year : year})) + + .then(number_of_days => { + + // Cach calculated value + if ( ! self.hasOwnProperty('tom_cach') ) { + self.tom_cach = {}; + } + + if ( ! self.tom_cach.hasOwnProperty('number_of_days_available_in_allowance')) { + self.tom_cach.number_of_days_available_in_allowance = {}; + } + + self.tom_cach.number_of_days_available_in_allowance[year] = number_of_days; + + return Promise.resolve( number_of_days ); + }); }, reload_with_leave_details : function(args){ diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 027149fd6..d2df14570 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -453,7 +453,7 @@ module.exports = function(sequelize){ }; - this.calculate_total_number_of_days_n_allowance = function(year) { + this._calculate_total_number_of_days_n_allowance = function(year) { // If optional paramater year was provided we need to calculate allowance // for that year, and if it is something other then current year, @@ -471,6 +471,29 @@ module.exports = function(sequelize){ + this.adjustment; }; + this.promise_total_number_of_days_in_allowance = function(year){ + let self = this; + + return Promise + + // First ensure that all necessary properties are available + .try(() => { + if ( ! self.department) { + return self.getDepartment() + .then(department => { + self.department = department; + return Promise.resolve(); + }) + } + + return Promise.resolve(); + }) + + .then(() => Promise.resolve( + self._calculate_total_number_of_days_n_allowance(year) + )); + }; + this.promise_my_leaves_for_calendar = function(args){ var year = args.year || moment(); diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 45a6eb291..cb077901b 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -103,7 +103,8 @@ router.get('/', function(req, res) { req.user.get_company_with_all_leave_types(), req.user.reload_with_leave_details({ year : current_year }), req.user.promise_supervisors(), - function(calendar, company, user, supervisors){ + req.user.promise_total_number_of_days_in_allowance(current_year), + function(calendar, company, user, supervisors, total_number_of_days_in_allowance){ let full_leave_type_statistics = user.get_leave_statistics_by_types(), this_year = moment().format('YYYY'); @@ -121,10 +122,11 @@ router.get('/', function(req, res) { current_year : current_year.format('YYYY'), next_year : moment(current_year).add(1,'year').format('YYYY'), show_full_year : show_full_year, - leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), + leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), full_leave_type_statistics : full_leave_type_statistics, - this_year : this_year, + this_year : this_year, number_of_days_available_in_allowance : number_of_days_available_in_allowance, + total_number_of_days_in_allowance : total_number_of_days_in_allowance, }) ); } diff --git a/lib/route/users.js b/lib/route/users.js index f2d64c5b2..a978b5fd2 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -150,17 +150,25 @@ router.get('/edit/:user_id/absences/', function(req, res){ return employee.reload_with_session_details(); }) .then( employee => employee.reload_with_leave_details({})) - .then(employee => employee - .promise_number_of_days_available_in_allowance() - .then( days => Promise.resolve([days, employee]) ) + .then(employee => Promise.join( + employee + .promise_number_of_days_available_in_allowance() + .then( days => Promise.resolve([days, employee]) ), + employee + .promise_total_number_of_days_in_allowance(), + (args, total_days_number) => { + args.push(total_days_number); + return Promise.resolve(args); + }) ) .then(args => { let remaining_allowance = args[0], - employee = args[1]; + employee = args[1], + total_days_number = args[2]; let leave_statistics = { - total_for_current_year : employee.calculate_total_number_of_days_n_allowance(), + total_for_current_year : total_days_number, remaining : remaining_allowance, }; diff --git a/views/calendar.hbs b/views/calendar.hbs index 0fa2aad6b..4de7f4cf9 100644 --- a/views/calendar.hbs +++ b/views/calendar.hbs @@ -24,7 +24,7 @@ {{#with current_user }}
{{ ../number_of_days_available_in_allowance }}
Days remaining
-
out of {{this.calculate_total_number_of_days_n_allowance ../this_year}} in Allowance
+
out of {{ ../total_number_of_days_in_allowance }} in Allowance
{{/with}}
@@ -64,7 +64,7 @@ {{~/ each ~}}
Department: {{ current_user.department.name }}
-
Allowance in {{this_year}}: {{#with current_user}}{{ this.calculate_total_number_of_days_n_allowance ../this_year }}{{/with}} days
+
Allowance in {{this_year}}: {{ total_number_of_days_in_allowance }} days
From c2e3e142a6e75c3c24d1767ccb92f0eea3af4a80 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 12:09:53 +0000 Subject: [PATCH 037/539] Use adjustemtn from source --- lib/model/db/user.js | 4 ++ lib/model/db/user_allowance_adjustment.js | 3 +- lib/model/mixin/user/absence_aware.js | 78 ++++++++++++++++++++--- lib/route/users.js | 60 +++++++++++++---- views/partials/user_details/absences.hbs | 2 +- views/partials/user_details/general.hbs | 2 - 6 files changed, 123 insertions(+), 26 deletions(-) diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 5bb756358..65a5c7bcb 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -598,6 +598,10 @@ function withAssociations() { as : 'feeds', foreignKey : 'userId', }); + models.User.hasMany(models.UserAllowanceAdjustment, { + as : 'adjustments', + foreignKey : 'user_id', + }); }; } diff --git a/lib/model/db/user_allowance_adjustment.js b/lib/model/db/user_allowance_adjustment.js index e4a471d2f..8e58f3d82 100644 --- a/lib/model/db/user_allowance_adjustment.js +++ b/lib/model/db/user_allowance_adjustment.js @@ -25,7 +25,8 @@ module.exports = function(sequelize, DataTypes){ updatedAt : false, tableName : 'user_allowance_adjustment', indexes : [{ - fields : [ 'user_id' ], + fields : [ 'user_id', 'year' ], + unique : true, }], classMethods : { diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index d2df14570..48dd8d940 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -452,23 +452,25 @@ module.exports = function(sequelize){ )); }; - - this._calculate_total_number_of_days_n_allowance = function(year) { + this._calculate_total_number_of_days_n_allowance = function(args) { + let + self = this, + year = args.year, + adjustment = args.adjustment; // If optional paramater year was provided we need to calculate allowance // for that year, and if it is something other then current year, // we use department nominal allowance plus employee's allowance // (ignoreing automatic allowance) if (year && year != moment().year()) { - return this.department.allowance - + this.adjustment; + return self.department.allowance + + adjustment; } // Get general allowance based on department - return this.department.allowance - + this.get_automatic_adjustment() - // Adjust it based on current user - + this.adjustment; + return self.department.allowance + + self.get_automatic_adjustment() + + adjustment; }; this.promise_total_number_of_days_in_allowance = function(year){ @@ -489,11 +491,67 @@ module.exports = function(sequelize){ return Promise.resolve(); }) - .then(() => Promise.resolve( - self._calculate_total_number_of_days_n_allowance(year) + // Fetch Adjustment for current year + .then(() => self.promise_adjustmet_for_year(year)) + + .then(adjustment => Promise.resolve( + self._calculate_total_number_of_days_n_allowance({ + year : year, + adjustment : adjustment, + }) )); }; + this.promise_adjustmet_for_year = function(year){ + let self = this; + + year = year || moment(); + year = moment(year).format('YYYY'); + + return self + .getAdjustments({ + where : { year : year } + }) + .then(adjustment_records => { + + // By deafault there is not adjustments + let adjustment = 0; + + if (adjustment_records.length === 1) { + adjustment = adjustment_records[0].adjustment; + } + + return Promise.resolve(adjustment); + }); + }; + + this.promise_to_update_adjustment = function(args) { + let + self = this, + year = args.year || moment().format('YYYY'), + adjustment = args.adjustment; + + // Update related allowance adjustement record + return sequelize.models.UserAllowanceAdjustment + .findOrCreate({ + where : { + user_id : self.id, + year : year, + }, + defaults : { adjustment : adjustment }, + }) + .spread((record, created) => { + + if ( created ) { + return Promise.resolve(); + } + + record.set('adjustment', adjustment); + + return record.save(); + }); + }; + this.promise_my_leaves_for_calendar = function(args){ var year = args.year || moment(); diff --git a/lib/route/users.js b/lib/route/users.js index a978b5fd2..cc4335ebf 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -67,8 +67,12 @@ router.post('/add/', function(req, res){ }); }) - .then(function(new_user_attributes){ - return model.User.create(new_user_attributes); + .then(new_user_attributes => { + + // User table is not going to hold adjustments + delete new_user_attributes.adjustment; + + return model.User.create(new_user_attributes) }) .then(function(new_user){ @@ -151,13 +155,20 @@ router.get('/edit/:user_id/absences/', function(req, res){ }) .then( employee => employee.reload_with_leave_details({})) .then(employee => Promise.join( + employee .promise_number_of_days_available_in_allowance() .then( days => Promise.resolve([days, employee]) ), + employee .promise_total_number_of_days_in_allowance(), - (args, total_days_number) => { + + employee + .promise_adjustmet_for_year(moment().format('YYYY')), + + (args, total_days_number, employee_adjustment) => { args.push(total_days_number); + args.push(employee_adjustment); return Promise.resolve(args); }) ) @@ -165,7 +176,8 @@ router.get('/edit/:user_id/absences/', function(req, res){ let remaining_allowance = args[0], employee = args[1], - total_days_number = args[2]; + total_days_number = args[2], + employee_adjustment = args[3]; let leave_statistics = { total_for_current_year : total_days_number, @@ -194,6 +206,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ show_absence_tab : true, leave_type_statistics : employee.get_leave_statistics_by_types(), leave_statistics : leave_statistics, + employee_adjustment : employee_adjustment, }); }); }); @@ -408,12 +421,32 @@ router.post('/edit/:user_id/', function(req, res){ // All validations are passed: update database .then(function(){ - employee.updateAttributes(new_user_attributes).then(function(){ - req.session.flash_message( - 'Details for '+employee.full_name()+' were updated' - ); - return res.redirect_with_session(req.body.back_to_absences ? './absences/' : '.'); - }); + let adjustment = new_user_attributes.adjustment; + delete new_user_attributes.adjustment; + + employee + + // Update user record + .updateAttributes(new_user_attributes) + + // Update adjustment if necessary + .then(() => { + if ( adjustment !== undefined ) { + return employee.promise_to_update_adjustment({ + year : moment().format('YYYY'), + adjustment : adjustment, + }); + } + + return Promise.resolve(); + }) + + .then(function(){ + req.session.flash_message( + 'Details for '+employee.full_name()+' were updated' + ); + return res.redirect_with_session(req.body.back_to_absences ? './absences/' : '.'); + }); }) .catch(function(error){ @@ -667,7 +700,7 @@ function get_and_validate_user_parameters(args) { department_id = validator.trim(req.param('department')), start_date = validator.trim(req.param('start_date')), end_date = validator.trim(req.param('end_date')), - adjustment = validator.trim(req.param('adjustment')) || 0, + adjustment = validator.trim(req.param('adjustment')), password = validator.trim(req.param('password_one')), password_confirm = validator.trim(req.param('password_confirm')), admin = validator.toBoolean(req.param('admin')), @@ -748,11 +781,14 @@ function get_and_validate_user_parameters(args) { DepartmentId : department_id, start_date : start_date, end_date : (end_date || null), - adjustment : adjustment, admin : admin, auto_approve : auto_approve, }; + if (adjustment || String(adjustment) === '0') { + attributes.adjustment = adjustment; + } + if ( password ) { attributes.password = password; } diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 1acecb81a..7519e5d44 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -61,7 +61,7 @@
- + working days
diff --git a/views/partials/user_details/general.hbs b/views/partials/user_details/general.hbs index a0d99c276..d448f4fd8 100644 --- a/views/partials/user_details/general.hbs +++ b/views/partials/user_details/general.hbs @@ -3,8 +3,6 @@
- - {{> user_details/breadcrumb employee=employee }}
From 84077db0e5ae5d19a530a632791a0a94585b08f7 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 14:41:05 +0000 Subject: [PATCH 038/539] Remove user's adjustment column --- lib/model/db/user.js | 6 --- .../20171219-allowance-adjustment-per-year.js | 13 ++--- ...171220-drop-adjustment-column-from-user.js | 54 +++++++++++++++++++ 3 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 migrations/20171220-drop-adjustment-column-from-user.js diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 65a5c7bcb..8240184c3 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -73,12 +73,6 @@ module.exports = function(sequelize, DataTypes) { defaultValue : null, comment : 'Date emplyee stop working for company', }, - adjustment : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - comment : 'Adjustment to allowance in current year', - }, }, { indexes : [ { diff --git a/migrations/20171219-allowance-adjustment-per-year.js b/migrations/20171219-allowance-adjustment-per-year.js index a8e54ee3d..19ef8e023 100644 --- a/migrations/20171219-allowance-adjustment-per-year.js +++ b/migrations/20171219-allowance-adjustment-per-year.js @@ -7,24 +7,25 @@ var models = require('../lib/model/db'), module.exports = { up: function (queryInterface, Sequelize) { - queryInterface.describeTable('Users') + return queryInterface + .createTable( + models.UserAllowanceAdjustment.tableName, + models.UserAllowanceAdjustment.attributes + ) + .then(() => queryInterface.describeTable('Users')) .then(function(attributes){ if ( ! attributes.hasOwnProperty('adjustment')) { - return 1; + return Promise.resolve(); } let sql = 'INSERT INTO user_allowance_adjustment (year, adjustment, user_id, created_at) ' + 'SELECT 2017 AS year, adjustment as adjustment, id as user_id, date() || \' \' || time() as created_at ' + 'FROM users'; - console.log(sql); - return queryInterface.sequelize.query( sql ); }) - // TODO remove the users.adjustment column - .then(() => Promise.resolve()); }, diff --git a/migrations/20171220-drop-adjustment-column-from-user.js b/migrations/20171220-drop-adjustment-column-from-user.js new file mode 100644 index 000000000..4385d3368 --- /dev/null +++ b/migrations/20171220-drop-adjustment-column-from-user.js @@ -0,0 +1,54 @@ + +'use strict'; + +var models = require('../lib/model/db'), + Promise = require('bluebird'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + return queryInterface + .describeTable('Users') + .then(attributes => { + + if ( ! attributes.hasOwnProperty('adjustment')) { + return Promise.resolve(); + } + + if ('sqlite' !== queryInterface.sequelize.getDialect()) { + // For non SQLite: it is easy + return queryInterface.removeColumn( + models.User.tableName, + 'adjustment' + ); + } + + // For SQLite it is "fun" + + return queryInterface + // Create Temp Users based on current model definitiom + .createTable('Users_backup', models.User.attributes) + + .then(function(){ + return queryInterface.sequelize.query('PRAGMA foreign_keys=off;'); + }) + + // Copy data form original Users into new Temp one + .then(function(){ + return queryInterface.sequelize.query( + 'INSERT INTO `Users_backup` (`id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve`) SELECT `id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve` FROM `'+ models.User.tableName +'`'); + }) + + .then(() => queryInterface.dropTable( models.User.tableName )) + .then(() => queryInterface.renameTable('Users_backup', models.User.tableName)) + .then(() => queryInterface.sequelize.query('PRAGMA foreign_keys=on;')) + .then(() => queryInterface.addIndex(models.User.tableName, ['companyId'])) + + }); + }, + + down: function (queryInterface, Sequelize) { + // No way back! + return Promise.resolve(); + } +}; From c3269a0d7a4bca01d92044daeeab73cd2b83dba4 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 16:04:20 +0000 Subject: [PATCH 039/539] Add scrip used when checking real data on different app versions --- bin/fetch_user_stat.js | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 bin/fetch_user_stat.js diff --git a/bin/fetch_user_stat.js b/bin/fetch_user_stat.js new file mode 100644 index 000000000..25d2d4c9c --- /dev/null +++ b/bin/fetch_user_stat.js @@ -0,0 +1,107 @@ + +'use strict'; + +var test = require('selenium-webdriver/testing'), + By = require('selenium-webdriver').By, + expect = require('chai').expect, + _ = require('underscore'), + Promise = require("bluebird"), + until = require('selenium-webdriver').until, + register_new_user_func = require('../t/lib/register_new_user'), + login_user_func = require('../t/lib/login_with_user'), + logout_user_func = require('../t/lib/logout_user'), + open_page_func = require('../t/lib/open_page'), + config = require('../t/lib/config'), + application_host = config.get_application_host(); + +/* + * THis is simple scrip to execute on different versions of application + * to check if new version introduces any anomalies. + * + * Example of running: + * + * node node_modules/mocha/bin/mocha --recursive bin/fetch_user_stat.js + * + * */ + +describe('Collect remaining days for employees', function(){ + + this.timeout( config.get_execution_timeout() ); + + var report = {}, + driver; + + it("Create new company", function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(function(data){ + driver = data.driver; + done(); + }); + }); + + it("Logout", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(function(){ done() }); + }); + + // This is a list of accountes to iterate through + // By default it is dummy ones + [ + 'test@test.com', + 'test2@test.com' + ].forEach( email => { + + it("Login as user", function(done){ + login_user_func({ + application_host : application_host, + user_email : email, + driver : driver, + }) + .then(function(){ done() }); + }); + + it("Open users page", function(done){ + open_page_func({ + url : application_host + 'users/', + driver : driver, + }) + .then(function(){ done() }); + }); + + it("Fetch remaining days for each employee", function(done){ + + driver + .findElements(By.css('tr[data-vpp-user-row]')) + + .then(els => Promise.map(els, el => { + let user_id; + + return el.getAttribute('data-vpp-user-row') + .then(u_id => Promise.resolve( user_id = u_id )) + .then(() => el.findElement(By.css('td.vpp-days-remaining'))) + .then(el => el.getText()) + .then(days => Promise.resolve( report[ user_id ] = days )); + }, { concurrency : 0 })) + + .then(() => done()) + }); + + it("Logout", function(done){ + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(function(){ done() }); + }); + }); + + after(function(done){ + console.dir(report); + driver.quit().then(function(){ done(); }); + }); +}); From 5bc9112d983c552b1b456ef512df4362023662d8 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 16:14:51 +0000 Subject: [PATCH 040/539] Update UI. With more information about new logic behind allowance adjustement --- views/partials/user_details/absences.hbs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 7519e5d44..ff63c9b99 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -59,14 +59,15 @@
- +
working days
-
Tune allowance for this user
+
Tune allowance for this user in current year.
Could be negative as well.
+
The value is valid during current year. Next year it needs to be re-confirmed.
From 06859cda5b66eeca5c85fd83d4b7698ad83537df Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 21 Dec 2017 18:58:51 +0000 Subject: [PATCH 041/539] Tweak the ico link Even though there is no such fil in codebase --- views/layouts/main.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/layouts/main.hbs b/views/layouts/main.hbs index 3b3c6a8a9..9b7380458 100644 --- a/views/layouts/main.hbs +++ b/views/layouts/main.hbs @@ -6,7 +6,7 @@ - + {{title}} From 6a6f86e78952ae878182e11b2a809836dc678040 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 09:26:25 +0000 Subject: [PATCH 042/539] Sort out default ordering of leaves --- lib/model/mixin/user/absence_aware.js | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 48dd8d940..6ae432637 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -245,6 +245,8 @@ module.exports = function(sequelize){ ); }) + .then(leaves => promise_to_sort_leaves(leaves)); + return promise_my_leaves; }; @@ -259,7 +261,8 @@ module.exports = function(sequelize){ sequelize.models.Leave.status_new(), sequelize.models.Leave.status_pended_revoke(), ], - }); + }) + .then(leaves => promise_to_sort_leaves(leaves)); }; // Promises leaves ever booked for current user @@ -272,7 +275,8 @@ module.exports = function(sequelize){ sequelize.models.Leave.status_new(), sequelize.models.Leave.status_pended_revoke(), ], - }); + }) + .then(leaves => promise_to_sort_leaves(leaves)); }; @@ -319,6 +323,7 @@ module.exports = function(sequelize){ { concurrency : 10 } ) .then( () => Promise.resolve(leaves) ) + .then(leaves => promise_to_sort_leaves(leaves)) ); }; // END of promise_leaves_to_be_processed @@ -335,7 +340,8 @@ module.exports = function(sequelize){ },{ concurrency : 10, }) - .then(function(){ return Promise.resolve(leaves) }); + .then(function(){ return Promise.resolve(leaves) }) + .then(leaves => promise_to_sort_leaves(leaves)); }); }; @@ -680,3 +686,15 @@ module.exports = function(sequelize){ }; +/* + * Simple function that sorts array of Leave objects in default way. + * + * */ + +function promise_to_sort_leaves(leaves) { + return Promise.resolve( leaves.sort( + (a,b) => a.date_start > b.date_start + ? -1 : a.date_start < b.date_start + ? 1 : 0 + )); +} From 64e549fa51e53fc29982f79d1106af210716f593 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 12:03:05 +0000 Subject: [PATCH 043/539] Group leaves by year in lists --- lib/model/leave_collection.js | 67 ++++++++++++++++++++++++ lib/model/mixin/user/absence_aware.js | 31 ++++------- lib/route/requests.js | 11 ++-- lib/route/users.js | 12 +++-- views/calendar.hbs | 7 ++- views/partials/user_details/absences.hbs | 3 +- views/partials/user_requests.hbs | 6 --- views/partials/user_requests_grouped.hbs | 7 +++ views/requests.hbs | 9 +++- 9 files changed, 115 insertions(+), 38 deletions(-) create mode 100644 lib/model/leave_collection.js create mode 100644 views/partials/user_requests_grouped.hbs diff --git a/lib/model/leave_collection.js b/lib/model/leave_collection.js new file mode 100644 index 000000000..055e9e7fe --- /dev/null +++ b/lib/model/leave_collection.js @@ -0,0 +1,67 @@ + +"use strict"; + +var + Promise = require('bluebird'), + moment = require('moment'), + _ = require('underscore'), + config = require('../config'); + +function promise_to_group_leaves(leaves) { + + if ( ! leaves ) { + throw new Error('Did not get "leaves" in promise_to_group_leaves'); + } + + let grouped_leaves = {}; + + // Group leaves by years + leaves.forEach(leave => { + let year = moment(leave.get_start_leave_day().date).format('YYYY'); + + if ( ! grouped_leaves[year]) { + grouped_leaves[ year ] = { + year : year, + leaves : [], + }; + } + + grouped_leaves[ year ].leaves.push(leave); + }); + + // Sort year groups + grouped_leaves = _ + .values( grouped_leaves ) + .sort((a,b) => a.year > b.year ? -1 : a.year < b.year ? 1 : 0); + + // Calculate total allowance deduction per group + grouped_leaves.forEach(group => { + group.total_deduction = _.reduce( + group.leaves.map(leave => leave.get_deducted_days_number()), + (memo, number) => memo + number, + 0 + ); + }); + + return Promise.resolve(grouped_leaves); +} + +/* + * Simple function that sorts array of Leave objects in default way. + * + * */ + +function promise_to_sort_leaves(leaves) { + return Promise.resolve( leaves.sort( + (a,b) => a.date_start > b.date_start + ? -1 : a.date_start < b.date_start + ? 1 : 0 + )); +} + +module.exports = function(){ + return { + promise_to_group_leaves : promise_to_group_leaves, + promise_to_sort_leaves : promise_to_sort_leaves, + }; +}; diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 6ae432637..201d08916 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -8,10 +8,11 @@ 'use strict'; var - _ = require('underscore'), - Promise = require("bluebird"), - CalendarMonth = require('../../calendar_month'), - moment = require('moment'); + _ = require('underscore'), + Promise = require("bluebird"), + CalendarMonth = require('../../calendar_month'), + LeaveCollectionUtil = require('../../leave_collection')(), + moment = require('moment'); module.exports = function(sequelize){ @@ -245,7 +246,7 @@ module.exports = function(sequelize){ ); }) - .then(leaves => promise_to_sort_leaves(leaves)); + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); return promise_my_leaves; }; @@ -262,7 +263,7 @@ module.exports = function(sequelize){ sequelize.models.Leave.status_pended_revoke(), ], }) - .then(leaves => promise_to_sort_leaves(leaves)); + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); }; // Promises leaves ever booked for current user @@ -276,7 +277,7 @@ module.exports = function(sequelize){ sequelize.models.Leave.status_pended_revoke(), ], }) - .then(leaves => promise_to_sort_leaves(leaves)); + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); }; @@ -323,7 +324,7 @@ module.exports = function(sequelize){ { concurrency : 10 } ) .then( () => Promise.resolve(leaves) ) - .then(leaves => promise_to_sort_leaves(leaves)) + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)) ); }; // END of promise_leaves_to_be_processed @@ -341,7 +342,7 @@ module.exports = function(sequelize){ concurrency : 10, }) .then(function(){ return Promise.resolve(leaves) }) - .then(leaves => promise_to_sort_leaves(leaves)); + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); }); }; @@ -686,15 +687,3 @@ module.exports = function(sequelize){ }; -/* - * Simple function that sorts array of Leave objects in default way. - * - * */ - -function promise_to_sort_leaves(leaves) { - return Promise.resolve( leaves.sort( - (a,b) => a.date_start > b.date_start - ? -1 : a.date_start < b.date_start - ? 1 : 0 - )); -} diff --git a/lib/route/requests.js b/lib/route/requests.js index d8ba0b77d..e7585671f 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -7,17 +7,20 @@ var express = require('express'), moment = require('moment'), validator = require('validator'), _ = require('underscore'), - EmailTransport = require('../email'); + LeaveCollectionUtil = require('../model/leave_collection')(), + EmailTransport = require('../email'); router.get('/', function(req, res){ Promise.join( - req.user.promise_my_active_leaves_ever(), + req.user + .promise_my_active_leaves_ever() + .then(leaves => LeaveCollectionUtil.promise_to_group_leaves(leaves)), req.user.promise_leaves_to_be_processed(), - function(my_leaves, to_be_approved_leaves){ + function(my_leaves_grouped, to_be_approved_leaves){ res.render('requests',{ - my_leaves : my_leaves, + my_leaves_grouped : my_leaves_grouped, to_be_approved_leaves : to_be_approved_leaves, }); } diff --git a/lib/route/users.js b/lib/route/users.js index cc4335ebf..04323677e 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -8,6 +8,7 @@ var express = require('express'), moment = require('moment'), _ = require('underscore'), uuid = require('node-uuid'), + LeaveCollectionUtil = require('../model/leave_collection')(), EmailTransport = require('../email'); // Make sure that current user is authorized to deal with settings @@ -199,15 +200,18 @@ router.get('/edit/:user_id/absences/', function(req, res){ .then(function(){ employee .promise_my_active_leaves_ever({}) - .then(function(leaves){ + .then(leaves => LeaveCollectionUtil.promise_to_group_leaves(leaves)) + .then(function(grouped_leaves){ + res.render('user_details', { employee : employee, - leaves : leaves, + grouped_leaves : grouped_leaves, show_absence_tab : true, leave_type_statistics : employee.get_leave_statistics_by_types(), - leave_statistics : leave_statistics, - employee_adjustment : employee_adjustment, + leave_statistics : leave_statistics, + employee_adjustment : employee_adjustment, }); + }); }); }) diff --git a/views/calendar.hbs b/views/calendar.hbs index 4de7f4cf9..d95936b94 100644 --- a/views/calendar.hbs +++ b/views/calendar.hbs @@ -140,9 +140,14 @@
- {{# unless show_full_year}} + +
+

All my absences in {{current_year}}

+
+ {{> user_requests leaves=current_user.my_leaves }} + {{/unless}} diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index ff63c9b99..89dc940f1 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -80,5 +80,6 @@
 
- {{> user_requests leaves=leaves no_header=1}} + {{> user_requests_grouped grouped_leaves=grouped_leaves logged_user=logged_user }} +
diff --git a/views/partials/user_requests.hbs b/views/partials/user_requests.hbs index 9479b338e..14736514c 100644 --- a/views/partials/user_requests.hbs +++ b/views/partials/user_requests.hbs @@ -1,10 +1,4 @@ -{{# unless no_header}} -
-

All absences

-
-{{/ unless}} -
{{# unless leaves}}
diff --git a/views/partials/user_requests_grouped.hbs b/views/partials/user_requests_grouped.hbs new file mode 100644 index 000000000..ba7f9c41b --- /dev/null +++ b/views/partials/user_requests_grouped.hbs @@ -0,0 +1,7 @@ + +{{# each grouped_leaves}} +

{{this.year}}

+ {{> user_requests leaves=this.leaves no_header=1 logged_user=../logged_user}} +

Days deducted from allowance: {{ this.total_deduction }}

+
 
+{{/ each}} diff --git a/views/requests.hbs b/views/requests.hbs index 4fa3d9979..31e8c6c80 100644 --- a/views/requests.hbs +++ b/views/requests.hbs @@ -60,6 +60,13 @@ {{/unless}}
-{{> user_requests leaves=my_leaves }} + +
 
+ +
+

All my absences

+
+ +{{> user_requests_grouped grouped_leaves=my_leaves_grouped logged_user=logged_user }} {{>footer}} From 58a3f03d940dec87f9ee76e80f5a899751b78cbb Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 14:13:43 +0000 Subject: [PATCH 044/539] Add column to store carried over allowance --- lib/model/db/user_allowance_adjustment.js | 6 ++++ ...0171222-add-carry-over-allowance-column.js | 28 +++++++++++++++++++ views/partials/user_details/absences.hbs | 12 ++++++++ 3 files changed, 46 insertions(+) create mode 100644 migrations/20171222-add-carry-over-allowance-column.js diff --git a/lib/model/db/user_allowance_adjustment.js b/lib/model/db/user_allowance_adjustment.js index 8e58f3d82..4e35d890a 100644 --- a/lib/model/db/user_allowance_adjustment.js +++ b/lib/model/db/user_allowance_adjustment.js @@ -17,6 +17,12 @@ module.exports = function(sequelize, DataTypes){ defaultValue : 0, comment : 'Adjustment to allowance in current year', }, + carried_over_allowance : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : 0, + comment : 'Additional allowance to use based on un-used holidays in previous year', + }, }, { underscored : true, freezeTableName : true, diff --git a/migrations/20171222-add-carry-over-allowance-column.js b/migrations/20171222-add-carry-over-allowance-column.js new file mode 100644 index 000000000..4c91e9a5e --- /dev/null +++ b/migrations/20171222-add-carry-over-allowance-column.js @@ -0,0 +1,28 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + return queryInterface.describeTable('user_allowance_adjustment') + .then(function(attributes){ + + if (attributes.hasOwnProperty('carried_over_allowance')) { + return 1; + } + + return queryInterface.addColumn( + 'user_allowance_adjustment', + 'carried_over_allowance', + models.UserAllowanceAdjustment.attributes.carried_over_allowance + ); + }); + }, + + down: function (queryInterface, Sequelize) { + return queryInterface + .removeColumn('user_allowance_adjustment', 'carried_over_allowance'); + } +}; diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 89dc940f1..fc94b4671 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -58,6 +58,18 @@
+
+ +
+ + working days +
+
+
Allowance adjustment based on unused holidays from previous year.
+
It is calculated at the beginning of current year.
+
+
+
From 5f1a76d8477eb4a6b21b7c3272fd3b6ea32166ef Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 14:38:09 +0000 Subject: [PATCH 045/539] Take into consideration allowance carried over from previouse year --- lib/model/mixin/user/absence_aware.js | 42 +++++++++++++++++++----- lib/route/users.js | 10 ++++-- views/partials/user_details/absences.hbs | 2 +- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 201d08916..7ba6b53ef 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -463,7 +463,8 @@ module.exports = function(sequelize){ let self = this, year = args.year, - adjustment = args.adjustment; + adjustment = args.adjustment, + carried_over_allowance = args.carried_over_allowance; // If optional paramater year was provided we need to calculate allowance // for that year, and if it is something other then current year, @@ -471,12 +472,14 @@ module.exports = function(sequelize){ // (ignoreing automatic allowance) if (year && year != moment().year()) { return self.department.allowance + + carried_over_allowance + adjustment; } // Get general allowance based on department return self.department.allowance + self.get_automatic_adjustment() + + carried_over_allowance + adjustment; }; @@ -498,18 +501,19 @@ module.exports = function(sequelize){ return Promise.resolve(); }) - // Fetch Adjustment for current year - .then(() => self.promise_adjustmet_for_year(year)) + // Fetch Adjustment and Carried over allowance for current year + .then(() => self.promise_adjustment_and_carry_over_for_year(year)) - .then(adjustment => Promise.resolve( + .then(adjustment_and_coa => Promise.resolve( self._calculate_total_number_of_days_n_allowance({ year : year, - adjustment : adjustment, + adjustment : adjustment_and_coa.adjustment, + carried_over_allowance : adjustment_and_coa.carried_over_allowance, }) )); }; - this.promise_adjustmet_for_year = function(year){ + this.promise_adjustment_and_carry_over_for_year = function(year){ let self = this; year = year || moment(); @@ -522,16 +526,36 @@ module.exports = function(sequelize){ .then(adjustment_records => { // By deafault there is not adjustments - let adjustment = 0; + let result = { + adjustment : 0, + carried_over_allowance : 0, + }; if (adjustment_records.length === 1) { - adjustment = adjustment_records[0].adjustment; + result.adjustment = adjustment_records[0].adjustment; + result.carried_over_allowance = adjustment_records[0].carried_over_allowance; } - return Promise.resolve(adjustment); + return Promise.resolve(result); }); }; + this.promise_adjustmet_for_year = function(year){ + let self = this; + + return self + .promise_adjustment_and_carry_over_for_year(year) + .then(combined_record => Promise.resolve(combined_record.adjustment)); + }; + + this.promise_carried_over_allowance_for_year = function(year){ + let self = this; + + return self + .promise_adjustment_and_carry_over_for_year(year) + .then(combined_record => Promise.resolve(combined_record.carried_over_allowance)); + }; + this.promise_to_update_adjustment = function(args) { let self = this, diff --git a/lib/route/users.js b/lib/route/users.js index 04323677e..ca351a5b5 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -167,9 +167,13 @@ router.get('/edit/:user_id/absences/', function(req, res){ employee .promise_adjustmet_for_year(moment().format('YYYY')), - (args, total_days_number, employee_adjustment) => { + employee + .promise_carried_over_allowance_for_year(moment().format('YYYY')), + + (args, total_days_number, employee_adjustment, carried_over_allowance) => { args.push(total_days_number); args.push(employee_adjustment); + args.push(carried_over_allowance); return Promise.resolve(args); }) ) @@ -178,7 +182,8 @@ router.get('/edit/:user_id/absences/', function(req, res){ remaining_allowance = args[0], employee = args[1], total_days_number = args[2], - employee_adjustment = args[3]; + employee_adjustment = args[3], + carried_over_allowance = args[4]; let leave_statistics = { total_for_current_year : total_days_number, @@ -210,6 +215,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ leave_type_statistics : employee.get_leave_statistics_by_types(), leave_statistics : leave_statistics, employee_adjustment : employee_adjustment, + carried_over_allowance: carried_over_allowance, }); }); diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index fc94b4671..4cb21b565 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -61,7 +61,7 @@
- + working days
From 2ee957d018b0bdae3b19cf432c9e8476a94dcfbc Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 15:42:48 +0000 Subject: [PATCH 046/539] Leaves list is less cluttering --- views/partials/user_requests.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/partials/user_requests.hbs b/views/partials/user_requests.hbs index 14736514c..1b094046a 100644 --- a/views/partials/user_requests.hbs +++ b/views/partials/user_requests.hbs @@ -12,9 +12,9 @@ + - @@ -25,9 +25,9 @@ {{# each leaves }} + - {{# each users_and_leaves}} - + diff --git a/views/requests.hbs b/views/requests.hbs index 31e8c6c80..560a253cc 100644 --- a/views/requests.hbs +++ b/views/requests.hbs @@ -35,7 +35,7 @@ - + From 0355ee7ac25364dde02670aa8f0ced7f208544b3 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 19:40:15 +0000 Subject: [PATCH 058/539] Make Calenda and team view pages be TZ aware --- lib/model/calendar_month.js | 8 +++++++- lib/model/db/department.js | 1 + lib/model/mixin/user/absence_aware.js | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index d944356c1..775ff3f87 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -10,6 +10,12 @@ function CalendarMonth(day, args){ this._leaves = {}; this._bank_holidays = {}; + this.today = moment.utc(); + + if (args && args.today) { + this.today = args.today; + } + if (args){ this._schedule = args.schedule; } @@ -146,7 +152,7 @@ CalendarMonth.prototype.is_weekend = function(day){ CalendarMonth.prototype.is_current_day = function(day){ return this.get_base_date().date(day).format( this.default_date_format() ) === - moment.utc().format( this.default_date_format() ); + this.today.format( this.default_date_format() ); }; CalendarMonth.prototype.as_for_template = function(){ diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 27d592c0d..632c7c87e 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -159,6 +159,7 @@ module.exports = function(sequelize, DataTypes) { : [], leave_days : user_data.leave_days, schedule : user_data.schedule, + today : company.get_today(), }); user_data.days = calendar_month.as_for_team_view(); diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 2433cb415..7ca88909d 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -115,6 +115,7 @@ module.exports = function(sequelize){ : [], leave_days : leave_days, schedule : schedule, + today : company.get_today(), } ); }) From a54f811c8d3e897cf50004a7551c9bc2cb65a80c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 21:29:18 +0000 Subject: [PATCH 059/539] Ensure app uses TZ aware now getter Although cases when it is YEAR that is considered are ignored. --- lib/model/calendar_month.js | 3 ++- lib/model/db/department.js | 19 ++++++++++++++---- lib/model/db/user.js | 3 +-- lib/model/mixin/user/absence_aware.js | 28 +++++++++++++++------------ lib/model/team_view.js | 2 +- lib/route/calendar.js | 4 ++-- lib/route/feed.js | 2 +- lib/route/users.js | 2 +- t/unit/calendar.js | 25 ++++++++++++------------ 9 files changed, 52 insertions(+), 36 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 775ff3f87..2ed9a8850 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -10,10 +10,11 @@ function CalendarMonth(day, args){ this._leaves = {}; this._bank_holidays = {}; - this.today = moment.utc(); if (args && args.today) { this.today = args.today; + } else { + throw new Error('CalendarMonth requires today - moment object that represents today'); } if (args){ diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 632c7c87e..99e531802 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -99,12 +99,23 @@ module.exports = function(sequelize, DataTypes) { var self = this, model = sequelize.models, - // NOTE VPP: following date is going to be amended by user's time zone - base_date = args.base_date || moment.utc(); + base_date = args.base_date; - var promise_users_and_leaves = Promise.try(function(){ - return self.promise_active_users(); + + var promise_users_and_leaves = Promise + + // First of all ensure that "base_date" is defined + .try(function(){ + if ( base_date ) { + return Promise.resolve(base_date); + } + + return self.getCompany() + .then(company => Promise.resolve( base_date = company.get_today() ) ) }) + + // Get users + .then( () => self.promise_active_users() ) .then(function(users){ return Promise.all( diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 5cc936dd4..8b0d5da5c 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -282,8 +282,7 @@ function get_instance_methods(sequelize) { }, reload_with_leave_details : function(args){ - var year = args.year || moment.utc(), - self = this; + var self = this; return Promise.join( self.promise_my_active_leaves(args), diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 7ca88909d..a7f9a0eef 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -17,8 +17,10 @@ var module.exports = function(sequelize){ this._get_calendar_months_to_show = function(args){ - var year = args.year, - show_full_year = args.show_full_year; + var + self = this, + year = args.year, + show_full_year = args.show_full_year; if (show_full_year) { return _.map([1,2,3,4,5,6,7,8,9,10,11,12], function(i){ @@ -27,18 +29,19 @@ module.exports = function(sequelize){ } return _.map([0,1,2,3], function(delta){ - return moment.utc().add(delta, 'months').startOf('month'); + return self.company.get_today().add(delta, 'months').startOf('month'); }) }; this.promise_calendar = function(args) { - var year = args.year || moment.utc(), - show_full_year = args.show_full_year || false, - model = sequelize.models, - this_user = this, - // Find or if we need to show multi year calendar - is_multi_year = moment.utc().month() > 8; + var + this_user = this, + year = args.year || this_user.company.get_today(), + show_full_year = args.show_full_year || false, + model = sequelize.models, + // Find out if we need to show multi year calendar + is_multi_year = this_user.company.get_today().month() > 8; var months_to_show = this_user._get_calendar_months_to_show({ year : year.clone(), @@ -182,13 +185,14 @@ module.exports = function(sequelize){ var self = this, where_clause = {}, + // Time zone does not really matter here, although there could be issues + // around New Year (but we can tolerate that) year = args.year || moment.utc(); if (args && args.filter_status) { where_clause = { status : args.filter_status }; } - if (args && ! args.ignore_year) { where_clause['$or'] = { date_start : { @@ -439,7 +443,7 @@ module.exports = function(sequelize){ this.get_automatic_adjustment = function(args) { - var now = (args && args.now) ? moment.utc(args.now) : moment.utc(); + var now = (args && args.now) ? moment.utc(args.now) : this.company.get_today(); if ( now.year() !== moment.utc(this.start_date).year() @@ -613,7 +617,7 @@ module.exports = function(sequelize){ this.promise_my_leaves_for_calendar = function(args){ - var year = args.year || moment.utc(); + var year = args.year || this.company.get_today(); return this.getMy_leaves({ where : { diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 25eee0be3..90d11d6aa 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -10,8 +10,8 @@ const function TeamView(args) { var me = this; - this.base_date = args.base_date || moment.utc(); this.user = args.user; + this.base_date = args.base_date || this.user.company.get_today(); } TeamView.prototype.promise_team_view_details = function(args){ diff --git a/lib/route/calendar.js b/lib/route/calendar.js index c0fe7eee2..0efd4c71b 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -98,7 +98,7 @@ router.get('/', function(req, res) { var current_year = validator.isNumeric(req.param('year')) ? moment.utc(req.param('year'), 'YYYY') - : moment.utc(); + : req.user.company.get_today(); var show_full_year = validator.toBoolean(req.param('show_full_year')); @@ -145,7 +145,7 @@ router.get('/teamview/', function(req, res){ var base_date = validator.isDate(req.param('date')) ? moment.utc(req.param('date')) - : moment.utc(); + : req.user.company.get_today(); var team_view = new TeamView({ base_date : base_date, diff --git a/lib/route/feed.js b/lib/route/feed.js index 03f4522be..22b71ed7d 100644 --- a/lib/route/feed.js +++ b/lib/route/feed.js @@ -44,7 +44,7 @@ router.get('/:token/ical.ics', function(req, res){ if (feed.is_calendar()){ return user.promise_calendar({ - year : moment.utc(), + year : user.calendar.company.get_today(), show_full_year : true, }) .then(function(calendar){ diff --git a/lib/route/users.js b/lib/route/users.js index 1dece7612..e028323ac 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -291,7 +291,7 @@ var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args){ // new "end_date" is provided // new "end_date" is in future new_user_attributes.end_date && - moment.utc( new_user_attributes.end_date ).startOf('day').toDate() >= moment.utc().startOf('day').toDate() + moment.utc( new_user_attributes.end_date ).startOf('day').toDate() >= req.user.company.get_today().startOf('day').toDate() ) ) ) { diff --git a/t/unit/calendar.js b/t/unit/calendar.js index 7a4f46c69..f53ea8b3b 100644 --- a/t/unit/calendar.js +++ b/t/unit/calendar.js @@ -4,6 +4,7 @@ var expect = require('chai').expect, _ = require('underscore'), model = require('../../lib/model/db'), + moment = require('moment'), schedule= model.Schedule.build({ company_id : 1 }), CalendarMonth = require('../../lib/model/calendar_month'); @@ -11,7 +12,7 @@ var expect = require('chai').expect, describe('Check calendar month object', function(){ it('Normalize provided date to be at the begining of the month',function(){ - var january = new CalendarMonth('2015-01-10', {schedule : schedule}); + var january = new CalendarMonth('2015-01-10', {schedule : schedule, today : moment.utc()}); expect( january.get_base_date().date() @@ -19,31 +20,31 @@ describe('Check calendar month object', function(){ }); it('Knows on which week day month starts', function(){ - var january = new CalendarMonth('2015-01-21', {schedule : schedule}); + var january = new CalendarMonth('2015-01-21', {schedule : schedule, today : moment.utc()}); expect( january.week_day() ).to.be.equal(4); - var feb = new CalendarMonth('2015-02-21', {schedule : schedule}); + var feb = new CalendarMonth('2015-02-21', {schedule : schedule, today : moment.utc()}); expect( feb.week_day() ).to.be.equal(7); }); it('Knows how many blanks to put before first day of the month', function(){ - var january = new CalendarMonth('2015-01-11', {schedule : schedule}); + var january = new CalendarMonth('2015-01-11', {schedule : schedule, today : moment.utc()}); expect( january.how_many_blanks_at_the_start() ).to.be.equal(3); - var feb = new CalendarMonth('2015-02-11', {schedule : schedule}); + var feb = new CalendarMonth('2015-02-11', {schedule : schedule, today : moment.utc()}); expect( feb.how_many_blanks_at_the_start() ).to.be.equal(6); }); it('Knows how many blanks to put after the last day of the month', function(){ - var january = new CalendarMonth('2015-01-11', {schedule : schedule}); + var january = new CalendarMonth('2015-01-11', {schedule : schedule, today : moment.utc()}); expect( january.how_many_blanks_at_the_end() ).to.be.equal(1); - var feb = new CalendarMonth('2015-02-11', {schedule : schedule}); + var feb = new CalendarMonth('2015-02-11', {schedule : schedule, today : moment.utc()}); expect( feb.how_many_blanks_at_the_end() ).to.be.equal(1); }); it('Knows whether day is weekend', function(){ - var feb = new CalendarMonth('2015-02-12', {schedule : schedule}); + var feb = new CalendarMonth('2015-02-12', {schedule : schedule, today : moment.utc()}); expect(feb.is_weekend(12)).not.to.be.ok; expect(feb.is_weekend(21)).to.be.ok; expect(feb.is_weekend(22)).to.be.ok; @@ -51,7 +52,7 @@ describe('Check calendar month object', function(){ }); it('Knows how to generate data structure for template', function(){ - var january = new CalendarMonth('2015-01-11', { schedule : schedule }), + var january = new CalendarMonth('2015-01-11', { schedule : schedule, today : moment.utc() }), object_to_test = january.as_for_template(); delete object_to_test['moment']; object_to_test.weeks.forEach(function(week){ @@ -62,7 +63,7 @@ describe('Check calendar month object', function(){ ); - var apr = new CalendarMonth('2015-04-11', { schedule : schedule }); + var apr = new CalendarMonth('2015-04-11', { schedule : schedule, today : moment.utc() }); object_to_test = apr.as_for_template(); delete object_to_test['moment']; object_to_test.weeks.forEach(function(week){ @@ -77,7 +78,7 @@ describe('Check calendar month object', function(){ it('Sanity checks pass', function(){ - var apr = new CalendarMonth('2015-04-01', { schedule : schedule }); + var apr = new CalendarMonth('2015-04-01', { schedule : schedule, today : moment.utc() }); expect(apr).to.be.a('object'); @@ -85,7 +86,7 @@ describe('Check calendar month object', function(){ }); it('It knows whether day is bank holiday', function(){ - var mar = new CalendarMonth('2015-03-19', { bank_holidays : ['2015-03-08'], schedule : schedule }); + var mar = new CalendarMonth('2015-03-19', { bank_holidays : ['2015-03-08'], schedule : schedule, today : moment.utc() }); expect(mar.is_bank_holiday(8)).to.be.ok; expect(mar.is_bank_holiday(10)).not.to.be.ok; From fe087ac053cab7ed8edd04f5e8a567f40845369f Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 2 Jan 2018 14:46:05 +0000 Subject: [PATCH 060/539] Sketch scenario for test to be --- t/integration/timezone.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 t/integration/timezone.js diff --git a/t/integration/timezone.js b/t/integration/timezone.js new file mode 100644 index 000000000..67a5496e7 --- /dev/null +++ b/t/integration/timezone.js @@ -0,0 +1,21 @@ + +'use strict'; + +/* + * Basic scenario for checking time zones: + * + * * Create a copany + * * Update Time zone to be somethng in Australia + * * Get the date from Book leave modal and put it into today_aus + * * Get the current date from Calendar page and ensure it is the same as today_aus + * * Get the current date from Team view page and ensure it is the same as today_aus + * * Book a leave and ensure its "created at" value on My requests page is today_aus + * * Reject newly added leave + * * Update Time zone to be USA/Alaska + * * Get the date from Book leave modal and put it into today_usa + * * Ensure that today_usa is one day behind the today_aus + * * Get the current date from Calendar page and ensure it is the same as today_usa + * * Get the current date from Team view page and ensure it is the same as today_usa + * * Book a leave and ensure its "created at" value on My requests page is today_usa + * + * */ From 46e623aa705d61b4a67e7546cbb569731e0e9b2b Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 3 Jan 2018 20:29:07 +0000 Subject: [PATCH 061/539] Add test for time zones --- t/integration/leave_request/cancel_basic.js | 2 +- t/integration/timezone.js | 254 ++++++++++++++++++++ views/requests.hbs | 4 +- 3 files changed, 257 insertions(+), 3 deletions(-) diff --git a/t/integration/leave_request/cancel_basic.js b/t/integration/leave_request/cancel_basic.js index 4ed3ec259..7f605f084 100644 --- a/t/integration/leave_request/cancel_basic.js +++ b/t/integration/leave_request/cancel_basic.js @@ -117,7 +117,7 @@ describe('Leave request cancelation', function(){ .then(function(){ done() }); }); - it("Submit new leave requesti from user B for one weekday", function(done){ + it("Submit new leave request from user B for one weekday", function(done){ submit_form_func({ driver : driver, form_params : [{ diff --git a/t/integration/timezone.js b/t/integration/timezone.js index 67a5496e7..06ba71f97 100644 --- a/t/integration/timezone.js +++ b/t/integration/timezone.js @@ -1,6 +1,20 @@ 'use strict'; +const + test = require('selenium-webdriver/testing'), + register_new_user_func = require('../lib/register_new_user'), + open_page_func = require('../lib/open_page'), + submit_form_func = require('../lib/submit_form'), + check_elements_func = require('../lib/check_elements'), + By = require('selenium-webdriver').By, + config = require('../lib/config'), + application_host = config.get_application_host(), + expect = require('chai').expect, + Bluebird = require('bluebird'), + moment = require('moment'), + company_edit_form_id ='#company_edit_form'; + /* * Basic scenario for checking time zones: * @@ -19,3 +33,243 @@ * * Book a leave and ensure its "created at" value on My requests page is today_usa * * */ + +describe('Check departments list page', function(){ + let + driver, + user_email, + today_usa, + today_aus; + + this.timeout( config.get_execution_timeout() ); + + it("Create a company", function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(function(data){ + driver = data.driver; + user_email = data.email; + done(); + }); + }); + + it("Open page for editing company details", function(done){ + open_page_func({ + url : application_host + 'settings/general/', + driver : driver, + }) + .then(() => done() ); + }); + + it("Update Time zone to be somethng in Australia", function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : company_edit_form_id+' select[name="timezone"]', + option_selector : 'option[value="Australia/Sydney"]', + value : 'Australia/Sydney', + }], + submit_button_selector : company_edit_form_id+' button[type="submit"]', + message : /successfully/i, + should_be_successful : true, + }) + .then(function(){ done() }); + }); + + it("Get the date from Book leave modal and put it into today_aus variable", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then(el => el.click()) + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + .then(() => driver.findElement(By.css( 'input.book-leave-from-input' ))) + .then(el => el.getAttribute('value')) + .then(today => { + today_aus = today; + done(); + }); + }); + + it("Get the current date from Calendar page and ensure it is the same as today_aus", function(done){ + open_page_func({ + url : application_host + 'calendar/', + driver : driver, + }) + .then(() => driver.findElement(By.css( + 'table.month_'+moment(today_aus).format('MMMM') + + ' td.half_1st.day_'+moment(today_aus).format('D')+'.current_day_cell' + ))) + .then(el => { + expect(el, 'Ensure that current date is marked correctly').to.exist; + done(); + }); + }); + + it("Get the current date from Team view page and ensure it is the same as today_aus", function(done){ + open_page_func({ + url : application_host + 'calendar/teamview/', + driver : driver, + }) + .then(() => driver.findElement(By.css( + 'table.calendar_month td.half_1st.day_'+moment(today_aus).format('D')+'.current_day_cell' + ))) + .then(el => { + expect(el, 'Ensure that current date is marked correctly').to.exist; + + return driver.findElement(By.css('div.calendar-section-caption')) + }) + .then(el => el.getText()) + .then(month_caption => { + expect(month_caption, 'Ensure month is correct').to.be.eql(moment(today_aus).format('MMMM, YYYY')); + done(); + }) + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then(el => driver.sleep(1000)) + .then(() => done()); + }); + + it("Submit new leave request", function(done){ + submit_form_func({ + driver : driver, + form_params : [], + message : /New leave request was added/, + }) + .then(() => done()); + }); + + it('Ensure its "created at" value on My requests page is today_aus', function( done ){ + open_page_func({ + url : application_host + 'requests/', + driver : driver, + }) + .then(() => driver.findElement(By.css('tr[vpp="pending_for__'+user_email+'"] td.date_of_request'))) + .then(el => el.getText()) + .then(text => { + expect(text).to.be.eql(moment(today_aus).format('YYYY-MM-DD')); + done(); + }); + }); + + it('Reject newly added leave', function(done){ + driver + .findElement(By.css('tr[vpp="pending_for__'+user_email+'"] input[value="Reject"]')) + .then(el => el.click()) + .then(() => done()); + }); + + it("Open page for editing company details", function(done){ + open_page_func({ + url : application_host + 'settings/general/', + driver : driver, + }) + .then(() => done() ); + }); + + it("Update Time zone to be USA/Alaska", function(done){ + submit_form_func({ + driver : driver, + form_params : [{ + selector : company_edit_form_id+' select[name="timezone"]', + option_selector : 'option[value="US/Alaska"]', + value : 'US/Alaska', + }], + submit_button_selector : company_edit_form_id+' button[type="submit"]', + message : /successfully/i, + should_be_successful : true, + }) + .then(function(){ done() }); + }); + + it("Get the date from Book leave modal and put it into today_usa", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then(el => el.click()) + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + .then(() => driver.findElement(By.css( 'input.book-leave-from-input' ))) + .then(el => el.getAttribute('value')) + .then(today => { + today_usa = today; + done(); + }); + }); + + it("Ensure that today_usa is one day behind the today_aus", function(done){ + expect(moment(today_usa).format('YYYY-MM-DD')).to.be.not.eql(moment(today_aus).format('YYYY-MM-DD')); + done(); + }); + + it("Get the current date from Calendar page and ensure it is the same as today_usa", function(done){ + open_page_func({ + url : application_host + 'calendar/', + driver : driver, + }) + .then(() => driver.findElement(By.css( + 'table.month_'+moment(today_usa).format('MMMM') + + ' td.half_1st.day_'+moment(today_usa).format('D')+'.current_day_cell' + ))) + .then(el => { + expect(el, 'Ensure that current date is marked correctly').to.exist; + done(); + }); + }); + + it("Get the current date from Team view page and ensure it is the same as today_usa", function(done){ + open_page_func({ + url : application_host + 'calendar/teamview/', + driver : driver, + }) + .then(() => driver.findElement(By.css( + 'table.calendar_month td.half_1st.day_'+moment(today_usa).format('D')+'.current_day_cell' + ))) + .then(el => { + expect(el, 'Ensure that current date is marked correctly').to.exist; + + return driver.findElement(By.css('div.calendar-section-caption')) + }) + .then(el => el.getText()) + .then(month_caption => { + expect(month_caption, 'Ensure month is correct').to.be.eql(moment(today_usa).format('MMMM, YYYY')); + done(); + }) + }); + + it("Open Book leave popup window", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then( el => el.click() ) + // This is very important line when working with Bootstrap modals! + .then(el => driver.sleep(1000)) + .then(() => done()); + }); + + it("Submit new leave request", function(done){ + submit_form_func({ + driver : driver, + form_params : [], + message : /New leave request was added/, + }) + .then(() => done()); + }); + + it('Ensure its "created at" value on My requests page is today_usa', function( done ){ + open_page_func({ + url : application_host + 'requests/', + driver : driver, + }) + .then(() => driver.findElement(By.css('tr[vpp="pending_for__'+user_email+'"] td.date_of_request'))) + .then(el => el.getText()) + .then(text => { + expect(text).to.be.eql(moment(today_usa).format('YYYY-MM-DD')); + done(); + }); + }); + + after(function(done){ + driver.quit().then(() => done()); + }); + +}); diff --git a/views/requests.hbs b/views/requests.hbs index 560a253cc..793f4803b 100644 --- a/views/requests.hbs +++ b/views/requests.hbs @@ -35,8 +35,8 @@ - - + + - {{# each users_info}} - {{# with this.user_row}} - - - - - - + + + + + + - {{/with}} {{/each}}
Dates (from to) Type DeductedDates Approved by Status
{{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} {{ this.leave_type.name }}{{#if this.is_pended_revoke_leave}}
(pended revoke){{/if}}		 {{ this.get_deducted_days_number }}From {{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} to {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} {{#with this.approver}}{{this.full_name}}{{/with}} {{# if this.is_approved_leave }} From d069d75712e41d7cf59c9f389a551aa0aa149671 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 16:06:20 +0000 Subject: [PATCH 047/539] Leave mark for future improvements --- lib/model/mixin/user/company_aware.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index 771e55147..17d4ef0e0 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -21,6 +21,10 @@ module.exports = function(sequelize){ * for user determined by user_id. * Returns promise that is resolved with company object as parameter */ + // + // TODO: Query below needs to be revisited as it is slow for users + // many leaves + // this.get_company_for_user_details = function(args){ var user_id = args.user_id, year = args.year || moment(), From dd1bd407fbd917732ef66ef57d6413cd6d169e36 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 18:52:22 +0000 Subject: [PATCH 048/539] Add script that carries over remaning allowance into next year --- ...late_carry_over_allowance_for_all_users.js | 41 +++++++++++++++++++ lib/model/mixin/user/absence_aware.js | 27 ++++++++++++ package.json | 1 + 3 files changed, 69 insertions(+) create mode 100644 bin/calculate_carry_over_allowance_for_all_users.js diff --git a/bin/calculate_carry_over_allowance_for_all_users.js b/bin/calculate_carry_over_allowance_for_all_users.js new file mode 100644 index 000000000..df81ea911 --- /dev/null +++ b/bin/calculate_carry_over_allowance_for_all_users.js @@ -0,0 +1,41 @@ + +'use strict'; + +const + Promise = require('bluebird'), + models = require('../lib/model/db'); + +const + YEAR_FROM = '2017', + YEAR_TO = '2018'; + +/* + * 1. Get all users + * + * 2. Iterate through users and: + * + * 3. Calculate remaining days for current year + * + * 4. Put value from step 3 into user_allowance_adjustment.carried_over_allowance + * of next year + * + * */ + +models.User + .findAll() + .then(users => Promise.map( + users, + user => { + return user + .reload_with_leave_details({YEAR_FROM}) + .then( user => user.promise_number_of_days_available_in_allowance(YEAR_FROM) ) + .then(remainer => { + return user.promise_to_update_carried_over_allowance({ + year : YEAR_TO, + carried_over_allowance : remainer, + }); + }) + .then(() => Promise.resolve(console.log('Done with user ' + user.id))); + }, + {concurrency : 1} + )); diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 7ba6b53ef..d4f10ba47 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -583,6 +583,33 @@ module.exports = function(sequelize){ }); }; + this.promise_to_update_carried_over_allowance = function(args) { + let + self = this, + year = args.year || moment().format('YYYY'), + carried_over_allowance = args.carried_over_allowance; + + // Update related allowance adjustement record + return sequelize.models.UserAllowanceAdjustment + .findOrCreate({ + where : { + user_id : self.id, + year : year, + }, + defaults : { carried_over_allowance : carried_over_allowance }, + }) + .spread((record, created) => { + + if ( created ) { + return Promise.resolve(); + } + + record.set('carried_over_allowance', carried_over_allowance); + + return record.save(); + }); + }; + this.promise_my_leaves_for_calendar = function(args){ var year = args.year || moment(); diff --git a/package.json b/package.json index 03585aeb9..d9ca48a01 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "test": "node node_modules/mocha/bin/mocha --recursive t/*", "start": "node bin/wwww", "db-update": "node node_modules/.bin/sequelize db:migrate --config=config/db.json --models-path=lib/model/db/", + "carry-over-allowance" : "node bin/calculate_carry_over_allowance_for_all_users.js", "compile-sass": "node node_modules/node-sass/bin/node-sass scss/main.scss public/css/style.css" } } From c5ef8319e40c3e2d65b17adbfa4bd0e19e992aa2 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 22 Dec 2017 19:45:28 +0000 Subject: [PATCH 049/539] Fix issue with UI on Team view when department has long name --- public/css/style.css | 2 +- scss/main.scss | 2 +- t/integration/team_view/basic_wall_chart.js | 2 +- views/partials/user_requests_grouped.hbs | 2 +- views/team_view.hbs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index bcbc8ea2c..d666ed174 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -113,7 +113,7 @@ td.leave_cell_pended { padding-top: 5px; padding-bottom: 5px; } -.team-view-users .user-name-cell { +.team-view-users .left-column-cell { text-overflow: ellipsis; /* Cannot avoid specifying width with pixels... */ width: 165px; diff --git a/scss/main.scss b/scss/main.scss index 7c3541954..917286924 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -141,7 +141,7 @@ td.leave_cell_pended { padding-bottom : 5px; } -.team-view-users .user-name-cell { +.team-view-users .left-column-cell { text-overflow: ellipsis; /* Cannot avoid specifying width with pixels... */ width: 165px; diff --git a/t/integration/team_view/basic_wall_chart.js b/t/integration/team_view/basic_wall_chart.js index 4363885d4..d5da102d9 100644 --- a/t/integration/team_view/basic_wall_chart.js +++ b/t/integration/team_view/basic_wall_chart.js @@ -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.user-name-cell' )) + .findElements(By.css( 'tr.teamview-user-list-row > td.left-column-cell' )) // Make sure that number of users is as expected .then(function(elements){ diff --git a/views/partials/user_requests_grouped.hbs b/views/partials/user_requests_grouped.hbs index ba7f9c41b..ad1795a1e 100644 --- a/views/partials/user_requests_grouped.hbs +++ b/views/partials/user_requests_grouped.hbs @@ -2,6 +2,6 @@ {{# each grouped_leaves}}

{{this.year}}

{{> user_requests leaves=this.leaves no_header=1 logged_user=../logged_user}} -

Days deducted from allowance: {{ this.total_deduction }}

+

Days would be deducted from allowance: {{ this.total_deduction }}

 
{{/ each}} diff --git a/views/team_view.hbs b/views/team_view.hbs index 315ce73d1..272a064a0 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -31,7 +31,7 @@
- @@ -46,7 +46,7 @@
{{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}}{{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} Date: Fri, 22 Dec 2017 21:06:43 +0000 Subject: [PATCH 050/539] Clean up pagination widget Make it simple --- views/partials/pager.hbs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/views/partials/pager.hbs b/views/partials/pager.hbs index f2561e547..e4f4362e5 100644 --- a/views/partials/pager.hbs +++ b/views/partials/pager.hbs @@ -20,24 +20,28 @@
  • {{#if pager.page_prev}} - « + « Prev {{else}} - « + « Prev {{/if}}
    • {{# each pager.pages }} -
  • - {{ this }} -
    • + + {{# if_equal this ../pager.page }} +
  • + {{ this }} of {{ ../pager.page_qnty }} +
    • + {{/ if_equal}} + {{/ each}} {{#if pager.page_next}} - » + Next » {{else}} - » + Next » {{/if}} From c7df06c825716d7f459ab3e1a856ce3871625460 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 2 Jan 2018 16:39:14 +0000 Subject: [PATCH 051/539] Adopt tests for new year Also add new filed for setting company into read only mode --- lib/model/db/company.js | 21 ++++++++ lib/route/calendar.js | 54 +++++++++++-------- ...maining_used_columns_match_user_details.js | 4 +- t/integration/leave_request/cancel_basic.js | 2 +- .../leave_request/leave_request_revoke.js | 8 +-- .../leave_request_revoke_by_admin.js | 8 +-- t/integration/leave_type_limit_next_year.js | 4 +- t/unit/model/db/user.js | 12 ++--- 8 files changed, 71 insertions(+), 42 deletions(-) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 209ca54c5..2d17e6cf2 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -66,6 +66,12 @@ module.exports = function(sequelize, DataTypes) { defaultValue : null, comment : 'Message shown to all users that belong to current company', }, + mode : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : 1, + comment : "Indicate which mode the company account is in.", + }, }, { indexes : [ @@ -148,6 +154,14 @@ module.exports = function(sequelize, DataTypes) { // }); }, + // Return code for "read-only holidays" mode of company account. + // That means company only shows holidays/timeoff for emplyes and + // does not allow to create new ones. + // + get_mode_readonly_holidays : function(){ + return 2; + }, + // Create new company based on default values create_default_company : function(args){ var country_code = args.country_code || 'UK'; @@ -396,6 +410,13 @@ module.exports = function(sequelize, DataTypes) { }); }, + // Return TRUE if company has restrictio on ly to show hollidays for its + // employees and prevent them from adding new ones + // + is_mode_readonly_holidays : function(){ + return this.mode === Company.get_mode_readonly_holidays(); + }, + } }); diff --git a/lib/route/calendar.js b/lib/route/calendar.js index cb077901b..b8d48bc58 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -16,30 +16,38 @@ router.post('/bookleave/', function(req, res){ var model = req.app.get('db_model'); Promise.join ( - req.user.promise_users_I_can_manage(), - req.user.get_company_with_all_leave_types(), - Promise.try( function(){return get_and_validate_leave_params({req : req})}), - function(users, company, valide_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]; - - if (!employee) { - req.session.flash_error('Incorrect employee'); - throw new Error( 'Got validation errors' ); - } - - if (!leave_type) { - req.session.flash_error('Incorrect leave type'); - throw new Error( 'Got validation errors' ); - } - - return model.Leave.create_new_leave({ - for_employee : employee, - of_type : leave_type, - with_parameters : valide_attributes, - }); + req.user.promise_users_I_can_manage(), + req.user.get_company_with_all_leave_types(), + Promise.try( function(){return get_and_validate_leave_params({req : req})}), + function(users, company, valide_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]; + + if (!employee) { + req.session.flash_error('Incorrect employee'); + throw new Error( 'Got validation errors' ); } + + if (!leave_type) { + req.session.flash_error('Incorrect leave type'); + throw new Error( 'Got validation errors' ); + } + + if (company.is_mode_readonly_holidays() ){ + req.session.flash_error( + "Company account is locked and new Timeoff " + + "requests could not be added. Please contact administration." + ); + throw new Error('Company is in "Read-only holidays" mode'); + } + + return model.Leave.create_new_leave({ + for_employee : employee, + of_type : leave_type, + with_parameters : valide_attributes, + }); + } ) .then(function(leave){ diff --git a/t/integration/employees_page/remaining_used_columns_match_user_details.js b/t/integration/employees_page/remaining_used_columns_match_user_details.js index 8891c558e..313805179 100644 --- a/t/integration/employees_page/remaining_used_columns_match_user_details.js +++ b/t/integration/employees_page/remaining_used_columns_match_user_details.js @@ -107,10 +107,10 @@ describe('Leave request cancelation', function(){ driver : driver, form_params : [{ selector : 'input#from', - value : '2017-05-01', + value : '2018-05-01', },{ selector : 'input#to', - value : '2017-05-07', + value : '2018-05-07', }], message : /New leave request was added/, }) diff --git a/t/integration/leave_request/cancel_basic.js b/t/integration/leave_request/cancel_basic.js index 629c410ae..4ed3ec259 100644 --- a/t/integration/leave_request/cancel_basic.js +++ b/t/integration/leave_request/cancel_basic.js @@ -17,7 +17,7 @@ var test = require('selenium-webdriver/testing'), submit_form_func = require('../../lib/submit_form'), user_info_func = require('../../lib/user_info'), application_host = config.get_application_host(), - some_weekday_date = '2017-06-01'; + some_weekday_date = '2018-01-03'; /* * Scenario: diff --git a/t/integration/leave_request/leave_request_revoke.js b/t/integration/leave_request/leave_request_revoke.js index 710286ae5..6ee81f387 100644 --- a/t/integration/leave_request/leave_request_revoke.js +++ b/t/integration/leave_request/leave_request_revoke.js @@ -174,10 +174,10 @@ describe('Revoke leave request', function(){ value : "2", },{ selector : 'input#from', - value : '2017-06-15', + value : '2018-05-15', },{ selector : 'input#to', - value : '2017-06-16', + value : '2018-05-16', }], message : /New leave request was added/, }) @@ -188,8 +188,8 @@ describe('Revoke leave request', function(){ it("Check that all days are marked as pended", function(done){ check_booking_func({ driver : driver, - full_days : [moment('2017-06-16')], - halfs_1st_days : [moment('2017-06-15')], + full_days : [moment('2018-05-16')], + halfs_1st_days : [moment('2018-05-15')], type : 'pended', }) .then(function(){ done() }); diff --git a/t/integration/leave_request/leave_request_revoke_by_admin.js b/t/integration/leave_request/leave_request_revoke_by_admin.js index b146d199c..5281605bc 100644 --- a/t/integration/leave_request/leave_request_revoke_by_admin.js +++ b/t/integration/leave_request/leave_request_revoke_by_admin.js @@ -113,10 +113,10 @@ describe('Revoke leave request by Admin', function(){ value : "2", },{ selector : 'input#from', - value : '2017-06-15', + value : '2018-05-15', },{ selector : 'input#to', - value : '2017-06-16', + value : '2018-05-16', }], message : /New leave request was added/, }) @@ -127,8 +127,8 @@ describe('Revoke leave request by Admin', function(){ it("Check that all days are marked as pended", function(done){ check_booking_func({ driver : driver, - full_days : [moment('2017-06-16')], - halfs_1st_days : [moment('2017-06-15')], + full_days : [moment('2018-05-16')], + halfs_1st_days : [moment('2018-05-15')], type : 'pended', }) .then(function(){ done() }); diff --git a/t/integration/leave_type_limit_next_year.js b/t/integration/leave_type_limit_next_year.js index 7a12f240c..68584b0d5 100644 --- a/t/integration/leave_type_limit_next_year.js +++ b/t/integration/leave_type_limit_next_year.js @@ -221,10 +221,10 @@ describe('Leave type limits for next year: ' + next_year, function(){ driver : driver, form_params : [{ selector : 'input#from', - value : next_year + '-05-11', + value : next_year + '-05-14', },{ selector : 'input#to', - value : next_year + '-05-11', + value : next_year + '-05-14', }], message : /Failed to create a leave request/, }) diff --git a/t/unit/model/db/user.js b/t/unit/model/db/user.js index e5ecd6564..bafa2483e 100644 --- a/t/unit/model/db/user.js +++ b/t/unit/model/db/user.js @@ -51,14 +51,14 @@ describe('get_automatic_adjustment method', function(){ describe('Start date is in current year, no end date', function(){ var employee = model.User.build({ - start_date : moment('2017-04-01'), + start_date : moment('2018-04-01'), }); employee.department = { allowance : 20, }; it('adjustment is made based on start date', function(){ - expect(employee.get_automatic_adjustment({now : moment('2017-07-20')})) + expect(employee.get_automatic_adjustment({now : moment('2018-07-20')})) .to.be.equal(-5); }); @@ -81,22 +81,22 @@ describe('get_automatic_adjustment method', function(){ describe('Start date is in current year, end date is in next year', function(){ var employee = model.User.build({ - start_date : moment('2017-04-01'), - end_date : moment('2018-10-01'), + start_date : moment('2018-04-01'), + end_date : moment('2019-10-01'), }); employee.department = { allowance : 20, }; it('adjustment is made based on start date', function(){ - expect(employee.get_automatic_adjustment({now : moment('2017-07-20')})) + expect(employee.get_automatic_adjustment({now : moment('2018-07-20')})) .to.be.equal(-5); }); }); describe('Start date is in next year, no end date', function(){ var employee = model.User.build({ - start_date : moment('2017-04-01'), + start_date : moment('2018-04-01'), }); employee.department = { allowance : 20, From 43153ad4e0016323d2258c5ade20c7f3a4709d80 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 2 Jan 2018 20:14:03 +0000 Subject: [PATCH 052/539] Add missing migration --- migrations/20180102-company-mode.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 migrations/20180102-company-mode.js diff --git a/migrations/20180102-company-mode.js b/migrations/20180102-company-mode.js new file mode 100644 index 000000000..5cb5c6f80 --- /dev/null +++ b/migrations/20180102-company-mode.js @@ -0,0 +1,27 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + queryInterface.describeTable('Companies').then(function(attributes){ + + if (attributes.hasOwnProperty('mode')) { + return 1; + } + + return queryInterface.addColumn( + 'Companies', + 'mode', + models.Company.attributes.mode + ); + }); + + }, + + down: function (queryInterface, Sequelize) { + return queryInterface.removeColumn('Companies', 'mode'); + } +}; From ba0a66b5d0080232b459ffc45f02d77698dfdf24 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 2 Jan 2018 20:46:39 +0000 Subject: [PATCH 053/539] Update current year in footer --- views/partials/footer.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/partials/footer.hbs b/views/partials/footer.hbs index 44cbf4540..37e9afaed 100644 --- a/views/partials/footer.hbs +++ b/views/partials/footer.hbs @@ -6,7 +6,7 @@

    - © TimeOff.management 2017 + © TimeOff.management 2018 From 36e2116c92ce0ffd89fe454f778b5169e9426287 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 14:24:05 +0000 Subject: [PATCH 054/539] Dates that system works on are in UTC --- lib/model/calendar_month.js | 8 +-- lib/model/db/bank_holiday.js | 2 +- lib/model/db/company.js | 2 +- lib/model/db/department.js | 3 +- lib/model/db/leave.js | 14 ++--- lib/model/db/schedule.js | 2 +- lib/model/db/user.js | 6 +- lib/model/db/user_allowance_adjustment.js | 2 +- lib/model/leave_collection.js | 2 +- lib/model/leave_day.js | 2 +- lib/model/leave_request_parameters.js | 10 ++-- lib/model/mixin/user/absence_aware.js | 68 +++++++++++------------ lib/model/mixin/user/company_aware.js | 10 ++-- lib/model/team_view.js | 2 +- lib/route/audit.js | 4 +- lib/route/calendar.js | 18 +++--- lib/route/feed.js | 6 +- lib/route/settings.js | 2 +- lib/route/users.js | 18 +++--- lib/view/helpers.js | 2 +- 20 files changed, 92 insertions(+), 91 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 85b9a9fa1..d944356c1 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -6,7 +6,7 @@ var moment = require('moment'), function CalendarMonth(day, args){ var me = this; - this.date = moment(day).startOf('month'); + this.date = moment.utc(day).startOf('month'); this._leaves = {}; this._bank_holidays = {}; @@ -21,7 +21,7 @@ function CalendarMonth(day, args){ if (args && args.bank_holidays){ var map = {}; args.bank_holidays.forEach(function(day){ - day = moment(day); + day = moment.utc(day); map[day.format(me.default_date_format())] = day; }); this._bank_holidays = map; @@ -30,7 +30,7 @@ function CalendarMonth(day, args){ if (args && args.leave_days){ var map = {}; args.leave_days.forEach(function(day){ - var attribute = moment(day.date).format(me.default_date_format()); + var attribute = moment.utc(day.date).format(me.default_date_format()); if ( ! map[attribute] ) { map[attribute] = day; } else if ( map[attribute] ) { @@ -146,7 +146,7 @@ CalendarMonth.prototype.is_weekend = function(day){ CalendarMonth.prototype.is_current_day = function(day){ return this.get_base_date().date(day).format( this.default_date_format() ) === - moment().format( this.default_date_format() ); + moment.utc().format( this.default_date_format() ); }; CalendarMonth.prototype.as_for_template = function(){ diff --git a/lib/model/db/bank_holiday.js b/lib/model/db/bank_holiday.js index b4249bc30..46a20203f 100644 --- a/lib/model/db/bank_holiday.js +++ b/lib/model/db/bank_holiday.js @@ -63,7 +63,7 @@ module.exports = function(sequelize, DataTypes) { instanceMethods : { get_pretty_date : function(){ - return moment(this.date).format('YYYY-MM-DD'); + return moment.utc(this.date).format('YYYY-MM-DD'); }, } }); diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 2d17e6cf2..e896b19d9 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -387,7 +387,7 @@ module.exports = function(sequelize, DataTypes) { // Takes date string in format specific for current company and produce string // with date in generic format used internally within application normalise_date : function(date_str) { - return moment(date_str, this.get_default_date_format()).format('YYYY-MM-DD'); + return moment.utc(date_str, this.get_default_date_format()).format('YYYY-MM-DD'); }, // Promise schedule object valid for current company, if it does not have such diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 316f48f19..27d592c0d 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -99,7 +99,8 @@ module.exports = function(sequelize, DataTypes) { var self = this, model = sequelize.models, - base_date = args.base_date || moment(); + // NOTE VPP: following date is going to be amended by user's time zone + base_date = args.base_date || moment.utc(); var promise_users_and_leaves = Promise.try(function(){ return self.promise_active_users(); diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index bbcd55e50..b19d4bdf6 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -129,8 +129,8 @@ module.exports = function(sequelize, DataTypes) { .then(() => employee.promise_boss()) .then(function(main_supervisor){ - var start_date = moment(valide_attributes.from_date), - end_date = moment(valide_attributes.to_date); + var start_date = moment.utc(valide_attributes.from_date), + end_date = moment.utc(valide_attributes.to_date); // Check that start date is not bigger then end one if ( start_date.toDate() > end_date.toDate() ) { @@ -175,8 +175,8 @@ module.exports = function(sequelize, DataTypes) { get_days : function() { var self = this, - start_date = moment(this.date_start), - end_date = moment(this.date_end), + start_date = moment.utc(this.date_start), + end_date = moment.utc(this.date_end), days = [ start_date ]; if (self.hasOwnProperty('_days')) { @@ -303,7 +303,7 @@ get_deducted_days : function(args) { } if (args && args.hasOwnProperty('year')) { - year = moment(args.year, 'YYYY'); + year = moment.utc(args.year, 'YYYY'); } // If current Leave stands for type that does not use @@ -331,10 +331,10 @@ get_deducted_days : function(args) { // If it happenned that current leave day is from the year current // call was made of, ignore that day - if (year && year.year() !== moment(leave_day.date).year()) return; + if (year && year.year() !== moment.utc(leave_day.date).year()) return; // Ignore non-working days (weekends) - if ( ! schedule.is_it_working_day({ day : moment(leave_day.date) }) ){ + if ( ! schedule.is_it_working_day({ day : moment.utc(leave_day.date) }) ){ return; } diff --git a/lib/model/db/schedule.js b/lib/model/db/schedule.js index 3e38f55eb..fc371f851 100644 --- a/lib/model/db/schedule.js +++ b/lib/model/db/schedule.js @@ -120,7 +120,7 @@ module.exports = function(sequelize, DataTypes){ throw new Error('"is_it_working_day" requires to have "day" parameter'); } - return this[ moment(day).format('dddd').toLowerCase() ] === works_whole_day(); + return this[ moment.utc(day).format('dddd').toLowerCase() ] === works_whole_day(); }, works_monday : function(){ diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 8240184c3..5cc936dd4 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -243,7 +243,7 @@ function get_instance_methods(sequelize) { let self = this; if ( ! year ){ - year = moment().format('YYYY'); + year = moment.utc().format('YYYY'); } // To avoid redundant trips to DB check cached value first @@ -282,7 +282,7 @@ function get_instance_methods(sequelize) { }, reload_with_leave_details : function(args){ - var year = args.year || moment(), + var year = args.year || moment.utc(), self = this; return Promise.join( @@ -561,7 +561,7 @@ function get_class_methods(sequelize) { return { $or : [ { end_date : {$eq : null}}, - { end_date : {$gte : moment().startOf('day').format('YYYY-MM-DD') }}, + { end_date : {$gte : moment.utc().startOf('day').format('YYYY-MM-DD') }}, ], }; }, diff --git a/lib/model/db/user_allowance_adjustment.js b/lib/model/db/user_allowance_adjustment.js index 4e35d890a..3ead47679 100644 --- a/lib/model/db/user_allowance_adjustment.js +++ b/lib/model/db/user_allowance_adjustment.js @@ -8,7 +8,7 @@ module.exports = function(sequelize, DataTypes){ year : { type : DataTypes.INTEGER, allowNull : false, - defaultValue : moment().format('YYYY'), + defaultValue : moment.utc().format('YYYY'), comment : 'Year when adjustment is applied', }, adjustment : { diff --git a/lib/model/leave_collection.js b/lib/model/leave_collection.js index 055e9e7fe..ecc9b9d61 100644 --- a/lib/model/leave_collection.js +++ b/lib/model/leave_collection.js @@ -17,7 +17,7 @@ function promise_to_group_leaves(leaves) { // Group leaves by years leaves.forEach(leave => { - let year = moment(leave.get_start_leave_day().date).format('YYYY'); + let year = moment.utc(leave.get_start_leave_day().date).format('YYYY'); if ( ! grouped_leaves[year]) { grouped_leaves[ year ] = { diff --git a/lib/model/leave_day.js b/lib/model/leave_day.js index 393822894..9ab90b286 100644 --- a/lib/model/leave_day.js +++ b/lib/model/leave_day.js @@ -54,7 +54,7 @@ LeaveDay.prototype.pretend_to_be_full_day = function() { }; LeaveDay.prototype.get_pretty_date = function(){ - return moment(this.date).format('YYYY-MM-DD'); + return moment.utc(this.date).format('YYYY-MM-DD'); }; module.exports = LeaveDay; diff --git a/lib/model/leave_request_parameters.js b/lib/model/leave_request_parameters.js index dfa0d93c9..1fde7796d 100644 --- a/lib/model/leave_request_parameters.js +++ b/lib/model/leave_request_parameters.js @@ -23,7 +23,7 @@ function LeaveRequest(args) { ); // From date should not be bigger then to - if (moment(args.from_date).toDate() > moment(args.to_date).toDate()){ + if (moment.utc(args.from_date).toDate() > moment.utc(args.to_date).toDate()){ throw new Error( 'From date should be before To date at LeaveRequest constructor' ); } @@ -52,9 +52,9 @@ LeaveRequest.prototype.as_data_object = function(){ }; LeaveRequest.prototype.is_within_one_day = function(){ - return moment(this.from_date).format('YYYY-MM-DD') + return moment.utc(this.from_date).format('YYYY-MM-DD') === - moment(this.to_date).format('YYYY-MM-DD'); + moment.utc(this.to_date).format('YYYY-MM-DD'); }; LeaveRequest.prototype._does_fit_with_point = function(leave_day, point_name){ @@ -62,9 +62,9 @@ LeaveRequest.prototype._does_fit_with_point = function(leave_day, point_name){ if ( ( - moment(leave_day.date).format('YYYY-MM-DD') + moment.utc(leave_day.date).format('YYYY-MM-DD') === - moment(this[point_name]).format('YYYY-MM-DD') + moment.utc(this[point_name]).format('YYYY-MM-DD') ) && (! leave_day.is_all_day_leave()) diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index d4f10ba47..2433cb415 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -22,23 +22,23 @@ module.exports = function(sequelize){ if (show_full_year) { return _.map([1,2,3,4,5,6,7,8,9,10,11,12], function(i){ - return moment(year.format('YYYY')+'-'+i+'-01'); + return moment.utc(year.format('YYYY')+'-'+i+'-01'); }); } return _.map([0,1,2,3], function(delta){ - return moment().add(delta, 'months').startOf('month'); + return moment.utc().add(delta, 'months').startOf('month'); }) }; this.promise_calendar = function(args) { - var year = args.year || moment(), + var year = args.year || moment.utc(), show_full_year = args.show_full_year || false, model = sequelize.models, this_user = this, // Find or if we need to show multi year calendar - is_multi_year = moment().month() > 8; + is_multi_year = moment.utc().month() > 8; var months_to_show = this_user._get_calendar_months_to_show({ year : year.clone(), @@ -70,16 +70,16 @@ module.exports = function(sequelize){ $or : { date_start : { $between : [ - moment(year).startOf('year').format('YYYY-MM-DD'), - moment( + moment.utc(year).startOf('year').format('YYYY-MM-DD'), + moment.utc( year.clone().add((is_multi_year ? 1 : 0), 'years') ).endOf('year').format('YYYY-MM-DD'), ] }, date_end : { $between : [ - moment( year ).startOf('year').format('YYYY-MM-DD'), - moment( + moment.utc( year ).startOf('year').format('YYYY-MM-DD'), + moment.utc( year.clone().add((is_multi_year ? 1 : 0), 'years') ).endOf('year').format('YYYY-MM-DD'), ] @@ -131,7 +131,7 @@ module.exports = function(sequelize){ var days_filter = { $between : [ new_leave_attributes.from_date, - moment(new_leave_attributes.to_date) + moment.utc(new_leave_attributes.to_date) .add(1,'days').format('YYYY-MM-DD'), ], }; @@ -181,7 +181,7 @@ module.exports = function(sequelize){ var self = this, where_clause = {}, - year = args.year || moment(); + year = args.year || moment.utc(); if (args && args.filter_status) { where_clause = { status : args.filter_status }; @@ -192,14 +192,14 @@ module.exports = function(sequelize){ where_clause['$or'] = { date_start : { $between : [ - moment(year).startOf('year').format('YYYY-MM-DD'), - moment(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).startOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD'), ] }, date_end : { $between : [ - moment(year).startOf('year').format('YYYY-MM-DD'), - moment(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).startOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD'), ] } }; @@ -253,7 +253,7 @@ module.exports = function(sequelize){ this.promise_my_active_leaves = function(args) { - var year = args.year || moment(); + var year = args.year || moment.utc(); return this.promise_my_leaves({ year : year, @@ -438,21 +438,21 @@ module.exports = function(sequelize){ this.get_automatic_adjustment = function(args) { - var now = (args && args.now) ? moment(args.now) : moment(); + var now = (args && args.now) ? moment.utc(args.now) : moment.utc(); if ( - now.year() !== moment(this.start_date).year() - && ( ! this.end_date || moment(this.end_date).year() > now.year() ) + now.year() !== moment.utc(this.start_date).year() + && ( ! this.end_date || moment.utc(this.end_date).year() > now.year() ) ){ return 0; } - var start_date = moment(this.start_date).year() === now.year() - ? moment(this.start_date) + var start_date = moment.utc(this.start_date).year() === now.year() + ? moment.utc(this.start_date) : now.startOf('year'), - end_date = this.end_date && moment(this.end_date).year() <= now.year() - ? moment(this.end_date) - : moment().endOf('year'); + end_date = this.end_date && moment.utc(this.end_date).year() <= now.year() + ? moment.utc(this.end_date) + : moment.utc().endOf('year'); return -1*(this.department.allowance - Math.round( this.department.allowance * end_date.diff(start_date, 'days') / 365 @@ -470,7 +470,7 @@ module.exports = function(sequelize){ // for that year, and if it is something other then current year, // we use department nominal allowance plus employee's allowance // (ignoreing automatic allowance) - if (year && year != moment().year()) { + if (year && year != moment.utc().year()) { return self.department.allowance + carried_over_allowance + adjustment; @@ -516,8 +516,8 @@ module.exports = function(sequelize){ this.promise_adjustment_and_carry_over_for_year = function(year){ let self = this; - year = year || moment(); - year = moment(year).format('YYYY'); + year = year || moment.utc(); + year = moment.utc(year).format('YYYY'); return self .getAdjustments({ @@ -559,7 +559,7 @@ module.exports = function(sequelize){ this.promise_to_update_adjustment = function(args) { let self = this, - year = args.year || moment().format('YYYY'), + year = args.year || moment.utc().format('YYYY'), adjustment = args.adjustment; // Update related allowance adjustement record @@ -586,7 +586,7 @@ module.exports = function(sequelize){ this.promise_to_update_carried_over_allowance = function(args) { let self = this, - year = args.year || moment().format('YYYY'), + year = args.year || moment.utc().format('YYYY'), carried_over_allowance = args.carried_over_allowance; // Update related allowance adjustement record @@ -612,7 +612,7 @@ module.exports = function(sequelize){ this.promise_my_leaves_for_calendar = function(args){ - var year = args.year || moment(); + var year = args.year || moment.utc(); return this.getMy_leaves({ where : { @@ -625,14 +625,14 @@ module.exports = function(sequelize){ $or : { date_start : { $between : [ - moment(year).startOf('year').format('YYYY-MM-DD'), - moment(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).startOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD'), ] }, date_end : { $between : [ - moment(year).startOf('year').format('YYYY-MM-DD'), - moment(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).startOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD'), ] } } @@ -651,7 +651,7 @@ module.exports = function(sequelize){ leave_type = args.leave_type, leave = args.leave, // Derive year from Leave object - year = args.year || moment(leave.date_start); + year = args.year || moment.utc(leave.date_start); // Make sure object contain all necessary data for that check return self.reload_with_leave_details({ diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index 17d4ef0e0..dfebedf0b 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -27,7 +27,7 @@ module.exports = function(sequelize){ // this.get_company_for_user_details = function(args){ var user_id = args.user_id, - year = args.year || moment(), + year = args.year || moment.utc(), current_user = this; return this.getCompany({ @@ -48,14 +48,14 @@ module.exports = function(sequelize){ $or : { date_start : { $between : [ - moment().startOf('year').format('YYYY-MM-DD'), - moment().endOf('year').format('YYYY-MM-DD'), + moment.utc().startOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD'), ] }, date_end : { $between : [ - moment().startOf('year').format('YYYY-MM-DD'), - moment().endOf('year').format('YYYY-MM-DD'), + moment.utc().startOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD'), ] } } diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 53cbede9c..25eee0be3 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -10,7 +10,7 @@ const function TeamView(args) { var me = this; - this.base_date = args.base_date || moment(); + this.base_date = args.base_date || moment.utc(); this.user = args.user; } diff --git a/lib/route/audit.js b/lib/route/audit.js index 52d627d52..4591ecd27 100644 --- a/lib/route/audit.js +++ b/lib/route/audit.js @@ -80,11 +80,11 @@ router.get(/email/, function(req, res){ }; if (start_date) { - filter.start_date = moment(start_date).format(req.user.company.get_default_date_format()); + filter.start_date = moment.utc(start_date).format(req.user.company.get_default_date_format()); } if (end_date) { - filter.end_date = moment(end_date).format(req.user.company.get_default_date_format()); + filter.end_date = moment.utc(end_date).format(req.user.company.get_default_date_format()); } res.render('audit/emails', { diff --git a/lib/route/calendar.js b/lib/route/calendar.js index b8d48bc58..d1b522ee2 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -98,8 +98,8 @@ router.post('/bookleave/', function(req, res){ router.get('/', function(req, res) { var current_year = validator.isNumeric(req.param('year')) - ? moment(req.param('year'), 'YYYY') - : moment(); + ? moment.utc(req.param('year'), 'YYYY') + : moment.utc(); var show_full_year = validator.toBoolean(req.param('show_full_year')); @@ -115,7 +115,7 @@ router.get('/', function(req, res) { function(calendar, company, user, supervisors, total_number_of_days_in_allowance){ let full_leave_type_statistics = user.get_leave_statistics_by_types(), - this_year = moment().format('YYYY'); + this_year = moment.utc().format('YYYY'); user .promise_number_of_days_available_in_allowance( this_year ) @@ -126,9 +126,9 @@ router.get('/', function(req, res) { title : 'Calendar', current_user : user, supervisors : supervisors, - previous_year : moment(current_year).add(-1,'year').format('YYYY'), + previous_year : moment.utc(current_year).add(-1,'year').format('YYYY'), current_year : current_year.format('YYYY'), - next_year : moment(current_year).add(1,'year').format('YYYY'), + next_year : moment.utc(current_year).add(1,'year').format('YYYY'), show_full_year : show_full_year, leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), full_leave_type_statistics : full_leave_type_statistics, @@ -145,8 +145,8 @@ router.get('/', function(req, res) { router.get('/teamview/', function(req, res){ var base_date = validator.isDate(req.param('date')) - ? moment(req.param('date')) - : moment(); + ? moment.utc(req.param('date')) + : moment.utc(); var team_view = new TeamView({ base_date : base_date, @@ -175,8 +175,8 @@ router.get('/teamview/', function(req, res){ })) .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'), + prev_date : moment.utc(base_date).add(-1,'month'), + next_date : moment.utc(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, diff --git a/lib/route/feed.js b/lib/route/feed.js index ff3908584..03f4522be 100644 --- a/lib/route/feed.js +++ b/lib/route/feed.js @@ -44,7 +44,7 @@ router.get('/:token/ical.ics', function(req, res){ if (feed.is_calendar()){ return user.promise_calendar({ - year : moment(), + year : moment.utc(), show_full_year : true, }) .then(function(calendar){ @@ -93,8 +93,8 @@ router.get('/:token/ical.ics', function(req, res){ return; } - var start = moment(day.moment), - end = moment(day.moment); + var start = moment.utc(day.moment), + end = moment.utc(day.moment); if (day.is_leave_morning && day.is_leave_afternoon) { start.hour(9).minute(0); diff --git a/lib/route/settings.js b/lib/route/settings.js index 493ba9565..0a3609da7 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -476,7 +476,7 @@ router.post('/company/export/', function(req, res){ .then(function(company){ res.attachment( - company.name_for_machine()+'_'+moment().format('YYYYMMDD-hhmmss')+'.json' + company.name_for_machine()+'_'+moment.utc().format('YYYYMMDD-hhmmss')+'.json' ); res.send(JSON.stringify(company)); diff --git a/lib/route/users.js b/lib/route/users.js index ca351a5b5..1dece7612 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -165,10 +165,10 @@ router.get('/edit/:user_id/absences/', function(req, res){ .promise_total_number_of_days_in_allowance(), employee - .promise_adjustmet_for_year(moment().format('YYYY')), + .promise_adjustmet_for_year(moment.utc().format('YYYY')), employee - .promise_carried_over_allowance_for_year(moment().format('YYYY')), + .promise_carried_over_allowance_for_year(moment.utc().format('YYYY')), (args, total_days_number, employee_adjustment, carried_over_allowance) => { args.push(total_days_number); @@ -291,7 +291,7 @@ var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args){ // new "end_date" is provided // new "end_date" is in future new_user_attributes.end_date && - moment( new_user_attributes.end_date ).startOf('day').toDate() >= moment().startOf('day').toDate() + moment.utc( new_user_attributes.end_date ).startOf('day').toDate() >= moment.utc().startOf('day').toDate() ) ) ) { @@ -443,7 +443,7 @@ router.post('/edit/:user_id/', function(req, res){ .then(() => { if ( adjustment !== undefined ) { return employee.promise_to_update_adjustment({ - year : moment().format('YYYY'), + year : moment.utc().format('YYYY'), adjustment : adjustment, }); } @@ -590,14 +590,14 @@ router.get('/', function(req, res) { $or : { date_start : { $between : [ - moment().startOf('year').format('YYYY-MM-DD'), - moment().endOf('year').format('YYYY-MM-DD'), + moment.utc().startOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD'), ] }, date_end : { $between : [ - moment().startOf('year').format('YYYY-MM-DD'), - moment().endOf('year').format('YYYY-MM-DD'), + moment.utc().startOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD'), ] } } @@ -762,7 +762,7 @@ function get_and_validate_user_parameters(args) { if ( start_date && end_date && - moment(start_date).toDate() > moment(end_date).toDate() + moment.utc(start_date).toDate() > moment.utc(end_date).toDate() ){ req.session.flash_error( 'End date for '+item_name+' is before start date' diff --git a/lib/view/helpers.js b/lib/view/helpers.js index b8680b433..efcf06f09 100644 --- a/lib/view/helpers.js +++ b/lib/view/helpers.js @@ -13,7 +13,7 @@ var as_date_formatted = function(date_str, format, options) { format = get_current_format( options ); } - return moment(date_str).format(format); + return moment.utc(date_str).format(format); } // Note: that currently it returns only truely value of given property, that is if there property From 71dc373bd8ba43212efa67f191434ddfb734d370 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 16:00:12 +0000 Subject: [PATCH 055/539] Add timezone field to company and UI to edit it --- lib/model/db/company.js | 6 ++++ lib/route/settings.js | 8 ++++++ ...20171228-add-time-zone-field-to-company.js | 28 +++++++++++++++++++ package.json | 4 +-- views/general_settings.hbs | 14 ++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 migrations/20171228-add-time-zone-field-to-company.js diff --git a/lib/model/db/company.js b/lib/model/db/company.js index e896b19d9..8fc437b35 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -72,6 +72,12 @@ module.exports = function(sequelize, DataTypes) { defaultValue : 1, comment : "Indicate which mode the company account is in.", }, + timezone : { + type : DataTypes.TEXT, + allowNull : true, + defaultValue : 'Europe/London', + comment : 'Timezone current company is located in', + }, }, { indexes : [ diff --git a/lib/route/settings.js b/lib/route/settings.js index 0a3609da7..f198319e9 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -9,6 +9,7 @@ var express = require('express'), validator = require('validator'), Promise = require('bluebird'), moment = require('moment'), + moment_tz = require('moment-timezone'), config = require('../config'), _ = require('underscore'); @@ -48,6 +49,7 @@ router.get('/general/', function(req, res){ company : company, schedule : schedule, countries : config.get('countries'), + timezones_available : moment_tz.tz.names(), }); }); }); @@ -57,6 +59,7 @@ router.post('/company/', function(req, res){ var name = validator.trim(req.param('name')), country_code = validator.trim(req.param('country')), date_format = validator.trim(req.param('date_format')), + timezone = validator.trim(req.param('timezone')), share_all_absences= validator.toBoolean( req.param('share_all_absences') ); @@ -65,6 +68,10 @@ router.post('/company/', function(req, res){ req.session.flash_error('Country should contain only letters and numbers'); } + if ( ! moment_tz.tz.names().find(tz_str => tz_str === timezone) ) { + req.session.flash_error('Time zone is unknown'); + } + // In case of validation error redirect back to edit form if ( req.session.flash_has_errors() ) { return res.redirect_with_session('/settings/general/'); @@ -89,6 +96,7 @@ router.post('/company/', function(req, res){ company.country = country_code; company.share_all_absences= share_all_absences; company.date_format = date_format; + company.timezone = timezone; return company.save(); }) diff --git a/migrations/20171228-add-time-zone-field-to-company.js b/migrations/20171228-add-time-zone-field-to-company.js new file mode 100644 index 000000000..f6236f614 --- /dev/null +++ b/migrations/20171228-add-time-zone-field-to-company.js @@ -0,0 +1,28 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + return queryInterface.describeTable('Companies') + .then(function(attributes){ + + if (attributes.hasOwnProperty('timezone')) { + return 1; + } + + return queryInterface.addColumn( + 'Companies', + 'timezone', + models.Company.attributes.timezone + ); + }); + }, + + down: function (queryInterface, Sequelize) { + return queryInterface + .removeColumn('Companies', 'timezone'); + } +}; diff --git a/package.json b/package.json index d9ca48a01..f38695cf6 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "joi": "~12.0.0", "ldapauth-fork": "^2.5.2", "moment": "^2.11.2", - "moment-timezone": "^0.5.10", + "moment-timezone": "^0.5.14", "morgan": "^1.3.2", "nconf": "^0.8.4", "node-uuid": "^1.4.7", @@ -47,7 +47,7 @@ "test": "node node_modules/mocha/bin/mocha --recursive t/*", "start": "node bin/wwww", "db-update": "node node_modules/.bin/sequelize db:migrate --config=config/db.json --models-path=lib/model/db/", - "carry-over-allowance" : "node bin/calculate_carry_over_allowance_for_all_users.js", + "carry-over-allowance": "node bin/calculate_carry_over_allowance_for_all_users.js", "compile-sass": "node node_modules/node-sass/bin/node-sass scss/main.scss public/css/style.css" } } diff --git a/views/general_settings.hbs b/views/general_settings.hbs index c8641bd9b..c61959880 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -49,6 +49,20 @@ + + +

    + +
    + +
    +
    + +
    From 838aa5d7fcec8cd627ad4c3f581d02dc9e72f4c5 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 18:28:00 +0000 Subject: [PATCH 056/539] Start and end booking dates are TZ aware --- app.js | 29 +++++++++++++++++++++-------- lib/route/calendar.js | 1 - 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app.js b/app.js index de753b088..1bbf71eac 100644 --- a/app.js +++ b/app.js @@ -57,14 +57,27 @@ app.use(passport.session()); // // Make sure session and user objects are available in templates app.use(function(req,res,next){ - res.locals.session = req.session; - res.locals.logged_user = req.user; - res.locals.url_to_the_site_root = '/'; - res.locals.requested_path = req.originalUrl; - // For book leave request modal - res.locals.booking_start = moment(); - res.locals.booking_end = moment(); - next(); + + // Get today given user's timezone + var today; + + if ( req.user && req.user.company ) { + today = moment.utc( + moment.utc().tz(req.user.company.timezone).format('YYYY-MM-DD') + ); + } else { + today = moment.utc(); + } + + res.locals.session = req.session; + res.locals.logged_user = req.user; + res.locals.url_to_the_site_root = '/'; + res.locals.requested_path = req.originalUrl; + // For book leave request modal + res.locals.booking_start = today, + res.locals.booking_end = today, + + next(); }); app.use(function(req,res,next){ diff --git a/lib/route/calendar.js b/lib/route/calendar.js index d1b522ee2..c0fe7eee2 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -9,7 +9,6 @@ var express = require('express'), validator = require('validator'), get_and_validate_leave_params = require('./validator/leave_request'), TeamView = require('../model/team_view'), - CalendarMonth = require('../model/calendar_month'), EmailTransport = require('../email'); router.post('/bookleave/', function(req, res){ From 31549d3e797eed7c52c1c1f4ffca10910253a654 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 28 Dec 2017 19:12:25 +0000 Subject: [PATCH 057/539] Add view helpers for TZ aware date formatting --- app.js | 4 +-- lib/model/db/company.js | 11 ++++++++ lib/view/helpers.js | 57 ++++++++++++++++++++++++++++++++++++++--- views/audit/emails.hbs | 2 +- views/requests.hbs | 2 +- 5 files changed, 68 insertions(+), 8 deletions(-) diff --git a/app.js b/app.js index 1bbf71eac..c0155a27d 100644 --- a/app.js +++ b/app.js @@ -62,9 +62,7 @@ app.use(function(req,res,next){ var today; if ( req.user && req.user.company ) { - today = moment.utc( - moment.utc().tz(req.user.company.timezone).format('YYYY-MM-DD') - ); + today = req.user.company.get_today(); } else { today = moment.utc(); } diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 8fc437b35..d9c6fa77c 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -3,6 +3,7 @@ var Promise = require("bluebird"), LdapAuth = require('ldapauth-fork'), moment = require('moment'), + moment_tz = require('moment-timezone'), _ = require('underscore'); module.exports = function(sequelize, DataTypes) { @@ -396,6 +397,16 @@ module.exports = function(sequelize, DataTypes) { return moment.utc(date_str, this.get_default_date_format()).format('YYYY-MM-DD'); }, + // Returns moment UTC-ed object that takes into consideration company time zone + // (p to day's precision) + get_today : function() { + let self = this; + + return moment.utc( + moment_tz.utc().tz(self.timezone).format('YYYY-MM-DD') + ); + }, + // Promise schedule object valid for current company, if it does not have such // in databse, retulr default one promise_schedule : function(){ diff --git a/lib/view/helpers.js b/lib/view/helpers.js index efcf06f09..3ee5d8708 100644 --- a/lib/view/helpers.js +++ b/lib/view/helpers.js @@ -2,8 +2,9 @@ "use strict"; var - moment = require('moment-timezone'), - config = require('../config'); + moment = require('moment'), + moment_tz = require('moment-timezone'), + config = require('../config'); var as_date_formatted = function(date_str, format, options) { @@ -13,6 +14,13 @@ var as_date_formatted = function(date_str, format, options) { format = get_current_format( options ); } + // Special case when we have to take time zone into consideration + // when printing date (usually it is needed for those dates recorded + // automatically as UTC time stampts) + if ( options.tom_take_timezone_into_consideration ) { + return moment_tz.utc(date_str).tz( get_timezone( options ) ).format( format ); + } + return moment.utc(date_str).format(format); } @@ -44,7 +52,21 @@ var get_current_format = function(options){ } return format; -} +}; + +var get_timezone = function(options) { + + let timezone = 'Europe/London'; + + var user = get_property_from_options(options, 'logged_user') + || get_property_from_options(options, 'user'); + + if ( user && user.hasOwnProperty('company') ) { + timezone = user.company.timezone; + } + + return timezone; +}; module.exports = function(){ return { @@ -72,6 +94,35 @@ module.exports = function(){ ); }, + // Do the same as "as_date" method but takes into consideration of company + // timezone. It is needed for rendering dates that were recorded in database + // automatically in UTC, dates that were recorded based on explicit input + // from users should not be used with this method (but with "as_date" instead) + as_date_from_timestamp : function(date_string, options){ + + // Add custom flag to options so further down the call stack + // we would know that date needs to be corrected with + // current timezone + options.tom_take_timezone_into_consideration = true; + + return as_date_formatted(date_string, undefined, options); + }, + + // Similar to "as_datetime" but with the same twist as "as_date_from_timestamp" + as_datetime_from_timestamp : function(date_str, options){ + + // Add custom flag to options so further down the call stack + // we would know that date needs to be corrected with + // current timezone + options.tom_take_timezone_into_consideration = true; + + return as_date_formatted( + date_str, + get_current_format(options) + ' HH:mm:ss', + options + ); + }, + // Given string with UTC date and string with moment.js format return corresponding string as_date_formatted : as_date_formatted, diff --git a/views/audit/emails.hbs b/views/audit/emails.hbs index aca3de23a..06d9c0cde 100644 --- a/views/audit/emails.hbs +++ b/views/audit/emails.hbs @@ -77,7 +77,7 @@
    		- {{as_datetime this.created_at}} + {{as_datetime_from_timestamp this.created_at}}
    {{#with this.user}}{{this.full_name}}{{/with}} {{this.user.department.name}}{{as_date this.createdAt}}{{as_date_from_timestamp this.createdAt}} From {{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} to {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} {{#if this.is_pended_revoke_leave}}REVOKE {{/if}}{{this.leave_type.name}} {{ this.get_deducted_days_number }}
    {{#with this.user}}{{this.full_name}}{{/with}} {{this.user.department.name}}{{as_date_from_timestamp this.createdAt}}From {{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} to {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}}{{as_date_from_timestamp this.createdAt}}{{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} {{#if this.is_pended_revoke_leave}}REVOKE {{/if}}{{this.leave_type.name}} {{ this.get_deducted_days_number }} From 8ba837e9d9de823f984419142dd6c43d41b2154e Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 5 Jan 2018 06:30:03 +0000 Subject: [PATCH 062/539] Simple commit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index af8d5262d..3fd6d000f 100644 --- a/README.md +++ b/README.md @@ -126,4 +126,5 @@ npm start ## Feedback -Please report any issues or feedback to twitter or Email: pavlo at timeoff.management \ No newline at end of file +Please report any issues or feedback to twitter or Email: pavlo at timeoff.management + From db52ced05288a532ac1b59dd6cdf27f795961d80 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 5 Jan 2018 06:48:24 +0000 Subject: [PATCH 063/539] Add sorting order column to leave type. Allow editing newly added flag. --- lib/model/db/leave_type.js | 6 + lib/model/mixin/user/company_aware.js | 1 + lib/route/settings.js | 155 +++++++++--------- .../20180103-sort-order-for-leave-types.js | 27 +++ t/integration/crud_leave_type.js | 45 +++-- t/integration/leave_type_limit_in_action.js | 2 +- t/integration/leave_type_limit_next_year.js | 2 +- t/integration/remove_used_leave_type.js | 2 +- views/general_settings.hbs | 27 ++- views/partials/add_new_leave_type_modal.hbs | 7 +- 10 files changed, 157 insertions(+), 117 deletions(-) create mode 100644 migrations/20180103-sort-order-for-leave-types.js diff --git a/lib/model/db/leave_type.js b/lib/model/db/leave_type.js index 322400b0c..9bef02bb2 100644 --- a/lib/model/db/leave_type.js +++ b/lib/model/db/leave_type.js @@ -22,6 +22,12 @@ module.exports = function(sequelize, DataTypes) { allowNull : false, defaultValue : 0, }, + sort_order : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : 0, + comment : "Is used to determine sorting order of leave types", + }, }, { classMethods: { associate : function( models ) { diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index dfebedf0b..e77649d49 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -152,6 +152,7 @@ module.exports = function(sequelize){ as : 'leave_types', }], order : [ + [{ model : sequelize.models.LeaveType, as : 'leave_types' }, 'sort_order', 'DESC'], [{ model : sequelize.models.LeaveType, as : 'leave_types' }, 'name'] ] }); diff --git a/lib/route/settings.js b/lib/route/settings.js index f198319e9..bf660870b 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -331,86 +331,73 @@ router.post('/bankholidays/delete/:bank_holiday_number/', function(req, res){ router.post('/leavetypes', function(req, res){ - var model = req.app.get('db_model'); - - req.user.getCompany({ - include : [{ model : model.LeaveType, as : 'leave_types' }], - order : [[{model: model.LeaveType, as : 'leave_types'}, 'name' ]], - }) - .then(function(company){ + var model = req.app.get('db_model'); - var promise_new_leave_type = Promise.resolve(1); + req.user - if (validator.trim(req.param('name__new'))) { - var attributes = get_and_validate_leave_type({ - req : req, - suffix : 'new', - item_name : 'New Leave Type' - }); - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); - } - attributes.companyId = company.id; - promise_new_leave_type = model.LeaveType.create(attributes); - } + .get_company_with_all_leave_types() + .then(function(company){ - return Promise.all([ - promise_new_leave_type, - _.map( + var promise_new_leave_type = Promise.resolve(1); - company.leave_types, - function(leave_type, index){ + if (validator.trim(req.param('name__new'))) { + var attributes = get_and_validate_leave_type({ + req : req, + suffix : 'new', + item_name : 'New Leave Type' + }); + attributes.companyId = company.id; + promise_new_leave_type = model.LeaveType.create(attributes); + } - var attributes = get_and_validate_leave_type({ - req : req, - suffix : index, - item_name : leave_type.name, - }); + return Promise.all([ + promise_new_leave_type, + _.map( + company.leave_types, + function(leave_type, index){ - // If there were any validation errors: do not update leave type - // (it affects all leave types, that is if one failed - // validation - all leave types are not to be updated) - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); - } + var attributes = get_and_validate_leave_type({ + req : req, + suffix : leave_type.id, + item_name : leave_type.name, + }); - return leave_type.updateAttributes(attributes); - } + return leave_type.updateAttributes(attributes); + } - ) // End of map that create leave type update promises - ]); + ) // End of map that create leave type update promises + ]); }) - .then(function(){ - if ( ! req.session.flash_has_errors() ) { - req.session.flash_message('Changes to leave types were saved'); - } - return res.redirect_with_session('/settings/general/'); + .then(() => { + req.session.flash_message('Changes to leave types were saved'); + return res.redirect_with_session('/settings/general/'); }) - .catch(function(error){ - console.error( - 'An error occurred when trying to edit Leave types by user '+req.user.id - + ' : ' + error - ); + .catch(error => { + console.error( + 'An error occurred when trying to edit Leave types by user '+req.user.id + + ' : ' + error + ); - req.session.flash_error( - 'Failed to update leave types details, please contact customer service' - ); + if (error.hasOwnProperty('user_message')) { + req.session.flash_error( error.user_message ); + } - return res.redirect_with_session('/settings/general/'); - }); + req.session.flash_error( + 'Failed to update leave types details, please contact customer service' + ); + return res.redirect_with_session('/settings/general/'); + }); }); -router.post('/leavetypes/delete/:leave_type_number/', function(req, res){ +router.post('/leavetypes/delete/:leave_type_id/', function(req, res){ - // leave_type_number is an index number of leave_type to be removed based - // on the list of leave types on the page, this is not an ID - var leave_type_number = req.param('leave_type_number'); + var leave_type_id = req.param('leave_type_id'); var model = req.app.get('db_model'); - if (!validator.isInt(leave_type_number)) { + if (!validator.isInt(leave_type_id)) { console.error( 'User '+req.user.id+' submited non-int leave_type number ' +bank_holiday_number @@ -430,7 +417,7 @@ router.post('/leavetypes/delete/:leave_type_number/', function(req, res){ order : [[{model: model.LeaveType, as : 'leave_types'}, 'name' ]], }) .then(function(company){ - var leave_type_to_remove = company.leave_types[ leave_type_number ]; + var leave_type_to_remove = company.leave_types.find( lt => String(lt.id) === String(leave_type_id) ); // Check if user specify valid department number if (! leave_type_to_remove) { @@ -439,7 +426,7 @@ router.post('/leavetypes/delete/:leave_type_number/', function(req, res){ throw new Error( 'User '+req.user.id+' tried to remove non-existing leave type number' - +leave_type_number+' out of '+company.leave_types.length + +leave_type_id+' out of '+company.leave_types.length ); @@ -588,33 +575,38 @@ function get_and_validate_bank_holiday(args) { } function get_and_validate_leave_type(args) { - var req = args.req, - index = args.suffix, - item_name = args.item_name; + let + req = args.req, + suffix = args.suffix, + item_name = args.item_name; // Get user parameters - var name = validator.trim(req.param('name__'+index)), - color = validator.trim(req.param('color__'+index)) || '#f1f1f1', - limit = validator.trim(req.param('limit__'+index)) || 0, - use_allowance = validator.toBoolean( - req.param('use_allowance__'+index) - ); + let + name = validator.trim(req.param('name__'+suffix)), + color = validator.trim(req.param('color__'+suffix)) || '#f1f1f1', + limit = validator.trim(req.param('limit__'+suffix)) || 0, + first_record = validator.trim(req.param('first_record')) || 0, + use_allowance = validator.toBoolean( + req.param('use_allowance__'+suffix) + ); - // Validate provided parameters + // VPP TODO move that into resusable component + let throw_user_error = function(message){ + let error = new Error(message); + error.user_message = message; + throw error; + }; + // Validate provided parameters if ( ! validator.isHexColor(color)) { - req.session.flash_error( - 'New color for '+item_name+' should be color code' - ); + throw_user_error( 'New color for '+item_name+' should be color code' ); } + if ( ! validator.isNumeric(limit) ){ - req.session.flash_error( - 'New limit for '+item_name+' should be a valide number' - ); + throw_user_error( 'New limit for '+item_name+' should be a valide number' ); + } else if ( limit < 0) { - req.session.flash_error( - 'New limit for '+item_name+' should be positive number or 0' - ); + throw_user_error( 'New limit for '+item_name+' should be positive number or 0' ); } return { @@ -622,6 +614,7 @@ function get_and_validate_leave_type(args) { color : color, use_allowance : use_allowance, limit : limit, + sort_order : ( (first_record && (String(first_record)===String(suffix))? 1 : 0) ), }; } diff --git a/migrations/20180103-sort-order-for-leave-types.js b/migrations/20180103-sort-order-for-leave-types.js new file mode 100644 index 000000000..4899d3997 --- /dev/null +++ b/migrations/20180103-sort-order-for-leave-types.js @@ -0,0 +1,27 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + queryInterface.describeTable('LeaveTypes').then(function(attributes){ + + if (attributes.hasOwnProperty('sort_order')) { + return 1; + } + + return queryInterface.addColumn( + 'LeaveTypes', + 'sort_order', + models.LeaveType.attributes.sort_order + ); + }); + + }, + + down: function (queryInterface, Sequelize) { + return queryInterface.removeColumn('LeaveTypes', 'sort_order'); + } +}; diff --git a/t/integration/crud_leave_type.js b/t/integration/crud_leave_type.js index c905386ae..bca2f3946 100644 --- a/t/integration/crud_leave_type.js +++ b/t/integration/crud_leave_type.js @@ -41,17 +41,16 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'Holiday', },{ - selector : leave_type_edit_form_id+' input[name="name__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', value : 'Sick Leave', }], }) .then(function(){ done() }); }); - // TODO un comment that step when we resurect editing colors // // Try to submit form with incorrect color code // .then(function(data){ @@ -70,11 +69,11 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="use_allowance__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="allowance_0"]', tick : true, value : 'on', },{ - selector : leave_type_edit_form_id+' input[name="use_allowance__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="allowance_1"]', tick : true, value : 'off', }], @@ -86,7 +85,7 @@ describe('CRUD for leave types', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="use_allowance__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="allowance_1"]', tick : true, value : 'on', }], @@ -101,11 +100,11 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="use_allowance__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="allowance_0"]', value : 'on', tick : true, },{ - selector : leave_type_edit_form_id+' input[name="use_allowance__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="allowance_1"]', value : 'on', tick : true, }], @@ -117,10 +116,10 @@ describe('CRUD for leave types', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="limit__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="limit_0"]', value : '0', },{ - selector : leave_type_edit_form_id+' input[name="limit__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="limit_1"]', value : '5', }], submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', @@ -134,7 +133,7 @@ describe('CRUD for leave types', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="limit__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="limit_0"]', value : '-1', }], submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', @@ -174,13 +173,13 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_new_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'AAAAA', },{ - selector : leave_type_new_form_id+' input[name="name__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', value : 'Holiday', },{ - selector : leave_type_new_form_id+' input[name="name__2"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_2"]', value : 'Sick Leave', }], }) @@ -191,7 +190,7 @@ describe('CRUD for leave types', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'MM', }], submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', @@ -204,13 +203,13 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'Holiday', },{ - selector : leave_type_edit_form_id+' input[name="name__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', value : 'MM', },{ - selector : leave_type_edit_form_id+' input[name="name__2"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_2"]', value : 'Sick Leave', }], }) @@ -221,13 +220,13 @@ describe('CRUD for leave types', function(){ submit_form_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'Holiday', },{ - selector : leave_type_edit_form_id+' input[name="name__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', value : 'Sick Leave', }], - submit_button_selector : leave_type_edit_form_id+' button[value="1"]', + submit_button_selector : leave_type_edit_form_id+' button[data-tom-leave-type-order="remove_1"]', message : /Leave type was successfully removed/, }) .then(function(){ done() }); @@ -237,10 +236,10 @@ describe('CRUD for leave types', function(){ check_elements_func({ driver : driver, elements_to_check : [{ - selector : leave_type_edit_form_id+' input[name="name__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', value : 'Holiday', },{ - selector : leave_type_edit_form_id+' input[name="name__1"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', value : 'Sick Leave', }], }) diff --git a/t/integration/leave_type_limit_in_action.js b/t/integration/leave_type_limit_in_action.js index ac465ab57..3746bdad7 100644 --- a/t/integration/leave_type_limit_in_action.js +++ b/t/integration/leave_type_limit_in_action.js @@ -60,7 +60,7 @@ describe('Leave type limits in actoion', function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="limit__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="limit_0"]', value : '3', }], submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', diff --git a/t/integration/leave_type_limit_next_year.js b/t/integration/leave_type_limit_next_year.js index 68584b0d5..848b83321 100644 --- a/t/integration/leave_type_limit_next_year.js +++ b/t/integration/leave_type_limit_next_year.js @@ -67,7 +67,7 @@ describe('Leave type limits for next year: ' + next_year, function(){ submit_form_func({ driver : driver, form_params : [{ - selector : leave_type_edit_form_id+' input[name="limit__0"]', + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="limit_0"]', value : '1', }], submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', diff --git a/t/integration/remove_used_leave_type.js b/t/integration/remove_used_leave_type.js index d7024d262..ee53368c5 100644 --- a/t/integration/remove_used_leave_type.js +++ b/t/integration/remove_used_leave_type.js @@ -140,7 +140,7 @@ describe('Try to remove used leave type', function(){ it("Try to remove newly added leave type and ensure it fails", function(done){ submit_form_func({ driver : driver, - submit_button_selector : leave_type_edit_form_id+' button[value="0"]', + submit_button_selector : leave_type_edit_form_id+' button[data-tom-leave-type-order="remove_0"]', message : /Cannot remove leave type: type is in use/, }) .then(function(){ done() }); diff --git a/views/general_settings.hbs b/views/general_settings.hbs index c61959880..7c0969b31 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -206,8 +206,14 @@
    -
    -
    +
    + +

    Tick one to always be on top of the list

    +
    +
    + +

    Days/year

    +
     
    @@ -225,17 +231,24 @@ {{#each company.leave_types}}
    - + +
    + + + + +
    +
    - - + +
    - +
    - +
    diff --git a/views/partials/add_new_leave_type_modal.hbs b/views/partials/add_new_leave_type_modal.hbs index f92c2ffb4..18e34c097 100644 --- a/views/partials/add_new_leave_type_modal.hbs +++ b/views/partials/add_new_leave_type_modal.hbs @@ -12,9 +12,10 @@ {{#each company.leave_types}} - - - + + + + {{/each}} From 0912927b71e2eed32b2f6247854c81612a76ba81 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sun, 7 Jan 2018 19:26:57 +0000 Subject: [PATCH 064/539] Add test for leave type orders --- lib/route/settings.js | 13 +- t/integration/crud_leave_type.js | 139 +++++++++++++++++++- views/partials/add_new_leave_type_modal.hbs | 9 -- views/partials/book_leave_modal.hbs | 2 +- 4 files changed, 150 insertions(+), 13 deletions(-) diff --git a/lib/route/settings.js b/lib/route/settings.js index bf660870b..ff46017ee 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -356,13 +356,16 @@ router.post('/leavetypes', function(req, res){ company.leave_types, function(leave_type, index){ - var attributes = get_and_validate_leave_type({ + let attributes = get_and_validate_leave_type({ req : req, suffix : leave_type.id, item_name : leave_type.name, }); - return leave_type.updateAttributes(attributes); + // Update leave type only if there are attributes submitted for it + return attributes + ? leave_type.updateAttributes(attributes) + : Promise.resolve(1); } ) // End of map that create leave type update promises @@ -590,6 +593,12 @@ function get_and_validate_leave_type(args) { req.param('use_allowance__'+suffix) ); + // If no name for leave type was provided: do nothing - treat case + // as no need to update the leave type + if ( ! name ) { + return false; + } + // VPP TODO move that into resusable component let throw_user_error = function(message){ let error = new Error(message); diff --git a/t/integration/crud_leave_type.js b/t/integration/crud_leave_type.js index bca2f3946..809653ba7 100644 --- a/t/integration/crud_leave_type.js +++ b/t/integration/crud_leave_type.js @@ -9,6 +9,8 @@ var test = require('selenium-webdriver/testing'), check_elements_func = require('../lib/check_elements'), By = require('selenium-webdriver').By, config = require('../lib/config'), + Bluebird = require('bluebird'), + expect = require('chai').expect, application_host = config.get_application_host(), leave_type_edit_form_id='#leave_type_edit_form', leave_type_new_form_id ='#leave_type_new_form'; @@ -186,7 +188,7 @@ describe('CRUD for leave types', function(){ .then(function(){ done() }); }); - it('Add rename newly added leave type to start with "M"', function(done){ + it('And rename newly added leave type to start with "M"', function(done){ submit_form_func({ driver : driver, form_params : [{ @@ -246,6 +248,141 @@ describe('CRUD for leave types', function(){ .then(function(){ done() }); }); + it("Add AAA and ZZZ leave types", function(done){ + driver + .findElement(By.css('#add_new_leave_type_btn')) + .then(el => el.click()) + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + .then(() => submit_form_func({ + driver : driver, + form_params : [{ + selector : leave_type_new_form_id+' input[name="name__new"]', + value : 'ZZZ', + },{ + selector : leave_type_new_form_id+' input[name="use_allowance__new"]', + value : 'on', + tick : true, + }], + submit_button_selector : leave_type_new_form_id+' button[type="submit"]', + message : /Changes to leave types were saved/, + }) + ) + .then(() => driver.findElement(By.css('#add_new_leave_type_btn'))) + .then(el => el.click()) + .then(() => driver.sleep(1000)) + .then(() => submit_form_func({ + driver : driver, + form_params : [{ + selector : leave_type_new_form_id+' input[name="name__new"]', + value : 'AAA', + },{ + selector : leave_type_new_form_id+' input[name="use_allowance__new"]', + value : 'on', + tick : true, + }], + submit_button_selector : leave_type_new_form_id+' button[type="submit"]', + message : /Changes to leave types were saved/, + }) + ) + .then(() => done()); + }); + + it("Ensure AAA is first and ZZZ is last in the list (general settings page)", function(done){ + check_elements_func({ + driver : driver, + elements_to_check : [{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', + value : 'AAA', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', + value : 'Holiday', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_2"]', + value : 'Sick Leave', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_3"]', + value : 'ZZZ', + }], + }) + .then(() => done()); + }); + + it("Ensure AAA is a first and ZZZ is a last in a list on book holiday modal", function(done){ + driver + .findElements(By.css('select#leave_type option')) + .then(options => Bluebird.map(options, option => { + let option_info = {}; + return option.getAttribute('value') + .then(val => Bluebird.resolve(option_info.value = val)) + .then(() => option.getAttribute('data-tom')) + .then(txt => Bluebird.resolve(option_info.text = txt)) + .then(() => Bluebird.resolve(option_info)); + })) + .then(option_infos => { + expect(option_infos[0], 'AAA is first').to.include({ value : '0', text : 'AAA'}); + expect(option_infos[3], 'ZZZ is last').to.include({ value : '3', text : 'ZZZ'}); + done(); + }); + }); + + it('Mark ZZZ as one to be default one', function(done){ + driver + .findElement(By.css(leave_type_edit_form_id+' input[data-tom-leave-type-order="name_3"]')) + .then(inp => inp.getAttribute('name')) + .then(name => Bluebird.resolve(name.split('__')[1])) + .then(id => submit_form_func({ + driver : driver, + form_params : [{ + selector : leave_type_edit_form_id+' input[type="radio"][value="'+id+'"]', + tick : true, + value : 'on', + }], + submit_button_selector : leave_type_edit_form_id+' button[type="submit"]', + message : /Changes to leave types were saved/, + }) + ) + .then(() => done()); + }); + + it("Ensure AAA is first and ZZZ is last in the list (general settings page)", function(done){ + check_elements_func({ + driver : driver, + elements_to_check : [{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_0"]', + value : 'AAA', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_1"]', + value : 'Holiday', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_2"]', + value : 'Sick Leave', + },{ + selector : leave_type_edit_form_id+' input[data-tom-leave-type-order="name_3"]', + value : 'ZZZ', + }], + }) + .then(() => done()); + }); + + it("Ensure ZZZ is a first and AAA is a second in a list on book holiday modal", function(done){ + driver + .findElements(By.css('select#leave_type option')) + .then(options => Bluebird.map(options, option => { + let option_info = {}; + return option.getAttribute('value') + .then(val => Bluebird.resolve(option_info.value = val)) + .then(() => option.getAttribute('data-tom')) + .then(txt => Bluebird.resolve(option_info.text = txt)) + .then(() => Bluebird.resolve(option_info)); + })) + .then(option_infos => { + expect(option_infos[0], 'ZZZ is first').to.include({ value : '0', text : 'ZZZ'}); + expect(option_infos[1], 'AAA is last').to.include({ value : '1', text : 'AAA'}); + done(); + }); + }); + after(function(done){ driver.quit().then(function(){ done(); }); }); diff --git a/views/partials/add_new_leave_type_modal.hbs b/views/partials/add_new_leave_type_modal.hbs index 18e34c097..0d6ce3b92 100644 --- a/views/partials/add_new_leave_type_modal.hbs +++ b/views/partials/add_new_leave_type_modal.hbs @@ -10,15 +10,6 @@

    Add new Leave Type

    - - {{#each company.leave_types}} - - - - - {{/each}} - -
    diff --git a/views/partials/book_leave_modal.hbs b/views/partials/book_leave_modal.hbs index bf84e0270..5ea1e1426 100644 --- a/views/partials/book_leave_modal.hbs +++ b/views/partials/book_leave_modal.hbs @@ -24,7 +24,7 @@
    From 2646bd38dcf0bf4c34732e91f9e8eedd94bc2375 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 8 Jan 2018 12:24:56 +0000 Subject: [PATCH 065/539] Capture timezone while registering company account --- lib/model/db/company.js | 4 +++- lib/model/db/user.js | 2 ++ lib/route/login.js | 12 ++++++++++-- t/integration/timezone.js | 6 +++--- views/register.hbs | 11 +++++++++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index d9c6fa77c..c0eb1482e 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -171,13 +171,15 @@ module.exports = function(sequelize, DataTypes) { // Create new company based on default values create_default_company : function(args){ - var country_code = args.country_code || 'UK'; + var country_code = args.country_code || 'UK', + timezone = args.timezone || 'Europe/London'; // Add new company record return Company.create({ name : args.name || 'New company', country : country_code, start_of_new_year : 1, + timezone : timezone, }) // When new company is created - add default departments to it diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 8b0d5da5c..0f80e44e0 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -501,6 +501,7 @@ function get_class_methods(sequelize) { var new_departments, new_user, country_code = attributes.country_code, + timezone = attributes.timezone, company_name = attributes.company_name; delete attributes.company_name; @@ -518,6 +519,7 @@ function get_class_methods(sequelize) { .create_default_company({ name : company_name, country_code : country_code, + timezone : timezone, }); }) diff --git a/lib/route/login.js b/lib/route/login.js index 614178490..8b6c7d1a3 100644 --- a/lib/route/login.js +++ b/lib/route/login.js @@ -18,6 +18,7 @@ var formidable = require('formidable'), fs = require("fs"), config = require('../config'), + moment_tz = require('moment-timezone'), EmailTransport = require('../email'); Promise.promisifyAll(fs); @@ -85,8 +86,9 @@ module.exports = function(passport) { } res.render('register',{ - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), - countries : config.get('countries'), + url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), + countries : config.get('countries'), + timezones_available : moment_tz.tz.names(), }); }); @@ -134,6 +136,11 @@ module.exports = function(passport) { req.session.flash_error('Incorrect country code'); } + let timezone = validator.trim(req.param('timezone')); + if ( ! moment_tz.tz.names().find(tz_str => tz_str === timezone) ) { + req.session.flash_error('Time zone is unknown'); + } + // In case of validation error redirect back to registration form if ( req.session.flash_has_errors() ) { return res.redirect_with_session('/register/'); @@ -147,6 +154,7 @@ module.exports = function(passport) { lastname : lastname, company_name : company_name, country_code : country_code, + timezone : timezone, }) // Send registration email .then(function(user){ diff --git a/t/integration/timezone.js b/t/integration/timezone.js index 06ba71f97..cb5958dda 100644 --- a/t/integration/timezone.js +++ b/t/integration/timezone.js @@ -34,7 +34,7 @@ const * * */ -describe('Check departments list page', function(){ +describe('Check Time zones', function(){ let driver, user_email, @@ -67,8 +67,8 @@ describe('Check departments list page', function(){ driver : driver, form_params : [{ selector : company_edit_form_id+' select[name="timezone"]', - option_selector : 'option[value="Australia/Sydney"]', - value : 'Australia/Sydney', + option_selector : 'option[value="Pacific/Auckland"]', + value : 'Pacific/Auckland', }], submit_button_selector : company_edit_form_id+' button[type="submit"]', message : /successfully/i, diff --git a/views/register.hbs b/views/register.hbs index afd3bc587..41fe29fb4 100644 --- a/views/register.hbs +++ b/views/register.hbs @@ -68,6 +68,17 @@
    +
    + +
    + +
    +
    +
    From d792619d86df5e2e25c2f93993d95d3501935491 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 9 Jan 2018 15:27:50 +0000 Subject: [PATCH 066/539] Fix issue with last day of the year holiday is not shown. --- lib/model/mixin/user/absence_aware.js | 12 ++++++------ lib/model/mixin/user/company_aware.js | 4 ++-- lib/route/users.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index a7f9a0eef..a678751af 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -76,7 +76,7 @@ module.exports = function(sequelize){ moment.utc(year).startOf('year').format('YYYY-MM-DD'), moment.utc( year.clone().add((is_multi_year ? 1 : 0), 'years') - ).endOf('year').format('YYYY-MM-DD'), + ).endOf('year').format('YYYY-MM-DD HH:mm'), ] }, date_end : { @@ -84,7 +84,7 @@ module.exports = function(sequelize){ moment.utc( year ).startOf('year').format('YYYY-MM-DD'), moment.utc( year.clone().add((is_multi_year ? 1 : 0), 'years') - ).endOf('year').format('YYYY-MM-DD'), + ).endOf('year').format('YYYY-MM-DD HH:mm'), ] } } @@ -198,13 +198,13 @@ module.exports = function(sequelize){ date_start : { $between : [ moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), ] }, date_end : { $between : [ moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), ] } }; @@ -631,13 +631,13 @@ module.exports = function(sequelize){ date_start : { $between : [ moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), ] }, date_end : { $between : [ moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD'), + moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), ] } } diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index e77649d49..aa4cd0eaf 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -49,13 +49,13 @@ module.exports = function(sequelize){ date_start : { $between : [ moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), ] }, date_end : { $between : [ moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), ] } } diff --git a/lib/route/users.js b/lib/route/users.js index e028323ac..550b71de0 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -591,13 +591,13 @@ router.get('/', function(req, res) { date_start : { $between : [ moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), ] }, date_end : { $between : [ moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD'), + moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), ] } } From 8d0491949a226102210fafc847b691bc7d917f38 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 9 Jan 2018 15:54:05 +0000 Subject: [PATCH 067/539] Add test to ensure the 31 Dec day off is shown on calendar --- .../leave_request/basic_leave_request.js | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/t/integration/leave_request/basic_leave_request.js b/t/integration/leave_request/basic_leave_request.js index c25548c73..9013350d9 100644 --- a/t/integration/leave_request/basic_leave_request.js +++ b/t/integration/leave_request/basic_leave_request.js @@ -317,3 +317,60 @@ describe("Use problematic date with non default date format", function(){ }); }); + +describe("Book the very last day of year to be a holiday", function(){ + + this.timeout( config.get_execution_timeout() ); + + var driver; + + it("Register new company", function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(function(data){ + driver = data.driver; + done(); + }); + }); + + it("Place new holiday to be the very last day of the year", function(done){ + driver.findElement(By.css('#book_time_off_btn')) + .then(el => el.click()) + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + .then(() => submit_form_func({ + driver : driver, + form_params : [{ + selector : 'input#from', + value : '2018-12-31', + },{ + selector : 'input#to', + value : '2018-12-31', + }], + message : /New leave request was added/, + }) + ) + .then(() => done()); + }); + + it("Open calendar page and ensure that the very last day of the year is marked as pending", function(done){ + open_page_func({ + url : application_host + 'calendar/?year=2018&show_full_year=1', + driver : driver, + }) + + .then(() => check_booking_func({ + driver : driver, + full_days : [moment('2018-12-31')], + type : 'pended', + })) + + .then(() => done()); + }); + + after(function(done){ + driver.quit().then(function(){ done(); }); + }); + +}); From 6246cb5523c5a7fb952146cff942e1a5e502323c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 10 Jan 2018 19:40:32 +0000 Subject: [PATCH 068/539] Better navigation on Team view page --- public/js/global.js | 52 +++++++++++++++++++++++++++++++++++++++++++++ views/team_view.hbs | 10 ++++++--- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/public/js/global.js b/public/js/global.js index 23ad262ae..ef2f4e6dd 100644 --- a/public/js/global.js +++ b/public/js/global.js @@ -88,3 +88,55 @@ $('#add_secondary_supervisers_modal').on('show.bs.modal', function (event) { .html('

    Loading...

    ') .load('/settings/departments/available-supervisors/'+department_id+'/'); }); + +/* + * Given URL string return its query paramters as object. + * + * If URL is not provided location of current page is used. + * */ + +function getUrlVars(url){ + if ( ! url ) { + url = window.location.href; + } + var vars = {}, hash; + var hashes = url.slice( url.indexOf('?') + 1).split('&'); + for (var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars[hash[0]] = hash[1]; + } + return vars; +} + +/* + * Evend that is fired when user change base date (current month) on Team View page. + * + * */ + +$(document).ready(function(){ + + $('#team_view_month_select_btn') + .datepicker() + .on('changeDate', function(e) { + var url = $(e.currentTarget).data('tom'); + + var form = document.createElement("form"); + form.method = 'GET'; + form.action = url; + + var url_params = getUrlVars( url ); + url_params['date'] = e.format('yyyy-mm'); + + // Move query parameters into the form + $.each( url_params, function(key, val){ + var inp = document.createElement("input"); + inp.name = key; + inp.value = val; + form.appendChild(inp); + }); + + document.body.appendChild(form); + + return form.submit(); + }); +}); diff --git a/views/team_view.hbs b/views/team_view.hbs index 272a064a0..b39b9e894 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -14,12 +14,16 @@ From c237c9c5abcf9468dd2fd5e07db6650aae83c549 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 10 Jan 2018 20:08:56 +0000 Subject: [PATCH 069/539] Remove phantom inputs on Team vew page --- public/js/global.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/global.js b/public/js/global.js index ef2f4e6dd..ef237a56e 100644 --- a/public/js/global.js +++ b/public/js/global.js @@ -132,6 +132,7 @@ $(document).ready(function(){ var inp = document.createElement("input"); inp.name = key; inp.value = val; + inp.type = 'hidden'; form.appendChild(inp); }); From efaab2bcfa5e16659fd636b186c4fc417c53090f Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 16 Jan 2018 20:22:31 +0000 Subject: [PATCH 070/539] Rebuild HTML for Team view page --- public/css/style.css | 37 ++++++--- scss/main.scss | 46 +++++++---- t/integration/schedule/company_wide.js | 4 +- t/integration/schedule/user_specific.js | 32 ++++---- t/integration/team_view/deducted_column.js | 6 +- .../team_view/deducted_column__visibility.js | 18 ++-- t/integration/timezone.js | 4 +- t/lib/teamview_check_user.js | 2 +- views/partials/calendar_cell.hbs | 4 +- views/team_view.hbs | 82 +++++++++---------- 10 files changed, 128 insertions(+), 107 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index d666ed174..76a14b29d 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -64,13 +64,33 @@ label.label-plain { margin-bottom: 30px; } /* styling calendar*/ +.calendar_month { + width: 100%; } + +.calendar_month td { + text-align: center; + padding-top: 5px; + padding-bottom: 5px; } + +.calendar_month thead { + text-align: center; + font-weight: bolder; } + div.month_container { height: 250px; } -.calendar_month { +.team-view-table { width: 100%; } -.calendar_month td { +.team-view-table td { + padding-top: 5px; + padding-bottom: 5px; } + +td.team-view-header { + height: 43px; + text-align: center; } + +td.calendar_cell { width: 15px !important; min-width: 15px !important; max-width: 15px !important; @@ -79,9 +99,9 @@ div.month_container { padding-top: 5px; padding-bottom: 5px; } -.calendar_month td span { +td.calendar_cell span { position: relative; - left: 10px; + left: 7px; top: -1px; display: block; text-align: center; @@ -109,11 +129,7 @@ td.leave_cell_pended { .modal-dialog { max-width: 450px; } -.team-view-users td { - padding-top: 5px; - padding-bottom: 5px; } - -.team-view-users .left-column-cell { +.left-column-cell { text-overflow: ellipsis; /* Cannot avoid specifying width with pixels... */ width: 165px; @@ -121,9 +137,6 @@ td.leave_cell_pended { overflow: hidden; display: inline-block; } -td.team-view-header { - height: 43px; } - .main-row_header { /* TODO refactore */ border: none; diff --git a/scss/main.scss b/scss/main.scss index 917286924..1cd8487e3 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -91,13 +91,38 @@ label.label-plain { /* styling calendar*/ +.calendar_month { + width : 100%; +} +.calendar_month td { + text-align: center; + padding-top : 5px; + padding-bottom : 5px; +} +.calendar_month thead { + text-align: center; + font-weight: bolder; +} + + div.month_container { height : 250px; } -.calendar_month { - width : 100%; + +.team-view-table { + width : 100%; } -.calendar_month td { +.team-view-table td { + padding-top : 5px; + padding-bottom : 5px; +} +td.team-view-header { + height: 43px; + text-align: center; +} + + +td.calendar_cell { width : 15px !important; min-width : 15px !important; max-width : 15px !important; @@ -106,9 +131,9 @@ div.month_container { padding-top : 5px; padding-bottom : 5px; } -.calendar_month td span { +td.calendar_cell span { position : relative; - left : 10px; + left : 7px; top : -1px; display : block; text-align : center; @@ -136,12 +161,7 @@ td.leave_cell_pended { .modal-dialog { max-width : 450px; } -.team-view-users td { - padding-top : 5px; - padding-bottom : 5px; - -} -.team-view-users .left-column-cell { +.left-column-cell { text-overflow: ellipsis; /* Cannot avoid specifying width with pixels... */ width: 165px; @@ -149,10 +169,6 @@ td.leave_cell_pended { overflow: hidden; display: inline-block; } -td.team-view-header { - height: 43px; -} - .main-row_header { /* TODO refactore */ border: none; diff --git a/t/integration/schedule/company_wide.js b/t/integration/schedule/company_wide.js index d02ae470c..deee83190 100644 --- a/t/integration/schedule/company_wide.js +++ b/t/integration/schedule/company_wide.js @@ -172,7 +172,7 @@ describe("Changing default company wide schedule", function(){ it('... and make sure Wednsday is marked as non-working day', function(done){ driver // We know that 7th of January 2015 is Wednesday - .findElement(By.css('table.calendar_month td.day_7')) + .findElement(By.css('table.team-view-table td.day_7')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -182,7 +182,7 @@ describe("Changing default company wide schedule", function(){ it('... and ensure Monday is still working day', function(done){ driver - .findElement(By.css('table.calendar_month td.day_5')) + .findElement(By.css('table.team-view-table td.day_5')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).not.to.match(/\bweekend_cell\b/); diff --git a/t/integration/schedule/user_specific.js b/t/integration/schedule/user_specific.js index b1f6274d0..3607820bc 100644 --- a/t/integration/schedule/user_specific.js +++ b/t/integration/schedule/user_specific.js @@ -252,7 +252,7 @@ describe('Basic user specific schedule', function(){ it('Make sure that team view shows user A has Sat and Sun as non-working days', function(done){ driver // We know that 7th of January 2015 is Wednesday - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_7')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_7')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.not.match(/\bweekend_cell\b/); @@ -260,7 +260,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_10')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_10')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -269,7 +269,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_11')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_11')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -282,7 +282,7 @@ describe('Basic user specific schedule', function(){ it('Make sure team view shows user B has Wed, Sat, Sun as non-working days', function(done){ driver // We know that 7th of January 2015 is Wednesday - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_7')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_7')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -290,7 +290,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_10')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_10')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -299,7 +299,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_11')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_11')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -586,7 +586,7 @@ describe('Basic user specific schedule', function(){ it('Make sure that team view shows user A has Sat and Sun as non-working days', function(done){ driver // We know that 7th of January 2015 is Wednesday - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_7')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_7')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.not.match(/\bweekend_cell\b/); @@ -594,7 +594,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_10')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_10')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -603,7 +603,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_11')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_11')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -616,7 +616,7 @@ describe('Basic user specific schedule', function(){ it('Make sure team view shows user B also has Sat, Sun as non-working days', function(done){ driver // We know that 7th of January 2015 is Wednesday - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_7')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_7')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.not.match(/\bweekend_cell\b/); @@ -624,7 +624,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_10')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_10')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -633,7 +633,7 @@ describe('Basic user specific schedule', function(){ }) .then(function(){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_11')) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_11')) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -838,7 +838,7 @@ describe('Populate company wide schedule before using user specific one', functi it('Ensure team view shows user A has Mon, Tue, Wed as working days', function(done){ Promise.map([5,6,7], function(day_number){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_'+day_number)) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_'+day_number)) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.not.match(/\bweekend_cell\b/); @@ -851,7 +851,7 @@ describe('Populate company wide schedule before using user specific one', functi it('Ensure team view shows user A has Thu, Fri, Sat, Sun as non-working days', function(done){ Promise.map([8,9,10,11], function(day_number){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_A+'"] td.day_'+day_number)) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_A+'"] td.day_'+day_number)) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); @@ -864,7 +864,7 @@ describe('Populate company wide schedule before using user specific one', functi it('Ensure team view shows user B has Mon, Tue, Wed, Thu as working days', function(done){ Promise.map([5,6,7,8], function(day_number){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_'+day_number)) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_'+day_number)) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.not.match(/\bweekend_cell\b/); @@ -877,7 +877,7 @@ describe('Populate company wide schedule before using user specific one', functi it('Ensure team view shows user B has Fri, Sat, Sun as non-working days', function(done){ Promise.map([9,10,11], function(day_number){ return driver - .findElement(By.css('table.calendar_month tr[data-vpp="'+user_id_B+'"] td.day_'+day_number)) + .findElement(By.css('table.team-view-table tr[data-vpp-user-list-row="'+user_id_B+'"] td.day_'+day_number)) .then(function(el){ return el.getAttribute('class'); }) .then(function(css){ expect(css).to.match(/\bweekend_cell\b/); diff --git a/t/integration/team_view/deducted_column.js b/t/integration/team_view/deducted_column.js index 3d7f409ff..63ae8cc53 100644 --- a/t/integration/team_view/deducted_column.js +++ b/t/integration/team_view/deducted_column.js @@ -338,7 +338,7 @@ describe('Case when holidays spans through more then one month and is devided by url : application_host + 'calendar/teamview/?date=2016-08', driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt, 'Ensure that system shows 9 days as deducted') @@ -352,7 +352,7 @@ describe('Case when holidays spans through more then one month and is devided by url : application_host + 'calendar/teamview/?date=2016-07', driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt, 'Ensure that system shows 1.5 days as deducted') @@ -366,7 +366,7 @@ describe('Case when holidays spans through more then one month and is devided by url : application_host + 'calendar/teamview/?date=2016-09', driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt, 'Ensure that system shows 2 days as deducted') diff --git a/t/integration/team_view/deducted_column__visibility.js b/t/integration/team_view/deducted_column__visibility.js index f1d26f452..254319de2 100644 --- a/t/integration/team_view/deducted_column__visibility.js +++ b/t/integration/team_view/deducted_column__visibility.js @@ -220,21 +220,21 @@ describe('Check that values for new columns are shown only for employess current driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); @@ -267,21 +267,21 @@ describe('Check that values for new columns are shown only for employess current driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql(''); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); @@ -314,21 +314,21 @@ describe('Check that values for new columns are shown only for employess current driver : driver, }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_A}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql(''); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_B}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql(''); return Promise.resolve(1); }) - .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] td.teamview-deducted-days`))) + .then(() => driver.findElement(By.css(`tr[data-vpp-user-list-row="${user_id_C}"] span.teamview-deducted-days`))) .then(el => el.getText()) .then(txt => { expect(txt).to.be.eql('0'); diff --git a/t/integration/timezone.js b/t/integration/timezone.js index cb5958dda..2b4bd9b2d 100644 --- a/t/integration/timezone.js +++ b/t/integration/timezone.js @@ -111,7 +111,7 @@ describe('Check Time zones', function(){ driver : driver, }) .then(() => driver.findElement(By.css( - 'table.calendar_month td.half_1st.day_'+moment(today_aus).format('D')+'.current_day_cell' + 'table.team-view-table td.half_1st.day_'+moment(today_aus).format('D')+'.current_day_cell' ))) .then(el => { expect(el, 'Ensure that current date is marked correctly').to.exist; @@ -224,7 +224,7 @@ describe('Check Time zones', function(){ driver : driver, }) .then(() => driver.findElement(By.css( - 'table.calendar_month td.half_1st.day_'+moment(today_usa).format('D')+'.current_day_cell' + 'table.team-view-table td.half_1st.day_'+moment(today_usa).format('D')+'.current_day_cell' ))) .then(el => { expect(el, 'Ensure that current date is marked correctly').to.exist; diff --git a/t/lib/teamview_check_user.js b/t/lib/teamview_check_user.js index daa73ff31..3fc478d72 100644 --- a/t/lib/teamview_check_user.js +++ b/t/lib/teamview_check_user.js @@ -36,7 +36,7 @@ module.exports = bluebird.promisify( function(args, callback){ .then(function(data){ return data.driver - .findElements(By.css( 'tr.teamview-user-list-row > td > ' + (is_link ? 'a' : 'span') )) + .findElements(By.css( 'tr.teamview-user-list-row > td.cross-link > ' + (is_link ? 'a' : 'span') )) .then(function(elements){ expect(elements.length).to.be.equal( emails.length ); return bluebird.resolve(data); diff --git a/views/partials/calendar_cell.hbs b/views/partials/calendar_cell.hbs index 0c66ebd6b..37163f397 100644 --- a/views/partials/calendar_cell.hbs +++ b/views/partials/calendar_cell.hbs @@ -1,5 +1,5 @@ -
    		{{day.val}}  
    -
    - - {{# each users_info}} - {{# with this.user_row}} - - - - - - + + + + + + - {{/with}} {{/each}}
    +
    + -
    - - -
    - - - {{# each users_and_leaves}} - - - + - - {{/each}} -
    {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} - {{# if statistics }}{{ statistics.deducted_days }}{{/if}} +
    +
    + + +
    -
    -
    - - {{# each users_and_leaves.0.days }} {{/each}} - {{# each users_and_leaves}} - - {{# each this.days}} - {{> calendar_cell day = this}} - {{/each}} - - {{/each}} + + {{# each users_and_leaves}} + + + + {{# each this.days}} + {{> calendar_cell day = this}} + {{/each}} + + {{/each}}
    {{as_date_formatted this.moment 'dd'}}
    {{# if ../logged_user.admin}} {{#with this.user }}{{ this.full_name }}{{/with}} {{else}}{{#with this.user }}{{ this.full_name }}{{/with}}{{/if}} + + {{# if statistics }}{{ statistics.deducted_days }}{{/if}} + +
    -
     
    From d16325c6c78f353e61c2c5c28c8b55629d1d1bb2 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 11 Jan 2018 06:59:33 +0000 Subject: [PATCH 071/539] Add link to import page from users page --- views/users.hbs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/views/users.hbs b/views/users.hbs index 717f8d6c6..08d36497a 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -8,7 +8,16 @@
    {{company.name}}'s staff
    - Add new employee +
    + Add new employee + + +
    From b550237215cef16230005b77e5e4430e491bc926 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 11 Jan 2018 07:03:33 +0000 Subject: [PATCH 072/539] Add link to import page from add new employee page --- views/user_add.hbs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/views/user_add.hbs b/views/user_add.hbs index 6782475fc..7d69b244f 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -3,10 +3,17 @@

    New employee

    -

    Adding new employee account

    - {{> show_flash_messages }} +
    +
    Adding new employee account
    +
    + Import new employees +
    +
    + +
     
    +
    From 5d935132235b161fdc6d809e08e06c9d6f968ba1 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 12 Jan 2018 06:51:58 +0000 Subject: [PATCH 073/539] First implementation of import users from .csv --- lib/model/db/company.js | 10 +++ lib/model/db/user.js | 5 +- lib/model/mixin/user/company_aware.js | 15 ---- lib/route/users.js | 113 ++++++++++++++++++++++++-- package.json | 1 + views/users_import.hbs | 60 ++++++++++++++ 6 files changed, 179 insertions(+), 25 deletions(-) create mode 100644 views/users_import.hbs diff --git a/lib/model/db/company.js b/lib/model/db/company.js index c0eb1482e..5ee127975 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -113,6 +113,16 @@ module.exports = function(sequelize, DataTypes) { }, loadScope : function( models ) { + + Company.addScope( + 'with_all_users', + { + include : [ + { model : models.User, as : 'users' }, + ] + } + ); + Company.addScope( 'with_active_users', // The scope needs to be dynamic as the criteria for active users is based diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 0f80e44e0..5e650292f 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -140,7 +140,10 @@ function get_instance_methods(sequelize) { // Check if current user is admin, then fetch all users form company if ( this_user.is_admin() ) { - return this_user.get_company_with_all_users() + return this_user + .getCompany({ + scope : ['with_all_users'], + }) .then(function(company){ return Promise.resolve( company.users ); }); diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index aa4cd0eaf..40d536d77 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -130,21 +130,6 @@ module.exports = function(sequelize){ }; - this.get_company_with_all_users = function(){ - return this.getCompany({ - include : [ - { - model : sequelize.models.User, - as : 'users', - }, - ], - order : [ - [{ model : sequelize.models.User, as : 'users' }, 'lastname'] - ] - }); - }; - - this.get_company_with_all_leave_types = function() { return this.getCompany({ include : [{ diff --git a/lib/route/users.js b/lib/route/users.js index 550b71de0..75752e772 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -1,15 +1,19 @@ "use strict"; -var express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - _ = require('underscore'), - uuid = require('node-uuid'), - LeaveCollectionUtil = require('../model/leave_collection')(), - EmailTransport = require('../email'); +const + express = require('express'), + router = express.Router(), + validator = require('validator'), + Promise = require('bluebird'), + moment = require('moment'), + _ = require('underscore'), + uuid = require('node-uuid'), + csv = Promise.promisifyAll(require('csv')), + fs = require("fs"), + formidable= require('formidable'), + LeaveCollectionUtil = require('../model/leave_collection')(), + EmailTransport = require('../email'); // Make sure that current user is authorized to deal with settings router.all(/.*/, require('../middleware/ensure_user_is_admin')); @@ -109,6 +113,97 @@ router.post('/add/', function(req, res){ }); }); +router.get('/import/', function(req, res){ + req.user + .getCompany() + .then(company => res.render( + 'users_import', { + company : company, + } + )); +}); + +router.post('/import/', function(req, res){ + let + form = new formidable.IncomingForm(), + model = req.app.get('db_model'), + parseAsync = Promise.promisify(form.parse); + + parseAsync + .call(form, req) + .then(args => { + + let files = args[1]; + + if (files.users_import.size === 0) { + throw new Error('No .CSV file to restore from was provided'); + } + + return fs.readFileAsync(files.users_import.path, "utf8"); + }) + .then(csv_data_string => csv.parseAsync(csv_data_string,{trim:true})) + .then(parsed_data => { + + // TODO consider limiting number of users + + // Ditch header + parsed_data.shift() + + return Promise + .map(parsed_data, user_vector => { + let attributes = { + email : user_vector[0], + lastname : user_vector[1], + name : user_vector[2], + password : uuid.v4(), + companyId : req.user.companyId, + DepartmentId : XXXXXXX, + }; + + return model.User.create(attributes) + }) + .then(new_users => { + // NOTE consider sending emails here + return Promise.resolve(new_users); + }); + }) + .then(function(company){ + req.session.flash_message('Successfully imported users'); + res.redirect_with_session('/users/import/'); + }) + .catch(function(error){ + req.session.flash_error('Failed to import users, reason: '+error); + res.redirect_with_session('/users/import/'); + }); +}); + +router.post('/import-sample/', function(req, res){ + + req.user + .getCompany({ + scope : ['with_active_users', 'with_simple_departments'], + }) + .then(company => { + + res.attachment( + company.name_for_machine()+'.csv' + ); + + let content = company.users.map( user => [ + user.email, + user.name, + user.lastname, + company.departments.find( dep => dep.id === user.DepartmentId ).name + ]); + + content.unshift( ['email','lastname', 'name', 'department'] ); + + return csv.stringifyAsync( content ); + }) + .then(csv_data_string => res.send(csv_data_string)); + +}); + router.get('/edit/:user_id/', function(req, res){ var user_id = validator.trim(req.param('user_id')); diff --git a/package.json b/package.json index f38695cf6..4d7345c06 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "body-parser": "^1.8.4", "connect-session-sequelize": "3.0.0", "cookie-parser": "^1.3.5", + "csv": "^0.4.6", "debug": "~2.0.0", "express": "^4.13.4", "express-handlebars": "^3.0.0", diff --git a/views/users_import.hbs b/views/users_import.hbs new file mode 100644 index 000000000..a6010e8d9 --- /dev/null +++ b/views/users_import.hbs @@ -0,0 +1,60 @@ + +{{> header }} + +

    Employees bulk import

    + +{{> show_flash_messages }} + +
    +
    Quick employees import
    +
    + Add new employee +
    +
    + +
     
    + +
    + +
    + +

    Download sample

    + + +
    + +
    + +
    +
    +
    +
    + Download sample prepopulated with current employees. +
    +
    + + + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    + + +
    + +
    + +
     
    + +{{> footer }} From 176a575608cddcecbb48b93a7c1895c6a5bf5eda Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 19 Jan 2018 07:26:02 +0000 Subject: [PATCH 074/539] Re-organise importing code so controller is lighter. --- lib/error/index.js | 80 +++++++++++++++++++++ lib/model/user_importer.js | 138 +++++++++++++++++++++++++++++++++++++ lib/route/users.js | 83 ++++++++++++++-------- 3 files changed, 273 insertions(+), 28 deletions(-) create mode 100644 lib/error/index.js create mode 100644 lib/model/user_importer.js diff --git a/lib/error/index.js b/lib/error/index.js new file mode 100644 index 000000000..b985d7135 --- /dev/null +++ b/lib/error/index.js @@ -0,0 +1,80 @@ + +"use strict"; + +const + Joi = require('Joi'); + +const schema_throw_user_error = [ + Joi.object() + .keys({ + system_error : Joi.string().required(), + user_error : Joi.string().required(), + }), + Joi.string() +]; + +function throw_user_error(args) { + const validate_args = Joi.validate(args, schema_throw_user_error); + + // Ensure all necesasry info was privided + if ( validate_args.error) { + // Tricky case here as we failed to rais exception, so log all data we have + // and still rais generic exception + console.log( + 'throw_user_error got invalid parameters: ' + + validate_args.annotate() + ); + console.dir(args); + throw new Error('Failed to throw user errors'); + } + + let system_error_message, + user_error_message; + + // Special case when user is lazy and specified generic error message to be + // used for system and customer level + if ( typeof args === 'string' ) { + system_error_message = user_error_message = args; + } else { + system_error_message = args.system_error; + user_error_message = args.user_error; + } + + let exception = new Error( system_error_message ); + + if ( user_error_message ) { + exception.user_error_message = user_error_message; + } + + throw exception; +} + +function extract_system_error_message(error) { + if ( ! error ) { + return null; + } + + return error; +} + +function extract_user_error_message(error) { + if ( ! error ) { + return null; + } + + if (typeof error === 'string') { + return error; + } + + if ( error.hasOwnProperty( 'user_error_message' )) { + return error.user_error_message; + } + + return 'N/A'; +} + +module.exports = { + throw_user_error : throw_user_error, + extract_user_error_message : extract_user_error_message, + extract_system_error_message : extract_system_error_message, +}; diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js new file mode 100644 index 000000000..8f8608266 --- /dev/null +++ b/lib/model/user_importer.js @@ -0,0 +1,138 @@ + +"use strict"; + +const + Joi = require('joi'), + uuid = require('node-uuid'), + Promise = require('bluebird'), + _ = require('underscore'), + Exception = require('../error'), + Models = require('./db'); + +const add_user_interface_schema = Joi.object().keys({ + email : Joi.string().email(), + lastname : Joi.string(), + name : Joi.string(), + company_id : Joi.number().integer().positive(), + department_id : Joi.number().integer().positive(), + }); + + +function add_user(args) { + let validate_args = Joi.validate(args, add_user_interface_schema); + + if (validate_args.error) { + console.log('An error occured when validatin parameters for add_user: '); + console.dir(validate_args); + Exception.throw_user_error({ + system_error : 'Failed to add new due to validation errors', + user_error : 'Failed to add user', + }); + } + + return Models.User.create({ + email : args.email, + lastname : args.lastname, + name : args.name, + password : uuid.v4(), + companyId : args.company_id, + DepartmentId : args.department_id, + }) + .then(new_users => { + // NOTE consider sending emails here + return Promise.resolve(new_users); + }); +} + +function add_users_in_bulk(args) { + let bulk_header = args.bulk_header, + bulk_data = args.bulk_data, + company_id = args.to_company_id; + + let company, + email_vector_index = 0, + lastname_vector_index = 1, + name_vector_index = 2, + department_vector_index = 3; + + return Models.Company.scope('with_simple_departments').findOne({ + where : { id : company_id }, + }) + + + // Validate department names and replace names with IDs + .then(cmp => { + company = cmp; + let dep_name_to_id = _.object( + company.departments.map(dep => [dep.name, dep.id]) + ); + + let with_invalid_departments = _.filter( + bulk_data, vector => ! dep_name_to_id[ vector[ department_vector_index] ] + ); + + if (with_invalid_departments.length > 0) { + let unknown_departments = with_invalid_departments + .map(vector => '"'+vector[department_vector_index]+'"') + .join(', '); + + Error.throw_user_error({ + user_error : 'Following departments could not be found in ' + + company.name + ' account: ' + unknown_departments, + system_error : 'While importing users to company ' + + company.id + ' there were unknown departments ' + + unknown_departments, + }); + } + + bulk_data.forEach( + vector => vector[ department_vector_index ] = dep_name_to_id[ vector[ department_vector_index ] ] + ); + + return Promise.resolve(); + }) + + // Add users + .then(() => { + return Promise.map(bulk_data, vector => { + let email = vector[ email_vector_index ]; + + return add_user({ + email : email, + lastname : vector[ lastname_vector_index ], + name : vector[ name_vector_index ], + department_id : vector[ department_vector_index ], + company_id : company_id, + }) + .catch(error => { + return Promise.resolve({ + error : error, + email : email, + }); + }); + }, { + concurrency : 2, + }) + }) + + // Sort out successfully creted users and errors + .then(users_or_errors => { + let result = { + users : [], + errors : [], + }; + + users_or_errors.forEach( item => { + item.hasOwnProperty('error') + ? result.errors.push( item ) + : result.users.push( item ) + }); + + return Promise.resolve(result); + }); + +} + +module.exports = { + add_users_in_bulk : add_users_in_bulk, +}; diff --git a/lib/route/users.js b/lib/route/users.js index 75752e772..127b88630 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -11,9 +11,11 @@ const uuid = require('node-uuid'), csv = Promise.promisifyAll(require('csv')), fs = require("fs"), - formidable= require('formidable'), + formidable = require('formidable'), LeaveCollectionUtil = require('../model/leave_collection')(), - EmailTransport = require('../email'); + Exception = require('../error'), + UserImporter = require('../model/user_importer'), + EmailTransport = require('../email'); // Make sure that current user is authorized to deal with settings router.all(/.*/, require('../middleware/ensure_user_is_admin')); @@ -100,7 +102,7 @@ router.post('/add/', function(req, res){ }) .catch(function(error){ - console.error( + console.log( 'An error occurred when trying to add new user account by user '+req.user.id + ' : ' + error ); @@ -136,7 +138,17 @@ router.post('/import/', function(req, res){ let files = args[1]; if (files.users_import.size === 0) { - throw new Error('No .CSV file to restore from was provided'); + Exception.throw_user_error({ + user_error : 'No .CSV file to restore from was provided', + system_error : 'User ' + req.user.id + ' tried to import employees ' + + 'without submitting .CSV file', + }); + } else if ( files.users_import.size > 2097152 ) { + Exception.throw_user_error({ + user_error : '.CSV file could not be bigger then 2M', + system_error : 'User ' + req.user.id + ' tried to submit file bigger then ' + + '2M', + }); } return fs.readFileAsync(files.users_import.path, "utf8"); @@ -144,35 +156,50 @@ router.post('/import/', function(req, res){ .then(csv_data_string => csv.parseAsync(csv_data_string,{trim:true})) .then(parsed_data => { - // TODO consider limiting number of users - - // Ditch header - parsed_data.shift() - - return Promise - .map(parsed_data, user_vector => { - let attributes = { - email : user_vector[0], - lastname : user_vector[1], - name : user_vector[2], - password : uuid.v4(), - companyId : req.user.companyId, - DepartmentId : XXXXXXX, - }; - - return model.User.create(attributes) - }) - .then(new_users => { - // NOTE consider sending emails here - return Promise.resolve(new_users); + // Limit number of employees to be imported at one go + // + if (parsed_data.length > 201) { + Exception.throw_user_error({ + user_error : 'Cannot import more then 200 employees per one go. ' + + 'Please splite .CSV file into chunks of no more then 200 employees ' + + 'and process them each at the time', + system_error : 'User ' + req.user.id + ' tried to import more then 200 ' + + 'user at one time' }); + } + + return UserImporter.add_users_in_bulk({ + to_company_id : req.user.companyId, + bulk_header : parsed_data.shift(), + bulk_data : parsed_data, + }); }) - .then(function(company){ - req.session.flash_message('Successfully imported users'); + .then(action_result => { + console.dir(action_result); + if ( action_result.users.length > 0 ) { + req.session.flash_message( + 'Successfully imported users: ' + + action_result.users.map(user => user.email).join(', ') + ); + } + if (action_result.errors.length > 0) { + req.session.flash_message( + 'Failed to import those users users: ' + + action_result.errors.map(err => err.email +': '+err.error).join('; ') + ); + } res.redirect_with_session('/users/import/'); }) .catch(function(error){ - req.session.flash_error('Failed to import users, reason: '+error); + console.error( + '>>>>>>> An error occurred when trying to import users for company' + + req.user.companyId + + '. Reason: ' + Exception.extract_system_error_message(error) + ); + req.session.flash_error( + 'Failed to import users, reason: ' + + Exception.extract_user_error_message(error) + ); res.redirect_with_session('/users/import/'); }); }); From 8e0b4eac27bf968b1ac492758131ddc34f73a190 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 19 Jan 2018 13:15:03 +0000 Subject: [PATCH 075/539] Validate email for new user to be free in single place --- lib/error/index.js | 2 ++ lib/model/user_importer.js | 68 +++++++++++++++++++++++++++++--------- lib/route/users.js | 47 +++++++++++++------------- 3 files changed, 77 insertions(+), 40 deletions(-) diff --git a/lib/error/index.js b/lib/error/index.js index b985d7135..2eeaca536 100644 --- a/lib/error/index.js +++ b/lib/error/index.js @@ -46,6 +46,8 @@ function throw_user_error(args) { exception.user_error_message = user_error_message; } + exception.tom_error = true; + throw exception; } diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js index 8f8608266..ad7ba3632 100644 --- a/lib/model/user_importer.js +++ b/lib/model/user_importer.js @@ -9,7 +9,7 @@ const Exception = require('../error'), Models = require('./db'); -const add_user_interface_schema = Joi.object().keys({ +const add_user_interface_schema = Joi.object().required().keys({ email : Joi.string().email(), lastname : Joi.string(), name : Joi.string(), @@ -30,14 +30,19 @@ function add_user(args) { }); } - return Models.User.create({ + return Promise.resolve() + // Ensure provided email is free to use + .then(() => validate_email_to_be_free({ email : args.email })) + + // Create new user record + .then(() => Models.User.create({ email : args.email, lastname : args.lastname, name : args.name, password : uuid.v4(), companyId : args.company_id, DepartmentId : args.department_id, - }) + })) .then(new_users => { // NOTE consider sending emails here return Promise.resolve(new_users); @@ -97,19 +102,20 @@ function add_users_in_bulk(args) { return Promise.map(bulk_data, vector => { let email = vector[ email_vector_index ]; - return add_user({ - email : email, - lastname : vector[ lastname_vector_index ], - name : vector[ name_vector_index ], - department_id : vector[ department_vector_index ], - company_id : company_id, - }) - .catch(error => { - return Promise.resolve({ - error : error, - email : email, + return Promise.resolve() + .then(() => add_user({ + email : email, + lastname : vector[ lastname_vector_index ], + name : vector[ name_vector_index ], + department_id : vector[ department_vector_index ], + company_id : company_id, + })) + .catch(error => { + return Promise.resolve({ + error : error, + email : email, + }); }); - }); }, { concurrency : 2, }) @@ -133,6 +139,36 @@ function add_users_in_bulk(args) { } +const validate_email_to_be_free_schema = Joi.object().required().keys({ + email : Joi.string().email().required(), + }); + +function validate_email_to_be_free(args) { + let validate_args = Joi.validate(args, validate_email_to_be_free_schema); + + if (validate_args.error) { + Exception.throw_user_error({ + system_error : 'validate_email_to_be_free failed arguments validation', + user_error : 'Failed to validate email', + }); + } + + return Models + .User + .find_by_email(args.email) + .then(user => { + + if (user) { + Exception.throw_user_error( + 'Email is already in use' + ); + } + + return Promise.resolve(); + }); +} + module.exports = { - add_users_in_bulk : add_users_in_bulk, + add_users_in_bulk : add_users_in_bulk, + validate_email_to_be_free : validate_email_to_be_free, }; diff --git a/lib/route/users.js b/lib/route/users.js index 127b88630..162f223ca 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -32,8 +32,10 @@ router.get('/add/', function(req, res){ router.post('/add/', function(req, res){ - var current_company, - model = req.app.get('db_model'); + const model = req.app.get('db_model'); + + let current_company, + new_user_attributes; req.user .get_company_for_add_user() @@ -41,7 +43,7 @@ router.post('/add/', function(req, res){ current_company = company; - var new_user_attributes = get_and_validate_user_parameters({ + new_user_attributes = get_and_validate_user_parameters({ req : req, item_name : 'user', departments : company.departments, @@ -61,20 +63,11 @@ router.post('/add/', function(req, res){ }) // Make sure that we do not add user with existing emails - .then(function(new_user_attributes){ - return model.User.find_by_email(new_user_attributes.email) - .then(function(user){ - - if (user) { - req.session.flash_error('Email is already in use'); - throw new Error('Email is already used'); - } - - return Promise.resolve(new_user_attributes); - }); - }) + .then(() => UserImporter + .validate_email_to_be_free({ email : new_user_attributes.email }) + ) - .then(new_user_attributes => { + .then(() => { // User table is not going to hold adjustments delete new_user_attributes.adjustment; @@ -102,16 +95,22 @@ router.post('/add/', function(req, res){ }) .catch(function(error){ - console.log( - 'An error occurred when trying to add new user account by user '+req.user.id - + ' : ' + error - ); + console.log( + 'An error occurred when trying to add new user account by user '+req.user.id + + ' : ' + error + ); - req.session.flash_error( - 'Failed to add new user' - ); + console.dir(error); + + if ( error && error.tom_error) { + req.session.flash_error( Exception.extract_user_error_message(error) ); + } + + req.session.flash_error( + 'Failed to add new user' + ); - return res.redirect_with_session('../add/'); + return res.redirect_with_session('../add/'); }); }); From d72be218e480c2764a8c778006278a7da664ed54 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 19 Jan 2018 15:36:55 +0000 Subject: [PATCH 076/539] Use single code for adding new users --- lib/model/user_importer.js | 58 +++++++++++++++++++++++++++------- lib/route/users.js | 64 +++++++++++++++++--------------------- 2 files changed, 75 insertions(+), 47 deletions(-) diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js index ad7ba3632..0f5c187ee 100644 --- a/lib/model/user_importer.js +++ b/lib/model/user_importer.js @@ -15,6 +15,12 @@ const add_user_interface_schema = Joi.object().required().keys({ name : Joi.string(), company_id : Joi.number().integer().positive(), department_id : Joi.number().integer().positive(), + + start_date : Joi.string().optional(), + end_date : Joi.string().default(null).allow(null), + admin : Joi.boolean().default(false), + auto_approve : Joi.boolean().default(false), + password : Joi.string().default(() => uuid.v4, 'Populate defaul password'), }); @@ -30,23 +36,49 @@ function add_user(args) { }); } + let attributes = {}; + + attributes.email = args.email; + attributes.lastname = args.lastname; + attributes.name = args.name; + attributes.companyId = args.company_id; + attributes.DepartmentId = args.department_id; + + attributes.password = Models.User.hashify_password(args.password); + attributes.admin = args.admin; + attributes.auto_approve = args.auto_approve; + attributes.end_date = args.end_date; + + // Pass start date inky if it is set, otherwise rely on database to use + // default value + if (args.start_date) { + attributes.start_date = args.start_date; + } + return Promise.resolve() + + // Ensure given department ID is owned by given company ID + .then(() => Models.Department + .findOne({ + where : { id : args.department_id, companyId : args.company_id }, + }) + .then( department => { + if ( ! department ) { + Exception.throw_user_error({ + system_error : 'Mismatch in department/company IDs when creating new user ' + + args.department_id + '/' + args.company_id, + user_error : 'Used wrong department', + }); + } + return Promise.resolve(); + }) + ) + // Ensure provided email is free to use .then(() => validate_email_to_be_free({ email : args.email })) // Create new user record - .then(() => Models.User.create({ - email : args.email, - lastname : args.lastname, - name : args.name, - password : uuid.v4(), - companyId : args.company_id, - DepartmentId : args.department_id, - })) - .then(new_users => { - // NOTE consider sending emails here - return Promise.resolve(new_users); - }); + .then(() => Models.User.create(attributes)); } function add_users_in_bulk(args) { @@ -169,6 +201,8 @@ function validate_email_to_be_free(args) { } module.exports = { + add_user : add_user, add_users_in_bulk : add_users_in_bulk, validate_email_to_be_free : validate_email_to_be_free, }; + diff --git a/lib/route/users.js b/lib/route/users.js index 162f223ca..6e5c9982c 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -32,7 +32,9 @@ router.get('/add/', function(req, res){ router.post('/add/', function(req, res){ - const model = req.app.get('db_model'); + const + model = req.app.get('db_model'), + Email = new EmailTransport(); let current_company, new_user_attributes; @@ -51,15 +53,7 @@ router.post('/add/', function(req, res){ require_password : (company.ldap_auth_enabled ? false : true ), }); - // TODO: make department responsible for adding new useR? - new_user_attributes.password = model.User.hashify_password( - // ... Instead use random string as password - // (users will be able to reset it when needed) - new_user_attributes.password || uuid.v4() - ); - new_user_attributes.companyId = company.id; - - return Promise.resolve(new_user_attributes); + return Promise.resolve(); }) // Make sure that we do not add user with existing emails @@ -67,39 +61,39 @@ router.post('/add/', function(req, res){ .validate_email_to_be_free({ email : new_user_attributes.email }) ) - .then(() => { - - // User table is not going to hold adjustments - delete new_user_attributes.adjustment; - - return model.User.create(new_user_attributes) - }) - - .then(function(new_user){ - var Email = new EmailTransport(); - - return Email.promise_add_new_user_email({ - company : current_company, - admin_user : req.user, - new_user : new_user, - }); - }) + // Add new user to database + .then(() => UserImporter.add_user({ + name : new_user_attributes.name, + lastname : new_user_attributes.lastname, + email : new_user_attributes.email, + department_id : new_user_attributes.DepartmentId, + start_date : new_user_attributes.start_date, + end_date : new_user_attributes.end_date, + admin : new_user_attributes.admin, + auto_approve : new_user_attributes.auto_approve, + company_id : req.user.companyId, + password : new_user_attributes.password, + })) + + .then(new_user => Email.promise_add_new_user_email({ + company : current_company, + admin_user : req.user, + new_user : new_user, + })) .then(function(){ - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('../add/'); - } else { - req.session.flash_message('New user account successfully added'); - return res.redirect_with_session('../'); - } + if ( req.session.flash_has_errors() ) { + return res.redirect_with_session('../add/'); + } else { + req.session.flash_message('New user account successfully added'); + return res.redirect_with_session('../'); + } }) .catch(function(error){ console.log( 'An error occurred when trying to add new user account by user '+req.user.id - + ' : ' + error ); - console.dir(error); if ( error && error.tom_error) { From 9b080cae742c3fd94c2413841308ddbc03031e4c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 19 Jan 2018 15:55:17 +0000 Subject: [PATCH 077/539] Amend error messages for users --- lib/route/users.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index 6e5c9982c..ba569ee4d 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -171,15 +171,14 @@ router.post('/import/', function(req, res){ console.dir(action_result); if ( action_result.users.length > 0 ) { req.session.flash_message( - 'Successfully imported users: ' + 'Successfully imported users with following emails: ' + action_result.users.map(user => user.email).join(', ') ); } if (action_result.errors.length > 0) { - req.session.flash_message( - 'Failed to import those users users: ' - + action_result.errors.map(err => err.email +': '+err.error).join('; ') - ); + action_result.errors.forEach(err => req.session.flash_error( + 'Failed to add user ' + err.email + '. Reason: ' + err.error + )); } res.redirect_with_session('/users/import/'); }) From fcd4ae072786f1c39e7124936130be9c146c83ef Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 07:16:03 +0000 Subject: [PATCH 078/539] Simple test for user import --- lib/route/users.js | 4 +- t/integration/users_import.js | 133 ++++++++++++++++++++++++++++++++++ t/lib/add_new_user.js | 2 +- t/lib/submit_form.js | 3 + views/user_add.hbs | 2 +- views/users_import.hbs | 2 +- 6 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 t/integration/users_import.js diff --git a/lib/route/users.js b/lib/route/users.js index ba569ee4d..9f530d526 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -172,7 +172,7 @@ router.post('/import/', function(req, res){ if ( action_result.users.length > 0 ) { req.session.flash_message( 'Successfully imported users with following emails: ' - + action_result.users.map(user => user.email).join(', ') + + action_result.users.map(user => user.email).sort().join(', ') ); } if (action_result.errors.length > 0) { @@ -832,7 +832,9 @@ function get_and_validate_user_parameters(args) { // Validate provided parameters + console.log('>>>>> ' + email); if (!validator.isEmail(email)) { + console.log('>>>>>: ' + email); req.session.flash_error( 'New email of '+item_name+' should be valid email address' ); diff --git a/t/integration/users_import.js b/t/integration/users_import.js new file mode 100644 index 000000000..ea3a82591 --- /dev/null +++ b/t/integration/users_import.js @@ -0,0 +1,133 @@ + +'use strict'; + +var test = require('selenium-webdriver/testing'), + By = require('selenium-webdriver').By, + expect = require('chai').expect, + _ = require('underscore'), + Promise = require("bluebird"), + fs = Promise.promisifyAll(require('fs')), + csv = Promise.promisifyAll(require('csv')), + 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'), + config = require('../lib/config'), + user_info_func = require('../lib/user_info'), + application_host = config.get_application_host(); + +/* + * Scenario to check: + * + * * Register new account + * * Create 10 unique emails/users + * * Put them into CSV and = + * + * */ + + +describe('Bulk import of users', function(){ + + this.timeout( config.get_execution_timeout() ); + + let email_admin, + driver, + csv_data, + test_users_filename = __dirname +'/../test.csv'; + + it('Create new company', function(done){ + register_new_user_func({ + application_host : application_host, + }) + .then(data => { + driver = data.driver; + done(); + }); + }); + + it('Navigate to bulk upload page', function(done){ + open_page_func({ + url : application_host + 'users/import/', + driver : driver, + }) + .then(function(){ done() }); + }); + + it('Create test .CSV file for the test', function(done){ + csv_data = [['email', 'name', 'lastname', 'department']]; + + let token = (new Date()).getTime(); + for (let i=0; i<10; i++){ + csv_data.push([ + 'test_csv_'+i+'_'+token+'@test.com', + 'name_csv_'+i+'_'+token+'@test.com', + 'lastname_csv_'+i+'_'+token+'@test.com', + 'Sales' + ]); + } + + Promise.resolve() + .then(() => fs.unlinkAsync(test_users_filename)) + .catch(err => Promise.resolve()) + .then(() => csv.stringifyAsync( csv_data )) + .then(data => fs.writeFileAsync(test_users_filename, data)) + .then(() => done()); + }); + + it('Upload user import file', function(done){ + let regex = new RegExp( + 'Successfully imported users with following emails: ' + + csv_data.slice(1).map(it => it[0]).sort().join(', ') + ); + + submit_form_func({ + submit_button_selector : '#submit_users_btn', + driver : driver, + form_params : [{ + selector : '#users_input_inp', + value : test_users_filename, + file : true, + }], + message : regex, + }) + .then(() => done()); + }); + + it('Ensure that imported users are in the system', function(done){ + let users_ids; + // Get IDs of newly added users + Promise.map(csv_data.slice(1).map(it => it[0]), email => { + return user_info_func({ + driver : driver, + email : email, + }) + .then(data => data.user.id); + }) + // Open users page + .then(ids => { + users_ids = ids; + + return open_page_func({ + url : application_host + 'users/', + driver : driver, + }); + }) + + // Ensure that IDs of newly added users are on th Users page + .then(() => Promise.map(users_ids, id => driver + .findElement(By.css('[data-vpp-user-row="'+id+'"]')) + .then(el => { + expect(el, 'Ensure that newly added user ID '+id+' exists on Users page') + .to.exists; + return Promise.resolve(); + }) + )) + + .then(() => done()); + }); + + after(function(done){ + driver.quit().then(() => done()); + }); +}); diff --git a/t/lib/add_new_user.js b/t/lib/add_new_user.js index 6b95fbde1..cbacea9b5 100644 --- a/t/lib/add_new_user.js +++ b/t/lib/add_new_user.js @@ -87,7 +87,7 @@ module.exports = Promise.promisify(function(args, callback){ }, select_department, ], - submit_button_selector : add_new_user_form_id+' button[type="submit"]', + submit_button_selector : add_new_user_form_id+' #add_new_user_btn', should_be_successful : error_message ? false : true, elements_to_check : [], message : error_message ? diff --git a/t/lib/submit_form.js b/t/lib/submit_form.js index b6d0d0cee..c41b5413e 100644 --- a/t/lib/submit_form.js +++ b/t/lib/submit_form.js @@ -55,6 +55,9 @@ var submit_form_func = Promise.promisify( function(args, callback){ .then(function(el){ return el.click(); }); } else if ( test_case.hasOwnProperty('tick')) { return el.click(); + } else if (test_case.file) { + return Promise.resolve() + .then(() => el.sendKeys( test_case.value )); } else { return el.clear().then(function(){ el.sendKeys( test_case.value ); diff --git a/views/user_add.hbs b/views/user_add.hbs index 7d69b244f..2bcbe959d 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -108,7 +108,7 @@
    - +
    diff --git a/views/users_import.hbs b/views/users_import.hbs index a6010e8d9..6228cb418 100644 --- a/views/users_import.hbs +++ b/views/users_import.hbs @@ -45,7 +45,7 @@
    -
    From 2ecaf1f2816df7f6e8c6fe46883527d2e70797c0 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 07:20:00 +0000 Subject: [PATCH 079/539] Require exact approximately version of csv --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d7345c06..f5eb5b069 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "body-parser": "^1.8.4", "connect-session-sequelize": "3.0.0", "cookie-parser": "^1.3.5", - "csv": "^0.4.6", + "csv": "~0.4.6", "debug": "~2.0.0", "express": "^4.13.4", "express-handlebars": "^3.0.0", From 5ce2c4d01706566e287803ddfb963c08b53197ba Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 09:56:41 +0000 Subject: [PATCH 080/539] Make test to clean up after itself --- t/integration/users_import.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/t/integration/users_import.js b/t/integration/users_import.js index ea3a82591..383225fc3 100644 --- a/t/integration/users_import.js +++ b/t/integration/users_import.js @@ -128,6 +128,10 @@ describe('Bulk import of users', function(){ }); after(function(done){ - driver.quit().then(() => done()); + Promise.resolve() + .then(() => driver.quit()) + .then(() => fs.unlinkAsync(test_users_filename)) + .catch(err => Promise.resolve()) + .then(() => done()); }); }); From 98b34036be5642d8737f0933916d37f73ccb3319 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 09:57:58 +0000 Subject: [PATCH 081/539] Debug travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 760f3335e..52f14bc60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ cache: env: before_install: before_script: - - node bin/wwww > /dev/null 2>&1 & + # - node bin/wwww > /dev/null 2>&1 & + - node bin/wwww & From c4cac3c4a065fbf82e1aafce17064e1b5d218adf Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 10:16:15 +0000 Subject: [PATCH 082/539] Fix Joi import instruction Linuxes are case sencitive cotrary to Mac OS --- lib/error/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/error/index.js b/lib/error/index.js index 2eeaca536..e95ec15ac 100644 --- a/lib/error/index.js +++ b/lib/error/index.js @@ -2,7 +2,7 @@ "use strict"; const - Joi = require('Joi'); + Joi = require('joi'); const schema_throw_user_error = [ Joi.object() From ed083fb5fe9985dc29580f3b399dbc8d6ab9f258 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 10:17:28 +0000 Subject: [PATCH 083/539] Remove travis debug --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52f14bc60..760f3335e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,4 @@ cache: env: before_install: before_script: - # - node bin/wwww > /dev/null 2>&1 & - - node bin/wwww & + - node bin/wwww > /dev/null 2>&1 & From 44c7f0ba182ee2fd9a88ae87c8971455a0d82656 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 11:25:24 +0000 Subject: [PATCH 084/539] Clean up UI of new page --- lib/model/user_importer.js | 4 +- t/integration/users_import.js | 4 +- views/settings_company_authentication.hbs | 2 +- views/user_add.hbs | 2 +- views/users_import.hbs | 72 ++++++++++++++--------- 5 files changed, 51 insertions(+), 33 deletions(-) diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js index 0f5c187ee..30a5b6700 100644 --- a/lib/model/user_importer.js +++ b/lib/model/user_importer.js @@ -38,7 +38,7 @@ function add_user(args) { let attributes = {}; - attributes.email = args.email; + attributes.email = args.email.toLowerCase(); attributes.lastname = args.lastname; attributes.name = args.name; attributes.companyId = args.company_id; @@ -113,7 +113,7 @@ function add_users_in_bulk(args) { .map(vector => '"'+vector[department_vector_index]+'"') .join(', '); - Error.throw_user_error({ + Exception.throw_user_error({ user_error : 'Following departments could not be found in ' + company.name + ' account: ' + unknown_departments, system_error : 'While importing users to company ' diff --git a/t/integration/users_import.js b/t/integration/users_import.js index 383225fc3..c543b2b79 100644 --- a/t/integration/users_import.js +++ b/t/integration/users_import.js @@ -22,7 +22,9 @@ var test = require('selenium-webdriver/testing'), * * * Register new account * * Create 10 unique emails/users - * * Put them into CSV and = + * * Put them into CSV and import in bulk + * * Ensure that all users were added into + * system and they appear on the Users page * * */ diff --git a/views/settings_company_authentication.hbs b/views/settings_company_authentication.hbs index 115678e0e..11f9cff3f 100644 --- a/views/settings_company_authentication.hbs +++ b/views/settings_company_authentication.hbs @@ -13,7 +13,7 @@
    -

    TimeOff.Management supports LDAP authentication for customers that want to integrate application with the rest of their infrastructure. The obvious reason is to allow employees reuse their Active directory credentials in TimeOff.Management..

    +

    TimeOff.Management supports LDAP authentication for customers that want to integrate application with the rest of their infrastructure. The obvious reason is to allow employees reuse their Active directory credentials in TimeOff.Management.

    This page allows you to setup the TimeOff.Management to communicate with a custom LDAP server.

    diff --git a/views/user_add.hbs b/views/user_add.hbs index 2bcbe959d..09b078aba 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -8,7 +8,7 @@
    Adding new employee account
    - Import new employees + Import new employees
    diff --git a/views/users_import.hbs b/views/users_import.hbs index 6228cb418..cfcca9ba9 100644 --- a/views/users_import.hbs +++ b/views/users_import.hbs @@ -3,56 +3,72 @@

    Employees bulk import

    -{{> show_flash_messages }} -
    Quick employees import
    - Add new employee + Add single employee
    -
     
    +{{> show_flash_messages }} + +
    +

    Description

    +
    +
    +

    TimeOff.Management supports importing employees in a bulk. So configuring the company account is fast and straightforward..

    -
    +

    In order to import employees into the system one needs to build .CSV file of following columns (in exact order):

    -

    Download sample

    +
      +
    • email: email of employee to be added
      • +
    • name: employee's name
      • +
    • lastname: employee's last name
      • +
    • department: name of the department new employee is going to be part of. Please ensure that the department is already added into Company account.
      • +
    -
    -
    - -
    - -
    -
    -
    -
    - Download sample prepopulated with current employees. -
    -
    -
    +

    The easiest way to get import file is to download sample one based on current settings of company account from the form below. Amend the file with new employees and upload the file in the form below.

    +

    Users who are already in the system are ignored during import.

    +
    +
    -
    +
    +

    Import

    +
    +
    + +
    +
    - -
    - -
    + +
    -
    -
    - -
    +
    +
    +
    + +
    +
    +
    + The sample file contains information about employees who are already in the system. +
    +
    + Extend the file to have records about new employees and ensure upload it from the form on left hand side. +
    +
    +
    +
     
    From 3d56938e43e2ebd6f0de56a493b1b96fd0ed3833 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 11:56:54 +0000 Subject: [PATCH 085/539] Sort out links --- views/partials/header.hbs | 1 + views/user_add.hbs | 2 +- views/users.hbs | 7 ++++--- views/users_import.hbs | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/views/partials/header.hbs b/views/partials/header.hbs index f7dce82ef..d21614cfc 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -40,6 +40,7 @@
  • Departments
  • LDAP configuration
  • Emails audit
    • +
  • Import employees
    • {{/if}} diff --git a/views/user_add.hbs b/views/user_add.hbs index 09b078aba..a76f893a7 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -8,7 +8,7 @@
    Adding new employee account
    - Import new employees + Import new employees
    diff --git a/views/users.hbs b/views/users.hbs index 08d36497a..773104a0f 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -9,13 +9,14 @@
    {{company.name}}'s staff
    - Add new employee -
    diff --git a/views/users_import.hbs b/views/users_import.hbs index cfcca9ba9..40b0d2114 100644 --- a/views/users_import.hbs +++ b/views/users_import.hbs @@ -6,7 +6,7 @@
    Quick employees import
    - Add single employee + Add single employee
    @@ -64,7 +64,7 @@ The sample file contains information about employees who are already in the system.
    - Extend the file to have records about new employees and ensure upload it from the form on left hand side. + Extend the file to have records about new employees and upload it from the form on left hand side.
    From 93f74e4f5d7ad7994abad8d9506398d9c9a47a25 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 12:22:35 +0000 Subject: [PATCH 086/539] Amend tests to respect new page structure --- t/lib/add_new_user.js | 128 ++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 74 deletions(-) diff --git a/t/lib/add_new_user.js b/t/lib/add_new_user.js index cbacea9b5..5d59b7d92 100644 --- a/t/lib/add_new_user.js +++ b/t/lib/add_new_user.js @@ -30,82 +30,62 @@ module.exports = Promise.promisify(function(args, callback){ var new_user_email = args.email || random_token + '@test.com'; // Open front page - driver.get( application_host ); - - driver.findElement( By.css('a[href="/users/"]') ) - .then(function(el){ - return el.getText(); - }) - .then(function(text){ - expect(text).to.be.equal('Employees'); + driver.get( application_host + 'users/add/'); + + + driver.call(() => { + + var select_department = {}; + if (typeof department_index !== 'undefined') { + + select_department = { + selector : 'select[name="department"]', + option_selector : 'option[data-vpp="'+department_index+'"]', + }; + } + + return submit_form_func({ + driver : driver, + form_params : [{ + selector : add_new_user_form_id+' input[name="name"]', + value : 'name'+random_token, + },{ + selector : add_new_user_form_id+' input[name="lastname"]', + value : 'lastname'+random_token, + },{ + selector : add_new_user_form_id+' input[name="email_address"]', + value : new_user_email, + },{ + selector : add_new_user_form_id+' input[name="password_one"]', + value : '123456', + },{ + selector : add_new_user_form_id+' input[name="password_confirm"]', + value : '123456', + },{ + selector : add_new_user_form_id+' input[name="start_date"]', + value : '2015-06-01', + }, + select_department, + ], + submit_button_selector : add_new_user_form_id+' #add_new_user_btn', + should_be_successful : error_message ? false : true, + elements_to_check : [], + message : error_message ? + new RegExp(error_message) : + /New user account successfully added/, }); - - driver.findElement( By.css('a[href="/users/"]') ) - .then(function(el){ - return el.click(); - }); - - driver.wait(until.elementLocated(By.css('#add_new_department')), 1000); - - driver.findElement( By.css('#add_new_department') ) - .then(function(el){ - return el.click(); - }) - .then(function(){ - - driver.wait(until.elementLocated(By.css('input[name="name"]')), 1000); - - var select_department = {}; - if (typeof department_index !== 'undefined') { - - select_department = { - selector : 'select[name="department"]', - option_selector : 'option[data-vpp="'+department_index+'"]', - }; + }) + + driver.call(function(){ + // "export" + result_callback( + null, + { + driver : driver, + new_user_email : new_user_email, } - - return submit_form_func({ - driver : driver, - form_params : [{ - selector : add_new_user_form_id+' input[name="name"]', - value : 'name'+random_token, - },{ - selector : add_new_user_form_id+' input[name="lastname"]', - value : 'lastname'+random_token, - },{ - selector : add_new_user_form_id+' input[name="email_address"]', - value : new_user_email, - },{ - selector : add_new_user_form_id+' input[name="password_one"]', - value : '123456', - },{ - selector : add_new_user_form_id+' input[name="password_confirm"]', - value : '123456', - },{ - selector : add_new_user_form_id+' input[name="start_date"]', - value : '2015-06-01', - }, - select_department, - ], - submit_button_selector : add_new_user_form_id+' #add_new_user_btn', - should_be_successful : error_message ? false : true, - elements_to_check : [], - message : error_message ? - new RegExp(error_message) : - /New user account successfully added/, - }); - }) - - .then(function(){ - // "export" - result_callback( - null, - { - driver : driver, - new_user_email : new_user_email, - } - ); - }); + ); + }); }); From 5246764a18dc9745ba5e0cf62c928d6ec15e96c6 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 24 Jan 2018 06:20:48 +0000 Subject: [PATCH 087/539] Add menu separators to group items by nature --- views/partials/header.hbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/views/partials/header.hbs b/views/partials/header.hbs index d21614cfc..e905aee4f 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -37,10 +37,12 @@ {{/if}} @@ -51,6 +53,7 @@ From dbb1f84ce4edf72034fe4c7583650d8cdac82363 Mon Sep 17 00:00:00 2001 From: Pavlo Date: Thu, 25 Jan 2018 06:57:31 +0000 Subject: [PATCH 088/539] Update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5eb5b069..b58cde173 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TimeOff.Management", - "version": "0.7.0", + "version": "0.10.0", "private": false, "description": "Simple yet powerful absence management software for small and medium size business", "engines": { From 268c946ac7285217f0ee30618912f8e1ea96196e Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 25 Jan 2018 16:25:08 +0000 Subject: [PATCH 089/539] Refactore logic behind leave revoking to be more efficient --- lib/route/requests.js | 139 ++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/lib/route/requests.js b/lib/route/requests.js index e7585671f..a6af6c414 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -189,91 +189,96 @@ router.post( } if ( req.session.flash_has_errors() ) { - console.error( + console.log( 'Got validation errors when revoking leave request for user ' + req.user.id ); return res.redirect_with_session('../'); } - Promise.try(function(){ - return Promise.join( - // Get user's leaves - req.user.promise_my_active_leaves_ever(), - // Get all leaves from users supervised by current user - req.user + Promise + // Get the Leave object for submitted ID + .try(() => req.app.get('db_model').Leave.findOne({ where : { id : request_id }})) + + // Ensure that current user can act on this Leave object + .then(requested_leave => { + + // Case when requested Leave is originated from current user + if ( String(requested_leave.userId) === String(req.user.id) ) { + return Promise.resolve( requested_leave ) + } + + // Case when requested Leave is originated from one of employees + // current user can manage + return req.user .promise_users_I_can_manage() - .then(function(users){ - return Promise.all( - _.map( - users, - function(user){ - return user.promise_my_active_leaves_ever(); - } - )) - .then(function(array_of_leave_arrays){ - return Promise.resolve(_.flatten(array_of_leave_arrays, true)); - }); - }), - function(users_leaves, supervised_leaves){ - // Compose all leaves into one new array - return Promise.resolve(users_leaves.concat(supervised_leaves)); - }); - }) - .then(function(leaves){ - var leave_to_process = _.find(leaves, function(leave){ - return String(leave.id) === String(request_id) - && leave.is_approved_leave(); - }); + .then(users => { + if ( users.find(u => String(u.id) === String(requested_leave.userId)) ) { + return Promise.resolve( requested_leave ); + } - if (! leave_to_process) { - throw new Error('Provided ID '+request_id - +' does not correspond to any leave requests to be revoked by user ' - + req.user.id - ); - } + return Promise.resolve(); + }); + }) - return leave_to_process.promise_to_revoke(); - }) - .then(function(processed_leave){ - return processed_leave.reload({ + .then(leave_to_process => { + + // Ensure that Leave is in status from it could be revoked + if (! leave_to_process) { + throw new Error('Provided ID '+request_id + +' does not correspond to any leave requests to be revoked by user ' + + req.user.id + ); + } + + // Do the action + return leave_to_process.promise_to_revoke(); + }) + + // Ensure that Leave object has all content necessary for sending emails + .then(processed_leave => processed_leave.reload({ include : [ {model : req.app.get('db_model').User, as : 'user'}, {model : req.app.get('db_model').User, as : 'approver'}, {model : req.app.get('db_model').LeaveType, as : 'leave_type' }, ], - }); - }) - .then(function(processed_leave){ + })) - var Email = new EmailTransport(); + // Send relevant emails + .then(processed_leave => { - return Email.promise_leave_request_revoke_emails({ - leave : processed_leave, + var Email = new EmailTransport(); + + return Email.promise_leave_request_revoke_emails({ + leave : processed_leave, + }) + .then(function(){ + return Promise.resolve(processed_leave); + }); }) - .then(function(){ - return Promise.resolve(processed_leave); - }); - }) - .then(function(processed_leave){ - req.session.flash_message( - 'You have requested leave to be revoked. ' - + ( - processed_leave.user.is_auto_approve() - ? '' - : 'Your supervisor needs to approve it' - ) - ); - return res.redirect_with_session('../'); - }) - .catch(function(error){ - console.error('An error occurred when attempting to revoke leave request ' - +request_id+' by user '+req.user.id+' Error: '+error - ); - req.session.flash_error('Failed to revoke leave request'); - return res.redirect_with_session('../'); - }); + // Deal with next page: where to land and what to show + .then(processed_leave => { + req.session.flash_message( + 'You have requested leave to be revoked. ' + + ( + processed_leave.user.is_auto_approve() + ? '' + : 'Your supervisor needs to approve it' + ) + ); + + return res.redirect_with_session('../'); + }) + + // Deal with issues if any occurs + .catch(error => { + console.error('An error occurred when attempting to revoke leave request ' + +request_id+' by user '+req.user.id+' Error: '+error + ); + req.session.flash_error('Failed to revoke leave request'); + return res.redirect_with_session('../'); + }); } ); From a3432b3c090f7d5f0bdd7598e769c90194fffbf8 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 26 Jan 2018 07:51:10 +0000 Subject: [PATCH 090/539] Make action button more prominant --- views/user_add.hbs | 2 +- views/users.hbs | 2 +- views/users_import.hbs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/user_add.hbs b/views/user_add.hbs index a76f893a7..d7dda5e27 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -8,7 +8,7 @@
    Adding new employee account
    - Import new employees + Import new employees
    diff --git a/views/users.hbs b/views/users.hbs index 773104a0f..a1d632b76 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -9,7 +9,7 @@
    {{company.name}}'s staff
    -
    +
    + + + +
    From ee5bc31a7f9fbb0653dbe794cc4f063688b9d0f2 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 09:17:58 +0000 Subject: [PATCH 092/539] Restructure code so logic is little bit more structureal way Still there is fat controller --- lib/model/db/company.js | 2 +- lib/route/users.js | 56 ++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 5ee127975..fa8296bbb 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -339,7 +339,7 @@ module.exports = function(sequelize, DataTypes) { * * */ name_for_machine : function(){ - return this.name.replace(/\s+/, '_'); + return this.name.replace(/\s+/g, '_'); }, reload_with_bank_holidays : function(){ diff --git a/lib/route/users.js b/lib/route/users.js index 1bb0e9606..110e32aba 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -804,25 +804,12 @@ router.get('/', function(req, res) { users_info = args[1]; if ( req.param('as-csv') ) { - res.attachment( - company.name_for_machine()+'_employees_on_'+company.get_today().format('YYYY_MMM_DD')+'.csv' - ); - - let content = [['email', 'lastname', 'name', 'department', 'remaining allowance', 'days used']]; - - users_info.forEach(ui => { - content.push([ - ui.user_row.email, - ui.user_row.lastname, - ui.user_row.name, - ui.user_row.department.name, - ui.number_of_days_available_in_allowance, - ui.user_row.calculate_number_of_days_taken_from_allowance() - ]); + return users_list_as_csv({ + users_info : users_info, + company : company, + req : res, + res : res, }); - - return csv.stringifyAsync( content ) - .then(csv_data_string => res.send(csv_data_string)); } res.render('users', { @@ -834,6 +821,39 @@ router.get('/', function(req, res) { }); }); +function users_list_as_csv(args) { + let users_info = args.users_info, + company = args.company, + req = args.req, + res = args.res; + + // Compose file name + res.attachment( + company.name_for_machine() + + '_employees_on_' + + company.get_today().format('YYYY_MMM_DD') + + '.csv' + ); + + // Compose result CSV header + let content = [['email', 'lastname', 'name', 'department', 'remaining allowance', 'days used']]; + + // ... and body + users_info.forEach(ui => { + content.push([ + ui.user_row.email, + ui.user_row.lastname, + ui.user_row.name, + ui.user_row.department.name, + ui.number_of_days_available_in_allowance, + ui.user_row.calculate_number_of_days_taken_from_allowance() + ]); + }); + + return csv.stringifyAsync( content ) + .then(csv_data_string => res.send(csv_data_string)); +} + function get_and_validate_user_parameters(args) { var req = args.req, item_name = args.item_name, From ec4f588741353fa35b1535b0945f99ed5aaa5822 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 10:00:29 +0000 Subject: [PATCH 093/539] Slowly lighten template from complex objects --- lib/route/users.js | 39 ++++++++++++++++++++++++++++++++++----- views/users.hbs | 14 ++++++-------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index 110e32aba..5e4b7ae83 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -798,6 +798,14 @@ router.get('/', function(req, res) { .then(users_info => Promise.resolve([company, users_info])) ) + // We are moving away from passing complex objects into templates + // for callting complicated methods from within templates + // Now only basic simple objects to be sent over to tamples, + // all preparation to be done before rendering. + // + // So prepare special rendering datastructure here + .then(args => promise_user_list_data_for_rendering(args)) + .then(function(args){ let company = args[0], @@ -821,6 +829,27 @@ router.get('/', function(req, res) { }); }); +function promise_user_list_data_for_rendering(args) { + let + company = args[0], + users_info = args[1]; + + let users_info_for_rendering = users_info.map(ui => ({ + user_id : ui.user_row.id, + user_email : ui.user_row.email, + user_name : ui.user_row.name, + user_lastname : ui.user_row.lastname, + user_full_name : ui.user_row.full_name(), + department_id : ui.user_row.department.id, + department_name : ui.user_row.department.name, + is_admin : ui.user_row.admin, + number_of_days_available_in_allowance : ui.number_of_days_available_in_allowance, + number_of_days_taken_from_allowance : ui.user_row.calculate_number_of_days_taken_from_allowance(), + })); + + return Promise.resolve([company, users_info_for_rendering]); +}; + function users_list_as_csv(args) { let users_info = args.users_info, company = args.company, @@ -841,12 +870,12 @@ function users_list_as_csv(args) { // ... and body users_info.forEach(ui => { content.push([ - ui.user_row.email, - ui.user_row.lastname, - ui.user_row.name, - ui.user_row.department.name, + ui.user_email, + ui.user_lastname, + ui.user_name, + ui.department_name, ui.number_of_days_available_in_allowance, - ui.user_row.calculate_number_of_days_taken_from_allowance() + ui.number_of_days_taken_from_allowance ]); }); diff --git a/views/users.hbs b/views/users.hbs index 1e8c1b091..87ee69d5f 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -49,15 +49,13 @@
    {{this.full_name}}{{this.department.name}}{{# if this.admin }}Yes{{else}}{{/if}}{{ ../number_of_days_available_in_allowance }}{{this.calculate_number_of_days_taken_from_allowance}}
    {{this.user_full_name}}{{this.department_name}}{{# if this.is_admin }}Yes{{else}}{{/if}}{{ this.number_of_days_available_in_allowance }}{{this.number_of_days_taken_from_allowance}}
    From 71096b3e3cb78d2bb48e58cc31cf4c373e07efc8 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 10:00:29 +0000 Subject: [PATCH 094/539] Slowly lighten template from complex objects --- lib/route/users.js | 39 ++++++++++++++++++++++++++++++++++----- views/users.hbs | 14 ++++++-------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index 110e32aba..5e4b7ae83 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -798,6 +798,14 @@ router.get('/', function(req, res) { .then(users_info => Promise.resolve([company, users_info])) ) + // We are moving away from passing complex objects into templates + // for callting complicated methods from within templates + // Now only basic simple objects to be sent over to tamples, + // all preparation to be done before rendering. + // + // So prepare special rendering datastructure here + .then(args => promise_user_list_data_for_rendering(args)) + .then(function(args){ let company = args[0], @@ -821,6 +829,27 @@ router.get('/', function(req, res) { }); }); +function promise_user_list_data_for_rendering(args) { + let + company = args[0], + users_info = args[1]; + + let users_info_for_rendering = users_info.map(ui => ({ + user_id : ui.user_row.id, + user_email : ui.user_row.email, + user_name : ui.user_row.name, + user_lastname : ui.user_row.lastname, + user_full_name : ui.user_row.full_name(), + department_id : ui.user_row.department.id, + department_name : ui.user_row.department.name, + is_admin : ui.user_row.admin, + number_of_days_available_in_allowance : ui.number_of_days_available_in_allowance, + number_of_days_taken_from_allowance : ui.user_row.calculate_number_of_days_taken_from_allowance(), + })); + + return Promise.resolve([company, users_info_for_rendering]); +}; + function users_list_as_csv(args) { let users_info = args.users_info, company = args.company, @@ -841,12 +870,12 @@ function users_list_as_csv(args) { // ... and body users_info.forEach(ui => { content.push([ - ui.user_row.email, - ui.user_row.lastname, - ui.user_row.name, - ui.user_row.department.name, + ui.user_email, + ui.user_lastname, + ui.user_name, + ui.department_name, ui.number_of_days_available_in_allowance, - ui.user_row.calculate_number_of_days_taken_from_allowance() + ui.number_of_days_taken_from_allowance ]); }); diff --git a/views/users.hbs b/views/users.hbs index 1e8c1b091..87ee69d5f 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -49,15 +49,13 @@
    {{this.full_name}}{{this.department.name}}{{# if this.admin }}Yes{{else}}{{/if}}{{ ../number_of_days_available_in_allowance }}{{this.calculate_number_of_days_taken_from_allowance}}
    {{this.user_full_name}}{{this.department_name}}{{# if this.is_admin }}Yes{{else}}{{/if}}{{ this.number_of_days_available_in_allowance }}{{this.number_of_days_taken_from_allowance}}
    From f76984d1f2066d04dc42802a9f79c322e904388c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 10:18:37 +0000 Subject: [PATCH 095/539] Add tooltip for newly added .csv button on users page --- views/users.hbs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/views/users.hbs b/views/users.hbs index 87ee69d5f..ca9105fea 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -22,7 +22,14 @@
    - +
    From 9d7817523b8aa45f306624584384fe4d9b56bbf4 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 10:49:29 +0000 Subject: [PATCH 096/539] Add some navigation links to user add/import pages --- views/user_add.hbs | 209 ++++++++++++++++++++++------------------- views/users_import.hbs | 12 ++- 2 files changed, 124 insertions(+), 97 deletions(-) diff --git a/views/user_add.hbs b/views/user_add.hbs index d7dda5e27..c47bddc34 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -3,8 +3,6 @@

    New employee

    -{{> show_flash_messages }} -
    Adding new employee account
    @@ -12,105 +10,124 @@
    -
     
    - -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    - Email address used by employee -
    - -
    - -
    - -
    - Department employee belongs to -
    - -
    -
    - -
    -
    - -
    -
    - -
    - Set the flag ON to streamline leave requests from this employee directly into Approved state. -
    - -
    - -
    - -
    - Date when employee started (inclusive) -
    +{{> show_flash_messages }} -
    - -
    - -
    -
    Date when user quits the {{ company.name }}.
    After this date user is not able to access the company.
    This is a way of deactivating user accounts.
     +
    +
    +
      +
    1. All Employees
      2. +
    2. Add new employee
      3. +
    +
    -
    - -
    - -
    - - {{# if company.ldap_auth_enabled }} - LDAP authentication is enabled, so that password does not matter. - {{else}} - Define employee's password. - {{/ if}} - -
    +
    +

    Details of new employee

    +
    -
    - -
    - -
    -
    +
    +
    + + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    + Email address used by employee +
    + +
    + +
    + +
    + Department employee belongs to +
    + +
    +
    + +
    +
    + +
    +
    + +
    + Set the flag ON to streamline leave requests from this employee directly into Approved state. +
    + +
    + +
    + +
    + Date when employee started (inclusive) +
    + +
    + +
    + +
    +
    Date when user quits the {{ company.name }}.
    After this date user is not able to access the company.
    This is a way of deactivating user accounts.
     +
    + +
    + +
    + +
    + + {{# if company.ldap_auth_enabled }} + LDAP authentication is enabled, so that password does not matter. + {{else}} + Define employee's password. + {{/ if}} + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + -
    -
    - -
    - +
    {{> footer }} diff --git a/views/users_import.hbs b/views/users_import.hbs index 68353ce6e..1c4119ad5 100644 --- a/views/users_import.hbs +++ b/views/users_import.hbs @@ -8,17 +8,27 @@
    Add single employee
    +
    {{> show_flash_messages }} +
    +
    +
      +
    1. All Employees
      2. +
    2. Import employees in a bulk
      3. +
    +
    +
    +

    Description

    -

    TimeOff.Management supports importing employees in a bulk. So configuring the company account is fast and straightforward..

    +

    TimeOff.Management supports importing employees in a bulk.

    In order to import employees into the system one needs to build .CSV file of following columns (in exact order):

    From 664ced15982f728fa6fe1d42f7d68e4caa98785b Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 11:00:29 +0000 Subject: [PATCH 097/539] Add hovering effect to team view page table --- views/team_view.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/team_view.hbs b/views/team_view.hbs index 56062bb76..78472909d 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -31,7 +31,7 @@
    - +
    From 4ef81b9b80ff3208b750fcd9187a33c9816385f9 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 23 Jan 2018 14:14:52 +0000 Subject: [PATCH 098/539] Add sketches of reports index page --- app.js | 5 +++++ lib/route/reports.js | 20 ++++++++++++++++++++ views/report/index.hbs | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 lib/route/reports.js create mode 100644 views/report/index.hbs diff --git a/app.js b/app.js index c0155a27d..3157ba07e 100644 --- a/app.js +++ b/app.js @@ -141,6 +141,11 @@ app.use( require('./lib/route/audit') ); +app.use( + '/reports/', + require('./lib/route/reports') +); + // catch 404 and forward to error handler app.use(function(req, res, next) { var err = new Error('Not Found'); diff --git a/lib/route/reports.js b/lib/route/reports.js new file mode 100644 index 000000000..67d6973ee --- /dev/null +++ b/lib/route/reports.js @@ -0,0 +1,20 @@ + +"use strict"; + +const + express = require('express'), + router = express.Router(), + validator = require('validator'), + Promise = require('bluebird'), + moment = require('moment'), + config = require('../config'), + _ = require('underscore'); + +// Make sure that current user is authorized to deal with settings +router.all(/.*/, require('../middleware/ensure_user_is_admin')); + +router.get('/', (req, res) => { + res.render('report/index'); +}); + +module.exports = router; diff --git a/views/report/index.hbs b/views/report/index.hbs new file mode 100644 index 000000000..1a12ae8e7 --- /dev/null +++ b/views/report/index.hbs @@ -0,0 +1,18 @@ + +{{> header }} + +

    Reports

    + +
    +
    List of available reports
    +
    + +
     
    + +
    +
    + Allownce usage +
    +
    + +{{> footer }} From 328791040f59678114b8e0c4b392d6c005354b5c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 25 Jan 2018 06:55:39 +0000 Subject: [PATCH 099/539] Some hardcoded report implementation --- lib/model/db/department.js | 108 ++++++++++++++++++++++++------- lib/model/team_view.js | 52 +++++++++++---- lib/route/reports.js | 52 +++++++++++++++ views/partials/header.hbs | 1 + views/report/allowancebytime.hbs | 64 ++++++++++++++++++ views/report/index.hbs | 6 +- views/team_view.hbs | 1 + 7 files changed, 244 insertions(+), 40 deletions(-) create mode 100644 views/report/allowancebytime.hbs diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 99e531802..48666ff57 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -95,23 +95,67 @@ module.exports = function(sequelize, DataTypes) { }); }, - promise_team_view : function(args){ + promise_team_view_for_month : function( month ){ + return this._promise_team_view({ start_date : month }); + }, + + promise_team_view_for_months_range : function (start_month, end_month){ + return this._promise_team_view({ + start_date : start_month, + end_date : end_month, + }); + }, + + _promise_team_view : function(args){ - var self = this, - model = sequelize.models, - base_date = args.base_date; + let + self = this, + model = sequelize.models, + start_date = args.start_date, + end_date = args.end_date; var promise_users_and_leaves = Promise - // First of all ensure that "base_date" is defined + // First of all ensure that "start_date" is defined .try(function(){ - if ( base_date ) { - return Promise.resolve(base_date); + if ( start_date ) { + return Promise.resolve(start_date); } return self.getCompany() - .then(company => Promise.resolve( base_date = company.get_today() ) ) + .then(company => Promise.resolve( start_date = company.get_today() ) ) + }) + + // Ensure end_date is suitable if it was provided + .then(() => { + + // If end_date was not provided: no need to validate it: set it to be equal to start date + if ( ! end_date ) { + + end_date = start_date; + + return Promise.resolve(); + } + + // If end date is privided... + // ... ensure start and end dates are from within same year + if (moment.utc(end_date).format('YYYY') !== moment.utc(start_date).format('YYYY')) { + Exception.throw_user_error({ + user_error : 'Start and End dates should within single year', + system_error : '_promise_team_view was called with start_date and end_date from different years.', + }); + } + + // ... ensure that start date proceed end date + if (moment.utc(start_date).dayOfYear() > moment.utc(end_date).dayOfYear()) { + Exception.throw_user_error({ + user_error : 'Start date needs to be before end date', + system_error : '_promise_team_view was called with end_date prior to start_date', + }); + } + + return Promise.resolve(); }) // Get users @@ -123,7 +167,7 @@ module.exports = function(sequelize, DataTypes) { users, function(user){ return user.promise_my_leaves_for_calendar({ - year : base_date, + year : start_date, }) .then(function(leaves){ @@ -159,21 +203,37 @@ module.exports = function(sequelize, DataTypes) { promise_company, promise_users_and_leaves, function(company, users_and_leaves){ - _.each(users_and_leaves, function(user_data){ - var calendar_month = new CalendarMonth(base_date,{ - bank_holidays : - self.include_public_holidays - ? _.map( - company.bank_holidays, - function(day){return day.date} - ) - : [], - leave_days : user_data.leave_days, - schedule : user_data.schedule, - today : company.get_today(), - }); - - user_data.days = calendar_month.as_for_team_view(); + + let number_of_months = moment.utc(end_date).month() - moment.utc(start_date).month(); + + users_and_leaves.forEach( user_data => { + + user_data.days = []; + + // Now iterate throw all monthes between start and end dates + // and get calendar months for each + // and then combined them all togather + for ( let i=0; i<=number_of_months; i++ ) { + + let calendar_month = new CalendarMonth( + moment.utc(start_date).clone().add(i, 'months'), + { + bank_holidays : + self.include_public_holidays + ? _.map( + company.bank_holidays, + function(day){return day.date} + ) + : [], + leave_days : user_data.leave_days, + schedule : user_data.schedule, + today : company.get_today(), + } + ); + + user_data.days.push( calendar_month.as_for_team_view()); + } // end of for + user_data.days = _.flatten( user_data.days ); }); return Promise.resolve(users_and_leaves); diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 90d11d6aa..233a3131e 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -2,16 +2,36 @@ 'use strict'; const - moment = require('moment'), - Promise = require('bluebird'), - Joi = require('joi'), - _ = require('underscore'); + moment = require('moment'), + Promise = require('bluebird'), + Joi = require('joi'), + Exception = require('../error'), + _ = require('underscore'); function TeamView(args) { var me = this; this.user = args.user; this.base_date = args.base_date || this.user.company.get_today(); + + // Optional parameters that override base date specify months range + // Team view is going to represent. + // + // The precision is up to month, that is any smaller part of dates + // (such as days, hours etc) are ignored. + // + // If those two parameters are missed - base_date is used to determine with month + // Team view would represent. + // + this.start_date = args.start_date; + this.end_date = args.end_date; + + if (args.start_date && args.end_date && args.base_date) { + Exception.throw_user_error({ + user_error : 'Failed to calculate team view', + system_error : 'TeamView could not be instanciated with start_date, end_data and base_date all defined.' + }); + } } TeamView.prototype.promise_team_view_details = function(args){ @@ -21,11 +41,13 @@ TeamView.prototype.promise_team_view_details = function(args){ args = {}; } - var user = this.user, - current_department_id = args.department_id, // optional parameter - related_departments = [], - current_department, - base_date = this.base_date; + let + self = this, + user = this.user, + current_department_id = args.department_id, // optional parameter + related_departments = [], + current_department, + base_date = this.base_date; var promise_departments; @@ -69,15 +91,17 @@ TeamView.prototype.promise_team_view_details = function(args){ } // Calculate users and leaves for every department - var promise_users_and_leaves = promise_departments.map(function(department){ - return department.promise_team_view({ base_date : base_date }); - }); + var promise_users_and_leaves = promise_departments + .map(department => self.start_date && self.end_date + ? department.promise_team_view_for_months_range( self.start_date, self.end_date ) + : department.promise_team_view_for_month( base_date ) + ); - return promise_users_and_leaves.then(function(users_and_leaves){ + return promise_users_and_leaves.then(users_and_leaves => { users_and_leaves = _.sortBy( _.flatten(users_and_leaves), - function(item){ return item.user.lastname + item.user.name; } + item => item.user.lastname + item.user.name ); return Promise.resolve({ diff --git a/lib/route/reports.js b/lib/route/reports.js index 67d6973ee..fdb29c787 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -8,6 +8,7 @@ const Promise = require('bluebird'), moment = require('moment'), config = require('../config'), + TeamView = require('../model/team_view'), _ = require('underscore'); // Make sure that current user is authorized to deal with settings @@ -17,4 +18,55 @@ router.get('/', (req, res) => { res.render('report/index'); }); +router.get('/allowancebytime/', (req, res) => { + + var base_date = validator.isDate(req.param('date')) + ? moment.utc(req.param('date')) + : req.user.company.get_today(); + + var team_view = new TeamView({ +// base_date : base_date, + user : req.user, + start_date : base_date.clone().add(-5, 'months'), + end_date : base_date.clone().add(-1, 'months'), + }); + + var current_deparment_id = validator.isNumeric(req.param('department')) + ? req.param('department') + : null; + + Promise.join( + team_view.promise_team_view_details({ + department_id : current_deparment_id, + }), + req.user.get_company_with_all_leave_types(), + (team_view_details, company) => { + team_view + .inject_statistics({ + team_view_details : team_view_details, + leave_types : company.leave_types, + }) + .then(team_view_details => res.render('report/allowancebytime', { + 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('/'); + }); + + // res.render('report/allowancebytime'); +}); + module.exports = router; diff --git a/views/partials/header.hbs b/views/partials/header.hbs index e905aee4f..9ec2f407b 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -43,6 +43,7 @@
  • Import employees
  • Emails audit
    • +
  • Reports
    • {{/if}} diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs new file mode 100644 index 000000000..4f959e5ca --- /dev/null +++ b/views/report/allowancebytime.hbs @@ -0,0 +1,64 @@ + +{{> header }} + +

    Allowance usage by time

    + +
    +
    Shows allowance usage in given time frame
    +
    + +
      +
    1. All reports
      2. +
    2. Allowance usage by time
      3. +
    + +
     
    + +
    +
    +

    Here will users

    +
    +
    + +
    +
    + + + + + + + + {{# each users_and_leaves}} + + + + + {{/each}} +
    +
    + + +
    +
    {{#with this.user }}{{ this.full_name }}{{/with}} + + {{ statistics.deducted_days }} + +
    +
    +
    + +{{> footer }} diff --git a/views/report/index.hbs b/views/report/index.hbs index 1a12ae8e7..714276634 100644 --- a/views/report/index.hbs +++ b/views/report/index.hbs @@ -10,8 +10,10 @@
     
    -
    - Allownce usage +
    +
    + Allowance usage by time +
    diff --git a/views/team_view.hbs b/views/team_view.hbs index 78472909d..d9756ac8c 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -76,6 +76,7 @@ {{/each}}
    +
     
    From ecdad755188e424fa786c2ea546dc7a189ecbed3 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 13:47:05 +0000 Subject: [PATCH 100/539] Some ideas about UI for report page --- lib/route/reports.js | 13 +++--- views/audit/emails.hbs | 6 +-- views/report/allowancebytime.hbs | 75 +++++++++++++++++++++----------- views/team_view.hbs | 1 + 4 files changed, 61 insertions(+), 34 deletions(-) diff --git a/lib/route/reports.js b/lib/route/reports.js index fdb29c787..e2f600f54 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -20,15 +20,18 @@ router.get('/', (req, res) => { router.get('/allowancebytime/', (req, res) => { - var base_date = validator.isDate(req.param('date')) - ? moment.utc(req.param('date')) + let start_date = validator.isDate(req.param('start_date')) + ? moment.utc(req.param('start_date')) + : req.user.company.get_today(); + + let end_date = validator.isDate(req.param('end_date')) + ? moment.utc(req.param('end_date')) : req.user.company.get_today(); var team_view = new TeamView({ -// base_date : base_date, user : req.user, - start_date : base_date.clone().add(-5, 'months'), - end_date : base_date.clone().add(-1, 'months'), + start_date : start_date, + end_date : end_date, }); var current_deparment_id = validator.isNumeric(req.param('department')) diff --git a/views/audit/emails.hbs b/views/audit/emails.hbs index 06d9c0cde..ee2a3befa 100644 --- a/views/audit/emails.hbs +++ b/views/audit/emails.hbs @@ -26,9 +26,9 @@
    + data-provide="datepicker" data-date-autoclose="1" data-date-format="{{#with logged_user.company }}{{this.get_default_date_format_for_date_picker}}{{/with}}" data-date-week-start="1" + value="{{#if filter.start_date }}{{as_date filter.start_date }}{{/if}}" + >
    diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index 4f959e5ca..98ba881a2 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -12,49 +12,72 @@
  • Allowance usage by time
    • -
     
    -
    -

    Here will users

    -
    -
    -
    -
    - +
    +
    -
    - + + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + + - +
    +
    +
    +
    + +
    +
    +
    -
    -
    -
    + + + + + + {{# each users_and_leaves}} - - - + + + {{/each}}
    Employee full nameDays deducted from allowance
    {{#with this.user }}{{ this.full_name }}{{/with}} - - {{ statistics.deducted_days }} - -
    {{#with this.user }}{{ this.full_name }}{{/with}}{{ statistics.deducted_days }}
    diff --git a/views/team_view.hbs b/views/team_view.hbs index d9756ac8c..6ab78c6d7 100644 --- a/views/team_view.hbs +++ b/views/team_view.hbs @@ -42,6 +42,7 @@
    • All
      • + {{#each related_departments}}
    • {{this.name}}
      • {{/each}} From 67aa54d536a76ac0f0c131e778c53e81ae65a547 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 16:52:03 +0000 Subject: [PATCH 101/539] Improve UI for newly added report --- lib/model/db/department.js | 1 + lib/route/reports.js | 21 ++++-- views/partials/reports/date_range_pretty.hbs | 1 + views/report/allowancebytime.hbs | 79 ++++++++++++-------- 4 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 views/partials/reports/date_range_pretty.hbs diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 48666ff57..8aa913ba2 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -3,6 +3,7 @@ var moment = require('moment'), _ = require('underscore'), Promise = require('bluebird'), + Exception = require('../../error'), CalendarMonth = require('../calendar_month'); module.exports = function(sequelize, DataTypes) { diff --git a/lib/route/reports.js b/lib/route/reports.js index e2f600f54..fdda57b84 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -9,6 +9,7 @@ const moment = require('moment'), config = require('../config'), TeamView = require('../model/team_view'), + Exception = require('../error'), _ = require('underscore'); // Make sure that current user is authorized to deal with settings @@ -54,6 +55,11 @@ router.get('/allowancebytime/', (req, res) => { related_departments : team_view_details.related_departments, current_department : team_view_details.current_department, company : company, + start_date_str : start_date.format('YYYY-MM'), + end_date_str : end_date.format('YYYY-MM'), + start_date_obj : start_date, + end_date_obj : end_date, + same_month : (start_date.format('YYYYMM') === end_date.format('YYYYMM')), }) ); }) @@ -62,14 +68,17 @@ router.get('/allowancebytime/', (req, res) => { '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); + + let user_error_message = 'Failed to produce report. Please contact administrator.'; + + if ( error.tom_error ) { + user_error_message = Exception.extract_user_error_message(error); } - return res.redirect_with_session('/'); - }); - // res.render('report/allowancebytime'); + req.session.flash_error(user_error_message); + + return res.redirect_with_session('./'); + }); }); module.exports = router; diff --git a/views/partials/reports/date_range_pretty.hbs b/views/partials/reports/date_range_pretty.hbs new file mode 100644 index 000000000..336138276 --- /dev/null +++ b/views/partials/reports/date_range_pretty.hbs @@ -0,0 +1 @@ +{{#if same_month }}{{ as_date_formatted start_date 'MMMM YYYY' }}{{else}}{{ as_date_formatted start_date 'MMMM' }} - {{ as_date_formatted end_date 'MMMM, YYYY'}}{{/if}} diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index 98ba881a2..0f67514fe 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -1,52 +1,64 @@ {{> header }} -

      Allowance usage by time

      +

      Allowance usage

      -
      Shows allowance usage in given time frame
      +
      Shows allowance usage in {{> reports/date_range_pretty same_month=same_month start_date=start_date_obj end_date=end_date_obj}}
      +{{> show_flash_messages }} +
      1. All reports
      2. Allowance usage by time
      +
      + Filter +
      +
      +
      -
      +
      -
      - -
        -
      • All
        • - +
        +
        + + +
      - -
      - - - - +
      +
      + +
      + + + (YYYY-MM) + + + (YYYY-MM) +
      + Date range must be within single year +
      @@ -56,22 +68,28 @@
      +
      -
      -
      -
      +
      + Report
      +
      + + {{# unless users_and_leaves }} +
      + There are no user in selected department +
      + {{else}} -
      - + {{# each users_and_leaves}} @@ -82,6 +100,7 @@ {{/each}}
      Employee full nameDays deducted from allowanceDays deducted from allowance
      in {{> reports/date_range_pretty same_month=same_month start_date=start_date_obj end_date=end_date_obj}}
      + {{/ unless}}
      {{> footer }} From b764b24b8ecc534bcb0c05bd93a693c9f9ccb108 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 19:59:31 +0000 Subject: [PATCH 102/539] Download allowance report as .csv --- lib/route/reports.js | 83 +++++++++++++++++++++++++++----- views/report/allowancebytime.hbs | 6 +++ 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/lib/route/reports.js b/lib/route/reports.js index fdda57b84..260c31489 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -10,6 +10,7 @@ const config = require('../config'), TeamView = require('../model/team_view'), Exception = require('../error'), + csv = Promise.promisifyAll(require('csv')), _ = require('underscore'); // Make sure that current user is authorized to deal with settings @@ -50,18 +51,14 @@ router.get('/allowancebytime/', (req, res) => { team_view_details : team_view_details, leave_types : company.leave_types, }) - .then(team_view_details => res.render('report/allowancebytime', { - 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, - start_date_str : start_date.format('YYYY-MM'), - end_date_str : end_date.format('YYYY-MM'), - start_date_obj : start_date, - end_date_obj : end_date, - same_month : (start_date.format('YYYYMM') === end_date.format('YYYYMM')), - }) - ); + .then(team_view_details => render_allowancebytime({ + req : req, + res : res, + team_view_details : team_view_details, + company : company, + start_date : start_date, + end_date : end_date, + })) }) .catch(error => { console.error( @@ -81,4 +78,66 @@ router.get('/allowancebytime/', (req, res) => { }); }); +function render_allowancebytime(args) { + let + req = args.req, + res = args.res, + team_view_details = args.team_view_details, + company = args.company, + start_date = args.start_date, + end_date = args.end_date; + + return Promise + .try(() => req.param('as-csv') + ? render_allowancebytime_as_csv(args) + : res.render('report/allowancebytime', { + 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, + start_date_str : start_date.format('YYYY-MM'), + end_date_str : end_date.format('YYYY-MM'), + start_date_obj : start_date, + end_date_obj : end_date, + same_month : (start_date.format('YYYYMM') === end_date.format('YYYYMM')), + }) + ); +} + +function render_allowancebytime_as_csv(args) { + let + req = args.req, + res = args.res, + team_view_details = args.team_view_details, + company = args.company, + start_date = args.start_date, + end_date = args.end_date; + + // Compose file name + res.attachment( + company.name_for_machine() + + '_employee_allowances_between' + + start_date.format('YYYY_MM') + + '_and_' + + end_date.format('YYYY_MM') + + '.csv' + ); + + // Compose result CSV header + let content = [['email', 'last name', 'name', 'days deducted from allowance']]; + + // ... and body + team_view_details.users_and_leaves.forEach(ul => { + content.push([ + ul.user.email, + ul.user.lastname, + ul.user.name, + ul.statistics.deducted_days + ]); + }); + + return csv.stringifyAsync( content ) + .then(csv_data_string => res.send(csv_data_string)); +} + module.exports = router; diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index 0f67514fe..e90b819ad 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -63,6 +63,12 @@
      +
      From 4edbb0bf35c7bf475c9ca36828a8c6dea12fd337 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 27 Jan 2018 23:09:53 +0000 Subject: [PATCH 103/539] Capture statistics breakdown by leave types on new report --- lib/model/team_view.js | 27 ++++++++++++++++++-- lib/route/reports.js | 42 +++++++++++++++++++++++--------- views/report/allowancebytime.hbs | 6 +++++ views/report/index.hbs | 2 ++ 4 files changed, 64 insertions(+), 13 deletions(-) diff --git a/lib/model/team_view.js b/lib/model/team_view.js index 233a3131e..b4b50875b 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -153,13 +153,16 @@ TeamView.prototype.inject_statistics = function(args){ 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; + // Set statistics by leave type to zeros + let leave_type_stat = {}; + leave_types.forEach( lt => leave_type_stat[lt.id] = 0 ); + node .days // Consider only those days that have any leave objects @@ -173,6 +176,16 @@ TeamView.prototype.inject_statistics = function(args){ .forEach( day => { let leave_type = leave_types_map[ day.leave_obj.leaveTypeId ]; + // Capture statistics by Leave types + if (leave_type) { + if (day.is_leave_afternoon && day.is_leave_morning) { + leave_type_stat[ leave_type.id ] ++; + } else { + leave_type_stat[ leave_type.id ] = leave_type_stat[ leave_type.id ] + 0.5; + } + } + + // Abort if current leave type does not use allowance if (! (leave_type && leave_type.use_allowance)) { return; } @@ -185,7 +198,17 @@ TeamView.prototype.inject_statistics = function(args){ }); let statistics = { - deducted_days : deducted_days, + deducted_days : deducted_days, + // Shows statistics by leave type + leave_type_break_down : { + // format for machine using + lite_version : leave_type_stat, + // format for rendering to end users + pretty_version : leave_types + // Sort by name + .sort((a,b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0) + .map(lt => ({ name : lt.name, stat : leave_type_stat[ lt.id ] })), + } }; node.statistics = statistics; diff --git a/lib/route/reports.js b/lib/route/reports.js index 260c31489..7fc184773 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -46,7 +46,7 @@ router.get('/allowancebytime/', (req, res) => { }), req.user.get_company_with_all_leave_types(), (team_view_details, company) => { - team_view + return team_view .inject_statistics({ team_view_details : team_view_details, leave_types : company.leave_types, @@ -63,18 +63,25 @@ router.get('/allowancebytime/', (req, res) => { .catch(error => { console.error( 'An error occured when user '+req.user.id+ - ' tried to access Teamview page: '+error + ' tried to access /reports/allowancebytime page: '+error ); - let user_error_message = 'Failed to produce report. Please contact administrator.'; + let + user_error_message = 'Failed to produce report. Please contact administrator.', + + // By default go back to root report page + redirect_path = '../'; if ( error.tom_error ) { user_error_message = Exception.extract_user_error_message(error); + + // If it is known error: stay on current page + redirect_path = './'; } req.session.flash_error(user_error_message); - return res.redirect_with_session('./'); + return res.redirect_with_session(redirect_path); }); }); @@ -124,16 +131,29 @@ function render_allowancebytime_as_csv(args) { ); // Compose result CSV header - let content = [['email', 'last name', 'name', 'days deducted from allowance']]; + let content = [ + ['email', 'last name', 'name'] + // Add dynamic list of Leave Types + .concat( + team_view_details.users_and_leaves.length > 0 + ? team_view_details.users_and_leaves[0].statistics.leave_type_break_down.pretty_version.map(it => it.name) + : [] + ) + .concat(['days deducted from allowance']) + ]; // ... and body team_view_details.users_and_leaves.forEach(ul => { - content.push([ - ul.user.email, - ul.user.lastname, - ul.user.name, - ul.statistics.deducted_days - ]); + content.push( + [ + ul.user.email, + ul.user.lastname, + ul.user.name, + ] + // Dynamic part of the column list + .concat( ul.statistics.leave_type_break_down.pretty_version.map(it => it.stat)) + .concat([ul.statistics.deducted_days]) + ); }); return csv.stringifyAsync( content ) diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index e90b819ad..b627e68cc 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -95,12 +95,18 @@ Employee full name + {{# each users_and_leaves.0.statistics.leave_type_break_down.pretty_version}} + {{this.name}} + {{/each}} Days deducted from allowance
      in {{> reports/date_range_pretty same_month=same_month start_date=start_date_obj end_date=end_date_obj}} {{# each users_and_leaves}} {{#with this.user }}{{ this.full_name }}{{/with}} + {{#each statistics.leave_type_break_down.pretty_version }} + {{this.stat}} + {{/each}} {{ statistics.deducted_days }} {{/each}} diff --git a/views/report/index.hbs b/views/report/index.hbs index 714276634..dd94fec26 100644 --- a/views/report/index.hbs +++ b/views/report/index.hbs @@ -7,6 +7,8 @@
      List of available reports
      +{{> show_flash_messages }} +
       
      From 9153734173fcada3c34a4eefaf420a24ec118504 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sun, 28 Jan 2018 07:20:36 +0000 Subject: [PATCH 104/539] Some UI tweaks in new report --- views/report/allowancebytime.hbs | 52 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index b627e68cc..2d423f165 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -18,30 +18,29 @@ Filter
      +
      -
      -
      -
      -
      - - +
      + +
      +
      + +
      -
      -
      -
      -
      +
      +
      @@ -60,23 +59,28 @@ Date range must be within single year
      +
      -
      - - +
      +
      +
      + + +
      +
      -
      +
      Report From efc306b9bf55dfa073b26f763d1efeb4d7cb49aa Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 30 Jan 2018 07:06:44 +0000 Subject: [PATCH 105/539] Distinguish partial leaves in lists --- lib/model/db/leave.js | 20 ++ .../leave_request/rendering_of_halves.js | 209 ++++++++++++++++++ views/partials/leave_dates.hbs | 7 + views/partials/user_requests.hbs | 2 +- views/requests.hbs | 4 +- 5 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 t/integration/leave_request/rendering_of_halves.js create mode 100644 views/partials/leave_dates.hbs diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index b19d4bdf6..ffc44dfcc 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -261,6 +261,26 @@ is_approved_leave : function() { this.status === Leave.status_pended_revoke() ; }, +// Determine if leave starts with half day in the morning +// +does_start_half_morning : function() { + return this.day_part_start === Leave.leave_day_part_morning(); +}, + +does_start_half_afternoon : function() { + return this.day_part_start === Leave.leave_day_part_afternoon(); +}, + +// Determine if leave ends with half a day in the afternoon +// +does_end_half_afternoon : function() { + return this.day_part_end === Leave.leave_day_part_afternoon(); +}, + +does_end_half_morning : function() { + return this.day_part_end === Leave.leave_day_part_morning(); +}, + get_start_leave_day : function(){ return this.get_days()[0]; }, diff --git a/t/integration/leave_request/rendering_of_halves.js b/t/integration/leave_request/rendering_of_halves.js new file mode 100644 index 000000000..fbc36ea88 --- /dev/null +++ b/t/integration/leave_request/rendering_of_halves.js @@ -0,0 +1,209 @@ + +'use strict'; + +var test = require('selenium-webdriver/testing'), + until = require('selenium-webdriver').until, + By = require('selenium-webdriver').By, + expect = require('chai').expect, + _ = require('underscore'), + Promise = require("bluebird"), + moment = require('moment'), + config = require('../../lib/config'), + application_host = config.get_application_host(), + login_user_func = require('../../lib/login_with_user'), + register_new_user_func = require('../../lib/register_new_user'), + logout_user_func = require('../../lib/logout_user'), + open_page_func = require('../../lib/open_page'), + submit_form_func = require('../../lib/submit_form'), + 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() ); + + var non_admin_user_email, new_user_email, driver; + + test.it('Create new company', done => { + register_new_user_func({ + application_host : application_host, + }) + .then(data => { + driver = data.driver; + new_user_email = data.email; + done(); + }); + }); + + it("Create new non-admin user", done => { + add_new_user_func({ + application_host : application_host, + driver : driver, + }) + .then(data =>{ + non_admin_user_email = data.new_user_email; + done(); + }); + }); + + it("Logout from admin acount", done => { + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as non-admin user", done => { + login_user_func({ + application_host : application_host, + user_email : non_admin_user_email, + driver : driver, + }) + .then(() => done()); + }); + + it("Open calendar page", done =>{ + open_page_func({ + url : application_host + 'calendar/?show_full_year=1&year=2015', + driver : driver, + }) + .then(() => done()); + }); + + it("Request new partial leave: morning to afternoon", done => { + driver + .findElement(By.css('#book_time_off_btn')) + .then(el => el.click()) + + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + + // Create new leave request + .then(() => submit_form_func({ + driver : driver, + form_params : [{ + selector : 'select[name="from_date_part"]', + option_selector : 'option[value="2"]', + value : "2", + },{ + selector : 'input#from', + value : '2015-06-16', + },{ + selector : 'select[name="to_date_part"]', + option_selector : 'option[value="3"]', + value : "3", + },{ + selector : 'input#to', + value : '2015-06-17', + }], + message : /New leave request was added/, + }) + ) + .then(() => done()); + }); + + it("Request new partial leave: afternoon to morning", done => { + driver + .findElement(By.css('#book_time_off_btn')) + .then(el => el.click()) + + // This is very important line when working with Bootstrap modals! + .then(() => driver.sleep(1000)) + + // Create new leave request + .then(() => submit_form_func({ + driver : driver, + form_params : [{ + selector : 'select[name="from_date_part"]', + option_selector : 'option[value="3"]', + value : "3", + },{ + selector : 'input#from', + value : '2015-06-23', + },{ + selector : 'select[name="to_date_part"]', + option_selector : 'option[value="2"]', + value : "2", + },{ + selector : 'input#to', + value : '2015-06-24', + }], + message : /New leave request was added/, + }) + ) + .then(() => done()); + }); + + it("Go to my requests page", done => { + open_page_func({ + url : application_host + 'requests/', + driver : driver, + }) + .then(() => done()); + }); + + it("Ensure that both new leave requests are listed and both are marked as partial", done => { + driver + .findElements(By.css('table.user-requests-table td[data-tom-leave-dates="1"]')) + .then(els => { + expect(els.length, 'Ensure two elements with leave dates were found').to.be.equal(2); + return Promise.map(els, (el => el.getText())); + }) + .then(dates_str => { + expect(dates_str.sort(), 'Ensure that date ranges values are as expected') + .to.be.deep.equal([ + '2015-06-16 (morning) 2015-06-17 (afternoon)', + '2015-06-23 (afternoon) 2015-06-24 (morning)' + ]); + done(); + }); + }); + + it("Logout from non-admin acount", done => { + logout_user_func({ + application_host : application_host, + driver : driver, + }) + .then(() => done()); + }); + + it("Login as admin user", done => { + login_user_func({ + application_host : application_host, + user_email : new_user_email, + driver : driver, + }) + .then(() => done()); + }); + + it("Go to my requests page", done => { + open_page_func({ + url : application_host + 'requests/', + driver : driver, + }) + .then(() => done()); + }); + + it("Ensure that both new leave requests are listed for approval and both are marked as partial", done => { + driver + .findElements(By.css('table.requests-to-approve-table td[data-tom-leave-dates="1"]')) + .then(els => { + expect(els.length, 'Ensure two elements with leave dates were found').to.be.equal(2); + return Promise.map(els, (el => el.getText())); + }) + .then(dates_str => { + expect(dates_str.sort(), 'Ensure that date ranges values are as expected') + .to.be.deep.equal([ + '2015-06-16 (morning) 2015-06-17 (afternoon)', + '2015-06-23 (afternoon) 2015-06-24 (morning)' + ]); + done(); + }); + }); + + after(done => { + driver.quit().then(() => done()); + }); + +}); diff --git a/views/partials/leave_dates.hbs b/views/partials/leave_dates.hbs new file mode 100644 index 000000000..b03993a21 --- /dev/null +++ b/views/partials/leave_dates.hbs @@ -0,0 +1,7 @@ +{{#with leave}} + {{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} + {{#if this.does_start_half_morning }} (morning){{else}}{{#if this.does_start_half_afternoon }} (afternoon){{/if}}{{/if}} + + {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} + {{#if this.does_end_half_morning }} (morning){{else}}{{#if this.does_end_half_afternoon }} (afternoon){{/if}}{{/if}} +{{/with}} diff --git a/views/partials/user_requests.hbs b/views/partials/user_requests.hbs index 1b094046a..a1fa94bb7 100644 --- a/views/partials/user_requests.hbs +++ b/views/partials/user_requests.hbs @@ -25,7 +25,7 @@ {{# each leaves }} - {{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}} + {{> leave_dates leave=this}} {{ this.leave_type.name }}{{#if this.is_pended_revoke_leave}}
      (pended revoke){{/if}} {{ this.get_deducted_days_number }} {{#with this.approver}}{{this.full_name}}{{/with}} diff --git a/views/requests.hbs b/views/requests.hbs index 793f4803b..4409c739b 100644 --- a/views/requests.hbs +++ b/views/requests.hbs @@ -18,7 +18,7 @@

      Scroll table horizontally

      - +
      @@ -36,7 +36,7 @@ - + @@ -56,6 +67,7 @@ + {{/each}} diff --git a/views/partials/add_new_department_modal.hbs b/views/partials/add_new_department_modal.hbs index 91abbf79e..fb765b42d 100644 --- a/views/partials/add_new_department_modal.hbs +++ b/views/partials/add_new_department_modal.hbs @@ -29,6 +29,11 @@ +
      +   + +
      +
      + Accrued allowance + + If enabled, holiday allowance starts to build up - or accrue - from the first day of employment. It accrues in proportion to the annual entitlement. E.g. an employee in the ninth month of employment would have built up 9/12ths (or three-quarters) of annual entitlement. +
      From 2f2a8c4eebc1ec94fda974e663eb9b4aa8b2422b Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 16:59:11 +0100 Subject: [PATCH 188/539] Plug accrual allowance --- lib/model/user_allowance.js | 12 +++++++++++- lib/route/users.js | 6 +++--- views/calendar.hbs | 2 +- views/partials/user_details/absences.hbs | 12 ++++++++++-- views/partials/user_details/allowance_breakdown.hbs | 11 +++++++++++ 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/lib/model/user_allowance.js b/lib/model/user_allowance.js index 355516e82..474abb8f7 100644 --- a/lib/model/user_allowance.js +++ b/lib/model/user_allowance.js @@ -113,7 +113,17 @@ class UserAllowance { } get number_of_days_available_in_allowance() { - return this.total_number_of_days_in_allowance - this.number_of_days_taken_from_allowance; + let self = this; + + return ( + self.total_number_of_days_in_allowance + - self.number_of_days_taken_from_allowance + + (self.is_accrued_allowance ? self.accrued_adjustment : 0) + ); + } + + get is_accrued_allowance() { + return !! this.user.department.is_accrued_allowance; } get user() { diff --git a/lib/route/users.js b/lib/route/users.js index 5b2c5cc08..8bac3abe4 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -294,7 +294,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ let allowance_obj = args[0], - remaining_allowance = allowance_obj.number_of_days_available_in_allowance, + remaining_allowance = allowance_obj.total_number_of_days_in_allowance - allowance_obj.number_of_days_taken_from_allowance, employee = args[1], total_days_number = allowance_obj.total_number_of_days_in_allowance, employee_adjustment = args[3], @@ -305,14 +305,14 @@ router.get('/edit/:user_id/absences/', function(req, res){ remaining : remaining_allowance, }; - leave_statistics.used_so_far = leave_statistics.total_for_current_year - leave_statistics.remaining; + leave_statistics.used_so_far = allowance_obj.number_of_days_taken_from_allowance; leave_statistics.used_so_far_percent = leave_statistics.total_for_current_year > 0 ? 100 * leave_statistics.used_so_far / leave_statistics.total_for_current_year : 0; leave_statistics.remaining_percent = leave_statistics.total_for_current_year > 0 - ? 100 * leave_statistics.remaining / leave_statistics.total_for_current_year + ? 100 * (leave_statistics.total_for_current_year - leave_statistics.used_so_far) / leave_statistics.total_for_current_year : 0; return employee diff --git a/views/calendar.hbs b/views/calendar.hbs index 501a0b8eb..0d3eb72e1 100644 --- a/views/calendar.hbs +++ b/views/calendar.hbs @@ -23,7 +23,7 @@
      {{#with current_user }}
      {{ ../user_allowance.number_of_days_available_in_allowance }}
      -
      Days remaining
      +
      Days available
      out of {{ ../user_allowance.total_number_of_days_in_allowance }} in allowance
      {{/with}}
      diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index efffa45b0..6db4afb9d 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -40,11 +40,19 @@
      - -

      {{ leave_statistics.remaining }} out of {{ leave_statistics.total_for_current_year }} in allowance

      + +

      {{ user_allowance.number_of_days_available_in_allowance }} out of {{ user_allowance.total_number_of_days_in_allowance }} in allowance

      +
      + +

      {{# if user_allowance.is_accrued_allowance }}Yes{{else}}No{{/if}}

      + + The way of available allowance calculation is defined on department level. More details + +
      +
      diff --git a/views/partials/user_details/allowance_breakdown.hbs b/views/partials/user_details/allowance_breakdown.hbs index 6d17aaf57..6ebb9ccce 100644 --- a/views/partials/user_details/allowance_breakdown.hbs +++ b/views/partials/user_details/allowance_breakdown.hbs @@ -62,4 +62,15 @@ data-trigger="focus hover" >{{#if_equal user_allowance.number_of_days_taken_from_allowance 0}}{{else}}-{{/if_equal}}{{ user_allowance.number_of_days_taken_from_allowance}} + {{# if user_allowance.is_accrued_allowance }} +
      + Locked so far + {{ user_allowance.accrued_adjustment }} +
      + {{/ if}}
      From 4b476f3dca2bce2c05cd1544e9c1ffb34dd53634 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 17:16:26 +0100 Subject: [PATCH 189/539] Make sure we test the same as what is shown to users --- t/unit/model/user_allowance.js | 4 ++++ views/partials/user_details/absences.hbs | 2 +- views/users.hbs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/t/unit/model/user_allowance.js b/t/unit/model/user_allowance.js index b747cfba3..77e88c2ac 100644 --- a/t/unit/model/user_allowance.js +++ b/t/unit/model/user_allowance.js @@ -283,4 +283,8 @@ describe('accrued_adjustment attribute', function(){ }); }); + // TODO + // 1. Check case when it is 1 Jan and employee started last year + // 2. Check case when it is 31 Jan and employee started last year + }); diff --git a/views/partials/user_details/absences.hbs b/views/partials/user_details/absences.hbs index 6db4afb9d..65d818ab9 100644 --- a/views/partials/user_details/absences.hbs +++ b/views/partials/user_details/absences.hbs @@ -42,7 +42,7 @@

      {{ user_allowance.number_of_days_available_in_allowance }} out of {{ user_allowance.total_number_of_days_in_allowance }} in allowance

      - +
      diff --git a/views/users.hbs b/views/users.hbs index 9dc76c52a..1d8914296 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -50,7 +50,7 @@
      - + From 01df01e203e62ace83250c1e9f8deb69f014ef48 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 17:23:55 +0100 Subject: [PATCH 190/539] Add few more tests --- t/unit/model/user_allowance.js | 101 ++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/t/unit/model/user_allowance.js b/t/unit/model/user_allowance.js index 77e88c2ac..5dea5e534 100644 --- a/t/unit/model/user_allowance.js +++ b/t/unit/model/user_allowance.js @@ -283,8 +283,103 @@ describe('accrued_adjustment attribute', function(){ }); }); - // TODO - // 1. Check case when it is 1 Jan and employee started last year - // 2. Check case when it is 31 Jan and employee started last year + describe('Started last year, today is 1 of January', () => { + let employee = model.User.build({ + start_date : moment('2016-04-01'), + }); + + let ul = new UserAllowance({ + user : employee, + year : moment('2017', 'YYYY'), + now : moment('2017-01-01'), + + number_of_days_taken_from_allowance : 0, + manual_adjustment : 0, + carry_over : 0, + nominal_allowance : 24, + }); + + it('Ensure year total allowance is correct', () => { + expect( ul.total_number_of_days_in_allowance ).to.be.eql( 24 ); + }); + + it('Check accrued_adjustment', () => { + expect( ul.accrued_adjustment ).to.be.eql(-24); + }); + }); + + describe('Started last year, today is 14th of January', () => { + let employee = model.User.build({ + start_date : moment('2016-04-01'), + }); + + let ul = new UserAllowance({ + user : employee, + year : moment('2017', 'YYYY'), + now : moment('2017-01-14'), + + number_of_days_taken_from_allowance : 0, + manual_adjustment : 0, + carry_over : 0, + nominal_allowance : 24 + }); + + it('Ensure year total allowance is correct', () => { + expect( ul.total_number_of_days_in_allowance ).to.be.eql( 24 ); + }); + + it('Check accrued_adjustment', () => { + expect( ul.accrued_adjustment ).to.be.eql(-23); + }); + }); + describe('Started last year, today is 31th of December', () => { + let employee = model.User.build({ + start_date : moment('2016-04-01'), + }); + + let ul = new UserAllowance({ + user : employee, + year : moment('2017', 'YYYY'), + now : moment('2017-12-31'), + + number_of_days_taken_from_allowance : 0, + manual_adjustment : 0, + carry_over : 0, + nominal_allowance : 24 + }); + + it('Ensure year total allowance is correct', () => { + expect( ul.total_number_of_days_in_allowance ).to.be.eql( 24 ); + }); + + it('Check accrued_adjustment', () => { + expect( ul.accrued_adjustment ).to.be.eql(-0); + }); + }); + + describe('Started last year, today is 15th of December', () => { + let employee = model.User.build({ + start_date : moment('2016-04-01'), + }); + + let ul = new UserAllowance({ + user : employee, + year : moment('2017', 'YYYY'), + now : moment('2017-12-15'), + + number_of_days_taken_from_allowance : 0, + manual_adjustment : 0, + carry_over : 0, + nominal_allowance : 24 + }); + + it('Ensure year total allowance is correct', () => { + expect( ul.total_number_of_days_in_allowance ).to.be.eql( 24 ); + }); + + it('Check accrued_adjustment', () => { + expect( ul.accrued_adjustment ).to.be.eql(-1); + }); + }); }); From 79c1eaf8d4842954e4f99c1cd2fb5f8017dba357 Mon Sep 17 00:00:00 2001 From: Markus Malmgren Date: Wed, 2 May 2018 13:51:25 +0200 Subject: [PATCH 191/539] Added LDAP settings to handle unauthorized SSL certificates. --- lib/model/db/company.js | 2 ++ lib/route/settings.js | 20 +++++++++++--------- views/settings_company_authentication.hbs | 11 +++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 8ec25f527..b5076d39e 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -370,6 +370,7 @@ module.exports = function(sequelize, DataTypes) { get_ldap_server : function(){ var config = this.get('ldap_auth_config'); + var tlsOptions = config.allow_unauthorized_cert ? { rejectUnauthorized: false } : {}; // When testing consider using TEST LDAP server // http://www.forumsys.com/en/tutorials/integration-how-to/ldap/online-ldap-test-server/ @@ -380,6 +381,7 @@ module.exports = function(sequelize, DataTypes) { searchBase : config.searchbase, searchFilter : '(mail={{username}})', cache : false, + tlsOptions : tlsOptions }); return ldap; diff --git a/lib/route/settings.js b/lib/route/settings.js index f4874a30c..4ebe48c24 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -698,11 +698,12 @@ function get_and_validate_ldap_auth_configuration(args) { // Get parameters // - var url = validator.trim(req.param('url')), - binddn = validator.trim(req.param('binddn')), - bindcredentials = validator.trim(req.param('bindcredentials')), - searchbase = validator.trim(req.param('searchbase')), - ldap_auth_enabled = validator.toBoolean(req.param('ldap_auth_enabled')), + var url = validator.trim(req.param('url')), + binddn = validator.trim(req.param('binddn')), + bindcredentials = validator.trim(req.param('bindcredentials')), + searchbase = validator.trim(req.param('searchbase')), + ldap_auth_enabled = validator.toBoolean(req.param('ldap_auth_enabled')), + allow_unauthorized_cert = validator.toBoolean(req.param('allow_unauthorized_cert')), // Fetch the password of current user that is valid in LDAP system password_to_check = validator.trim(req.param('password_to_check')); @@ -724,10 +725,11 @@ function get_and_validate_ldap_auth_configuration(args) { // Return the configuration object return { ldap_config : { - url : url, - binddn : binddn, - bindcredentials : bindcredentials, - searchbase : searchbase, + url : url, + binddn : binddn, + bindcredentials : bindcredentials, + searchbase : searchbase, + allow_unauthorized_cert : allow_unauthorized_cert, }, ldap_auth_enabled : ldap_auth_enabled, password_to_check : password_to_check, diff --git a/views/settings_company_authentication.hbs b/views/settings_company_authentication.hbs index 11f9cff3f..f806866b7 100644 --- a/views/settings_company_authentication.hbs +++ b/views/settings_company_authentication.hbs @@ -57,6 +57,17 @@ The URL must contain the protocol and port parts +
      + +
      From 16f52928d3023d344dae110402593db65c302d97 Mon Sep 17 00:00:00 2001 From: Markus Malmgren Date: Fri, 4 May 2018 10:26:00 +0200 Subject: [PATCH 192/539] Improved LDAP error handling, updating ldapauth-fork and adding the event based error handling to catch ldap related errors instead of the server crashing. --- lib/route/settings.js | 29 ++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/route/settings.js b/lib/route/settings.js index 4ebe48c24..be820db5e 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -577,9 +577,32 @@ router.post('/company/authentication/', function(req, res){ company.setDataValue('ldap_auth_enabled', parameters.ldap_auth_enabled); var ldap_server = company.get_ldap_server(); + + // Handle event based errors from ldapauth-fork + var ldapError = ""; + ldap_server.on('error', function(err) { + ldapError = err; + }); + + var auth_func = function(email, password) { + return new Promise(function(resolve, reject) { + // Wait one second before cheking for event based errors + setTimeout(() => { + if (ldapError) { + reject(ldapError); + } + }, 1000); - var auth_func = Promise.promisify(ldap_server.authenticate.bind(ldap_server)); - + ldap_server.authenticate(email, password, function(error, user) { + if (error) { + reject(error); + } else { + resolve(user); + } + }); + }); + }; + return auth_func(req.user.email, parameters.password_to_check) .then(function(){ return company.save(); @@ -608,7 +631,7 @@ router.post('/company/authentication/', function(req, res){ req.session.flash_error( 'Failed to update LDAP configuration. ' + - ( error.show_to_user ? 'Error: '+error : 'Please contact customer service') + ( error.show_to_user ? error : 'Please contact customer service') ); return res.redirect_with_session('/settings/company/authentication/'); diff --git a/package.json b/package.json index b58cde173..3ef3cb30b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "html-to-text": "^3.2.0", "ical-generator": "^0.2.7", "joi": "~12.0.0", - "ldapauth-fork": "^2.5.2", + "ldapauth-fork": "^4.0.2", "moment": "^2.11.2", "moment-timezone": "^0.5.14", "morgan": "^1.3.2", From 4d4c6ef750ab815df717621d25237ae699d58f8f Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 21 May 2018 14:45:48 +0100 Subject: [PATCH 193/539] Remove data migration feature --- lib/model/db/company.js | 284 -------------------------- lib/model/mixin/user/company_aware.js | 29 --- lib/route/login.js | 43 ---- lib/route/settings.js | 20 -- views/general_settings.hbs | 16 -- views/import_company.hbs | 68 ------ views/login.hbs | 2 +- 7 files changed, 1 insertion(+), 461 deletions(-) delete mode 100644 views/import_company.hbs diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 8ec25f527..34af09365 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -231,119 +231,6 @@ module.exports = function(sequelize, DataTypes) { }, - restore_from_dump : function(args){ - - // The dump JSON object that is about to be imported - var dump_json = args.dump_json, - - // Dictionary that holds mapping between promary keys from original system - // and new one - id_maps = { - company : {}, - bank_holiday : {}, - leave_type : {}, - department : {}, - user : {}, - }; - - // Make sure that emails that are about to be migrated do not exist - // withing current database - return sequelize.models.User.findAll({ - where : { - email : { "$in" : _.map(dump_json.users, function(u){ return u.email; }) } - } - }) - .then(function(users){ - if (users.length > 0) { - throw new Error( - 'Users with following emails already exist in the system: ' - + _.map(users, function(u){return u.email}).join(', ') - ); - } - - return sequelize.models.Company.describe() - }) - - // Instert company - .then(function(company_definition){ - - var company_json = _.omit(dump_json, function(value, key, object){ - return ! (company_definition.hasOwnProperty(key) && key !== 'id'); - }); - - return sequelize.models.Company.create(company_json) - .then(function(company){ - id_maps.company[dump_json.id] = company.id; - return Promise.resolve(1); - }); - }) - - // Instert bank holidays and Leave types - // - .then(function(){ - return Promise.join( - promise_to_restore_bank_holidays({ - dump_json : dump_json, - id_maps : id_maps, - model : sequelize.models, - }), - promise_to_restore_leave_types({ - dump_json : dump_json, - id_maps : id_maps, - model : sequelize.models, - }), - function(){return Promise.resolve(1);} - ); - }) - - // Insert departments - // - .then(function(){ - return promise_to_restore_departments({ - dump_json : dump_json, - id_maps : id_maps, - model : sequelize.models, - }); - }) - - // insert users - // - .then(function(){ - return promise_to_restore_users({ - dump_json : dump_json, - id_maps : id_maps, - model : sequelize.models, - }); - }) - - // Update departments with correct user IDs for supervisor - // - .then(function(){ - return Promise.all( - _.map(_.values( id_maps.department ), function(department_id){ - return sequelize.models.Department - .find({ where : {id : department_id} }); - }) - ) - .then(function(departments_to_update){ - return Promise.all( - _.map(departments_to_update, function(department){ - department.bossId = id_maps.user[ department.bossId ]; - return department.save(); - }) - ); - }); - }) - - // insert leaves - .then(function(){ - return promise_to_restore_leaves({ - dump_json : dump_json, - id_maps : id_maps, - model : sequelize.models, - }); - }) - }, // End of restore_from_dump }, instanceMethods : { @@ -465,174 +352,3 @@ module.exports = function(sequelize, DataTypes) { return Company; }; - - -function promise_to_restore_bank_holidays(args){ - var dump_json = args.dump_json, - model = args.model, - id_maps = args.id_maps; - - return model.BankHoliday.describe() - .then(function(bank_holiday_definition){ - // get array of JSON for each bank holiday - var bank_holiday_json = _.map(dump_json.bank_holidays,function(rec){ - var json = _.omit(rec, function(v,k,o){ - return ! bank_holiday_definition.hasOwnProperty(k); - }); - // substitude company IDs with fresh ones - json.companyId = id_maps.company[ json.companyId ]; - return json; - }); - - return Promise.all(_.map(bank_holiday_json, function(json){ - var old_id = json.id; - delete json.id; - - return model.BankHoliday.create(json) - .then(function(bh){ - id_maps.bank_holiday[ old_id ] = bh.id; - return Promise.resolve(1); - }); - })); - }); -}; - - -function promise_to_restore_leave_types(args){ - var dump_json = args.dump_json, - model = args.model, - id_maps = args.id_maps; - - return model.LeaveType.describe() - .then(function(leave_type_definition){ - var leave_type_json = _.map(dump_json.leave_types,function(rec){ - var json = _.omit(rec, function(v,k,o){ - return ! leave_type_definition.hasOwnProperty(k); - }); - // substitude company IDs with fresh ones - json.companyId = id_maps.company[ json.companyId ]; - return json; - }); - - return Promise.all(_.map(leave_type_json, function(json){ - var old_id = json.id; - delete json.id; - - return model.LeaveType.create(json) - .then(function(lt){ - id_maps.leave_type[ old_id ] = lt.id; - return Promise.resolve(1); - }); - })); - - }); -}; - -function promise_to_restore_departments (args){ - var dump_json = args.dump_json, - model = args.model, - id_maps = args.id_maps; - - return model.Department.describe() - .then(function(department_definition){ - var department_json = _.map(dump_json.departments,function(rec){ - var json = _.omit(rec, function(v,k,o){ - return ! department_definition.hasOwnProperty(k); - }); - - // substitude company IDs with fresh ones - json.companyId = id_maps.company[ json.companyId ]; - - return json; - }); - - return Promise.all(_.map(department_json, function(json){ - var old_id = json.id; - delete json.id; - - return model.Department.create(json) - .then(function(d){ - id_maps.department[ old_id ] = d.id; - return Promise.resolve(1); - }); - })); - - }); -}; - -function promise_to_restore_users(args) { - var dump_json = args.dump_json, - model = args.model, - id_maps = args.id_maps; - - return model.User.describe() - .then(function(user_definition){ - var user_json = _.map(dump_json.users, function(rec){ - var json = _.omit(rec, function(v,k,o){ - return ! user_definition.hasOwnProperty(k); - }); - - // substitude company IDs with fresh ones - json.companyId = id_maps.company[ json.companyId ]; - - // replace department ID with fresh one - json.DepartmentId = id_maps.department[ json.DepartmentId ]; - - // replace password hash - json.password = model.User.hashify_password('changeme'); - - return json; - }); - - return Promise.all(_.map(user_json, function(json){ - var old_id = json.id; - delete json.id; - - return model.User.create(json) - .then(function(u){ - id_maps.user[ old_id ] = u.id; - return Promise.resolve(1); - }); - })); - - }); -}; - -function promise_to_restore_leaves(args){ - var dump_json = args.dump_json, - model = args.model, - id_maps = args.id_maps; - - return model.Leave.describe() - .then(function(leave_definition){ - var leave_json = _.map( - _.flatten( - _.map(dump_json.users, function(u){ return u.my_leaves; }), - true - ), - function(rec){ - var json = _.omit(rec, function(v,k,o){ - return ! leave_definition.hasOwnProperty(k); - }); - - // replace approver ID with fresh one - json.approverId = id_maps.user[ json.approverId ]; - - // replace user ID with fresh one - json.userId = id_maps.user[ json.userId ]; - - // replace leave type ID with fresh one - json.leaveTypeId = id_maps.leave_type[ json.leaveTypeId ]; - - return json; - } - ); - - return Promise.all(_.map(leave_json, function(json){ - var old_id = json.id; - delete json.id; - - return model.Leave.create(json); - })); - }); -}; diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index 40d536d77..cd817d788 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -143,33 +143,4 @@ module.exports = function(sequelize){ }); }; - - this.get_company_for_export = function(){ - return this.getCompany({ - include : [{ - model : sequelize.models.LeaveType, - as : 'leave_types', - },{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', - },{ - model : sequelize.models.Department, - as : 'departments', - },{ - model : sequelize.models.User, - as : 'users', - include : [{model: sequelize.models.Leave, as : 'my_leaves'}], - }], - }) - .then(function(company){ - - // Erase password hash record as it is pottencially possible to reverse engineer - // the installatioon 'salt' - company.users.forEach(function(user){ user.password = ''; }); - - return Promise.resolve(company); - }); - }; - - }; diff --git a/lib/route/login.js b/lib/route/login.js index 8b6c7d1a3..1b82072fc 100644 --- a/lib/route/login.js +++ b/lib/route/login.js @@ -317,48 +317,5 @@ module.exports = function(passport) { }); }); - router.post('/import-company/', function(req, res){ - - var form = new formidable.IncomingForm(), - parseAsync = Promise.promisify(form.parse); - - parseAsync.call(form, req) - .then(function(args){ - - var files = args[1]; - - if (files.company_dump.size === 0) { - throw new Error('No dump file to restore from was provided'); - } - - return fs.readFileAsync(files.company_dump.path, "utf8"); - }) - .then(function(dump_json){ - - return Promise.resolve(JSON.parse(dump_json)); - }) - .then(function(raw_company_obj){ - - return req.app.get('db_model').Company.restore_from_dump({ - dump_json : raw_company_obj, - }); - }) - .then(function(company){ - req.session.flash_message('Company '+ company.name +' was restored'); - res.redirect_with_session('/import-company/'); - }) - .catch(function(error){ - req.session.flash_error('Failed to import company, due to error: '+error); - res.redirect_with_session('/import-company/'); - }); - - }); - - router.get('/import-company/', function(req, res){ - res.render('import_company', { - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), - }); - }); - return router; }; diff --git a/lib/route/settings.js b/lib/route/settings.js index f4874a30c..100e0a4d0 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -527,26 +527,6 @@ router.post('/leavetypes/delete/:leave_type_id/', function(req, res){ }); }); -/* - * Export all data related to current user's Company, - * the output data structure is suitable to for feeding - * into company restore action. - * - * */ -router.post('/company/export/', function(req, res){ - - req.user - .get_company_for_export() - .then(function(company){ - - res.attachment( - company.name_for_machine()+'_'+moment.utc().format('YYYYMMDD-hhmmss')+'.json' - ); - - res.send(JSON.stringify(company)); - }); -}); - router.get('/company/authentication/', function(req, res){ req.user diff --git a/views/general_settings.hbs b/views/general_settings.hbs index f42478f94..e0d8967ff 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -84,22 +84,6 @@
      - -
      - -
      - -
      -
      -
      -
      - Download company dump file that could be used to restore account on another TimeOff.Management installation. -
      -
      - - - -
       
      diff --git a/views/import_company.hbs b/views/import_company.hbs deleted file mode 100644 index 54fbe3e47..000000000 --- a/views/import_company.hbs +++ /dev/null @@ -1,68 +0,0 @@ - - -{{> header }} - -

      Restore company

      - -{{> show_flash_messages }} - -
       
      - -
      -
      -

      - TimeOff.Management allows data migration between different installations. -

      - -

      - Upload company dump file using form below to migrate data into current installation of TimeOff.Management. -

      - -

      - Please take into consideration: - -

      - -
      Change of user's passwords
      -
      TimeOff.Management does not store user's passwords in any form, it is impossible for us to save and restore them through data migration process.
      -
      After company account is migrated to new TimeOff.Management installation all user accounts will have passwords to be changeme
      -
       
      - -
      User emails have to be unique
      -
      User emails from company that is about to be imported should be unique and there should not be any other companies withing current TimeOff.Management installation that contain any of those email addresses.
      -
      For example if you are about to restore a company Test Ltd that have john@test.com as an employee, but current installation has another company Another Test Ltd where there is an employee with same email address, the import would fail.
      -
      - -

      - - - In order to obtain company dump file, please login as an administrator user and go to Settings &nbgt; General page and press button next to "Export company data". - - -
      -
      - -
       
      - -
      - -
      - - -
      - -
      - -
      -
      - -
      -
      - - -
      - -
      - -{{> footer }} diff --git a/views/login.hbs b/views/login.hbs index 35bc9330c..cee66ae79 100644 --- a/views/login.hbs +++ b/views/login.hbs @@ -28,7 +28,7 @@
      -

      Forgot password?{{#if allow_create_new_accounts }} | Register new company{{/if}} | Restore

      +

      Forgot password?{{#if allow_create_new_accounts }} | Register new company{{/if}}

      From 246036e933181b43ef5fade111e59c5236f89741 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Mon, 21 May 2018 16:48:39 +0100 Subject: [PATCH 194/539] Expose bank holiday name to UI --- lib/model/calendar_month.js | 26 +++++++++++++++++++++----- lib/model/db/department.js | 9 +++------ lib/model/mixin/user/absence_aware.js | 7 ++----- t/unit/calendar.js | 2 +- views/partials/calendar_cell.hbs | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 57ae4e587..3485cfc38 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -28,8 +28,11 @@ function CalendarMonth(day, args){ if (args && args.bank_holidays){ var map = {}; args.bank_holidays.forEach(function(day){ - day = moment.utc(day); - map[day.format(self.default_date_format())] = day; + day = { + date : moment.utc(day.date), + name : day.name, + }; + map[day.date.clone().format(self.default_date_format())] = day; }); self._bank_holidays = map; } @@ -77,11 +80,23 @@ function CalendarMonth(day, args){ }; CalendarMonth.prototype.is_bank_holiday = function(day) { - return this._bank_holidays && this._bank_holidays[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; + return this._bank_holidays && this._bank_holidays.hasOwnProperty( + this.get_base_date().date(day).format(this.default_date_format()) + ); }; +CalendarMonth.prototype.get_bank_holiday_name = function(day) { + const self = this; + + if ( ! self.is_bank_holiday(day) ) { + return null; + } + + return this._bank_holidays[ + this.get_base_date().date(day).format(this.default_date_format()) + ].name; +} + CalendarMonth.prototype.is_leave = function(day) { var leave_day = this._leaves[ this.get_base_date().date(day).format(this.default_date_format()) @@ -223,6 +238,7 @@ CalendarMonth.prototype.as_for_template = function(){ day.is_weekend = true; } else if ( self.is_bank_holiday(i) ){ day.is_bank_holiday = true; + day.bank_holiday_name = self.get_bank_holiday_name(i) || 'N/A'; } else { if ( self.is_leave_morning(i) ) { day.is_leave_morning = true; diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 16a55e2af..290442e2c 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -226,12 +226,9 @@ module.exports = function(sequelize, DataTypes) { moment.utc(start_date).clone().add(i, 'months'), { bank_holidays : - self.include_public_holidays - ? _.map( - company.bank_holidays, - function(day){return day.date} - ) - : [], + self.include_public_holidays + ? company.bank_holidays + : [], leave_days : user_data.leave_days, schedule : user_data.schedule, today : company.get_today(), diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 2b9ff3a28..cac460fc3 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -102,11 +102,8 @@ module.exports = function(sequelize){ { bank_holidays : department.include_public_holidays - ? _.map( - company.bank_holidays, - function(day){return day.date} - ) - : [], + ? company.bank_holidays + : [], leave_days : leave_days, schedule : schedule, today : company.get_today(), diff --git a/t/unit/calendar.js b/t/unit/calendar.js index f53ea8b3b..b2c375a4a 100644 --- a/t/unit/calendar.js +++ b/t/unit/calendar.js @@ -86,7 +86,7 @@ describe('Check calendar month object', function(){ }); it('It knows whether day is bank holiday', function(){ - var mar = new CalendarMonth('2015-03-19', { bank_holidays : ['2015-03-08'], schedule : schedule, today : moment.utc() }); + var mar = new CalendarMonth('2015-03-19', { bank_holidays : [{date : '2015-03-08'}], schedule : schedule, today : moment.utc() }); expect(mar.is_bank_holiday(8)).to.be.ok; expect(mar.is_bank_holiday(10)).not.to.be.ok; diff --git a/views/partials/calendar_cell.hbs b/views/partials/calendar_cell.hbs index 172cfffe3..8f1f32832 100644 --- a/views/partials/calendar_cell.hbs +++ b/views/partials/calendar_cell.hbs @@ -40,7 +40,7 @@ {{#if day.is_bank_holiday}} data-toggle="tooltip" data-placement="top" - title="Bank holiday" + title="Bank holiday: {{day.bank_holiday_name}}" {{/if}} >{{day.val}} From 003d8b2254f6bef39ff6ac139a7c6f04fa690325 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 23 May 2018 12:51:20 +0100 Subject: [PATCH 195/539] Simple .csv file as backup. --- lib/model/company_exporter/company_summary.js | 65 ++++++++++++++++++ lib/model/company_exporter/index.js | 66 +++++++++++++++++++ lib/model/db/user.js | 17 +++++ lib/model/user_importer.js | 10 +-- lib/route/settings.js | 42 ++++++++++++ 5 files changed, 195 insertions(+), 5 deletions(-) create mode 100644 lib/model/company_exporter/company_summary.js create mode 100644 lib/model/company_exporter/index.js diff --git a/lib/model/company_exporter/company_summary.js b/lib/model/company_exporter/company_summary.js new file mode 100644 index 000000000..9cca6cd80 --- /dev/null +++ b/lib/model/company_exporter/company_summary.js @@ -0,0 +1,65 @@ + +'use strict'; + +const + Promise = require('bluebird'), + CSV = Promise.promisifyAll(require('csv')), + moment = require('moment'), + Joi = require('joi'); + +const + schema_constructor = Joi.object().required().keys({ + company : Joi.object().required(), + users : Joi.array().required(), + }); + +class CompanySummary { + constructor(args) { + args = Joi.attempt( + args, + schema_constructor, + "Failed to in stantiate companySummary due to validation" + ); + + this._company = args.company; + this._users = args.users; + } + + get company() { return this._company } + get users() { return this._users } + + as_csv_data() { + let + self = this, + results = [], + date_format = self.company.get_default_date_format(); + + // Put headers + results.push(['department', 'lastname', 'name', 'email', 'start_date', 'end_date']); + + self.users.forEach(u => u.my_leaves.forEach(l => { + results.push( [ + u.DepartmentId, + u.lastname, + u.name, + u.email, + moment(l.date_start).format(date_format), + moment(l.date_end).format(date_format) + ]) + })); + + + return results; + } + + promise_as_csv_string() { + const self = this; + + return Promise + .resolve( self.as_csv_data() ) + .then( data => CSV.stringifyAsync( data ) ) + } + +} + +module.exports = CompanySummary; diff --git a/lib/model/company_exporter/index.js b/lib/model/company_exporter/index.js new file mode 100644 index 000000000..894ab91af --- /dev/null +++ b/lib/model/company_exporter/index.js @@ -0,0 +1,66 @@ + +'use strict'; + +const + Joi = require('joi'), + Promise = require('bluebird'), + CompanySummary = require('./company_summary'); + +const + constructor_schema = Joi.object().required() + .keys({ + dbSchema : Joi.object().required(), + }), + schemaPromiseCompanySummary = Joi.object().required() + .keys({ + company : Joi.object().required(), + }); + +class CompanyExporter { + constructor(args) { + args = Joi.attempt( + args, + constructor_schema, + "Faled to instantiate new companyExporter due to arguments validation" + ); + + this._db_model = args.dbSchema; + } + + get dbModel() { + return this._db_model; + } + + promiseCompanySummary(args) { + args = Joi.attempt( + args, + schemaPromiseCompanySummary, + "Failed to get company summary die to validation errors" + ); + + let + self = this, + company = args.company; + + return Promise + .join( + self.dbModel.Company + .scope('with_simple_departments') + .findOne({ + where : { id : company.id }, + }), + self.dbModel.User + .scope('with_simple_leaves') + .findAll({ + where : { companyId : company.id } + }), + (company, users) => Promise.resolve( new CompanySummary({ + company : company, + users : users, + })) + ); + } + +} + +module.exports = CompanyExporter; diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 4edb575cc..cbbf66422 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -572,6 +572,7 @@ function withAssociations() { function withScopes() { this.loadScope = function(models) { + models.User.addScope( 'active', function () { @@ -579,5 +580,21 @@ function withScopes() { } ); + models.User.addScope( + 'with_simple_leaves', + () => ({ + include : [{ + model : models.Leave, + as : 'my_leaves', + where : { + $and : [ + { status : { $ne : models.Leave.status_rejected() } }, + { status : { $ne : models.Leave.status_canceled() } }, + ], + }, + }], + }) + ); + }; } diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js index 10b526046..78a24e618 100644 --- a/lib/model/user_importer.js +++ b/lib/model/user_importer.js @@ -2,12 +2,12 @@ "use strict"; const - Joi = require('joi'), + Joi = require('joi'), uuid = require('node-uuid'), - Promise = require('bluebird'), - _ = require('underscore'), - Exception = require('../error'), - Models = require('./db'); + Promise = require('bluebird'), + _ = require('underscore'), + Exception = require('../error'), + Models = require('./db'); const add_user_interface_schema = Joi.object().required().keys({ email : Joi.string().email(), diff --git a/lib/route/settings.js b/lib/route/settings.js index 2d58ebd76..bd4875acc 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -15,6 +15,9 @@ const Exception = require('../error'), _ = require('underscore'); +const + CompanyExporter = require('../model/company_exporter'); + // Make sure that current user is authorized to deal with settings router.all(/.*/, require('../middleware/ensure_user_is_admin')); @@ -739,4 +742,43 @@ function get_and_validate_ldap_auth_configuration(args) { }; } +router.get('/company/backup/', (req, res) => { + const companyExporter = new CompanyExporter({ + dbSchema : req.app.get('db_model'), + }); + + let company; + + req.user + .getCompany() + .then(c => Promise.resolve(company = c)) + + // Generate company summary + .then(company => companyExporter.promiseCompanySummary({ company : company })) + + // Get CSV presentation of company summary + .then(companySummary => companySummary.promise_as_csv_string()) + + .then(csv_content => { + + res.attachment( + company.name_for_machine()+'_backup.csv' + ); + + res.send(csv_content); + }) + .catch(function(error){ + console.error( + "An error occured while downloading company summary: %s, at %s", error, error.stack + ); + + req.session.flash_error( + "Failed to download company summary. " + + ( error.show_to_user ? error : 'Please contact customer service') + ); + + return res.redirect_with_session('/settings/general/'); + }); +}); + module.exports = router; From 0cd4afd6490cebd3b277f6cb0d2ae482167a2674 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 23 May 2018 13:06:49 +0100 Subject: [PATCH 196/539] Group users per department --- lib/model/company_exporter/company_summary.js | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/model/company_exporter/company_summary.js b/lib/model/company_exporter/company_summary.js index 9cca6cd80..8df1e51c5 100644 --- a/lib/model/company_exporter/company_summary.js +++ b/lib/model/company_exporter/company_summary.js @@ -30,23 +30,33 @@ class CompanySummary { as_csv_data() { let - self = this, - results = [], - date_format = self.company.get_default_date_format(); + self = this, + results = [], + date_format = self.company.get_default_date_format(), + departmentsMap = {}; + + self.company.departments.forEach(d => departmentsMap[d.id] = d); // Put headers results.push(['department', 'lastname', 'name', 'email', 'start_date', 'end_date']); - self.users.forEach(u => u.my_leaves.forEach(l => { - results.push( [ - u.DepartmentId, - u.lastname, - u.name, - u.email, - moment(l.date_start).format(date_format), - moment(l.date_end).format(date_format) - ]) - })); + self.users + // Sort users by departments + .sort( + (a,b) => departmentsMap[ a.DepartmentId ].name + .localeCompare( departmentsMap[ b.DepartmentId ].name ) + ) + // Get a row per every leave + .forEach(u => u.my_leaves.forEach(l => { + results.push([ + departmentsMap[ u.DepartmentId ].name, + u.lastname, + u.name, + u.email, + moment(l.date_start).format(date_format), + moment(l.date_end).format(date_format) + ]) + })); return results; From b766ab954084fccde30731eb99211182b33a0983 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 24 May 2018 10:39:21 +0100 Subject: [PATCH 197/539] Add UI to trigger leave data download --- views/general_settings.hbs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/views/general_settings.hbs b/views/general_settings.hbs index e0d8967ff..19a6554c6 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -85,6 +85,20 @@
      +
      +
      + +
      + Employees and Leaves data +
      +
      +
      +
      + Download list of employees with their leave requests ever. The file is in .CSV format which is compatible with MS Excel. +
      +
      +
      +
      @@ -107,7 +121,6 @@
      -
      From f241b7e4e602f81c968407389c10186a70efdf15 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Thu, 24 May 2018 11:28:07 +0100 Subject: [PATCH 198/539] Expose all necessary data into .csv --- lib/model/company_exporter/company_summary.js | 46 +++++++++++++++---- lib/model/company_exporter/index.js | 2 +- views/general_settings.hbs | 2 +- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/lib/model/company_exporter/company_summary.js b/lib/model/company_exporter/company_summary.js index 8df1e51c5..e78d740db 100644 --- a/lib/model/company_exporter/company_summary.js +++ b/lib/model/company_exporter/company_summary.js @@ -33,32 +33,62 @@ class CompanySummary { self = this, results = [], date_format = self.company.get_default_date_format(), - departmentsMap = {}; + departmentsMap = {}, + leaveTypesMap = {}; + // Fill departments map self.company.departments.forEach(d => departmentsMap[d.id] = d); + // Fill leave types map + self.company.leave_types.forEach( lt => leaveTypesMap[ lt.id ] = lt ); + // Put headers - results.push(['department', 'lastname', 'name', 'email', 'start_date', 'end_date']); + results.push([ + 'Ddepartment', 'Lastname', 'Name', 'Email address', + 'Type of absence', 'Started at', 'Date type', 'Ended at', 'Date type' + ]); self.users - // Sort users by departments + // Sort users by departments and by last names .sort( - (a,b) => departmentsMap[ a.DepartmentId ].name - .localeCompare( departmentsMap[ b.DepartmentId ].name ) + (a,b) => ( + // primary criteria is department name + departmentsMap[ a.DepartmentId ].name + .localeCompare( departmentsMap[ b.DepartmentId ].name ) + || + // secondary criteria is employee's lastname + a.lastname.localeCompare( b.lastname ) + ) ) // Get a row per every leave .forEach(u => u.my_leaves.forEach(l => { + + const + start_date = moment(l.date_start).format(date_format), + end_date = moment(l.date_end).format(date_format); + results.push([ departmentsMap[ u.DepartmentId ].name, u.lastname, u.name, u.email, - moment(l.date_start).format(date_format), - moment(l.date_end).format(date_format) + leaveTypesMap[ l.leaveTypeId ].name, + start_date, + ( + l.does_start_half_morning() ? 'morning' + : l.does_start_half_afternoon() ? 'afternoon' + : 'whole day' + ), + end_date, + ( + start_date === end_date ? 'N/A' + : l.does_end_half_morning() ? 'morning' + : l.does_end_half_afternoon() ? 'afternoon' + : 'whole day' + ), ]) })); - return results; } diff --git a/lib/model/company_exporter/index.js b/lib/model/company_exporter/index.js index 894ab91af..5b6b1b6d3 100644 --- a/lib/model/company_exporter/index.js +++ b/lib/model/company_exporter/index.js @@ -45,7 +45,7 @@ class CompanyExporter { return Promise .join( self.dbModel.Company - .scope('with_simple_departments') + .scope('with_simple_departments', 'with_leave_types') .findOne({ where : { id : company.id }, }), diff --git a/views/general_settings.hbs b/views/general_settings.hbs index 19a6554c6..c38d5d0c4 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -94,7 +94,7 @@
      - Download list of employees with their leave requests ever. The file is in .CSV format which is compatible with MS Excel. + Download list of employees with their leave requests ever. The file is in .CSV format which is compatible with MS Excel.
      From a48eceb45ca7c824601741417bd1408a1636331e Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 25 May 2018 09:29:37 +0100 Subject: [PATCH 199/539] Better naming for files --- lib/model/{company_exporter => company/exporter}/index.js | 6 +++--- .../company_summary.js => company/exporter/summary.js} | 0 lib/route/settings.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename lib/model/{company_exporter => company/exporter}/index.js (91%) rename lib/model/{company_exporter/company_summary.js => company/exporter/summary.js} (100%) diff --git a/lib/model/company_exporter/index.js b/lib/model/company/exporter/index.js similarity index 91% rename from lib/model/company_exporter/index.js rename to lib/model/company/exporter/index.js index 5b6b1b6d3..d8c10a7c2 100644 --- a/lib/model/company_exporter/index.js +++ b/lib/model/company/exporter/index.js @@ -2,9 +2,9 @@ 'use strict'; const - Joi = require('joi'), - Promise = require('bluebird'), - CompanySummary = require('./company_summary'); + Joi = require('joi'), + Promise = require('bluebird'), + CompanySummary = require('./summary'); const constructor_schema = Joi.object().required() diff --git a/lib/model/company_exporter/company_summary.js b/lib/model/company/exporter/summary.js similarity index 100% rename from lib/model/company_exporter/company_summary.js rename to lib/model/company/exporter/summary.js diff --git a/lib/route/settings.js b/lib/route/settings.js index bd4875acc..d3a380a64 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -16,7 +16,7 @@ const _ = require('underscore'); const - CompanyExporter = require('../model/company_exporter'); + CompanyExporter = require('../model/company/exporter'); // Make sure that current user is authorized to deal with settings router.all(/.*/, require('../middleware/ensure_user_is_admin')); From 7de81b4bea6dda7c2365766e874db2b834d4329c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 26 May 2018 09:38:58 +0100 Subject: [PATCH 200/539] Change UI of company backup --- views/general_settings.hbs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/general_settings.hbs b/views/general_settings.hbs index c38d5d0c4..c08595253 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -88,15 +88,17 @@
      -
      - Employees and Leaves data -
      Download list of employees with their leave requests ever. The file is in .CSV format which is compatible with MS Excel.
      +
      +
      + Download backup +
      +
      From 2147e692ab3fb987a5753aa65886cd7e74c3677c Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sun, 3 Jun 2018 08:27:01 +0100 Subject: [PATCH 201/539] Allow users to delete company account --- lib/model/company/remover.js | 79 +++++++++++++++++++ lib/route/settings.js | 32 ++++++++ views/general_settings.hbs | 41 ++++++++++ views/partials/add_new_bank_holiday_modal.hbs | 1 - views/partials/remove_company_modal.hbs | 25 ++++++ 5 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 lib/model/company/remover.js create mode 100644 views/partials/remove_company_modal.hbs diff --git a/lib/model/company/remover.js b/lib/model/company/remover.js new file mode 100644 index 000000000..045595c5e --- /dev/null +++ b/lib/model/company/remover.js @@ -0,0 +1,79 @@ + +"use strict"; + +const + Joi = require('joi'), + Promise = require('bluebird'), + Exception = require('../../error'), + Models = require('../db'); + +const + schemaPromiseToRemove = Joi.object().required().keys({ + company : Joi.object().required(), //.type(Models.Company.constructor), + byUser : Joi.object().required(), //.type(Models.User.constructor), + confirmName : Joi.string().required().trim(), + }); + + +class CompanyRemover { + + static promiseToRemove(args){ + + args = Joi.attempt( + args, + schemaPromiseToRemove, + "Param validation failed for promiseToRemove" + ); + + const + company = args.company, + byUser = args.byUser, + confirmName = args.confirmName; + + // Ensure that confirm name is correct + let normalizedNames = [company.name, confirmName] + .map(s => s.trim()) + .map(s => s.replace(/\s+/g, '')) + .map(s => s.toUpperCase()); + + if (normalizedNames[0] !== normalizedNames[1]) { + Exception.throw_user_error({ + system_error : `Confirmed name does not match one on company record: ${ normalizedNames.join(', ') }`, + user_error : `Provided name confirmation does not match company one`, + }); + } + + return Models.User + + // Ensure user belongs to current combany and is admin + .count({ + where : { + id : byUser.id, + companyId : company.id, + admin : true, + } + }) + .then(count => { + if ( count === 0) { + Exception.throw_user_error({ + system_error : `An attempt to remove company [${company.id}] by unrelated user [${byUser.id }]`, + user_error : `User does not have permissions to remove company`, + }); + } + return Promise.resolve(1); + }) + + // Remove company record and all related records + // (we do not really remove all data, just the sensitive information) + // .. delete email audit + .then(() => Models.EmailAudit.destroy({ where : { company_id : company.id } })) + // Remove all leaves for related users + .then(() => company.getUsers().map(u => Models.Leave.destroy({ where : { userId : u.id }}))) + // Remove all users + .then(() => Models.User.destroy({where : {companyId : company.id} })) + // Remove company record + .then(() => company.destroy()); + } +} + +module.exports = CompanyRemover; diff --git a/lib/route/settings.js b/lib/route/settings.js index d3a380a64..0dc89dae5 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -13,6 +13,7 @@ const moment_tz = require('moment-timezone'), config = require('../config'), Exception = require('../error'), + CompanyRemover = require('../model/company/remover'), _ = require('underscore'); const @@ -781,4 +782,35 @@ router.get('/company/backup/', (req, res) => { }); }); +router.post('/company/delete/', (req, res) => { + + let company; + + req.user + .getCompany() + .then(c => Promise.resolve(company = c)) + .then(company => CompanyRemover.promiseToRemove({ + company : company, + byUser : req.user, + confirmName : req.body.confirm_name, + })) + .then(() => { + req.session.flash_message(`Company ${company.name} and related data were successfully removed`); + + return res.redirect_with_session('/'); + }) + .catch(error => { + + console.log( + `Failed to remove ${company.id} by user ${req.user.id}. Reason: ${ Exception.extract_system_error_message(error) }, at ${error.stack}` + ); + + req.session.flash_error( + `Failed to remove company. Reason: ${ Exception.extract_user_error_message(error) }` + ); + + return res.redirect_with_session('/settings/general/'); + }); +}); + module.exports = router; diff --git a/views/general_settings.hbs b/views/general_settings.hbs index c08595253..96190f0bf 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -288,6 +288,42 @@ + +
      +
      +
      +
      + Danger zone +
      +
      + +
      + +
      +
      + +
      +
      +
      +

      Completely erase data associated with {{company.name}}'s account.

      +

      This is irreversible action.

      +

      It is strongly recommended to download employees leave data first.

      +
      +
      + +
      +
      +
      + +
      + + +
      +
      +
      +
      + + {{> add_new_bank_holiday_modal container_id='add_new_bank_holiday_modal' form_action='/settings/bankholidays/' @@ -299,4 +335,9 @@ form_action='/settings/leavetypes/' }} +{{> remove_company_modal + container_id='remove_company_modal' + +}} + {{> footer }} diff --git a/views/partials/add_new_bank_holiday_modal.hbs b/views/partials/add_new_bank_holiday_modal.hbs index f9f0b506d..7769b36f9 100644 --- a/views/partials/add_new_bank_holiday_modal.hbs +++ b/views/partials/add_new_bank_holiday_modal.hbs @@ -1,5 +1,4 @@ -       '; - if (this.o.calendarWeeks){ - this.picker.find('.datepicker-days .datepicker-switch') - .attr('colspan', function(i, val){ - return parseInt(val) + 1; - }); - html += ''; - } - while (dowCnt < this.o.weekStart + 7){ - html += ''; - } - html += ''; - this.picker.find('.datepicker-days thead').append(html); - }, - - fillMonths: function(){ - var html = '', - i = 0; - while (i < 12){ - html += ''+dates[this.o.language].monthsShort[i++]+''; - } - this.picker.find('.datepicker-months td').html(html); - }, - - setRange: function(range){ - if (!range || !range.length) - delete this.range; - else - this.range = $.map(range, function(d){ - return d.valueOf(); - }); - this.fill(); - }, - - getClassNames: function(date){ - var cls = [], - year = this.viewDate.getUTCFullYear(), - month = this.viewDate.getUTCMonth(), - today = new Date(); - if (date.getUTCFullYear() < year || (date.getUTCFullYear() === year && date.getUTCMonth() < month)){ - cls.push('old'); - } - else if (date.getUTCFullYear() > year || (date.getUTCFullYear() === year && date.getUTCMonth() > month)){ - cls.push('new'); - } - if (this.focusDate && date.valueOf() === this.focusDate.valueOf()) - cls.push('focused'); - // Compare internal UTC date with local today, not UTC today - if (this.o.todayHighlight && - date.getUTCFullYear() === today.getFullYear() && - date.getUTCMonth() === today.getMonth() && - date.getUTCDate() === today.getDate()){ - cls.push('today'); - } - if (this.dates.contains(date) !== -1) - cls.push('active'); - if (!this.dateWithinRange(date) || this.dateIsDisabled(date)){ - cls.push('disabled'); - } - if ($.inArray(date.getUTCDay(), this.o.daysOfWeekHighlighted) !== -1){ - cls.push('highlighted'); - } - - if (this.range){ - if (date > this.range[0] && date < this.range[this.range.length-1]){ - cls.push('range'); - } - if ($.inArray(date.valueOf(), this.range) !== -1){ - cls.push('selected'); - } - if (date.valueOf() === this.range[0]){ - cls.push('range-start'); + ] + ]; + } + this._events.push( + // Component: listen for blur on element descendants + [ + this.element, + "*", + { + blur: $.proxy(function(e) { + this._focused_from = e.target; + }, this) + } + ], + // Input: listen for blur on element + [ + this.element, + { + blur: $.proxy(function(e) { + this._focused_from = e.target; + }, this) + } + ] + ); + + if (this.o.immediateUpdates) { + // Trigger input updates immediately on changed year/month + this._events.push([ + this.element, + { + "changeYear changeMonth": $.proxy(function(e) { + this.update(e.date); + }, this) + } + ]); + } + + this._secondaryEvents = [ + [ + this.picker, + { + click: $.proxy(this.click, this) + } + ], + [ + $(window), + { + resize: $.proxy(this.place, this) + } + ], + [ + $(document), + { + mousedown: $.proxy(function(e) { + // Clicked outside the datepicker, hide it + if ( + !( + this.element.is(e.target) || + this.element.find(e.target).length || + this.picker.is(e.target) || + this.picker.find(e.target).length || + this.picker.hasClass("datepicker-inline") + ) + ) { + this.hide(); + } + }, this) + } + ] + ]; + }, + _attachEvents: function() { + this._detachEvents(); + this._applyEvents(this._events); + }, + _detachEvents: function() { + this._unapplyEvents(this._events); + }, + _attachSecondaryEvents: function() { + this._detachSecondaryEvents(); + this._applyEvents(this._secondaryEvents); + }, + _detachSecondaryEvents: function() { + this._unapplyEvents(this._secondaryEvents); + }, + _trigger: function(event, altdate) { + var date = altdate || this.dates.get(-1), + local_date = this._utc_to_local(date); + + this.element.trigger({ + type: event, + date: local_date, + dates: $.map(this.dates, this._utc_to_local), + format: $.proxy(function(ix, format) { + if (arguments.length === 0) { + ix = this.dates.length - 1; + format = this.o.format; + } else if (typeof ix === "string") { + format = ix; + ix = this.dates.length - 1; + } + format = format || this.o.format; + var date = this.dates.get(ix); + return DPGlobal.formatDate(date, format, this.o.language); + }, this) + }); + }, + + show: function() { + var element = this.component ? this.element.find("input") : this.element; + if (element.attr("readonly") && this.o.enableOnReadonly === false) return; + if (!this.isInline) this.picker.appendTo(this.o.container); + this.place(); + this.picker.show(); + this._attachSecondaryEvents(); + this._trigger("show"); + if ( + (window.navigator.msMaxTouchPoints || "ontouchstart" in document) && + this.o.disableTouchKeyboard + ) { + $(this.element).blur(); + } + return this; + }, + + hide: function() { + if (this.isInline) return this; + if (!this.picker.is(":visible")) return this; + this.focusDate = null; + this.picker.hide().detach(); + this._detachSecondaryEvents(); + this.viewMode = this.o.startView; + this.showMode(); + + if ( + this.o.forceParse && + ((this.isInput && this.element.val()) || + (this.hasInput && this.element.find("input").val())) + ) + this.setValue(); + this._trigger("hide"); + return this; + }, + + remove: function() { + this.hide(); + this._detachEvents(); + this._detachSecondaryEvents(); + this.picker.remove(); + delete this.element.data().datepicker; + if (!this.isInput) { + delete this.element.data().date; + } + return this; + }, + + paste: function(evt) { + var dateString; + if ( + evt.originalEvent.clipboardData && + evt.originalEvent.clipboardData.types && + $.inArray("text/plain", evt.originalEvent.clipboardData.types) !== -1 + ) { + dateString = evt.originalEvent.clipboardData.getData("text/plain"); + } else if (window.clipboardData) { + dateString = window.clipboardData.getData("Text"); + } else { + return; + } + this.setDate(dateString); + this.update(); + evt.preventDefault(); + }, + + _utc_to_local: function(utc) { + return utc && new Date(utc.getTime() + utc.getTimezoneOffset() * 60000); + }, + _local_to_utc: function(local) { + return ( + local && new Date(local.getTime() - local.getTimezoneOffset() * 60000) + ); + }, + _zero_time: function(local) { + return ( + local && + new Date(local.getFullYear(), local.getMonth(), local.getDate()) + ); + }, + _zero_utc_time: function(utc) { + return ( + utc && + new Date( + Date.UTC(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate()) + ) + ); + }, + + getDates: function() { + return $.map(this.dates, this._utc_to_local); + }, + + getUTCDates: function() { + return $.map(this.dates, function(d) { + return new Date(d); + }); + }, + + getDate: function() { + return this._utc_to_local(this.getUTCDate()); + }, + + getUTCDate: function() { + var selected_date = this.dates.get(-1); + if (typeof selected_date !== "undefined") { + return new Date(selected_date); + } else { + return null; + } + }, + + clearDates: function() { + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find("input"); + } + + if (element) { + element.val(""); + } + + this.update(); + this._trigger("changeDate"); + + if (this.o.autoclose) { + this.hide(); + } + }, + setDates: function() { + var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + this.update.apply(this, args); + this._trigger("changeDate"); + this.setValue(); + return this; + }, + + setUTCDates: function() { + var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + this.update.apply(this, $.map(args, this._utc_to_local)); + this._trigger("changeDate"); + this.setValue(); + return this; + }, + + setDate: alias("setDates"), + setUTCDate: alias("setUTCDates"), + + setValue: function() { + var formatted = this.getFormattedDate(); + if (!this.isInput) { + if (this.component) { + this.element.find("input").val(formatted); + } + } else { + this.element.val(formatted); + } + return this; + }, + + getFormattedDate: function(format) { + if (format === undefined) format = this.o.format; + + var lang = this.o.language; + return $.map(this.dates, function(d) { + return DPGlobal.formatDate(d, format, lang); + }).join(this.o.multidateSeparator); + }, + + setStartDate: function(startDate) { + this._process_options({ startDate: startDate }); + this.update(); + this.updateNavArrows(); + return this; + }, + + setEndDate: function(endDate) { + this._process_options({ endDate: endDate }); + this.update(); + this.updateNavArrows(); + return this; + }, + + setDaysOfWeekDisabled: function(daysOfWeekDisabled) { + this._process_options({ daysOfWeekDisabled: daysOfWeekDisabled }); + this.update(); + this.updateNavArrows(); + return this; + }, + + setDaysOfWeekHighlighted: function(daysOfWeekHighlighted) { + this._process_options({ daysOfWeekHighlighted: daysOfWeekHighlighted }); + this.update(); + return this; + }, + + setDatesDisabled: function(datesDisabled) { + this._process_options({ datesDisabled: datesDisabled }); + this.update(); + this.updateNavArrows(); + }, + + place: function() { + if (this.isInline) return this; + var calendarWidth = this.picker.outerWidth(), + calendarHeight = this.picker.outerHeight(), + visualPadding = 10, + container = $(this.o.container), + windowWidth = container.width(), + scrollTop = + this.o.container === "body" + ? $(document).scrollTop() + : container.scrollTop(), + appendOffset = container.offset(); + + var parentsZindex = []; + this.element.parents().each(function() { + var itemZIndex = $(this).css("z-index"); + if (itemZIndex !== "auto" && itemZIndex !== 0) + parentsZindex.push(parseInt(itemZIndex)); + }); + var zIndex = Math.max.apply(Math, parentsZindex) + this.o.zIndexOffset; + var offset = this.component + ? this.component.parent().offset() + : this.element.offset(); + var height = this.component + ? this.component.outerHeight(true) + : this.element.outerHeight(false); + var width = this.component + ? this.component.outerWidth(true) + : this.element.outerWidth(false); + var left = offset.left - appendOffset.left, + top = offset.top - appendOffset.top; + + if (this.o.container !== "body") { + top += scrollTop; + } + + this.picker.removeClass( + "datepicker-orient-top datepicker-orient-bottom " + + "datepicker-orient-right datepicker-orient-left" + ); + + if (this.o.orientation.x !== "auto") { + this.picker.addClass("datepicker-orient-" + this.o.orientation.x); + if (this.o.orientation.x === "right") left -= calendarWidth - width; + } + // auto x orientation is best-placement: if it crosses a window + // edge, fudge it sideways + else { + if (offset.left < 0) { + // component is outside the window on the left side. Move it into visible range + this.picker.addClass("datepicker-orient-left"); + left -= offset.left - visualPadding; + } else if (left + calendarWidth > windowWidth) { + // the calendar passes the widow right edge. Align it to component right side + this.picker.addClass("datepicker-orient-right"); + left += width - calendarWidth; + } else { + // Default to left + this.picker.addClass("datepicker-orient-left"); + } + } + + // auto y orientation is best-situation: top or bottom, no fudging, + // decision based on which shows more of the calendar + var yorient = this.o.orientation.y, + top_overflow; + if (yorient === "auto") { + top_overflow = -scrollTop + top - calendarHeight; + yorient = top_overflow < 0 ? "bottom" : "top"; + } + + this.picker.addClass("datepicker-orient-" + yorient); + if (yorient === "top") + top -= calendarHeight + parseInt(this.picker.css("padding-top")); + else top += height; + + if (this.o.rtl) { + var right = windowWidth - (left + width); + this.picker.css({ + top: top, + right: right, + zIndex: zIndex + }); + } else { + this.picker.css({ + top: top, + left: left, + zIndex: zIndex + }); + } + return this; + }, + + _allow_update: true, + update: function() { + if (!this._allow_update) return this; + + var oldDates = this.dates.copy(), + dates = [], + fromArgs = false; + if (arguments.length) { + $.each( + arguments, + $.proxy(function(i, date) { + if (date instanceof Date) date = this._local_to_utc(date); + dates.push(date); + }, this) + ); + fromArgs = true; + } else { + dates = this.isInput + ? this.element.val() + : this.element.data("date") || this.element.find("input").val(); + if (dates && this.o.multidate) + dates = dates.split(this.o.multidateSeparator); + else dates = [dates]; + delete this.element.data().date; + } + + dates = $.map( + dates, + $.proxy(function(date) { + return DPGlobal.parseDate(date, this.o.format, this.o.language); + }, this) + ); + dates = $.grep( + dates, + $.proxy(function(date) { + return !this.dateWithinRange(date) || !date; + }, this), + true + ); + this.dates.replace(dates); + + if (this.dates.length) this.viewDate = new Date(this.dates.get(-1)); + else if (this.viewDate < this.o.startDate) + this.viewDate = new Date(this.o.startDate); + else if (this.viewDate > this.o.endDate) + this.viewDate = new Date(this.o.endDate); + else this.viewDate = this.o.defaultViewDate; + + if (fromArgs) { + // setting date by clicking + this.setValue(); + } else if (dates.length) { + // setting date by typing + if (String(oldDates) !== String(this.dates)) + this._trigger("changeDate"); + } + if (!this.dates.length && oldDates.length) this._trigger("clearDate"); + + this.fill(); + this.element.change(); + return this; + }, + + fillDow: function() { + var dowCnt = this.o.weekStart, + html = ""; + if (this.o.calendarWeeks) { + this.picker + .find(".datepicker-days .datepicker-switch") + .attr("colspan", function(i, val) { + return parseInt(val) + 1; + }); + html += ''; + } + while (dowCnt < this.o.weekStart + 7) { + html += + '"; + } + html += ""; + this.picker.find(".datepicker-days thead").append(html); + }, + + fillMonths: function() { + var html = "", + i = 0; + while (i < 12) { + html += + '' + + dates[this.o.language].monthsShort[i++] + + ""; + } + this.picker.find(".datepicker-months td").html(html); + }, + + setRange: function(range) { + if (!range || !range.length) delete this.range; + else + this.range = $.map(range, function(d) { + return d.valueOf(); + }); + this.fill(); + }, + + getClassNames: function(date) { + var cls = [], + year = this.viewDate.getUTCFullYear(), + month = this.viewDate.getUTCMonth(), + today = new Date(); + if ( + date.getUTCFullYear() < year || + (date.getUTCFullYear() === year && date.getUTCMonth() < month) + ) { + cls.push("old"); + } else if ( + date.getUTCFullYear() > year || + (date.getUTCFullYear() === year && date.getUTCMonth() > month) + ) { + cls.push("new"); + } + if (this.focusDate && date.valueOf() === this.focusDate.valueOf()) + cls.push("focused"); + // Compare internal UTC date with local today, not UTC today + if ( + this.o.todayHighlight && + date.getUTCFullYear() === today.getFullYear() && + date.getUTCMonth() === today.getMonth() && + date.getUTCDate() === today.getDate() + ) { + cls.push("today"); + } + if (this.dates.contains(date) !== -1) cls.push("active"); + if (!this.dateWithinRange(date) || this.dateIsDisabled(date)) { + cls.push("disabled"); + } + if ($.inArray(date.getUTCDay(), this.o.daysOfWeekHighlighted) !== -1) { + cls.push("highlighted"); + } + + if (this.range) { + if (date > this.range[0] && date < this.range[this.range.length - 1]) { + cls.push("range"); + } + if ($.inArray(date.valueOf(), this.range) !== -1) { + cls.push("selected"); + } + if (date.valueOf() === this.range[0]) { + cls.push("range-start"); } - if (date.valueOf() === this.range[this.range.length-1]){ - cls.push('range-end'); + if (date.valueOf() === this.range[this.range.length - 1]) { + cls.push("range-end"); } - } - return cls; - }, - - fill: function(){ - var d = new Date(this.viewDate), - year = d.getUTCFullYear(), - month = d.getUTCMonth(), - startYear = this.o.startDate !== -Infinity ? this.o.startDate.getUTCFullYear() : -Infinity, - startMonth = this.o.startDate !== -Infinity ? this.o.startDate.getUTCMonth() : -Infinity, - endYear = this.o.endDate !== Infinity ? this.o.endDate.getUTCFullYear() : Infinity, - endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity, - todaytxt = dates[this.o.language].today || dates['en'].today || '', - cleartxt = dates[this.o.language].clear || dates['en'].clear || '', - titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat, - tooltip; - if (isNaN(year) || isNaN(month)) - return; - this.picker.find('.datepicker-days thead .datepicker-switch') - .text(DPGlobal.formatDate(new UTCDate(year, month), titleFormat, this.o.language)); - this.picker.find('tfoot .today') - .text(todaytxt) - .toggle(this.o.todayBtn !== false); - this.picker.find('tfoot .clear') - .text(cleartxt) - .toggle(this.o.clearBtn !== false); - this.picker.find('thead .datepicker-title') - .text(this.o.title) - .toggle(this.o.title !== ''); - this.updateNavArrows(); - this.fillMonths(); - var prevMonth = UTCDate(year, month-1, 28), - day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth()); - prevMonth.setUTCDate(day); - prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.o.weekStart + 7)%7); - var nextMonth = new Date(prevMonth); - if (prevMonth.getUTCFullYear() < 100){ + } + return cls; + }, + + fill: function() { + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(), + startYear = + this.o.startDate !== -Infinity + ? this.o.startDate.getUTCFullYear() + : -Infinity, + startMonth = + this.o.startDate !== -Infinity + ? this.o.startDate.getUTCMonth() + : -Infinity, + endYear = + this.o.endDate !== Infinity + ? this.o.endDate.getUTCFullYear() + : Infinity, + endMonth = + this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity, + todaytxt = dates[this.o.language].today || dates["en"].today || "", + cleartxt = dates[this.o.language].clear || dates["en"].clear || "", + titleFormat = + dates[this.o.language].titleFormat || dates["en"].titleFormat, + tooltip; + if (isNaN(year) || isNaN(month)) return; + this.picker + .find(".datepicker-days thead .datepicker-switch") + .text( + DPGlobal.formatDate( + new UTCDate(year, month), + titleFormat, + this.o.language + ) + ); + this.picker + .find("tfoot .today") + .text(todaytxt) + .toggle(this.o.todayBtn !== false); + this.picker + .find("tfoot .clear") + .text(cleartxt) + .toggle(this.o.clearBtn !== false); + this.picker + .find("thead .datepicker-title") + .text(this.o.title) + .toggle(this.o.title !== ""); + this.updateNavArrows(); + this.fillMonths(); + var prevMonth = UTCDate(year, month - 1, 28), + day = DPGlobal.getDaysInMonth( + prevMonth.getUTCFullYear(), + prevMonth.getUTCMonth() + ); + prevMonth.setUTCDate(day); + prevMonth.setUTCDate( + day - ((prevMonth.getUTCDay() - this.o.weekStart + 7) % 7) + ); + var nextMonth = new Date(prevMonth); + if (prevMonth.getUTCFullYear() < 100) { nextMonth.setUTCFullYear(prevMonth.getUTCFullYear()); } - nextMonth.setUTCDate(nextMonth.getUTCDate() + 42); - nextMonth = nextMonth.valueOf(); - var html = []; - var clsName; - while (prevMonth.valueOf() < nextMonth){ - if (prevMonth.getUTCDay() === this.o.weekStart){ - html.push(''); - if (this.o.calendarWeeks){ - // ISO 8601: First week contains first thursday. - // ISO also states week starts on Monday, but we can be more abstract here. - var - // Start of current week: based on weekstart/current date - ws = new Date(+prevMonth + (this.o.weekStart - prevMonth.getUTCDay() - 7) % 7 * 864e5), - // Thursday of this week - th = new Date(Number(ws) + (7 + 4 - ws.getUTCDay()) % 7 * 864e5), - // First Thursday of year, year from thursday - yth = new Date(Number(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay())%7*864e5), - // Calendar week: ms between thursdays, div ms per day, div 7 days - calWeek = (th - yth) / 864e5 / 7 + 1; - html.push(''); - - } - } - clsName = this.getClassNames(prevMonth); - clsName.push('day'); - - if (this.o.beforeShowDay !== $.noop){ - var before = this.o.beforeShowDay(this._utc_to_local(prevMonth)); - if (before === undefined) - before = {}; - else if (typeof(before) === 'boolean') - before = {enabled: before}; - else if (typeof(before) === 'string') - before = {classes: before}; - if (before.enabled === false) - clsName.push('disabled'); - if (before.classes) - clsName = clsName.concat(before.classes.split(/\s+/)); - if (before.tooltip) - tooltip = before.tooltip; - } - - clsName = $.unique(clsName); - html.push(''); - tooltip = null; - if (prevMonth.getUTCDay() === this.o.weekEnd){ - html.push(''); - } - prevMonth.setUTCDate(prevMonth.getUTCDate()+1); - } - this.picker.find('.datepicker-days tbody').empty().append(html.join('')); - - var monthsTitle = dates[this.o.language].monthsTitle || dates['en'].monthsTitle || 'Months'; - var months = this.picker.find('.datepicker-months') - .find('.datepicker-switch') - .text(this.o.maxViewMode < 2 ? monthsTitle : year) - .end() - .find('span').removeClass('active'); - - $.each(this.dates, function(i, d){ - if (d.getUTCFullYear() === year) - months.eq(d.getUTCMonth()).addClass('active'); - }); - - if (year < startYear || year > endYear){ - months.addClass('disabled'); - } - if (year === startYear){ - months.slice(0, startMonth).addClass('disabled'); - } - if (year === endYear){ - months.slice(endMonth+1).addClass('disabled'); - } - - if (this.o.beforeShowMonth !== $.noop){ - var that = this; - $.each(months, function(i, month){ - if (!$(month).hasClass('disabled')) { - var moDate = new Date(year, i, 1); - var before = that.o.beforeShowMonth(moDate); - if (before === false) - $(month).addClass('disabled'); - } - }); - } - - html = ''; - year = parseInt(year/10, 10) * 10; - var yearCont = this.picker.find('.datepicker-years') - .find('.datepicker-switch') - .text(year + '-' + (year + 9)) - .end() - .find('td'); - year -= 1; - var years = $.map(this.dates, function(d){ - return d.getUTCFullYear(); - }), - classes; - for (var i = -1; i < 11; i++){ - classes = ['year']; - tooltip = null; - - if (i === -1) - classes.push('old'); - else if (i === 10) - classes.push('new'); - if ($.inArray(year, years) !== -1) - classes.push('active'); - if (year < startYear || year > endYear) - classes.push('disabled'); - - if (this.o.beforeShowYear !== $.noop) { - var yrBefore = this.o.beforeShowYear(new Date(year, 0, 1)); - if (yrBefore === undefined) - yrBefore = {}; - else if (typeof(yrBefore) === 'boolean') - yrBefore = {enabled: yrBefore}; - else if (typeof(yrBefore) === 'string') - yrBefore = {classes: yrBefore}; - if (yrBefore.enabled === false) - classes.push('disabled'); - if (yrBefore.classes) - classes = classes.concat(yrBefore.classes.split(/\s+/)); - if (yrBefore.tooltip) - tooltip = yrBefore.tooltip; - } - - html += '' + year + ''; - year += 1; - } - yearCont.html(html); - }, - - updateNavArrows: function(){ - if (!this._allow_update) - return; - - var d = new Date(this.viewDate), - year = d.getUTCFullYear(), - month = d.getUTCMonth(); - switch (this.viewMode){ - case 0: - if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear() && month <= this.o.startDate.getUTCMonth()){ - this.picker.find('.prev').css({visibility: 'hidden'}); - } - else { - this.picker.find('.prev').css({visibility: 'visible'}); - } - if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear() && month >= this.o.endDate.getUTCMonth()){ - this.picker.find('.next').css({visibility: 'hidden'}); - } - else { - this.picker.find('.next').css({visibility: 'visible'}); - } - break; - case 1: - case 2: - if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear() || this.o.maxViewMode < 2){ - this.picker.find('.prev').css({visibility: 'hidden'}); - } - else { - this.picker.find('.prev').css({visibility: 'visible'}); - } - if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear() || this.o.maxViewMode < 2){ - this.picker.find('.next').css({visibility: 'hidden'}); - } - else { - this.picker.find('.next').css({visibility: 'visible'}); - } - break; - } - }, - - click: function(e){ - e.preventDefault(); - e.stopPropagation(); - var target = $(e.target).closest('span, td, th'), - year, month, day; - if (target.length === 1){ - switch (target[0].nodeName.toLowerCase()){ - case 'th': - switch (target[0].className){ - case 'datepicker-switch': - this.showMode(1); - break; - case 'prev': - case 'next': - var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1); - switch (this.viewMode){ - case 0: - this.viewDate = this.moveMonth(this.viewDate, dir); - this._trigger('changeMonth', this.viewDate); - break; - case 1: - case 2: - this.viewDate = this.moveYear(this.viewDate, dir); - if (this.viewMode === 1) - this._trigger('changeYear', this.viewDate); - break; - } - this.fill(); - break; - case 'today': - this.showMode(-2); - var which = this.o.todayBtn === 'linked' ? null : 'view'; - this._setDate(UTCToday(), which); - break; - case 'clear': - this.clearDates(); - break; - } - break; - case 'span': - if (!target.hasClass('disabled')){ - this.viewDate.setUTCDate(1); - if (target.hasClass('month')){ - day = 1; - month = target.parent().find('span').index(target); - year = this.viewDate.getUTCFullYear(); - this.viewDate.setUTCMonth(month); - this._trigger('changeMonth', this.viewDate); - if (this.o.minViewMode === 1){ - this._setDate(UTCDate(year, month, day)); - this.showMode(); - } else { - this.showMode(-1); - } - } - else { - day = 1; - month = 0; - year = parseInt(target.text(), 10)||0; - this.viewDate.setUTCFullYear(year); - this._trigger('changeYear', this.viewDate); - if (this.o.minViewMode === 2){ - this._setDate(UTCDate(year, month, day)); - } - this.showMode(-1); - } - this.fill(); - } - break; - case 'td': - if (target.hasClass('day') && !target.hasClass('disabled')){ - day = parseInt(target.text(), 10)||1; - year = this.viewDate.getUTCFullYear(); - month = this.viewDate.getUTCMonth(); - if (target.hasClass('old')){ - if (month === 0){ - month = 11; - year -= 1; - } - else { - month -= 1; - } - } - else if (target.hasClass('new')){ - if (month === 11){ - month = 0; - year += 1; - } - else { - month += 1; - } - } - this._setDate(UTCDate(year, month, day)); - } - break; - } - } - if (this.picker.is(':visible') && this._focused_from){ - $(this._focused_from).focus(); - } - delete this._focused_from; - }, - - _toggle_multidate: function(date){ - var ix = this.dates.contains(date); - if (!date){ - this.dates.clear(); - } - - if (ix !== -1){ - if (this.o.multidate === true || this.o.multidate > 1 || this.o.toggleActive){ - this.dates.remove(ix); - } - } else if (this.o.multidate === false) { - this.dates.clear(); - this.dates.push(date); - } - else { - this.dates.push(date); - } - - if (typeof this.o.multidate === 'number') - while (this.dates.length > this.o.multidate) - this.dates.remove(0); - }, - - _setDate: function(date, which){ - if (!which || which === 'date') - this._toggle_multidate(date && new Date(date)); - if (!which || which === 'view') - this.viewDate = date && new Date(date); - - this.fill(); - this.setValue(); - if (!which || which !== 'view') { - this._trigger('changeDate'); - } - var element; - if (this.isInput){ - element = this.element; - } - else if (this.component){ - element = this.element.find('input'); - } - if (element){ - element.change(); - } - if (this.o.autoclose && (!which || which === 'date')){ - this.hide(); - } - }, - - moveDay: function(date, dir){ - var newDate = new Date(date); - newDate.setUTCDate(date.getUTCDate() + dir); - - return newDate; - }, - - moveWeek: function(date, dir){ - return this.moveDay(date, dir * 7); - }, - - moveMonth: function(date, dir){ - if (!isValidDate(date)) - return this.o.defaultViewDate; - if (!dir) - return date; - var new_date = new Date(date.valueOf()), - day = new_date.getUTCDate(), - month = new_date.getUTCMonth(), - mag = Math.abs(dir), - new_month, test; - dir = dir > 0 ? 1 : -1; - if (mag === 1){ - test = dir === -1 - // If going back one month, make sure month is not current month - // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02) - ? function(){ - return new_date.getUTCMonth() === month; - } - // If going forward one month, make sure month is as expected - // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02) - : function(){ - return new_date.getUTCMonth() !== new_month; - }; - new_month = month + dir; - new_date.setUTCMonth(new_month); - // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11 - if (new_month < 0 || new_month > 11) - new_month = (new_month + 12) % 12; - } - else { - // For magnitudes >1, move one month at a time... - for (var i=0; i < mag; i++) - // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)... - new_date = this.moveMonth(new_date, dir); - // ...then reset the day, keeping it in the new month - new_month = new_date.getUTCMonth(); - new_date.setUTCDate(day); - test = function(){ - return new_month !== new_date.getUTCMonth(); - }; - } - // Common date-resetting loop -- if date is beyond end of month, make it - // end of month - while (test()){ - new_date.setUTCDate(--day); - new_date.setUTCMonth(new_month); - } - return new_date; - }, - - moveYear: function(date, dir){ - return this.moveMonth(date, dir*12); - }, - - moveAvailableDate: function(date, dir, fn){ - do { - date = this[fn](date, dir); - - if (!this.dateWithinRange(date)) - return false; - - fn = 'moveDay'; - } - while (this.dateIsDisabled(date)); - - return date; - }, - - weekOfDateIsDisabled: function(date){ - return $.inArray(date.getUTCDay(), this.o.daysOfWeekDisabled) !== -1; - }, - - dateIsDisabled: function(date){ - return ( - this.weekOfDateIsDisabled(date) || - $.grep(this.o.datesDisabled, function(d){ - return isUTCEquals(date, d); - }).length > 0 - ); - }, - - dateWithinRange: function(date){ - return date >= this.o.startDate && date <= this.o.endDate; - }, - - keydown: function(e){ - if (!this.picker.is(':visible')){ - if (e.keyCode === 40 || e.keyCode === 27) { // allow down to re-show picker - this.show(); - e.stopPropagation(); + nextMonth.setUTCDate(nextMonth.getUTCDate() + 42); + nextMonth = nextMonth.valueOf(); + var html = []; + var clsName; + while (prevMonth.valueOf() < nextMonth) { + if (prevMonth.getUTCDay() === this.o.weekStart) { + html.push(""); + if (this.o.calendarWeeks) { + // ISO 8601: First week contains first thursday. + // ISO also states week starts on Monday, but we can be more abstract here. + var // Start of current week: based on weekstart/current date + ws = new Date( + +prevMonth + + ((this.o.weekStart - prevMonth.getUTCDay() - 7) % 7) * 864e5 + ), + // Thursday of this week + th = new Date( + Number(ws) + ((7 + 4 - ws.getUTCDay()) % 7) * 864e5 + ), + // First Thursday of year, year from thursday + yth = new Date( + Number((yth = UTCDate(th.getUTCFullYear(), 0, 1))) + + ((7 + 4 - yth.getUTCDay()) % 7) * 864e5 + ), + // Calendar week: ms between thursdays, div ms per day, div 7 days + calWeek = (th - yth) / 864e5 / 7 + 1; + html.push('"); + } + } + clsName = this.getClassNames(prevMonth); + clsName.push("day"); + + if (this.o.beforeShowDay !== $.noop) { + var before = this.o.beforeShowDay(this._utc_to_local(prevMonth)); + if (before === undefined) before = {}; + else if (typeof before === "boolean") before = { enabled: before }; + else if (typeof before === "string") before = { classes: before }; + if (before.enabled === false) clsName.push("disabled"); + if (before.classes) + clsName = clsName.concat(before.classes.split(/\s+/)); + if (before.tooltip) tooltip = before.tooltip; + } + + clsName = $.unique(clsName); + html.push( + '" + ); + tooltip = null; + if (prevMonth.getUTCDay() === this.o.weekEnd) { + html.push(""); + } + prevMonth.setUTCDate(prevMonth.getUTCDate() + 1); + } + this.picker + .find(".datepicker-days tbody") + .empty() + .append(html.join("")); + + var monthsTitle = + dates[this.o.language].monthsTitle || + dates["en"].monthsTitle || + "Months"; + var months = this.picker + .find(".datepicker-months") + .find(".datepicker-switch") + .text(this.o.maxViewMode < 2 ? monthsTitle : year) + .end() + .find("span") + .removeClass("active"); + + $.each(this.dates, function(i, d) { + if (d.getUTCFullYear() === year) + months.eq(d.getUTCMonth()).addClass("active"); + }); + + if (year < startYear || year > endYear) { + months.addClass("disabled"); + } + if (year === startYear) { + months.slice(0, startMonth).addClass("disabled"); + } + if (year === endYear) { + months.slice(endMonth + 1).addClass("disabled"); + } + + if (this.o.beforeShowMonth !== $.noop) { + var that = this; + $.each(months, function(i, month) { + if (!$(month).hasClass("disabled")) { + var moDate = new Date(year, i, 1); + var before = that.o.beforeShowMonth(moDate); + if (before === false) $(month).addClass("disabled"); + } + }); + } + + html = ""; + year = parseInt(year / 10, 10) * 10; + var yearCont = this.picker + .find(".datepicker-years") + .find(".datepicker-switch") + .text(year + "-" + (year + 9)) + .end() + .find("td"); + year -= 1; + var years = $.map(this.dates, function(d) { + return d.getUTCFullYear(); + }), + classes; + for (var i = -1; i < 11; i++) { + classes = ["year"]; + tooltip = null; + + if (i === -1) classes.push("old"); + else if (i === 10) classes.push("new"); + if ($.inArray(year, years) !== -1) classes.push("active"); + if (year < startYear || year > endYear) classes.push("disabled"); + + if (this.o.beforeShowYear !== $.noop) { + var yrBefore = this.o.beforeShowYear(new Date(year, 0, 1)); + if (yrBefore === undefined) yrBefore = {}; + else if (typeof yrBefore === "boolean") + yrBefore = { enabled: yrBefore }; + else if (typeof yrBefore === "string") + yrBefore = { classes: yrBefore }; + if (yrBefore.enabled === false) classes.push("disabled"); + if (yrBefore.classes) + classes = classes.concat(yrBefore.classes.split(/\s+/)); + if (yrBefore.tooltip) tooltip = yrBefore.tooltip; + } + + html += + '" + + year + + ""; + year += 1; + } + yearCont.html(html); + }, + + updateNavArrows: function() { + if (!this._allow_update) return; + + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(); + switch (this.viewMode) { + case 0: + if ( + this.o.startDate !== -Infinity && + year <= this.o.startDate.getUTCFullYear() && + month <= this.o.startDate.getUTCMonth() + ) { + this.picker.find(".prev").css({ visibility: "hidden" }); + } else { + this.picker.find(".prev").css({ visibility: "visible" }); + } + if ( + this.o.endDate !== Infinity && + year >= this.o.endDate.getUTCFullYear() && + month >= this.o.endDate.getUTCMonth() + ) { + this.picker.find(".next").css({ visibility: "hidden" }); + } else { + this.picker.find(".next").css({ visibility: "visible" }); + } + break; + case 1: + case 2: + if ( + (this.o.startDate !== -Infinity && + year <= this.o.startDate.getUTCFullYear()) || + this.o.maxViewMode < 2 + ) { + this.picker.find(".prev").css({ visibility: "hidden" }); + } else { + this.picker.find(".prev").css({ visibility: "visible" }); + } + if ( + (this.o.endDate !== Infinity && + year >= this.o.endDate.getUTCFullYear()) || + this.o.maxViewMode < 2 + ) { + this.picker.find(".next").css({ visibility: "hidden" }); + } else { + this.picker.find(".next").css({ visibility: "visible" }); + } + break; + } + }, + + click: function(e) { + e.preventDefault(); + e.stopPropagation(); + var target = $(e.target).closest("span, td, th"), + year, + month, + day; + if (target.length === 1) { + switch (target[0].nodeName.toLowerCase()) { + case "th": + switch (target[0].className) { + case "datepicker-switch": + this.showMode(1); + break; + case "prev": + case "next": + var dir = + DPGlobal.modes[this.viewMode].navStep * + (target[0].className === "prev" ? -1 : 1); + switch (this.viewMode) { + case 0: + this.viewDate = this.moveMonth(this.viewDate, dir); + this._trigger("changeMonth", this.viewDate); + break; + case 1: + case 2: + this.viewDate = this.moveYear(this.viewDate, dir); + if (this.viewMode === 1) + this._trigger("changeYear", this.viewDate); + break; + } + this.fill(); + break; + case "today": + this.showMode(-2); + var which = this.o.todayBtn === "linked" ? null : "view"; + this._setDate(UTCToday(), which); + break; + case "clear": + this.clearDates(); + break; + } + break; + case "span": + if (!target.hasClass("disabled")) { + this.viewDate.setUTCDate(1); + if (target.hasClass("month")) { + day = 1; + month = target + .parent() + .find("span") + .index(target); + year = this.viewDate.getUTCFullYear(); + this.viewDate.setUTCMonth(month); + this._trigger("changeMonth", this.viewDate); + if (this.o.minViewMode === 1) { + this._setDate(UTCDate(year, month, day)); + this.showMode(); + } else { + this.showMode(-1); + } + } else { + day = 1; + month = 0; + year = parseInt(target.text(), 10) || 0; + this.viewDate.setUTCFullYear(year); + this._trigger("changeYear", this.viewDate); + if (this.o.minViewMode === 2) { + this._setDate(UTCDate(year, month, day)); + } + this.showMode(-1); + } + this.fill(); + } + break; + case "td": + if (target.hasClass("day") && !target.hasClass("disabled")) { + day = parseInt(target.text(), 10) || 1; + year = this.viewDate.getUTCFullYear(); + month = this.viewDate.getUTCMonth(); + if (target.hasClass("old")) { + if (month === 0) { + month = 11; + year -= 1; + } else { + month -= 1; + } + } else if (target.hasClass("new")) { + if (month === 11) { + month = 0; + year += 1; + } else { + month += 1; + } + } + this._setDate(UTCDate(year, month, day)); + } + break; + } + } + if (this.picker.is(":visible") && this._focused_from) { + $(this._focused_from).focus(); + } + delete this._focused_from; + }, + + _toggle_multidate: function(date) { + var ix = this.dates.contains(date); + if (!date) { + this.dates.clear(); + } + + if (ix !== -1) { + if ( + this.o.multidate === true || + this.o.multidate > 1 || + this.o.toggleActive + ) { + this.dates.remove(ix); } - return; - } - var dateChanged = false, - dir, newViewDate, - focusDate = this.focusDate || this.viewDate; - switch (e.keyCode){ - case 27: // escape - if (this.focusDate){ - this.focusDate = null; - this.viewDate = this.dates.get(-1) || this.viewDate; - this.fill(); - } - else - this.hide(); - e.preventDefault(); - e.stopPropagation(); - break; - case 37: // left - case 38: // up - case 39: // right - case 40: // down - if (!this.o.keyboardNavigation || this.o.daysOfWeekDisabled.length === 7) - break; - dir = e.keyCode === 37 || e.keyCode === 38 ? -1 : 1; - if (e.ctrlKey){ - newViewDate = this.moveAvailableDate(focusDate, dir, 'moveYear'); - - if (newViewDate) - this._trigger('changeYear', this.viewDate); - } - else if (e.shiftKey){ - newViewDate = this.moveAvailableDate(focusDate, dir, 'moveMonth'); - - if (newViewDate) - this._trigger('changeMonth', this.viewDate); - } - else if (e.keyCode === 37 || e.keyCode === 39){ - newViewDate = this.moveAvailableDate(focusDate, dir, 'moveDay'); - } - else if (!this.weekOfDateIsDisabled(focusDate)){ - newViewDate = this.moveAvailableDate(focusDate, dir, 'moveWeek'); - } - if (newViewDate){ - this.focusDate = this.viewDate = newViewDate; - this.setValue(); - this.fill(); - e.preventDefault(); - } - break; - case 13: // enter - if (!this.o.forceParse) - break; - focusDate = this.focusDate || this.dates.get(-1) || this.viewDate; - if (this.o.keyboardNavigation) { - this._toggle_multidate(focusDate); - dateChanged = true; - } - this.focusDate = null; - this.viewDate = this.dates.get(-1) || this.viewDate; - this.setValue(); - this.fill(); - if (this.picker.is(':visible')){ - e.preventDefault(); - e.stopPropagation(); - if (this.o.autoclose) - this.hide(); - } - break; - case 9: // tab - this.focusDate = null; - this.viewDate = this.dates.get(-1) || this.viewDate; - this.fill(); - this.hide(); - break; - } - if (dateChanged){ - if (this.dates.length) - this._trigger('changeDate'); - else - this._trigger('clearDate'); - var element; - if (this.isInput){ - element = this.element; - } - else if (this.component){ - element = this.element.find('input'); - } - if (element){ - element.change(); - } - } - }, - - showMode: function(dir){ - if (dir){ - this.viewMode = Math.max(this.o.minViewMode, Math.min(this.o.maxViewMode, this.viewMode + dir)); - } - this.picker - .children('div') - .hide() - .filter('.datepicker-' + DPGlobal.modes[this.viewMode].clsName) - .show(); - this.updateNavArrows(); - } - }; - - var DateRangePicker = function(element, options){ - $(element).data('datepicker', this); - this.element = $(element); - this.inputs = $.map(options.inputs, function(i){ - return i.jquery ? i[0] : i; - }); - delete options.inputs; - - datepickerPlugin.call($(this.inputs), options) - .on('changeDate', $.proxy(this.dateUpdated, this)); - - this.pickers = $.map(this.inputs, function(i){ - return $(i).data('datepicker'); - }); - this.updateDates(); - }; - DateRangePicker.prototype = { - updateDates: function(){ - this.dates = $.map(this.pickers, function(i){ - return i.getUTCDate(); - }); - this.updateRanges(); - }, - updateRanges: function(){ - var range = $.map(this.dates, function(d){ - return d.valueOf(); - }); - $.each(this.pickers, function(i, p){ - p.setRange(range); - }); - }, - dateUpdated: function(e){ - // `this.updating` is a workaround for preventing infinite recursion - // between `changeDate` triggering and `setUTCDate` calling. Until - // there is a better mechanism. - if (this.updating) - return; - this.updating = true; - - var dp = $(e.target).data('datepicker'); - - if (typeof(dp) === "undefined") { - return; - } - - var new_date = dp.getUTCDate(), - i = $.inArray(e.target, this.inputs), - j = i - 1, - k = i + 1, - l = this.inputs.length; - if (i === -1) - return; - - $.each(this.pickers, function(i, p){ - if (!p.getUTCDate()) - p.setUTCDate(new_date); - }); - - if (new_date < this.dates[j]){ - // Date being moved earlier/left - while (j >= 0 && new_date < this.dates[j]){ - this.pickers[j--].setUTCDate(new_date); - } - } - else if (new_date > this.dates[k]){ - // Date being moved later/right - while (k < l && new_date > this.dates[k]){ - this.pickers[k++].setUTCDate(new_date); - } - } - this.updateDates(); - - delete this.updating; - }, - remove: function(){ - $.map(this.pickers, function(p){ p.remove(); }); - delete this.element.data().datepicker; - } - }; - - function opts_from_el(el, prefix){ - // Derive options from element data-attrs - var data = $(el).data(), - out = {}, inkey, - replace = new RegExp('^' + prefix.toLowerCase() + '([A-Z])'); - prefix = new RegExp('^' + prefix.toLowerCase()); - function re_lower(_,a){ - return a.toLowerCase(); - } - for (var key in data) - if (prefix.test(key)){ - inkey = key.replace(replace, re_lower); - out[inkey] = data[key]; - } - return out; - } - - function opts_from_locale(lang){ - // Derive options from locale plugins - var out = {}; - // Check if "de-DE" style date is available, if not language should - // fallback to 2 letter code eg "de" - if (!dates[lang]){ - lang = lang.split('-')[0]; - if (!dates[lang]) - return; - } - var d = dates[lang]; - $.each(locale_opts, function(i,k){ - if (k in d) - out[k] = d[k]; - }); - return out; - } - - var old = $.fn.datepicker; - var datepickerPlugin = function(option){ - var args = Array.apply(null, arguments); - args.shift(); - var internal_return; - this.each(function(){ - var $this = $(this), - data = $this.data('datepicker'), - options = typeof option === 'object' && option; - if (!data){ - var elopts = opts_from_el(this, 'date'), - // Preliminary otions - xopts = $.extend({}, defaults, elopts, options), - locopts = opts_from_locale(xopts.language), - // Options priority: js args, data-attrs, locales, defaults - opts = $.extend({}, defaults, locopts, elopts, options); - if ($this.hasClass('input-daterange') || opts.inputs){ - $.extend(opts, { - inputs: opts.inputs || $this.find('input').toArray() - }); - data = new DateRangePicker(this, opts); - } - else { - data = new Datepicker(this, opts); - } - $this.data('datepicker', data); - } - if (typeof option === 'string' && typeof data[option] === 'function'){ - internal_return = data[option].apply(data, args); - } - }); - - if ( - internal_return === undefined || - internal_return instanceof Datepicker || - internal_return instanceof DateRangePicker - ) - return this; - - if (this.length > 1) - throw new Error('Using only allowed for the collection of a single element (' + option + ' function)'); - else - return internal_return; - }; - $.fn.datepicker = datepickerPlugin; - - var defaults = $.fn.datepicker.defaults = { - autoclose: false, - beforeShowDay: $.noop, - beforeShowMonth: $.noop, - beforeShowYear: $.noop, - calendarWeeks: false, - clearBtn: false, - toggleActive: false, - daysOfWeekDisabled: [], - daysOfWeekHighlighted: [], - datesDisabled: [], - endDate: Infinity, - forceParse: true, - format: 'mm/dd/yyyy', - keyboardNavigation: true, - language: 'en', - minViewMode: 0, - maxViewMode: 2, - multidate: false, - multidateSeparator: ',', - orientation: "auto", - rtl: false, - startDate: -Infinity, - startView: 0, - todayBtn: false, - todayHighlight: false, - weekStart: 0, - disableTouchKeyboard: false, - enableOnReadonly: true, - showOnFocus: true, - zIndexOffset: 10, - container: 'body', - immediateUpdates: false, - title: '' - }; - var locale_opts = $.fn.datepicker.locale_opts = [ - 'format', - 'rtl', - 'weekStart' - ]; - $.fn.datepicker.Constructor = Datepicker; - var dates = $.fn.datepicker.dates = { - en: { - days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], - daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], - daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"], - months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], - monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], - today: "Today", - clear: "Clear", - titleFormat: "MM yyyy" - } - }; - - var DPGlobal = { - modes: [ - { - clsName: 'days', - navFnc: 'Month', - navStep: 1 - }, - { - clsName: 'months', - navFnc: 'FullYear', - navStep: 1 - }, - { - clsName: 'years', - navFnc: 'FullYear', - navStep: 10 - }], - isLeapYear: function(year){ - return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)); - }, - getDaysInMonth: function(year, month){ - return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]; - }, - validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g, - nonpunctuation: /[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g, - parseFormat: function(format){ - if (typeof format.toValue === 'function' && typeof format.toDisplay === 'function') - return format; - // IE treats \0 as a string end in inputs (truncating the value), - // so it's a bad format delimiter, anyway - var separators = format.replace(this.validParts, '\0').split('\0'), - parts = format.match(this.validParts); - if (!separators || !separators.length || !parts || parts.length === 0){ - throw new Error("Invalid date format."); - } - return {separators: separators, parts: parts}; - }, - parseDate: function(date, format, language){ - if (!date) - return undefined; - if (date instanceof Date) - return date; - if (typeof format === 'string') - format = DPGlobal.parseFormat(format); - if (format.toValue) - return format.toValue(date, format, language); - var part_re = /([\-+]\d+)([dmwy])/, - parts = date.match(/([\-+]\d+)([dmwy])/g), - fn_map = { - d: 'moveDay', - m: 'moveMonth', - w: 'moveWeek', - y: 'moveYear' - }, - part, dir, i, fn; - if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)){ - date = new Date(); - for (i=0; i < parts.length; i++){ - part = part_re.exec(parts[i]); - dir = parseInt(part[1]); - fn = fn_map[part[2]]; - date = Datepicker.prototype[fn](date, dir); - } - return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()); - } - parts = date && date.match(this.nonpunctuation) || []; - date = new Date(); - var parsed = {}, - setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'], - setters_map = { - yyyy: function(d,v){ - return d.setUTCFullYear(v); - }, - yy: function(d,v){ - return d.setUTCFullYear(2000+v); - }, - m: function(d,v){ - if (isNaN(d)) - return d; - v -= 1; - while (v < 0) v += 12; - v %= 12; - d.setUTCMonth(v); - while (d.getUTCMonth() !== v) - d.setUTCDate(d.getUTCDate()-1); - return d; - }, - d: function(d,v){ - return d.setUTCDate(v); - } - }, - val, filtered; - setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m']; - setters_map['dd'] = setters_map['d']; - date = UTCToday(); - var fparts = format.parts.slice(); - // Remove noop parts - if (parts.length !== fparts.length){ - fparts = $(fparts).filter(function(i,p){ - return $.inArray(p, setters_order) !== -1; - }).toArray(); - } - // Process remainder - function match_part(){ - var m = this.slice(0, parts[i].length), - p = parts[i].slice(0, m.length); - return m.toLowerCase() === p.toLowerCase(); - } - if (parts.length === fparts.length){ - var cnt; - for (i=0, cnt = fparts.length; i < cnt; i++){ - val = parseInt(parts[i], 10); - part = fparts[i]; - if (isNaN(val)){ - switch (part){ - case 'MM': - filtered = $(dates[language].months).filter(match_part); - val = $.inArray(filtered[0], dates[language].months) + 1; - break; - case 'M': - filtered = $(dates[language].monthsShort).filter(match_part); - val = $.inArray(filtered[0], dates[language].monthsShort) + 1; - break; - } - } - parsed[part] = val; - } - var _date, s; - for (i=0; i < setters_order.length; i++){ - s = setters_order[i]; - if (s in parsed && !isNaN(parsed[s])){ - _date = new Date(date); - setters_map[s](_date, parsed[s]); - if (!isNaN(_date)) - date = _date; - } - } - } - return date; - }, - formatDate: function(date, format, language){ - if (!date) - return ''; - if (typeof format === 'string') - format = DPGlobal.parseFormat(format); - if (format.toDisplay) - return format.toDisplay(date, format, language); - var val = { - d: date.getUTCDate(), - D: dates[language].daysShort[date.getUTCDay()], - DD: dates[language].days[date.getUTCDay()], - m: date.getUTCMonth() + 1, - M: dates[language].monthsShort[date.getUTCMonth()], - MM: dates[language].months[date.getUTCMonth()], - yy: date.getUTCFullYear().toString().substring(2), - yyyy: date.getUTCFullYear() - }; - val.dd = (val.d < 10 ? '0' : '') + val.d; - val.mm = (val.m < 10 ? '0' : '') + val.m; - date = []; - var seps = $.extend([], format.separators); - for (var i=0, cnt = format.parts.length; i <= cnt; i++){ - if (seps.length) - date.push(seps.shift()); - date.push(val[format.parts[i]]); - } - return date.join(''); - }, - headTemplate: ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '', - contTemplate: '', - footTemplate: ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '' - }; - DPGlobal.template = '
      '+ - '
      '+ - '
      Employee{{#with this.user}}{{this.full_name}}{{/with}} {{this.user.department.name}} {{as_date_from_timestamp this.createdAt}}{{#with this.get_start_leave_day}}{{as_date this.date}}{{/with}} {{#with this.get_end_leave_day}}{{as_date this.date}}{{/with}}{{> leave_dates leave=this}} {{#if this.is_pended_revoke_leave}}REVOKE {{/if}}{{this.leave_type.name}} {{ this.get_deducted_days_number }} From f5f0bc5ca268c3ebe53690459682275827472a88 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Wed, 31 Jan 2018 07:02:43 +0000 Subject: [PATCH 106/539] Pass color class name from DB to Calandar cell on the page --- lib/model/calendar_month.js | 107 ++++++++++++++++++++------ lib/model/db/department.js | 1 + lib/model/db/leave.js | 1 + lib/model/db/leave_type.js | 3 + lib/model/leave_day.js | 19 +++-- lib/model/mixin/user/absence_aware.js | 1 + views/partials/calendar_cell.hbs | 2 + 7 files changed, 103 insertions(+), 31 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 2ed9a8850..01b861fe3 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -5,23 +5,23 @@ var moment = require('moment'), _ = require('underscore'); function CalendarMonth(day, args){ - var me = this; + var self = this; this.date = moment.utc(day).startOf('month'); this._leaves = {}; this._bank_holidays = {}; if (args && args.today) { - this.today = args.today; + self.today = args.today; } else { throw new Error('CalendarMonth requires today - moment object that represents today'); } if (args){ - this._schedule = args.schedule; + self._schedule = args.schedule; } - if ( ! this._schedule ) { + if ( ! self._schedule ) { throw new Error('CalendarMonth requires schedule'); } @@ -29,15 +29,15 @@ function CalendarMonth(day, args){ var map = {}; args.bank_holidays.forEach(function(day){ day = moment.utc(day); - map[day.format(me.default_date_format())] = day; + map[day.format(self.default_date_format())] = day; }); - this._bank_holidays = map; + self._bank_holidays = map; } if (args && args.leave_days){ var map = {}; args.leave_days.forEach(function(day){ - var attribute = moment.utc(day.date).format(me.default_date_format()); + var attribute = moment.utc(day.date).format(self.default_date_format()); if ( ! map[attribute] ) { map[attribute] = day; } else if ( map[attribute] ) { @@ -50,11 +50,27 @@ function CalendarMonth(day, args){ map[attribute] = day; } else if ( map[attribute].day_part !== day.day_part ) { map[attribute].pretend_to_be_full_day(); + + // Merge leave types from both days into one in "map" + if (day.is_morning_leave()) { + map[attribute].morning_leave_type_id = day.morning_leave_type_id; + } else if ( day.is_afternoon_leave() ) { + map[attribute].afternoon_leave_type_id = day.afternoon_leave_type_id; + } } } }); - this._leaves = map; + self._leaves = map; + } + + self._leave_types_map = {}; + + if (args && args.leave_types) { + // Build leave types look up dictionary + args.leave_types.forEach(lt => self._leave_types_map[ lt.id ] = lt); } + + return; }; CalendarMonth.prototype.is_bank_holiday = function(day) { @@ -116,6 +132,34 @@ CalendarMonth.prototype.is_approved_leave = function(day){ return leave_day && leave_day.leave && leave_day.leave.is_approved_leave(); }; +CalendarMonth.prototype.get_morning_leave_type_id = function(day){ + let + self = this, + leave_day = self._leaves[ + self.get_base_date().date(day).format(self.default_date_format()) + ]; + + if ( ! leave_day ) { + return null; + } + + return leave_day.get_morning_leave_type_id(); +}; + +CalendarMonth.prototype.get_afternoon_leave_type_id = function(day){ + let + self = this, + leave_day = self._leaves[ + self.get_base_date().date(day).format(self.default_date_format()) + ]; + + if ( ! leave_day ) { + return null; + } + + return leave_day.get_afternoon_leave_type_id(); +}; + CalendarMonth.prototype.default_date_format = function(){ return 'YYYY-MM-DD'; }; @@ -157,39 +201,52 @@ CalendarMonth.prototype.is_current_day = function(day){ }; CalendarMonth.prototype.as_for_template = function(){ - var weeks = []; - var week = []; + let + self = this, + weeks = [], + week = []; - for( var i=0; i Date: Thu, 1 Feb 2018 07:00:35 +0000 Subject: [PATCH 107/539] Some basic UI for editingn colors --- lib/model/calendar_month.js | 7 ++++--- lib/route/settings.js | 6 +++--- public/css/style.css | 12 ++++++++++++ scss/main.scss | 15 +++++++++++++++ views/general_settings.hbs | 16 ++++++++++++++++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 01b861fe3..1a7d11c10 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -52,11 +52,12 @@ function CalendarMonth(day, args){ map[attribute].pretend_to_be_full_day(); // Merge leave types from both days into one in "map" - if (day.is_morning_leave()) { - map[attribute].morning_leave_type_id = day.morning_leave_type_id; - } else if ( day.is_afternoon_leave() ) { + if ( map[attribute].is_morning_leave()) { map[attribute].afternoon_leave_type_id = day.afternoon_leave_type_id; } + if ( map[attribute].is_afternoon_leave() ) { + map[attribute].morning_leave_type_id = day.morning_leave_type_id; + } } } }); diff --git a/lib/route/settings.js b/lib/route/settings.js index ff46017ee..3f595cc66 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -586,7 +586,7 @@ function get_and_validate_leave_type(args) { // Get user parameters let name = validator.trim(req.param('name__'+suffix)), - color = validator.trim(req.param('color__'+suffix)) || '#f1f1f1', + color = validator.trim(req.param('color__'+suffix)) || '', limit = validator.trim(req.param('limit__'+suffix)) || 0, first_record = validator.trim(req.param('first_record')) || 0, use_allowance = validator.toBoolean( @@ -607,8 +607,8 @@ function get_and_validate_leave_type(args) { }; // Validate provided parameters - if ( ! validator.isHexColor(color)) { - throw_user_error( 'New color for '+item_name+' should be color code' ); + if ( ! validator.matches(color, /^leave_type_color_[1-4]$/)) { + throw_user_error( 'New color for '+item_name+' should be valid css class' ); } if ( ! validator.isNumeric(limit) ){ diff --git a/public/css/style.css b/public/css/style.css index 76a14b29d..4702adfa6 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -210,3 +210,15 @@ div.feeds-holder { .selected-item { background: #F5F7F8; font-weight: bolder; } + +.leave_type_color_1 { + background: #96c521 !important; } + +.leave_type_color_2 { + background: #ffcba4 !important; } + +.leave_type_color_3 { + background: #cb6cac !important; } + +.leave_type_color_4 { + background: #9fbb58 !important; } diff --git a/scss/main.scss b/scss/main.scss index 1cd8487e3..99cd337cf 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -260,3 +260,18 @@ div.feeds-holder { font-weight: bolder; } +.leave_type_color_1 { + background: #96c521 !important; +} + +.leave_type_color_2 { + background: #ffcba4 !important; +} + +.leave_type_color_3 { + background: #cb6cac !important; +} + +.leave_type_color_4 { + background: #9fbb58 !important; +} diff --git a/views/general_settings.hbs b/views/general_settings.hbs index 7c0969b31..7822569fa 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -237,6 +237,22 @@ + + +
      + + +
      From be32557e52c33ab6e59a12310b5ebb5f2e38cf68 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 2 Feb 2018 07:22:53 +0000 Subject: [PATCH 108/539] Fix issu of half day highlights and reports --- lib/model/calendar_month.js | 28 +++++++++++++++++----------- lib/model/team_view.js | 30 ++++++++++++++---------------- lib/route/settings.js | 2 +- views/partials/calendar_cell.hbs | 4 ++-- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 1a7d11c10..57ae4e587 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -49,15 +49,17 @@ function CalendarMonth(day, args){ if (day.is_all_day_leave()){ map[attribute] = day; } else if ( map[attribute].day_part !== day.day_part ) { - map[attribute].pretend_to_be_full_day(); - - // Merge leave types from both days into one in "map" - if ( map[attribute].is_morning_leave()) { - map[attribute].afternoon_leave_type_id = day.afternoon_leave_type_id; - } - if ( map[attribute].is_afternoon_leave() ) { - map[attribute].morning_leave_type_id = day.morning_leave_type_id; - } + + // Merge leave types from both days into one in "map" + if (day.is_morning_leave()) { + map[attribute].morning_leave_type_id = day.morning_leave_type_id; + } + + if ( day.is_afternoon_leave() ) { + map[attribute].afternoon_leave_type_id = day.afternoon_leave_type_id; + } + + map[attribute].pretend_to_be_full_day(); } } }); @@ -226,7 +228,9 @@ CalendarMonth.prototype.as_for_template = function(){ day.is_leave_morning = true; let morning_leave_type_id = self.get_morning_leave_type_id(i); - day.leave_color_class = morning_leave_type_id && self._leave_types_map[ morning_leave_type_id ] + day.morning_leave_type_id = morning_leave_type_id; + + day.leave_color_class_morning = morning_leave_type_id && self._leave_types_map[ morning_leave_type_id ] ? self._leave_types_map[ morning_leave_type_id ].get_color_class() : 'leave_type_color_1'; } @@ -235,7 +239,9 @@ CalendarMonth.prototype.as_for_template = function(){ day.is_leave_afternoon = true; let afternoon_leave_type_id = self.get_afternoon_leave_type_id(i); - day.leave_color_class = afternoon_leave_type_id && self._leave_types_map[ afternoon_leave_type_id ] + day.afternoon_leave_type_id = afternoon_leave_type_id; + + day.leave_color_class_afternoon = afternoon_leave_type_id && self._leave_types_map[ afternoon_leave_type_id ] ? self._leave_types_map[ afternoon_leave_type_id ].get_color_class() : 'leave_type_color_1'; } diff --git a/lib/model/team_view.js b/lib/model/team_view.js index b4b50875b..02de7683b 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -174,27 +174,25 @@ TeamView.prototype.inject_statistics = function(args){ // Ignore bank holidays .filter( day => ! day.is_bank_holiday ) .forEach( day => { - let leave_type = leave_types_map[ day.leave_obj.leaveTypeId ]; - - // Capture statistics by Leave types - if (leave_type) { - if (day.is_leave_afternoon && day.is_leave_morning) { - leave_type_stat[ leave_type.id ] ++; - } else { - leave_type_stat[ leave_type.id ] = leave_type_stat[ leave_type.id ] + 0.5; + + if (day.is_leave_morning) { + + leave_type_stat[ day.morning_leave_type_id ] = leave_type_stat[ day.morning_leave_type_id ] + 0.5; + + if ( leave_types_map[ day.morning_leave_type_id ] && leave_types_map[ day.morning_leave_type_id ].use_allowance ) { + deducted_days = deducted_days + 0.5; } } - // Abort if current leave type does not use allowance - if (! (leave_type && leave_type.use_allowance)) { - return; - } + if (day.is_leave_afternoon) { - if (day.is_leave_afternoon && day.is_leave_morning){ - deducted_days++; - } else { - deducted_days = deducted_days + 0.5; + if ( leave_types_map[ day.afternoon_leave_type_id ] && leave_types_map[ day.afternoon_leave_type_id ].use_allowance ) { + deducted_days = deducted_days + 0.5; + } + + leave_type_stat[ day.afternoon_leave_type_id ] = leave_type_stat[ day.afternoon_leave_type_id ] + 0.5; } + }); let statistics = { diff --git a/lib/route/settings.js b/lib/route/settings.js index 3f595cc66..3cf92fb9e 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -586,7 +586,7 @@ function get_and_validate_leave_type(args) { // Get user parameters let name = validator.trim(req.param('name__'+suffix)), - color = validator.trim(req.param('color__'+suffix)) || '', + color = validator.trim(req.param('color__'+suffix)) || 'leave_type_color_1', limit = validator.trim(req.param('limit__'+suffix)) || 0, first_record = validator.trim(req.param('first_record')) || 0, use_allowance = validator.toBoolean( diff --git a/views/partials/calendar_cell.hbs b/views/partials/calendar_cell.hbs index 12d8c6e54..172cfffe3 100644 --- a/views/partials/calendar_cell.hbs +++ b/views/partials/calendar_cell.hbs @@ -7,7 +7,7 @@ leave_cell_pended {{else}} leave_cell - {{day.leave_color_class}} + {{day.leave_color_class_morning}} {{/if}} {{/if}} {{# if day.is_current_day }}current_day_cell{{/if}} @@ -53,7 +53,7 @@ leave_cell_pended {{else}} leave_cell - {{day.leave_color_class}} + {{day.leave_color_class_afternoon}} {{/if}} {{/if}} {{# if day.is_current_day }}current_day_cell{{/if}} From 0523eedab8290d924d5736f26ca30c1815013ed4 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Sat, 3 Feb 2018 08:39:05 +0000 Subject: [PATCH 109/539] Sort out issues with UI --- lib/model/db/leave_type.js | 6 ++++- public/css/style.css | 14 +++++----- public/js/global.js | 29 +++++++++++++++++++++ scss/main.scss | 18 ++++++++----- views/general_settings.hbs | 24 +++++++---------- views/partials/add_new_leave_type_modal.hbs | 18 +++++++++++++ 6 files changed, 81 insertions(+), 28 deletions(-) diff --git a/lib/model/db/leave_type.js b/lib/model/db/leave_type.js index 9c6226afb..ada19bdaf 100644 --- a/lib/model/db/leave_type.js +++ b/lib/model/db/leave_type.js @@ -57,7 +57,11 @@ module.exports = function(sequelize, DataTypes) { instanceMethods : { get_color_class : function() { - return this.color; + let value_in_db = this.color || ''; + + return value_in_db.match(/^\s*\#/) + ? 'leave_type_color_1' + : value_in_db; } } diff --git a/public/css/style.css b/public/css/style.css index 4702adfa6..ffeb40b84 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -108,7 +108,7 @@ td.calendar_cell span { z-index: 10; } td.current_day_cell { - background: #e25440; + background: #FFCDD2; color: #ffffff; } td.weekend_cell { @@ -120,11 +120,13 @@ td.bank_holiday_cell { td.leave_cell { background: #9fbb58; - color: #ffffff; } + color: #61686b; + font-weight: bolder; } td.leave_cell_pended { background: #FFCBA4; - color: #61686b; } + color: #61686b; + font-weight: bolder; } .modal-dialog { max-width: 450px; } @@ -215,10 +217,10 @@ div.feeds-holder { background: #96c521 !important; } .leave_type_color_2 { - background: #ffcba4 !important; } + background: #40C4FF !important; } .leave_type_color_3 { - background: #cb6cac !important; } + background: #FF5722 !important; } .leave_type_color_4 { - background: #9fbb58 !important; } + background: #FF80AB !important; } diff --git a/public/js/global.js b/public/js/global.js index ef237a56e..c324ca331 100644 --- a/public/js/global.js +++ b/public/js/global.js @@ -141,3 +141,32 @@ $(document).ready(function(){ return form.submit(); }); }); + + +$(document).ready(function(){ + + $('[data-tom-color-picker] a') + .on('click', function(e){ + e.stopPropagation(); + + // Close dropdown + $(e.target).closest('.dropdown-menu').dropdown('toggle'); + + var new_class_name = $(e.target).data('tom-color-picker-css-class'); + + // Ensure newly selected color is on triggering element + $(e.target).closest('[data-tom-color-picker]') + .find('button.dropdown-toggle') + .attr('class', function(idx, c){ return c.replace(/leave_type_color_\d+/g, '') }) + .addClass( new_class_name ); + + // Capture newly picked up color in hidden input for submission + $(e.target).closest('[data-tom-color-picker]') + .find('input[type="hidden"]') + .attr('value', new_class_name); + + return false; + }); +}); + + diff --git a/scss/main.scss b/scss/main.scss index 99cd337cf..a4fb3b4dd 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -13,6 +13,8 @@ $font-size-bigger : 16px; $selected-item-background : #F5F7F8; +$leave_cell_font_color : #61686b; + // 5E5E5E body { @@ -140,11 +142,11 @@ td.calendar_cell span { z-index : 10; } td.current_day_cell { - background: #e25440; + background: #FFCDD2; color : #ffffff; } td.weekend_cell { - background: $selected-item-background; + background: $selected-item-background; } td.bank_holiday_cell { background : #31B0D5; @@ -152,11 +154,13 @@ td.bank_holiday_cell { } td.leave_cell { background : #9fbb58; - color : #ffffff; + color : $leave_cell_font_color; + font-weight: bolder; } td.leave_cell_pended { background: #FFCBA4; - color: $primary-font-color; + color: $leave_cell_font_color; + font-weight: bolder; } .modal-dialog { max-width : 450px; @@ -265,13 +269,13 @@ div.feeds-holder { } .leave_type_color_2 { - background: #ffcba4 !important; + background: #40C4FF !important; } .leave_type_color_3 { - background: #cb6cac !important; + background: #FF5722 !important; } .leave_type_color_4 { - background: #9fbb58 !important; + background: #FF80AB !important; } diff --git a/views/general_settings.hbs b/views/general_settings.hbs index 7822569fa..e99a17e3b 100644 --- a/views/general_settings.hbs +++ b/views/general_settings.hbs @@ -237,22 +237,18 @@ - - -
      - -
      diff --git a/views/partials/add_new_leave_type_modal.hbs b/views/partials/add_new_leave_type_modal.hbs index 0d6ce3b92..36abb5113 100644 --- a/views/partials/add_new_leave_type_modal.hbs +++ b/views/partials/add_new_leave_type_modal.hbs @@ -20,11 +20,29 @@
        +

      If checked leaves of this type are going to be counted towards employee's annual holiday allowance.

      +
      +
      + + + +
      +

      Determine how leaves of new type are going to be highlighted on Calendar/Team view pages.

      +
      + + +
      +

      If set to non-zero value determines maximum number of days of new leave type each employee could take during the year.

      From 0d6160dcd0e4ea9939e0ab7243c239dc083c5511 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Tue, 6 Feb 2018 07:13:57 +0000 Subject: [PATCH 110/539] Start adding tests --- t/integration/crud_leave_type.js | 55 +++- .../leave_type/colouring_on_calendar.js | 298 ++++++++++++++++++ t/lib/submit_form.js | 4 + views/general_settings.hbs | 2 +- 4 files changed, 344 insertions(+), 15 deletions(-) create mode 100644 t/integration/leave_type/colouring_on_calendar.js diff --git a/t/integration/crud_leave_type.js b/t/integration/crud_leave_type.js index 809653ba7..69e37dfb7 100644 --- a/t/integration/crud_leave_type.js +++ b/t/integration/crud_leave_type.js @@ -1,7 +1,8 @@ 'use strict'; -var test = require('selenium-webdriver/testing'), +const + test = require('selenium-webdriver/testing'), register_new_user_func = require('../lib/register_new_user'), login_user_func = require('../lib/login_with_user'), open_page_func = require('../lib/open_page'), @@ -53,19 +54,45 @@ describe('CRUD for leave types', function(){ .then(function(){ done() }); }); -// TODO un comment that step when we resurect editing colors -// // Try to submit form with incorrect color code -// .then(function(data){ -// return submit_form_func({ -// driver : data.driver, -// form_params : [{ -// selector : leave_type_edit_form_id+' input[name="color__0"]', -// value : ' {{~/ is_ga_analitics_on ~}} diff --git a/views/login.hbs b/views/login.hbs index b72bae6d9..74ee2c536 100644 --- a/views/login.hbs +++ b/views/login.hbs @@ -5,7 +5,6 @@ {{> show_flash_messages }} - {{#if login.default}}
      From dd3cff637eb0055091390a3f0851078b4634be28 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 11:13:09 +0200 Subject: [PATCH 169/539] let's how the automatic tests perform... --- config/db.json | 6 +- lib/model/db/company.js | 2 +- lib/model/db/department.js | 2 +- lib/model/db/user.js | 2 +- lib/passport.js | 6 +- lib/route/calendar.js | 10 +- lib/route/departments.js | 823 +++++++++--------- lib/route/login.js | 6 +- lib/route/reports.js | 2 +- lib/route/requests.js | 8 +- lib/route/settings.js | 32 +- lib/route/users.js | 26 +- lib/route/validator/leave_request.js | 30 +- package.json | 2 +- .../bank_holidays/crud_bank_holiday.js | 2 +- .../ovelapping_bookings_halfs.js | 2 +- .../leave_request/rendering_of_halves.js | 2 +- t/integration/team_view/basic_wall_chart.js | 2 +- t/lib/register_new_user.js | 2 +- 19 files changed, 491 insertions(+), 476 deletions(-) diff --git a/config/db.json b/config/db.json index 661fead1b..dd48f4829 100644 --- a/config/db.json +++ b/config/db.json @@ -1,7 +1,8 @@ { "development": { "dialect": "sqlite", - "storage": "./db.development.sqlite" + "storage": "./db.development.sqlite", + "logging": false }, "test": { "username": "root", @@ -15,6 +16,7 @@ "password": null, "database": "database_production", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "mysql", + "logging": false } } diff --git a/lib/model/db/company.js b/lib/model/db/company.js index eb868918f..7b9ee78cb 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -74,7 +74,7 @@ module.exports = function(sequelize, DataTypes) { comment : "Indicate which mode the company account is in.", }, timezone : { - type : DataTypes.TEXT, + type: DataTypes.STRING, allowNull : true, defaultValue : 'Europe/London', comment : 'Timezone current company is located in', diff --git a/lib/model/db/department.js b/lib/model/db/department.js index d8fb94710..98924fa97 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -251,7 +251,7 @@ module.exports = function(sequelize, DataTypes) { promise_me_with_supervisors: function () { var self = this; - return self.Model.scope('with_supervisors').findById( self.id ); + return this.sequelize.models.Department.scope('with_supervisors').findById(self.id); }, }); diff --git a/lib/model/db/user.js b/lib/model/db/user.js index a355df740..e1f038abc 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -326,7 +326,7 @@ function get_instance_methods(sequelize) { get_reset_password_token : function(){ var self = this; - return new Buffer( self.email + ' ' + self.Model.hashify_password( self.password ) ).toString('base64'); + return new Buffer(self.email + ' ' + this.sequelize.models.User.hashify_password(self.password)).toString('base64'); }, // Accept an object that represent email to be sent to current user and diff --git a/lib/passport.js b/lib/passport.js index 14ee444f1..cc7839520 100644 --- a/lib/passport.js +++ b/lib/passport.js @@ -58,7 +58,7 @@ function authenticate_user({user, password, done}){ ldap_server.close(); }) .catch(function(error){ - console.error('Failed while trying to deal with LDAP server with error: %s', error); + console.error('Failed while trying to deal with LDAP server with error: %s', error, error.stack); done(null, false); }); @@ -166,7 +166,7 @@ function strategy_handler(email, password, strategy, done) { .catch(function(error){ console.error( 'At login: unknown error when trying to login in as %s. Error: %s', - email, error + email, error, error.stack ); done(null, false); @@ -216,7 +216,7 @@ module.exports = function(){ done(null, user); }) .catch(function(error){ - console.error('Failed to fetch session user '+id+' with error: '+error); + console.error('Failed to fetch session user ' + id + ' with error: ' + error, error.stack); done(null, false, { message : 'Failed to fetch session user' }); }); diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 0f751cea2..3ec498e3d 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -81,8 +81,8 @@ router.post('/bookleave/', function(req, res){ .catch(function(error){ console.error( 'An error occured when user '+req.user.id+ - ' try to create a leave request: '+error - ); + ' try to create a leave request: ', error + , error.stack); req.session.flash_error('Failed to create a leave request'); if (error.hasOwnProperty('user_message')) { req.session.flash_error(error.user_message); @@ -102,7 +102,7 @@ router.get('/', function(req, res) { ? moment.utc(req.query.year, 'YYYY') : req.user.company.get_today(); - var show_full_year = req.query.show_full_year && validator.toBoolean(req.query.show_full_year); + var show_full_year = (req.query.show_full_year && validator.toBoolean(req.query.show_full_year)) || false; Promise.join( req.user.promise_calendar({ @@ -182,8 +182,8 @@ router.get('/teamview/', function(req, res){ .catch(error => { console.error( 'An error occured when user '+req.user.id+ - ' tried to access Teamview page: '+error - ); + ' tried to access Teamview page: ', error + , error.stack); req.session.flash_error('Failed to access Teamview page. Please contact administrator.'); if (error.hasOwnProperty('user_message')) { req.session.flash_error(error.user_message); diff --git a/lib/route/departments.js b/lib/route/departments.js index 55527303e..239c2a0d1 100644 --- a/lib/route/departments.js +++ b/lib/route/departments.js @@ -1,484 +1,495 @@ - "use strict"; -var express = require('express'), - router = express.Router(), +var express = require('express'), + router = express.Router(), validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - config = require('../config'), - _ = require('underscore'); + Promise = require('bluebird'), + moment = require('moment'), + config = require('../config'), + _ = require('underscore'); // Make sure that current user is authorized to deal with settings router.all(/.*/, require('../middleware/ensure_user_is_admin')); function generate_all_department_allowances() { - var allowance_options = [{ value : 0, caption : 'None'}], - allowance = 0.5; + var allowance_options = [{value: 0, caption: 'None'}], + allowance = 0.5; - while (allowance <= 50) { - allowance_options.push({ value : allowance, caption : allowance }); - allowance += 0.5; - } + while (allowance <= 50) { + allowance_options.push({value: allowance, caption: allowance}); + allowance += 0.5; + } - return allowance_options; + return allowance_options; } function get_and_validate_department(args) { var params = args.params, session = args.session, - index = args.suffix, - company = args.company, - // If no_suffix is set then parameter names are considered without "indexes" - no_suffix = args.no_suffix, - department_name = args.department_name; - - // Get user parameters - var - name = validator.trim(params[(no_suffix ? 'name' : 'name__' + index)]), - allowance = validator.trim(params[(no_suffix ? 'allowance' : 'allowance__' + index)]), - boss_id = validator.trim(params[(no_suffix ? 'boss_id' : 'boss_id__' + index)]), - include_public_holidays = params[no_suffix ? 'include_public_holidays' : 'include_public_holidays__' + index] && validator.toBoolean( - params[no_suffix ? 'include_public_holidays' : 'include_public_holidays__' + index] - ); - - // Validate provided parameters - // - // New allowance should be from range of (0;50] - if (!validator.isFloat(allowance)) { - session.flash_error( - 'New allowance for '+department_name+' should be numeric' - ); - } else if (!((0 <= allowance) && (allowance <= 50))) { - session.flash_error( - 'New allowance for '+department_name+' should be between 0.5 and 50 days' - ); - } - // New manager ID should be numeric and from within - // current company - if (!validator.isNumeric( boss_id ) ) { - session.flash_error( - 'New boss reference for '+department_name+' should be numeric' - ); - } else if ( ! _.contains( - _.map( company.users, function(user){ return String(user.id) }), - String(boss_id) - )) { - session.flash_error( - 'New boss for '+department_name+' is unknown' - ); - } - - return { - allowance : allowance, - bossId : boss_id, - include_public_holidays : include_public_holidays, - name : name, - }; -} - -router.get('/departments/', function(req, res){ - - // Add JS that is specific only to current page - res.locals.custom_java_script.push('/js/departments.js'); - - var company_for_template, - model = req.app.get('db_model'); - - req.user.getCompany({ - scope : ['with_active_users', 'order_by_active_users'], - }) - .then(function(company){ - 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, - allowance_options : generate_all_department_allowances(), - company : company_for_template, - }); - }); -}); - -router.post('/departments/', function(req, res){ - const - model = req.app.get('db_model'); - - req.user.getCompany({ - scope : ['with_active_users'], - }) - .then(company => { - - let attributes = get_and_validate_department({ - params: req.body, - session: req.session, - suffix : 'new', - company : company, - department_name : 'New department' - }); - - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); + index = args.suffix, + company = args.company, + // If no_suffix is set then parameter names are considered without "indexes" + no_suffix = args.no_suffix, + department_name = args.department_name; + + // Get user parameters + var + name = validator.trim(params[(no_suffix ? 'name' : 'name__' + index)]), + allowance = validator.trim(params[(no_suffix ? 'allowance' : 'allowance__' + index)]), + boss_id = validator.trim(params[(no_suffix ? 'boss_id' : 'boss_id__' + index)]), + include_public_holidays = (params[no_suffix ? 'include_public_holidays' : 'include_public_holidays__' + index] && validator.toBoolean( + params[no_suffix ? 'include_public_holidays' : 'include_public_holidays__' + index])) || false; + + // Validate provided parameters + // + // New allowance should be from range of (0;50] + if (!validator.isFloat(allowance)) { + session.flash_error( + 'New allowance for ' + department_name + ' should be numeric' + ); + } else if (!((0 <= allowance) && (allowance <= 50))) { + session.flash_error( + 'New allowance for ' + department_name + ' should be between 0.5 and 50 days' + ); } - - attributes.companyId = company.id; - - return model.Department.create(attributes); - }) - - .then(() => { - if ( ! req.session.flash_has_errors() ) { - req.session.flash_message('Changes to departments were saved'); + // New manager ID should be numeric and from within + // current company + if (typeof boss_id !== 'number' && (!boss_id || !validator.isNumeric(boss_id))) { + session.flash_error( + 'New boss reference for ' + department_name + ' should be numeric' + ); + } else if (!_.contains( + _.map(company.users, function (user) { + return String(user.id) + }), + String(boss_id) + )) { + session.flash_error( + 'New boss for ' + department_name + ' is unknown' + ); } - return res.redirect_with_session('/settings/departments/'); - }) + return { + allowance: allowance, + bossId: boss_id, + include_public_holidays: include_public_holidays, + name: name, + }; +} + +router.get('/departments/', function (req, res) { - .catch(error => { - console.error( - 'An error occurred when trying to add department by user '+req.user.id - + ' : ' + error - ); + // Add JS that is specific only to current page + res.locals.custom_java_script.push('/js/departments.js'); - req.session.flash_error( - 'Failed to add new department, please contact customer service' - ); + var company_for_template, + model = req.app.get('db_model'); - return res.redirect_with_session('/settings/departments/'); - }); + req.user.getCompany({ + scope: ['with_active_users', 'order_by_active_users'], + }) + .then(function (company) { + 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, + allowance_options: generate_all_department_allowances(), + company: company_for_template, + }); + }); }); -router.post('/departments/delete/:department_id/', function(req, res){ +router.post('/departments/', function (req, res) { + const + model = req.app.get('db_model'); - var department_id = req.params.department_id, - department_to_remove; + req.user.getCompany({ + scope: ['with_active_users'], + }) + .then(company => { - if (!validator.isInt(department_id)) { - console.error( - 'User '+req.user.id+' submited non-int department ID '+department_id - ); + let attributes = get_and_validate_department({ + params: req.body, + session: req.session, + suffix: 'new', + company: company, + department_name: 'New department' + }); - req.session.flash_error('Cannot remove department: wronge parameters'); + if (req.session.flash_has_errors()) { + return Promise.resolve(1); + } - return res.redirect_with_session('/settings/departments/'); - } + attributes.companyId = company.id; - req.user.getCompany() + return model.Department.create(attributes); + }) - .then(function(company){ - return company.getDepartments({ - scope : ['with_simple_users'], - where : { - id : department_id, - } - }); - }) - .then(function(departments){ - department_to_remove = departments[ 0 ]; + .then(() => { + if (!req.session.flash_has_errors()) { + req.session.flash_message('Changes to departments were saved'); + } - // Check if user specify valid department number - if (! department_to_remove) { + return res.redirect_with_session('/settings/departments/'); + }) - req.session.flash_error('Cannot remove department: wronge parameters'); + .catch(error => { + console.error( + 'An error occurred when trying to add department by user ' + req.user.id + + ' : ' + error + ); - throw new Error( - 'User '+req.user.id+' tried to remove non-existing department ID'+department_id - ); - } + req.session.flash_error( + 'Failed to add new department, please contact customer service' + ); - if (department_to_remove.users.length > 0){ - req.session.flash_error( - 'Cannot remove department '+department_to_remove.name - +' as it still has ' - +department_to_remove.users.length+' users.' - ); + return res.redirect_with_session('/settings/departments/'); + }); +}); - throw new Error('Department still has users'); - } +router.post('/departments/delete/:department_id/', function (req, res) { - // TODO VPP remove corresponding records in supervisors linking table - return department_to_remove.destroy(); - }) - .then(function(){ - req.session.flash_message('Department was successfully removed'); - return res.redirect_with_session('/settings/departments/'); - }) - .catch(function(error){ - - console.error( - 'An error occurred when trying to edit departments by user '+req.user.id+' : '+error - ); - - return res.redirect_with_session( department_to_remove - ? '/settings/departments/edit/'+department_to_remove.get('id')+'/' - : '/settings/departments/' - ); - }); -}); + var department_id = req.params.department_id, + department_to_remove; -function promise_to_extract_company_and_department(params, session) { - var department_id = params.department_id, - company; + if (typeof department_id !== 'number' && (!department_id || !validator.isInt(department_id))) { + console.error( + 'User ' + req.user.id + ' submited non-int department ID ' + department_id + ); - return Promise.try(function(){ + req.session.flash_error('Cannot remove department: wronge parameters'); - if ( ! validator.isInt(department_id)) { - throw new Error('User '+req.user.id+' tried to open department refered by non-int ID '+department_id); + return res.redirect_with_session('/settings/departments/'); } - return req.user.getCompany({ - scope : ['with_active_users', 'order_by_active_users'], - }); - }) - .then(function(c){ - company = c; + req.user.getCompany() + + .then(function (company) { + return company.getDepartments({ + scope: ['with_simple_users'], + where: { + id: department_id, + } + }); + }) + .then(function (departments) { + department_to_remove = departments[0]; + + // Check if user specify valid department number + if (!department_to_remove) { + + req.session.flash_error('Cannot remove department: wronge parameters'); + + throw new Error( + 'User ' + req.user.id + ' tried to remove non-existing department ID' + department_id + ); + } + + if (department_to_remove.users.length > 0) { + req.session.flash_error( + 'Cannot remove department ' + department_to_remove.name + + ' as it still has ' + + department_to_remove.users.length + ' users.' + ); + + throw new Error('Department still has users'); + } + + // TODO VPP remove corresponding records in supervisors linking table + return department_to_remove.destroy(); + }) + .then(function () { + req.session.flash_message('Department was successfully removed'); + return res.redirect_with_session('/settings/departments/'); + }) + .catch(function (error) { + + console.error( + 'An error occurred when trying to edit departments by user ' + req.user.id + ' : ' + error + , error.stack); + + return res.redirect_with_session(department_to_remove + ? '/settings/departments/edit/' + department_to_remove.get('id') + '/' + : '/settings/departments/' + ); + }); +}); - if ( ! company ) { - throw new Error('Cannot determin company!'); - } +function promise_to_extract_company_and_department(department_id, params, session, req) { + var company; - return company.getDepartments({ - scope : ['with_simple_users', 'with_boss', 'with_supervisors'], - where : { - id : department_id, - } - }); - }) - .then(function(departments){ - var department = departments[0]; + return Promise.try(function () { - // Ensure we have database record for given department ID - if ( ! department ) { - throw new Error('Non existing department ID provided'); - } + if (typeof department_id !== 'number' && (!department_id || !validator.isInt(department_id))) { + throw new Error('User ' + req.user.id + ' tried to open department refered by non-int ID ' + department_id); + } - return Promise.resolve({ - company : company, - department : department, - }); - }); + return req.user.getCompany({ + scope: ['with_active_users', 'order_by_active_users'], + }); + }) + .then(function (c) { + company = c; + + if (!company) { + throw new Error('Cannot determin company!'); + } + + return company.getDepartments({ + scope: ['with_simple_users', 'with_boss', 'with_supervisors'], + where: { + id: department_id, + } + }); + }) + .then(function (departments) { + var department = departments[0]; + + // Ensure we have database record for given department ID + if (!department) { + throw new Error('Non existing department ID provided'); + } + + return Promise.resolve({ + company: company, + department: department, + }); + }); } -router.get('/departments/edit/:department_id/', function(req, res){ +router.get('/departments/edit/:department_id/', function (req, res) { var department_id = req.params.department_id; - Promise.try(function(){ - return promise_to_extract_company_and_department(req.query, req.session); - }) - .then(function(result){ - var department = result.department, - company = result.company; - - res.render('department_details', { - title : 'Department details', - department : department, - company : company, - allowance_options : generate_all_department_allowances(), - }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to edit department '+department_id - +' for user '+req.user.id + ' : ' + error - ); - - req.session.flash_error( - 'Failed to fetch details for given department' - ); - - return res.redirect_with_session('/settings/departments/'); - }); + Promise.try(function () { + return promise_to_extract_company_and_department(department_id, req.query, req.session, req); + }) + .then(function (result) { + var department = result.department, + company = result.company; + + res.render('department_details', { + title: 'Department details', + department: department, + company: company, + allowance_options: generate_all_department_allowances(), + }); + }) + .catch(function (error) { + console.error( + 'An error occurred when trying to edit department ' + department_id + + ' for user ' + req.user.id + ' : ' + error + , error.stack); + + req.session.flash_error( + 'Failed to fetch details for given department' + ); + + return res.redirect_with_session('/settings/departments/'); + }); }); -router.post('/departments/edit/:department_id/', function(req, res){ +router.post('/departments/edit/:department_id/', function (req, res) { var department_id = req.params.department_id, - company, - department; - - Promise.try(function(){ - return promise_to_extract_company_and_department(req.body, req.session); - }) - .then(function(result){ - company = result.company; - department = result.department; - - return Promise.resolve(1); - }) - - .then(function(){ - if (params.remove_supervisor_id) { - return promise_to_remove_supervisor({ - supervisor_id: params.remove_supervisor_id, - company : company, - department : department, - }) - .then(function(){ - req.session.flash_message('Supervisor was removed from ' + department.name); - return Promise.resolve(1); - }); - } else if (params.do_add_supervisors) { - return promise_to_update_supervisors({ - params: req.body, - session: req.session, - company : company, - department : department, - }) - .then(function(){ - req.session.flash_message('Supervisors were added to department ' + department.name); - return Promise.resolve(1); - }); - } + company, + department; - return promise_to_update_department({ - params: req.body, - session: req.session, - company : company, - department : department, + Promise.try(function () { + return promise_to_extract_company_and_department(department_id, req.body, req.session, req); }) - .then(function(){ - req.session.flash_message('Department ' + department.name + ' was updated'); - return Promise.resolve(1); - }); - }) - - .then(function(){ - return res.redirect_with_session('.'); - }) - - .catch(function(error){ - console.error( - 'An error occurred when trying to update secondary superwisors for depertment '+department_id - +' by user '+req.user.id + ' : ' + error - ); - - req.session.flash_error( - "Failed to update department's details" - ); - - return res.redirect_with_session('../../'); - }); + .then(function (result) { + + company = result.company; + department = result.department; + }) + + .then(function () { + if (req.body.remove_supervisor_id) { + return promise_to_remove_supervisor({ + supervisor_id: params.remove_supervisor_id, + company: company, + department: department, + }) + .then(function () { + req.session.flash_message('Supervisor was removed from ' + department.name); + return Promise.resolve(1); + }); + } else if (req.body.do_add_supervisors) { + return promise_to_update_supervisors({ + params: req.body, + session: req.session, + company: company, + department: department, + }) + .then(function () { + req.session.flash_message('Supervisors were added to department ' + department.name); + return Promise.resolve(1); + }); + } + + return promise_to_update_department({ + params: req.body, + session: req.session, + company: company, + department: department, + }) + .then(function () { + req.session.flash_message('Department ' + department.name + ' was updated'); + return Promise.resolve(1); + }); + }) + + .then(function () { + return res.redirect_with_session('.'); + }) + + .catch(function (error) { + console.error( + 'An error occurred when trying to update secondary superwisors for depertment ' + department_id + + ' by user ' + req.user.id + ' : ' + error + , error.stack); + + req.session.flash_error( + "Failed to update department's details" + ); + + return res.redirect_with_session('../../'); + }); }); function promise_to_remove_supervisor(args) { - var - supervisor_id = args.supervisor_id, - company = args.company, - department = args.department; - - // Make sure that provided supervisor ID belongs to user from current company - if (company.users.map(function(u){return String(u.id)}).indexOf( String(supervisor_id) ) === -1){ - return Promise.resolve(1); - } - - return department.Model.sequelize.models.DepartmentSupervisor.destroy({ - where : { - department_id : department.id, - user_id : supervisor_id, - }, - }); + var + supervisor_id = args.supervisor_id, + company = args.company, + department = args.department; + + // Make sure that provided supervisor ID belongs to user from current company + if (company.users.map(function (u) { + return String(u.id) + }).indexOf(String(supervisor_id)) === -1) { + return Promise.resolve(1); + } + + return department.Model.sequelize.models.DepartmentSupervisor.destroy({ + where: { + department_id: department.id, + user_id: supervisor_id, + }, + }); } function promise_to_update_supervisors(args) { - var - params = args.params, - session = args.session, - company = args.company, - department = args.department; + var + params = args.params, + session = args.session, + company = args.company, + department = args.department; var supervisor_ids = params.supervisor_id || []; - // Take list of all users as a base of intersaction, - // so we use submitted data only as criteria and do not save it in database - supervisor_ids = company.users - .map(function(user){ return user.id}) - .filter(function(id){ return supervisor_ids.indexOf(String(id)) !== -1}); + // Take list of all users as a base of intersaction, + // so we use submitted data only as criteria and do not save it in database + supervisor_ids = company.users + .map(function (user) { + return user.id + }) + .filter(function (id) { + return supervisor_ids.indexOf(String(id)) !== -1 + }); + + var link_model = department.Model.sequelize.models.DepartmentSupervisor; + + return link_model.destroy({ + where: { + department_id: department.id, + } + }) + .then(function () { + return link_model.bulkCreate( + supervisor_ids.map(function (id) { + return {user_id: id, department_id: department.id} + }) + ); + }); +} - var link_model = department.Model.sequelize.models.DepartmentSupervisor; +function promise_to_update_department(args) { + var + params = args.params, + session = args.session, + company = args.company, + department = args.department; + + var attributes = get_and_validate_department({ + company: company, + department_name: department.name, + no_suffix: true, + params: params, + session: session + }); - return link_model.destroy({ - where : { - department_id : department.id, + // If there were any validation errors: do not update department + if (session.flash_has_errors()) { + throw new Error("Invalid parameters submitted while while attempt to update department details"); } - }) - .then(function(){ - return link_model.bulkCreate( - supervisor_ids.map(function(id){ return { user_id : id, department_id : department.id } }) - ); - }); -} -function promise_to_update_department(args) { - var - params = args.params, - session = args.session, - company = args.company, - department = args.department; - - var attributes = get_and_validate_department({ - company : company, - department_name : department.name, - no_suffix : true, - params: params, - session: session - }); - - // If there were any validation errors: do not update department - if ( req.session.flash_has_errors() ) { - throw new Error("Invalid parameters submitted while while attempt to update department details"); - } - - return department.updateAttributes(attributes); + return department.updateAttributes(attributes); } -router.get('/departments/available-supervisors/:department_id/', function(req, res){ +router.get('/departments/available-supervisors/:department_id/', function (req, res) { var department_id = req.params.department_id, - department, - company; + department, + company; - Promise.try(function(){ - return promise_to_extract_company_and_department(req.query, req.session); - }) - - .then(function(result){ - department = result.department; - company = result.company; - - return department.promise_me_with_supervisors(); - }) - - .then(function(department_with_supervisors){ - - var supervisor_map = {}; - - department_with_supervisors.supervisors.forEach(function(user){ - supervisor_map[user.id] = true; - }); + Promise.try(function () { + return promise_to_extract_company_and_department(department_id, req.query, req.session, req); + }) - res.render('department/available_supervisors', { - layout : false, - users : _.map( - _.filter(company.users, function(user){ return user.id !== department.bossId }), - function(user){ user._marked = supervisor_map[user.id]; return user } - ), - }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to get all availabele superviers for department '+department_id - +' for user '+req.user.id + ' : ' + error - ); - - res.send('REQUEST FAILED'); - }); + .then(function (result) { + department = result.department; + company = result.company; + + return department.promise_me_with_supervisors(); + }) + + .then(function (department_with_supervisors) { + + var supervisor_map = {}; + + department_with_supervisors.supervisors.forEach(function (user) { + supervisor_map[user.id] = true; + }); + + res.render('department/available_supervisors', { + layout: false, + users: _.map( + _.filter(company.users, function (user) { + return user.id !== department.bossId + }), + function (user) { + user._marked = supervisor_map[user.id]; + return user + } + ), + }); + }) + .catch(function (error) { + console.error( + 'An error occurred when trying to get all availabele superviers for department ' + department_id + + ' for user ' + req.user.id + ' : ' + error + , error.stack); + + res.send('REQUEST FAILED'); + }); }); module.exports = router; diff --git a/lib/route/login.js b/lib/route/login.js index 160514df4..a00a49416 100644 --- a/lib/route/login.js +++ b/lib/route/login.js @@ -196,7 +196,7 @@ module.exports = function(passport) { console.error( 'An error occurred when trying to register new user ' + email + ' : ' + error - ); + , error.stack); req.session.flash_error( 'Failed to register user please contact customer service.'+ @@ -265,7 +265,7 @@ module.exports = function(passport) { return res.redirect_with_session('./'); } - console.error('An error occurred while submittin forgot password form: '+error); + console.error('An error occurred while submittin forgot password form: ' + error, error.stack); req.session.flash_error('Failed to proceed with submitted data.'); return res.redirect_with_session('./'); }); @@ -359,7 +359,7 @@ module.exports = function(passport) { res.redirect_with_session('/import-company/'); }) .catch(function(error){ - req.session.flash_error('Failed to import company, due to error: '+error); + req.session.flash_error('Failed to import company, due to error: ' + error, error.stack); res.redirect_with_session('/import-company/'); }); diff --git a/lib/route/reports.js b/lib/route/reports.js index 402c04362..6ba07aa22 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -63,7 +63,7 @@ router.get('/allowancebytime/', (req, res) => { .catch(error => { console.error( 'An error occured when user ' + req.user.id + - ' tried to access /reports/allowancebytime page: ' + error + ' tried to access /reports/allowancebytime page: ', error, error.stack ); let diff --git a/lib/route/requests.js b/lib/route/requests.js index e24d78af6..be319cfee 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -37,7 +37,7 @@ function leave_request_action(args) { var request_id = validator.trim(req.body.request); - if (!validator.isNumeric(request_id)){ + if (typeof request_id !== 'number' && (!request_id || !validator.isNumeric(request_id))) { req.session.flash_error('Failed to ' + current_action); } @@ -98,7 +98,7 @@ function leave_request_action(args) { .catch(function(error){ console.error('An error occurred when attempting to '+current_action +' leave request '+request_id+' by user '+req.user.id+' Error: '+error - ); + , error.stack); req.session.flash_error('Failed to '+current_action); return res.redirect_with_session('../'); }); @@ -168,7 +168,7 @@ router.post('/cancel/', function(req, res){ req.session.flash_message('The leave request was canceled'); }) .catch(function(error){ - console.log('An error occurred: '+error); + console.log('An error occurred: ' + error, error.stack); req.session.flash_error('Failed to cancel leave request'); }) .finally(function(){ @@ -184,7 +184,7 @@ router.post( // TODO NOTE revoke action now could be made from more then one place, // so make sure that user is redirected to correct place - if (!validator.isNumeric(request_id)){ + if (typeof request_id !== 'number' && (!request_id || !validator.isNumeric(request_id))) { req.session.flash_error('Failed to revoke leave request'); } diff --git a/lib/route/settings.js b/lib/route/settings.js index 920facd60..0085ecb62 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -62,9 +62,9 @@ router.post('/company/', function(req, res){ country_code = validator.trim(req.body.country), date_format = validator.trim(req.body.date_format), timezone = validator.trim(req.body.timezone), - share_all_absences = req.body.share_all_absences && validator.toBoolean( + share_all_absences = (req.body.share_all_absences && validator.toBoolean( req.body.share_all_absences - ); + )) || false; if (!validator.isAlphanumeric(country_code)){ req.session.flash_error('Country should contain only letters and numbers'); @@ -110,7 +110,7 @@ router.post('/company/', function(req, res){ console.error( 'An error occurred when trying to edit company for user ' + req.user.id + ' : ' + error - ); + , error.stack); req.session.flash_error( 'Failed to update company details, please contact customer service' @@ -189,7 +189,7 @@ router.post('/schedule/', function(req, res){ // Action failed .catch(function(error){ - console.error('An error occurred while saving schedule: ' + error); + console.error('An error occurred while saving schedule: ' + error, error.stack); req.session.flash_error( schedule.is_user_specific() ? 'Failed to save user schedule' : 'Failed to save company schedule' @@ -207,8 +207,8 @@ router.post('/schedule/', function(req, res){ }); router.post('/bankholidays/', function(req,res){ - var name = validator.trim(req.body['name__new']), - date = validator.trim(req.body['date__new']), + var name = req.body.name__new && validator.trim(req.body.name__new), + date = req.body.date__new && validator.trim(req.body.date__new), model= req.app.get('db_model'); req.user.getCompany({ @@ -219,7 +219,7 @@ router.post('/bankholidays/', function(req,res){ var promise_new_bank_holiday = Promise.resolve(1); - if (validator.trim(req.body['name__new'])) { + if (name) { var attributes = get_and_validate_bank_holiday({ params: req.body, req : req, @@ -264,6 +264,7 @@ router.post('/bankholidays/', function(req,res){ .then(function(){ if ( req.session.flash_has_errors() ) { + console.log("req.session.flash_has_errors()", res.locals.flash.errors) return res.redirect_with_session('/settings/general/'); } else { req.session.flash_message('Changes to bank holidays were saved'); @@ -274,7 +275,7 @@ router.post('/bankholidays/', function(req,res){ console.error( 'An error occurred when trying to edit Bank holidays by user '+req.user.id + ' : ' + error - ); + , error.stack); req.session.flash_error( 'Failed to update bank holidayes details, please contact customer service' @@ -358,7 +359,7 @@ router.post('/bankholidays/delete/:bank_holiday_number/', function(req, res){ var model = req.app.get('db_model'); - if (!validator.isInt(bank_holiday_number)) { + if (typeof bank_holiday_number !== 'number' && (!bank_holiday_number || !validator.isInt(bank_holiday_number))) { console.error( 'User '+req.user.id+' submited non-int bank holiday number ' +bank_holiday_number @@ -470,7 +471,7 @@ router.post('/leavetypes/delete/:leave_type_id/', function(req, res){ var model = req.app.get('db_model'); - if (!validator.isInt(leave_type_id)) { + if (typeof leave_type_id !== 'number' && (!leave_type_id || !validator.isInt(leave_type_id))) { console.error( 'User '+req.user.id+' submited non-int leave_type number ' +bank_holiday_number @@ -521,7 +522,7 @@ router.post('/leavetypes/delete/:leave_type_id/', function(req, res){ console.error( 'An error occurred when trying to remove leave type by user' + req.user.id + ' : ' + error - ); + , error.stack); req.session.flash_error( 'Failed to remove Leave Type' @@ -592,7 +593,7 @@ router.post('/company/authentication/', function(req, res){ .catch(function(error){ error = new Error( "Failed to validate new LDAP settings with provided current user password. "+error - ); + , error.stack); error.show_to_user = true; throw error; }); @@ -609,7 +610,7 @@ router.post('/company/authentication/', function(req, res){ .catch(function(error){ console.error( "An error occured while trying to update LDAP configuration: %s", error - ); + , error.stack); req.session.flash_error( 'Failed to update LDAP configuration. ' + @@ -684,8 +685,7 @@ function get_and_validate_leave_type(args) { throw_user_error( 'New color for '+item_name+' should be valid css class' ); } - console.log("limit", typeof limit); - if (typeof limit !== 'number' && !validator.isNumeric(limit)) { + if (typeof limit !== 'number' && (!limit || !validator.isNumeric(limit))) { throw_user_error( 'New limit for '+item_name+' should be a valide number' ); } else if ( limit < 0) { @@ -711,7 +711,7 @@ function get_and_validate_ldap_auth_configuration(args) { binddn = validator.trim(params.binddn), bindcredentials = validator.trim(params.bindcredentials), searchbase = validator.trim(params.searchbase), - ldap_auth_enabled = params.ldap_auth_enabled && validator.toBoolean(params.ldap_auth_enabled), + ldap_auth_enabled = (params.ldap_auth_enabled && validator.toBoolean(params.ldap_auth_enabled)) || false, // Fetch the password of current user that is valid in LDAP system password_to_check = validator.trim(params.password_to_check); diff --git a/lib/route/users.js b/lib/route/users.js index 0669eaf74..229bfbf0e 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -94,7 +94,7 @@ router.post('/add/', function(req, res){ .catch(function(error){ console.log( 'An error occurred when trying to add new user account by user '+req.user.id - ); + , error.stack); console.dir(error); if ( error && error.tom_error) { @@ -188,7 +188,7 @@ router.post('/import/', function(req, res){ 'An error occurred when trying to import users for company' + req.user.companyId + '. Reason: ' + Exception.extract_system_error_message(error) - ); + , error.stack); req.session.flash_error( 'Failed to import users, reason: ' + Exception.extract_user_error_message(error) @@ -252,7 +252,7 @@ router.get('/edit/:user_id/', function(req, res){ console.error( 'An error occurred when trying to open employee details by user '+req.user.id + ' : ' + error - ); + , error.stack); return res.redirect_with_session('../../'); }); @@ -342,7 +342,7 @@ router.get('/edit/:user_id/absences/', function(req, res){ console.error( 'An error occurred when trying to open employee absences by user '+req.user.id + ' : ' + error - ); + , error.stack); return res.redirect_with_session('../../../'); }); @@ -378,7 +378,7 @@ router.get('/edit/:user_id/schedule/', function(req, res){ console.error( 'An error occurred when trying to open employee absences by user '+req.user.id + ' : ' + error - ); + , error.stack); return res.redirect_with_session('../../../'); }); @@ -408,7 +408,7 @@ var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args){ // new "end_date" is provided // new "end_date" is in future new_user_attributes.end_date && - moment.utc( new_user_attributes.end_date ).startOf('day').toDate() >= req.user.company.get_today().startOf('day').toDate() + moment.utc(new_user_attributes.end_date).startOf('day').toDate() >= req.user.company.get_today().startOf('day').toDate() ) ) ) { @@ -581,7 +581,7 @@ router.post('/edit/:user_id/', function(req, res){ console.error( 'An error occurred when trying to save chnages to user account by user '+req.user.id + ' : ' + error - ); + , error.stack); req.session.flash_error( 'Failed to save changes.' @@ -621,7 +621,7 @@ router.post('/delete/:user_id/', function(req, res){ console.error( 'An error occurred when trying to remove user '+user_id+' by user ' + req.user.id + '. Error: ' + error - ); + , error.stack); req.session.flash_error( 'Failed to remove user. ' + error @@ -677,7 +677,7 @@ router.get('/', function(req, res) { users_filter = {}, model = req.app.get('db_model'); - if (department_id && validator.isNumeric(department_id)) { + if (typeof department_id === 'number' || (department_id && validator.isNumeric(department_id))) { users_filter = { DepartmentId : department_id }; } else { department_id = undefined; @@ -903,8 +903,8 @@ function get_and_validate_user_parameters(args) { adjustment = params.adjustment && validator.trim(params.adjustment), password = params.password_one && validator.trim(params.password_one), password_confirm = params.password_confirm && validator.trim(params.password_confirm), - admin = params.admin && validator.toBoolean(params.admin), - auto_approve = params.auto_approve && validator.toBoolean(params.auto_approve); + admin = (params.admin && validator.toBoolean(params.admin)) || false, + auto_approve = (params.auto_approve && validator.toBoolean(params.auto_approve)) || false; // Validate provided parameters @@ -916,7 +916,7 @@ function get_and_validate_user_parameters(args) { ); } - if (!validator.isNumeric(department_id)) { + if (typeof department_id !== 'number' && (!department_id || !validator.isNumeric(department_id))) { req.session.flash_error( 'New department number of '+item_name+' should be a valid number' ); @@ -1002,7 +1002,7 @@ function ensure_user_id_is_integer(args){ var req = args.req, user_id = args.user_id; - if (! validator.isInt(user_id)){ + if (typeof user_id !== 'number' && (!user_id || !validator.isInt(user_id))) { throw new Error( 'User '+req.user.id+' tried to edit user with non-integer ID: '+user_id ); diff --git a/lib/route/validator/leave_request.js b/lib/route/validator/leave_request.js index 5897a045b..ee363c4a6 100644 --- a/lib/route/validator/leave_request.js +++ b/lib/route/validator/leave_request.js @@ -9,21 +9,19 @@ module.exports = function(args){ var req = args.req, params = args.params; - console.log("params", params); - - var user = params.user && validator.trim(params.user), - leave_type = params.leave_type && validator.trim(params.leave_type), - from_date = params.from_date && validator.trim(params.from_date), - from_date_part = params.from_date_part && validator.trim(params.from_date_part), - to_date = params.to_date && validator.trim(params.to_date), - to_date_part = params.to_date_part && validator.trim(params.to_date_part), - reason = params.reason && validator.trim(params.reason); - - if (user && !validator.isNumeric(user)){ + var user = typeof params.user !== 'undefined' && validator.trim(params.user), + leave_type = typeof params.leave_type !== 'undefined' && validator.trim(params.leave_type), + from_date = typeof params.from_date !== 'undefined' && validator.trim(params.from_date), + from_date_part = typeof params.from_date_part !== 'undefined' && validator.trim(params.from_date_part), + to_date = typeof params.to_date !== 'undefined' && validator.trim(params.to_date), + to_date_part = typeof params.to_date_part !== 'undefined' && validator.trim(params.to_date_part), + reason = typeof params.reason !== 'undefined' && validator.trim(params.reason); + + if (typeof user !== 'undefined' && typeof user !== 'number' && (!user || !validator.isNumeric(user))) { req.session.flash_error('Incorrect employee'); } - if (!leave_type || !validator.isNumeric(leave_type)) { + if (typeof leave_type !== 'number' && (!leave_type || !validator.isNumeric(leave_type))) { req.session.flash_error('Incorrect leave type'); } @@ -59,7 +57,9 @@ module.exports = function(args){ // Check if it makes sence to continue validation (as following code relies on // to and from dates to be valid ones) if ( req.session.flash_has_errors() ) { - throw new Error( 'Got validation errors' ); + const error = new Error('Got validation errors'); + error.flash = req.session.flash; + throw error; } // Convert dates inot format used internally @@ -71,7 +71,9 @@ module.exports = function(args){ } if ( req.session.flash_has_errors() ) { - throw new Error( 'Got validation errors' ); + const error = new Error('Got validation errors'); + error.flash = req.session.flash; + throw error; } var valid_attributes = { diff --git a/package.json b/package.json index a115b4ccf..8d331e129 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "chai": "^4.1.2", "mocha": "^5.0.5", "node-sass": "^4.5.3", - "selenium-webdriver": "4.0.0-alpha.1" + "selenium-webdriver": "^3.6.0" }, "scripts": { "test": "node node_modules/mocha/bin/mocha --recursive t/*", diff --git a/t/integration/bank_holidays/crud_bank_holiday.js b/t/integration/bank_holidays/crud_bank_holiday.js index b72f6ff9a..5322b62c3 100644 --- a/t/integration/bank_holidays/crud_bank_holiday.js +++ b/t/integration/bank_holidays/crud_bank_holiday.js @@ -94,7 +94,7 @@ describe('CRUD for bank holidays', function(){ .then(function(){done()}); }); - test.it("Add new bank holiday to be in the beginning of the list", function(done){ + it("Add new bank holiday to be in the beginning of the list", function (done) { driver.findElement(By.css('#add_new_bank_holiday_btn')) .then(function(el){ return el.click() }) .then(function(){ diff --git a/t/integration/leave_request/ovelapping_bookings_halfs.js b/t/integration/leave_request/ovelapping_bookings_halfs.js index 520d4101e..82a7e1194 100644 --- a/t/integration/leave_request/ovelapping_bookings_halfs.js +++ b/t/integration/leave_request/ovelapping_bookings_halfs.js @@ -42,7 +42,7 @@ describe('Overlapping leaverequest (with halfs)', function(){ var non_admin_user_email, new_user_email, driver; - test.it('Create new company', function(done){ + it('Create new company', function (done) { register_new_user_func({ application_host : application_host, }) diff --git a/t/integration/leave_request/rendering_of_halves.js b/t/integration/leave_request/rendering_of_halves.js index fbc36ea88..99e064d75 100644 --- a/t/integration/leave_request/rendering_of_halves.js +++ b/t/integration/leave_request/rendering_of_halves.js @@ -24,7 +24,7 @@ describe('Ensure that leaves with not full days are rendered properly', function var non_admin_user_email, new_user_email, driver; - test.it('Create new company', done => { + it('Create new company', done => { register_new_user_func({ application_host : application_host, }) diff --git a/t/integration/team_view/basic_wall_chart.js b/t/integration/team_view/basic_wall_chart.js index 7b317c2bb..ef409c572 100644 --- a/t/integration/team_view/basic_wall_chart.js +++ b/t/integration/team_view/basic_wall_chart.js @@ -94,7 +94,7 @@ describe('Check basic scenario for Team view page', function(){ var driver, user_A, user_B, user_C; - test.it('Performing registration process', function( done ){ + it('Performing registration process', function (done) { register_new_user_func({ application_host : application_host, }) diff --git a/t/lib/register_new_user.js b/t/lib/register_new_user.js index d642a3318..e02bc8466 100644 --- a/t/lib/register_new_user.js +++ b/t/lib/register_new_user.js @@ -36,7 +36,7 @@ var register_new_user_func = Promise.promisify( function(args, callback){ // driver.manage().timeouts().implicitlyWait(10*1000); // Make sure we are in desktop version - driver.manage().window().setSize(1024, 768); + //driver.manage().window().setSize(1024, 768); // Go to front page driver.get( application_host ); From 3b95cc617d2d36ae6a27ced1d34f567ceea1e6bd Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 13:53:13 +0200 Subject: [PATCH 170/539] leave request check for user --- lib/route/validator/leave_request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/route/validator/leave_request.js b/lib/route/validator/leave_request.js index ee363c4a6..f783b717a 100644 --- a/lib/route/validator/leave_request.js +++ b/lib/route/validator/leave_request.js @@ -17,7 +17,7 @@ module.exports = function(args){ to_date_part = typeof params.to_date_part !== 'undefined' && validator.trim(params.to_date_part), reason = typeof params.reason !== 'undefined' && validator.trim(params.reason); - if (typeof user !== 'undefined' && typeof user !== 'number' && (!user || !validator.isNumeric(user))) { + if (typeof user !== 'undefined' && user && typeof user !== 'number' && (!user || !validator.isNumeric(user))) { req.session.flash_error('Incorrect employee'); } From 6af80a97c7d8a7073b47cd05392d12ed956499d5 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:00:10 +0200 Subject: [PATCH 171/539] leave request check for user --- lib/route/departments.js | 2 +- lib/route/requests.js | 2 +- lib/route/settings.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/route/departments.js b/lib/route/departments.js index 239c2a0d1..a724ea270 100644 --- a/lib/route/departments.js +++ b/lib/route/departments.js @@ -143,7 +143,7 @@ router.post('/departments/', function (req, res) { .catch(error => { console.error( 'An error occurred when trying to add department by user ' + req.user.id - + ' : ' + error + + ' : ', error, error.stack ); req.session.flash_error( diff --git a/lib/route/requests.js b/lib/route/requests.js index be319cfee..0db68075b 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -274,7 +274,7 @@ router.post( // Deal with issues if any occurs .catch(error => { console.error('An error occurred when attempting to revoke leave request ' - +request_id+' by user '+req.user.id+' Error: '+error + + request_id + ' by user ' + req.user.id + ' Error: ', error, error.stack ); req.session.flash_error('Failed to revoke leave request'); return res.redirect_with_session('../'); diff --git a/lib/route/settings.js b/lib/route/settings.js index 0085ecb62..11424302c 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -335,7 +335,7 @@ router.post('/bankholidays/import/', (req, res) => { .catch(error => { console.log( - 'An error occurred when trying to import default bank holidays by user '+req.user.id + 'An error occurred when trying to import default bank holidays by user ' + req.user.id, error, error.stack ); console.dir(error); @@ -449,7 +449,7 @@ router.post('/leavetypes', function(req, res){ .catch(error => { console.error( 'An error occurred when trying to edit Leave types by user '+req.user.id - + ' : ' + error + + ' : ', error , error.stack); if (error.hasOwnProperty('user_message')) { From e2cd8979ce2acaf398ee55373126895bb9479011 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:13:37 +0200 Subject: [PATCH 172/539] smtp --- lib/email.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/email.js b/lib/email.js index dddd3aa7c..dda067f8b 100644 --- a/lib/email.js +++ b/lib/email.js @@ -8,8 +8,9 @@ handlebars = require('express-handlebars').create({ helpers : require('./view/helpers')(), }), config = require('./config'), -nodemailer = require('nodemailer'), -smtpTransport = require('nodemailer-smtp-transport'); + nodemailer = require('nodemailer'); + +// smtpTransport = require('nodemailer-smtp-transport'); function Email(){ @@ -89,9 +90,9 @@ Email.prototype.get_send_email = function(){ }; } - var transporter = nodemailer.createTransport(smtpTransport( + var transporter = nodemailer.createTransport( config.get("email_transporter") - )); + ); var send_mail = bluebird.promisify(transporter.sendMail, transporter); From f4a1a9746f9cd401fe29d0108f98d916d8a378d9 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:15:51 +0200 Subject: [PATCH 173/539] smtp --- lib/email.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/email.js b/lib/email.js index dda067f8b..24293cb14 100644 --- a/lib/email.js +++ b/lib/email.js @@ -94,9 +94,14 @@ Email.prototype.get_send_email = function(){ config.get("email_transporter") ); - var send_mail = bluebird.promisify(transporter.sendMail, transporter); + return new Promise(function (resolve, reject) { + transporter.sendMail(transporter, function (err, result) { + if (err) return reject(err); + resolve(result); + }); + } - return send_mail; + // return send_mail; }; // Send registration complete email for provided user From e2ef64f79166eb390ffb6be1632b5acfc40e6839 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:16:50 +0200 Subject: [PATCH 174/539] email?= --- lib/email.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/email.js b/lib/email.js index 24293cb14..3fd2497a2 100644 --- a/lib/email.js +++ b/lib/email.js @@ -94,11 +94,13 @@ Email.prototype.get_send_email = function(){ config.get("email_transporter") ); - return new Promise(function (resolve, reject) { - transporter.sendMail(transporter, function (err, result) { - if (err) return reject(err); - resolve(result); - }); + return function (data) { + return new Promise(function (resolve, reject) { + transporter.sendMail(data, function (err, result) { + if (err) return reject(err); + resolve(result); + }); + } } // return send_mail; From c57fe7cba44a60324566f4bc6f60518fcd51ffc8 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:17:31 +0200 Subject: [PATCH 175/539] email?= --- lib/email.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/email.js b/lib/email.js index 3fd2497a2..e8622a39b 100644 --- a/lib/email.js +++ b/lib/email.js @@ -100,7 +100,7 @@ Email.prototype.get_send_email = function(){ if (err) return reject(err); resolve(result); }); - } + }); } // return send_mail; From 045fbabd0f4064c7d4187c1cf79dd427779a3ba8 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:21:12 +0200 Subject: [PATCH 176/539] email?= --- lib/email.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/email.js b/lib/email.js index e8622a39b..bc45775ca 100644 --- a/lib/email.js +++ b/lib/email.js @@ -91,14 +91,20 @@ Email.prototype.get_send_email = function(){ } var transporter = nodemailer.createTransport( - config.get("email_transporter") + config.get("email_transporter") ); return function (data) { + console.log("MAIL", data); return new Promise(function (resolve, reject) { - transporter.sendMail(data, function (err, result) { - if (err) return reject(err); - resolve(result); + console.log("sendMail", data); + transporter.sendMail(data, function (err, info) { + if (err) { + console.log("MAIL: ERROR", err); + return reject(err); + } + console.log("MAIL: GOOD TO GO", info); + resolve(info); }); }); } From fdad5f004f28d63a3adb74a9bf9afe23ab69b7b5 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:22:16 +0200 Subject: [PATCH 177/539] email?= --- lib/email.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/email.js b/lib/email.js index bc45775ca..467e175e7 100644 --- a/lib/email.js +++ b/lib/email.js @@ -10,7 +10,7 @@ handlebars = require('express-handlebars').create({ config = require('./config'), nodemailer = require('nodemailer'); -// smtpTransport = require('nodemailer-smtp-transport'); +smtpTransport = require('nodemailer-smtp-transport'); function Email(){ @@ -90,9 +90,9 @@ Email.prototype.get_send_email = function(){ }; } - var transporter = nodemailer.createTransport( + var transporter = nodemailer.createTransport(smtpTransport( config.get("email_transporter") - ); + )); return function (data) { console.log("MAIL", data); From 7a7c105278d0c96efacdc065a2d089c66d0335b6 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 14:23:20 +0200 Subject: [PATCH 178/539] email?= --- lib/email.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/email.js b/lib/email.js index 467e175e7..16de4bebe 100644 --- a/lib/email.js +++ b/lib/email.js @@ -8,8 +8,7 @@ handlebars = require('express-handlebars').create({ helpers : require('./view/helpers')(), }), config = require('./config'), - nodemailer = require('nodemailer'); - + nodemailer = require('nodemailer'), smtpTransport = require('nodemailer-smtp-transport'); function Email(){ From 97f4a649e08f389ccbb1c17c59da718c467cbee7 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 16:09:09 +0200 Subject: [PATCH 179/539] email?= --- lib/email.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/email.js b/lib/email.js index 16de4bebe..0b27c8883 100644 --- a/lib/email.js +++ b/lib/email.js @@ -15,6 +15,10 @@ function Email(){ }; +var transporter = nodemailer.createTransport(smtpTransport( + config.get("email_transporter") +)); + // This is a little helper that ensure that data in context are in a shape // suitable for usage in templates // @@ -89,10 +93,6 @@ Email.prototype.get_send_email = function(){ }; } - var transporter = nodemailer.createTransport(smtpTransport( - config.get("email_transporter") - )); - return function (data) { console.log("MAIL", data); return new Promise(function (resolve, reject) { From 7ea4407ff381dcc87977acd0bcfe0bc2490d5429 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Apr 2018 16:23:30 +0200 Subject: [PATCH 180/539] asnyc mails --- lib/email.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/email.js b/lib/email.js index 0b27c8883..78389d13f 100644 --- a/lib/email.js +++ b/lib/email.js @@ -93,19 +93,20 @@ Email.prototype.get_send_email = function(){ }; } + // we do not wait for mails..just send them in background + return function (data) { - console.log("MAIL", data); - return new Promise(function (resolve, reject) { - console.log("sendMail", data); - transporter.sendMail(data, function (err, info) { - if (err) { - console.log("MAIL: ERROR", err); - return reject(err); - } - console.log("MAIL: GOOD TO GO", info); - resolve(info); - }); + //return new Promise(function (resolve, reject) { + transporter.sendMail(data, function (err, info) { + if (err) { + console.error("error sending mail", err); + return reject(err); + } + //resolve(info); }); + + return Promise.resolve(); + //}); } // return send_mail; From f8bff3864af43d7802f39d8c48d47757f07fc8b7 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 17 Apr 2018 18:18:38 +0200 Subject: [PATCH 181/539] merged title and slack PR (by Morthor) --- lib/route/departments.js | 45 ++-------------------------------------- lib/route/users.js | 16 +------------- 2 files changed, 3 insertions(+), 58 deletions(-) diff --git a/lib/route/departments.js b/lib/route/departments.js index f2d583890..52cd9cb9d 100644 --- a/lib/route/departments.js +++ b/lib/route/departments.js @@ -86,7 +86,6 @@ router.get('/departments/', function (req, res) { var company_for_template, model = req.app.get('db_model'); -<<<<<<< HEAD req.user.getCompany({ scope: ['with_active_users', 'order_by_active_users'], }) @@ -99,32 +98,12 @@ router.get('/departments/', function (req, res) { }) .then(function (departments) { res.render('departments_overview', { - title: 'Departments settings', + title: 'Settings - Departments | TimeOff', departments: departments, allowance_options: generate_all_department_allowances(), company: company_for_template, }); }); -======= - req.user.getCompany({ - scope : ['with_active_users', 'order_by_active_users'], - }) - .then(function(company){ - 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 : 'Settings - Departments | TimeOff', - departments : departments, - allowance_options : generate_all_department_allowances(), - company : company_for_template, - }); - }); ->>>>>>> f96c996b7dd4aa390ebf20533987316fc0a490e1 }); router.post('/departments/', function (req, res) { @@ -474,8 +453,6 @@ router.get('/departments/available-supervisors/:department_id/', function (req, Promise.try(function () { return promise_to_extract_company_and_department(department_id, req.query, req.session, req); }) - -<<<<<<< HEAD .then(function (result) { department = result.department; company = result.company; @@ -502,6 +479,7 @@ router.get('/departments/available-supervisors/:department_id/', function (req, return user } ), + title: 'Settings - Department Available Supervisors | TimeOff', }); }) .catch(function (error) { @@ -512,25 +490,6 @@ router.get('/departments/available-supervisors/:department_id/', function (req, res.send('REQUEST FAILED'); }); -======= - res.render('department/available_supervisors', { - layout : false, - users : _.map( - _.filter(company.users, function(user){ return user.id !== department.bossId }), - function(user){ user._marked = supervisor_map[user.id]; return user } - ), - title: 'Settings - Department Available Supervisors | TimeOff', - }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to get all availabele superviers for department '+department_id - +' for user '+req.user.id + ' : ' + error - ); - - res.send('REQUEST FAILED'); - }); ->>>>>>> f96c996b7dd4aa390ebf20533987316fc0a490e1 }); module.exports = router; diff --git a/lib/route/users.js b/lib/route/users.js index 0beb25afe..c6a33b378 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -911,9 +911,9 @@ function get_and_validate_user_parameters(args) { require_password = args.require_password || false; // Get user parameters -<<<<<<< HEAD var name = params.name && validator.trim(params.name), lastname = params.lastname && validator.trim(params.lastname), + slack_username = params.slack_username && validator.trim(params.slack_username), email = params.email_address && validator.trim(params.email_address), department_id = params.department && validator.trim(params.department), start_date = params.start_date && validator.trim(params.start_date), @@ -923,20 +923,6 @@ function get_and_validate_user_parameters(args) { password_confirm = params.password_confirm && validator.trim(params.password_confirm), admin = (params.admin && validator.toBoolean(params.admin)) || false, auto_approve = (params.auto_approve && validator.toBoolean(params.auto_approve)) || false; -======= - var name = validator.trim(req.param('name')), - lastname = validator.trim(req.param('lastname')), - slack_username = validator.trim(req.param('slack_username')), - email = validator.trim(req.param('email_address')), - department_id = validator.trim(req.param('department')), - start_date = validator.trim(req.param('start_date')), - end_date = validator.trim(req.param('end_date')), - adjustment = validator.trim(req.param('adjustment')), - password = validator.trim(req.param('password_one')), - password_confirm = validator.trim(req.param('password_confirm')), - admin = validator.toBoolean(req.param('admin')), - auto_approve = validator.toBoolean(req.param('auto_approve')); ->>>>>>> f96c996b7dd4aa390ebf20533987316fc0a490e1 // Validate provided parameters From 9954b5929e31983d40da8cd93d38163ef8429011 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 17 Apr 2018 18:18:55 +0200 Subject: [PATCH 182/539] rm logs --- lib/route/users.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/route/users.js b/lib/route/users.js index c6a33b378..2833a4804 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -926,9 +926,7 @@ function get_and_validate_user_parameters(args) { // Validate provided parameters - console.log('>>>>> ' + email); if (!email || !validator.isEmail(email)) { - console.log('>>>>>: ' + email); req.session.flash_error( 'New email of '+item_name+' should be valid email address' ); From dde1ea77b2dca584cd7ed5d918b34d1c89606c71 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 17 Apr 2018 18:42:22 +0200 Subject: [PATCH 183/539] revert calendar --- lib/route/calendar.js | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/lib/route/calendar.js b/lib/route/calendar.js index dc43cb537..63407a99b 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -122,29 +122,25 @@ router.get('/', function(req, res) { req.user.promise_allowance({ year : current_year }), function(calendar, company, user, supervisors, user_allowance){ let - full_leave_type_statistics = user.get_leave_statistics_by_types(), - this_year = moment.utc().format('YYYY'); - - user - .promise_number_of_days_available_in_allowance( this_year ) - .then( number_of_days_available_in_allowance => res - .render('calendar', { - calendar : _.map(calendar, function(c){return c.as_for_template()}), - company : company, + full_leave_type_statistics = user.get_leave_statistics_by_types(); + + res.render('calendar', { + calendar: _.map(calendar, function (c) { + return c.as_for_template() + }), + company: company, title: 'Calendar | TimeOff', - current_user : user, - supervisors : supervisors, - previous_year : moment.utc(current_year).add(-1,'year').format('YYYY'), - current_year : current_year.format('YYYY'), - next_year : moment.utc(current_year).add(1,'year').format('YYYY'), - show_full_year : show_full_year, - leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), - full_leave_type_statistics : full_leave_type_statistics, - this_year : this_year, - number_of_days_available_in_allowance : number_of_days_available_in_allowance, - total_number_of_days_in_allowance : total_number_of_days_in_allowance, - }) - ); + current_user: user, + supervisors: supervisors, + previous_year: moment.utc(current_year).add(-1, 'year').format('YYYY'), + current_year: current_year.format('YYYY'), + next_year: moment.utc(current_year).add(1, 'year').format('YYYY'), + show_full_year: show_full_year, + leave_type_statistics: _.filter(full_leave_type_statistics, st => st.days_taken > 0), + + // User allowance object is simple object with attributes only + user_allowance: user_allowance, + }); } ); From d0b9358ea07193ab1c9ddb06a70a57cb1a850461 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 14:14:15 +0100 Subject: [PATCH 184/539] Use ECMAScript 6 class attributes --- lib/model/user_allowance.js | 192 ++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 98 deletions(-) diff --git a/lib/model/user_allowance.js b/lib/model/user_allowance.js index b55025b05..03b7cc59a 100644 --- a/lib/model/user_allowance.js +++ b/lib/model/user_allowance.js @@ -80,8 +80,7 @@ class UserAllowance { 'Failed parameters validation for UserAllowance constructor' ); - let self = this, - now = args.now; + let self = this; // Private properties (not to be accessed directly) self._user = args.user; @@ -89,102 +88,101 @@ class UserAllowance { self._manual_adjustment = args.manual_adjustment; self._carry_over = args.carry_over; self._nominal_allowance = args.nominal_allowance; + self._now = args.now; + } + + get total_number_of_days_in_allowance() { + let self = this; + + return (self.nominal_allowance + + self.carry_over + + self.manual_adjustment + + self.employement_range_adjustment); + } + + get number_of_days_taken_from_allowance() { + return this._number_of_days_taken_from_allowance; + } - Object.defineProperty(self, 'total_number_of_days_in_allowance', { - get : () => { - - return (self.nominal_allowance + - self.carry_over + - self.manual_adjustment + - self.employement_range_adjustment); - }, - }); - - - Object.defineProperty(self, 'number_of_days_taken_from_allowance', { - get : () => self._number_of_days_taken_from_allowance, - }); - - Object.defineProperty(self, 'manual_adjustment', { - get : () => self._manual_adjustment, - }); - - Object.defineProperty(self, 'carry_over', { - get : () => self._carry_over, - }); - - Object.defineProperty(self, 'nominal_allowance', { - get : () => self._nominal_allowance, - }); - - - Object.defineProperty(self, 'number_of_days_available_in_allowance', { - get : () => self.total_number_of_days_in_allowance - self.number_of_days_taken_from_allowance, - }); - - Object.defineProperty(self, 'user', { - get : () => self._user, - }); - - Object.defineProperty(self, 'employement_range_adjustment', { - get : () => { - - if ( - now.year() !== moment.utc(self.user.start_date).year() - && ( ! self.user.end_date || moment.utc(self.user.end_date).year() > now.year() ) - ){ - return 0; - } - - let start_date = moment.utc(self.user.start_date).year() === now.year() - ? moment.utc(self.user.start_date) - : now.clone().startOf('year'), - end_date = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() - ? moment.utc(self.user.end_date) - : now.clone().endOf('year'); - - return -1*(self.nominal_allowance - Math.round( - self.nominal_allowance * end_date.diff(start_date, 'days') / 365 - )); - } - }); - - /* - * Accrued adjustment affects all total allowance components BUT carried - * over part. Because "carry over" part was already deserved. - * - * */ - Object.defineProperty(self, 'accrued_adjustment', { - get : () => { - - // Consider only following parts of allowance when calculating accrual - // adjustment: - // * nominal allowance - // * manual adjustment - // * adjustment based in start/end day of employment - // Other components do not make sense, e.g.: - // * carried over part - it could be immediately used as employee - // already worked on them last year - let allowance = self.nominal_allowance - + self.manual_adjustment - + self.employement_range_adjustment; - - let period_starts_at = moment.utc(self.user.start_date).year() === now.year() - ? moment.utc(self.user.start_date) - : now.clone().startOf('year'); - - let period_ends_at = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() - ? moment.utc(self.user.end_date) - : now.clone().endOf('year'); - - let days_in_period = period_ends_at.diff( period_starts_at, 'days' ); - - let delta = allowance * period_ends_at.diff( now, 'days' ) / days_in_period; - - return -1 * (Math.round(delta * 2) / 2).toFixed(1); - } - }); + get manual_adjustment() { + return this._manual_adjustment; + } + + get carry_over() { + return this._carry_over; + } + get nominal_allowance() { + return this._nominal_allowance; + } + + get number_of_days_available_in_allowance() { + return this.total_number_of_days_in_allowance - this.number_of_days_taken_from_allowance; + } + + get user() { + return this._user; + } + + get employement_range_adjustment() { + let + self = this, + now = self._now.clone(); + + if ( + now.year() !== moment.utc(self.user.start_date).year() + && ( ! self.user.end_date || moment.utc(self.user.end_date).year() > now.year() ) + ){ + return 0; + } + + let start_date = moment.utc(self.user.start_date).year() === now.year() + ? moment.utc(self.user.start_date) + : now.clone().startOf('year'), + end_date = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() + ? moment.utc(self.user.end_date) + : now.clone().endOf('year'); + + return -1*(self.nominal_allowance - Math.round( + self.nominal_allowance * end_date.diff(start_date, 'days') / 365 + )); + } + + /* + * Accrued adjustment affects all total allowance components BUT carried + * over part. Because "carry over" part was already deserved. + * + * */ + get accrued_adjustment() { + let + self = this, + now = self._now.clone(); + + // Consider only following parts of allowance when calculating accrual + // adjustment: + // * nominal allowance + // * manual adjustment + // * adjustment based in start/end day of employment + // Other components do not make sense, e.g.: + // * carried over part - it could be immediately used as employee + // already worked on them last year + let allowance = self.nominal_allowance + + self.manual_adjustment + + self.employement_range_adjustment; + + let period_starts_at = moment.utc(self.user.start_date).year() === now.year() + ? moment.utc(self.user.start_date) + : now.clone().startOf('year'); + + let period_ends_at = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() + ? moment.utc(self.user.end_date) + : now.clone().endOf('year'); + + let days_in_period = period_ends_at.diff( period_starts_at, 'days' ); + + let delta = allowance * period_ends_at.diff( now, 'days' ) / days_in_period; + + return -1 * (Math.round(delta * 2) / 2).toFixed(1); } @@ -237,9 +235,7 @@ class UserAllowance { nominal_allowance : user.department.allowance, }); }); - } - } module.exports = UserAllowance; From 3e86cdc31929123f4682ac9ef39b33bc240f6cd4 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 14:23:17 +0100 Subject: [PATCH 185/539] Remove dead code --- lib/model/user_allowance.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/model/user_allowance.js b/lib/model/user_allowance.js index 03b7cc59a..355516e82 100644 --- a/lib/model/user_allowance.js +++ b/lib/model/user_allowance.js @@ -24,10 +24,6 @@ const schema_user = Joi .object() .required(), -// .options({ allowUnknown : true }) -// .keys({ -// promise_total_number_of_days_in_allowance : Joi.func().required(), -// }), schema_year = Joi .object() From 6d94929ba73be2b8a9d38b898d376cf643bb9f8b Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 14:49:28 +0100 Subject: [PATCH 186/539] Add migration that adds new column to department table --- lib/model/db/department.js | 48 +++++++++++-------- ...-add-is_accrued_allowance-to-department.js | 28 +++++++++++ 2 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 migrations/20180427-add-is_accrued_allowance-to-department.js diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 430ae18cd..16a55e2af 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -1,28 +1,34 @@ "use strict"; -var moment = require('moment'), - _ = require('underscore'), - Promise = require('bluebird'), - Exception = require('../../error'), - CalendarMonth = require('../calendar_month'); +const + moment = require('moment'), + _ = require('underscore'), + Promise = require('bluebird'), + Exception = require('../../error'), + CalendarMonth = require('../calendar_month'); module.exports = function(sequelize, DataTypes) { - var Department = sequelize.define("Department", { - // TODO add validators! - name : { - type : DataTypes.STRING, - allowNull : false - }, - allowance : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 20, - }, - include_public_holidays : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : true, - } + let Department = sequelize.define("Department", { + // TODO add validators! + name : { + type : DataTypes.STRING, + allowNull : false + }, + allowance : { + type : DataTypes.INTEGER, + allowNull : false, + defaultValue : 20, + }, + include_public_holidays : { + type : DataTypes.BOOLEAN, + allowNull : false, + defaultValue : true, + }, + is_accrued_allowance : { + type : DataTypes.BOOLEAN, + allowNull : false, + defaultValue : false, + }, }, { indexes : [ { diff --git a/migrations/20180427-add-is_accrued_allowance-to-department.js b/migrations/20180427-add-is_accrued_allowance-to-department.js new file mode 100644 index 000000000..ae3525eab --- /dev/null +++ b/migrations/20180427-add-is_accrued_allowance-to-department.js @@ -0,0 +1,28 @@ + +'use strict'; + +var models = require('../lib/model/db'); + +module.exports = { + up: function (queryInterface, Sequelize) { + + return queryInterface.describeTable('Departments') + .then(function(attributes){ + + if (attributes.hasOwnProperty('is_accrued_allowance')) { + return 1; + } + + return queryInterface.addColumn( + 'Departments', + 'is_accrued_allowance', + models.Department.attributes.is_accrued_allowance + ); + }); + }, + + down: function (queryInterface, Sequelize) { + return queryInterface + .removeColumn('Departments', 'is_accrued_allowance'); + } +}; From c74b6aa9b54d4a718a1b2da0016adab39a382e69 Mon Sep 17 00:00:00 2001 From: Pavlo Vodopyan Date: Fri, 27 Apr 2018 15:42:19 +0100 Subject: [PATCH 187/539] Expose is_accrued_allowance of department to UI --- lib/route/departments.js | 6 +++++- views/departments_overview.hbs | 12 ++++++++++++ views/partials/add_new_department_modal.hbs | 5 +++++ views/partials/department_details/general.hbs | 8 ++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/route/departments.js b/lib/route/departments.js index cf0101249..546493fcd 100644 --- a/lib/route/departments.js +++ b/lib/route/departments.js @@ -34,12 +34,15 @@ function get_and_validate_department(args) { department_name = args.department_name; // Get user parameters - var + let name = validator.trim(req.param(no_suffix ? 'name' : 'name__'+index)), allowance = validator.trim(req.param(no_suffix ? 'allowance' : 'allowance__'+index)), boss_id = validator.trim(req.param(no_suffix ? 'boss_id' : 'boss_id__'+index)), include_public_holidays = validator.toBoolean( req.param(no_suffix ? 'include_public_holidays' : 'include_public_holidays__'+index) + ), + is_accrued_allowance = validator.toBoolean( + req.param(no_suffix ? 'is_accrued_allowance' : 'is_accrued_allowance__'+index) ); // Validate provided parameters @@ -73,6 +76,7 @@ function get_and_validate_department(args) { allowance : allowance, bossId : boss_id, include_public_holidays : include_public_holidays, + is_accrued_allowance : is_accrued_allowance, name : name, }; } diff --git a/views/departments_overview.hbs b/views/departments_overview.hbs index 60e6a1fbb..c7b2a9b71 100644 --- a/views/departments_overview.hbs +++ b/views/departments_overview.hbs @@ -43,6 +43,17 @@ +
      		Accrued Allowance + +
      {{this.users.length}} {{# if this.include_public_holidays }}Yes{{/if}}{{# if this.is_accrued_allowance }}Yes{{/if}}
      Name Department Is Administrator?Remaining allowanceAvailable allowance Days used
      Public Holidays + @@ -338,7 +338,7 @@

      Completely erase data associated with {{company.name}}'s account.

      -

      This is irreversible action.

      +

      This is action cannot be reverted.

      It is strongly recommended to download employees leave data first.

      diff --git a/views/index.hbs b/views/index.hbs index 0735f185e..dbc622a2e 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -16,7 +16,7 @@

      Create departments to group employees, each one has its own manager.

      Customised Leave Types

      -

      Holidays, Sickness, Maternity, Paternity, Working from home etc. In addition configure if each use vacation allowance or not.

      +

      Holidays, Sickness, Maternity, Paternity, Working from home etc. In addition configure whether a type uses vacation allowance or not.

      Calendar Integration

      Broadcast employees whereabout into calendars: Outlook, Gmail. (Work in progess)

      diff --git a/views/partials/footer.hbs b/views/partials/footer.hbs index eb50f7976..78589c700 100644 --- a/views/partials/footer.hbs +++ b/views/partials/footer.hbs @@ -6,7 +6,7 @@

      - © TimeOff.management 2014-2018 + © TimeOff.management 2014-2019 diff --git a/views/partials/remove_company_modal.hbs b/views/partials/remove_company_modal.hbs index 6c57e66ee..39650c2d0 100644 --- a/views/partials/remove_company_modal.hbs +++ b/views/partials/remove_company_modal.hbs @@ -11,7 +11,7 @@

      -

      Please type in the name of company you wish to remove.

      +

      Please type in the name of the company you wish to remove.

      diff --git a/views/report/allowancebytime.hbs b/views/report/allowancebytime.hbs index c3ef8d847..eb3a42e93 100644 --- a/views/report/allowancebytime.hbs +++ b/views/report/allowancebytime.hbs @@ -56,7 +56,7 @@ > (YYYY-MM)
      - Date range must be within single year + Date range must be within a single year
      @@ -90,7 +90,7 @@ {{# unless users_and_leaves }}
      - There are no user in selected department + There are no users in selected department
      {{else}} diff --git a/views/requests.hbs b/views/requests.hbs index 4409c739b..c6e9f8a2f 100644 --- a/views/requests.hbs +++ b/views/requests.hbs @@ -12,7 +12,7 @@
      {{# unless to_be_approved_leaves}}
      - There are no leave request to decide on. + There are no leave requests to decide on.
      {{else}}
      diff --git a/views/settings_company_authentication.hbs b/views/settings_company_authentication.hbs index f806866b7..6a53f2806 100644 --- a/views/settings_company_authentication.hbs +++ b/views/settings_company_authentication.hbs @@ -13,13 +13,13 @@
      -

      TimeOff.Management supports LDAP authentication for customers that want to integrate application with the rest of their infrastructure. The obvious reason is to allow employees reuse their Active directory credentials in TimeOff.Management.

      +

      TimeOff.Management supports LDAP authentication for customers that want to integrate the application with the rest of their infrastructure. The obvious reason is to allow employees to reuse their Active directory credentials in TimeOff.Management.

      This page allows you to setup the TimeOff.Management to communicate with a custom LDAP server.

      -

      Please note that employees have to use their LDAP email with LDAP password (rather than username). This is due to multi-tenant nature of TimeOff.Management application that allows hosting more than one company within single installation.

      +

      Please note that employees have to use their LDAP email with LDAP password (rather than username). This is due to the multi-tenant nature of TimeOff.Management application that allows hosting more than one company within a single installation.

      -

      Form bellow has placeholders with examples how to setup TimeOff.Management to use free test LDAP server described here.

      +

      Form below has placeholders with examples how to setup TimeOff.Management to use free test LDAP server described here.

      @@ -94,8 +94,8 @@
      -

      In order to prevent situation when a company account is locked out, current administrator ({{# with logged_user}}{{this.full_name}}{{/with}}) has to enter the password associated with her/his email on the LDAP server.

      -

      This is just to make sure {{# with logged_user}}{{this.full_name}}{{/with}} can login into TimeOff.Management with new LDAP settings.

      +

      In order to prevent a situation where a company account locks itself out, the current administrator ({{# with logged_user}}{{this.full_name}}{{/with}}) has to enter the password associated with her/his email on the LDAP server.

      +

      This is to ensure that {{# with logged_user}}{{this.full_name}}{{/with}} can login into TimeOff.Management with new LDAP settings.

      diff --git a/views/settings_company_integration_api.hbs b/views/settings_company_integration_api.hbs index f01e59ed4..e796cc593 100644 --- a/views/settings_company_integration_api.hbs +++ b/views/settings_company_integration_api.hbs @@ -44,7 +44,7 @@
      - Token that allows access to {{company.name}}'s data. Keep it secrete. + Token that allows access to {{company.name}}'s data. Keep it secret.
      diff --git a/views/user_add.hbs b/views/user_add.hbs index c47bddc34..7bfb332f5 100644 --- a/views/user_add.hbs +++ b/views/user_add.hbs @@ -96,7 +96,7 @@
      -
      Date when user quits the {{ company.name }}.
      After this date user is not able to access the company.
      This is a way of deactivating user accounts.
       +
      Date when employee quits the {{ company.name }}.
      After this date the user is no longer able to access the application.
      This is a way of deactivating user accounts.
      diff --git a/views/users_import.hbs b/views/users_import.hbs index 94275ee61..c2e53a8cd 100644 --- a/views/users_import.hbs +++ b/views/users_import.hbs @@ -36,7 +36,7 @@ type = "submit" id = "users_import_sample_btn" class = "btn btn-success" - data-content = "The sample file contains information about employees who are already in the system. Extend the file to have records about new employees and upload it from the form on left hand side." + data-content = "The sample file contains information about employees who are already in the system. Extend the file to have records about new employees and upload it using the form on left hand side." data-placement = "top" data-toggle = "popover" data-trigger = "focus hover" @@ -56,7 +56,7 @@
      -

      From c239138cb8dea0c0146f82188d118b451949479a Mon Sep 17 00:00:00 2001 From: Ingo Isaksson Date: Mon, 11 Mar 2019 14:06:39 +0100 Subject: [PATCH 277/539] Fixes #339 by printing the data in the same order as the header --- lib/route/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/route/users.js b/lib/route/users.js index 52a02cdab..5ee8805fb 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -211,8 +211,8 @@ router.post('/import-sample/', function(req, res){ let content = company.users.map( user => [ user.email, - user.name, user.lastname, + user.name, company.departments.find( dep => dep.id === user.DepartmentId ).name ]); From 632be22743e53b5ea822f3ad0361982d78caa201 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 2 May 2019 12:47:38 +0200 Subject: [PATCH 278/539] format all js files with prettier --- app.js | 174 +- ...late_carry_over_allowance_for_all_users.js | 25 +- bin/check_where_i_am_on_google.js | 134 +- bin/fetch_user_stat.js | 135 +- lib/config.js | 9 +- lib/email.js | 738 ++- lib/error/index.js | 53 +- lib/middleware/ensure_user_is_admin.js | 21 +- lib/middleware/flash_messages.js | 73 +- lib/middleware/session_aware_redirect.js | 33 +- lib/model/Report.js | 102 +- lib/model/audit.js | 40 +- lib/model/calculateCarryOverAllowance.js | 80 +- lib/model/calendar_month.js | 444 +- lib/model/comment.js | 22 +- lib/model/company/exporter/index.js | 60 +- lib/model/company/exporter/summary.js | 128 +- lib/model/company/remover.js | 109 +- lib/model/db/audit.js | 102 +- lib/model/db/bank_holiday.js | 120 +- lib/model/db/comment.js | 79 +- lib/model/db/company.js | 672 +- lib/model/db/department.js | 360 +- lib/model/db/department_supervisor.js | 60 +- lib/model/db/email_audit.js | 106 +- lib/model/db/index.js | 27 +- lib/model/db/leave.js | 717 +- lib/model/db/leave_type.js | 124 +- lib/model/db/schedule.js | 300 +- lib/model/db/user.js | 685 +- lib/model/db/user_allowance_adjustment.js | 87 +- lib/model/db/user_feed.js | 103 +- lib/model/leave/index.js | 113 +- lib/model/leave_collection.js | 47 +- lib/model/leave_day.js | 61 +- lib/model/leave_request_parameters.js | 171 +- lib/model/mixin/user/absence_aware.js | 884 +-- lib/model/mixin/user/company_aware.js | 220 +- lib/model/team_view.js | 264 +- lib/model/user_allowance.js | 202 +- lib/model/user_importer.js | 325 +- lib/passport/getCompanyAdminByToken.js | 29 +- lib/passport/index.js | 187 +- lib/route/audit.js | 147 +- lib/route/calendar.js | 352 +- lib/route/dashboard.js | 38 +- lib/route/departments.js | 678 +- lib/route/feed.js | 170 +- lib/route/integration_api.js | 218 +- lib/route/login.js | 400 +- lib/route/reports.js | 221 +- lib/route/requests.js | 461 +- lib/route/settings.js | 1071 +-- lib/route/users.js | 1409 ++-- lib/route/utils/pager.js | 60 +- lib/route/validator/leave_request.js | 168 +- lib/view/helpers.js | 101 +- .../20170103144054-add_default_date_format.js | 28 +- ...329060832-rename_allowence_to_allowance.js | 108 +- .../20170530-add_auto_approve_flag_to_user.js | 22 +- migrations/20171218-company-wide-message.js | 22 +- .../20171219-allowance-adjustment-per-year.js | 29 +- ...171220-drop-adjustment-column-from-user.js | 68 +- ...0171222-add-carry-over-allowance-column.js | 28 +- ...20171228-add-time-zone-field-to-company.js | 35 +- migrations/20180102-company-mode.js | 22 +- .../20180103-sort-order-for-leave-types.js | 22 +- ...-add-is_accrued_allowance-to-department.js | 25 +- ...81119-integration-api-token-per-company.js | 34 +- migrations/20181213-carry-over-conf.js | 19 +- ...0190118-chnage-type-value-for-api-token.js | 51 +- package.json | 2 + public/js/bootstrap-datepicker.js | 3946 +++++------ public/js/bootstrap.min.js | 1658 ++++- public/js/departments.js | 22 +- public/js/global.js | 203 +- public/js/jquery.min.js | 5758 ++++++++++++++++- public/js/settings_general.js | 31 +- .../add_new_user_with_existing_email.js | 48 +- .../bank_holidays/crud_bank_holiday.js | 381 +- .../bank_holidays/non_default_date_format.js | 345 +- t/integration/carryOver/justAddedUsers.js | 130 +- .../carryOver/negativeWhenSwitchedOff.js | 235 +- t/integration/company/delete_account.js | 346 +- t/integration/company/edit_company_details.js | 88 +- t/integration/crud_users.js | 662 +- t/integration/deactivate_and_activate_user.js | 234 +- t/integration/department/one_by_one_crud.js | 1012 +-- .../edit_user_to_have_duplicated_email.js | 143 +- .../filter_users_by_departments.js | 219 +- ...maining_used_columns_match_user_details.js | 323 +- t/integration/inactivate_user.js | 379 +- t/integration/integration_api/audit.js | 214 +- .../integration_api/enable_disable.js | 327 +- t/integration/leave_request/auto_approve.js | 462 +- .../leave_request/basic_leave_request.js | 541 +- .../leave_request/book_leave_request_form.js | 209 +- t/integration/leave_request/cancel_basic.js | 633 +- .../create_leave_with_single_user.js | 137 +- .../leave_request/leave_in_next_year.js | 93 +- .../leave_request/leave_request_revoke.js | 573 +- .../leave_request_revoke_by_admin.js | 361 +- .../leave_request/ovelapping_bookings.js | 201 +- .../ovelapping_bookings_halfs.js | 388 +- .../leave_request/rendering_of_halves.js | 248 +- .../request_leaves_for_other_users.js | 433 +- .../try_to_overbook_allowance.js | 198 +- .../leave_type/colouring_on_calendar.js | 1016 +-- t/integration/leave_type/crud_leave_type.js | 795 ++- .../leave_type/leave_type_limit_in_action.js | 249 +- .../leave_type/leave_type_limit_next_year.js | 320 +- .../leave_type/remove_used_leave_type.js | 225 +- t/integration/login_case_sensitive.js | 91 +- t/integration/menu_bar_reflect_user.js | 168 +- ...register_new_company_for_existing_email.js | 101 +- t/integration/register_new_user.js | 200 +- t/integration/schedule/company_wide.js | 467 +- t/integration/schedule/user_specific.js | 1444 +++-- t/integration/team_view/basic_wall_chart.js | 488 +- t/integration/team_view/deducted_column.js | 509 +- .../team_view/deducted_column__visibility.js | 507 +- .../team_view/teamview_cross_links.js | 93 +- t/integration/timezone.js | 376 +- .../try_to_open_private_pages_with_guest.js | 201 +- .../try_to_register_with_loggedon_user.js | 60 +- ..._to_revoke_admin_rights_from_last_admin.js | 243 +- t/integration/user_edit_non_default_dates.js | 96 +- t/integration/users_import.js | 199 +- t/lib/add_new_user.js | 144 +- t/lib/check_booking_on_calendar.js | 96 +- t/lib/check_elements.js | 90 +- t/lib/config.js | 10 +- t/lib/login_with_user.js | 158 +- t/lib/logout_user.js | 71 +- t/lib/mock_express_request.js | 47 +- t/lib/open_page.js | 32 +- t/lib/register_new_user.js | 229 +- ...r_to_start_at_the_beginning_of_the_year.js | 69 +- t/lib/submit_form.js | 264 +- t/lib/teamview_check_user.js | 71 +- t/lib/user_info.js | 86 +- t/unit/calendar.js | 271 +- t/unit/email.js | 55 +- t/unit/model/db/leave.js | 473 +- t/unit/model/db/leave_day.js | 193 +- t/unit/model/user_allowance.js | 428 +- t/unit/validator/leave_request.js | 272 +- 147 files changed, 28136 insertions(+), 18386 deletions(-) diff --git a/app.js b/app.js index 4c07e1603..91339e2d8 100644 --- a/app.js +++ b/app.js @@ -1,184 +1,146 @@ - -var express = require('express'); -var path = require('path'); -var favicon = require('serve-favicon'); -var logger = require('morgan'); -var cookieParser = require('cookie-parser'); -var bodyParser = require('body-parser'); -var moment = require('moment'); +var express = require("express"); +var path = require("path"); +var favicon = require("serve-favicon"); +var logger = require("morgan"); +var cookieParser = require("cookie-parser"); +var bodyParser = require("body-parser"); +var moment = require("moment"); var app = express(); // View engine setup -var handlebars = require('express-handlebars') - .create({ - defaultLayout : 'main', - extname : '.hbs', - helpers : require('./lib/view/helpers')(), - }); +var handlebars = require("express-handlebars").create({ + defaultLayout: "main", + extname: ".hbs", + helpers: require("./lib/view/helpers")() +}); -app.engine('.hbs', handlebars.engine); -app.set('view engine', '.hbs'); +app.engine(".hbs", handlebars.engine); +app.set("view engine", ".hbs"); // Add single reference to the model into application object // and reuse it whenever an access to DB is needed -app.set('db_model', require('./lib/model/db')); +app.set("db_model", require("./lib/model/db")); // uncomment after placing your favicon in /public //app.use(favicon(__dirname + '/public/favicon.ico')); -app.use(logger('dev')); +app.use(logger("dev")); app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(__dirname, 'public'))); - - +app.use(express.static(path.join(__dirname, "public"))); // Setup authentication mechanism -const passport = require('./lib/passport')(); +const passport = require("./lib/passport")(); -var session = require('express-session'); +var session = require("express-session"); // initalize sequelize with session store -var SequelizeStore = require('connect-session-sequelize')(session.Store); -app.use(session({ - secret : 'my dirty secret ;khjsdkjahsdajhasdam,nnsnad,', - resave : false, - saveUninitialized : false, +var SequelizeStore = require("connect-session-sequelize")(session.Store); +app.use( + session({ + secret: "my dirty secret ;khjsdkjahsdajhasdam,nnsnad,", + resave: false, + saveUninitialized: false, store: new SequelizeStore({ - db: app.get('db_model').sequelize - }), -})) + db: app.get("db_model").sequelize + }) + }) +); app.use(passport.initialize()); app.use(passport.session()); - - // Custom middlewares // // Make sure session and user objects are available in templates -app.use(function(req,res,next){ - +app.use(function(req, res, next) { // Get today given user's timezone var today; - if ( req.user && req.user.company ) { + if (req.user && req.user.company) { today = req.user.company.get_today(); } else { today = moment.utc(); } - res.locals.session = req.session; + res.locals.session = req.session; res.locals.logged_user = req.user; - res.locals.url_to_the_site_root = '/'; + res.locals.url_to_the_site_root = "/"; res.locals.requested_path = req.originalUrl; // For book leave request modal - res.locals.booking_start = today, - res.locals.booking_end = today, - - next(); + (res.locals.booking_start = today), (res.locals.booking_end = today), next(); }); -app.use(function(req,res,next){ - res.locals.custom_java_script = [ - '/js/bootstrap-datepicker.js', - '/js/global.js' - ]; - res.locals.custom_css = [ - '/css/bootstrap-datepicker3.standalone.css' - ]; +app.use(function(req, res, next) { + res.locals.custom_java_script = [ + "/js/bootstrap-datepicker.js", + "/js/global.js" + ]; + res.locals.custom_css = ["/css/bootstrap-datepicker3.standalone.css"]; - next(); + next(); }); // Enable flash messages within session -app.use( require('./lib/middleware/flash_messages') ); +app.use(require("./lib/middleware/flash_messages")); -app.use( require('./lib/middleware/session_aware_redirect') ); +app.use(require("./lib/middleware/session_aware_redirect")); // Here will be publicly accessible routes -app.use( - '/feed/', - require('./lib/route/feed') -); +app.use("/feed/", require("./lib/route/feed")); -app.use( - '/integration/v1/', - require('./lib/route/integration_api')(passport) -); +app.use("/integration/v1/", require("./lib/route/integration_api")(passport)); app.use( - '/', - require('./lib/route/login')(passport), + "/", + require("./lib/route/login")(passport), // All rotes bellow are only for authenticated users - require('./lib/route/dashboard') + require("./lib/route/dashboard") ); -app.use( - '/calendar/', - require('./lib/route/calendar') -); +app.use("/calendar/", require("./lib/route/calendar")); -app.use( - '/settings/', - require('./lib/route/settings') -); +app.use("/settings/", require("./lib/route/settings")); // '/settings/' path is quite big hence there are two modules providng handlers for it -app.use( - '/settings/', - require('./lib/route/departments') -); +app.use("/settings/", require("./lib/route/departments")); -app.use( - '/users/', - require('./lib/route/users') -); +app.use("/users/", require("./lib/route/users")); -app.use( - '/requests/', - require('./lib/route/requests') -); +app.use("/requests/", require("./lib/route/requests")); -app.use( - '/audit/', - require('./lib/route/audit') -); +app.use("/audit/", require("./lib/route/audit")); -app.use( - '/reports/', - require('./lib/route/reports') -); +app.use("/reports/", require("./lib/route/reports")); // catch 404 app.use(function(req, res, next) { - res.render('not_found'); + res.render("not_found"); }); - // error handlers // development error handler // will print stacktrace -if (app.get('env') === 'development') { - app.use(function(err, req, res, next) { - res.status(err.status || 500); - res.render('error', { - message: err.message, - error: err - }); +if (app.get("env") === "development") { + app.use(function(err, req, res, next) { + res.status(err.status || 500); + res.render("error", { + message: err.message, + error: err }); + }); } // production error handler // no stacktraces leaked to user app.use(function(err, req, res, next) { - res.status(err.status || 500); - res.render('error', { - message: err.message, - error: {} - }); + res.status(err.status || 500); + res.render("error", { + message: err.message, + error: {} + }); }); module.exports = app; diff --git a/bin/calculate_carry_over_allowance_for_all_users.js b/bin/calculate_carry_over_allowance_for_all_users.js index e1800fa42..f8e76e0db 100644 --- a/bin/calculate_carry_over_allowance_for_all_users.js +++ b/bin/calculate_carry_over_allowance_for_all_users.js @@ -1,14 +1,15 @@ +"use strict"; -'use strict'; +const { + calculateCarryOverAllowance + } = require("../lib/model/calculateCarryOverAllowance"), + models = require("../lib/model/db"); -const - {calculateCarryOverAllowance} = require('../lib/model/calculateCarryOverAllowance'), - models = require('../lib/model/db'); - -models.User - .findAll() - .then(users =>calculateCarryOverAllowance({users})) - .then(() => console.log('Done!')) - .catch(error => console.log( - `Failed to recalculate carry over allowance: ${error} at ${error.stack}` - )); +models.User.findAll() + .then(users => calculateCarryOverAllowance({ users })) + .then(() => console.log("Done!")) + .catch(error => + console.log( + `Failed to recalculate carry over allowance: ${error} at ${error.stack}` + ) + ); diff --git a/bin/check_where_i_am_on_google.js b/bin/check_where_i_am_on_google.js index 028a82f19..c8d06884e 100644 --- a/bin/check_where_i_am_on_google.js +++ b/bin/check_where_i_am_on_google.js @@ -1,66 +1,106 @@ - // Usage: // node bin/check_where_i_am_on_google.js --domain="nixieshop.com" --query="nixie shop" -'use strict'; - -var - optimist = require('optimist').argv, - search_query = optimist.query || 'time off manager', - web_site_domain = optimist.domain || 'timeoffmanager.com', - stop_on_first = true; - -console.log('-----------------------------------'); -console.log(' Cheking query string : '+search_query); -console.log(' Look for domain : '+web_site_domain); -console.log('-----------------------------------'); +"use strict"; +var optimist = require("optimist").argv, + search_query = optimist.query || "time off manager", + web_site_domain = optimist.domain || "timeoffmanager.com", + stop_on_first = true; -var webdriver = require('selenium-webdriver'), - _ = require('underscore'), - google_url = 'https://www.google.com/search?q='+search_query+'&start=', - driver; +console.log("-----------------------------------"); +console.log(" Cheking query string : " + search_query); +console.log(" Look for domain : " + web_site_domain); +console.log("-----------------------------------"); +var webdriver = require("selenium-webdriver"), + _ = require("underscore"), + google_url = "https://www.google.com/search?q=" + search_query + "&start=", + driver; // Instantiate new driver object driver = new webdriver.Builder() .withCapabilities(webdriver.Capabilities.chrome()) .build(); - - -_.map([ - 0,10,20,30,40,50,60,70,80,90,100, - 110,120,130,140,150,160,170,180,190,200, - 210,220,230,240,250,260,270,280,290,300, - 310,320,330,340,350,360,370,380,390,400, - 410,420,430,440,450,460,470,480,490,500, -// 510,520,530,540,550,560,570,580,590,600, -// 610,620,630,640,650,660,670,680,690,700, -// 710,720,730,740,750,760,770,780,790,800, -// 810,820,830,840,850,860,870,880,890,900, -// 910,920,930,940,950,960,970,980,990,1000, -], function(i){ - +_.map( + [ + 0, + 10, + 20, + 30, + 40, + 50, + 60, + 70, + 80, + 90, + 100, + 110, + 120, + 130, + 140, + 150, + 160, + 170, + 180, + 190, + 200, + 210, + 220, + 230, + 240, + 250, + 260, + 270, + 280, + 290, + 300, + 310, + 320, + 330, + 340, + 350, + 360, + 370, + 380, + 390, + 400, + 410, + 420, + 430, + 440, + 450, + 460, + 470, + 480, + 490, + 500 + // 510,520,530,540,550,560,570,580,590,600, + // 610,620,630,640,650,660,670,680,690,700, + // 710,720,730,740,750,760,770,780,790,800, + // 810,820,830,840,850,860,870,880,890,900, + // 910,920,930,940,950,960,970,980,990,1000, + ], + function(i) { driver.sleep(500); // Go to front page - driver.get( google_url + i ); - - driver.getPageSource().then(function(source){ - if (source.match(new RegExp('http(s)?://(www.)?'+web_site_domain))) { - console.log('>>>>>>> Found on '+(1+i/10)+' page'); - if (stop_on_first) { - driver.quit().then(function(){ - process.exit(); - }); - } - } else { - console.log((1+i/10)+'...'); + driver.get(google_url + i); + + driver.getPageSource().then(function(source) { + if (source.match(new RegExp("http(s)?://(www.)?" + web_site_domain))) { + console.log(">>>>>>> Found on " + (1 + i / 10) + " page"); + if (stop_on_first) { + driver.quit().then(function() { + process.exit(); + }); } + } else { + console.log(1 + i / 10 + "..."); + } }); -}); - + } +); driver.quit(); - diff --git a/bin/fetch_user_stat.js b/bin/fetch_user_stat.js index 25d2d4c9c..953a5f872 100644 --- a/bin/fetch_user_stat.js +++ b/bin/fetch_user_stat.js @@ -1,18 +1,17 @@ - -'use strict'; - -var test = require('selenium-webdriver/testing'), - By = require('selenium-webdriver').By, - expect = require('chai').expect, - _ = require('underscore'), - Promise = require("bluebird"), - until = require('selenium-webdriver').until, - register_new_user_func = require('../t/lib/register_new_user'), - login_user_func = require('../t/lib/login_with_user'), - logout_user_func = require('../t/lib/logout_user'), - open_page_func = require('../t/lib/open_page'), - config = require('../t/lib/config'), - application_host = config.get_application_host(); +"use strict"; + +var test = require("selenium-webdriver/testing"), + By = require("selenium-webdriver").By, + expect = require("chai").expect, + _ = require("underscore"), + Promise = require("bluebird"), + until = require("selenium-webdriver").until, + register_new_user_func = require("../t/lib/register_new_user"), + login_user_func = require("../t/lib/login_with_user"), + logout_user_func = require("../t/lib/logout_user"), + open_page_func = require("../t/lib/open_page"), + config = require("../t/lib/config"), + application_host = config.get_application_host(); /* * THis is simple scrip to execute on different versions of application @@ -24,84 +23,90 @@ var test = require('selenium-webdriver/testing'), * * */ -describe('Collect remaining days for employees', function(){ - - this.timeout( config.get_execution_timeout() ); +describe("Collect remaining days for employees", function() { + this.timeout(config.get_execution_timeout()); var report = {}, driver; - it("Create new company", function(done){ + it("Create new company", function(done) { register_new_user_func({ - application_host : application_host, - }) - .then(function(data){ + application_host: application_host + }).then(function(data) { driver = data.driver; done(); }); }); - it("Logout", function(done){ + it("Logout", function(done) { logout_user_func({ - application_host : application_host, - driver : driver, - }) - .then(function(){ done() }); + application_host: application_host, + driver: driver + }).then(function() { + done(); + }); }); // This is a list of accountes to iterate through // By default it is dummy ones - [ - 'test@test.com', - 'test2@test.com' - ].forEach( email => { - - it("Login as user", function(done){ + ["test@test.com", "test2@test.com"].forEach(email => { + it("Login as user", function(done) { login_user_func({ - application_host : application_host, - user_email : email, - driver : driver, - }) - .then(function(){ done() }); + application_host: application_host, + user_email: email, + driver: driver + }).then(function() { + done(); + }); }); - it("Open users page", function(done){ + it("Open users page", function(done) { open_page_func({ - url : application_host + 'users/', - driver : driver, - }) - .then(function(){ done() }); + url: application_host + "users/", + driver: driver + }).then(function() { + done(); + }); }); - it("Fetch remaining days for each employee", function(done){ - + it("Fetch remaining days for each employee", function(done) { driver - .findElements(By.css('tr[data-vpp-user-row]')) - - .then(els => Promise.map(els, el => { - let user_id; - - return el.getAttribute('data-vpp-user-row') - .then(u_id => Promise.resolve( user_id = u_id )) - .then(() => el.findElement(By.css('td.vpp-days-remaining'))) - .then(el => el.getText()) - .then(days => Promise.resolve( report[ user_id ] = days )); - }, { concurrency : 0 })) - - .then(() => done()) + .findElements(By.css("tr[data-vpp-user-row]")) + + .then(els => + Promise.map( + els, + el => { + let user_id; + + return el + .getAttribute("data-vpp-user-row") + .then(u_id => Promise.resolve((user_id = u_id))) + .then(() => el.findElement(By.css("td.vpp-days-remaining"))) + .then(el => el.getText()) + .then(days => Promise.resolve((report[user_id] = days))); + }, + { concurrency: 0 } + ) + ) + + .then(() => done()); }); - it("Logout", function(done){ + it("Logout", function(done) { logout_user_func({ - application_host : application_host, - driver : driver, - }) - .then(function(){ done() }); + application_host: application_host, + driver: driver + }).then(function() { + done(); + }); }); }); - after(function(done){ + after(function(done) { console.dir(report); - driver.quit().then(function(){ done(); }); + driver.quit().then(function() { + done(); + }); }); }); diff --git a/lib/config.js b/lib/config.js index d01d611de..c1e9fb95a 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,11 +1,10 @@ +"use strict"; -'use strict'; - -var nconf = require('nconf'); +var nconf = require("nconf"); nconf .argv() - .file('localisation', { file: __dirname+'/../config/localisation.json' }) - .file({ file: __dirname+'/../config/app.json' }); + .file("localisation", { file: __dirname + "/../config/localisation.json" }) + .file({ file: __dirname + "/../config/app.json" }); module.exports = nconf; diff --git a/lib/email.js b/lib/email.js index b39dc0d64..5dbe942b8 100644 --- a/lib/email.js +++ b/lib/email.js @@ -1,27 +1,23 @@ +"use strict"; -'use strict'; - -const - bluebird = require('bluebird'), - handlebars = require('express-handlebars').create({ - partialsDir : __dirname+'/../views/partials/', - extname : '.hbs', - helpers : require('./view/helpers')(), +const bluebird = require("bluebird"), + handlebars = require("express-handlebars").create({ + partialsDir: __dirname + "/../views/partials/", + extname: ".hbs", + helpers: require("./view/helpers")() }), - config = require('./config'), - nodemailer = require('nodemailer'), - smtpTransport = require('nodemailer-smtp-transport'), - {getCommentsForLeave} = require('./model/comment'); - -function Email(){ + config = require("./config"), + nodemailer = require("nodemailer"), + smtpTransport = require("nodemailer-smtp-transport"), + { getCommentsForLeave } = require("./model/comment"); -}; +function Email() {} // This is a little helper that ensure that data in context are in a shape // suitable for usage in templates // function _promise_to_unfold_context(context) { - if (context.hasOwnProperty('user')){ + if (context.hasOwnProperty("user")) { return context.user.reload_with_session_details(); } else { return bluebird.resolve(1); @@ -34,66 +30,65 @@ function _promise_to_unfold_context(context) { // * render inner part of template // * place the innerpart ingo ready to use HTML wrapper -Email.prototype.promise_rendered_email_template = function(args){ +Email.prototype.promise_rendered_email_template = function(args) { var filename = args.template_name, - context = args.context || {}; - - return bluebird.resolve() - - // Prepare context to be passed into first rendering stage - .then(function(){ - return _promise_to_unfold_context(context); - }) - - // Render inner part of email - .then(function(){ - return handlebars.render( - __dirname+'/../views/email/'+filename+'.hbs', - context - ); - }) - - // Produce final (ready to use) version of email and Subject - .then(function(text){ - - // Extract subject from email - var subject_and_body = text.split(/\r?\n=====\r?\n/); - - return handlebars - // Render ready to use email: wrap the content with fancy HTML boilerplate - .render( - __dirname+'/../views/email/wrapper.hbs', - { - subject : subject_and_body[0], - body : subject_and_body[1], - } - ) - .then(function(final_email){ - return bluebird.resolve({ - subject : subject_and_body[0], - body : final_email, - }); - }); - }); - + context = args.context || {}; + + return ( + bluebird + .resolve() + + // Prepare context to be passed into first rendering stage + .then(function() { + return _promise_to_unfold_context(context); + }) + + // Render inner part of email + .then(function() { + return handlebars.render( + __dirname + "/../views/email/" + filename + ".hbs", + context + ); + }) + + // Produce final (ready to use) version of email and Subject + .then(function(text) { + // Extract subject from email + var subject_and_body = text.split(/\r?\n=====\r?\n/); + + return ( + handlebars + // Render ready to use email: wrap the content with fancy HTML boilerplate + .render(__dirname + "/../views/email/wrapper.hbs", { + subject: subject_and_body[0], + body: subject_and_body[1] + }) + .then(function(final_email) { + return bluebird.resolve({ + subject: subject_and_body[0], + body: final_email + }); + }) + ); + }) + ); }; // Return function that support same interface as sendMail but promisified. // If current configuration does not allow sending emails, it return empty function // -Email.prototype.get_send_email = function(){ - +Email.prototype.get_send_email = function() { // Check if current installation is set to send emails - if (! config.get("send_emails") || ! config.get("email_transporter") ) { - return function(){ - console.log('Pretend to send email: '+ JSON.stringify(arguments)); + if (!config.get("send_emails") || !config.get("email_transporter")) { + return function() { + console.log("Pretend to send email: " + JSON.stringify(arguments)); return bluebird.resolve(); }; } - var transporter = nodemailer.createTransport(smtpTransport( - config.get("email_transporter") - )); + var transporter = nodemailer.createTransport( + smtpTransport(config.get("email_transporter")) + ); var send_mail = bluebird.promisify(transporter.sendMail, transporter); @@ -102,349 +97,376 @@ Email.prototype.get_send_email = function(){ // Send registration complete email for provided user // -Email.prototype.promise_registration_email = function(args){ +Email.prototype.promise_registration_email = function(args) { var self = this, - user = args.user; + user = args.user; var send_mail = self.get_send_email(); - return self.promise_rendered_email_template({ - template_name : 'registration_complete', - context : {user : user} - }) - .then(function(email_obj){ - - return send_mail({ - from : config.get('application_sender_email'), - to : user.email, - subject : email_obj.subject, - html : email_obj.body, + return self + .promise_rendered_email_template({ + template_name: "registration_complete", + context: { user: user } }) - .then(function(send_result){ - return user.record_email_addressed_to_me(email_obj) - .then(function(){ return bluebird.resolve( send_result ); }); + .then(function(email_obj) { + return send_mail({ + from: config.get("application_sender_email"), + to: user.email, + subject: email_obj.subject, + html: email_obj.body + }).then(function(send_result) { + return user.record_email_addressed_to_me(email_obj).then(function() { + return bluebird.resolve(send_result); + }); + }); }); - }); }; -Email.prototype.promise_add_new_user_email = function(args){ - var self = this, - company = args.company, - admin_user = args.admin_user, - new_user = args.new_user, - send_mail = self.get_send_email(); - - return self.promise_rendered_email_template({ - template_name : 'add_new_user', - context : { - new_user : new_user, - admin_user : admin_user, - company : company, - user : new_user, - } - }) - .then(function(email_obj){ - - return send_mail({ - from : config.get('application_sender_email'), - to : new_user.email, - subject : email_obj.subject, - html : email_obj.body, +Email.prototype.promise_add_new_user_email = function(args) { + var self = this, + company = args.company, + admin_user = args.admin_user, + new_user = args.new_user, + send_mail = self.get_send_email(); + + return self + .promise_rendered_email_template({ + template_name: "add_new_user", + context: { + new_user: new_user, + admin_user: admin_user, + company: company, + user: new_user + } }) - .then(function(send_result){ - return new_user.record_email_addressed_to_me(email_obj) - .then(function(){ return bluebird.resolve( send_result ); }); + .then(function(email_obj) { + return send_mail({ + from: config.get("application_sender_email"), + to: new_user.email, + subject: email_obj.subject, + html: email_obj.body + }).then(function(send_result) { + return new_user + .record_email_addressed_to_me(email_obj) + .then(function() { + return bluebird.resolve(send_result); + }); + }); }); - }); - }; -Email.prototype.promise_leave_request_revoke_emails = function(args){ +Email.prototype.promise_leave_request_revoke_emails = function(args) { const self = this, - leave = args.leave, - send_mail = self.get_send_email(); + leave = args.leave, + send_mail = self.get_send_email(); - let template_name_to_supervisor = 'leave_request_revoke_to_supervisor'; - let template_name_to_requestor = 'leave_request_revoke_to_requestor'; + let template_name_to_supervisor = "leave_request_revoke_to_supervisor"; + let template_name_to_requestor = "leave_request_revoke_to_requestor"; - if ( leave.get('user').is_auto_approve() ) { - template_name_to_supervisor = 'leave_request_revoke_to_supervisor_autoapprove'; - template_name_to_requestor = 'leave_request_revoke_to_requestor_autoapprove'; + if (leave.get("user").is_auto_approve()) { + template_name_to_supervisor = + "leave_request_revoke_to_supervisor_autoapprove"; + template_name_to_requestor = + "leave_request_revoke_to_requestor_autoapprove"; } - const promise_email_to_supervisor = comments => self.promise_rendered_email_template({ - template_name : template_name_to_supervisor, - context : { - leave, - comments, - approver : leave.get('approver'), - requester : leave.get('user'), - user : leave.get('approver'), - } - }) - .then(email_obj => - send_mail({ - from : config.get('application_sender_email'), - to : leave.get('approver').email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(() => leave.get('approver').record_email_addressed_to_me(email_obj)) - ); - - const promise_email_to_requestor = comments => self.promise_rendered_email_template({ - template_name : template_name_to_requestor, - context : { - leave, - comments, - approver : leave.get('approver'), - requester : leave.get('user'), - user : leave.get('user'), - } - }) - .then(email_obj => - send_mail({ - from : config.get('application_sender_email'), - to : leave.get('user').email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(() => leave.get('user').record_email_addressed_to_me(email_obj)) - ); - - return getCommentsForLeave({leave}) - .then(comments => bluebird.join( - promise_email_to_supervisor(comments), promise_email_to_requestor(comments), + const promise_email_to_supervisor = comments => + self + .promise_rendered_email_template({ + template_name: template_name_to_supervisor, + context: { + leave, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("approver") + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("approver").email, + subject: email_obj.subject, + html: email_obj.body + }).then(() => + leave.get("approver").record_email_addressed_to_me(email_obj) + ) + ); + + const promise_email_to_requestor = comments => + self + .promise_rendered_email_template({ + template_name: template_name_to_requestor, + context: { + leave, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("user") + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("user").email, + subject: email_obj.subject, + html: email_obj.body + }).then(() => leave.get("user").record_email_addressed_to_me(email_obj)) + ); + + return getCommentsForLeave({ leave }).then(comments => + bluebird.join( + promise_email_to_supervisor(comments), + promise_email_to_requestor(comments), () => bluebird.resolve() - )); + ) + ); }; -Email.prototype.promise_leave_request_emails = function(args){ - var self = this, - leave = args.leave, - send_mail = self.get_send_email(); +Email.prototype.promise_leave_request_emails = function(args) { + var self = this, + leave = args.leave, + send_mail = self.get_send_email(); - var template_name_to_supervisor = 'leave_request_to_supervisor'; - var template_name_to_requestor = 'leave_request_to_requestor'; + var template_name_to_supervisor = "leave_request_to_supervisor"; + var template_name_to_requestor = "leave_request_to_requestor"; - if ( leave.get('user').is_auto_approve() ) { - template_name_to_supervisor = 'leave_request_to_supervisor_autoapprove'; - template_name_to_requestor = 'leave_request_to_requestor_autoapprove'; + if (leave.get("user").is_auto_approve()) { + template_name_to_supervisor = "leave_request_to_supervisor_autoapprove"; + template_name_to_requestor = "leave_request_to_requestor_autoapprove"; } - const promise_email_to_supervisor = comments => supervisor => self.promise_rendered_email_template({ - template_name : template_name_to_supervisor, - context : { - leave, - comments, - approver : supervisor, - requester : leave.get('user'), - user : supervisor, - } - }) - .then(email_obj => - send_mail({ - from : config.get('application_sender_email'), - to : supervisor.email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(send_result => supervisor.record_email_addressed_to_me(email_obj)) - ); - - const promise_email_to_requestor = comments => self.promise_rendered_email_template({ - template_name : template_name_to_requestor, - context : { - leave, - comments, - approver : leave.get('approver'), - requester : leave.get('user'), - user : leave.get('approver'), - } - }) - .then(email_obj => send_mail({ - from : config.get('application_sender_email'), - to : leave.get('user').email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(() => leave.get('user').record_email_addressed_to_me(email_obj)) - ); - - return getCommentsForLeave({leave}) - .then(comments => bluebird.join( + const promise_email_to_supervisor = comments => supervisor => + self + .promise_rendered_email_template({ + template_name: template_name_to_supervisor, + context: { + leave, + comments, + approver: supervisor, + requester: leave.get("user"), + user: supervisor + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: supervisor.email, + subject: email_obj.subject, + html: email_obj.body + }).then(send_result => + supervisor.record_email_addressed_to_me(email_obj) + ) + ); + + const promise_email_to_requestor = comments => + self + .promise_rendered_email_template({ + template_name: template_name_to_requestor, + context: { + leave, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("approver") + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("user").email, + subject: email_obj.subject, + html: email_obj.body + }).then(() => leave.get("user").record_email_addressed_to_me(email_obj)) + ); + + return getCommentsForLeave({ leave }).then(comments => + bluebird.join( promise_email_to_requestor(comments), - leave.get('user') + leave + .get("user") .promise_supervisors() .map(supervisor => promise_email_to_supervisor(comments)(supervisor)), () => bluebird.resolve() - )); + ) + ); }; - -Email.prototype.promise_leave_request_decision_emails = function(args){ - const - self = this, - leave = args.leave, +Email.prototype.promise_leave_request_decision_emails = function(args) { + const self = this, + leave = args.leave, action = args.action, was_pended_revoke = args.was_pended_revoke, - send_mail = self.get_send_email(); - - const promise_email_to_supervisor = comments => self.promise_rendered_email_template({ - template_name : 'leave_request_decision_to_supervisor', - context : { - leave, - action, - was_pended_revoke, - comments, - approver: leave.get('approver'), - requester: leave.get('user'), - user: leave.get('approver'), - } - }) - .then(email_obj => - send_mail({ - from : config.get('application_sender_email'), - to : leave.get('approver').email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(()=>leave.get('approver').record_email_addressed_to_me(email_obj)) - ); - - const promise_email_to_requestor = comments => self.promise_rendered_email_template({ - template_name : 'leave_request_decision_to_requestor', - context : { - leave, - action, - was_pended_revoke, - comments, - approver: leave.get('approver'), - requester: leave.get('user'), - user: leave.get('user'), - } - }) - .then(email_obj => - send_mail({ - from : config.get('application_sender_email'), - to : leave.get('user').email, - subject : email_obj.subject, - html : email_obj.body, - }) - .then(() => leave.get('user').record_email_addressed_to_me(email_obj)) - ); + send_mail = self.get_send_email(); - return getCommentsForLeave({leave}) - .then(comments => bluebird.join( - promise_email_to_supervisor(comments), promise_email_to_requestor(comments), + const promise_email_to_supervisor = comments => + self + .promise_rendered_email_template({ + template_name: "leave_request_decision_to_supervisor", + context: { + leave, + action, + was_pended_revoke, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("approver") + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("approver").email, + subject: email_obj.subject, + html: email_obj.body + }).then(() => + leave.get("approver").record_email_addressed_to_me(email_obj) + ) + ); + + const promise_email_to_requestor = comments => + self + .promise_rendered_email_template({ + template_name: "leave_request_decision_to_requestor", + context: { + leave, + action, + was_pended_revoke, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("user") + } + }) + .then(email_obj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("user").email, + subject: email_obj.subject, + html: email_obj.body + }).then(() => leave.get("user").record_email_addressed_to_me(email_obj)) + ); + + return getCommentsForLeave({ leave }).then(comments => + bluebird.join( + promise_email_to_supervisor(comments), + promise_email_to_requestor(comments), () => bluebird.resolve() - )); + ) + ); }; -Email.prototype.promise_forgot_password_email = function(args){ - var self = this, - user = args.user, - send_mail = self.get_send_email(); +Email.prototype.promise_forgot_password_email = function(args) { + var self = this, + user = args.user, + send_mail = self.get_send_email(); - return user.getCompany() - .then(function(company){ + return user + .getCompany() + .then(function(company) { return self.promise_rendered_email_template({ - template_name : 'forgot_password', - context : { - user : user, - company : company, + template_name: "forgot_password", + context: { + user: user, + company: company } }); - }) - .then(function(email_obj){ - - return send_mail({ - from : config.get('application_sender_email'), - to : user.email, - subject : email_obj.subject, - html : email_obj.body, }) - .then(function(send_result){ - return user.record_email_addressed_to_me(email_obj) - .then(function(){ return bluebird.resolve( send_result ); }); + .then(function(email_obj) { + return send_mail({ + from: config.get("application_sender_email"), + to: user.email, + subject: email_obj.subject, + html: email_obj.body + }).then(function(send_result) { + return user.record_email_addressed_to_me(email_obj).then(function() { + return bluebird.resolve(send_result); + }); + }); }); - }); }; -Email.prototype.promise_reset_password_email = function(args){ - var self = this, - user = args.user, - send_mail = self.get_send_email(); - - return self.promise_rendered_email_template({ - template_name : 'reset_password', - context : { - user : user, - } - }) - .then(function(email_obj){ - - return send_mail({ - from : config.get('application_sender_email'), - to : user.email, - subject : email_obj.subject, - html : email_obj.body, +Email.prototype.promise_reset_password_email = function(args) { + var self = this, + user = args.user, + send_mail = self.get_send_email(); + + return self + .promise_rendered_email_template({ + template_name: "reset_password", + context: { + user: user + } }) - .then(function(send_result){ - return user.record_email_addressed_to_me(email_obj) - .then(function(){ return bluebird.resolve( send_result ); }); + .then(function(email_obj) { + return send_mail({ + from: config.get("application_sender_email"), + to: user.email, + subject: email_obj.subject, + html: email_obj.body + }).then(function(send_result) { + return user.record_email_addressed_to_me(email_obj).then(function() { + return bluebird.resolve(send_result); + }); + }); }); - }); }; -Email.prototype.promise_leave_request_cancel_emails = function(args){ - const - self = this, - leave = args.leave, +Email.prototype.promise_leave_request_cancel_emails = function(args) { + const self = this, + leave = args.leave, send_mail = self.get_send_email(); - const promise_email_to_supervisor = comments => self.promise_rendered_email_template({ - template_name : 'leave_request_cancel_to_supervisor', - context : { - leave, - comments, - approver: leave.get('approver'), - requester: leave.get('user'), - user: leave.get('approver'), - } - }) - .then(emailObj => send_mail({ - from : config.get('application_sender_email'), - to : leave.get('approver').email, - subject : emailObj.subject, - html : emailObj.body, - }) - .then(() => leave.get('approver').record_email_addressed_to_me(emailObj)) - ); - - const promise_email_to_requestor = comments => self.promise_rendered_email_template({ - template_name : 'leave_request_cancel_to_requestor', - context : { - leave, - comments, - approver: leave.get('approver'), - requester: leave.get('user'), - user: leave.get('user'), - } - }) - .then(emailObj => send_mail({ - from : config.get('application_sender_email'), - to : leave.get('user').email, - subject : emailObj.subject, - html : emailObj.body, - }) - .then(() => leave.get('user').record_email_addressed_to_me(emailObj)) - ); - - return getCommentsForLeave({leave}) - .then(comments => bluebird.join( - promise_email_to_supervisor(comments), promise_email_to_requestor(comments), + const promise_email_to_supervisor = comments => + self + .promise_rendered_email_template({ + template_name: "leave_request_cancel_to_supervisor", + context: { + leave, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("approver") + } + }) + .then(emailObj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("approver").email, + subject: emailObj.subject, + html: emailObj.body + }).then(() => + leave.get("approver").record_email_addressed_to_me(emailObj) + ) + ); + + const promise_email_to_requestor = comments => + self + .promise_rendered_email_template({ + template_name: "leave_request_cancel_to_requestor", + context: { + leave, + comments, + approver: leave.get("approver"), + requester: leave.get("user"), + user: leave.get("user") + } + }) + .then(emailObj => + send_mail({ + from: config.get("application_sender_email"), + to: leave.get("user").email, + subject: emailObj.subject, + html: emailObj.body + }).then(() => leave.get("user").record_email_addressed_to_me(emailObj)) + ); + + return getCommentsForLeave({ leave }).then(comments => + bluebird.join( + promise_email_to_supervisor(comments), + promise_email_to_requestor(comments), () => bluebird.resolve() - )); + ) + ); }; module.exports = Email; diff --git a/lib/error/index.js b/lib/error/index.js index f65824e99..d137c1b44 100644 --- a/lib/error/index.js +++ b/lib/error/index.js @@ -1,15 +1,12 @@ - "use strict"; -const - Joi = require('joi'); +const Joi = require("joi"); const schema_throw_user_error = [ - Joi.object() - .keys({ - system_error : Joi.string().required(), - user_error : Joi.string().required(), - }), + Joi.object().keys({ + system_error: Joi.string().required(), + user_error: Joi.string().required() + }), Joi.string() ]; @@ -17,32 +14,30 @@ function throw_user_error(args) { const validate_args = Joi.validate(args, schema_throw_user_error); // Ensure all necesasry info was privided - if ( validate_args.error) { + if (validate_args.error) { // Tricky case here as we failed to rais exception, so log all data we have // and still rais generic exception console.log( - 'throw_user_error got invalid parameters: ' - + validate_args.annotate() + "throw_user_error got invalid parameters: " + validate_args.annotate() ); console.dir(args); - throw new Error('Failed to throw user errors'); + throw new Error("Failed to throw user errors"); } - let system_error_message, - user_error_message; + let system_error_message, user_error_message; // Special case when user is lazy and specified generic error message to be // used for system and customer level - if ( typeof args === 'string' ) { + if (typeof args === "string") { system_error_message = user_error_message = args; } else { system_error_message = args.system_error; - user_error_message = args.user_error; + user_error_message = args.user_error; } - let exception = new Error( system_error_message ); + let exception = new Error(system_error_message); - if ( user_error_message ) { + if (user_error_message) { exception.user_error_message = user_error_message; } @@ -52,7 +47,7 @@ function throw_user_error(args) { } function extract_system_error_message(error) { - if ( ! error ) { + if (!error) { return null; } @@ -60,27 +55,27 @@ function extract_system_error_message(error) { } function extract_user_error_message(error) { - if ( ! error ) { + if (!error) { return null; } - if (typeof error === 'string') { + if (typeof error === "string") { return error; } - if ( error.hasOwnProperty( 'user_error_message' )) { + if (error.hasOwnProperty("user_error_message")) { return error.user_error_message; } - return 'N/A'; + return "N/A"; } module.exports = { - throw_user_error : throw_user_error, - extract_user_error_message : extract_user_error_message, - extract_system_error_message : extract_system_error_message, + throw_user_error: throw_user_error, + extract_user_error_message: extract_user_error_message, + extract_system_error_message: extract_system_error_message, - throwUserError : throw_user_error, - extractUserErrorMessage : extract_user_error_message, - extractSystemErrorMessage : extract_system_error_message, + throwUserError: throw_user_error, + extractUserErrorMessage: extract_user_error_message, + extractSystemErrorMessage: extract_system_error_message }; diff --git a/lib/middleware/ensure_user_is_admin.js b/lib/middleware/ensure_user_is_admin.js index 97d6d012d..f98eda087 100644 --- a/lib/middleware/ensure_user_is_admin.js +++ b/lib/middleware/ensure_user_is_admin.js @@ -6,17 +6,16 @@ * */ "use strict"; -module.exports = function(req, res, next){ +module.exports = function(req, res, next) { + // User should be login to view settings pages + if (!req.user) { + return res.redirect_with_session(303, "/"); + } - // User should be login to view settings pages - if ( !req.user ) { - return res.redirect_with_session(303, '/'); - } + // Only Admin users allowed to deal with settings pages + if (!req.user.is_admin()) { + return res.redirect_with_session(303, "/"); + } - // Only Admin users allowed to deal with settings pages - if ( !req.user.is_admin() ) { - return res.redirect_with_session(303, '/'); - } - - next(); + next(); }; diff --git a/lib/middleware/flash_messages.js b/lib/middleware/flash_messages.js index e86c04939..1ce9c417d 100644 --- a/lib/middleware/flash_messages.js +++ b/lib/middleware/flash_messages.js @@ -23,47 +23,48 @@ // Move flash object out of session and place it in to locals // so template is aware of it -module.exports = function(req, res, next){ - res.locals.flash = req.session.flash; - delete req.session.flash; +module.exports = function(req, res, next) { + res.locals.flash = req.session.flash; + delete req.session.flash; - // This is is a function that return custom function to be installed - // into session object as a method to add new message or array of - // messages. - var install_flash_array = function(key) { + // This is is a function that return custom function to be installed + // into session object as a method to add new message or array of + // messages. + var install_flash_array = function(key) { + return function(error_message) { + if (!this.flash) { + this.flash = {}; + } + if (!Array.isArray(this.flash[key])) { + this.flash[key] = []; + } - return function(error_message){ - if ( ! this.flash ) { - this.flash = {}; - } - if ( ! Array.isArray( this.flash[key] ) ) { - this.flash[key] = []; - } - - if (Array.isArray(error_message)) { - this.flash[key] = this.flash[key].concat( error_message ); - } else { - this.flash[key].push( error_message ); - } - }; + if (Array.isArray(error_message)) { + this.flash[key] = this.flash[key].concat(error_message); + } else { + this.flash[key].push(error_message); + } }; + }; - req.session.flash_error = install_flash_array('errors'); - req.session.flash_message = install_flash_array('messages'); - - req.session.flash_has_errors = function(){ - return this.flash - && Array.isArray( this.flash.errors ) - && this.flash.errors.length > 0; - }; + req.session.flash_error = install_flash_array("errors"); + req.session.flash_message = install_flash_array("messages"); - req.session.keep_old = function(){ - if (res.locals.flash) { - if (res.locals.flash.errors) this.flash_error( res.locals.flash.errors ); - if (res.locals.flash.messages) this.flash_message( res.locals.flash.messages ); - } - }; + req.session.flash_has_errors = function() { + return ( + this.flash && + Array.isArray(this.flash.errors) && + this.flash.errors.length > 0 + ); + }; - next(); + req.session.keep_old = function() { + if (res.locals.flash) { + if (res.locals.flash.errors) this.flash_error(res.locals.flash.errors); + if (res.locals.flash.messages) + this.flash_message(res.locals.flash.messages); + } + }; + next(); }; diff --git a/lib/middleware/session_aware_redirect.js b/lib/middleware/session_aware_redirect.js index bdd67ae96..d37361cb7 100644 --- a/lib/middleware/session_aware_redirect.js +++ b/lib/middleware/session_aware_redirect.js @@ -1,4 +1,3 @@ - "use strict"; /* @@ -14,21 +13,19 @@ TODO: Consider to completly substitute redirect function with new logic. */ -module.exports = function(req, res, next){ - - res.redirect_with_session = function(a,b){ - - if (arguments.length === 2) { - req.session.save(function(err){ - res.redirect(a,b); - }); - } else { - req.session.save(function(err){ - res.redirect(a); - }); - } - return true; - }; - - next(); +module.exports = function(req, res, next) { + res.redirect_with_session = function(a, b) { + if (arguments.length === 2) { + req.session.save(function(err) { + res.redirect(a, b); + }); + } else { + req.session.save(function(err) { + res.redirect(a); + }); + } + return true; + }; + + next(); }; diff --git a/lib/model/Report.js b/lib/model/Report.js index 71d0aa9f4..7f67eb314 100644 --- a/lib/model/Report.js +++ b/lib/model/Report.js @@ -1,93 +1,97 @@ - "use strict"; -const - Promise = require('bluebird'), - moment = require('moment'); +const Promise = require("bluebird"), + moment = require("moment"); const getUsersWithLeaves = ({ company, - startDate=company.get_today(), - endDate=company.get_today(), - departmentId=null - + startDate = company.get_today(), + endDate = company.get_today(), + departmentId = null }) => { - - let result = company.sequelize.models.Company.scope('with_active_users').findOne({ - where : {id : company.id}, + let result = company.sequelize.models.Company.scope( + "with_active_users" + ).findOne({ + where: { id: company.id } }); result = result.then(company => Promise.resolve(company.users)); if (departmentId) { - result = result.then(users => Promise.resolve(users.filter(u => String(u.DepartmentId) === String(departmentId)))); + result = result.then(users => + Promise.resolve( + users.filter(u => String(u.DepartmentId) === String(departmentId)) + ) + ); } - result = result.then(users => Promise.map(users, user => user.reload_with_leave_details({}), { concurrency : 10})); + result = result.then(users => + Promise.map(users, user => user.reload_with_leave_details({}), { + concurrency: 10 + }) + ); - const filter = filterLeaves({startDate, endDate}); + const filter = filterLeaves({ startDate, endDate }); - result = result.then( - users => Promise.map( + result = result.then(users => + Promise.map( users, - (user) => user.promise_my_active_leaves_ever() - .then(leaves => Promise.resolve(leaves.filter(filter))) - .then(leaves => Promise.resolve({user, leaves})), - { concurrency : 10 } + user => + user + .promise_my_active_leaves_ever() + .then(leaves => Promise.resolve(leaves.filter(filter))) + .then(leaves => Promise.resolve({ user, leaves })), + { concurrency: 10 } ) ); - result = result.then(report => report.map( - ({user, leaves}) => - ({ - user:{ - id:user.id, + result = result.then(report => + report.map(({ user, leaves }) => ({ + user: { + id: user.id, department: user.department.name, - email:user.email, - fullName:user.full_name(), + email: user.email, + fullName: user.full_name() }, - leaves : leaves.map(l => leaveIntoObject(l)), - }) - )); + leaves: leaves.map(l => leaveIntoObject(l)) + })) + ); return result; }; -const filterLeaves = ({startDate, endDate}) => (leave) => { +const filterLeaves = ({ startDate, endDate }) => leave => { const sd = moment.utc(leave.get_start_leave_day().date); - const ed = moment.utc(leave.get_end_leave_day().date) + const ed = moment.utc(leave.get_end_leave_day().date); return ( - (sd.isSameOrAfter(startDate, 'day') && sd.isSameOrBefore(endDate, 'day')) - || - (ed.isSameOrAfter(startDate, 'day') && ed.isSameOrBefore(endDate, 'day')) + (sd.isSameOrAfter(startDate, "day") && sd.isSameOrBefore(endDate, "day")) || + (ed.isSameOrAfter(startDate, "day") && ed.isSameOrBefore(endDate, "day")) ); }; -const leaveIntoObject = (leave) => { - - const dateFormat = 'YYYY-MM-DD'; +const leaveIntoObject = leave => { + const dateFormat = "YYYY-MM-DD"; const Leave = leave.sequelize.models.Leave; const statusMap = { - [Leave.status_new()]: 'New', - [Leave.status_approved()]: 'Approved', - [Leave.status_rejected()]: 'Rejected', - [Leave.status_pended_revoke()]: 'Pended Revoke', - [Leave.status_canceled()]: 'Canceled', + [Leave.status_new()]: "New", + [Leave.status_approved()]: "Approved", + [Leave.status_rejected()]: "Rejected", + [Leave.status_pended_revoke()]: "Pended Revoke", + [Leave.status_canceled()]: "Canceled" }; return { - startDate: moment.utc(leave.get_start_leave_day().date).format(dateFormat), - endDate: moment.utc(leave.get_end_leave_day().date).format(dateFormat), - type: leave.leave_type.name, + startDate: moment.utc(leave.get_start_leave_day().date).format(dateFormat), + endDate: moment.utc(leave.get_end_leave_day().date).format(dateFormat), + type: leave.leave_type.name, deductedDays: leave.get_deducted_days_number(), - approver: (leave.approver ? leave.approver.full_name() : 'N/A'), - status: statusMap[leave.status]||'Unknown', + approver: leave.approver ? leave.approver.full_name() : "N/A", + status: statusMap[leave.status] || "Unknown" }; }; - module.exports = { getUsersWithLeaves }; diff --git a/lib/model/audit.js b/lib/model/audit.js index beeaaa7e3..c062cdcd0 100644 --- a/lib/model/audit.js +++ b/lib/model/audit.js @@ -1,38 +1,36 @@ +"use strict"; -'use strict'; +const Bluebird = require("bluebird"), + Models = require("./db"); -const - Bluebird = require('bluebird'), - Models = require('./db'); - -const getAuditCaptureForUser = ({byUser, forUser, newAttributes}) => () => { +const getAuditCaptureForUser = ({ byUser, forUser, newAttributes }) => () => { const attributeUpdates = Object.keys(newAttributes) .filter(k => String(newAttributes[k]) !== String(forUser[k])) - .map( - attribute => Models.Audit.create({ - companyId: byUser.companyId, - byUserId: byUser.id, - entityType: 'USER', - entityId: forUser.id, + .map(attribute => + Models.Audit.create({ + companyId: byUser.companyId, + byUserId: byUser.id, + entityType: "USER", + entityId: forUser.id, attribute, - oldValue: String(forUser[attribute]), - newValue: String(newAttributes[attribute]), + oldValue: String(forUser[attribute]), + newValue: String(newAttributes[attribute]) }) ); - return Bluebird.map(attributeUpdates, f => f, {concurrency : 5}); + return Bluebird.map(attributeUpdates, f => f, { concurrency: 5 }); }; -const getAudit = ({companyId}) => { +const getAudit = ({ companyId }) => { return Models.Audit.findAll({ - where : { - companyId, + where: { + companyId }, - raw: true, - }) + raw: true + }); }; module.exports = { getAuditCaptureForUser, - getAudit, + getAudit }; diff --git a/lib/model/calculateCarryOverAllowance.js b/lib/model/calculateCarryOverAllowance.js index c5dba94a2..34279eec2 100644 --- a/lib/model/calculateCarryOverAllowance.js +++ b/lib/model/calculateCarryOverAllowance.js @@ -1,40 +1,58 @@ +"use strict"; -'use strict'; +const moment = require("moment"), + Promise = require("bluebird"); -const - moment = require('moment'), - Promise= require('bluebird'); - -const calculateCarryOverAllowance = ({users}) => { - - const - yearFrom = moment.utc().add(-1, 'y').year(), +const calculateCarryOverAllowance = ({ users }) => { + const yearFrom = moment + .utc() + .add(-1, "y") + .year(), yearTo = moment.utc().year(); let flow = Promise.resolve(users); - flow = flow.then(users => Promise.map( - users, - user => { - let carryOver; - return Promise.resolve(user.getCompany().then(c => carryOver = c.carry_over)) - .then(() => user.reload_with_leave_details({year:moment.utc(yearFrom, 'YYYY')})) - .then(user => user.promise_allowance({year:moment.utc(yearFrom, 'YYYY')})) - .then(allowance => { - - const carried_over_allowance = (carryOver === 0) - ? 0 - : Math.min(allowance.number_of_days_available_in_allowance, carryOver); - - return user.promise_to_update_carried_over_allowance({ - carried_over_allowance, - year: yearTo, - }); - }) - .then(() => console.log(`Carried over unused allowance ${yearFrom} -> ${yearTo} for user ${user.id}`)); - }, - {concurrency : 1} - )); + flow = flow.then(users => + Promise.map( + users, + user => { + let carryOver; + return Promise.resolve( + user.getCompany().then(c => (carryOver = c.carry_over)) + ) + .then(() => + user.reload_with_leave_details({ + year: moment.utc(yearFrom, "YYYY") + }) + ) + .then(user => + user.promise_allowance({ year: moment.utc(yearFrom, "YYYY") }) + ) + .then(allowance => { + const carried_over_allowance = + carryOver === 0 + ? 0 + : Math.min( + allowance.number_of_days_available_in_allowance, + carryOver + ); + + return user.promise_to_update_carried_over_allowance({ + carried_over_allowance, + year: yearTo + }); + }) + .then(() => + console.log( + `Carried over unused allowance ${yearFrom} -> ${yearTo} for user ${ + user.id + }` + ) + ); + }, + { concurrency: 1 } + ) + ); return flow; }; diff --git a/lib/model/calendar_month.js b/lib/model/calendar_month.js index 3485cfc38..42c896b7e 100644 --- a/lib/model/calendar_month.js +++ b/lib/model/calendar_month.js @@ -1,130 +1,142 @@ +"use strict"; -'use strict'; +var moment = require("moment"), + _ = require("underscore"); -var moment = require('moment'), - _ = require('underscore'); +function CalendarMonth(day, args) { + var self = this; + this.date = moment.utc(day).startOf("month"); + this._leaves = {}; + this._bank_holidays = {}; -function CalendarMonth(day, args){ - var self = this; - this.date = moment.utc(day).startOf('month'); - this._leaves = {}; - this._bank_holidays = {}; + if (args && args.today) { + self.today = args.today; + } else { + throw new Error( + "CalendarMonth requires today - moment object that represents today" + ); + } + if (args) { + self._schedule = args.schedule; + } - if (args && args.today) { - self.today = args.today; - } else { - throw new Error('CalendarMonth requires today - moment object that represents today'); - } + if (!self._schedule) { + throw new Error("CalendarMonth requires schedule"); + } - if (args){ - self._schedule = args.schedule; - } + if (args && args.bank_holidays) { + var map = {}; + args.bank_holidays.forEach(function(day) { + day = { + date: moment.utc(day.date), + name: day.name + }; + map[day.date.clone().format(self.default_date_format())] = day; + }); + self._bank_holidays = map; + } - if ( ! self._schedule ) { - throw new Error('CalendarMonth requires schedule'); - } + if (args && args.leave_days) { + var map = {}; + args.leave_days.forEach(function(day) { + var attribute = moment.utc(day.date).format(self.default_date_format()); + if (!map[attribute]) { + map[attribute] = day; + } else if (map[attribute]) { + if (map[attribute].is_all_day_leave()) { + return; + } - if (args && args.bank_holidays){ - var map = {}; - args.bank_holidays.forEach(function(day){ - day = { - date : moment.utc(day.date), - name : day.name, - }; - map[day.date.clone().format(self.default_date_format())] = day; - }); - self._bank_holidays = map; - } + if (day.is_all_day_leave()) { + map[attribute] = day; + } else if (map[attribute].day_part !== day.day_part) { + // Merge leave types from both days into one in "map" + if (day.is_morning_leave()) { + map[attribute].morning_leave_type_id = day.morning_leave_type_id; + } - if (args && args.leave_days){ - var map = {}; - args.leave_days.forEach(function(day){ - var attribute = moment.utc(day.date).format(self.default_date_format()); - if ( ! map[attribute] ) { - map[attribute] = day; - } else if ( map[attribute] ) { - - if (map[attribute].is_all_day_leave()) { - return; - } - - if (day.is_all_day_leave()){ - map[attribute] = day; - } else if ( map[attribute].day_part !== day.day_part ) { - - // Merge leave types from both days into one in "map" - if (day.is_morning_leave()) { - map[attribute].morning_leave_type_id = day.morning_leave_type_id; - } - - if ( day.is_afternoon_leave() ) { - map[attribute].afternoon_leave_type_id = day.afternoon_leave_type_id; - } - - map[attribute].pretend_to_be_full_day(); - } - } - }); - self._leaves = map; - } + if (day.is_afternoon_leave()) { + map[attribute].afternoon_leave_type_id = + day.afternoon_leave_type_id; + } - self._leave_types_map = {}; + map[attribute].pretend_to_be_full_day(); + } + } + }); + self._leaves = map; + } - if (args && args.leave_types) { - // Build leave types look up dictionary - args.leave_types.forEach(lt => self._leave_types_map[ lt.id ] = lt); - } + self._leave_types_map = {}; + + if (args && args.leave_types) { + // Build leave types look up dictionary + args.leave_types.forEach(lt => (self._leave_types_map[lt.id] = lt)); + } return; -}; +} CalendarMonth.prototype.is_bank_holiday = function(day) { - return this._bank_holidays && this._bank_holidays.hasOwnProperty( - this.get_base_date().date(day).format(this.default_date_format()) + return ( + this._bank_holidays && + this._bank_holidays.hasOwnProperty( + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ) ); }; CalendarMonth.prototype.get_bank_holiday_name = function(day) { const self = this; - if ( ! self.is_bank_holiday(day) ) { + if (!self.is_bank_holiday(day)) { return null; } return this._bank_holidays[ - this.get_base_date().date(day).format(this.default_date_format()) + this.get_base_date() + .date(day) + .format(this.default_date_format()) ].name; -} +}; CalendarMonth.prototype.is_leave = function(day) { - var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; + var leave_day = this._leaves[ + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ]; - return leave_day && leave_day.is_all_day_leave(); + return leave_day && leave_day.is_all_day_leave(); }; CalendarMonth.prototype.is_leave_morning = function(day) { - var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; - return this.is_leave(day) - || (leave_day && leave_day.is_morning_leave()); + var leave_day = this._leaves[ + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ]; + return this.is_leave(day) || (leave_day && leave_day.is_morning_leave()); }; CalendarMonth.prototype.is_leave_afternoon = function(day) { - var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; + var leave_day = this._leaves[ + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ]; - return this.is_leave(day) - || (leave_day && leave_day.is_afternoon_leave()); + return this.is_leave(day) || (leave_day && leave_day.is_afternoon_leave()); }; -CalendarMonth.prototype.get_leave_obj = function(day){ +CalendarMonth.prototype.get_leave_obj = function(day) { var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) + this.get_base_date() + .date(day) + .format(this.default_date_format()) ]; if (leave_day && leave_day.leave) { @@ -134,183 +146,201 @@ CalendarMonth.prototype.get_leave_obj = function(day){ } }; -CalendarMonth.prototype.is_new_leave = function(day){ - var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; +CalendarMonth.prototype.is_new_leave = function(day) { + var leave_day = this._leaves[ + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ]; - return leave_day && leave_day.leave && leave_day.leave.is_new_leave(); + return leave_day && leave_day.leave && leave_day.leave.is_new_leave(); }; -CalendarMonth.prototype.is_approved_leave = function(day){ - var leave_day = this._leaves[ - this.get_base_date().date(day).format(this.default_date_format()) - ]; +CalendarMonth.prototype.is_approved_leave = function(day) { + var leave_day = this._leaves[ + this.get_base_date() + .date(day) + .format(this.default_date_format()) + ]; - return leave_day && leave_day.leave && leave_day.leave.is_approved_leave(); + return leave_day && leave_day.leave && leave_day.leave.is_approved_leave(); }; -CalendarMonth.prototype.get_morning_leave_type_id = function(day){ - let - self = this, - leave_day = self._leaves[ - self.get_base_date().date(day).format(self.default_date_format()) - ]; - - if ( ! leave_day ) { +CalendarMonth.prototype.get_morning_leave_type_id = function(day) { + let self = this, + leave_day = + self._leaves[ + self + .get_base_date() + .date(day) + .format(self.default_date_format()) + ]; + + if (!leave_day) { return null; } return leave_day.get_morning_leave_type_id(); }; -CalendarMonth.prototype.get_afternoon_leave_type_id = function(day){ - let - self = this, - leave_day = self._leaves[ - self.get_base_date().date(day).format(self.default_date_format()) - ]; - - if ( ! leave_day ) { +CalendarMonth.prototype.get_afternoon_leave_type_id = function(day) { + let self = this, + leave_day = + self._leaves[ + self + .get_base_date() + .date(day) + .format(self.default_date_format()) + ]; + + if (!leave_day) { return null; } return leave_day.get_afternoon_leave_type_id(); }; -CalendarMonth.prototype.default_date_format = function(){ - return 'YYYY-MM-DD'; +CalendarMonth.prototype.default_date_format = function() { + return "YYYY-MM-DD"; }; CalendarMonth.prototype.how_many_days = function() { - return this.date.daysInMonth(); + return this.date.daysInMonth(); }; -CalendarMonth.prototype.get_base_date = function(){ - return this.date.clone(); +CalendarMonth.prototype.get_base_date = function() { + return this.date.clone(); }; -CalendarMonth.prototype._week_day_map = function(){ - return { 0:7, 1:1, 2:2, 3:3, 4:4, 5:5, 6:6 }; +CalendarMonth.prototype._week_day_map = function() { + return { 0: 7, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6 }; }; -CalendarMonth.prototype.week_day = function(){ - return this._week_day_map()[ this.date.day() ]; +CalendarMonth.prototype.week_day = function() { + return this._week_day_map()[this.date.day()]; }; -CalendarMonth.prototype.how_many_blanks_at_the_start = function(){ - return this.week_day() - 1; +CalendarMonth.prototype.how_many_blanks_at_the_start = function() { + return this.week_day() - 1; }; -CalendarMonth.prototype.how_many_blanks_at_the_end = function(){ - return 7 - this._week_day_map()[ this.get_base_date().endOf('month').day() ]; +CalendarMonth.prototype.how_many_blanks_at_the_end = function() { + return ( + 7 - + this._week_day_map()[ + this.get_base_date() + .endOf("month") + .day() + ] + ); }; -CalendarMonth.prototype.is_weekend = function(day){ - return ! this._schedule.is_it_working_day({ - day : this.get_base_date().date(day), +CalendarMonth.prototype.is_weekend = function(day) { + return !this._schedule.is_it_working_day({ + day: this.get_base_date().date(day) }); }; -CalendarMonth.prototype.is_current_day = function(day){ - return this.get_base_date().date(day).format( this.default_date_format() ) - === - this.today.format( this.default_date_format() ); +CalendarMonth.prototype.is_current_day = function(day) { + return ( + this.get_base_date() + .date(day) + .format(this.default_date_format()) === + this.today.format(this.default_date_format()) + ); }; -CalendarMonth.prototype.as_for_template = function(){ - let - self = this, - weeks = [], - week = []; +CalendarMonth.prototype.as_for_template = function() { + let self = this, + weeks = [], + week = []; - for( var i=0; i= 7) { - weeks.push( week ); - week = []; - } + if (self.is_current_day(i)) { + day.is_current_day = true; } - for( var i=0; i= 7) { + weeks.push(week); + week = []; } + } - weeks.push(week); + for (var i = 0; i < self.how_many_blanks_at_the_end(); i++) { + week.push({ val: "" }); + } - return { - month : self.get_base_date().format('MMMM'), - moment: self.get_base_date(), - weeks : weeks, - }; + weeks.push(week); + + return { + month: self.get_base_date().format("MMMM"), + moment: self.get_base_date(), + weeks: weeks + }; }; -CalendarMonth.prototype.as_for_team_view = function(){ +CalendarMonth.prototype.as_for_team_view = function() { var me = this, for_calendar_structure = this.as_for_template(); // remove empty days, those staying for empty cells in calendar - var days = _.filter( - _.flatten(for_calendar_structure.weeks), - function(day){ - return !! day.val - } - ); + var days = _.filter(_.flatten(for_calendar_structure.weeks), function(day) { + return !!day.val; + }); - _.each(days, function(day){ + _.each(days, function(day) { day.moment = me.get_base_date().date(day.val); }); return days; - }; module.exports = CalendarMonth; diff --git a/lib/model/comment.js b/lib/model/comment.js index a40da0c8f..e0b3f3f07 100644 --- a/lib/model/comment.js +++ b/lib/model/comment.js @@ -1,31 +1,29 @@ +"use strict"; -'use strict'; +const Bluebird = require("bluebird"), + Models = require("./db"); -const - Bluebird = require('bluebird'), - Models = require('./db'); - -const commentLeave = ({leave, comment, companyId}) => { +const commentLeave = ({ leave, comment, companyId }) => { return Models.Comment.create({ entityType: Models.Comment.getEntityTypeLeave(), entityId: leave.id, comment, companyId, - byUserId: leave.userId, + byUserId: leave.userId }); }; -const getCommentsForLeave = ({leave}) => { +const getCommentsForLeave = ({ leave }) => { return Models.Comment.findAll({ raw: true, - where : { + where: { entityType: Models.Comment.getEntityTypeLeave(), - entityId: leave.id, - }, + entityId: leave.id + } }); }; module.exports = { commentLeave, - getCommentsForLeave, + getCommentsForLeave }; diff --git a/lib/model/company/exporter/index.js b/lib/model/company/exporter/index.js index d8c10a7c2..58e7e2e4d 100644 --- a/lib/model/company/exporter/index.js +++ b/lib/model/company/exporter/index.js @@ -1,19 +1,18 @@ +"use strict"; -'use strict'; +const Joi = require("joi"), + Promise = require("bluebird"), + CompanySummary = require("./summary"); -const - Joi = require('joi'), - Promise = require('bluebird'), - CompanySummary = require('./summary'); - -const - constructor_schema = Joi.object().required() +const constructor_schema = Joi.object() + .required() .keys({ - dbSchema : Joi.object().required(), + dbSchema: Joi.object().required() }), - schemaPromiseCompanySummary = Joi.object().required() + schemaPromiseCompanySummary = Joi.object() + .required() .keys({ - company : Joi.object().required(), + company: Joi.object().required() }); class CompanyExporter { @@ -38,29 +37,28 @@ class CompanyExporter { "Failed to get company summary die to validation errors" ); - let - self = this, + let self = this, company = args.company; - return Promise - .join( - self.dbModel.Company - .scope('with_simple_departments', 'with_leave_types') - .findOne({ - where : { id : company.id }, - }), - self.dbModel.User - .scope('with_simple_leaves') - .findAll({ - where : { companyId : company.id } - }), - (company, users) => Promise.resolve( new CompanySummary({ - company : company, - users : users, - })) - ); + return Promise.join( + self.dbModel.Company.scope( + "with_simple_departments", + "with_leave_types" + ).findOne({ + where: { id: company.id } + }), + self.dbModel.User.scope("with_simple_leaves").findAll({ + where: { companyId: company.id } + }), + (company, users) => + Promise.resolve( + new CompanySummary({ + company: company, + users: users + }) + ) + ); } - } module.exports = CompanyExporter; diff --git a/lib/model/company/exporter/summary.js b/lib/model/company/exporter/summary.js index e78d740db..9ac6f5665 100644 --- a/lib/model/company/exporter/summary.js +++ b/lib/model/company/exporter/summary.js @@ -1,16 +1,15 @@ - -'use strict'; - -const - Promise = require('bluebird'), - CSV = Promise.promisifyAll(require('csv')), - moment = require('moment'), - Joi = require('joi'); - -const - schema_constructor = Joi.object().required().keys({ - company : Joi.object().required(), - users : Joi.array().required(), +"use strict"; + +const Promise = require("bluebird"), + CSV = Promise.promisifyAll(require("csv")), + moment = require("moment"), + Joi = require("joi"); + +const schema_constructor = Joi.object() + .required() + .keys({ + company: Joi.object().required(), + users: Joi.array().required() }); class CompanySummary { @@ -22,72 +21,82 @@ class CompanySummary { ); this._company = args.company; - this._users = args.users; + this._users = args.users; } - get company() { return this._company } - get users() { return this._users } + get company() { + return this._company; + } + get users() { + return this._users; + } as_csv_data() { - let - self = this, - results = [], + let self = this, + results = [], date_format = self.company.get_default_date_format(), departmentsMap = {}, leaveTypesMap = {}; // Fill departments map - self.company.departments.forEach(d => departmentsMap[d.id] = d); + self.company.departments.forEach(d => (departmentsMap[d.id] = d)); // Fill leave types map - self.company.leave_types.forEach( lt => leaveTypesMap[ lt.id ] = lt ); + self.company.leave_types.forEach(lt => (leaveTypesMap[lt.id] = lt)); // Put headers results.push([ - 'Ddepartment', 'Lastname', 'Name', 'Email address', - 'Type of absence', 'Started at', 'Date type', 'Ended at', 'Date type' + "Ddepartment", + "Lastname", + "Name", + "Email address", + "Type of absence", + "Started at", + "Date type", + "Ended at", + "Date type" ]); self.users // Sort users by departments and by last names .sort( - (a,b) => ( + (a, b) => // primary criteria is department name - departmentsMap[ a.DepartmentId ].name - .localeCompare( departmentsMap[ b.DepartmentId ].name ) - || + departmentsMap[a.DepartmentId].name.localeCompare( + departmentsMap[b.DepartmentId].name + ) || // secondary criteria is employee's lastname - a.lastname.localeCompare( b.lastname ) - ) + a.lastname.localeCompare(b.lastname) ) // Get a row per every leave - .forEach(u => u.my_leaves.forEach(l => { - - const - start_date = moment(l.date_start).format(date_format), - end_date = moment(l.date_end).format(date_format); - - results.push([ - departmentsMap[ u.DepartmentId ].name, - u.lastname, - u.name, - u.email, - leaveTypesMap[ l.leaveTypeId ].name, - start_date, - ( - l.does_start_half_morning() ? 'morning' - : l.does_start_half_afternoon() ? 'afternoon' - : 'whole day' - ), - end_date, - ( - start_date === end_date ? 'N/A' - : l.does_end_half_morning() ? 'morning' - : l.does_end_half_afternoon() ? 'afternoon' - : 'whole day' - ), - ]) - })); + .forEach(u => + u.my_leaves.forEach(l => { + const start_date = moment(l.date_start).format(date_format), + end_date = moment(l.date_end).format(date_format); + + results.push([ + departmentsMap[u.DepartmentId].name, + u.lastname, + u.name, + u.email, + leaveTypesMap[l.leaveTypeId].name, + start_date, + l.does_start_half_morning() + ? "morning" + : l.does_start_half_afternoon() + ? "afternoon" + : "whole day", + end_date, + start_date === end_date + ? "N/A" + : l.does_end_half_morning() + ? "morning" + : l.does_end_half_afternoon() + ? "afternoon" + : "whole day" + ]); + }) + ); return results; } @@ -95,11 +104,10 @@ class CompanySummary { promise_as_csv_string() { const self = this; - return Promise - .resolve( self.as_csv_data() ) - .then( data => CSV.stringifyAsync( data ) ) + return Promise.resolve(self.as_csv_data()).then(data => + CSV.stringifyAsync(data) + ); } - } module.exports = CompanySummary; diff --git a/lib/model/company/remover.js b/lib/model/company/remover.js index 045595c5e..c44769015 100644 --- a/lib/model/company/remover.js +++ b/lib/model/company/remover.js @@ -1,78 +1,87 @@ - "use strict"; -const - Joi = require('joi'), - Promise = require('bluebird'), - Exception = require('../../error'), - Models = require('../db'); +const Joi = require("joi"), + Promise = require("bluebird"), + Exception = require("../../error"), + Models = require("../db"); -const - schemaPromiseToRemove = Joi.object().required().keys({ - company : Joi.object().required(), //.type(Models.Company.constructor), - byUser : Joi.object().required(), //.type(Models.User.constructor), - confirmName : Joi.string().required().trim(), +const schemaPromiseToRemove = Joi.object() + .required() + .keys({ + company: Joi.object().required(), //.type(Models.Company.constructor), + byUser: Joi.object().required(), //.type(Models.User.constructor), + confirmName: Joi.string() + .required() + .trim() }); - class CompanyRemover { - - static promiseToRemove(args){ - + static promiseToRemove(args) { args = Joi.attempt( args, schemaPromiseToRemove, "Param validation failed for promiseToRemove" ); - const - company = args.company, - byUser = args.byUser, - confirmName = args.confirmName; + const company = args.company, + byUser = args.byUser, + confirmName = args.confirmName; // Ensure that confirm name is correct let normalizedNames = [company.name, confirmName] .map(s => s.trim()) - .map(s => s.replace(/\s+/g, '')) + .map(s => s.replace(/\s+/g, "")) .map(s => s.toUpperCase()); if (normalizedNames[0] !== normalizedNames[1]) { Exception.throw_user_error({ - system_error : `Confirmed name does not match one on company record: ${ normalizedNames.join(', ') }`, - user_error : `Provided name confirmation does not match company one`, + system_error: `Confirmed name does not match one on company record: ${normalizedNames.join( + ", " + )}`, + user_error: `Provided name confirmation does not match company one` }); } - return Models.User + return ( + Models.User - // Ensure user belongs to current combany and is admin - .count({ - where : { - id : byUser.id, - companyId : company.id, - admin : true, - } - }) - .then(count => { - if ( count === 0) { - Exception.throw_user_error({ - system_error : `An attempt to remove company [${company.id}] by unrelated user [${byUser.id }]`, - user_error : `User does not have permissions to remove company`, - }); - } - return Promise.resolve(1); - }) + // Ensure user belongs to current combany and is admin + .count({ + where: { + id: byUser.id, + companyId: company.id, + admin: true + } + }) + .then(count => { + if (count === 0) { + Exception.throw_user_error({ + system_error: `An attempt to remove company [${ + company.id + }] by unrelated user [${byUser.id}]`, + user_error: `User does not have permissions to remove company` + }); + } + return Promise.resolve(1); + }) - // Remove company record and all related records - // (we do not really remove all data, just the sensitive information) - // .. delete email audit - .then(() => Models.EmailAudit.destroy({ where : { company_id : company.id } })) - // Remove all leaves for related users - .then(() => company.getUsers().map(u => Models.Leave.destroy({ where : { userId : u.id }}))) - // Remove all users - .then(() => Models.User.destroy({where : {companyId : company.id} })) - // Remove company record - .then(() => company.destroy()); + // Remove company record and all related records + // (we do not really remove all data, just the sensitive information) + // .. delete email audit + .then(() => + Models.EmailAudit.destroy({ where: { company_id: company.id } }) + ) + // Remove all leaves for related users + .then(() => + company + .getUsers() + .map(u => Models.Leave.destroy({ where: { userId: u.id } })) + ) + // Remove all users + .then(() => Models.User.destroy({ where: { companyId: company.id } })) + // Remove company record + .then(() => company.destroy()) + ); } } diff --git a/lib/model/db/audit.js b/lib/model/db/audit.js index b484937dd..c1b23bd27 100644 --- a/lib/model/db/audit.js +++ b/lib/model/db/audit.js @@ -1,57 +1,59 @@ +"use strict"; -'use strict'; - -module.exports = function(sequelize, DataTypes){ - - const Audit = sequelize.define("Audit", { - entityType: { - type: DataTypes.STRING, - allowNull: false, - comment: 'Type of the entity which change is tracked. E.g. USER, LEAVE etc', - }, - entityId: { - type: DataTypes.INTEGER, - allowNull: false, - comment: 'ID of the entity defined by entityType', - }, - attribute: { - type: DataTypes.STRING, - allowNull: false, - comment: 'Attribute of the entity which chnage is to be recorded', - }, - oldValue: { - type: DataTypes.STRING, - allowNull: true, - comment: 'Old value converted to STRING', - }, - newValue: { - type: DataTypes.STRING, - allowNull: true, - comment: 'New value converted to STRING', - }, - }, { - underscored : true, - freezeTableName : true, - timestamps : true, - createdAt : 'at', - updatedAt : false, - tableName : 'audit', - - classMethods : { - associate : (models) => { - Audit.belongsTo(models.Company, { - as : 'company', - foreignKey : 'companyId', - }); - - Audit.belongsTo(models.User, { - as: 'byUser', - foreignKey: 'byUserId', - }); +module.exports = function(sequelize, DataTypes) { + const Audit = sequelize.define( + "Audit", + { + entityType: { + type: DataTypes.STRING, + allowNull: false, + comment: + "Type of the entity which change is tracked. E.g. USER, LEAVE etc" + }, + entityId: { + type: DataTypes.INTEGER, + allowNull: false, + comment: "ID of the entity defined by entityType" }, + attribute: { + type: DataTypes.STRING, + allowNull: false, + comment: "Attribute of the entity which chnage is to be recorded" + }, + oldValue: { + type: DataTypes.STRING, + allowNull: true, + comment: "Old value converted to STRING" + }, + newValue: { + type: DataTypes.STRING, + allowNull: true, + comment: "New value converted to STRING" + } }, + { + underscored: true, + freezeTableName: true, + timestamps: true, + createdAt: "at", + updatedAt: false, + tableName: "audit", + + classMethods: { + associate: models => { + Audit.belongsTo(models.Company, { + as: "company", + foreignKey: "companyId" + }); - }); + Audit.belongsTo(models.User, { + as: "byUser", + foreignKey: "byUserId" + }); + } + } + } + ); return Audit; }; diff --git a/lib/model/db/bank_holiday.js b/lib/model/db/bank_holiday.js index 46a20203f..c344a40e9 100644 --- a/lib/model/db/bank_holiday.js +++ b/lib/model/db/bank_holiday.js @@ -1,72 +1,76 @@ "use strict"; -var moment = require('moment'), -_ = require('underscore'), -config = require('../../config'); +var moment = require("moment"), + _ = require("underscore"), + config = require("../../config"); module.exports = function(sequelize, DataTypes) { - var BankHoliday = sequelize.define("BankHoliday", { - // TODO add validators! - name : { - type : DataTypes.STRING, - allowNull : false - }, - date : { - type : DataTypes.DATE, - allowNull : false, + var BankHoliday = sequelize.define( + "BankHoliday", + { + // TODO add validators! + name: { + type: DataTypes.STRING, + allowNull: false + }, + date: { + type: DataTypes.DATE, + allowNull: false + } + }, + { + indexes: [ + { + fields: ["companyId"] + } + ], + classMethods: { + associate: function(models) { + BankHoliday.belongsTo(models.Company, { as: "company" }); }, - }, { - indexes : [ - { - fields : ['companyId'], - } - ], - classMethods: { - associate : function( models ) { - BankHoliday.belongsTo(models.Company, {as : 'company'}); - }, - generate_bank_holidays : function(args){ - var company = args.company, - country_code = args.country_code; + generate_bank_holidays: function(args) { + var company = args.company, + country_code = args.country_code; - var bank_holidays = [ - { - name : 'Early May bank holiday', - date : '2015-05-04', - companyId : company.id, - }, - ]; + var bank_holidays = [ + { + name: "Early May bank holiday", + date: "2015-05-04", + companyId: company.id + } + ]; - var config_countries = config.get('countries'); + var config_countries = config.get("countries"); - if ( - config_countries.hasOwnProperty( country_code ) - && config_countries[ country_code ].hasOwnProperty('bank_holidays') - && config_countries[ country_code ].bank_holidays.length > 0 - ) { - bank_holidays = _.map( - config_countries[ country_code ].bank_holidays, - function(bh){ - return { - name : bh.name, - date : bh.date, - companyId : company.id, - }; - } - ); - } + if ( + config_countries.hasOwnProperty(country_code) && + config_countries[country_code].hasOwnProperty("bank_holidays") && + config_countries[country_code].bank_holidays.length > 0 + ) { + bank_holidays = _.map( + config_countries[country_code].bank_holidays, + function(bh) { + return { + name: bh.name, + date: bh.date, + companyId: company.id + }; + } + ); + } - return BankHoliday.bulkCreate(bank_holidays); - }, - }, + return BankHoliday.bulkCreate(bank_holidays); + } + }, - instanceMethods : { - get_pretty_date : function(){ - return moment.utc(this.date).format('YYYY-MM-DD'); - }, + instanceMethods: { + get_pretty_date: function() { + return moment.utc(this.date).format("YYYY-MM-DD"); } - }); + } + } + ); - return BankHoliday; + return BankHoliday; }; diff --git a/lib/model/db/comment.js b/lib/model/db/comment.js index 55e384556..68f5c1a18 100644 --- a/lib/model/db/comment.js +++ b/lib/model/db/comment.js @@ -1,46 +1,49 @@ - -'use strict'; +"use strict"; module.exports = (sequelize, DataTypes) => { - const Comment = sequelize.define('Comment', { - entityType: { - type: DataTypes.STRING, - allowNull: false, - comment: 'Type of entity current comments belongs to', - }, - entityId: { - type: DataTypes.INTEGER, - allowNull: false, - comment: 'Reference ID for entity current comment belongs to', - }, - comment: { - type: DataTypes.STRING, - allowNull: false, - comment: 'The value of comment', + const Comment = sequelize.define( + "Comment", + { + entityType: { + type: DataTypes.STRING, + allowNull: false, + comment: "Type of entity current comments belongs to" + }, + entityId: { + type: DataTypes.INTEGER, + allowNull: false, + comment: "Reference ID for entity current comment belongs to" + }, + comment: { + type: DataTypes.STRING, + allowNull: false, + comment: "The value of comment" + } }, - },{ - underscored : true, - freezeTableName : true, - timestamps : true, - createdAt : 'at', - updatedAt : false, - tableName : 'comment', + { + underscored: true, + freezeTableName: true, + timestamps: true, + createdAt: "at", + updatedAt: false, + tableName: "comment", - classMethods : { - associate : (models) => { - Comment.belongsTo(models.Company, { - as : 'company', - foreignKey : 'companyId', - }); + classMethods: { + associate: models => { + Comment.belongsTo(models.Company, { + as: "company", + foreignKey: "companyId" + }); - Comment.belongsTo(models.User, { - as: 'byUser', - foreignKey: 'byUserId', - }); - }, - getEntityTypeLeave: () => 'LEAVE', - }, - }); + Comment.belongsTo(models.User, { + as: "byUser", + foreignKey: "byUserId" + }); + }, + getEntityTypeLeave: () => "LEAVE" + } + } + ); return Comment; }; diff --git a/lib/model/db/company.js b/lib/model/db/company.js index 66f0ac92e..7a8749723 100644 --- a/lib/model/db/company.js +++ b/lib/model/db/company.js @@ -1,405 +1,385 @@ "use strict"; -const - Promise = require("bluebird"), - LdapAuth = require('ldapauth-fork'), - moment = require('moment'), - moment_tz = require('moment-timezone'), - _ = require('underscore'), - uuidv4 = require('uuid/v4'); - +const Promise = require("bluebird"), + LdapAuth = require("ldapauth-fork"), + moment = require("moment"), + moment_tz = require("moment-timezone"), + _ = require("underscore"), + uuidv4 = require("uuid/v4"); module.exports = function(sequelize, DataTypes) { - var Company = sequelize.define("Company", { - // TODO add validators! - name : { - type : DataTypes.STRING, - allowNull : false - }, - country : { - type : DataTypes.STRING, - allowNull : false - }, - start_of_new_year : { - type : DataTypes.INTEGER, - allowNull : false - }, - share_all_absences : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, - }, - ldap_auth_enabled : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, - }, - ldap_auth_config : { - type : DataTypes.STRING, - allowNull : true, - set : function(val){ - if (! val || typeof val !== 'object' ) { + var Company = sequelize.define( + "Company", + { + // TODO add validators! + name: { + type: DataTypes.STRING, + allowNull: false + }, + country: { + type: DataTypes.STRING, + allowNull: false + }, + start_of_new_year: { + type: DataTypes.INTEGER, + allowNull: false + }, + share_all_absences: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false + }, + ldap_auth_enabled: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false + }, + ldap_auth_config: { + type: DataTypes.STRING, + allowNull: true, + set: function(val) { + if (!val || typeof val !== "object") { val = JSON.stringify({}); } - this.setDataValue( 'ldap_auth_config', JSON.stringify(val) ); + this.setDataValue("ldap_auth_config", JSON.stringify(val)); }, - get : function(){ - var val = this.getDataValue('ldap_auth_config'); + get: function() { + var val = this.getDataValue("ldap_auth_config"); try { val = JSON.parse(val); - } catch(err) { + } catch (err) { console.error( - 'Faled to parse the LDAP settings saved in company %s. Error: %s', - this.id, err + "Faled to parse the LDAP settings saved in company %s. Error: %s", + this.id, + err ); val = {}; } return val; - }, - }, - date_format : { - type : DataTypes.STRING, - allowNull : false, - defaultValue : 'YYYY-MM-DD', - }, - company_wide_message : { - type : DataTypes.TEXT, - allowNull : true, - defaultValue : null, - comment : 'Message shown to all users that belong to current company', - }, - mode : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 1, - comment : "Indicate which mode the company account is in.", - }, - timezone : { - type : DataTypes.TEXT, - allowNull : true, - defaultValue : 'Europe/London', - comment : 'Timezone current company is located in', - }, - integration_api_enabled : { - type: DataTypes.BOOLEAN, - allowNull: false, - defaultValue: false, - }, - integration_api_token : { - type : DataTypes.UUID, - allowNull : false, - defaultValue : () => uuidv4(), - comment : "Indicate which mode the company account is in.", - }, - carry_over : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - comment : "Defines how may remaining days from allowance are carried over to the next year.", + } + }, + date_format: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: "YYYY-MM-DD" + }, + company_wide_message: { + type: DataTypes.TEXT, + allowNull: true, + defaultValue: null, + comment: "Message shown to all users that belong to current company" + }, + mode: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 1, + comment: "Indicate which mode the company account is in." + }, + timezone: { + type: DataTypes.TEXT, + allowNull: true, + defaultValue: "Europe/London", + comment: "Timezone current company is located in" + }, + integration_api_enabled: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false + }, + integration_api_token: { + type: DataTypes.UUID, + allowNull: false, + defaultValue: () => uuidv4(), + comment: "Indicate which mode the company account is in." + }, + carry_over: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 0, + comment: + "Defines how may remaining days from allowance are carried over to the next year." + } }, - }, { + { + indexes: [ + { + fields: ["id"] + } + ], - indexes : [ - { - fields : ['id'], - } - ], - - classMethods: { - - associate : models => { - Company.hasMany(models.Department, { - as : 'departments', - foreignKey : 'companyId', - }); - Company.hasMany(models.User, { - as : 'users', - foreignKey : 'companyId', - }); - Company.hasMany(models.BankHoliday, { - as : 'bank_holidays', - foreignKey : 'companyId', - }); - Company.hasMany(models.LeaveType, { - as : 'leave_types', - foreignKey : 'companyId', - }); - Company.hasMany(models.EmailAudit, { - as : 'audit_emails', - foreignKey : 'company_id', - }); - Company.hasMany(models.Audit, { - as: 'audit', - foreignKey: 'companyId', - }); - }, + classMethods: { + associate: models => { + Company.hasMany(models.Department, { + as: "departments", + foreignKey: "companyId" + }); + Company.hasMany(models.User, { + as: "users", + foreignKey: "companyId" + }); + Company.hasMany(models.BankHoliday, { + as: "bank_holidays", + foreignKey: "companyId" + }); + Company.hasMany(models.LeaveType, { + as: "leave_types", + foreignKey: "companyId" + }); + Company.hasMany(models.EmailAudit, { + as: "audit_emails", + foreignKey: "company_id" + }); + Company.hasMany(models.Audit, { + as: "audit", + foreignKey: "companyId" + }); + }, - loadScope : function( models ) { + loadScope: function(models) { + Company.addScope("with_all_users", { + include: [{ model: models.User, as: "users" }] + }); - Company.addScope( - 'with_all_users', - { - include : [ - { model : models.User, as : 'users' }, - ] - } - ); + Company.addScope("with_audit", { + include: [{ model: models.Audit, as: "audit" }] + }); - Company.addScope( - 'with_audit', - { - include : [{ model: models.Audit, as: 'audit' }], - } - ); - - Company.addScope( - 'with_active_users', - // The scope needs to be dynamic as the criteria for active users is based - // on current date, which could be buggy if left static - function() { - return { include : [{ - model : models.User, - as : 'users', - where : models.User.get_active_user_filter(), - }] + Company.addScope( + "with_active_users", + // The scope needs to be dynamic as the criteria for active users is based + // on current date, which could be buggy if left static + function() { + return { + include: [ + { + model: models.User, + as: "users", + where: models.User.get_active_user_filter() + } + ] + }; } - } - ); - - Company.addScope( - 'order_by_active_users', - { - order : [ - [{model : models.User, as : 'users'}, 'lastname'] - ] - } - ); - - Company.addScope( - 'with_simple_departments', - { - include : [ - { model : models.Department, as : 'departments' } - ] - } - ); + ); - Company.addScope( - 'with_bank_holidays', - { - include : [{ model : models.BankHoliday, as : 'bank_holidays' }], - } - ); + Company.addScope("order_by_active_users", { + order: [[{ model: models.User, as: "users" }, "lastname"]] + }); - Company.addScope( - 'with_leave_types', - { - include : [{ model : models.LeaveType, as : 'leave_types' }] - } - ); - }, + Company.addScope("with_simple_departments", { + include: [{ model: models.Department, as: "departments" }] + }); - scopeAssociate : function( models ) { - // Following code is here for reference only: to help declaring scopped - // associations in future. The approach is not suitable for active users - // bacause of its dynamic nature - we need to have up to date "now", which - // does not work nicely with accociations as they are installed once at the - // applicaiton start time, and if the app will be running for more than one - // day the active users association becomes wrong as it still remember the - // now as a date when the app was started - // -// Company.hasMany(models.User.scope('active'), { -// as : 'activeUsers', -// foreignKey : 'companyId', -// }); - }, + Company.addScope("with_bank_holidays", { + include: [{ model: models.BankHoliday, as: "bank_holidays" }] + }); - // Return code for "read-only holidays" mode of company account. - // That means company only shows holidays/timeoff for emplyes and - // does not allow to create new ones. - // - get_mode_readonly_holidays : function(){ - return 2; - }, + Company.addScope("with_leave_types", { + include: [{ model: models.LeaveType, as: "leave_types" }] + }); + }, - // Create new company based on default values - create_default_company : function(args){ - var country_code = args.country_code || 'UK', - timezone = args.timezone || 'Europe/London'; - - // Add new company record - return Company.create({ - name : args.name || 'New company', - country : country_code, - start_of_new_year : 1, - timezone : timezone, - }) - - // When new company is created - add default departments to it - .then(function(company){ - - return Promise.all([ - sequelize.models.Department - .create({ - name : 'Sales', - companyId : company.id, - }), - sequelize.models.BankHoliday - .generate_bank_holidays({ - company : company, - country_code : country_code, - }), - sequelize.models.LeaveType - .generate_leave_types({ company : company }) - ]) - .then(function(){ - - return Promise.resolve(company); - }); - }); + scopeAssociate: function(models) { + // Following code is here for reference only: to help declaring scopped + // associations in future. The approach is not suitable for active users + // bacause of its dynamic nature - we need to have up to date "now", which + // does not work nicely with accociations as they are installed once at the + // applicaiton start time, and if the app will be running for more than one + // day the active users association becomes wrong as it still remember the + // now as a date when the app was started + // + // Company.hasMany(models.User.scope('active'), { + // as : 'activeUsers', + // foreignKey : 'companyId', + // }); + }, - }, + // Return code for "read-only holidays" mode of company account. + // That means company only shows holidays/timeoff for emplyes and + // does not allow to create new ones. + // + get_mode_readonly_holidays: function() { + return 2; + }, - getCompanyByApiToken: ({token}) => sequelize.models - .Company - .scope('with_active_users') - .findOne({ - where : { - integration_api_token: token, - integration_api_enabled: true, - } - }), - - }, // End of calss methods - - instanceMethods : { - /* - * Return name suitable to use for precessing by machines, - * actually it just remove spaces and replace them with "_" - * - * */ - name_for_machine : function(){ - return this.name.replace(/\s+/g, '_'); - }, + // Create new company based on default values + create_default_company: function(args) { + var country_code = args.country_code || "UK", + timezone = args.timezone || "Europe/London"; + + // Add new company record + return ( + Company.create({ + name: args.name || "New company", + country: country_code, + start_of_new_year: 1, + timezone: timezone + }) + + // When new company is created - add default departments to it + .then(function(company) { + return Promise.all([ + sequelize.models.Department.create({ + name: "Sales", + companyId: company.id + }), + sequelize.models.BankHoliday.generate_bank_holidays({ + company: company, + country_code: country_code + }), + sequelize.models.LeaveType.generate_leave_types({ + company: company + }) + ]).then(function() { + return Promise.resolve(company); + }); + }) + ); + }, - reload_with_bank_holidays : function(){ - var self = this; + getCompanyByApiToken: ({ token }) => + sequelize.models.Company.scope("with_active_users").findOne({ + where: { + integration_api_token: token, + integration_api_enabled: true + } + }) + }, // End of calss methods + + instanceMethods: { + /* + * Return name suitable to use for precessing by machines, + * actually it just remove spaces and replace them with "_" + * + * */ + name_for_machine: function() { + return this.name.replace(/\s+/g, "_"); + }, + + reload_with_bank_holidays: function() { + var self = this; - return self.getBank_holidays() - .then(function(bank_holidays){ + return self.getBank_holidays().then(function(bank_holidays) { self.bank_holidays = bank_holidays; return Promise.resolve(self); }); - }, - - get_ldap_server : function(){ - - var config = this.get('ldap_auth_config'); - var tlsOptions = config.allow_unauthorized_cert ? { rejectUnauthorized: false } : {}; - - // When testing consider using TEST LDAP server - // http://www.forumsys.com/en/tutorials/integration-how-to/ldap/online-ldap-test-server/ - var ldap = new LdapAuth({ - url : config.url, - bindDn : config.binddn, - bindCredentials : config.bindcredentials, - searchBase : config.searchbase, - searchFilter : '(mail={{username}})', - cache : false, - tlsOptions : tlsOptions - }); - - return ldap; - }, + }, - get_moment_to_datepicker_map : function() { - return { - "YYYY-MM-DD" : 'yyyy-mm-dd', - "YYYY/MM/DD" : 'yyyy/mm/dd', - "DD MMM, YY" : 'dd M, yy', - "DD/MM/YY" : "dd/mm/yy", - "DD/MM/YYYY" : "dd/mm/yyyy", - "MM/DD/YY" : 'mm/dd/yy', - }; - }, + get_ldap_server: function() { + var config = this.get("ldap_auth_config"); + var tlsOptions = config.allow_unauthorized_cert + ? { rejectUnauthorized: false } + : {}; + + // When testing consider using TEST LDAP server + // http://www.forumsys.com/en/tutorials/integration-how-to/ldap/online-ldap-test-server/ + var ldap = new LdapAuth({ + url: config.url, + bindDn: config.binddn, + bindCredentials: config.bindcredentials, + searchBase: config.searchbase, + searchFilter: "(mail={{username}})", + cache: false, + tlsOptions: tlsOptions + }); - get_default_date_format : function() { - return this.getDataValue('date_format'); - }, + return ldap; + }, - get_available_date_formats : function() { - var obj = this.get_moment_to_datepicker_map(); - return _.keys( obj ); - }, + get_moment_to_datepicker_map: function() { + return { + "YYYY-MM-DD": "yyyy-mm-dd", + "YYYY/MM/DD": "yyyy/mm/dd", + "DD MMM, YY": "dd M, yy", + "DD/MM/YY": "dd/mm/yy", + "DD/MM/YYYY": "dd/mm/yyyy", + "MM/DD/YY": "mm/dd/yy" + }; + }, - get_default_date_format_for_date_picker : function() { - var self = this; + get_default_date_format: function() { + return this.getDataValue("date_format"); + }, - var moment_to_datepicker_map = self.get_moment_to_datepicker_map(); + get_available_date_formats: function() { + var obj = this.get_moment_to_datepicker_map(); + return _.keys(obj); + }, - if ( moment_to_datepicker_map.hasOwnProperty( self.get_default_date_format() ) ) { - return moment_to_datepicker_map[ self.get_default_date_format() ]; - } + get_default_date_format_for_date_picker: function() { + var self = this; - return 'yyyy-mm-dd'; - }, + var moment_to_datepicker_map = self.get_moment_to_datepicker_map(); - // Takes date string in format specific for current company and produce string - // with date in generic format used internally within application - normalise_date : function(date_str) { - return moment.utc(date_str, this.get_default_date_format()).format('YYYY-MM-DD'); - }, + if ( + moment_to_datepicker_map.hasOwnProperty( + self.get_default_date_format() + ) + ) { + return moment_to_datepicker_map[self.get_default_date_format()]; + } - // Returns moment UTC-ed object that takes into consideration company time zone - // (p to day's precision) - get_today : function() { - let self = this; + return "yyyy-mm-dd"; + }, - return moment.utc( - moment_tz.utc().tz(self.timezone).format('YYYY-MM-DD') - ); - }, + // Takes date string in format specific for current company and produce string + // with date in generic format used internally within application + normalise_date: function(date_str) { + return moment + .utc(date_str, this.get_default_date_format()) + .format("YYYY-MM-DD"); + }, - regenerateIntegrationApiToken : function() { - const self = this; + // Returns moment UTC-ed object that takes into consideration company time zone + // (p to day's precision) + get_today: function() { + let self = this; + + return moment.utc( + moment_tz + .utc() + .tz(self.timezone) + .format("YYYY-MM-DD") + ); + }, - self.set('integration_api_token', uuidv4()); + regenerateIntegrationApiToken: function() { + const self = this; - return self.save(); - }, + self.set("integration_api_token", uuidv4()); - // Promise schedule object valid for current company, if it does not have such - // in databse, retulr default one - promise_schedule : function(){ - var self = this; + return self.save(); + }, - return self.sequelize.models.Schedule - .findOne({ - where : { company_id : self.id }, - }) - .then(function(schedule){ + // Promise schedule object valid for current company, if it does not have such + // in databse, retulr default one + promise_schedule: function() { + var self = this; - if ( schedule) { - return Promise.resolve( schedule ); + return self.sequelize.models.Schedule.findOne({ + where: { company_id: self.id } + }).then(function(schedule) { + if (schedule) { + return Promise.resolve(schedule); } - return self.sequelize.models.Schedule - .promise_to_build_default_for({ company_id : self.id }); + return self.sequelize.models.Schedule.promise_to_build_default_for({ + company_id: self.id + }); }); - }, - - // Return TRUE if company has restrictio on ly to show hollidays for its - // employees and prevent them from adding new ones - // - is_mode_readonly_holidays : function(){ - return this.mode === Company.get_mode_readonly_holidays(); - }, + }, + // Return TRUE if company has restrictio on ly to show hollidays for its + // employees and prevent them from adding new ones + // + is_mode_readonly_holidays: function() { + return this.mode === Company.get_mode_readonly_holidays(); + } + } } - }); + ); return Company; }; diff --git a/lib/model/db/department.js b/lib/model/db/department.js index 087877e6a..e49bc61e6 100644 --- a/lib/model/db/department.js +++ b/lib/model/db/department.js @@ -1,260 +1,250 @@ "use strict"; -const - moment = require('moment'), - _ = require('underscore'), - Promise = require('bluebird'), - Exception = require('../../error'), - CalendarMonth = require('../calendar_month'); +const moment = require("moment"), + _ = require("underscore"), + Promise = require("bluebird"), + Exception = require("../../error"), + CalendarMonth = require("../calendar_month"); module.exports = function(sequelize, DataTypes) { - let Department = sequelize.define("Department", { - // TODO add validators! - name : { - type : DataTypes.STRING, - allowNull : false - }, - allowance : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 20, - }, - include_public_holidays : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : true, - }, - is_accrued_allowance : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, + let Department = sequelize.define( + "Department", + { + // TODO add validators! + name: { + type: DataTypes.STRING, + allowNull: false + }, + allowance: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 20 + }, + include_public_holidays: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: true + }, + is_accrued_allowance: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false + } }, - }, { - indexes : [ + { + indexes: [ { - fields : ['companyId'], + fields: ["companyId"] }, { - fields : ['id'], + fields: ["id"] } ], classMethods: { - loadScope : function( models ) { - - Department.addScope( - 'with_simple_users', - { - include : [ - { model : models.User, as : 'users' }, - ], - } - ); - - Department.addScope( - 'with_boss', - { - include : [ - { model : models.User, as : 'boss' }, - ] - } - ); + loadScope: function(models) { + Department.addScope("with_simple_users", { + include: [{ model: models.User, as: "users" }] + }); - Department.addScope( - 'with_supervisors', - { - include : [ - { model : models.User, as : 'supervisors' }, - ] - } - ); - }, - associate : function( models ) { - // We have constrains OFF as to prevent ORM complaining about - // cycle reference - Department.belongsTo ( models.User, { as : 'boss', constraints: false}); - Department.belongsTo ( models.Company, { as : 'company'}); - Department.hasMany ( models.User, { as : 'users'}); + Department.addScope("with_boss", { + include: [{ model: models.User, as: "boss" }] + }); - Department.hasMany( models.DepartmentSupervisor, { - as : 'supervisors_link', - foreignKey : {name: 'department_id', allowNull: false}, - }); + Department.addScope("with_supervisors", { + include: [{ model: models.User, as: "supervisors" }] + }); + }, + associate: function(models) { + // We have constrains OFF as to prevent ORM complaining about + // cycle reference + Department.belongsTo(models.User, { as: "boss", constraints: false }); + Department.belongsTo(models.Company, { as: "company" }); + Department.hasMany(models.User, { as: "users" }); + + Department.hasMany(models.DepartmentSupervisor, { + as: "supervisors_link", + foreignKey: { name: "department_id", allowNull: false } + }); - Department.belongsToMany(models.User, { - as : 'supervisors', - foreignKey : 'department_id', - otherKey : 'user_id', - through : models.DepartmentSupervisor, - }); - }, + Department.belongsToMany(models.User, { + as: "supervisors", + foreignKey: "department_id", + otherKey: "user_id", + through: models.DepartmentSupervisor + }); + }, - default_order_field : function(){ - return 'name'; - }, + default_order_field: function() { + return "name"; + } }, - instanceMethods : { - + instanceMethods: { // Return users related to current department and still active - promise_active_users : function(){ + promise_active_users: function() { return this.getUsers({ - where : sequelize.models.User.get_active_user_filter() + where: sequelize.models.User.get_active_user_filter() }); }, - promise_team_view_for_month : function( month ){ - return this._promise_team_view({ start_date : month }); + promise_team_view_for_month: function(month) { + return this._promise_team_view({ start_date: month }); }, - promise_team_view_for_months_range : function (start_month, end_month){ + promise_team_view_for_months_range: function(start_month, end_month) { return this._promise_team_view({ - start_date : start_month, - end_date : end_month, + start_date: start_month, + end_date: end_month }); }, - _promise_team_view : function(args){ - - let - self = this, - model = sequelize.models, + _promise_team_view: function(args) { + let self = this, + model = sequelize.models, start_date = args.start_date, - end_date = args.end_date; - + end_date = args.end_date; var promise_users_and_leaves = Promise - // First of all ensure that "start_date" is defined - .try(function(){ - if ( start_date ) { - return Promise.resolve(start_date); - } - - return self.getCompany() - .then(company => Promise.resolve( start_date = company.get_today() ) ) - }) - - // Ensure end_date is suitable if it was provided - .then(() => { - - // If end_date was not provided: no need to validate it: set it to be equal to start date - if ( ! end_date ) { - - end_date = start_date; - - return Promise.resolve(); - } - - // If end date is privided... - // ... ensure start and end dates are from within same year - if (moment.utc(end_date).format('YYYY') !== moment.utc(start_date).format('YYYY')) { - Exception.throw_user_error({ - user_error : 'Start and End dates should within single year', - system_error : '_promise_team_view was called with start_date and end_date from different years.', - }); - } + // First of all ensure that "start_date" is defined + .try(function() { + if (start_date) { + return Promise.resolve(start_date); + } - // ... ensure that start date proceed end date - if (moment.utc(start_date).dayOfYear() > moment.utc(end_date).dayOfYear()) { - Exception.throw_user_error({ - user_error : 'Start date needs to be before end date', - system_error : '_promise_team_view was called with end_date prior to start_date', - }); - } + return self + .getCompany() + .then(company => + Promise.resolve((start_date = company.get_today())) + ); + }) - return Promise.resolve(); - }) + // Ensure end_date is suitable if it was provided + .then(() => { + // If end_date was not provided: no need to validate it: set it to be equal to start date + if (!end_date) { + end_date = start_date; - // Get users - .then( () => self.promise_active_users() ) - .then(function(users){ + return Promise.resolve(); + } - return Promise.all( - _.map( - users, - function(user){ - return user.promise_my_leaves_for_calendar({ - year : start_date, - }) - .then(function(leaves){ + // If end date is privided... + // ... ensure start and end dates are from within same year + if ( + moment.utc(end_date).format("YYYY") !== + moment.utc(start_date).format("YYYY") + ) { + Exception.throw_user_error({ + user_error: "Start and End dates should within single year", + system_error: + "_promise_team_view was called with start_date and end_date from different years." + }); + } - var leave_days = _.flatten( _.map(leaves, function(leave){ - return _.map( leave.get_days(), function(leave_day){ - leave_day.leave = leave; - return leave_day; - }); - })); + // ... ensure that start date proceed end date + if ( + moment.utc(start_date).dayOfYear() > + moment.utc(end_date).dayOfYear() + ) { + Exception.throw_user_error({ + user_error: "Start date needs to be before end date", + system_error: + "_promise_team_view was called with end_date prior to start_date" + }); + } - return user.promise_schedule_I_obey() - .then(function(schedule){ - return Promise.resolve({ - user : user, - leave_days : leave_days, - schedule : schedule, + return Promise.resolve(); + }) + + // Get users + .then(() => self.promise_active_users()) + .then(function(users) { + return Promise.all( + _.map(users, function(user) { + return user + .promise_my_leaves_for_calendar({ + year: start_date + }) + .then(function(leaves) { + var leave_days = _.flatten( + _.map(leaves, function(leave) { + return _.map(leave.get_days(), function(leave_day) { + leave_day.leave = leave; + return leave_day; + }); + }) + ); + + return user + .promise_schedule_I_obey() + .then(function(schedule) { + return Promise.resolve({ + user: user, + leave_days: leave_days, + schedule: schedule + }); }); - }); - }); - } - ) // End of map - ); // End of promise_users_and_leaves - }); + }); + }) // End of map + ); // End of promise_users_and_leaves + }); var promise_company = self.getCompany({ - include:[ - { model : model.BankHoliday , as : 'bank_holidays' }, - { model : model.LeaveType , as : 'leave_types' }, + include: [ + { model: model.BankHoliday, as: "bank_holidays" }, + { model: model.LeaveType, as: "leave_types" } ] }); return Promise.join( promise_company, promise_users_and_leaves, - function(company, users_and_leaves){ - - let number_of_months = moment.utc(end_date).month() - moment.utc(start_date).month(); - - users_and_leaves.forEach( user_data => { + function(company, users_and_leaves) { + let number_of_months = + moment.utc(end_date).month() - moment.utc(start_date).month(); + users_and_leaves.forEach(user_data => { user_data.days = []; // Now iterate throw all monthes between start and end dates // and get calendar months for each // and then combined them all togather - for ( let i=0; i<=number_of_months; i++ ) { - + for (let i = 0; i <= number_of_months; i++) { let calendar_month = new CalendarMonth( - moment.utc(start_date).clone().add(i, 'months'), + moment + .utc(start_date) + .clone() + .add(i, "months"), { - bank_holidays : - self.include_public_holidays + bank_holidays: self.include_public_holidays ? company.bank_holidays : [], - leave_days : user_data.leave_days, - schedule : user_data.schedule, - today : company.get_today(), - leave_types: company.leave_types, + leave_days: user_data.leave_days, + schedule: user_data.schedule, + today: company.get_today(), + leave_types: company.leave_types } ); - user_data.days.push( calendar_month.as_for_team_view()); + user_data.days.push(calendar_month.as_for_team_view()); } // end of for - user_data.days = _.flatten( user_data.days ); + user_data.days = _.flatten(user_data.days); }); return Promise.resolve(users_and_leaves); } ); - }, // End of promise_team_view // Return new department object that is based on same ID but include all supervisors - promise_me_with_supervisors : function() { + promise_me_with_supervisors: function() { var self = this; - return self.Model.scope('with_supervisors').findById( self.id ); - }, + return self.Model.scope("with_supervisors").findById(self.id); + } } - }); + } + ); return Department; }; diff --git a/lib/model/db/department_supervisor.js b/lib/model/db/department_supervisor.js index e6dee958e..307075682 100644 --- a/lib/model/db/department_supervisor.js +++ b/lib/model/db/department_supervisor.js @@ -1,35 +1,39 @@ - "use strict"; -module.exports = function(sequelize, DataTypes){ - var DepartmentSupervisor = sequelize.define("DepartmentSupervisor", {}, { - underscored : true, - freezeTableName : true, - timestamps : true, - createdAt : 'created_at', - updatedAt : false, - indexes : [{ - fields : [ 'department_id' ], - },{ - fields : [ 'user_id' ], - }], - - classMethods : { - associate : function(models) { - - DepartmentSupervisor.belongsTo(models.Department, { - as : 'department', - foreignKey : 'department_id', - }); +module.exports = function(sequelize, DataTypes) { + var DepartmentSupervisor = sequelize.define( + "DepartmentSupervisor", + {}, + { + underscored: true, + freezeTableName: true, + timestamps: true, + createdAt: "created_at", + updatedAt: false, + indexes: [ + { + fields: ["department_id"] + }, + { + fields: ["user_id"] + } + ], - DepartmentSupervisor.belongsTo(models.User, { - as : 'user', - foreignKey : 'user_id', - }); - }, - }, + classMethods: { + associate: function(models) { + DepartmentSupervisor.belongsTo(models.Department, { + as: "department", + foreignKey: "department_id" + }); - }); + DepartmentSupervisor.belongsTo(models.User, { + as: "user", + foreignKey: "user_id" + }); + } + } + } + ); return DepartmentSupervisor; }; diff --git a/lib/model/db/email_audit.js b/lib/model/db/email_audit.js index 78c9a0280..6813c089b 100644 --- a/lib/model/db/email_audit.js +++ b/lib/model/db/email_audit.js @@ -1,62 +1,66 @@ - "use strict"; -var - Bluebird = require('bluebird'), - htmlToText = require('html-to-text'), - moment = require("moment"); - -module.exports = function(sequelize, DataTypes){ - var EmailAudit = sequelize.define("EmailAudit", { - email : { - type : DataTypes.STRING, - allowNull : false, - }, - subject : { - type : DataTypes.TEXT, - allowNull : false, - }, - body : { - type : DataTypes.TEXT, - allowNull : false, - }, - },{ - underscored : true, - freezeTableName : true, - timestamps : true, - createdAt : 'created_at', - updatedAt : false, - indexes : [{ - fields : [ 'created_at' ], - },{ - fields : [ 'user_id' ], - }], - - classMethods : { - associate : function(models) { +var Bluebird = require("bluebird"), + htmlToText = require("html-to-text"), + moment = require("moment"); - EmailAudit.belongsTo(models.Company, { - as : 'company', - foreignKey : 'company_id', - }); - - - EmailAudit.belongsTo(models.User, { - as : 'user', - foreignKey : 'user_id', - }); +module.exports = function(sequelize, DataTypes) { + var EmailAudit = sequelize.define( + "EmailAudit", + { + email: { + type: DataTypes.STRING, + allowNull: false + }, + subject: { + type: DataTypes.TEXT, + allowNull: false }, + body: { + type: DataTypes.TEXT, + allowNull: false + } }, + { + underscored: true, + freezeTableName: true, + timestamps: true, + createdAt: "created_at", + updatedAt: false, + indexes: [ + { + fields: ["created_at"] + }, + { + fields: ["user_id"] + } + ], - instanceMethods : { - // Present the email body as a text, strips off any html tags etc - // - body_as_text : function(){ - return this.body.indexOf('DOCTYPE') > 0 ? htmlToText.fromString(this.body) : this.body; + classMethods: { + associate: function(models) { + EmailAudit.belongsTo(models.Company, { + as: "company", + foreignKey: "company_id" + }); + + EmailAudit.belongsTo(models.User, { + as: "user", + foreignKey: "user_id" + }); + } }, - }, - }); + instanceMethods: { + // Present the email body as a text, strips off any html tags etc + // + body_as_text: function() { + return this.body.indexOf("DOCTYPE") > 0 + ? htmlToText.fromString(this.body) + : this.body; + } + } + } + ); return EmailAudit; }; diff --git a/lib/model/db/index.js b/lib/model/db/index.js index af125bba9..3ef640377 100644 --- a/lib/model/db/index.js +++ b/lib/model/db/index.js @@ -1,18 +1,21 @@ "use strict"; -var fs = require("fs"); -var path = require("path"); +var fs = require("fs"); +var path = require("path"); var Sequelize = require("sequelize"); -var env = process.env.NODE_ENV || "development"; -var config = require(__dirname + '/../../../config/db.json')[env]; -var sequelize = new Sequelize(config.database, config.username, config.password, config); -var db = {}; +var env = process.env.NODE_ENV || "development"; +var config = require(__dirname + "/../../../config/db.json")[env]; +var sequelize = new Sequelize( + config.database, + config.username, + config.password, + config +); +var db = {}; -fs - .readdirSync(__dirname) +fs.readdirSync(__dirname) .filter(function(file) { - return (file.indexOf(".") !== 0) - && (file !== "index.js"); + return file.indexOf(".") !== 0 && file !== "index.js"; }) .forEach(function(file) { var model = sequelize["import"](path.join(__dirname, file)); @@ -30,7 +33,7 @@ Object.keys(db).forEach(function(modelName) { // Add scopes // Object.keys(db).forEach(function(modelName) { - if ('loadScope' in db[modelName]) { + if ("loadScope" in db[modelName]) { db[modelName].loadScope(db); } }); @@ -38,7 +41,7 @@ Object.keys(db).forEach(function(modelName) { // Link models based on associations that are based on scopes // Object.keys(db).forEach(function(modelName) { - if ('scopeAssociate' in db[modelName]) { + if ("scopeAssociate" in db[modelName]) { db[modelName].scopeAssociate(db); } }); diff --git a/lib/model/db/leave.js b/lib/model/db/leave.js index 18cb599e9..52f3742b1 100644 --- a/lib/model/db/leave.js +++ b/lib/model/db/leave.js @@ -1,415 +1,420 @@ - "use strict"; -var - _ = require('underscore'), - moment = require('moment'), - Promise = require("bluebird"), - LeaveDay = require('../leave_day'); +var _ = require("underscore"), + moment = require("moment"), + Promise = require("bluebird"), + LeaveDay = require("../leave_day"); module.exports = function(sequelize, DataTypes) { - var Leave = sequelize.define("Leave", { - // TODO add validators! - 'status' : { - type : DataTypes.INTEGER, - allowNull : false - }, - employee_comment : { - type : DataTypes.STRING, - allowNull : true, - }, - approver_comment : { - type : DataTypes.STRING, - allowNull : true, - }, - decided_at : { - type : DataTypes.DATE, - allowNull : true, - }, - - date_start : { - type : DataTypes.DATE, - allowNull : false, - defaultValue : sequelize.NOW, - }, - day_part_start : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 1, // VPP TODO replace with constant value - }, - date_end : { - type : DataTypes.DATE, - allowNull : false, - defaultValue : sequelize.NOW, - }, - day_part_end : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 1, // VPP TODO replace with constant value - }, - }, { + var Leave = sequelize.define( + "Leave", + { + // TODO add validators! + status: { + type: DataTypes.INTEGER, + allowNull: false + }, + employee_comment: { + type: DataTypes.STRING, + allowNull: true + }, + approver_comment: { + type: DataTypes.STRING, + allowNull: true + }, + decided_at: { + type: DataTypes.DATE, + allowNull: true + }, - indexes : [ + date_start: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: sequelize.NOW + }, + day_part_start: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 1 // VPP TODO replace with constant value + }, + date_end: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: sequelize.NOW + }, + day_part_end: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 1 // VPP TODO replace with constant value + } + }, + { + indexes: [ { - fields : ['userId'], + fields: ["userId"] }, { - fields : ['leaveTypeId'], + fields: ["leaveTypeId"] }, { - fields : ['approverId'], - }, + fields: ["approverId"] + } ], - classMethods : { - associate : function( models ){ - Leave.belongsTo(models.User, { as : 'user',foreignKey : 'userId' }); - Leave.belongsTo(models.User, { as : 'approver',foreignKey : 'approverId' }); - Leave.belongsTo(models.LeaveType, { as : 'leave_type' } ); + classMethods: { + associate: function(models) { + Leave.belongsTo(models.User, { as: "user", foreignKey: "userId" }); + Leave.belongsTo(models.User, { + as: "approver", + foreignKey: "approverId" + }); + Leave.belongsTo(models.LeaveType, { as: "leave_type" }); Leave.hasMany(models.Comment, { - as : 'comments', - foreignKey: 'companyId', + as: "comments", + foreignKey: "companyId", scope: { - entityType: models.Comment.getEntityTypeLeave(), - }, + entityType: models.Comment.getEntityTypeLeave() + } }); }, - status_new : () => 1, - status_approved : () => 2, - status_rejected : () => 3, - status_pended_revoke : () => 4, - status_canceled : () => 5, + status_new: () => 1, + status_approved: () => 2, + status_rejected: () => 3, + status_pended_revoke: () => 4, + status_canceled: () => 5, - leave_day_part_all : () => 1, - leave_day_part_morning : () => 2, - leave_day_part_afternoon : () => 3, + leave_day_part_all: () => 1, + leave_day_part_morning: () => 2, + leave_day_part_afternoon: () => 3 }, - instanceMethods : { - -reloadWithAssociates : function() { - const self = this; - - return self.reload({ - include : [ - {model : self.sequelize.models.User, as : 'user'}, - {model : self.sequelize.models.User, as : 'approver'}, - {model : self.sequelize.models.LeaveType, as : 'leave_type'}, - ], - }); -}, - -get_days : function() { - - var self = this, - start_date = moment.utc(this.date_start), - end_date = moment.utc(this.date_end), - days = [ start_date ]; - - if (self.hasOwnProperty('_days')) { - return self._days; - } - - if ( ! start_date.isSame( end_date, 'day') ){ - - var days_in_between = end_date.diff( start_date, 'days' ) - 1; - - for (var i=1; i<=days_in_between; i++) { - days.push( start_date.clone().add(i, 'days') ); - } + instanceMethods: { + reloadWithAssociates: function() { + const self = this; - days.push( end_date ); - } - - days = _.map( - days, - function(day){ - return new LeaveDay({ - leave_type_id : self.leaveTypeId, - sequelize : sequelize, - date : day.format('YYYY-MM-DD'), - day_part : day.isSame(start_date, 'day') - ? self.day_part_start - : day.isSame(end_date, 'day') - ? self.day_part_end - : Leave.leave_day_part_all(), + return self.reload({ + include: [ + { model: self.sequelize.models.User, as: "user" }, + { model: self.sequelize.models.User, as: "approver" }, + { model: self.sequelize.models.LeaveType, as: "leave_type" } + ] }); - } - ); + }, - return self._days = days; -}, - -fit_with_leave_request : function(leave_request) { - - // If start and end dates are the same, check if one of them fit - // into fist or last leave_days. - if ( - leave_request.is_within_one_day() && ( - leave_request.does_fit_with_leave_day( _.last(this.get_days()) ) - || - leave_request.does_fit_with_leave_day( _.first(this.get_days()) ) - ) - ) { - return true; - } + get_days: function() { + var self = this, + start_date = moment.utc(this.date_start), + end_date = moment.utc(this.date_end), + days = [start_date]; + + if (self.hasOwnProperty("_days")) { + return self._days; + } + + if (!start_date.isSame(end_date, "day")) { + var days_in_between = end_date.diff(start_date, "days") - 1; + + for (var i = 1; i <= days_in_between; i++) { + days.push(start_date.clone().add(i, "days")); + } + + days.push(end_date); + } + + days = _.map(days, function(day) { + return new LeaveDay({ + leave_type_id: self.leaveTypeId, + sequelize: sequelize, + date: day.format("YYYY-MM-DD"), + day_part: day.isSame(start_date, "day") + ? self.day_part_start + : day.isSame(end_date, "day") + ? self.day_part_end + : Leave.leave_day_part_all() + }); + }); - // If start and end dates are different, check if start date - // fits into end leave_day or end date fits int start leave_date. - if ( - (! leave_request.is_within_one_day()) && ( - leave_request.does_fit_with_leave_day_at_start( - _.last(this.get_days()) - ) - || - leave_request.does_fit_with_leave_day_at_end( - _.first(this.get_days()) - ) - ) - ) { - return true; - } + return (self._days = days); + }, - return false; -}, // End of fit_with_leave_request - -is_new_leave : function() { - return this.status === Leave.status_new(); -}, - -is_pended_revoke_leave : function(){ - return this.status === Leave.status_pended_revoke(); -}, - -// Leave is treated as "approved" one if it is in approved staus -// or if it is waiting decision on revoke action -// -is_approved_leave : function() { - return this.status === Leave.status_approved() || - this.status === Leave.status_pended_revoke() ; -}, - -// Determine if leave starts with half day in the morning -// -does_start_half_morning : function() { - return this.day_part_start === Leave.leave_day_part_morning(); -}, - -does_start_half_afternoon : function() { - return this.day_part_start === Leave.leave_day_part_afternoon(); -}, - -// Determine if leave ends with half a day in the afternoon -// -does_end_half_afternoon : function() { - return this.day_part_end === Leave.leave_day_part_afternoon(); -}, - -does_end_half_morning : function() { - return this.day_part_end === Leave.leave_day_part_morning(); -}, - -get_start_leave_day : function(){ - return this.get_days()[0]; -}, - -get_end_leave_day : function(){ - return this.get_days()[ this.get_days().length - 1 ]; -}, - -get_deducted_days_number : function(args) { - var number_of_days = this.get_deducted_days(args).length; - - // leave spans via on working day only, pay attention only to the start date - if (number_of_days === 1 && !this.get_start_leave_day().is_all_day_leave()) { - number_of_days = number_of_days - 0.5; - } - - // case when leave spreads for more then one day, then check if both start and day - // are halfs - else if (number_of_days > 1) { - if ( ! this.get_start_leave_day().is_all_day_leave() ){ - number_of_days = number_of_days - 0.5; - } - if ( ! this.get_end_leave_day().is_all_day_leave() ) { - number_of_days = number_of_days - 0.5; - } - } + fit_with_leave_request: function(leave_request) { + // If start and end dates are the same, check if one of them fit + // into fist or last leave_days. + if ( + leave_request.is_within_one_day() && + (leave_request.does_fit_with_leave_day(_.last(this.get_days())) || + leave_request.does_fit_with_leave_day(_.first(this.get_days()))) + ) { + return true; + } + + // If start and end dates are different, check if start date + // fits into end leave_day or end date fits int start leave_date. + if ( + !leave_request.is_within_one_day() && + (leave_request.does_fit_with_leave_day_at_start( + _.last(this.get_days()) + ) || + leave_request.does_fit_with_leave_day_at_end( + _.first(this.get_days()) + )) + ) { + return true; + } + + return false; + }, // End of fit_with_leave_request + + is_new_leave: function() { + return this.status === Leave.status_new(); + }, - return number_of_days; -}, + is_pended_revoke_leave: function() { + return this.status === Leave.status_pended_revoke(); + }, -get_deducted_days : function(args) { + // Leave is treated as "approved" one if it is in approved staus + // or if it is waiting decision on revoke action + // + is_approved_leave: function() { + return ( + this.status === Leave.status_approved() || + this.status === Leave.status_pended_revoke() + ); + }, - var leave_days = [], - ignore_allowance = false, - leave_type = this.leave_type || args.leave_type, - year; + // Determine if leave starts with half day in the morning + // + does_start_half_morning: function() { + return this.day_part_start === Leave.leave_day_part_morning(); + }, - if (args && args.hasOwnProperty('ignore_allowance')) { - ignore_allowance = args.ignore_allowance; - } + does_start_half_afternoon: function() { + return this.day_part_start === Leave.leave_day_part_afternoon(); + }, - if (args && args.hasOwnProperty('year')) { - year = moment.utc(args.year, 'YYYY'); - } + // Determine if leave ends with half a day in the afternoon + // + does_end_half_afternoon: function() { + return this.day_part_end === Leave.leave_day_part_afternoon(); + }, - // If current Leave stands for type that does not use - // allowance, ignore rest of the code; - if (! ignore_allowance && !leave_type.use_allowance) return leave_days; + does_end_half_morning: function() { + return this.day_part_end === Leave.leave_day_part_morning(); + }, - var user = this.user || this.approver || args.user; + get_start_leave_day: function() { + return this.get_days()[0]; + }, - var bank_holiday_map = {}; + get_end_leave_day: function() { + return this.get_days()[this.get_days().length - 1]; + }, - user.company.bank_holidays.forEach(function(bank_holiday){ - bank_holiday_map[ bank_holiday.get_pretty_date() ] = 1; - }); + get_deducted_days_number: function(args) { + var number_of_days = this.get_deducted_days(args).length; + + // leave spans via on working day only, pay attention only to the start date + if ( + number_of_days === 1 && + !this.get_start_leave_day().is_all_day_leave() + ) { + number_of_days = number_of_days - 0.5; + } + + // case when leave spreads for more then one day, then check if both start and day + // are halfs + else if (number_of_days > 1) { + if (!this.get_start_leave_day().is_all_day_leave()) { + number_of_days = number_of_days - 0.5; + } + if (!this.get_end_leave_day().is_all_day_leave()) { + number_of_days = number_of_days - 0.5; + } + } + + return number_of_days; + }, - // Because we currently in synchronos code we have to rely on cahed value - // rather then fetching it here, and prey that whoever called current - // method made sure that the cach is populated - var schedule = user.cached_schedule; + get_deducted_days: function(args) { + var leave_days = [], + ignore_allowance = false, + leave_type = this.leave_type || args.leave_type, + year; - leave_days = _.filter( - _.map(this.get_days(), function(leave_day){ + if (args && args.hasOwnProperty("ignore_allowance")) { + ignore_allowance = args.ignore_allowance; + } - // Ignore bank holidays - if ( bank_holiday_map[ leave_day.get_pretty_date() ] ) return; + if (args && args.hasOwnProperty("year")) { + year = moment.utc(args.year, "YYYY"); + } - // If it happenned that current leave day is from the year current - // call was made of, ignore that day - if (year && year.year() !== moment.utc(leave_day.date).year()) return; + // If current Leave stands for type that does not use + // allowance, ignore rest of the code; + if (!ignore_allowance && !leave_type.use_allowance) return leave_days; - // Ignore non-working days (weekends) - if ( ! schedule.is_it_working_day({ day : moment.utc(leave_day.date) }) ){ - return; - } + var user = this.user || this.approver || args.user; - return leave_day; - }), - function(leave_day){ - return !! leave_day; - } - ) || []; + var bank_holiday_map = {}; - return leave_days; -}, // End get_deducted_days + user.company.bank_holidays.forEach(function(bank_holiday) { + bank_holiday_map[bank_holiday.get_pretty_date()] = 1; + }); -promise_to_reject : function(args) { - let self = this; + // Because we currently in synchronos code we have to rely on cahed value + // rather then fetching it here, and prey that whoever called current + // method made sure that the cach is populated + var schedule = user.cached_schedule; + + leave_days = + _.filter( + _.map(this.get_days(), function(leave_day) { + // Ignore bank holidays + if (bank_holiday_map[leave_day.get_pretty_date()]) return; + + // If it happenned that current leave day is from the year current + // call was made of, ignore that day + if (year && year.year() !== moment.utc(leave_day.date).year()) + return; + + // Ignore non-working days (weekends) + if ( + !schedule.is_it_working_day({ + day: moment.utc(leave_day.date) + }) + ) { + return; + } + + return leave_day; + }), + function(leave_day) { + return !!leave_day; + } + ) || []; + + return leave_days; + }, // End get_deducted_days + + promise_to_reject: function(args) { + let self = this; + + if (!args) { + args = {}; + } + + if (!args.by_user) { + throw new Error("promise_to_reject has to have by_user parameter"); + } + + let by_user = args.by_user; + + // See explanation to promise_to_approve + self.status = self.is_pended_revoke_leave() + ? Leave.status_approved() + : Leave.status_rejected(); + + self.approverId = by_user.id; + + return self.save(); + }, - if ( ! args ) { - args = {}; - } + promise_to_approve: function(args) { + let self = this; - if ( ! args.by_user ) { - throw new Error('promise_to_reject has to have by_user parameter'); - } + if (!args) { + args = {}; + } - let by_user = args.by_user; + if (!args.by_user) { + throw new Error("promise_to_approve has to have by_user parameter"); + } - // See explanation to promise_to_approve - self.status = self.is_pended_revoke_leave() ? - Leave.status_approved(): - Leave.status_rejected(); + let by_user = args.by_user; - self.approverId = by_user.id; + // If current leave is one with requested revoke, then + // approve action set it into Rejected status + // otherwise it is approve action for new leave + // so put leave into Approved + self.status = self.is_pended_revoke_leave() + ? Leave.status_rejected() + : Leave.status_approved(); - return self.save(); -}, + self.approverId = by_user.id; -promise_to_approve : function(args) { - let self = this; + return self.save(); + }, - if ( ! args ) { - args = {}; - } + promise_to_revoke: function() { + let self = this; + + return self + .getUser({ + include: [ + { + model: sequelize.models.Department, + as: "department" + } + ] + }) + .then(function(user) { + var new_leave_status = user.is_auto_approve() + ? Leave.status_rejected() + : Leave.status_pended_revoke(); + + // By default it is user main boss is one who has to approve the revoked request + self.approverId = user.department.bossId; + + self.status = new_leave_status; + + return self.save(); + }); + }, - if ( ! args.by_user ) { - throw new Error('promise_to_approve has to have by_user parameter'); - } + promise_to_cancel: function() { + var self = this; - let by_user = args.by_user; + if (!self.is_new_leave()) { + throw new Error( + "An attempt to cancel non-new leave request id : " + self.id + ); + } - // If current leave is one with requested revoke, then - // approve action set it into Rejected status - // otherwise it is approve action for new leave - // so put leave into Approved - self.status = self.is_pended_revoke_leave() ? - Leave.status_rejected(): - Leave.status_approved(); + self.status = Leave.status_canceled(); - self.approverId = by_user.id; + return self.save(); + }, - return self.save(); -}, + get_leave_type_name: function() { + var leave_type = this.get("leave_type"); -promise_to_revoke : function(){ - let self = this; + if (!leave_type) { + return ""; + } else { + return leave_type.name; + } + }, - return self.getUser({ - include : [ - { - model : sequelize.models.Department, - as : 'department', + promise_approver: function() { + return this.getApprover({ + include: [ + { + model: sequelize.models.Company, + as: "company", + include: [ + { + model: sequelize.models.BankHoliday, + as: "bank_holidays" + } + ] + } + ] + }); } - ], - }) - .then(function(user){ - - var new_leave_status = user.is_auto_approve() - ? Leave.status_rejected() - : Leave.status_pended_revoke(); - - // By default it is user main boss is one who has to approve the revoked request - self.approverId = user.department.bossId; - - self.status = new_leave_status; - - return self.save(); - }); -}, - -promise_to_cancel : function(){ - var self = this; - - if ( ! self.is_new_leave() ) { - throw new Error('An attempt to cancel non-new leave request id : '+self.id); - } - - self.status = Leave.status_canceled(); - - return self.save(); -}, - -get_leave_type_name : function() { - var leave_type = this.get('leave_type'); - - if (! leave_type ) { - return ''; - } else { - return leave_type.name; - } -}, - -promise_approver : function() { - - return this.getApprover({ - include : [{ - model : sequelize.models.Company, - as : 'company', - include : [{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', - }], - }], - }) -}, - - - }, - }); + } + } + ); - return Leave; + return Leave; }; diff --git a/lib/model/db/leave_type.js b/lib/model/db/leave_type.js index ada19bdaf..fc3bc0ef5 100644 --- a/lib/model/db/leave_type.js +++ b/lib/model/db/leave_type.js @@ -1,71 +1,77 @@ "use strict"; module.exports = function(sequelize, DataTypes) { - var LeaveType = sequelize.define("LeaveType", { - // TODO add validators! - name : { - type : DataTypes.STRING, - allowNull : false + var LeaveType = sequelize.define( + "LeaveType", + { + // TODO add validators! + name: { + type: DataTypes.STRING, + allowNull: false + }, + color: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: "#ffffff" + }, + use_allowance: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: true + }, + limit: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 0 + }, + sort_order: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 0, + comment: "Is used to determine sorting order of leave types" + } + }, + { + classMethods: { + associate: function(models) { + LeaveType.belongsTo(models.Company, { as: "company" }); + LeaveType.hasMany(models.Leave, { + as: "leaves", + foreignKey: "leaveTypeId" + }); }, - color : { - type : DataTypes.STRING, - allowNull : false, - defaultValue : '#ffffff', - }, - use_allowance : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : true, - }, - limit : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - }, - sort_order : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - comment : "Is used to determine sorting order of leave types", - }, - }, { - classMethods: { - associate : function( models ) { - LeaveType.belongsTo(models.Company, {as : 'company'}); - LeaveType.hasMany(models.Leave, {as : 'leaves', foreignKey : 'leaveTypeId'}); - }, - generate_leave_types : function(args){ - var company = args.company; + generate_leave_types: function(args) { + var company = args.company; - return LeaveType.bulkCreate([ - { - name : 'Holiday', - color : '#22AA66', - companyId : company.id, - }, - { - name : 'Sick Leave', - color : '#459FF3', - companyId : company.id, - limit : 10, - use_allowance : 0, - }, - ]) + return LeaveType.bulkCreate([ + { + name: "Holiday", + color: "#22AA66", + companyId: company.id }, - }, - - instanceMethods : { - get_color_class : function() { - let value_in_db = this.color || ''; + { + name: "Sick Leave", + color: "#459FF3", + companyId: company.id, + limit: 10, + use_allowance: 0 + } + ]); + } + }, - return value_in_db.match(/^\s*\#/) - ? 'leave_type_color_1' - : value_in_db; - } + instanceMethods: { + get_color_class: function() { + let value_in_db = this.color || ""; + return value_in_db.match(/^\s*\#/) + ? "leave_type_color_1" + : value_in_db; } - }); + } + } + ); - return LeaveType; + return LeaveType; }; diff --git a/lib/model/db/schedule.js b/lib/model/db/schedule.js index fc371f851..82f14ed6a 100644 --- a/lib/model/db/schedule.js +++ b/lib/model/db/schedule.js @@ -1,158 +1,188 @@ +"use strict"; -'use strict'; - -var moment = require('moment'), +var moment = require("moment"), Promise = require("bluebird"); -function works_whole_day() { return 1 } -function works_none() { return 2 } -function works_morning() { return 3 } -function works_afternoon() { return 4 } +function works_whole_day() { + return 1; +} +function works_none() { + return 2; +} +function works_morning() { + return 3; +} +function works_afternoon() { + return 4; +} function week_day_flag_setter(flag_name) { - return function(v){ this.setDataValue(flag_name, v ? works_whole_day() : works_none()) }; + return function(v) { + this.setDataValue(flag_name, v ? works_whole_day() : works_none()); + }; } -module.exports = function(sequelize, DataTypes){ - - var Schedule = sequelize.define("Schedule", { - monday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_whole_day(), - set : week_day_flag_setter('monday'), - }, - tuesday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_whole_day(), - set : week_day_flag_setter('tuesday'), - }, - wednesday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_whole_day(), - set : week_day_flag_setter('wednesday'), - }, - thursday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_whole_day(), - set : week_day_flag_setter('thursday'), - }, - friday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_whole_day(), - set : week_day_flag_setter('friday'), - }, - saturday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_none(), - set : week_day_flag_setter('saturday'), - }, - sunday : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : works_none(), - set : week_day_flag_setter('sunday'), - }, - },{ - - underscored : true, - freezeTableName : true, - tableName : 'schedule', - - indexes : [ - { fields : ['user_id'] }, - { fields : ['company_id'] }, - ], - - classMethods: { - associate : function( models ) { - Schedule.belongsTo(models.Company, {as : 'company', foreignKey : 'company_id'}); - Schedule.belongsTo(models.User, {as : 'user', foreignKey : 'user_id'}); +module.exports = function(sequelize, DataTypes) { + var Schedule = sequelize.define( + "Schedule", + { + monday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_whole_day(), + set: week_day_flag_setter("monday") }, - - promise_to_build_default_for : function(args){ - var company_id = args.company_id, - user_id = args.user_id; - - if ( ! company_id && ! user_id ) { - throw new Error('Needs to have either company_id or user_id'); - } - - var default_schedule = sequelize.models.Schedule.build({ - company_id : company_id, - user_id : user_id, - }); - - return Promise.resolve(default_schedule); + tuesday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_whole_day(), + set: week_day_flag_setter("tuesday") }, - }, - - validate : { - relatesToEitherUserOrCompanyButNotBoth : function(){ - if ( this.company_id && this.user_id ) { - console.error('company_id='+this.company_id+', user_id='+this.user_id); - throw new Error('Schedule should be connected either to company of to user but not to both'); - } - }, - - relatesToUserOrCompany : function(){ - if ( ! this.company_id && ! this.user_id ){ - console.error('company_id='+this.company_id+', user_id='+this.user_id); - throw new Error('Schedule needs to be related to eaither company or user'); - } + wednesday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_whole_day(), + set: week_day_flag_setter("wednesday") }, - }, - - instanceMethods : { - is_user_specific : function() { - return !! this.user_id; + thursday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_whole_day(), + set: week_day_flag_setter("thursday") }, - - is_it_working_day : function(args){ - var day = args.day; - - if ( ! day ) { - throw new Error('"is_it_working_day" requires to have "day" parameter'); - } - - return this[ moment.utc(day).format('dddd').toLowerCase() ] === works_whole_day(); + friday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_whole_day(), + set: week_day_flag_setter("friday") }, - - works_monday : function(){ - return this.monday === works_whole_day(); - }, - - works_tuesday : function(){ - return this.tuesday === works_whole_day(); + saturday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_none(), + set: week_day_flag_setter("saturday") }, + sunday: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: works_none(), + set: week_day_flag_setter("sunday") + } + }, + { + underscored: true, + freezeTableName: true, + tableName: "schedule", + + indexes: [{ fields: ["user_id"] }, { fields: ["company_id"] }], + + classMethods: { + associate: function(models) { + Schedule.belongsTo(models.Company, { + as: "company", + foreignKey: "company_id" + }); + Schedule.belongsTo(models.User, { + as: "user", + foreignKey: "user_id" + }); + }, + + promise_to_build_default_for: function(args) { + var company_id = args.company_id, + user_id = args.user_id; - works_wednesday : function(){ - return this.wednesday === works_whole_day(); - }, + if (!company_id && !user_id) { + throw new Error("Needs to have either company_id or user_id"); + } - works_thursday : function(){ - return this.thursday === works_whole_day(); - }, + var default_schedule = sequelize.models.Schedule.build({ + company_id: company_id, + user_id: user_id + }); - works_friday : function(){ - return this.friday === works_whole_day(); - }, - - works_saturday : function(){ - return this.saturday === works_whole_day(); + return Promise.resolve(default_schedule); + } }, - works_sunday : function(){ - return this.sunday === works_whole_day(); + validate: { + relatesToEitherUserOrCompanyButNotBoth: function() { + if (this.company_id && this.user_id) { + console.error( + "company_id=" + this.company_id + ", user_id=" + this.user_id + ); + throw new Error( + "Schedule should be connected either to company of to user but not to both" + ); + } + }, + + relatesToUserOrCompany: function() { + if (!this.company_id && !this.user_id) { + console.error( + "company_id=" + this.company_id + ", user_id=" + this.user_id + ); + throw new Error( + "Schedule needs to be related to eaither company or user" + ); + } + } }, - }, - }); + instanceMethods: { + is_user_specific: function() { + return !!this.user_id; + }, + + is_it_working_day: function(args) { + var day = args.day; + + if (!day) { + throw new Error( + '"is_it_working_day" requires to have "day" parameter' + ); + } + + return ( + this[ + moment + .utc(day) + .format("dddd") + .toLowerCase() + ] === works_whole_day() + ); + }, + + works_monday: function() { + return this.monday === works_whole_day(); + }, + + works_tuesday: function() { + return this.tuesday === works_whole_day(); + }, + + works_wednesday: function() { + return this.wednesday === works_whole_day(); + }, + + works_thursday: function() { + return this.thursday === works_whole_day(); + }, + + works_friday: function() { + return this.friday === works_whole_day(); + }, + + works_saturday: function() { + return this.saturday === works_whole_day(); + }, + + works_sunday: function() { + return this.sunday === works_whole_day(); + } + } + } + ); return Schedule; }; diff --git a/lib/model/db/user.js b/lib/model/db/user.js index 80c5bd0a9..ca85afb50 100644 --- a/lib/model/db/user.js +++ b/lib/model/db/user.js @@ -1,145 +1,144 @@ "use strict"; -var - crypto = require('crypto'), - model = require('../db'), - _ = require('underscore'), - moment = require('moment'), - Promise = require("bluebird"), - config = require('../../config'), - - UserAllowance = require('../user_allowance'), - - // User mixins - withCompanyAwareness = require('../mixin/user/company_aware'), - withAbsenceAwareness = require('../mixin/user/absence_aware'); - +var crypto = require("crypto"), + model = require("../db"), + _ = require("underscore"), + moment = require("moment"), + Promise = require("bluebird"), + config = require("../../config"), + UserAllowance = require("../user_allowance"), + // User mixins + withCompanyAwareness = require("../mixin/user/company_aware"), + withAbsenceAwareness = require("../mixin/user/absence_aware"); module.exports = function(sequelize, DataTypes) { - var instance_methods = get_instance_methods(sequelize); - withCompanyAwareness.call ( instance_methods, sequelize ) ; - withAbsenceAwareness.call ( instance_methods, sequelize ) ; + withCompanyAwareness.call(instance_methods, sequelize); + withAbsenceAwareness.call(instance_methods, sequelize); var class_methods = get_class_methods(sequelize); - withAssociations.call ( class_methods, sequelize ) ; - withScopes.call ( class_methods, sequelize ) ; + withAssociations.call(class_methods, sequelize); + withScopes.call(class_methods, sequelize); - var User = sequelize.define("User", { + var User = sequelize.define( + "User", + { // TODO add validators! - email : { - type : DataTypes.STRING, - allowNull : false + email: { + type: DataTypes.STRING, + allowNull: false }, - password : { - type : DataTypes.STRING, - allowNull : false + password: { + type: DataTypes.STRING, + allowNull: false }, - name : { - type : DataTypes.STRING, - allowNull : false + name: { + type: DataTypes.STRING, + allowNull: false }, - lastname : { - type : DataTypes.STRING, - allowNull : false + lastname: { + type: DataTypes.STRING, + allowNull: false }, - activated : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, - comment : 'This flag means that user account was activated, e.g. login', + activated: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false, + comment: "This flag means that user account was activated, e.g. login" }, - admin : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, - comment : 'Indicate if account can edit company wide settings', + admin: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false, + comment: "Indicate if account can edit company wide settings" }, - auto_approve : { - type : DataTypes.BOOLEAN, - allowNull : false, - defaultValue : false, - comment : 'Indicate if leave request from current employee are auto approveed', + auto_approve: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: false, + comment: + "Indicate if leave request from current employee are auto approveed" }, - start_date : { - type : DataTypes.DATE, - allowNull : false, - defaultValue : DataTypes.NOW, - comment : 'Date employee start to work for company', - get: function(){ - return moment.utc(this.getDataValue('start_date')).format('YYYY-MM-DD'); - }, + start_date: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: DataTypes.NOW, + comment: "Date employee start to work for company", + get: function() { + return moment + .utc(this.getDataValue("start_date")) + .format("YYYY-MM-DD"); + } }, - end_date : { - type : DataTypes.DATE, - allowNull : true, - defaultValue : null, - comment : 'Date emplyee stop working for company', - get: function(){ - const endDate = this.getDataValue('end_date'); - if ( ! endDate ) { - return endDate; - } + end_date: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: "Date emplyee stop working for company", + get: function() { + const endDate = this.getDataValue("end_date"); + if (!endDate) { + return endDate; + } - return moment.utc(endDate).format('YYYY-MM-DD'); - }, - }, - }, { - indexes : [ + return moment.utc(endDate).format("YYYY-MM-DD"); + } + } + }, + { + indexes: [ { - fields : ['companyId'], + fields: ["companyId"] }, { - fields : ['lastname'], - }, + fields: ["lastname"] + } ], classMethods: class_methods, - instanceMethods : instance_methods, - }); + instanceMethods: instance_methods + } + ); - return User; + return User; }; - /* * Convinience method that returns an object with definition of User's instance methods. * * */ function get_instance_methods(sequelize) { - return { - - is_my_password : function( password ) { - return sequelize.models.User.hashify_password( password ) === this.password; + is_my_password: function(password) { + return sequelize.models.User.hashify_password(password) === this.password; }, /* * Activate user only when it is inactive. * Return promise that gets user's object. * */ - maybe_activate : function(){ - if ( ! this.activated ) { - this.activated = true; + maybe_activate: function() { + if (!this.activated) { + this.activated = true; } return this.save(); }, - is_admin : function() { + is_admin: function() { return this.admin === true; }, /* * Indicates is leave requests from current user are automatically approved * */ - is_auto_approve : function(){ + is_auto_approve: function() { return this.auto_approve === true; }, - full_name : function() { - return this.name + ' ' + this.lastname; + full_name: function() { + return this.name + " " + this.lastname; }, // TODO VPP: rename this method as its name misleading: it returns all users @@ -147,62 +146,57 @@ function get_instance_methods(sequelize) { // "promise_all_supervised_users_plus_me" // In fact this method probably have to be ditched in favour of more granular ones // - promise_users_I_can_manage : function(){ + promise_users_I_can_manage: function() { var this_user = this; // Check if current user is admin, then fetch all users form company - if ( this_user.is_admin() ) { - + if (this_user.is_admin()) { return this_user .getCompany({ - scope : ['with_all_users'], + scope: ["with_all_users"] }) - .then(function(company){ - return Promise.resolve( company.users ); + .then(function(company) { + return Promise.resolve(company.users); }); } // If current user has any departments under supervision then get // all users from those departments plus user himself, // if no supervised users an array with only current user is returned - return this_user.promise_supervised_departments() - .then(function(departments){ - var users = _.flatten( - _.map( - departments, - function(department){ return department.users; } - ) - ); + return this_user + .promise_supervised_departments() + .then(function(departments) { + var users = _.flatten( + _.map(departments, function(department) { + return department.users; + }) + ); - // Make sure current user is considered as well - users.push(this_user); + // Make sure current user is considered as well + users.push(this_user); - // Remove duplicates - users = _.uniq( - users, - function(user){ return user.id; } - ); - - // Order by last name - users = _.sortBy( - users, - function(user){ return user.lastname; } - ); + // Remove duplicates + users = _.uniq(users, function(user) { + return user.id; + }); - return users; - }); + // Order by last name + users = _.sortBy(users, function(user) { + return user.lastname; + }); + return users; + }); }, // promise_users_I_can_manage /* * Return user's boss, the head of department user belongs to * * */ - promise_boss : function(){ + promise_boss: function() { return this.getDepartment({ - scope : ['with_boss'], - }) - .then(department => Promise.resolve( department.boss )); + scope: ["with_boss"] + }).then(department => Promise.resolve(department.boss)); }, /* @@ -211,63 +205,67 @@ function get_instance_methods(sequelize) { * those user. * * */ - promise_supervisors : function(){ + promise_supervisors: function() { return this.getDepartment({ - scope : ['with_boss', 'with_supervisors'], - }) - .then( department => Promise.resolve( _.flatten([ department.boss, department.supervisors ]) ) ); + scope: ["with_boss", "with_supervisors"] + }).then(department => + Promise.resolve(_.flatten([department.boss, department.supervisors])) + ); }, - promise_supervised_departments : function() { + promise_supervised_departments: function() { let self = this; - return sequelize.models.DepartmentSupervisor.findAll({ where : { user_id : self.id } }) - // Obtain departments current user supervises as secondary supervisor - .then(department_supervisors => department_supervisors.map( obj => obj.department_id )) - .then( department_ids => { - - if ( ! department_ids ) { - department_ids = []; - } - - return sequelize.models.Department.scope('with_simple_users').findAll({ - where : { - $or : [ - { id : department_ids }, - { bossId : self.id }, - ] + return ( + sequelize.models.DepartmentSupervisor.findAll({ + where: { user_id: self.id } + }) + // Obtain departments current user supervises as secondary supervisor + .then(department_supervisors => + department_supervisors.map(obj => obj.department_id) + ) + .then(department_ids => { + if (!department_ids) { + department_ids = []; } - }); - }); + + return sequelize.models.Department.scope( + "with_simple_users" + ).findAll({ + where: { + $or: [{ id: department_ids }, { bossId: self.id }] + } + }); + }) + ); }, - promise_supervised_users : function () { + promise_supervised_users: function() { let self = this; - return self - .promise_supervised_departments() - .then(departments => { - return self.Model.findAll({ where : { DepartmentId : departments.map(d => d.id ) } }); - }) + return self.promise_supervised_departments().then(departments => { + return self.Model.findAll({ + where: { DepartmentId: departments.map(d => d.id) } + }); + }); }, - // Generate object that represent Employee allowance - promise_allowance : function(args) { + promise_allowance: function(args) { args = args || {}; // Override user to be current one args.user = this; return UserAllowance.promise_allowance(args); }, - reload_with_leave_details : function(args){ + reload_with_leave_details: function(args) { var self = this; return Promise.join( self.promise_my_active_leaves(args), self.getDepartment(), self.promise_schedule_I_obey(), - function(leaves, department, schedule){ + function(leaves, department, schedule) { self.my_leaves = leaves; self.department = department; @@ -279,18 +277,17 @@ function get_instance_methods(sequelize) { return Promise.resolve(self); } ); - }, // This method reload user object to have all necessary information to render // each page - reload_with_session_details : function(){ + reload_with_session_details: function() { var self = this; return Promise.join( self.promise_users_I_can_manage(), self.get_company_with_all_leave_types(), self.promise_schedule_I_obey(), - function(users, company, schedule){ + function(users, company, schedule) { self.supervised_users = users || []; self.company = company; @@ -300,315 +297,319 @@ function get_instance_methods(sequelize) { // at thi moment after mixing non blocking and blocking code together... return Promise.resolve(self); - }); + } + ); }, - - remove : function() { + remove: function() { var self = this; // make sure I am not admin, otherwise throw an error if (self.is_admin()) { - throw new Error('Cannot remove administrator user'); + throw new Error("Cannot remove administrator user"); } // make sure I am not supervisor, otherwise throw an error - return self.promise_supervised_departments() - .then(departments => { - if (departments.length > 0){ - throw new Error("Cannot remove supervisor"); - } - - return self.getMy_leaves(); - }) - .then(function(leaves){ - // remove all leaves - return Promise.all( - _.map( leaves, function(leave){ return leave.destroy(); }) - ); - }) + return ( + self + .promise_supervised_departments() + .then(departments => { + if (departments.length > 0) { + throw new Error("Cannot remove supervisor"); + } - // remove user record - .then(function(){ - return self.destroy(); - }) + return self.getMy_leaves(); + }) + .then(function(leaves) { + // remove all leaves + return Promise.all( + _.map(leaves, function(leave) { + return leave.destroy(); + }) + ); + }) + // remove user record + .then(function() { + return self.destroy(); + }) + ); }, - get_reset_password_token : function(){ + get_reset_password_token: function() { var self = this; - return new Buffer( self.email + ' ' + self.Model.hashify_password( self.password ) ).toString('base64'); + return new Buffer( + self.email + " " + self.Model.hashify_password(self.password) + ).toString("base64"); }, // Accept an object that represent email to be sent to current user and // record it into the corresponding audit table // - record_email_addressed_to_me : function(email_obj) { - + record_email_addressed_to_me: function(email_obj) { // validate email object to contain all necessary fields - if ( ! email_obj || - ! email_obj.hasOwnProperty('subject') || - ! email_obj.subject || - ! email_obj.hasOwnProperty('body') || - ! email_obj.body + if ( + !email_obj || + !email_obj.hasOwnProperty("subject") || + !email_obj.subject || + !email_obj.hasOwnProperty("body") || + !email_obj.body ) { throw new Error( - 'Got incorrect parameters. There should be an object '+ - 'to represent and email and contain subject and body' + "Got incorrect parameters. There should be an object " + + "to represent and email and contain subject and body" ); } var promise_action = this.sequelize.models.EmailAudit.create({ - email : this.email, - subject : email_obj.subject, - body : email_obj.body, - user_id : this.id, - company_id : this.companyId, + email: this.email, + subject: email_obj.subject, + body: email_obj.body, + user_id: this.id, + company_id: this.companyId }); - promise_action.then(function(audit_record){ + promise_action.then(function(audit_record) { return Promise.resolve(audit_record); }); return promise_action; }, - promise_schedule_I_obey : function(){ + promise_schedule_I_obey: function() { var self = this; - if ( self.cached_schedule ) { - return Promise.resolve( self.cached_schedule ); + if (self.cached_schedule) { + return Promise.resolve(self.cached_schedule); } - return self.sequelize.models.Schedule - .findAll({ - where : { - $or : [ - { user_id : self.id }, - { company_id : self.companyId }, - ] - } - }) - .then(function(schedules){ - - // no schedules for current user in DB, return default one - if (schedules.length === 0) { - return self.sequelize.models.Schedule - .promise_to_build_default_for({ company_id : self.companyId }) - .then(function(sch){ self.cached_schedule = sch; return Promise.resolve(sch) }); - } + return self.sequelize.models.Schedule.findAll({ + where: { + $or: [{ user_id: self.id }, { company_id: self.companyId }] + } + }).then(function(schedules) { + // no schedules for current user in DB, return default one + if (schedules.length === 0) { + return self.sequelize.models.Schedule.promise_to_build_default_for({ + company_id: self.companyId + }).then(function(sch) { + self.cached_schedule = sch; + return Promise.resolve(sch); + }); + } - // there are two schedules, presumably one company wide and another - // is user specific, return later one - if (schedules.length === 2) { - return Promise.resolve( - _.find(schedules, function(sch){ return sch.is_user_specific() }) - ) - .then(function(sch){ self.cached_schedule = sch; return Promise.resolve(sch) }); - } + // there are two schedules, presumably one company wide and another + // is user specific, return later one + if (schedules.length === 2) { + return Promise.resolve( + _.find(schedules, function(sch) { + return sch.is_user_specific(); + }) + ).then(function(sch) { + self.cached_schedule = sch; + return Promise.resolve(sch); + }); + } - // single schedule means it is company wide one - return Promise.resolve( schedules.pop() ) - .then(function(sch){ self.cached_schedule = sch; return Promise.resolve(sch) }); + // single schedule means it is company wide one + return Promise.resolve(schedules.pop()).then(function(sch) { + self.cached_schedule = sch; + return Promise.resolve(sch); }); - }, - + }); + } }; - -}; +} function get_class_methods(sequelize) { return { - /* hashify_password( password_string ) : string * * For provided string return hashed string. * * */ - hashify_password : function( password ) { + hashify_password: function(password) { return crypto - .createHash('md5') + .createHash("md5") .update( - password + config.get('crypto_secret'), - (config.get('crypto_hash_encoding') || 'binary') + password + config.get("crypto_secret"), + config.get("crypto_hash_encoding") || "binary" ) - .digest('hex'); + .digest("hex"); }, + get_user_by_reset_password_token: function(token) { + var self = this, + unpacked_token = new Buffer(token, "base64").toString("ascii"), + email_and_hashed_password = unpacked_token.split(/\s/); - get_user_by_reset_password_token : function(token) { - var self = this, - unpacked_token = new Buffer(token, 'base64').toString('ascii'), - email_and_hashed_password = unpacked_token.split(/\s/); - - return self.find_by_email(email_and_hashed_password[0]) - .then(function(user){ - if (user && self.hashify_password(user.password) === email_and_hashed_password[1]) { + return self + .find_by_email(email_and_hashed_password[0]) + .then(function(user) { + if ( + user && + self.hashify_password(user.password) === + email_and_hashed_password[1] + ) { return Promise.resolve(user); } else { return Promise.resolve(); } - }) + }); }, // Get active user by provided email address - find_by_email : function( email ) { - + find_by_email: function(email) { // TODO validate email - var condition = { email : email }; + var condition = { email: email }; var active_users_filter = this.get_active_user_filter(); for (var attrname in active_users_filter) { condition[attrname] = active_users_filter[attrname]; } - return this.find({ where : condition }); + return this.find({ where: condition }); }, - find_by_id : function(id) { - return this.find({ where : {id : id}}); + find_by_id: function(id) { + return this.find({ where: { id: id } }); }, /* * Create new admin user within new environment - company etc * */ - register_new_admin_user : function(attributes){ - + register_new_admin_user: function(attributes) { // TODO add parameters validation // Make sure we hash the password before storing it to DB attributes.password = this.hashify_password(attributes.password); var new_departments, - new_user, - country_code = attributes.country_code, - timezone = attributes.timezone, - company_name = attributes.company_name; + new_user, + country_code = attributes.country_code, + timezone = attributes.timezone, + company_name = attributes.company_name; delete attributes.company_name; delete attributes.country_code; - return sequelize.models.User.find_by_email( attributes.email ) - .then(function(existing_user){ - if (existing_user) { - var error = new Error('Email is already used') - error.show_to_user = true; - throw error; - } + return ( + sequelize.models.User.find_by_email(attributes.email) + .then(function(existing_user) { + if (existing_user) { + var error = new Error("Email is already used"); + error.show_to_user = true; + throw error; + } - return sequelize.models.Company - .create_default_company({ - name : company_name, - country_code : country_code, - timezone : timezone, + return sequelize.models.Company.create_default_company({ + name: company_name, + country_code: country_code, + timezone: timezone }); - }) - - // Make sure new user is going to be linked with a company - .then(function(company){ - - attributes.companyId = company.id; - attributes.admin = true; + }) - return company.getDepartments(); - }) + // Make sure new user is going to be linked with a company + .then(function(company) { + attributes.companyId = company.id; + attributes.admin = true; - // Make sure new user is linked with department - .then(function(departments){ + return company.getDepartments(); + }) - new_departments = departments; + // Make sure new user is linked with department + .then(function(departments) { + new_departments = departments; - attributes.DepartmentId = departments[0].id; + attributes.DepartmentId = departments[0].id; - return sequelize.models.User.create( attributes ); - }) + return sequelize.models.User.create(attributes); + }) - // Make sure new departments know who is their boss - .then(function(user){ - new_user = user; + // Make sure new departments know who is their boss + .then(function(user) { + new_user = user; - return Promise.all(_.map(new_departments, function(department){ - department.bossId = user.id; - return department.save(); - })); - }) + return Promise.all( + _.map(new_departments, function(department) { + department.bossId = user.id; + return department.save(); + }) + ); + }) - // Return promise with newly created user - .then(function(){ - return Promise.resolve(new_user); - }); + // Return promise with newly created user + .then(function() { + return Promise.resolve(new_user); + }) + ); }, - get_active_user_filter : function(){ + get_active_user_filter: function() { return { - $or : [ - { end_date : {$eq : null}}, - { end_date : {$gte : moment.utc().startOf('day').format('YYYY-MM-DD') }}, - ], + $or: [ + { end_date: { $eq: null } }, + { + end_date: { + $gte: moment + .utc() + .startOf("day") + .format("YYYY-MM-DD") + } + } + ] }; - }, - + } }; -}; // END of class methods - +} // END of class methods // Mixin-like function that injects definition of User's associations into supplied object. // (Define relations between User class and other entities in the domain). // function withAssociations() { - - this.associate = function(models){ - + this.associate = function(models) { models.User.belongsTo(models.Company, { - as : 'company', + as: "company" }); models.User.belongsTo(models.Department, { - as : 'department', - foreignKey : 'DepartmentId', + as: "department", + foreignKey: "DepartmentId" }); models.User.hasMany(models.Leave, { - as : 'my_leaves', - foreignKey : 'userId', + as: "my_leaves", + foreignKey: "userId" }); models.User.hasMany(models.UserFeed, { - as : 'feeds', - foreignKey : 'userId', + as: "feeds", + foreignKey: "userId" }); models.User.hasMany(models.UserAllowanceAdjustment, { - as : 'adjustments', - foreignKey : 'user_id', + as: "adjustments", + foreignKey: "user_id" }); }; } - function withScopes() { - this.loadScope = function(models) { + models.User.addScope("active", function() { + return { where: models.User.get_active_user_filter() }; + }); - models.User.addScope( - 'active', - function () { - return { where : models.User.get_active_user_filter() }; - } - ); - - models.User.addScope( - 'with_simple_leaves', - () => ({ - include : [{ - model : models.Leave, - as : 'my_leaves', - where : { - $and : [ - { status : { $ne : models.Leave.status_rejected() } }, - { status : { $ne : models.Leave.status_canceled() } }, - ], - }, - }], - }) - ); - + models.User.addScope("with_simple_leaves", () => ({ + include: [ + { + model: models.Leave, + as: "my_leaves", + where: { + $and: [ + { status: { $ne: models.Leave.status_rejected() } }, + { status: { $ne: models.Leave.status_canceled() } } + ] + } + } + ] + })); }; } diff --git a/lib/model/db/user_allowance_adjustment.js b/lib/model/db/user_allowance_adjustment.js index 3ead47679..da04f8e46 100644 --- a/lib/model/db/user_allowance_adjustment.js +++ b/lib/model/db/user_allowance_adjustment.js @@ -1,50 +1,55 @@ - "use strict"; -const moment = require('moment'); - -module.exports = function(sequelize, DataTypes){ - let UserAllowanceAdjustment = sequelize.define("UserAllowanceAdjustment", { - year : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : moment.utc().format('YYYY'), - comment : 'Year when adjustment is applied', - }, - adjustment : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - comment : 'Adjustment to allowance in current year', - }, - carried_over_allowance : { - type : DataTypes.INTEGER, - allowNull : false, - defaultValue : 0, - comment : 'Additional allowance to use based on un-used holidays in previous year', - }, - }, { - underscored : true, - freezeTableName : true, - timestamps : true, - createdAt : 'created_at', - updatedAt : false, - tableName : 'user_allowance_adjustment', - indexes : [{ - fields : [ 'user_id', 'year' ], - unique : true, - }], +const moment = require("moment"); - classMethods : { - associate : function(models) { - UserAllowanceAdjustment.belongsTo(models.User, { - as : 'user', - foreignKey : 'user_id', - }); +module.exports = function(sequelize, DataTypes) { + let UserAllowanceAdjustment = sequelize.define( + "UserAllowanceAdjustment", + { + year: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: moment.utc().format("YYYY"), + comment: "Year when adjustment is applied" + }, + adjustment: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 0, + comment: "Adjustment to allowance in current year" }, + carried_over_allowance: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: 0, + comment: + "Additional allowance to use based on un-used holidays in previous year" + } }, + { + underscored: true, + freezeTableName: true, + timestamps: true, + createdAt: "created_at", + updatedAt: false, + tableName: "user_allowance_adjustment", + indexes: [ + { + fields: ["user_id", "year"], + unique: true + } + ], - }); + classMethods: { + associate: function(models) { + UserAllowanceAdjustment.belongsTo(models.User, { + as: "user", + foreignKey: "user_id" + }); + } + } + } + ); return UserAllowanceAdjustment; }; diff --git a/lib/model/db/user_feed.js b/lib/model/db/user_feed.js index 3f7f45c45..174c5e488 100644 --- a/lib/model/db/user_feed.js +++ b/lib/model/db/user_feed.js @@ -1,66 +1,67 @@ "use strict"; -var - uuid = require('node-uuid'); +var uuid = require("node-uuid"); module.exports = function(sequelize, DataTypes) { - var UserFeed = sequelize.define("UserFeed", { - name : { - type : DataTypes.STRING, - allowNull : false, - }, - feed_token : { - type : DataTypes.STRING, - allowNull : false, - }, - type : { - // NOTE: 'wallchart' and 'teamview' are essentially the same thing - // later one used to be know as former, from now on use 'teamview' - // and keep old what for data compatibility - type : DataTypes.ENUM('calendar', 'wallchart', 'teamview', 'company'), - allowNull : false, - }, - }, { - - classMethods: { - associate : function( models ) { - UserFeed.belongsTo(models.User, {as : 'user'}); + var UserFeed = sequelize.define( + "UserFeed", + { + name: { + type: DataTypes.STRING, + allowNull: false + }, + feed_token: { + type: DataTypes.STRING, + allowNull: false }, + type: { + // NOTE: 'wallchart' and 'teamview' are essentially the same thing + // later one used to be know as former, from now on use 'teamview' + // and keep old what for data compatibility + type: DataTypes.ENUM("calendar", "wallchart", "teamview", "company"), + allowNull: false + } + }, + { + classMethods: { + associate: function(models) { + UserFeed.belongsTo(models.User, { as: "user" }); + }, - promise_new_feed : function(args){ - var self = this, + promise_new_feed: function(args) { + var self = this, user = args.user, type = args.type; - return self - .find({ where : {userId : user.id, type : type} }) - .then(function(feed){ - if ( feed ) { - feed.feed_token = uuid.v4(); - return feed.save(); - } else { - return self.create({ - name : "Calendar Feed", - feed_token : uuid.v4(), - type : type, - userId : user.id, - }); - } - }) + return self + .find({ where: { userId: user.id, type: type } }) + .then(function(feed) { + if (feed) { + feed.feed_token = uuid.v4(); + return feed.save(); + } else { + return self.create({ + name: "Calendar Feed", + feed_token: uuid.v4(), + type: type, + userId: user.id + }); + } + }); + } }, - }, - - instanceMethods : { - is_calendar : function() { - return this.type === 'calendar'; - }, + instanceMethods: { + is_calendar: function() { + return this.type === "calendar"; + }, - is_team_view : function(){ - return this.type === 'wallchart' || this.type === 'teamview'; - }, - }, - }); + is_team_view: function() { + return this.type === "wallchart" || this.type === "teamview"; + } + } + } + ); return UserFeed; }; diff --git a/lib/model/leave/index.js b/lib/model/leave/index.js index 394707d38..0a8d983f4 100644 --- a/lib/model/leave/index.js +++ b/lib/model/leave/index.js @@ -1,48 +1,45 @@ - -"use strict" - -const - Promise = require('bluebird'), - Joi = require('joi'), - moment = require('moment'), - Exception = require('../../error'), - {commentLeave} = require('../comment'), - Models = require('../db'); - -const - schemaCreateNewLeave = Joi.object().required().keys({ - for_employee : Joi.object().required(), - of_type : Joi.object().required(), - with_parameters : Joi.object().required(), +"use strict"; + +const Promise = require("bluebird"), + Joi = require("joi"), + moment = require("moment"), + Exception = require("../../error"), + { commentLeave } = require("../comment"), + Models = require("../db"); + +const schemaCreateNewLeave = Joi.object() + .required() + .keys({ + for_employee: Joi.object().required(), + of_type: Joi.object().required(), + with_parameters: Joi.object().required() }); /* * Create new leave for provided parameters. * Returns promise that is resolved with newly created leave row * */ -function createNewLeave(args){ - +function createNewLeave(args) { args = Joi.attempt( args, schemaCreateNewLeave, "Failed to validate arguments" ); - const - employee = args.for_employee, - leave_type = args.of_type, + const employee = args.for_employee, + leave_type = args.of_type, valide_attributes = args.with_parameters; - const - start_date = moment.utc(valide_attributes.from_date), - end_date = moment.utc(valide_attributes.to_date); + const start_date = moment.utc(valide_attributes.from_date), + end_date = moment.utc(valide_attributes.to_date); // Check that start date is not bigger then end one - if ( start_date.toDate() > end_date.toDate() ) { + if (start_date.toDate() > end_date.toDate()) { Exception.throwUserError({ - user_error : "Start date is later than end date", - system_error : `Failed to add new Leave for user ${ employee.id } ` - `because start date ${ start_date } happnned to be after end date ${ end_date }`, + user_error: "Start date is later than end date", + system_error: `Failed to add new Leave for user ${ + employee.id + } ``because start date ${start_date} happnned to be after end date ${end_date}` }); } @@ -51,48 +48,52 @@ function createNewLeave(args){ // Make sure that booking to be created is not going to ovelap with // any existing bookings - return Promise - - .try(() => employee.validate_overlapping(valide_attributes)) + return Promise.try(() => employee.validate_overlapping(valide_attributes)) .then(() => employee.promise_boss()) .then(main_supervisor => { - const new_leave_status = employee.is_auto_approve() ? Models.Leave.status_approved() : Models.Leave.status_new(); // Following statement creates in memory only leave object // it is not in database until .save() method is called - return Promise.resolve(Models.Leave.build({ - userId : employee.id, - leaveTypeId : leave_type.id, - status : new_leave_status, - approverId : main_supervisor.id, - employee_comment : valide_attributes.reason, - - date_start : start_date.format('YYYY-MM-DD'), - date_end : end_date.format('YYYY-MM-DD'), - day_part_start : valide_attributes.from_date_part, - day_part_end : valide_attributes.to_date_part, - })); + return Promise.resolve( + Models.Leave.build({ + userId: employee.id, + leaveTypeId: leave_type.id, + status: new_leave_status, + approverId: main_supervisor.id, + employee_comment: valide_attributes.reason, + + date_start: start_date.format("YYYY-MM-DD"), + date_end: end_date.format("YYYY-MM-DD"), + day_part_start: valide_attributes.from_date_part, + day_part_end: valide_attributes.to_date_part + }) + ); }) - .then(leave_to_create => employee - .validate_leave_fits_into_remaining_allowance({ - year : start_date, - leave_type : leave_type, - leave : leave_to_create, - }) - .then(() => leave_to_create.save()) + .then(leave_to_create => + employee + .validate_leave_fits_into_remaining_allowance({ + year: start_date, + leave_type: leave_type, + leave: leave_to_create + }) + .then(() => leave_to_create.save()) + ) + .then(leave => + commentLeaveIfNeeded({ leave, comment, companyId }).then(() => leave) ) - .then(leave => commentLeaveIfNeeded({leave,comment,companyId}).then(() => leave)) .then(leave => Promise.resolve(leave)); } -const commentLeaveIfNeeded = ({leave,comment, companyId}) => { - return comment ? commentLeave({leave,comment,companyId}) : Promise.resolve(); +const commentLeaveIfNeeded = ({ leave, comment, companyId }) => { + return comment + ? commentLeave({ leave, comment, companyId }) + : Promise.resolve(); }; module.exports = { - createNewLeave : createNewLeave, -} + createNewLeave: createNewLeave +}; diff --git a/lib/model/leave_collection.js b/lib/model/leave_collection.js index ecc9b9d61..00d876f0d 100644 --- a/lib/model/leave_collection.js +++ b/lib/model/leave_collection.js @@ -1,15 +1,12 @@ - "use strict"; -var - Promise = require('bluebird'), - moment = require('moment'), - _ = require('underscore'), - config = require('../config'); +var Promise = require("bluebird"), + moment = require("moment"), + _ = require("underscore"), + config = require("../config"); function promise_to_group_leaves(leaves) { - - if ( ! leaves ) { + if (!leaves) { throw new Error('Did not get "leaves" in promise_to_group_leaves'); } @@ -17,22 +14,22 @@ function promise_to_group_leaves(leaves) { // Group leaves by years leaves.forEach(leave => { - let year = moment.utc(leave.get_start_leave_day().date).format('YYYY'); + let year = moment.utc(leave.get_start_leave_day().date).format("YYYY"); - if ( ! grouped_leaves[year]) { - grouped_leaves[ year ] = { - year : year, - leaves : [], + if (!grouped_leaves[year]) { + grouped_leaves[year] = { + year: year, + leaves: [] }; } - grouped_leaves[ year ].leaves.push(leave); + grouped_leaves[year].leaves.push(leave); }); // Sort year groups - grouped_leaves = _ - .values( grouped_leaves ) - .sort((a,b) => a.year > b.year ? -1 : a.year < b.year ? 1 : 0); + grouped_leaves = _.values(grouped_leaves).sort((a, b) => + a.year > b.year ? -1 : a.year < b.year ? 1 : 0 + ); // Calculate total allowance deduction per group grouped_leaves.forEach(group => { @@ -52,16 +49,16 @@ function promise_to_group_leaves(leaves) { * */ function promise_to_sort_leaves(leaves) { - return Promise.resolve( leaves.sort( - (a,b) => a.date_start > b.date_start - ? -1 : a.date_start < b.date_start - ? 1 : 0 - )); + return Promise.resolve( + leaves.sort((a, b) => + a.date_start > b.date_start ? -1 : a.date_start < b.date_start ? 1 : 0 + ) + ); } -module.exports = function(){ +module.exports = function() { return { - promise_to_group_leaves : promise_to_group_leaves, - promise_to_sort_leaves : promise_to_sort_leaves, + promise_to_group_leaves: promise_to_group_leaves, + promise_to_sort_leaves: promise_to_sort_leaves }; }; diff --git a/lib/model/leave_day.js b/lib/model/leave_day.js index 59da8453d..63530a499 100644 --- a/lib/model/leave_day.js +++ b/lib/model/leave_day.js @@ -11,45 +11,52 @@ "use strict"; -var - _ = require('underscore'), - moment = require('moment'); +var _ = require("underscore"), + moment = require("moment"); function LeaveDay(args) { - // Make sure all required data is provided - _.each( - ['date', 'day_part', 'sequelize', 'leave_type_id'], - function(property){ - if (! _.has(args, property)) { - throw new Error('No mandatory '+property+' was provided'); - } + _.each(["date", "day_part", "sequelize", "leave_type_id"], function( + property + ) { + if (!_.has(args, property)) { + throw new Error("No mandatory " + property + " was provided"); } - ); + }); - this.date = args.date; - this.day_part = args.day_part; - this.sequelize = args.sequelize; - this.morning_leave_type_id = this.afternoon_leave_type_id = args.leave_type_id; -}; + this.date = args.date; + this.day_part = args.day_part; + this.sequelize = args.sequelize; + this.morning_leave_type_id = this.afternoon_leave_type_id = + args.leave_type_id; +} -LeaveDay.prototype.is_all_day_leave = function(){ - return String(this.day_part) === String(this.sequelize.models.Leave.leave_day_part_all()); +LeaveDay.prototype.is_all_day_leave = function() { + return ( + String(this.day_part) === + String(this.sequelize.models.Leave.leave_day_part_all()) + ); }; -LeaveDay.prototype.is_morning_leave = function(){ - return String(this.day_part) === String(this.sequelize.models.Leave.leave_day_part_morning()); +LeaveDay.prototype.is_morning_leave = function() { + return ( + String(this.day_part) === + String(this.sequelize.models.Leave.leave_day_part_morning()) + ); }; -LeaveDay.prototype.is_afternoon_leave = function(){ - return String(this.day_part) === String(this.sequelize.models.Leave.leave_day_part_afternoon()); +LeaveDay.prototype.is_afternoon_leave = function() { + return ( + String(this.day_part) === + String(this.sequelize.models.Leave.leave_day_part_afternoon()) + ); }; -LeaveDay.prototype.get_morning_leave_type_id = function(){ +LeaveDay.prototype.get_morning_leave_type_id = function() { return String(this.morning_leave_type_id); }; -LeaveDay.prototype.get_afternoon_leave_type_id = function(){ +LeaveDay.prototype.get_afternoon_leave_type_id = function() { return String(this.afternoon_leave_type_id); }; @@ -57,11 +64,11 @@ LeaveDay.prototype.get_afternoon_leave_type_id = function(){ // saved into database. It is used when showing calendar to user and // there are two half days that fit into one whole day LeaveDay.prototype.pretend_to_be_full_day = function() { - return this.day_part = this.sequelize.models.Leave.leave_day_part_all(); + return (this.day_part = this.sequelize.models.Leave.leave_day_part_all()); }; -LeaveDay.prototype.get_pretty_date = function(){ - return moment.utc(this.date).format('YYYY-MM-DD'); +LeaveDay.prototype.get_pretty_date = function() { + return moment.utc(this.date).format("YYYY-MM-DD"); }; module.exports = LeaveDay; diff --git a/lib/model/leave_request_parameters.js b/lib/model/leave_request_parameters.js index 1fde7796d..b020dc312 100644 --- a/lib/model/leave_request_parameters.js +++ b/lib/model/leave_request_parameters.js @@ -1,82 +1,100 @@ +"use strict"; -'use strict'; - -var - _ = require('underscore'), - model = require('../model/db'), - moment = require('moment'); +var _ = require("underscore"), + model = require("../model/db"), + moment = require("moment"); function LeaveRequest(args) { - var me = this; - - // Make sure all required data is provided - _.each( - [ - 'leave_type','from_date','from_date_part', - 'to_date', 'to_date_part', 'reason' - ], - function(property){ - if (! _.has(args, property)) { - throw new Error('No mandatory '+property+' was provided to LeaveRequest constructor'); - } - } - ); - - // From date should not be bigger then to - if (moment.utc(args.from_date).toDate() > moment.utc(args.to_date).toDate()){ - throw new Error( 'From date should be before To date at LeaveRequest constructor' ); + var me = this; + + // Make sure all required data is provided + _.each( + [ + "leave_type", + "from_date", + "from_date_part", + "to_date", + "to_date_part", + "reason" + ], + function(property) { + if (!_.has(args, property)) { + throw new Error( + "No mandatory " + + property + + " was provided to LeaveRequest constructor" + ); + } } + ); - _.each( - [ - 'leave_type','from_date','from_date_part', - 'to_date', 'to_date_part', 'reason', 'user' - ], - function(property){ me[property] = args[property]; } + // From date should not be bigger then to + if (moment.utc(args.from_date).toDate() > moment.utc(args.to_date).toDate()) { + throw new Error( + "From date should be before To date at LeaveRequest constructor" ); + } + + _.each( + [ + "leave_type", + "from_date", + "from_date_part", + "to_date", + "to_date_part", + "reason", + "user" + ], + function(property) { + me[property] = args[property]; + } + ); } -LeaveRequest.prototype.as_data_object = function(){ - var obj = {}, - me = this; - - _.each( - [ - 'leave_type','from_date','from_date_part', - 'to_date', 'to_date_part', 'reason', 'user' - ], - function(property){ obj[property] = me[property]; } - ); +LeaveRequest.prototype.as_data_object = function() { + var obj = {}, + me = this; + + _.each( + [ + "leave_type", + "from_date", + "from_date_part", + "to_date", + "to_date_part", + "reason", + "user" + ], + function(property) { + obj[property] = me[property]; + } + ); - return obj; + return obj; }; -LeaveRequest.prototype.is_within_one_day = function(){ - return moment.utc(this.from_date).format('YYYY-MM-DD') - === - moment.utc(this.to_date).format('YYYY-MM-DD'); +LeaveRequest.prototype.is_within_one_day = function() { + return ( + moment.utc(this.from_date).format("YYYY-MM-DD") === + moment.utc(this.to_date).format("YYYY-MM-DD") + ); }; -LeaveRequest.prototype._does_fit_with_point = function(leave_day, point_name){ - var return_val = false; - - if ( - ( - moment.utc(leave_day.date).format('YYYY-MM-DD') - === - moment.utc(this[point_name]).format('YYYY-MM-DD') - ) - && - (! leave_day.is_all_day_leave()) - && - (String(this[point_name+'_part']) !== String(model.Leave.leave_day_part_all())) - && - (String(leave_day.day_part) !== String(this[point_name+'_part'])) - ) { - return_val = true; - } - - return return_val; +LeaveRequest.prototype._does_fit_with_point = function(leave_day, point_name) { + var return_val = false; + + if ( + moment.utc(leave_day.date).format("YYYY-MM-DD") === + moment.utc(this[point_name]).format("YYYY-MM-DD") && + !leave_day.is_all_day_leave() && + String(this[point_name + "_part"]) !== + String(model.Leave.leave_day_part_all()) && + String(leave_day.day_part) !== String(this[point_name + "_part"]) + ) { + return_val = true; + } + + return return_val; }; // Check if start date or end date of current object fits with provided leave_day @@ -84,22 +102,19 @@ LeaveRequest.prototype._does_fit_with_point = function(leave_day, point_name){ // By fitting I mean days are the same and both of them are // halfs of different types. // -LeaveRequest.prototype.does_fit_with_leave_day = function(leave_day){ - - return this._does_fit_with_point(leave_day, 'from_date') - || - this._does_fit_with_point(leave_day, 'to_date'); +LeaveRequest.prototype.does_fit_with_leave_day = function(leave_day) { + return ( + this._does_fit_with_point(leave_day, "from_date") || + this._does_fit_with_point(leave_day, "to_date") + ); }; -LeaveRequest.prototype.does_fit_with_leave_day_at_start = function(leave_day){ - - return this._does_fit_with_point(leave_day, 'from_date'); +LeaveRequest.prototype.does_fit_with_leave_day_at_start = function(leave_day) { + return this._does_fit_with_point(leave_day, "from_date"); }; -LeaveRequest.prototype.does_fit_with_leave_day_at_end = function(leave_day){ - - return this._does_fit_with_point(leave_day, 'to_date'); +LeaveRequest.prototype.does_fit_with_leave_day_at_end = function(leave_day) { + return this._does_fit_with_point(leave_day, "to_date"); }; - module.exports = LeaveRequest; diff --git a/lib/model/mixin/user/absence_aware.js b/lib/model/mixin/user/absence_aware.js index 41f03663d..4db3a7707 100644 --- a/lib/model/mixin/user/absence_aware.js +++ b/lib/model/mixin/user/absence_aware.js @@ -1,199 +1,210 @@ - /* * Mixin that inject to user model object consumer set of methods necessary for * dealing with abcenses. * * */ -'use strict'; - -var - _ = require('underscore'), - Promise = require("bluebird"), - CalendarMonth = require('../../calendar_month'), - LeaveCollectionUtil = require('../../leave_collection')(), - moment = require('moment'); +"use strict"; -module.exports = function(sequelize){ +var _ = require("underscore"), + Promise = require("bluebird"), + CalendarMonth = require("../../calendar_month"), + LeaveCollectionUtil = require("../../leave_collection")(), + moment = require("moment"); - this._get_calendar_months_to_show = function(args){ - var - self = this, - year = args.year, +module.exports = function(sequelize) { + this._get_calendar_months_to_show = function(args) { + var self = this, + year = args.year, show_full_year = args.show_full_year; if (show_full_year) { - return _.map([1,2,3,4,5,6,7,8,9,10,11,12], function(i){ - return moment.utc(year.format('YYYY')+'-'+i+'-01'); + return _.map([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], function(i) { + return moment.utc(year.format("YYYY") + "-" + i + "-01"); }); } - return _.map([0,1,2,3], function(delta){ - return self.company.get_today().add(delta, 'months').startOf('month'); - }) + return _.map([0, 1, 2, 3], function(delta) { + return self.company + .get_today() + .add(delta, "months") + .startOf("month"); + }); }; - this.promise_calendar = function(args) { - var - this_user = this, - year = args.year || this_user.company.get_today(), + var this_user = this, + year = args.year || this_user.company.get_today(), show_full_year = args.show_full_year || false, - model = sequelize.models, + model = sequelize.models, // Find out if we need to show multi year calendar is_multi_year = this_user.company.get_today().month() > 8; var months_to_show = this_user._get_calendar_months_to_show({ - year : year.clone(), - show_full_year : show_full_year + year: year.clone(), + show_full_year: show_full_year }); return Promise.join( - Promise.try(() => this_user.getDepartment()), - Promise.try(() => this_user.getCompany({ - scope : ['with_bank_holidays', 'with_leave_types'] - })), + Promise.try(() => + this_user.getCompany({ + scope: ["with_bank_holidays", "with_leave_types"] + }) + ), - Promise.try(function(){ + Promise.try(function() { return this_user.getMy_leaves({ - where : { - $and : [ - { status : { $ne : sequelize.models.Leave.status_rejected() } }, - { status : { $ne : sequelize.models.Leave.status_canceled() } }, + where: { + $and: [ + { status: { $ne: sequelize.models.Leave.status_rejected() } }, + { status: { $ne: sequelize.models.Leave.status_canceled() } } ], - $or : { - date_start : { - $between : [ - moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc( - year.clone().add((is_multi_year ? 1 : 0), 'years') - ).endOf('year').format('YYYY-MM-DD HH:mm'), + $or: { + date_start: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year.clone().add(is_multi_year ? 1 : 0, "years")) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] }, - date_end : { - $between : [ - moment.utc( year ).startOf('year').format('YYYY-MM-DD'), - moment.utc( - year.clone().add((is_multi_year ? 1 : 0), 'years') - ).endOf('year').format('YYYY-MM-DD HH:mm'), + date_end: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year.clone().add(is_multi_year ? 1 : 0, "years")) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] } } - }, + } }); }), Promise.try(() => this_user.promise_schedule_I_obey()), - function(department, company, leaves, schedule){ - var leave_days = _.flatten( _.map(leaves, function(leave){ - return _.map( leave.get_days(), function(leave_day){ - leave_day.leave = leave; - return leave_day; - }); - })); + function(department, company, leaves, schedule) { + var leave_days = _.flatten( + _.map(leaves, function(leave) { + return _.map(leave.get_days(), function(leave_day) { + leave_day.leave = leave; + return leave_day; + }); + }) + ); return Promise.resolve( - _.map(months_to_show, function(month){ - return new CalendarMonth( - month, - { - bank_holidays : - department.include_public_holidays - ? company.bank_holidays - : [], - leave_days : leave_days, - schedule : schedule, - today : company.get_today(), - leave_types: company.leave_types, - } - ); + _.map(months_to_show, function(month) { + return new CalendarMonth(month, { + bank_holidays: department.include_public_holidays + ? company.bank_holidays + : [], + leave_days: leave_days, + schedule: schedule, + today: company.get_today(), + leave_types: company.leave_types + }); }) ); } - ); // End of join }; - this.validate_overlapping = function(new_leave_attributes) { var this_user = this; var days_filter = { - $between : [ + $between: [ new_leave_attributes.from_date, - moment.utc(new_leave_attributes.to_date) - .add(1,'days').format('YYYY-MM-DD'), - ], + moment + .utc(new_leave_attributes.to_date) + .add(1, "days") + .format("YYYY-MM-DD") + ] }; - return this_user.getMy_leaves({ - where : { - $and : [ - { status : { $ne : sequelize.models.Leave.status_rejected() } }, - { status : { $ne : sequelize.models.Leave.status_canceled() } }, - ], - - $or : { - date_start : days_filter, - date_end : days_filter, - }, - }, - }) - - .then(function(overlapping_leaves){ + return this_user + .getMy_leaves({ + where: { + $and: [ + { status: { $ne: sequelize.models.Leave.status_rejected() } }, + { status: { $ne: sequelize.models.Leave.status_canceled() } } + ], + + $or: { + date_start: days_filter, + date_end: days_filter + } + } + }) - // Check there are overlapping leaves - if (overlapping_leaves.length === 0){ + .then(function(overlapping_leaves) { + // Check there are overlapping leaves + if (overlapping_leaves.length === 0) { return Promise.resolve(1); - } + } - var overlapping_leave = overlapping_leaves[0]; + var overlapping_leave = overlapping_leaves[0]; - if (overlapping_leave.fit_with_leave_request( - new_leave_attributes - )){ + if (overlapping_leave.fit_with_leave_request(new_leave_attributes)) { return Promise.resolve(1); - } - - // Otherwise it is overlapping! - var error = new Error('Overlapping booking!'); - error.user_message = 'Overlapping booking!'; - throw error; + } - }); + // Otherwise it is overlapping! + var error = new Error("Overlapping booking!"); + error.user_message = "Overlapping booking!"; + throw error; + }); }; // end of validate_overlapping - // Promise all leaves requested by current user, regardless // their statuses // - this.promise_my_leaves = function(args){ - - var self = this, - where_clause = {}, - // Time zone does not really matter here, although there could be issues - // around New Year (but we can tolerate that) - year = args.year || moment.utc(); + this.promise_my_leaves = function(args) { + var self = this, + where_clause = {}, + // Time zone does not really matter here, although there could be issues + // around New Year (but we can tolerate that) + year = args.year || moment.utc(); if (args && args.filter_status) { - where_clause = { status : args.filter_status }; + where_clause = { status: args.filter_status }; } - if (args && ! args.ignore_year) { - where_clause['$or'] = { - date_start : { - $between : [ - moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), + if (args && !args.ignore_year) { + where_clause["$or"] = { + date_start: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] }, - date_end : { - $between : [ - moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), + date_end: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] } }; @@ -202,189 +213,207 @@ module.exports = function(sequelize){ var promise_my_leaves = this.getMy_leaves({ // TODO here is cartesian product between leave types and users, // needs to be split - include : [{ - model : sequelize.models.LeaveType, - as : 'leave_type', - },{ - model : sequelize.models.User, - as : 'user', - include : [{ - model : sequelize.models.Company, - as : 'company', - include : [{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', - }], - }], - }], - where : where_clause, + include: [ + { + model: sequelize.models.LeaveType, + as: "leave_type" + }, + { + model: sequelize.models.User, + as: "user", + include: [ + { + model: sequelize.models.Company, + as: "company", + include: [ + { + model: sequelize.models.BankHoliday, + as: "bank_holidays" + } + ] + } + ] + } + ], + where: where_clause }) - // Fetch approvers for each leave in separate query, to avoid cartesian - // products. - .then(function(leaves){ - - leaves.forEach(function(leave){ leave.user.cached_schedule = self.cached_schedule; }); + // Fetch approvers for each leave in separate query, to avoid cartesian + // products. + .then(function(leaves) { + leaves.forEach(function(leave) { + leave.user.cached_schedule = self.cached_schedule; + }); - return Promise.resolve(leaves) - .map( - function(leave){ - return leave.promise_approver() - .then(function(approver){ + return Promise.resolve(leaves).map( + function(leave) { + return leave.promise_approver().then(function(approver) { leave.approver = approver; return Promise.resolve(leave); }); - }, { - concurrency : 10, + }, + { + concurrency: 10 } ); - }) + }) - .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); return promise_my_leaves; }; - this.promise_my_active_leaves = function(args) { var year = args.year || moment.utc(); return this.promise_my_leaves({ - year : year, - filter_status : [ + year: year, + filter_status: [ sequelize.models.Leave.status_approved(), sequelize.models.Leave.status_new(), - sequelize.models.Leave.status_pended_revoke(), - ], - }) - .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); + sequelize.models.Leave.status_pended_revoke() + ] + }).then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); }; // Promises leaves ever booked for current user this.promise_my_active_leaves_ever = function() { - return this.promise_my_leaves({ - ignore_year : true, - filter_status : [ + ignore_year: true, + filter_status: [ sequelize.models.Leave.status_approved(), sequelize.models.Leave.status_new(), - sequelize.models.Leave.status_pended_revoke(), - ], - }) - .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); + sequelize.models.Leave.status_pended_revoke() + ] + }).then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); }; - // Promise leaves that are needed to be Approved/Rejected // - this.promise_leaves_to_be_processed = function(){ + this.promise_leaves_to_be_processed = function() { let self = this; return self .promise_supervised_users() .then(users => { return sequelize.models.Leave.findAll({ - include : [{ - model : sequelize.models.LeaveType, - as : 'leave_type', - },{ - model : sequelize.models.User, - as : 'user', - include : [{ - model : sequelize.models.Company, - as : 'company', - include : [{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', - }], - },{ - model : sequelize.models.Department, - as : 'department', - }], - }], - where : { - status : [ + include: [ + { + model: sequelize.models.LeaveType, + as: "leave_type" + }, + { + model: sequelize.models.User, + as: "user", + include: [ + { + model: sequelize.models.Company, + as: "company", + include: [ + { + model: sequelize.models.BankHoliday, + as: "bank_holidays" + } + ] + }, + { + model: sequelize.models.Department, + as: "department" + } + ] + } + ], + where: { + status: [ sequelize.models.Leave.status_new(), sequelize.models.Leave.status_pended_revoke() ], - userId : users.map(u => u.id), - }, - }) + userId: users.map(u => u.id) + } + }); }) - .then( leaves => Promise - .resolve(leaves) - .map( - leave => leave.user.promise_schedule_I_obey(), - { concurrency : 10 } - ) - .then( () => Promise.resolve(leaves) ) - .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)) + .then(leaves => + Promise.resolve(leaves) + .map(leave => leave.user.promise_schedule_I_obey(), { + concurrency: 10 + }) + .then(() => Promise.resolve(leaves)) + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)) ); }; // END of promise_leaves_to_be_processed - this.promise_cancelable_leaves = function(){ + this.promise_cancelable_leaves = function() { var self = this; - return self.promise_my_leaves({ - ignore_year : true, - filter_status : [ sequelize.models.Leave.status_new() ], - }) - .then(function(leaves){ - return Promise.map(leaves, function(leave){ - return leave.user.promise_schedule_I_obey(); - },{ - concurrency : 10, + return self + .promise_my_leaves({ + ignore_year: true, + filter_status: [sequelize.models.Leave.status_new()] }) - .then(function(){ return Promise.resolve(leaves) }) - .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); - }); + .then(function(leaves) { + return Promise.map( + leaves, + function(leave) { + return leave.user.promise_schedule_I_obey(); + }, + { + concurrency: 10 + } + ) + .then(function() { + return Promise.resolve(leaves); + }) + .then(leaves => LeaveCollectionUtil.promise_to_sort_leaves(leaves)); + }); }; - - this.calculate_number_of_days_taken_from_allowance = function(args){ + this.calculate_number_of_days_taken_from_allowance = function(args) { var self = this, - leave_type = args ? args.leave_type : null, - leaves_to_traverse = this.my_leaves || []; - + leave_type = args ? args.leave_type : null, + leaves_to_traverse = this.my_leaves || []; - leaves_to_traverse.forEach(function(leave){ leave.user.cached_schedule = self.cached_schedule; }); + leaves_to_traverse.forEach(function(leave) { + leave.user.cached_schedule = self.cached_schedule; + }); // If leave_type was provided, we care only about leaves of that type if (leave_type) { - leaves_to_traverse = _.filter( - leaves_to_traverse, - function(leave){ return leave.leaveTypeId === leave_type.id; } - ); + leaves_to_traverse = _.filter(leaves_to_traverse, function(leave) { + return leave.leaveTypeId === leave_type.id; + }); } - return _.reduce( - _.map( - _.filter( - leaves_to_traverse, - function (leave){ return leave.is_approved_leave(); } + return ( + _.reduce( + _.map( + _.filter(leaves_to_traverse, function(leave) { + return leave.is_approved_leave(); + }), + function(leave) { + return leave.get_deducted_days_number(args); + } ), - function(leave){ return leave.get_deducted_days_number(args); } - ), - function(memo, num){ return memo + num }, - 0 - ) || 0; + function(memo, num) { + return memo + num; + }, + 0 + ) || 0 + ); }; - // Based on leaves attached to the current user object, // the method does not perform any additional queries // - this.get_leave_statistics_by_types = function(args){ - - if (! args ) args = {}; + (this.get_leave_statistics_by_types = function(args) { + if (!args) args = {}; var statistics = {}, limit_by_top = args.limit_by_top || false; - this.company.leave_types.forEach(function(leave_type){ + this.company.leave_types.forEach(function(leave_type) { var initial_stat = { - leave_type : leave_type, - days_taken : 0, + leave_type: leave_type, + days_taken: 0 }; if (leave_type.limit && leave_type.limit > 0) { initial_stat.limit = leave_type.limit; @@ -393,71 +422,60 @@ module.exports = function(sequelize){ }); // Calculate statistics as an object - _.filter( - this.my_leaves, - function (leave){ return leave.is_approved_leave() } - ) - .forEach( - function(leave){ - - var stat_obj = statistics[leave.leave_type.id]; - - stat_obj.days_taken = stat_obj.days_taken + leave.get_deducted_days_number({ - ignore_allowance : true, + _.filter(this.my_leaves, function(leave) { + return leave.is_approved_leave(); + }).forEach(function(leave) { + var stat_obj = statistics[leave.leave_type.id]; + + stat_obj.days_taken = + stat_obj.days_taken + + leave.get_deducted_days_number({ + ignore_allowance: true }); - } - ); - - var statistic_arr = _.map( - _.pairs(statistics), - function(pair){ - return pair[1]; - } - ); + }); - statistic_arr = _.sortBy( - statistic_arr, - 'days_taken' - ) - .reverse(); + var statistic_arr = _.map(_.pairs(statistics), function(pair) { + return pair[1]; + }); + statistic_arr = _.sortBy(statistic_arr, "days_taken").reverse(); if (limit_by_top) { statistic_arr = _.first(statistic_arr, 4); } - return _.sortBy(statistic_arr, function(rec){ return rec.leave_type.name; }); - }, - - - this.promise_adjustment_and_carry_over_for_year = function(year){ - let self = this; - - year = year || moment.utc(); - year = moment.utc(year).format('YYYY'); - - return self - .getAdjustments({ - where : { year : year } - }) - .then(adjustment_records => { + return _.sortBy(statistic_arr, function(rec) { + return rec.leave_type.name; + }); + }), + (this.promise_adjustment_and_carry_over_for_year = function(year) { + let self = this; - // By deafault there is not adjustments - let result = { - adjustment : 0, - carried_over_allowance : 0, - }; + year = year || moment.utc(); + year = moment.utc(year).format("YYYY"); - if (adjustment_records.length === 1) { - result.adjustment = adjustment_records[0].adjustment; - result.carried_over_allowance = adjustment_records[0].carried_over_allowance; - } + return self + .getAdjustments({ + where: { year: year } + }) + .then(adjustment_records => { + // By deafault there is not adjustments + let result = { + adjustment: 0, + carried_over_allowance: 0 + }; + + if (adjustment_records.length === 1) { + result.adjustment = adjustment_records[0].adjustment; + result.carried_over_allowance = + adjustment_records[0].carried_over_allowance; + } - return Promise.resolve(result); - }); - }; + return Promise.resolve(result); + }); + }); - this.promise_adjustmet_for_year = function(year){ + this.promise_adjustmet_for_year = function(year) { let self = this; return self @@ -465,95 +483,99 @@ module.exports = function(sequelize){ .then(combined_record => Promise.resolve(combined_record.adjustment)); }; - this.promise_carried_over_allowance_for_year = function(year){ + this.promise_carried_over_allowance_for_year = function(year) { let self = this; return self .promise_adjustment_and_carry_over_for_year(year) - .then(combined_record => Promise.resolve(combined_record.carried_over_allowance)); + .then(combined_record => + Promise.resolve(combined_record.carried_over_allowance) + ); }; this.promise_to_update_adjustment = function(args) { - let - self = this, - year = args.year || moment.utc().format('YYYY'), + let self = this, + year = args.year || moment.utc().format("YYYY"), adjustment = args.adjustment; // Update related allowance adjustement record - return sequelize.models.UserAllowanceAdjustment - .findOrCreate({ - where : { - user_id : self.id, - year : year, - }, - defaults : { adjustment : adjustment }, - }) - .spread((record, created) => { - - if ( created ) { - return Promise.resolve(); - } + return sequelize.models.UserAllowanceAdjustment.findOrCreate({ + where: { + user_id: self.id, + year: year + }, + defaults: { adjustment: adjustment } + }).spread((record, created) => { + if (created) { + return Promise.resolve(); + } - record.set('adjustment', adjustment); + record.set("adjustment", adjustment); - return record.save(); - }); + return record.save(); + }); }; this.promise_to_update_carried_over_allowance = function(args) { - let - self = this, - year = args.year || moment.utc().format('YYYY'), + let self = this, + year = args.year || moment.utc().format("YYYY"), carried_over_allowance = args.carried_over_allowance; // Update related allowance adjustement record - return sequelize.models.UserAllowanceAdjustment - .findOrCreate({ - where : { - user_id : self.id, - year : year, - }, - defaults : { carried_over_allowance : carried_over_allowance }, - }) - .spread((record, created) => { - - if ( created ) { - return Promise.resolve(); - } + return sequelize.models.UserAllowanceAdjustment.findOrCreate({ + where: { + user_id: self.id, + year: year + }, + defaults: { carried_over_allowance: carried_over_allowance } + }).spread((record, created) => { + if (created) { + return Promise.resolve(); + } - record.set('carried_over_allowance', carried_over_allowance); + record.set("carried_over_allowance", carried_over_allowance); - return record.save(); - }); + return record.save(); + }); }; - - this.promise_my_leaves_for_calendar = function(args){ + this.promise_my_leaves_for_calendar = function(args) { var year = args.year || this.company.get_today(); return this.getMy_leaves({ - where : { - - $and : [ - { status : { $ne : sequelize.models.Leave.status_rejected() } }, - { status : { $ne : sequelize.models.Leave.status_canceled() } }, + where: { + $and: [ + { status: { $ne: sequelize.models.Leave.status_rejected() } }, + { status: { $ne: sequelize.models.Leave.status_canceled() } } ], - $or : { - date_start : { - $between : [ - moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), + $or: { + date_start: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] }, - date_end : { - $between : [ - moment.utc(year).startOf('year').format('YYYY-MM-DD'), - moment.utc(year).endOf('year').format('YYYY-MM-DD HH:mm'), + date_end: { + $between: [ + moment + .utc(year) + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc(year) + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] } } - }, + } }); // End of MyLeaves }; @@ -563,88 +585,96 @@ module.exports = function(sequelize){ // // If validation fails an exceptionis thrown. // - this.validate_leave_fits_into_remaining_allowance = function(args){ - var self = this, - leave_type = args.leave_type, - leave = args.leave, - // Derive year from Leave object - year = args.year || moment.utc(leave.date_start); + this.validate_leave_fits_into_remaining_allowance = function(args) { + var self = this, + leave_type = args.leave_type, + leave = args.leave, + // Derive year from Leave object + year = args.year || moment.utc(leave.date_start); // Make sure object contain all necessary data for that check - return self.reload_with_leave_details({ - year : year.clone(), - }) - .then( employee => employee.reload_with_session_details() ) - .then(employee => employee.company.reload_with_bank_holidays() - .then(() => Promise.resolve(employee)) - ) - .then(employee => - employee.promise_allowance({year}) - .then(allowance_obj => Promise.resolve([allowance_obj.number_of_days_available_in_allowance, employee])) - ) - .then(function(args){ - let days_remaining_in_allowance = args[0], - employee = args[1]; - - let deducted_days = leave.get_deducted_days_number({ - year : year.format('YYYY'), - user : employee, - leave_type : leave_type, - }); - - // Throw an exception when less than zero vacation would remain - // if we add currently requested absence - if ( - days_remaining_in_allowance - deducted_days < 0 - ) { - - var error = new Error('Requested absence is longer than remaining allowance'); - error.user_message = error.toString(); - throw error; - } - - return Promise.resolve(employee); - }) - - // Check that adding new leave of this type will not exceed maximum limit of - // that type (if it is defined) - .then(function(employee){ - if ( - // There is a limit for current type - leave_type.limit - // ... and lemit is bigger than zero - && leave_type.limit > 0 - ) { - - // ... sum of used dayes for this limit is going to be bigger then limit - var would_be_used = employee.calculate_number_of_days_taken_from_allowance({ - year : year.format('YYYY'), - leave_type : leave_type, - ignore_allowance : true, - }) - + - leave.get_deducted_days_number({ - year : year.format('YYYY'), - user : employee, - leave_type : leave_type, - ignore_allowance : true, + return ( + self + .reload_with_leave_details({ + year: year.clone() + }) + .then(employee => employee.reload_with_session_details()) + .then(employee => + employee.company + .reload_with_bank_holidays() + .then(() => Promise.resolve(employee)) + ) + .then(employee => + employee + .promise_allowance({ year }) + .then(allowance_obj => + Promise.resolve([ + allowance_obj.number_of_days_available_in_allowance, + employee + ]) + ) + ) + .then(function(args) { + let days_remaining_in_allowance = args[0], + employee = args[1]; + + let deducted_days = leave.get_deducted_days_number({ + year: year.format("YYYY"), + user: employee, + leave_type: leave_type }); - if (would_be_used > leave_type.limit) { + // Throw an exception when less than zero vacation would remain + // if we add currently requested absence + if (days_remaining_in_allowance - deducted_days < 0) { + var error = new Error( + "Requested absence is longer than remaining allowance" + ); + error.user_message = error.toString(); + throw error; + } - var error = new Error('Adding requested '+leave_type.name - +" absence would exceed maximum allowed for such type by " - +(would_be_used - leave_type.limit) - ); + return Promise.resolve(employee); + }) - error.user_message = error.toString(); - throw error; - } - } + // Check that adding new leave of this type will not exceed maximum limit of + // that type (if it is defined) + .then(function(employee) { + if ( + // There is a limit for current type + leave_type.limit && + // ... and lemit is bigger than zero + leave_type.limit > 0 + ) { + // ... sum of used dayes for this limit is going to be bigger then limit + var would_be_used = + employee.calculate_number_of_days_taken_from_allowance({ + year: year.format("YYYY"), + leave_type: leave_type, + ignore_allowance: true + }) + + leave.get_deducted_days_number({ + year: year.format("YYYY"), + user: employee, + leave_type: leave_type, + ignore_allowance: true + }); + + if (would_be_used > leave_type.limit) { + var error = new Error( + "Adding requested " + + leave_type.name + + " absence would exceed maximum allowed for such type by " + + (would_be_used - leave_type.limit) + ); + + error.user_message = error.toString(); + throw error; + } + } - return Promise.resolve(); - }); + return Promise.resolve(); + }) + ); }; - }; - diff --git a/lib/model/mixin/user/company_aware.js b/lib/model/mixin/user/company_aware.js index cd817d788..bc3eaf9a8 100644 --- a/lib/model/mixin/user/company_aware.js +++ b/lib/model/mixin/user/company_aware.js @@ -1,4 +1,3 @@ - /* * This is a role to be applied to user model that injects getters necessary * for fetching related company object with different level of details. @@ -8,14 +7,12 @@ * * */ -'use strict'; - -var - Promise = require("bluebird"), - moment = require('moment'); +"use strict"; -module.exports = function(sequelize){ +var Promise = require("bluebird"), + moment = require("moment"); +module.exports = function(sequelize) { /* Fetch company object associated with current user, the company object * includes all necessary associations for building user detail page * for user determined by user_id. @@ -25,122 +22,147 @@ module.exports = function(sequelize){ // TODO: Query below needs to be revisited as it is slow for users // many leaves // - this.get_company_for_user_details = function(args){ - var user_id = args.user_id, - year = args.year || moment.utc(), + this.get_company_for_user_details = function(args) { + var user_id = args.user_id, + year = args.year || moment.utc(), current_user = this; - return this.getCompany({ - include : [ - { - model : sequelize.models.User, - as : 'users', - where : { id : user_id }, - include : [ - - // Following is needed to be able to calculate how many days were - // taked from allowance - { - model : sequelize.models.Leave, - as : 'my_leaves', - required : false, - where : { - $or : { - date_start : { - $between : [ - moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), - ] + return ( + this.getCompany({ + include: [ + { + model: sequelize.models.User, + as: "users", + where: { id: user_id }, + include: [ + // Following is needed to be able to calculate how many days were + // taked from allowance + { + model: sequelize.models.Leave, + as: "my_leaves", + required: false, + where: { + $or: { + date_start: { + $between: [ + moment + .utc() + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc() + .endOf("year") + .format("YYYY-MM-DD HH:mm") + ] + }, + date_end: { + $between: [ + moment + .utc() + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc() + .endOf("year") + .format("YYYY-MM-DD HH:mm") + ] + } + } + }, + include: [ + { + model: sequelize.models.LeaveType, + as: "leave_type" }, - date_end : { - $between : [ - moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), + { + model: sequelize.models.User, + as: "user", + include: [ + { + model: sequelize.models.Company, + as: "company", + include: [ + { + model: sequelize.models.BankHoliday, + as: "bank_holidays" + } + ] + } ] } - } + ] // End of my_leaves include }, - include : [{ - model : sequelize.models.LeaveType, - as : 'leave_type', - },{ - model : sequelize.models.User, - as : 'user', - include : [{ - model : sequelize.models.Company, - as : 'company', - include : [{ - model : sequelize.models.BankHoliday, - as : 'bank_holidays', - }], - }], - }] // End of my_leaves include - },{ - model : sequelize.models.Department, - as : 'department', + { + model: sequelize.models.Department, + as: "department" + } + ] + }, + { + model: sequelize.models.Department, + as: "departments", + include: { + model: sequelize.models.User, + as: "boss" } - ], - },{ - model : sequelize.models.Department, - as : 'departments', - include : { - model : sequelize.models.User, - as : 'boss', } - } - ], - order : [ - [ - {model : sequelize.models.Department, as : 'departments'}, - sequelize.models.Department.default_order_field(), + ], + order: [ + [ + { model: sequelize.models.Department, as: "departments" }, + sequelize.models.Department.default_order_field() + ] ] - ], - }) - - // Make sure that company got only one user associated with for - // provided user_id - .then(function(company){ - - if (!company || company.users.length !== 1) { - throw new Error( - 'User '+current_user.id+' tried to edit user '+user_id - +' but they do not share a company' - ); - } + }) + + // Make sure that company got only one user associated with for + // provided user_id + .then(function(company) { + if (!company || company.users.length !== 1) { + throw new Error( + "User " + + current_user.id + + " tried to edit user " + + user_id + + " but they do not share a company" + ); + } - return Promise.resolve(company); - }); + return Promise.resolve(company); + }) + ); }; - this.get_company_for_add_user = function() { var model = sequelize.models; return this.getCompany({ - include : [ - {model : model.Department, as : 'departments'} - ], - order : [ + include: [{ model: model.Department, as: "departments" }], + order: [ [ - {model : model.Department, as : 'departments'}, - model.Department.default_order_field(), + { model: model.Department, as: "departments" }, + model.Department.default_order_field() ] - ], + ] }); }; - 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'] + 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"] ] }); }; - }; diff --git a/lib/model/team_view.js b/lib/model/team_view.js index c39fb89df..00eb9b390 100644 --- a/lib/model/team_view.js +++ b/lib/model/team_view.js @@ -1,12 +1,10 @@ +"use strict"; -'use strict'; - -const - moment = require('moment'), - Promise = require('bluebird'), - Joi = require('joi'), - Exception = require('../error'), - _ = require('underscore'); +const moment = require("moment"), + Promise = require("bluebird"), + Joi = require("joi"), + Exception = require("../error"), + _ = require("underscore"); function TeamView(args) { var me = this; @@ -24,25 +22,24 @@ function TeamView(args) { // Team view would represent. // this.start_date = args.start_date; - this.end_date = args.end_date; + this.end_date = args.end_date; if (args.start_date && args.end_date && args.base_date) { Exception.throw_user_error({ - user_error : 'Failed to calculate team view', - system_error : 'TeamView could not be instanciated with start_date, end_data and base_date all defined.' + user_error: "Failed to calculate team view", + system_error: + "TeamView could not be instanciated with start_date, end_data and base_date all defined." }); } } -TeamView.prototype.promise_team_view_details = function(args){ - +TeamView.prototype.promise_team_view_details = function(args) { // Handle case when no parameters were provided - if ( ! args ) { + if (!args) { args = {}; } - let - self = this, + let self = this, user = this.user, current_department_id = args.department_id, // optional parameter related_departments = [], @@ -51,36 +48,43 @@ TeamView.prototype.promise_team_view_details = function(args){ var promise_departments; - var normalise_departments_func = function(my_department, supervised_departments){ - + var normalise_departments_func = function( + my_department, + supervised_departments + ) { if (my_department) { // Get all related departments by combining supervised ones with // one current user belongs to supervised_departments.push(my_department); } - supervised_departments = _.uniq(supervised_departments, function(item){ return item.id }); + supervised_departments = _.uniq(supervised_departments, function(item) { + return item.id; + }); // Copy all available departments for current user into closured variable // to pass it into template - related_departments = _.sortBy(supervised_departments, 'name'); + related_departments = _.sortBy(supervised_departments, "name"); // Find out what particular department is active now if (current_department_id) { - current_department = _.findWhere(supervised_departments, { id : Number(current_department_id) }); + current_department = _.findWhere(supervised_departments, { + id: Number(current_department_id) + }); } - return Promise.resolve(current_department ? [current_department] : supervised_departments); - } + return Promise.resolve( + current_department ? [current_department] : supervised_departments + ); + }; if (user.is_admin() || user.company.share_all_absences) { - // For admin users or if current company allows all users to see everybody's // time offs promise all departments for current company - promise_departments = user.company.getDepartments() - .then(function(departments){ + promise_departments = user.company + .getDepartments() + .then(function(departments) { return normalise_departments_func(null, departments); }); - } else { // Promise departments either supervised by current user or one that she belongs to promise_departments = Promise.join( @@ -91,43 +95,45 @@ TeamView.prototype.promise_team_view_details = function(args){ } // Calculate users and leaves for every department - var promise_users_and_leaves = promise_departments - .map(department => self.start_date && self.end_date - ? department.promise_team_view_for_months_range( self.start_date, self.end_date ) - : department.promise_team_view_for_month( base_date ) - ); + var promise_users_and_leaves = promise_departments.map(department => + self.start_date && self.end_date + ? department.promise_team_view_for_months_range( + self.start_date, + self.end_date + ) + : department.promise_team_view_for_month(base_date) + ); return promise_users_and_leaves.then(users_and_leaves => { - users_and_leaves = _.sortBy( _.flatten(users_and_leaves), item => item.user.lastname + item.user.name ); return Promise.resolve({ - users_and_leaves : users_and_leaves, - related_departments : related_departments, - current_department : current_department, + users_and_leaves: users_and_leaves, + related_departments: related_departments, + current_department: current_department }); }); - }; // 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() - ) - }), - }); +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 @@ -135,84 +141,92 @@ const inject_statistics_args_schema = Joi.object() * * */ -TeamView.prototype.inject_statistics = function(args){ - +TeamView.prototype.inject_statistics = function(args) { // Validate parameters - let param_validation = Joi.validate(args, inject_statistics_args_schema, { allowUnknown : true }); + 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.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'); + throw new Error( + "Failed to validate parameters in TeamView.inject_statistics" + ); } - let - team_view_details = args.team_view_details, + 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; - - // Set statistics by leave type to zeros - let leave_type_stat = {}; - leave_types.forEach( lt => leave_type_stat[lt.id] = 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 => { - - if (day.is_leave_morning) { - - leave_type_stat[ day.morning_leave_type_id ] = leave_type_stat[ day.morning_leave_type_id ] + 0.5; - - if ( leave_types_map[ day.morning_leave_type_id ] && leave_types_map[ day.morning_leave_type_id ].use_allowance ) { - deducted_days = deducted_days + 0.5; - } + leave_types.forEach(lt => (leave_types_map[lt.id] = lt)); + + team_view_details.users_and_leaves.forEach(node => { + let deducted_days = 0; + + // Set statistics by leave type to zeros + let leave_type_stat = {}; + leave_types.forEach(lt => (leave_type_stat[lt.id] = 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 => { + if (day.is_leave_morning) { + leave_type_stat[day.morning_leave_type_id] = + leave_type_stat[day.morning_leave_type_id] + 0.5; + + if ( + leave_types_map[day.morning_leave_type_id] && + leave_types_map[day.morning_leave_type_id].use_allowance + ) { + deducted_days = deducted_days + 0.5; } + } - if (day.is_leave_afternoon) { - - if ( leave_types_map[ day.afternoon_leave_type_id ] && leave_types_map[ day.afternoon_leave_type_id ].use_allowance ) { - deducted_days = deducted_days + 0.5; - } - - leave_type_stat[ day.afternoon_leave_type_id ] = leave_type_stat[ day.afternoon_leave_type_id ] + 0.5; + if (day.is_leave_afternoon) { + if ( + leave_types_map[day.afternoon_leave_type_id] && + leave_types_map[day.afternoon_leave_type_id].use_allowance + ) { + deducted_days = deducted_days + 0.5; } - }); - - let statistics = { - deducted_days : deducted_days, - // Shows statistics by leave type - leave_type_break_down : { - // format for machine using - lite_version : leave_type_stat, - // format for rendering to end users - pretty_version : leave_types - // Sort by name - .sort((a,b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0) - .map(lt => ({ name : lt.name, stat : leave_type_stat[ lt.id ], id : lt.id })), + leave_type_stat[day.afternoon_leave_type_id] = + leave_type_stat[day.afternoon_leave_type_id] + 0.5; } - }; + }); - node.statistics = statistics; - }); + let statistics = { + deducted_days: deducted_days, + // Shows statistics by leave type + leave_type_break_down: { + // format for machine using + lite_version: leave_type_stat, + // format for rendering to end users + pretty_version: leave_types + // Sort by name + .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)) + .map(lt => ({ + name: lt.name, + stat: leave_type_stat[lt.id], + id: lt.id + })) + } + }; - return Promise.resolve( team_view_details ); + node.statistics = statistics; + }); + + return Promise.resolve(team_view_details); }; /* @@ -222,26 +236,22 @@ TeamView.prototype.inject_statistics = function(args){ * * */ -TeamView.prototype.restrainStatisticsForUser = function(args){ - +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 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); + 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; - } - }); + 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 ); + return Promise.resolve(team_view_details); }; module.exports = TeamView; diff --git a/lib/model/user_allowance.js b/lib/model/user_allowance.js index 584db63e9..df2959f50 100644 --- a/lib/model/user_allowance.js +++ b/lib/model/user_allowance.js @@ -1,4 +1,3 @@ - /* * This class represent Employee's allowance. * @@ -10,52 +9,48 @@ "use strict"; -const - moment = require('moment'), - Promise= require('bluebird'), - Joi = require('joi'); +const moment = require("moment"), + Promise = require("bluebird"), + Joi = require("joi"); /* * Section where we declare interfaces used in methods for this class. * */ -const - - schema_user = Joi - .object() - .required(), - - schema_year = Joi - .object() +const schema_user = Joi.object().required(), + schema_year = Joi.object() .type(moment) // Consider removing defaults - .default(() => moment.utc(), 'Default year is current one'), - - schema_now = Joi - .object() + .default(() => moment.utc(), "Default year is current one"), + schema_now = Joi.object() .type(moment) // Consider removing defaults // Note on this line: once it used to derive now from user's company // get_now() method, but Joi.js has high penalty on defaults which // use function with 'context' so I have removed it. // Yes it is less precise but much more faster code. - .default(() => moment.utc(), 'Default is UTC one not from company specific'), - - schema_promise_allowance = Joi.object().required().keys({ - year : schema_year, - user : schema_user, - now : schema_now, - }), - - scheme_constructor = Joi.object().required().keys({ - user : schema_user, - - number_of_days_taken_from_allowance : Joi.number().required(), - manual_adjustment : Joi.number().required(), - carry_over : Joi.number().required(), - nominal_allowance : Joi.number().required(), - now : schema_now, - }); + .default( + () => moment.utc(), + "Default is UTC one not from company specific" + ), + schema_promise_allowance = Joi.object() + .required() + .keys({ + year: schema_year, + user: schema_user, + now: schema_now + }), + scheme_constructor = Joi.object() + .required() + .keys({ + user: schema_user, + + number_of_days_taken_from_allowance: Joi.number().required(), + manual_adjustment: Joi.number().required(), + carry_over: Joi.number().required(), + nominal_allowance: Joi.number().required(), + now: schema_now + }); /* * Class definition. @@ -63,34 +58,35 @@ const * */ class UserAllowance { - constructor(args) { - // Validate provided parameters args = Joi.attempt( args, scheme_constructor, - 'Failed parameters validation for UserAllowance constructor' + "Failed parameters validation for UserAllowance constructor" ); const self = this; // Private properties (not to be accessed directly) - self._user = args.user; - self._number_of_days_taken_from_allowance = args.number_of_days_taken_from_allowance; - self._manual_adjustment = args.manual_adjustment; - self._carry_over = args.carry_over; - self._nominal_allowance = args.nominal_allowance; - self._now = args.now; + self._user = args.user; + self._number_of_days_taken_from_allowance = + args.number_of_days_taken_from_allowance; + self._manual_adjustment = args.manual_adjustment; + self._carry_over = args.carry_over; + self._nominal_allowance = args.nominal_allowance; + self._now = args.now; } get total_number_of_days_in_allowance() { const self = this; - return (self.nominal_allowance + + return ( + self.nominal_allowance + self.carry_over + self.manual_adjustment + - self.employement_range_adjustment); + self.employement_range_adjustment + ); } get number_of_days_taken_from_allowance() { @@ -115,21 +111,22 @@ class UserAllowance { // Check case when user started after "now", then even so she has // nominal allowance derived from general settings, she could not // use it as it is valid for time she was not here - if (self.user.start_date && + if ( + self.user.start_date && moment.utc(self.user.start_date).year() > self._now.year() ) { return 0; } return ( - self.total_number_of_days_in_allowance - - self.number_of_days_taken_from_allowance - + (self.is_accrued_allowance ? self.accrued_adjustment : 0) + self.total_number_of_days_in_allowance - + self.number_of_days_taken_from_allowance + + (self.is_accrued_allowance ? self.accrued_adjustment : 0) ); } get is_accrued_allowance() { - return !! this.user.department.is_accrued_allowance; + return !!this.user.department.is_accrued_allowance; } get user() { @@ -137,27 +134,34 @@ class UserAllowance { } get employement_range_adjustment() { - let - self = this, - now = self._now.clone(); + let self = this, + now = self._now.clone(); if ( - now.year() !== moment.utc(self.user.start_date).year() - && ( ! self.user.end_date || moment.utc(self.user.end_date).year() > now.year() ) - ){ + now.year() !== moment.utc(self.user.start_date).year() && + (!self.user.end_date || + moment.utc(self.user.end_date).year() > now.year()) + ) { return 0; } - let start_date = moment.utc(self.user.start_date).year() === now.year() - ? moment.utc(self.user.start_date) - : now.clone().startOf('year'), - end_date = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() - ? moment.utc(self.user.end_date) - : now.clone().endOf('year'); + let start_date = + moment.utc(self.user.start_date).year() === now.year() + ? moment.utc(self.user.start_date) + : now.clone().startOf("year"), + end_date = + self.user.end_date && + moment.utc(self.user.end_date).year() <= now.year() + ? moment.utc(self.user.end_date) + : now.clone().endOf("year"); - return -1*(self.nominal_allowance - Math.round( - self.nominal_allowance * end_date.diff(start_date, 'days') / 365 - )); + return ( + -1 * + (self.nominal_allowance - + Math.round( + (self.nominal_allowance * end_date.diff(start_date, "days")) / 365 + )) + ); } /* @@ -166,9 +170,8 @@ class UserAllowance { * * */ get accrued_adjustment() { - const - self = this, - now = self._now.clone(); + const self = this, + now = self._now.clone(); // Consider only following parts of allowance when calculating accrual // adjustment: @@ -178,65 +181,70 @@ class UserAllowance { // Other components do not make sense, e.g.: // * carried over part - it could be immediately used as employee // already worked on them last year - const allowance = self.nominal_allowance - + self.manual_adjustment - + self.employement_range_adjustment; + const allowance = + self.nominal_allowance + + self.manual_adjustment + + self.employement_range_adjustment; - const period_starts_at = moment.utc(self.user.start_date).year() === now.year() - ? moment.utc(self.user.start_date) - : now.clone().startOf('year'); + const period_starts_at = + moment.utc(self.user.start_date).year() === now.year() + ? moment.utc(self.user.start_date) + : now.clone().startOf("year"); - const period_ends_at = self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() - ? moment.utc(self.user.end_date) - : now.clone().endOf('year'); + const period_ends_at = + self.user.end_date && moment.utc(self.user.end_date).year() <= now.year() + ? moment.utc(self.user.end_date) + : now.clone().endOf("year"); - let days_in_period = period_ends_at.diff( period_starts_at, 'days' ); + let days_in_period = period_ends_at.diff(period_starts_at, "days"); - let delta = allowance * period_ends_at.diff( now, 'days' ) / days_in_period; + let delta = (allowance * period_ends_at.diff(now, "days")) / days_in_period; return -1 * (Math.round(delta * 2) / 2).toFixed(1); } - /* * The idea of this static method is to be constructor for UserAllowance class. * It takes parameters and perform all necessary (and costly) actions to fetch * all info required for allowance calculation for given user and year. * */ static promise_allowance(args) { - args = Joi.attempt( args, schema_promise_allowance, - 'Failed to validate parameters for promise_allowance' + "Failed to validate parameters for promise_allowance" ); - let - user = args.user, + let user = args.user, year = args.year, number_of_days_taken_from_allowance, manual_adjustment, carried_over_allowance; let flow = Promise.resolve(); - - if ( user.my_leaves === undefined ) { - flow = flow.then(() => user.reload_with_leave_details({year})); + + if (user.my_leaves === undefined) { + flow = flow.then(() => user.reload_with_leave_details({ year })); } // Fetch adjustment and Carry over allowance - flow = flow.then(() => user.promise_adjustment_and_carry_over_for_year(year)); + flow = flow.then(() => + user.promise_adjustment_and_carry_over_for_year(year) + ); flow = flow.then(adjustment_and_coa => { - manual_adjustment = adjustment_and_coa.adjustment; + manual_adjustment = adjustment_and_coa.adjustment; carried_over_allowance = adjustment_and_coa.carried_over_allowance; return Promise.resolve(); }); - flow = flow.then(() => Promise.resolve( - number_of_days_taken_from_allowance = user.calculate_number_of_days_taken_from_allowance({year : year.format('YYYY')}) - )); - + flow = flow.then(() => + Promise.resolve( + (number_of_days_taken_from_allowance = user.calculate_number_of_days_taken_from_allowance( + { year: year.format("YYYY") } + )) + ) + ); // Got all necessary data for UserAllowance object so build it! flow = flow.then(() => { @@ -244,12 +252,12 @@ class UserAllowance { user, manual_adjustment, number_of_days_taken_from_allowance, - carry_over: carried_over_allowance, - nominal_allowance: user.department.allowance, + carry_over: carried_over_allowance, + nominal_allowance: user.department.allowance }; - if ( year && year.year() !== moment.utc().year() ) { - args.now = year.startOf('year'); + if (year && year.year() !== moment.utc().year()) { + args.now = year.startOf("year"); } return new UserAllowance(args); diff --git a/lib/model/user_importer.js b/lib/model/user_importer.js index 78a24e618..2b8882bd5 100644 --- a/lib/model/user_importer.js +++ b/lib/model/user_importer.js @@ -1,38 +1,43 @@ - "use strict"; -const - Joi = require('joi'), - uuid = require('node-uuid'), - Promise = require('bluebird'), - _ = require('underscore'), - Exception = require('../error'), - Models = require('./db'); - -const add_user_interface_schema = Joi.object().required().keys({ - email : Joi.string().email(), - lastname : Joi.string(), - name : Joi.string(), - company_id : Joi.number().integer().positive(), - department_id : Joi.number().integer().positive(), - - start_date : Joi.string().optional(), - end_date : Joi.string().default(null).allow(null), - admin : Joi.boolean().default(false), - auto_approve : Joi.boolean().default(false), - password : Joi.string().default(() => uuid.v4(), 'Populate default password'), +const Joi = require("joi"), + uuid = require("node-uuid"), + Promise = require("bluebird"), + _ = require("underscore"), + Exception = require("../error"), + Models = require("./db"); + +const add_user_interface_schema = Joi.object() + .required() + .keys({ + email: Joi.string().email(), + lastname: Joi.string(), + name: Joi.string(), + company_id: Joi.number() + .integer() + .positive(), + department_id: Joi.number() + .integer() + .positive(), + + start_date: Joi.string().optional(), + end_date: Joi.string() + .default(null) + .allow(null), + admin: Joi.boolean().default(false), + auto_approve: Joi.boolean().default(false), + password: Joi.string().default(() => uuid.v4(), "Populate default password") }); - function add_user(args) { let validated_args = Joi.validate(args, add_user_interface_schema); if (validated_args.error) { - console.log('An error occured when validatin parameters for add_user: '); + console.log("An error occured when validatin parameters for add_user: "); console.dir(validated_args); Exception.throw_user_error({ - system_error : 'Failed to add new due to validation errors', - user_error : 'Failed to add user', + system_error: "Failed to add new due to validation errors", + user_error: "Failed to add user" }); } @@ -41,16 +46,16 @@ function add_user(args) { let attributes = {}; - attributes.email = args.email.toLowerCase(); - attributes.lastname = args.lastname; - attributes.name = args.name; - attributes.companyId = args.company_id; + attributes.email = args.email.toLowerCase(); + attributes.lastname = args.lastname; + attributes.name = args.name; + attributes.companyId = args.company_id; attributes.DepartmentId = args.department_id; - attributes.password = Models.User.hashify_password(args.password); - attributes.admin = args.admin; + attributes.password = Models.User.hashify_password(args.password); + attributes.admin = args.admin; attributes.auto_approve = args.auto_approve; - attributes.end_date = args.end_date; + attributes.end_date = args.end_date; // Pass start date inky if it is set, otherwise rely on database to use // default value @@ -58,124 +63,147 @@ function add_user(args) { attributes.start_date = args.start_date; } - return Promise.resolve() - - // Ensure given department ID is owned by given company ID - .then(() => Models.Department - .findOne({ - where : { id : args.department_id, companyId : args.company_id }, - }) - .then( department => { - if ( ! department ) { - Exception.throw_user_error({ - system_error : 'Mismatch in department/company IDs when creating new user ' - + args.department_id + '/' + args.company_id, - user_error : 'Used wrong department', - }); - } - return Promise.resolve(); - }) - ) - - // Ensure provided email is free to use - .then(() => validate_email_to_be_free({ email : args.email })) - - // Create new user record - .then(() => Models.User.create(attributes)); + return ( + Promise.resolve() + + // Ensure given department ID is owned by given company ID + .then(() => + Models.Department.findOne({ + where: { id: args.department_id, companyId: args.company_id } + }).then(department => { + if (!department) { + Exception.throw_user_error({ + system_error: + "Mismatch in department/company IDs when creating new user " + + args.department_id + + "/" + + args.company_id, + user_error: "Used wrong department" + }); + } + return Promise.resolve(); + }) + ) + + // Ensure provided email is free to use + .then(() => validate_email_to_be_free({ email: args.email })) + + // Create new user record + .then(() => Models.User.create(attributes)) + ); } function add_users_in_bulk(args) { let bulk_header = args.bulk_header, - bulk_data = args.bulk_data, - company_id = args.to_company_id; + bulk_data = args.bulk_data, + company_id = args.to_company_id; let company, - email_vector_index = 0, - lastname_vector_index = 1, - name_vector_index = 2, + email_vector_index = 0, + lastname_vector_index = 1, + name_vector_index = 2, department_vector_index = 3; - return Models.Company.scope('with_simple_departments').findOne({ - where : { id : company_id }, - }) - - - // Validate department names and replace names with IDs - .then(cmp => { - company = cmp; - let dep_name_to_id = _.object( - company.departments.map(dep => [dep.name, dep.id]) - ); - - let with_invalid_departments = _.filter( - bulk_data, vector => ! dep_name_to_id[ vector[ department_vector_index] ] - ); - - if (with_invalid_departments.length > 0) { - let unknown_departments = with_invalid_departments - .map(vector => '"'+vector[department_vector_index]+'"') - .join(', '); - - Exception.throw_user_error({ - user_error : 'Following departments could not be found in ' - + company.name + ' account: ' + unknown_departments, - system_error : 'While importing users to company ' - + company.id + ' there were unknown departments ' - + unknown_departments, - }); - } + return ( + Models.Company.scope("with_simple_departments") + .findOne({ + where: { id: company_id } + }) - bulk_data.forEach( - vector => vector[ department_vector_index ] = dep_name_to_id[ vector[ department_vector_index ] ] - ); + // Validate department names and replace names with IDs + .then(cmp => { + company = cmp; + let dep_name_to_id = _.object( + company.departments.map(dep => [dep.name, dep.id]) + ); - return Promise.resolve(); - }) - - // Add users - .then(() => { - return Promise.map(bulk_data, vector => { - let email = vector[ email_vector_index ]; - - return Promise.resolve() - .then(() => add_user({ - email : email, - lastname : vector[ lastname_vector_index ], - name : vector[ name_vector_index ], - department_id : vector[ department_vector_index ], - company_id : company_id, - })) - .catch(error => { - return Promise.resolve({ - error : error, - email : email, + let with_invalid_departments = _.filter( + bulk_data, + vector => !dep_name_to_id[vector[department_vector_index]] + ); + + if (with_invalid_departments.length > 0) { + let unknown_departments = with_invalid_departments + .map(vector => '"' + vector[department_vector_index] + '"') + .join(", "); + + Exception.throw_user_error({ + user_error: + "Following departments could not be found in " + + company.name + + " account: " + + unknown_departments, + system_error: + "While importing users to company " + + company.id + + " there were unknown departments " + + unknown_departments }); - }); - }, { - concurrency : 2, - }) - }) - - // Sort out successfully creted users and errors - .then(users_or_errors => { - let result = { - users : [], - errors : [], - }; - - users_or_errors.forEach( item => { - item.hasOwnProperty('error') - ? result.errors.push( item ) - : result.users.push( item ) - }); + } - return Promise.resolve(result); - }); + bulk_data.forEach( + vector => + (vector[department_vector_index] = + dep_name_to_id[vector[department_vector_index]]) + ); + + return Promise.resolve(); + }) + + // Add users + .then(() => { + return Promise.map( + bulk_data, + vector => { + let email = vector[email_vector_index]; + + return Promise.resolve() + .then(() => + add_user({ + email: email, + lastname: vector[lastname_vector_index], + name: vector[name_vector_index], + department_id: vector[department_vector_index], + company_id: company_id + }) + ) + .catch(error => { + return Promise.resolve({ + error: error, + email: email + }); + }); + }, + { + concurrency: 2 + } + ); + }) + // Sort out successfully creted users and errors + .then(users_or_errors => { + let result = { + users: [], + errors: [] + }; + + users_or_errors.forEach(item => { + item.hasOwnProperty("error") + ? result.errors.push(item) + : result.users.push(item); + }); + + return Promise.resolve(result); + }) + ); } -const validate_email_to_be_free_schema = Joi.object().required().keys({ - email : Joi.string().email().required(), +const validate_email_to_be_free_schema = Joi.object() + .required() + .keys({ + email: Joi.string() + .email() + .required() }); function validate_email_to_be_free(args) { @@ -183,29 +211,22 @@ function validate_email_to_be_free(args) { if (validate_args.error) { Exception.throw_user_error({ - system_error : 'validate_email_to_be_free failed arguments validation', - user_error : 'Failed to validate email', + system_error: "validate_email_to_be_free failed arguments validation", + user_error: "Failed to validate email" }); } - return Models - .User - .find_by_email(args.email) - .then(user => { - - if (user) { - Exception.throw_user_error( - 'Email is already in use' - ); - } + return Models.User.find_by_email(args.email).then(user => { + if (user) { + Exception.throw_user_error("Email is already in use"); + } - return Promise.resolve(); + return Promise.resolve(); }); } module.exports = { - add_user : add_user, - add_users_in_bulk : add_users_in_bulk, - validate_email_to_be_free : validate_email_to_be_free, + add_user: add_user, + add_users_in_bulk: add_users_in_bulk, + validate_email_to_be_free: validate_email_to_be_free }; - diff --git a/lib/passport/getCompanyAdminByToken.js b/lib/passport/getCompanyAdminByToken.js index f8382ad0e..40380bdee 100644 --- a/lib/passport/getCompanyAdminByToken.js +++ b/lib/passport/getCompanyAdminByToken.js @@ -1,35 +1,32 @@ +"use strict"; -'use strict'; +const { throwUserError } = require("../error"), + Promise = require("bluebird"); -const - { throwUserError } = require('../error'), - Promise = require('bluebird'); - -module.exports = ({token, model}) => { - - if ( ! token ) { +module.exports = ({ token, model }) => { + if (!token) { throwUserError({ - system_error : "Provided token has FALSY value", - user_error : "Wrong access token", + system_error: "Provided token has FALSY value", + user_error: "Wrong access token" }); } let action = model.Company.getCompanyByApiToken({ token }); action = action.then(company => { - if ( ! company ) { + if (!company) { throwUserError({ system_error: `Cannot find company record for provided token ${token}`, - user_error: 'Wrong access token', + user_error: "Wrong access token" }); } - const [adminUser] = company.get('users').filter(u => u.is_admin()); + const [adminUser] = company.get("users").filter(u => u.is_admin()); - if ( ! adminUser) { + if (!adminUser) { throwUserError({ - system_error: `Failed to find admin users for company ${ company.id }`, - user_error: 'Wrong access token', + system_error: `Failed to find admin users for company ${company.id}`, + user_error: "Wrong access token" }); } diff --git a/lib/passport/index.js b/lib/passport/index.js index d6b60ffdb..84ef8762a 100644 --- a/lib/passport/index.js +++ b/lib/passport/index.js @@ -1,4 +1,3 @@ - /* * Module to encapsulate logic for passport instantiation used for * authentication. @@ -7,27 +6,27 @@ * * */ -'use strict'; +"use strict"; -const - model = require('../model/db'), - passport = require('passport'), - Promise = require('bluebird'), - LocalStrategy = require('passport-local').Strategy, - BearerStrategy= require('passport-http-bearer').Strategy, - getCompanyAdminByToken = require('./getCompanyAdminByToken'); +const model = require("../model/db"), + passport = require("passport"), + Promise = require("bluebird"), + LocalStrategy = require("passport-local").Strategy, + BearerStrategy = require("passport-http-bearer").Strategy, + getCompanyAdminByToken = require("./getCompanyAdminByToken"); // In case if user is successfully logged in, make sure it is // activated function prepare_user_for_session(args) { var user = args.user, - done = args.done; + done = args.done; - user.maybe_activate() - .then(function(user){ + user + .maybe_activate() + .then(function(user) { return user.reload_with_session_details(); }) - .then(function(){ + .then(function() { done(null, user); }); } @@ -37,70 +36,68 @@ function prepare_user_for_session(args) { // The method is callback based and the result is conveyed // via provided callback function "done" // -function authenticate_user(args){ - +function authenticate_user(args) { var user = args.user, - password = args.password, - done = args.done, - email = user.email; + password = args.password, + done = args.done, + email = user.email; // In case of LDAP authentification connect the LDAP server - if ( user.company.ldap_auth_enabled ) { - -// email = 'euler@ldap.forumsys.com'; password = 'password'; // TODO remove - Promise.resolve( user.company.get_ldap_server() ) - .then(function(ldap_server){ - - ldap_server.authenticate(email, password, function (err, u) { - if (err) { - console.log("LDAP auth error: %s", err); - return done(null, false); - } - prepare_user_for_session({ - user : user, - done : done, + if (user.company.ldap_auth_enabled) { + // email = 'euler@ldap.forumsys.com'; password = 'password'; // TODO remove + Promise.resolve(user.company.get_ldap_server()) + .then(function(ldap_server) { + ldap_server.authenticate(email, password, function(err, u) { + if (err) { + console.log("LDAP auth error: %s", err); + return done(null, false); + } + prepare_user_for_session({ + user: user, + done: done + }); }); - }); - ldap_server.close(); - }) - .catch(function(error){ - console.error('Failed while trying to deal with LDAP server with error: %s', error); + ldap_server.close(); + }) + .catch(function(error) { + console.error( + "Failed while trying to deal with LDAP server with error: %s", + error + ); - done(null, false); - }); + done(null, false); + }); - // Provided password is correct + // Provided password is correct } else if (user.is_my_password(password)) { - prepare_user_for_session({ - user : user, - done : done, + user: user, + done: done }); - // User exists but provided password does not match + // User exists but provided password does not match } else { - console.error( - 'When login user entered existsing email ' +email+ - ' but incorrect password' - ); - done(null, false); + console.error( + "When login user entered existsing email " + + email + + " but incorrect password" + ); + done(null, false); } } function strategy_handler(email, password, done) { - // Normalize email to be in lower case email = email.toLowerCase(); - model.User - .find_by_email( email ) - .then(function(user){ - + model.User.find_by_email(email) + .then(function(user) { // Case when no user for provided email - if ( ! user ) { + if (!user) { console.error( - 'At login: failed to find user with provided email %s', email + "At login: failed to find user with provided email %s", + email ); // We need to abort the execution of current callback function @@ -109,44 +106,44 @@ function strategy_handler(email, password, done) { } // Athenticate user by provided password - user.getCompany() - .then(function(company){ - - // We need to have company for user fetchef dow the line so query it now - user.company = company; - - authenticate_user({ - user : user, - password : password, - done : done, - }); + user.getCompany().then(function(company) { + // We need to have company for user fetchef dow the line so query it now + user.company = company; + + authenticate_user({ + user: user, + password: password, + done: done }); + }); }) // there was unknown error when trying to retrieve user object - .catch(function(error){ + .catch(function(error) { console.error( - 'At login: unknown error when trying to login in as %s. Error: %s', - email, error + "At login: unknown error when trying to login in as %s. Error: %s", + email, + error ); done(null, false); }); } -module.exports = function(){ - - passport.use(new LocalStrategy( strategy_handler )); - - passport.use(new BearerStrategy((token, done) => { - getCompanyAdminByToken({ token, model }) - .then(user => user.reload_with_session_details()) - .then(user => done(null, user)) - .catch(error => { - console.log(`Failed to authenticate TOKEN. Reason: '${error}'`); - done(null, false); - }); - })); +module.exports = function() { + passport.use(new LocalStrategy(strategy_handler)); + + passport.use( + new BearerStrategy((token, done) => { + getCompanyAdminByToken({ token, model }) + .then(user => user.reload_with_session_details()) + .then(user => done(null, user)) + .catch(error => { + console.log(`Failed to authenticate TOKEN. Reason: '${error}'`); + done(null, false); + }); + }) + ); // Define how user object is going to be flattered into session // after request is processed. @@ -159,18 +156,20 @@ module.exports = function(){ // in session storage. // Fetch user data from DB based on ID. passport.deserializeUser(function(id, done) { + model.User.find({ where: { id: id } }) + .then(function(user) { + return user.reload_with_session_details(); + }) + .then(function(user) { + done(null, user); + }) + .catch(function(error) { + console.error( + "Failed to fetch session user " + id + " with error: " + error + ); - model.User.find({where : {id : id}}).then(function(user){ - return user.reload_with_session_details(); - }) - .then(function(user){ - done(null, user); - }) - .catch(function(error){ - console.error('Failed to fetch session user '+id+' with error: '+error); - - done(null, false, { message : 'Failed to fetch session user' }); - }); + done(null, false, { message: "Failed to fetch session user" }); + }); }); return passport; diff --git a/lib/route/audit.js b/lib/route/audit.js index 4591ecd27..11cb72cb9 100644 --- a/lib/route/audit.js +++ b/lib/route/audit.js @@ -1,107 +1,102 @@ - "usse strict"; -var express = require('express'), -Bluebird = require('bluebird'), -validator = require('validator'), -_ = require('underscore'), -moment = require('moment'); -router = express.Router(), -Pager = require('./utils/pager')(); +var express = require("express"), + Bluebird = require("bluebird"), + validator = require("validator"), + _ = require("underscore"), + moment = require("moment"); +(router = express.Router()), (Pager = require("./utils/pager")()); // Make sure that current user is authorized to deal with settings -router.all(/.*/, require('../middleware/ensure_user_is_admin')); - -router.get(/email/, function(req, res){ - - var user_id = validator.toInt(req.param('user_id')), - start_date = validator.trim(req.param('start_date')), - end_date = validator.trim(req.param('end_date')), - page = validator.toInt(req.param('page')) || 1, - model = req.app.get('db_model'), - filter = { - company_id: req.user.companyId, - }; +router.all(/.*/, require("../middleware/ensure_user_is_admin")); + +router.get(/email/, function(req, res) { + var user_id = validator.toInt(req.param("user_id")), + start_date = validator.trim(req.param("start_date")), + end_date = validator.trim(req.param("end_date")), + page = validator.toInt(req.param("page")) || 1, + model = req.app.get("db_model"), + filter = { + company_id: req.user.companyId + }; var items_per_page = Pager.items_per_page; - if (start_date) start_date = req.user.company.normalise_date( start_date ); + if (start_date) start_date = req.user.company.normalise_date(start_date); // if there is a valid start date provided pass it to the filter - if ( validator.isDate(start_date) ) { - if (! filter.hasOwnProperty('created_at')) filter.created_at = {}; - filter.created_at['$gte'] = start_date; + if (validator.isDate(start_date)) { + if (!filter.hasOwnProperty("created_at")) filter.created_at = {}; + filter.created_at["$gte"] = start_date; } // ... same for end date - if (end_date) end_date = req.user.company.normalise_date( end_date ); + if (end_date) end_date = req.user.company.normalise_date(end_date); - if ( validator.isDate(end_date) ) { - if (! filter.hasOwnProperty('created_at')) filter.created_at = {}; - filter.created_at['$lte'] = end_date; + if (validator.isDate(end_date)) { + if (!filter.hasOwnProperty("created_at")) filter.created_at = {}; + filter.created_at["$lte"] = end_date; } - if ( validator.isInt(user_id) ) { + if (validator.isInt(user_id)) { filter.user_id = user_id; } var promise_emails = model.EmailAudit.findAndCountAll({ - where : filter, - - limit : items_per_page, - offset : items_per_page * (page - 1), - order : [ - [ 'id', 'DESC'] - ], - - include : [{ - model : model.User, - as : 'user', - }] + where: filter, + + limit: items_per_page, + offset: items_per_page * (page - 1), + order: [["id", "DESC"]], + + include: [ + { + model: model.User, + as: "user" + } + ] }); var promise_all_users = model.User.findAll({ - where : { - companyId : req.user.companyId, + where: { + companyId: req.user.companyId }, - order : [ - ['lastname'] - ], + order: [["lastname"]] }); - Bluebird.join( - promise_emails, - promise_all_users, - function(email_result, all_users){ - - var filter = { - user_id : user_id, - }; - - if (start_date) { - filter.start_date = moment.utc(start_date).format(req.user.company.get_default_date_format()); - } - - if (end_date) { - filter.end_date = moment.utc(end_date).format(req.user.company.get_default_date_format()); - } - - res.render('audit/emails', { - audit_emails : email_result.rows, - all_users : all_users, - filter : filter, - show_reset_button : _.some([ user_id, start_date, end_date ]), - pager : Pager.get_pager_object({ - filter : filter, - total_items_count : email_result.count, - current_page : page, - }), - }); + Bluebird.join(promise_emails, promise_all_users, function( + email_result, + all_users + ) { + var filter = { + user_id: user_id + }; + + if (start_date) { + filter.start_date = moment + .utc(start_date) + .format(req.user.company.get_default_date_format()); + } + if (end_date) { + filter.end_date = moment + .utc(end_date) + .format(req.user.company.get_default_date_format()); } - ); -}); + res.render("audit/emails", { + audit_emails: email_result.rows, + all_users: all_users, + filter: filter, + show_reset_button: _.some([user_id, start_date, end_date]), + pager: Pager.get_pager_object({ + filter: filter, + total_items_count: email_result.count, + current_page: page + }) + }); + }); +}); module.exports = router; diff --git a/lib/route/calendar.js b/lib/route/calendar.js index 0b83087c6..edf62fdab 100644 --- a/lib/route/calendar.js +++ b/lib/route/calendar.js @@ -1,246 +1,250 @@ - "use strict"; -var express = require('express'), - router = express.Router(), - Promise = require('bluebird'), - moment = require('moment'), - _ = require('underscore'), - validator = require('validator'), - get_and_validate_leave_params = require('./validator/leave_request'), - TeamView = require('../model/team_view'), - EmailTransport = require('../email'), - createNewLeave = require('../model/leave').createNewLeave; - -router.post('/bookleave/', function(req, res){ - var model = req.app.get('db_model'); - - Promise.join ( - 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) => { - - // 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]; - - if (!employee) { - req.session.flash_error('Incorrect employee'); - throw new Error( 'Got validation errors' ); - } - - if (!leave_type) { - req.session.flash_error('Incorrect leave type'); - throw new Error( 'Got validation errors' ); - } - - if (company.is_mode_readonly_holidays() ){ - req.session.flash_error( - "Company account is locked and new Timeoff " - + "requests could not be added. Please contact administration." - ); - throw new Error('Company is in "Read-only holidays" mode'); - } - - return createNewLeave({ - for_employee : employee, - of_type : leave_type, - with_parameters : valide_attributes, - }); +var express = require("express"), + router = express.Router(), + Promise = require("bluebird"), + moment = require("moment"), + _ = require("underscore"), + validator = require("validator"), + get_and_validate_leave_params = require("./validator/leave_request"), + TeamView = require("../model/team_view"), + EmailTransport = require("../email"), + createNewLeave = require("../model/leave").createNewLeave; + +router.post("/bookleave/", function(req, res) { + var model = req.app.get("db_model"); + + Promise.join( + 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) => { + // 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]; + + if (!employee) { + req.session.flash_error("Incorrect employee"); + throw new Error("Got validation errors"); } - ) - .then(leave => leave.reloadWithAssociates()) - .then(leave => (new EmailTransport()).promise_leave_request_emails({leave})) - .then(function(){ - - req.session.flash_message('New leave request was added'); - return res.redirect_with_session( - req.param('redirect_back_to') - ? req.param('redirect_back_to') - : '../' + + if (!leave_type) { + req.session.flash_error("Incorrect leave type"); + throw new Error("Got validation errors"); + } + + if (company.is_mode_readonly_holidays()) { + req.session.flash_error( + "Company account is locked and new Timeoff " + + "requests could not be added. Please contact administration." ); + throw new Error('Company is in "Read-only holidays" mode'); + } + + return createNewLeave({ + for_employee: employee, + of_type: leave_type, + with_parameters: valide_attributes + }); + } + ) + .then(leave => leave.reloadWithAssociates()) + .then(leave => new EmailTransport().promise_leave_request_emails({ leave })) + .then(function() { + req.session.flash_message("New leave request was added"); + return res.redirect_with_session( + req.param("redirect_back_to") ? req.param("redirect_back_to") : "../" + ); }) - .catch(function(error){ - console.error( - 'An error occured when user '+req.user.id+ - ' try to create a leave request: '+error+ - ' at: ' + error.stack - ); - req.session.flash_error('Failed to create a leave request'); - if (error.hasOwnProperty('user_message')) { - req.session.flash_error(error.user_message); - } - return res.redirect_with_session( - req.param('redirect_back_to') - ? req.param('redirect_back_to') - : '../' - ); + .catch(function(error) { + console.error( + "An error occured when user " + + req.user.id + + " try to create a leave request: " + + error + + " at: " + + error.stack + ); + req.session.flash_error("Failed to create a leave request"); + if (error.hasOwnProperty("user_message")) { + req.session.flash_error(error.user_message); + } + return res.redirect_with_session( + req.param("redirect_back_to") ? req.param("redirect_back_to") : "../" + ); }); - }); -router.get('/', function(req, res) { - - var current_year = validator.isNumeric(req.param('year')) - ? moment.utc(req.param('year'), 'YYYY') +router.get("/", function(req, res) { + var current_year = validator.isNumeric(req.param("year")) + ? moment.utc(req.param("year"), "YYYY") : req.user.company.get_today(); - var show_full_year = validator.toBoolean(req.param('show_full_year')); + var show_full_year = validator.toBoolean(req.param("show_full_year")); Promise.join( req.user.promise_calendar({ - year : current_year.clone(), - show_full_year : show_full_year, + year: current_year.clone(), + show_full_year: show_full_year }), req.user.get_company_with_all_leave_types(), - req.user.reload_with_leave_details({ year : current_year }), + req.user.reload_with_leave_details({ year: current_year }), req.user.promise_supervisors(), - req.user.promise_allowance({ year : current_year }), - function(calendar, company, user, supervisors, user_allowance){ - let - full_leave_type_statistics = user.get_leave_statistics_by_types(); - - res.render('calendar', { - calendar : _.map(calendar, function(c){return c.as_for_template()}), - company : company, - title : 'Calendar', - current_user : user, - supervisors : supervisors, - previous_year : moment.utc(current_year).add(-1,'year').format('YYYY'), - current_year : current_year.format('YYYY'), - next_year : moment.utc(current_year).add(1,'year').format('YYYY'), - show_full_year : show_full_year, - leave_type_statistics : _.filter(full_leave_type_statistics, st => st.days_taken > 0), + req.user.promise_allowance({ year: current_year }), + function(calendar, company, user, supervisors, user_allowance) { + let full_leave_type_statistics = user.get_leave_statistics_by_types(); + + res.render("calendar", { + calendar: _.map(calendar, function(c) { + return c.as_for_template(); + }), + company: company, + title: "Calendar", + current_user: user, + supervisors: supervisors, + previous_year: moment + .utc(current_year) + .add(-1, "year") + .format("YYYY"), + current_year: current_year.format("YYYY"), + next_year: moment + .utc(current_year) + .add(1, "year") + .format("YYYY"), + show_full_year: show_full_year, + leave_type_statistics: _.filter( + full_leave_type_statistics, + st => st.days_taken > 0 + ), // User allowance object is simple object with attributes only - user_allowance : user_allowance, + user_allowance: user_allowance }); } ); - }); -router.get('/teamview/', function(req, res){ - - var base_date = validator.isDate(req.param('date')) - ? moment.utc(req.param('date')) +router.get("/teamview/", function(req, res) { + var base_date = validator.isDate(req.param("date")) + ? moment.utc(req.param("date")) : req.user.company.get_today(); var team_view = new TeamView({ - base_date : base_date, - user : req.user, + base_date: base_date, + user: req.user }); - var current_deparment_id = validator.isNumeric(req.param('department')) - ? req.param('department') + var current_deparment_id = validator.isNumeric(req.param("department")) + ? req.param("department") : null; Promise.join( team_view.promise_team_view_details({ - department_id : current_deparment_id, + department_id: current_deparment_id }), req.user.get_company_with_all_leave_types(), (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, + 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.utc(base_date).add(-1,'month'), - next_date : moment.utc(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, + .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.utc(base_date).add(-1, "month"), + next_date: moment.utc(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('/'); - }); - + } + ).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("/"); + }); }); -router.get('/feeds/', function(req, res){ - req.user - .getFeeds() - .then(function(feeds){ - - return Promise.join( - promise_feed_of_type({user : req.user, feeds: feeds, type : 'calendar'}), - promise_feed_of_type({user : req.user, feeds: feeds, type : 'teamview'}), - promise_feed_of_type({user : req.user, feeds: feeds, type : 'company'}), - function(calendar_feed, team_view_feed, company_feed){ - res.render('feeds_list', { - title : 'My feeds', - calendar_feed : calendar_feed, - team_view_feed: team_view_feed, - current_host : req.get('host'), - }); - }); - - }); +router.get("/feeds/", function(req, res) { + req.user.getFeeds().then(function(feeds) { + return Promise.join( + promise_feed_of_type({ user: req.user, feeds: feeds, type: "calendar" }), + promise_feed_of_type({ user: req.user, feeds: feeds, type: "teamview" }), + promise_feed_of_type({ user: req.user, feeds: feeds, type: "company" }), + function(calendar_feed, team_view_feed, company_feed) { + res.render("feeds_list", { + title: "My feeds", + calendar_feed: calendar_feed, + team_view_feed: team_view_feed, + current_host: req.get("host") + }); + } + ); + }); }); -router.post('/feeds/regenerate/', function(req, res){ - var model = req.app.get('db_model'); +router.post("/feeds/regenerate/", function(req, res) { + var model = req.app.get("db_model"); req.user .getFeeds() - .then(function(feeds){ - var the_feed = _.findWhere(feeds, { feed_token : req.param('token') }); + .then(function(feeds) { + var the_feed = _.findWhere(feeds, { feed_token: req.param("token") }); if (the_feed) { - return model.UserFeed.promise_new_feed({ - user : req.user, - type : the_feed.type, + user: req.user, + type: the_feed.type }); } return Promise.resolve(); }) - .then(function(){ - req.session.flash_message('Feed was regenerated'); - return res.redirect_with_session('/calendar/feeds/'); + .then(function() { + req.session.flash_message("Feed was regenerated"); + return res.redirect_with_session("/calendar/feeds/"); }); }); // Fetch or create new feed feed provided types function promise_feed_of_type(args) { var type = args.type, - user = args.user, - feeds= args.feeds, - feed = _.findWhere(feeds, { type : type }), - feed_promise; + user = args.user, + feeds = args.feeds, + feed = _.findWhere(feeds, { type: type }), + feed_promise; - if (! feed) { + if (!feed) { feed_promise = user.sequelize.models.UserFeed.promise_new_feed({ - user : user, - type : type, + user: user, + type: type }); } else { - feed_promise = Promise.resolve( feed ); + feed_promise = Promise.resolve(feed); } return feed_promise; -}; +} module.exports = router; diff --git a/lib/route/dashboard.js b/lib/route/dashboard.js index 20ae697a8..462c8f71b 100644 --- a/lib/route/dashboard.js +++ b/lib/route/dashboard.js @@ -4,38 +4,34 @@ "use strict"; -var express = require('express'); -var router = express.Router(); +var express = require("express"); +var router = express.Router(); -router.get('/', function(req, res) { +router.get("/", function(req, res) { + var user = req.user; - var user = req.user; + req.session.keep_old(); - req.session.keep_old(); + // if no user available in session show main public + if (!user) { + return res.redirect_with_session("./login/"); + } - // if no user available in session show main public - if (!user) { - return res.redirect_with_session('./login/'); - } - - return res.redirect_with_session('./calendar/'); + return res.redirect_with_session("./calendar/"); }); // Make sure that all fallowing handlers Dashboard // require authenticated users -router.all(/.*/, function (req, res, next) { - - if ( !req.user ) { - return res.redirect_with_session(303, '/'); - } +router.all(/.*/, function(req, res, next) { + if (!req.user) { + return res.redirect_with_session(303, "/"); + } - next(); + next(); }); -router.get('/foo/', function(req, res) { - - res.render('dashboard', { title: 'FOO' }); +router.get("/foo/", function(req, res) { + res.render("dashboard", { title: "FOO" }); }); - module.exports = router; diff --git a/lib/route/departments.js b/lib/route/departments.js index 546493fcd..b4735f405 100644 --- a/lib/route/departments.js +++ b/lib/route/departments.js @@ -1,24 +1,22 @@ - "use strict"; -var express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - config = require('../config'), - _ = require('underscore'); +var express = require("express"), + router = express.Router(), + validator = require("validator"), + Promise = require("bluebird"), + moment = require("moment"), + config = require("../config"), + _ = require("underscore"); // Make sure that current user is authorized to deal with settings -router.all(/.*/, require('../middleware/ensure_user_is_admin')); +router.all(/.*/, require("../middleware/ensure_user_is_admin")); function generate_all_department_allowances() { - - var allowance_options = [{ value : 0, caption : 'None'}], + var allowance_options = [{ value: 0, caption: "None" }], allowance = 0.5; while (allowance <= 50) { - allowance_options.push({ value : allowance, caption : allowance }); + allowance_options.push({ value: allowance, caption: allowance }); allowance += 0.5; } @@ -26,23 +24,32 @@ function generate_all_department_allowances() { } function get_and_validate_department(args) { - var req = args.req, - index = args.suffix, - company = args.company, - // If no_suffix is set then parameter names are considered without "indexes" - no_suffix = args.no_suffix, - department_name = args.department_name; + var req = args.req, + index = args.suffix, + company = args.company, + // If no_suffix is set then parameter names are considered without "indexes" + no_suffix = args.no_suffix, + department_name = args.department_name; // Get user parameters - let - name = validator.trim(req.param(no_suffix ? 'name' : 'name__'+index)), - allowance = validator.trim(req.param(no_suffix ? 'allowance' : 'allowance__'+index)), - boss_id = validator.trim(req.param(no_suffix ? 'boss_id' : 'boss_id__'+index)), + let name = validator.trim(req.param(no_suffix ? "name" : "name__" + index)), + allowance = validator.trim( + req.param(no_suffix ? "allowance" : "allowance__" + index) + ), + boss_id = validator.trim( + req.param(no_suffix ? "boss_id" : "boss_id__" + index) + ), include_public_holidays = validator.toBoolean( - req.param(no_suffix ? 'include_public_holidays' : 'include_public_holidays__'+index) + req.param( + no_suffix + ? "include_public_holidays" + : "include_public_holidays__" + index + ) ), is_accrued_allowance = validator.toBoolean( - req.param(no_suffix ? 'is_accrued_allowance' : 'is_accrued_allowance__'+index) + req.param( + no_suffix ? "is_accrued_allowance" : "is_accrued_allowance__" + index + ) ); // Validate provided parameters @@ -50,346 +57,371 @@ function get_and_validate_department(args) { // New allowance should be from range of (0;50] if (!validator.isFloat(allowance)) { req.session.flash_error( - 'New allowance for '+department_name+' should be numeric' + "New allowance for " + department_name + " should be numeric" ); - } else if (!((0 <= allowance) && (allowance <= 50))) { + } else if (!(0 <= allowance && allowance <= 50)) { req.session.flash_error( - 'New allowance for '+department_name+' should be between 0.5 and 50 days' + "New allowance for " + + department_name + + " should be between 0.5 and 50 days" ); } // New manager ID should be numeric and from within // current company - if (!validator.isNumeric( boss_id ) ) { + if (!validator.isNumeric(boss_id)) { req.session.flash_error( - 'New boss reference for '+department_name+' should be numeric' + "New boss reference for " + department_name + " should be numeric" ); - } else if ( ! _.contains( - _.map( company.users, function(user){ return String(user.id) }), + } else if ( + !_.contains( + _.map(company.users, function(user) { + return String(user.id); + }), String(boss_id) - )) { - req.session.flash_error( - 'New boss for '+department_name+' is unknown' - ); + ) + ) { + req.session.flash_error("New boss for " + department_name + " is unknown"); } return { - allowance : allowance, - bossId : boss_id, - include_public_holidays : include_public_holidays, - is_accrued_allowance : is_accrued_allowance, - name : name, + allowance: allowance, + bossId: boss_id, + include_public_holidays: include_public_holidays, + is_accrued_allowance: is_accrued_allowance, + name: name }; } -router.get('/departments/', function(req, res){ - +router.get("/departments/", function(req, res) { // Add JS that is specific only to current page - res.locals.custom_java_script.push('/js/departments.js'); + res.locals.custom_java_script.push("/js/departments.js"); var company_for_template, - model = req.app.get('db_model'); + model = req.app.get("db_model"); - req.user.getCompany({ - scope : ['with_active_users', 'order_by_active_users'], - }) - .then(function(company){ - 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, - allowance_options : generate_all_department_allowances(), - company : company_for_template, + req.user + .getCompany({ + scope: ["with_active_users", "order_by_active_users"] + }) + .then(function(company) { + 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, + allowance_options: generate_all_department_allowances(), + company: company_for_template + }); }); - }); }); -router.post('/departments/', function(req, res){ - const - model = req.app.get('db_model'); - - req.user.getCompany({ - scope : ['with_active_users'], - }) - .then(company => { +router.post("/departments/", function(req, res) { + const model = req.app.get("db_model"); - let attributes = get_and_validate_department({ - req : req, - suffix : 'new', - company : company, - department_name : 'New department' - }); + req.user + .getCompany({ + scope: ["with_active_users"] + }) + .then(company => { + let attributes = get_and_validate_department({ + req: req, + suffix: "new", + company: company, + department_name: "New department" + }); - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); - } + if (req.session.flash_has_errors()) { + return Promise.resolve(1); + } - attributes.companyId = company.id; + attributes.companyId = company.id; - return model.Department.create(attributes); - }) + return model.Department.create(attributes); + }) - .then(() => { - if ( ! req.session.flash_has_errors() ) { - req.session.flash_message('Changes to departments were saved'); - } + .then(() => { + if (!req.session.flash_has_errors()) { + req.session.flash_message("Changes to departments were saved"); + } - return res.redirect_with_session('/settings/departments/'); - }) + return res.redirect_with_session("/settings/departments/"); + }) - .catch(error => { - console.error( - 'An error occurred when trying to add department by user '+req.user.id - + ' : ' + error - ); + .catch(error => { + console.error( + "An error occurred when trying to add department by user " + + req.user.id + + " : " + + error + ); - req.session.flash_error( - 'Failed to add new department, please contact customer service' - ); + req.session.flash_error( + "Failed to add new department, please contact customer service" + ); - return res.redirect_with_session('/settings/departments/'); - }); + return res.redirect_with_session("/settings/departments/"); + }); }); -router.post('/departments/delete/:department_id/', function(req, res){ - - var department_id = req.param('department_id'), +router.post("/departments/delete/:department_id/", function(req, res) { + var department_id = req.param("department_id"), department_to_remove; if (!validator.isInt(department_id)) { console.error( - 'User '+req.user.id+' submited non-int department ID '+department_id + "User " + req.user.id + " submited non-int department ID " + department_id ); - req.session.flash_error('Cannot remove department: wronge parameters'); + req.session.flash_error("Cannot remove department: wronge parameters"); - return res.redirect_with_session('/settings/departments/'); + return res.redirect_with_session("/settings/departments/"); } - req.user.getCompany() + req.user + .getCompany() - .then(function(company){ - return company.getDepartments({ - scope : ['with_simple_users'], - where : { - id : department_id, + .then(function(company) { + return company.getDepartments({ + scope: ["with_simple_users"], + where: { + id: department_id + } + }); + }) + .then(function(departments) { + department_to_remove = departments[0]; + + // Check if user specify valid department number + if (!department_to_remove) { + req.session.flash_error("Cannot remove department: wronge parameters"); + + throw new Error( + "User " + + req.user.id + + " tried to remove non-existing department ID" + + department_id + ); } - }); - }) - .then(function(departments){ - department_to_remove = departments[ 0 ]; - // Check if user specify valid department number - if (! department_to_remove) { + if (department_to_remove.users.length > 0) { + req.session.flash_error( + "Cannot remove department " + + department_to_remove.name + + " as it still has " + + department_to_remove.users.length + + " users." + ); - req.session.flash_error('Cannot remove department: wronge parameters'); + throw new Error("Department still has users"); + } - throw new Error( - 'User '+req.user.id+' tried to remove non-existing department ID'+department_id + // TODO VPP remove corresponding records in supervisors linking table + return department_to_remove.destroy(); + }) + .then(function() { + req.session.flash_message("Department was successfully removed"); + return res.redirect_with_session("/settings/departments/"); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to edit departments by user " + + req.user.id + + " : " + + error ); - } - if (department_to_remove.users.length > 0){ - req.session.flash_error( - 'Cannot remove department '+department_to_remove.name - +' as it still has ' - +department_to_remove.users.length+' users.' + return res.redirect_with_session( + department_to_remove + ? "/settings/departments/edit/" + department_to_remove.get("id") + "/" + : "/settings/departments/" ); - - throw new Error('Department still has users'); - } - - // TODO VPP remove corresponding records in supervisors linking table - return department_to_remove.destroy(); - }) - .then(function(){ - req.session.flash_message('Department was successfully removed'); - return res.redirect_with_session('/settings/departments/'); - }) - .catch(function(error){ - - console.error( - 'An error occurred when trying to edit departments by user '+req.user.id+' : '+error - ); - - return res.redirect_with_session( department_to_remove - ? '/settings/departments/edit/'+department_to_remove.get('id')+'/' - : '/settings/departments/' - ); - }); + }); }); function promise_to_extract_company_and_department(req) { - var department_id = req.param('department_id'), + var department_id = req.param("department_id"), company; - return Promise.try(function(){ - - if ( ! validator.isInt(department_id)) { - throw new Error('User '+req.user.id+' tried to open department refered by non-int ID '+department_id); + return Promise.try(function() { + if (!validator.isInt(department_id)) { + throw new Error( + "User " + + req.user.id + + " tried to open department refered by non-int ID " + + department_id + ); } return req.user.getCompany({ - scope : ['with_active_users', 'order_by_active_users'], + scope: ["with_active_users", "order_by_active_users"] }); }) - .then(function(c){ - company = c; + .then(function(c) { + company = c; - if ( ! company ) { - throw new Error('Cannot determin company!'); - } - - return company.getDepartments({ - scope : ['with_simple_users', 'with_boss', 'with_supervisors'], - where : { - id : department_id, + if (!company) { + throw new Error("Cannot determin company!"); } - }); - }) - .then(function(departments){ - var department = departments[0]; - // Ensure we have database record for given department ID - if ( ! department ) { - throw new Error('Non existing department ID provided'); - } + return company.getDepartments({ + scope: ["with_simple_users", "with_boss", "with_supervisors"], + where: { + id: department_id + } + }); + }) + .then(function(departments) { + var department = departments[0]; - return Promise.resolve({ - company : company, - department : department, + // Ensure we have database record for given department ID + if (!department) { + throw new Error("Non existing department ID provided"); + } + + return Promise.resolve({ + company: company, + department: department + }); }); - }); } -router.get('/departments/edit/:department_id/', function(req, res){ - var department_id = req.param('department_id'); +router.get("/departments/edit/:department_id/", function(req, res) { + var department_id = req.param("department_id"); - Promise.try(function(){ + Promise.try(function() { return promise_to_extract_company_and_department(req); }) - .then(function(result){ - var department = result.department, - company = result.company; - - res.render('department_details', { - title : 'Department details', - department : department, - company : company, - allowance_options : generate_all_department_allowances(), - }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to edit department '+department_id - +' for user '+req.user.id + ' : ' + error - ); + .then(function(result) { + var department = result.department, + company = result.company; + + res.render("department_details", { + title: "Department details", + department: department, + company: company, + allowance_options: generate_all_department_allowances() + }); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to edit department " + + department_id + + " for user " + + req.user.id + + " : " + + error + ); - req.session.flash_error( - 'Failed to fetch details for given department' - ); + req.session.flash_error("Failed to fetch details for given department"); - return res.redirect_with_session('/settings/departments/'); - }); + return res.redirect_with_session("/settings/departments/"); + }); }); -router.post('/departments/edit/:department_id/', function(req, res){ - - var department_id = req.body['department_id'], +router.post("/departments/edit/:department_id/", function(req, res) { + var department_id = req.body["department_id"], company, department; - Promise.try(function(){ + Promise.try(function() { return promise_to_extract_company_and_department(req); }) - .then(function(result){ - company = result.company; - department = result.department; + .then(function(result) { + company = result.company; + department = result.department; - return Promise.resolve(1); - }) + return Promise.resolve(1); + }) - .then(function(){ - if (req.body.remove_supervisor_id) { - return promise_to_remove_supervisor({ - supervisor_id : req.body.remove_supervisor_id, - company : company, - department : department, - }) - .then(function(){ - req.session.flash_message('Supervisor was removed from ' + department.name); - return Promise.resolve(1); - }); - } else if ( req.body.do_add_supervisors ) { - return promise_to_update_supervisors({ - req : req, - company : company, - department : department, - }) - .then(function(){ - req.session.flash_message('Supervisors were added to department ' + department.name); + .then(function() { + if (req.body.remove_supervisor_id) { + return promise_to_remove_supervisor({ + supervisor_id: req.body.remove_supervisor_id, + company: company, + department: department + }).then(function() { + req.session.flash_message( + "Supervisor was removed from " + department.name + ); + return Promise.resolve(1); + }); + } else if (req.body.do_add_supervisors) { + return promise_to_update_supervisors({ + req: req, + company: company, + department: department + }).then(function() { + req.session.flash_message( + "Supervisors were added to department " + department.name + ); + return Promise.resolve(1); + }); + } + + return promise_to_update_department({ + req: req, + company: company, + department: department + }).then(function() { + req.session.flash_message( + "Department " + department.name + " was updated" + ); return Promise.resolve(1); }); - } - - return promise_to_update_department({ - req : req, - company : company, - department : department, }) - .then(function(){ - req.session.flash_message('Department ' + department.name + ' was updated'); - return Promise.resolve(1); - }); - }) - .then(function(){ - return res.redirect_with_session('.'); - }) + .then(function() { + return res.redirect_with_session("."); + }) - .catch(function(error){ - console.error( - 'An error occurred when trying to update secondary superwisors for depertment '+department_id - +' by user '+req.user.id + ' : ' + error - ); + .catch(function(error) { + console.error( + "An error occurred when trying to update secondary superwisors for depertment " + + department_id + + " by user " + + req.user.id + + " : " + + error + ); - req.session.flash_error( - "Failed to update department's details" - ); + req.session.flash_error("Failed to update department's details"); - return res.redirect_with_session('../../'); - }); + return res.redirect_with_session("../../"); + }); }); function promise_to_remove_supervisor(args) { - var - supervisor_id = args.supervisor_id, - company = args.company, - department = args.department; + var supervisor_id = args.supervisor_id, + company = args.company, + department = args.department; // Make sure that provided supervisor ID belongs to user from current company - if (company.users.map(function(u){return String(u.id)}).indexOf( String(supervisor_id) ) === -1){ + if ( + company.users + .map(function(u) { + return String(u.id); + }) + .indexOf(String(supervisor_id)) === -1 + ) { return Promise.resolve(1); } - return department.Model.sequelize.models.DepartmentSupervisor.destroy({ - where : { - department_id : department.id, - user_id : supervisor_id, - }, + return department.Model.sequelize.models.DepartmentSupervisor.destroy({ + where: { + department_id: department.id, + user_id: supervisor_id + } }); } function promise_to_update_supervisors(args) { - - var - req = args.req, - company = args.company, + var req = args.req, + company = args.company, department = args.department; var supervisor_ids = req.body.supervisor_id || []; @@ -397,85 +429,103 @@ function promise_to_update_supervisors(args) { // Take list of all users as a base of intersaction, // so we use submitted data only as criteria and do not save it in database supervisor_ids = company.users - .map(function(user){ return user.id}) - .filter(function(id){ return supervisor_ids.indexOf(String(id)) !== -1}); + .map(function(user) { + return user.id; + }) + .filter(function(id) { + return supervisor_ids.indexOf(String(id)) !== -1; + }); var link_model = department.Model.sequelize.models.DepartmentSupervisor; - return link_model.destroy({ - where : { - department_id : department.id, - } - }) - .then(function(){ - return link_model.bulkCreate( - supervisor_ids.map(function(id){ return { user_id : id, department_id : department.id } }) - ); - }); + return link_model + .destroy({ + where: { + department_id: department.id + } + }) + .then(function() { + return link_model.bulkCreate( + supervisor_ids.map(function(id) { + return { user_id: id, department_id: department.id }; + }) + ); + }); } function promise_to_update_department(args) { - var - req = args.req, - company = args.company, + var req = args.req, + company = args.company, department = args.department; var attributes = get_and_validate_department({ - company : company, - department_name : department.name, - no_suffix : true, - req : req, + company: company, + department_name: department.name, + no_suffix: true, + req: req }); // If there were any validation errors: do not update department - if ( req.session.flash_has_errors() ) { - throw new Error("Invalid parameters submitted while while attempt to update department details"); + if (req.session.flash_has_errors()) { + throw new Error( + "Invalid parameters submitted while while attempt to update department details" + ); } return department.updateAttributes(attributes); } -router.get('/departments/available-supervisors/:department_id/', function(req, res){ - - var department_id = req.param('department_id'), +router.get("/departments/available-supervisors/:department_id/", function( + req, + res +) { + var department_id = req.param("department_id"), department, company; - Promise.try(function(){ + Promise.try(function() { return promise_to_extract_company_and_department(req); }) - .then(function(result){ - department = result.department; - company = result.company; + .then(function(result) { + department = result.department; + company = result.company; - return department.promise_me_with_supervisors(); - }) + return department.promise_me_with_supervisors(); + }) - .then(function(department_with_supervisors){ + .then(function(department_with_supervisors) { + var supervisor_map = {}; - var supervisor_map = {}; + department_with_supervisors.supervisors.forEach(function(user) { + supervisor_map[user.id] = true; + }); - department_with_supervisors.supervisors.forEach(function(user){ - supervisor_map[user.id] = true; - }); + res.render("department/available_supervisors", { + layout: false, + users: _.map( + _.filter(company.users, function(user) { + return user.id !== department.bossId; + }), + function(user) { + user._marked = supervisor_map[user.id]; + return user; + } + ) + }); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to get all availabele superviers for department " + + department_id + + " for user " + + req.user.id + + " : " + + error + ); - res.render('department/available_supervisors', { - layout : false, - users : _.map( - _.filter(company.users, function(user){ return user.id !== department.bossId }), - function(user){ user._marked = supervisor_map[user.id]; return user } - ), + res.send("REQUEST FAILED"); }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to get all availabele superviers for department '+department_id - +' for user '+req.user.id + ' : ' + error - ); - - res.send('REQUEST FAILED'); - }); }); module.exports = router; diff --git a/lib/route/feed.js b/lib/route/feed.js index c15da7336..a34f265d8 100644 --- a/lib/route/feed.js +++ b/lib/route/feed.js @@ -1,119 +1,126 @@ - "use strict"; -const - express = require('express'), - router = express.Router(), - _ = require('underscore'), - moment = require('moment'), - Promise = require('bluebird'), - ical = require('ical-generator'), - config = require('../config'), - TeamView = require('../model/team_view'); - -const - numberOfFutureMonthsInTeamViewFeed = config.get('number_of_future_months_in_team_view_feed') || 6, - numberOfPastMonthsInTeamViewFeed = config.get('number_of_past_months_in_team_view_feed') || 2; - -router.get('/:token/ical.ics', function(req, res){ - +const express = require("express"), + router = express.Router(), + _ = require("underscore"), + moment = require("moment"), + Promise = require("bluebird"), + ical = require("ical-generator"), + config = require("../config"), + TeamView = require("../model/team_view"); + +const numberOfFutureMonthsInTeamViewFeed = + config.get("number_of_future_months_in_team_view_feed") || 6, + numberOfPastMonthsInTeamViewFeed = + config.get("number_of_past_months_in_team_view_feed") || 2; + +router.get("/:token/ical.ics", function(req, res) { var cal = ical({ - domain : 'timeoff.management', + domain: "timeoff.management" }), - token = req.param('token'), - model = req.app.get('db_model'), + token = req.param("token"), + model = req.app.get("db_model"), user; - Promise - .resolve() - .then(() => model.UserFeed.find({ - where : {feed_token : token}, - include : [{ - model : model.User, - as : 'user', - include : [{ - model : model.Company, - as : 'company', - where : { - mode : {$ne : model.Company.get_mode_readonly_holidays()}, - }, - }] - }] + Promise.resolve() + .then(() => + model.UserFeed.find({ + where: { feed_token: token }, + include: [ + { + model: model.User, + as: "user", + include: [ + { + model: model.Company, + as: "company", + where: { + mode: { $ne: model.Company.get_mode_readonly_holidays() } + } + } + ] + } + ] }) ) - .then(function(feed){ - - if ( ! feed ) { + .then(function(feed) { + if (!feed) { throw new Error("Unknown token provided"); } user = feed.user; - if (feed.is_calendar()){ - cal.name(user.full_name() + ' calendar'); + if (feed.is_calendar()) { + cal.name(user.full_name() + " calendar"); return user .promise_calendar({ - year : user.calendar.company.get_today(), - show_full_year : true, + year: user.calendar.company.get_today(), + show_full_year: true }) - .then(function(calendar){ - let days = _.flatten( calendar.map( cal => cal.as_for_team_view() )); + .then(function(calendar) { + let days = _.flatten(calendar.map(cal => cal.as_for_team_view())); - days.forEach(day => day.user = user); + days.forEach(day => (day.user = user)); return Promise.resolve(days); }); } else { - - cal.name(`${ user.full_name() }'s team whereabout`); + cal.name(`${user.full_name()}'s team whereabout`); // Get the list of month deltas in relation to current month, to we can calculate // moths for which to build the feed - let monthDeltas = Array.from(Array(numberOfFutureMonthsInTeamViewFeed + 1).keys()) - .concat( Array.from(Array(numberOfPastMonthsInTeamViewFeed).keys()).map(i => -1 * (i + 1)) ); - - return Promise - .resolve( - monthDeltas.map( - delta => user.company.get_today().clone().add(delta, 'months').startOf('month') - ) + let monthDeltas = Array.from( + Array(numberOfFutureMonthsInTeamViewFeed + 1).keys() + ).concat( + Array.from(Array(numberOfPastMonthsInTeamViewFeed).keys()).map( + i => -1 * (i + 1) ) - .map(month => { - - const team_view = new TeamView({ - user : user, - base_date : month, - }); + ); + + return Promise.resolve( + monthDeltas.map(delta => + user.company + .get_today() + .clone() + .add(delta, "months") + .startOf("month") + ) + ) + .map( + month => { + const team_view = new TeamView({ + user: user, + base_date: month + }); - return team_view.promise_team_view_details() - .then(details => { + return team_view.promise_team_view_details().then(details => { let days = []; details.users_and_leaves.forEach(rec => { - rec.days.forEach(day => day.user = rec.user); - days = days.concat( rec.days ); + rec.days.forEach(day => (day.user = rec.user)); + days = days.concat(rec.days); }); return Promise.resolve(days); }); - }, { concurrency : 10 }) - .then(arrayOfDays => Promise.resolve( _.flatten(arrayOfDays) )); + }, + { concurrency: 10 } + ) + .then(arrayOfDays => Promise.resolve(_.flatten(arrayOfDays))); } }) - .then(function(days){ - - days.forEach(function(day){ - + .then(function(days) { + days.forEach(function(day) { // We care only about days when employee is on leave if (!(day.is_leave_morning || day.is_leave_afternoon)) { return; } let start = moment.utc(day.moment), - end = moment.utc(day.moment), - allDay = false; + end = moment.utc(day.moment), + allDay = false; if (day.is_leave_morning && day.is_leave_afternoon) { start.hour(9).minute(0); @@ -128,25 +135,22 @@ router.get('/:token/ical.ics', function(req, res){ } cal.createEvent({ - start : start.toDate(), - end : end.toDate(), - allDay : allDay, - summary : day.user.full_name() + ' is out of office', -// description : 'It works ;)', + start: start.toDate(), + end: end.toDate(), + allDay: allDay, + summary: day.user.full_name() + " is out of office" + // description : 'It works ;)', }); }); - res.send( cal.toString() ); + res.send(cal.toString()); }) .catch(error => { - console.log(`Failed to fetch feed because of: ${error}`); // TODO VPP set 404 status - res.send('N/A'); + res.send("N/A"); }); - }); - module.exports = router; diff --git a/lib/route/integration_api.js b/lib/route/integration_api.js index 73ca1de54..44267987c 100644 --- a/lib/route/integration_api.js +++ b/lib/route/integration_api.js @@ -1,132 +1,130 @@ - -'use strict'; - -const - express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - config = require('../config'), - TeamView = require('../model/team_view'), - Exception = require('../error'), - _ = require('underscore'), - {getAudit}= require('../model/audit'), - {getUsersWithLeaves} = require('../model/Report'); +"use strict"; + +const express = require("express"), + router = express.Router(), + validator = require("validator"), + Promise = require("bluebird"), + moment = require("moment"), + config = require("../config"), + TeamView = require("../model/team_view"), + Exception = require("../error"), + _ = require("underscore"), + { getAudit } = require("../model/audit"), + { getUsersWithLeaves } = require("../model/Report"); module.exports = passport => { - router.all( /.*/, - passport.authenticate('bearer', { session: false }), + passport.authenticate("bearer", { session: false }), (req, res, next) => { - if ( req.isAuthenticated() ) { + if (req.isAuthenticated()) { return next(); } - return res.status(401).json({ ok : false}); - }); - - router.get( - '/', - (req, res) => res.json({ok : true}) + return res.status(401).json({ ok: false }); + } ); - router.get( - '/report/allowance', - (req, res) => { - - const startDate = validator.isDate(req.param('start_date')) - ? moment.utc(req.param('start_date')) - : req.user.company.get_today(); - - const endDate = validator.isDate(req.param('end_date')) - ? moment.utc(req.param('end_date')) - : req.user.company.get_today(); - - const teamView = new TeamView({ - user : req.user, - start_date : startDate, - end_date : endDate, - }); - - const currentDeparmentId = validator.isNumeric(req.param('department')) - ? req.param('department') - : null; - - Promise.join( - teamView.promise_team_view_details({ - department_id : currentDeparmentId, - }), - req.user.get_company_with_all_leave_types(), - (teamViewDetails, company) => { - return teamView - .inject_statistics({ - team_view_details : teamViewDetails, - leave_types : company.leave_types, - }) - .then(teamViewDetails => ( - res.json({data : [ + router.get("/", (req, res) => res.json({ ok: true })); + + router.get("/report/allowance", (req, res) => { + const startDate = validator.isDate(req.param("start_date")) + ? moment.utc(req.param("start_date")) + : req.user.company.get_today(); + + const endDate = validator.isDate(req.param("end_date")) + ? moment.utc(req.param("end_date")) + : req.user.company.get_today(); + + const teamView = new TeamView({ + user: req.user, + start_date: startDate, + end_date: endDate + }); + + const currentDeparmentId = validator.isNumeric(req.param("department")) + ? req.param("department") + : null; + + Promise.join( + teamView.promise_team_view_details({ + department_id: currentDeparmentId + }), + req.user.get_company_with_all_leave_types(), + (teamViewDetails, company) => { + return teamView + .inject_statistics({ + team_view_details: teamViewDetails, + leave_types: company.leave_types + }) + .then(teamViewDetails => + res.json({ + data: [ teamViewDetails.users_and_leaves.map(ul => ({ userId: ul.user.id, userEmail: ul.user.email, userLastname: ul.user.lastname, userName: ul.user.name, - leaveTypeBreakDown: ul.statistics.leave_type_break_down.pretty_version, - deductedDays: ul.statistics.deducted_days, + leaveTypeBreakDown: + ul.statistics.leave_type_break_down.pretty_version, + deductedDays: ul.statistics.deducted_days })) - ]}) - )) - }) - .catch(error => { - console.log( - 'An error occured when user '+req.user.id+ - ' tried to access /reports/allowancebytime page: '+error + ] + }) ); + } + ).catch(error => { + console.log( + "An error occured when user " + + req.user.id + + " tried to access /reports/allowancebytime page: " + + error + ); + + res.json({ error }); + }); + }); - res.json({ error }) - }); - - } - ); - - router.get( - '/report/absence', - (req,res) => { - - const startDate = validator.isDate(req.param('start_date')) - ? moment.utc(req.param('start_date')) - : req.user.company.get_today(); - - const endDate = validator.isDate(req.param('end_date')) - ? moment.utc(req.param('end_date')) - : req.user.company.get_today(); - - const departmentId = validator.isNumeric(req.param('department')) - ? req.param('department') - : null; - - let result = getUsersWithLeaves({company:req.user.company, startDate, endDate, departmentId}); - - result = result - .then(data => res.json(data)) - .catch(error => { - console.log(`An error occured when trying to access /report/absence: ${error} at ${error.stack}`); - res.json({ error: `${error}` }); - }); + router.get("/report/absence", (req, res) => { + const startDate = validator.isDate(req.param("start_date")) + ? moment.utc(req.param("start_date")) + : req.user.company.get_today(); + + const endDate = validator.isDate(req.param("end_date")) + ? moment.utc(req.param("end_date")) + : req.user.company.get_today(); + + const departmentId = validator.isNumeric(req.param("department")) + ? req.param("department") + : null; + + let result = getUsersWithLeaves({ + company: req.user.company, + startDate, + endDate, + departmentId + }); + + result = result + .then(data => res.json(data)) + .catch(error => { + console.log( + `An error occured when trying to access /report/absence: ${error} at ${ + error.stack + }` + ); + res.json({ error: `${error}` }); + }); }); - router.get( - '/audit/', - (req,res) => { - getAudit({companyId: req.user.companyId}) - .then(data => res.json(data)) - .catch(error => { - console.log(`Failed to fetch Audit data: ${error} at ${error.stack}`); - res.json({ error: `${error}` }); - }); - } - ); + router.get("/audit/", (req, res) => { + getAudit({ companyId: req.user.companyId }) + .then(data => res.json(data)) + .catch(error => { + console.log(`Failed to fetch Audit data: ${error} at ${error.stack}`); + res.json({ error: `${error}` }); + }); + }); return router; -} +}; diff --git a/lib/route/login.js b/lib/route/login.js index fb775fcc3..0dc04910a 100644 --- a/lib/route/login.js +++ b/lib/route/login.js @@ -1,4 +1,3 @@ - /* * Contain handlers for dealing with user account: * - login @@ -10,308 +9,317 @@ * not the router itself! * Exported function gets passport object. * */ -'use strict'; +"use strict"; -var - validator = require('validator'), - Promise = require('bluebird'), - formidable = require('formidable'), - fs = require("fs"), - config = require('../config'), - moment_tz = require('moment-timezone'), - EmailTransport = require('../email'); +var validator = require("validator"), + Promise = require("bluebird"), + formidable = require("formidable"), + fs = require("fs"), + config = require("../config"), + moment_tz = require("moment-timezone"), + EmailTransport = require("../email"); Promise.promisifyAll(fs); var get_url_to_site_root_for_anonymous_session = function(req) { - return req.get('host').indexOf('app.timeoff') < 0 - ? '/' - : config.get('promotion_website_domain'); -} + return req.get("host").indexOf("app.timeoff") < 0 + ? "/" + : config.get("promotion_website_domain"); +}; module.exports = function(passport) { - - var express = require('express'); - var router = express.Router(); - - router.get('/login', function(req, res){ - res.render('login', { - allow_create_new_accounts: JSON.parse(config.get('allow_create_new_accounts')), - title : 'Time Off Management', - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), - }); + var express = require("express"); + var router = express.Router(); + + router.get("/login", function(req, res) { + res.render("login", { + allow_create_new_accounts: JSON.parse( + config.get("allow_create_new_accounts") + ), + title: "Time Off Management", + url_to_the_site_root: get_url_to_site_root_for_anonymous_session(req) + }); }); - router.post('/login', function(req, res, next) { - passport.authenticate('local', function(err, user, info) { - if (err) { return next(err); } + router.post("/login", function(req, res, next) { + passport.authenticate("local", function(err, user, info) { + if (err) { + return next(err); + } if (!user) { - req.session.flash_error('Incorrect credentials'); - return res.redirect_with_session('/login'); + req.session.flash_error("Incorrect credentials"); + return res.redirect_with_session("/login"); } req.logIn(user, function(err) { - if (err) { return next(err); } + if (err) { + return next(err); + } - req.session.flash_message('Welcome back '+user.name+'!'); + req.session.flash_message("Welcome back " + user.name + "!"); - return res.redirect_with_session('/'); + return res.redirect_with_session("/"); }); })(req, res, next); }); - router.get('/logout', function(req, res){ - - // Maybe this check is redundant but to be on safe side lets do it - if ( !req.user ) { - return res.redirect_with_session(303, '/'); - } + router.get("/logout", function(req, res) { + // Maybe this check is redundant but to be on safe side lets do it + if (!req.user) { + return res.redirect_with_session(303, "/"); + } - req.logout(); + req.logout(); - return res.redirect_with_session(res.locals.url_to_the_site_root); + return res.redirect_with_session(res.locals.url_to_the_site_root); }); - router.get('/register', function(req, res){ - - // Disable new accounts. - if ( !JSON.parse(config.get('allow_create_new_accounts')) ) { - return res.redirect_with_session(res.locals.url_to_the_site_root); - } + router.get("/register", function(req, res) { + // Disable new accounts. + if (!JSON.parse(config.get("allow_create_new_accounts"))) { + return res.redirect_with_session(res.locals.url_to_the_site_root); + } - // There is no need to register new accounts when user alreeady login - if ( req.user ) { - return res.redirect_with_session(303, '/'); - } + // There is no need to register new accounts when user alreeady login + if (req.user) { + return res.redirect_with_session(303, "/"); + } - res.render('register',{ - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), - countries : config.get('countries'), - timezones_available : moment_tz.tz.names(), - }); + res.render("register", { + url_to_the_site_root: get_url_to_site_root_for_anonymous_session(req), + countries: config.get("countries"), + timezones_available: moment_tz.tz.names() + }); }); - router.post('/register', function(req, res){ - - // There is no need to register new accounts when user alreeady login - // (just to prevent people to mess around) - if ( req.user ) { - return res.redirect_with_session(303, '/'); - } + router.post("/register", function(req, res) { + // There is no need to register new accounts when user alreeady login + // (just to prevent people to mess around) + if (req.user) { + return res.redirect_with_session(303, "/"); + } - // TODO at some point we need to unified form validation code - // and make it reusable + // TODO at some point we need to unified form validation code + // and make it reusable - var email = req.param('email'); - if (!email){ - req.session.flash_error('Email was not provided'); - } else if ( ! validator.isEmail(email)) { - req.session.flash_error('Email address is invalid'); - } + var email = req.param("email"); + if (!email) { + req.session.flash_error("Email was not provided"); + } else if (!validator.isEmail(email)) { + req.session.flash_error("Email address is invalid"); + } - var name = req.param('name'); - if (!name){ - req.session.flash_error('Name was not specified'); - } + var name = req.param("name"); + if (!name) { + req.session.flash_error("Name was not specified"); + } - var lastname = req.param('lastname'); - if (!lastname) { - req.session.flash_error('Last was not specified'); - } + var lastname = req.param("lastname"); + if (!lastname) { + req.session.flash_error("Last was not specified"); + } - var company_name = req.param('company_name'); + var company_name = req.param("company_name"); - var password = req.param('password'); - if (!password) { - req.session.flash_error('Password could not be blank'); - } else if ( password !== req.param('password_confirmed') ) { - req.session.flash_error('Confirmed password does not match initial one'); - } + var password = req.param("password"); + if (!password) { + req.session.flash_error("Password could not be blank"); + } else if (password !== req.param("password_confirmed")) { + req.session.flash_error("Confirmed password does not match initial one"); + } - var country_code = req.param('country'); - if (! validator.matches(country_code, /^[a-z]{2}/i) ){ - req.session.flash_error('Incorrect country code'); - } + var country_code = req.param("country"); + if (!validator.matches(country_code, /^[a-z]{2}/i)) { + req.session.flash_error("Incorrect country code"); + } - let timezone = validator.trim(req.param('timezone')); - if ( ! moment_tz.tz.names().find(tz_str => tz_str === timezone) ) { - req.session.flash_error('Time zone is unknown'); - } + let timezone = validator.trim(req.param("timezone")); + if (!moment_tz.tz.names().find(tz_str => tz_str === timezone)) { + req.session.flash_error("Time zone is unknown"); + } - // In case of validation error redirect back to registration form - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('/register/'); - } + // In case of validation error redirect back to registration form + if (req.session.flash_has_errors()) { + return res.redirect_with_session("/register/"); + } - // Try to create new record of user - req.app.get('db_model').User.register_new_admin_user({ - email : email.toLowerCase(), - password : password, - name : name, - lastname : lastname, - company_name : company_name, - country_code : country_code, - timezone : timezone, + // Try to create new record of user + req.app + .get("db_model") + .User.register_new_admin_user({ + email: email.toLowerCase(), + password: password, + name: name, + lastname: lastname, + company_name: company_name, + country_code: country_code, + timezone: timezone }) // Send registration email - .then(function(user){ + .then(function(user) { var email = new EmailTransport(); - return email.promise_registration_email({ - user : user, - }) - .then(function(){ - return Promise.resolve(user) - }); + return email + .promise_registration_email({ + user: user + }) + .then(function() { + return Promise.resolve(user); + }); }) - .then(function(user){ - + .then(function(user) { // Login newly created user req.logIn(user, function(err) { - if (err) { return next(err); } + if (err) { + return next(err); + } - req.session.flash_message( - 'Registration is complete.' - ); + req.session.flash_message("Registration is complete."); - return res.redirect_with_session('/'); + return res.redirect_with_session("/"); }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to register new user ' - + email + ' : ' + error - ); - - req.session.flash_error( - 'Failed to register user please contact customer service.'+ - (error.show_to_user ? ' '+ error : '') - ); - - return res.redirect_with_session('/register/'); + .catch(function(error) { + console.error( + "An error occurred when trying to register new user " + + email + + " : " + + error + ); + + req.session.flash_error( + "Failed to register user please contact customer service." + + (error.show_to_user ? " " + error : "") + ); + + return res.redirect_with_session("/register/"); }); - }); - router.get('/forgot-password/', function(req, res){ - - res.render('forgot_password',{ - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), + router.get("/forgot-password/", function(req, res) { + res.render("forgot_password", { + url_to_the_site_root: get_url_to_site_root_for_anonymous_session(req) }); }); - router.post('/forgot-password/', function(req, res){ - var email = req.param('email'); - - if (!email){ - req.session.flash_error('Email was not provided'); + router.post("/forgot-password/", function(req, res) { + var email = req.param("email"); - } else if ( ! validator.isEmail(email)) { - req.session.flash_error('Email address is invalid'); + if (!email) { + req.session.flash_error("Email was not provided"); + } else if (!validator.isEmail(email)) { + req.session.flash_error("Email address is invalid"); } // In case of validation error redirect back to forgot password form - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('./'); + if (req.session.flash_has_errors()) { + return res.redirect_with_session("./"); } - var success_msg ='Please check your email box for further instructions'; + var success_msg = "Please check your email box for further instructions"; // Normalize email address: system operates only in low cased emails email = email.toLowerCase(); - req.app.get('db_model').User.find_by_email(email) - .then(function(user){ - + req.app + .get("db_model") + .User.find_by_email(email) + .then(function(user) { if (!user) { req.session.flash_message(success_msg); - var error = new Error(''); + var error = new Error(""); error.do_not_report = true; throw error; } return Promise.resolve(user); }) - .then(function(user){ + .then(function(user) { var Email = new EmailTransport(); return Email.promise_forgot_password_email({ - user : user, + user: user }); }) - .then(function(){ - req.session.flash_message(success_msg); - return res.redirect_with_session('./'); + .then(function() { + req.session.flash_message(success_msg); + return res.redirect_with_session("./"); }) - .catch(function(error){ - - if (error.do_not_report ){ - return res.redirect_with_session('./'); + .catch(function(error) { + if (error.do_not_report) { + return res.redirect_with_session("./"); } - console.error('An error occurred while submittin forgot password form: '+error); - req.session.flash_error('Failed to proceed with submitted data.'); - return res.redirect_with_session('./'); + console.error( + "An error occurred while submittin forgot password form: " + error + ); + req.session.flash_error("Failed to proceed with submitted data."); + return res.redirect_with_session("./"); }); - }); - router.get('/reset-password/', function(req, res){ + router.get("/reset-password/", function(req, res) { + var token = req.param("t"); - var token = req.param('t'); - - req.app.get('db_model').User.get_user_by_reset_password_token(token) - .then(function(user){ - if (! user) { - req.session.flash_error('Unknown reset password link, please submit request again'); - return res.redirect_with_session('/forgot-password/') + req.app + .get("db_model") + .User.get_user_by_reset_password_token(token) + .then(function(user) { + if (!user) { + req.session.flash_error( + "Unknown reset password link, please submit request again" + ); + return res.redirect_with_session("/forgot-password/"); } - res.render('reset_password',{ - url_to_the_site_root : get_url_to_site_root_for_anonymous_session(req), - token : token, + res.render("reset_password", { + url_to_the_site_root: get_url_to_site_root_for_anonymous_session(req), + token: token }); }); }); - router.post('/reset-password/', function(req, res){ - - var token = req.param('t'), - password = req.param('password'), - confirm_password = req.param('confirm_password'); - + router.post("/reset-password/", function(req, res) { + var token = req.param("t"), + password = req.param("password"), + confirm_password = req.param("confirm_password"); if (password !== confirm_password) { - req.session.flash_error('Confirmed password does not match password'); - return res.redirect_with_session('/reset-password/?t='+token); + req.session.flash_error("Confirmed password does not match password"); + return res.redirect_with_session("/reset-password/?t=" + token); } - req.app.get('db_model').User.get_user_by_reset_password_token(token) - .then(function(user){ - if (! user) { - req.session.flash_error('Unknown reset password link, please submit request again'); - return res.redirect_with_session('/forgot-password/'); + req.app + .get("db_model") + .User.get_user_by_reset_password_token(token) + .then(function(user) { + if (!user) { + req.session.flash_error( + "Unknown reset password link, please submit request again" + ); + return res.redirect_with_session("/forgot-password/"); } return Promise.resolve(user); }) - .then(function(user){ - user.password = req.app.get('db_model').User.hashify_password(password); + .then(function(user) { + user.password = req.app.get("db_model").User.hashify_password(password); return user.save(); }) - .then(function(user){ + .then(function(user) { var Email = new EmailTransport(); return Email.promise_reset_password_email({ - user : user, + user: user }); }) - .then(function(){ - req.session.flash_message('Please use new password to login into system'); - return res.redirect_with_session('/login/') + .then(function() { + req.session.flash_message( + "Please use new password to login into system" + ); + return res.redirect_with_session("/login/"); }); }); diff --git a/lib/route/reports.js b/lib/route/reports.js index 7fc184773..f105482f2 100644 --- a/lib/route/reports.js +++ b/lib/route/reports.js @@ -1,162 +1,161 @@ - "use strict"; -const - express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - config = require('../config'), - TeamView = require('../model/team_view'), - Exception = require('../error'), - csv = Promise.promisifyAll(require('csv')), - _ = require('underscore'); +const express = require("express"), + router = express.Router(), + validator = require("validator"), + Promise = require("bluebird"), + moment = require("moment"), + config = require("../config"), + TeamView = require("../model/team_view"), + Exception = require("../error"), + csv = Promise.promisifyAll(require("csv")), + _ = require("underscore"); // Make sure that current user is authorized to deal with settings -router.all(/.*/, require('../middleware/ensure_user_is_admin')); +router.all(/.*/, require("../middleware/ensure_user_is_admin")); -router.get('/', (req, res) => { - res.render('report/index'); +router.get("/", (req, res) => { + res.render("report/index"); }); -router.get('/allowancebytime/', (req, res) => { - - let start_date = validator.isDate(req.param('start_date')) - ? moment.utc(req.param('start_date')) +router.get("/allowancebytime/", (req, res) => { + let start_date = validator.isDate(req.param("start_date")) + ? moment.utc(req.param("start_date")) : req.user.company.get_today(); - let end_date = validator.isDate(req.param('end_date')) - ? moment.utc(req.param('end_date')) + let end_date = validator.isDate(req.param("end_date")) + ? moment.utc(req.param("end_date")) : req.user.company.get_today(); var team_view = new TeamView({ - user : req.user, - start_date : start_date, - end_date : end_date, + user: req.user, + start_date: start_date, + end_date: end_date }); - var current_deparment_id = validator.isNumeric(req.param('department')) - ? req.param('department') + var current_deparment_id = validator.isNumeric(req.param("department")) + ? req.param("department") : null; Promise.join( team_view.promise_team_view_details({ - department_id : current_deparment_id, + department_id: current_deparment_id }), req.user.get_company_with_all_leave_types(), (team_view_details, company) => { return team_view .inject_statistics({ - team_view_details : team_view_details, - leave_types : company.leave_types, + team_view_details: team_view_details, + leave_types: company.leave_types }) - .then(team_view_details => render_allowancebytime({ - req : req, - res : res, - team_view_details : team_view_details, - company : company, - start_date : start_date, - end_date : end_date, - })) - }) - .catch(error => { - console.error( - 'An error occured when user '+req.user.id+ - ' tried to access /reports/allowancebytime page: '+error - ); - - let - user_error_message = 'Failed to produce report. Please contact administrator.', - - // By default go back to root report page - redirect_path = '../'; - - if ( error.tom_error ) { - user_error_message = Exception.extract_user_error_message(error); - - // If it is known error: stay on current page - redirect_path = './'; - } - - req.session.flash_error(user_error_message); - - return res.redirect_with_session(redirect_path); - }); + .then(team_view_details => + render_allowancebytime({ + req: req, + res: res, + team_view_details: team_view_details, + company: company, + start_date: start_date, + end_date: end_date + }) + ); + } + ).catch(error => { + console.error( + "An error occured when user " + + req.user.id + + " tried to access /reports/allowancebytime page: " + + error + ); + + let user_error_message = + "Failed to produce report. Please contact administrator.", + // By default go back to root report page + redirect_path = "../"; + + if (error.tom_error) { + user_error_message = Exception.extract_user_error_message(error); + + // If it is known error: stay on current page + redirect_path = "./"; + } + + req.session.flash_error(user_error_message); + + return res.redirect_with_session(redirect_path); + }); }); function render_allowancebytime(args) { - let - req = args.req, - res = args.res, + let req = args.req, + res = args.res, team_view_details = args.team_view_details, - company = args.company, - start_date = args.start_date, - end_date = args.end_date; - - return Promise - .try(() => req.param('as-csv') - ? render_allowancebytime_as_csv(args) - : res.render('report/allowancebytime', { - 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, - start_date_str : start_date.format('YYYY-MM'), - end_date_str : end_date.format('YYYY-MM'), - start_date_obj : start_date, - end_date_obj : end_date, - same_month : (start_date.format('YYYYMM') === end_date.format('YYYYMM')), + company = args.company, + start_date = args.start_date, + end_date = args.end_date; + + return Promise.try(() => + req.param("as-csv") + ? render_allowancebytime_as_csv(args) + : res.render("report/allowancebytime", { + 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, + start_date_str: start_date.format("YYYY-MM"), + end_date_str: end_date.format("YYYY-MM"), + start_date_obj: start_date, + end_date_obj: end_date, + same_month: start_date.format("YYYYMM") === end_date.format("YYYYMM") }) - ); + ); } function render_allowancebytime_as_csv(args) { - let - req = args.req, - res = args.res, + let req = args.req, + res = args.res, team_view_details = args.team_view_details, - company = args.company, - start_date = args.start_date, - end_date = args.end_date; + company = args.company, + start_date = args.start_date, + end_date = args.end_date; // Compose file name res.attachment( - company.name_for_machine() - + '_employee_allowances_between' - + start_date.format('YYYY_MM') - + '_and_' - + end_date.format('YYYY_MM') - + '.csv' + company.name_for_machine() + + "_employee_allowances_between" + + start_date.format("YYYY_MM") + + "_and_" + + end_date.format("YYYY_MM") + + ".csv" ); // Compose result CSV header let content = [ - ['email', 'last name', 'name'] - // Add dynamic list of Leave Types - .concat( - team_view_details.users_and_leaves.length > 0 - ? team_view_details.users_and_leaves[0].statistics.leave_type_break_down.pretty_version.map(it => it.name) - : [] - ) - .concat(['days deducted from allowance']) + ["email", "last name", "name"] + // Add dynamic list of Leave Types + .concat( + team_view_details.users_and_leaves.length > 0 + ? team_view_details.users_and_leaves[0].statistics.leave_type_break_down.pretty_version.map( + it => it.name + ) + : [] + ) + .concat(["days deducted from allowance"]) ]; // ... and body team_view_details.users_and_leaves.forEach(ul => { content.push( - [ - ul.user.email, - ul.user.lastname, - ul.user.name, - ] - // Dynamic part of the column list - .concat( ul.statistics.leave_type_break_down.pretty_version.map(it => it.stat)) - .concat([ul.statistics.deducted_days]) + [ul.user.email, ul.user.lastname, ul.user.name] + // Dynamic part of the column list + .concat( + ul.statistics.leave_type_break_down.pretty_version.map(it => it.stat) + ) + .concat([ul.statistics.deducted_days]) ); }); - return csv.stringifyAsync( content ) + return csv + .stringifyAsync(content) .then(csv_data_string => res.send(csv_data_string)); } diff --git a/lib/route/requests.js b/lib/route/requests.js index a6af6c414..18a2c49d3 100644 --- a/lib/route/requests.js +++ b/lib/route/requests.js @@ -1,285 +1,298 @@ - "use strict"; -var express = require('express'), - router = express.Router(), - Promise = require('bluebird'), - moment = require('moment'), - validator = require('validator'), - _ = require('underscore'), - LeaveCollectionUtil = require('../model/leave_collection')(), - EmailTransport = require('../email'); - -router.get('/', function(req, res){ - - Promise.join( - req.user - .promise_my_active_leaves_ever() - .then(leaves => LeaveCollectionUtil.promise_to_group_leaves(leaves)), - req.user.promise_leaves_to_be_processed(), - function(my_leaves_grouped, to_be_approved_leaves){ - - res.render('requests',{ - my_leaves_grouped : my_leaves_grouped, - to_be_approved_leaves : to_be_approved_leaves, - }); - } - ); +var express = require("express"), + router = express.Router(), + Promise = require("bluebird"), + moment = require("moment"), + validator = require("validator"), + _ = require("underscore"), + LeaveCollectionUtil = require("../model/leave_collection")(), + EmailTransport = require("../email"); + +router.get("/", function(req, res) { + Promise.join( + req.user + .promise_my_active_leaves_ever() + .then(leaves => LeaveCollectionUtil.promise_to_group_leaves(leaves)), + req.user.promise_leaves_to_be_processed(), + function(my_leaves_grouped, to_be_approved_leaves) { + res.render("requests", { + my_leaves_grouped: my_leaves_grouped, + to_be_approved_leaves: to_be_approved_leaves + }); + } + ); }); function leave_request_action(args) { - var - current_action = args.action, - leave_action_method = args.leave_action_method, - was_pended_revoke = false; - - return function(req, res){ + var current_action = args.action, + leave_action_method = args.leave_action_method, + was_pended_revoke = false; - var request_id = validator.trim( req.param('request') ); + return function(req, res) { + var request_id = validator.trim(req.param("request")); - if (!validator.isNumeric(request_id)){ - req.session.flash_error('Failed to ' + current_action); + if (!validator.isNumeric(request_id)) { + req.session.flash_error("Failed to " + current_action); } - if ( req.session.flash_has_errors() ) { - console.error('Got validation errors on '+current_action+' request handler'); + if (req.session.flash_has_errors()) { + console.error( + "Got validation errors on " + current_action + " request handler" + ); - return res.redirect_with_session('../'); + return res.redirect_with_session("../"); } - Promise.try(function(){ + Promise.try(function() { return req.user.promise_leaves_to_be_processed(); }) - .then(function(leaves){ - var leave_to_process = _.find(leaves, function(leave){ - return String(leave.id) === String(request_id) - && (leave.is_new_leave() || leave.is_pended_revoke_leave()); - }); - - if (! leave_to_process) { - throw new Error('Provided ID '+request_id - +'does not correspond to any leave requests to be '+current_action - +'ed for user ' + req.user.id + .then(function(leaves) { + var leave_to_process = _.find(leaves, function(leave) { + return ( + String(leave.id) === String(request_id) && + (leave.is_new_leave() || leave.is_pended_revoke_leave()) ); - } + }); - was_pended_revoke = leave_to_process.is_pended_revoke_leave(); + if (!leave_to_process) { + throw new Error( + "Provided ID " + + request_id + + "does not correspond to any leave requests to be " + + current_action + + "ed for user " + + req.user.id + ); + } - return leave_to_process[leave_action_method]({ by_user : req.user }); - }) - .then(function(processed_leave){ - return processed_leave.reload({ - include : [ - {model : req.app.get('db_model').User, as : 'user'}, - {model : req.app.get('db_model').User, as : 'approver'}, - {model : req.app.get('db_model').LeaveType, as : 'leave_type' }, - ], - }); - }) - .then(function(processed_leave){ + was_pended_revoke = leave_to_process.is_pended_revoke_leave(); - var Email = new EmailTransport(); + return leave_to_process[leave_action_method]({ by_user: req.user }); + }) + .then(function(processed_leave) { + return processed_leave.reload({ + include: [ + { model: req.app.get("db_model").User, as: "user" }, + { model: req.app.get("db_model").User, as: "approver" }, + { model: req.app.get("db_model").LeaveType, as: "leave_type" } + ] + }); + }) + .then(function(processed_leave) { + var Email = new EmailTransport(); - return Email.promise_leave_request_decision_emails({ - leave : processed_leave, - action : current_action, - was_pended_revoke : was_pended_revoke, + return Email.promise_leave_request_decision_emails({ + leave: processed_leave, + action: current_action, + was_pended_revoke: was_pended_revoke + }).then(function() { + return Promise.resolve(processed_leave); + }); }) - .then(function(){ - return Promise.resolve( processed_leave); - }); - }) - .then(function(processed_leave){ - req.session.flash_message('Request from '+processed_leave.user.full_name() - +' was '+current_action+'ed'); + .then(function(processed_leave) { + req.session.flash_message( + "Request from " + + processed_leave.user.full_name() + + " was " + + current_action + + "ed" + ); - return res.redirect_with_session('../'); - }) - .catch(function(error){ - console.error('An error occurred when attempting to '+current_action - +' leave request '+request_id+' by user '+req.user.id+' Error: '+error - ); - req.session.flash_error('Failed to '+current_action); - return res.redirect_with_session('../'); - }); + return res.redirect_with_session("../"); + }) + .catch(function(error) { + console.error( + "An error occurred when attempting to " + + current_action + + " leave request " + + request_id + + " by user " + + req.user.id + + " Error: " + + error + ); + req.session.flash_error("Failed to " + current_action); + return res.redirect_with_session("../"); + }); }; - -}; +} router.post( - '/reject/', + "/reject/", leave_request_action({ - action : 'reject', - leave_action_method : 'promise_to_reject', + action: "reject", + leave_action_method: "promise_to_reject" }) ); router.post( - '/approve/', + "/approve/", leave_request_action({ - action : 'approve', - leave_action_method : 'promise_to_approve', + action: "approve", + leave_action_method: "promise_to_approve" }) ); -router.post('/cancel/', function(req, res){ +router.post("/cancel/", function(req, res) { + var request_id = validator.trim(req.param("request")); - var request_id = validator.trim( req.param('request') ); - - Promise.try(function(){ - return req.user.promise_cancelable_leaves() + Promise.try(function() { + return req.user.promise_cancelable_leaves(); }) - .then(function(leaves){ - var leave_to_cancel = _.find(leaves, function(leave){ + .then(function(leaves) { + var leave_to_cancel = _.find(leaves, function(leave) { return String(leave.id) === String(request_id); - }); - - if ( ! leave_to_cancel ) { - throw new Error('Given leave request is not amoung those current user can cancel'); - } + }); - return Promise.resolve(leave_to_cancel); - }) - .then(function(leave){ - return leave.promise_to_cancel() - .then(function(){ return Promise.resolve(leave)}); - }) - .then(function(leave){ - return leave.reload({ - include : [ - {model : req.app.get('db_model').User, as : 'user'}, - {model : req.app.get('db_model').User, as : 'approver'}, - {model : req.app.get('db_model').LeaveType, as : 'leave_type' }, - ], - }); - }) - .then(function(leave){ + if (!leave_to_cancel) { + throw new Error( + "Given leave request is not amoung those current user can cancel" + ); + } - var Email = new EmailTransport(); + return Promise.resolve(leave_to_cancel); + }) + .then(function(leave) { + return leave.promise_to_cancel().then(function() { + return Promise.resolve(leave); + }); + }) + .then(function(leave) { + return leave.reload({ + include: [ + { model: req.app.get("db_model").User, as: "user" }, + { model: req.app.get("db_model").User, as: "approver" }, + { model: req.app.get("db_model").LeaveType, as: "leave_type" } + ] + }); + }) + .then(function(leave) { + var Email = new EmailTransport(); - return Email.promise_leave_request_cancel_emails({ - leave : leave, + return Email.promise_leave_request_cancel_emails({ + leave: leave + }).then(function() { + return Promise.resolve(leave); + }); }) - .then(function(){ - return Promise.resolve(leave); + .then(function(leave) { + req.session.flash_message("The leave request was canceled"); + }) + .catch(function(error) { + console.log("An error occurred: " + error); + req.session.flash_error("Failed to cancel leave request"); + }) + .finally(function() { + return res.redirect_with_session("/requests/"); }); - }) - .then(function(leave){ - req.session.flash_message('The leave request was canceled'); - }) - .catch(function(error){ - console.log('An error occurred: '+error); - req.session.flash_error('Failed to cancel leave request'); - }) - .finally(function(){ - return res.redirect_with_session('/requests/'); - }); }); -router.post( - '/revoke/', - function(req, res){ - var request_id = validator.trim( req.param('request') ); - - // TODO NOTE revoke action now could be made from more then one place, - // so make sure that user is redirected to correct place - - if (!validator.isNumeric(request_id)){ - req.session.flash_error('Failed to revoke leave request'); - } +router.post("/revoke/", function(req, res) { + var request_id = validator.trim(req.param("request")); - if ( req.session.flash_has_errors() ) { - console.log( - 'Got validation errors when revoking leave request for user ' + req.user.id - ); + // TODO NOTE revoke action now could be made from more then one place, + // so make sure that user is redirected to correct place - return res.redirect_with_session('../'); - } + if (!validator.isNumeric(request_id)) { + req.session.flash_error("Failed to revoke leave request"); + } - Promise - // Get the Leave object for submitted ID - .try(() => req.app.get('db_model').Leave.findOne({ where : { id : request_id }})) + if (req.session.flash_has_errors()) { + console.log( + "Got validation errors when revoking leave request for user " + + req.user.id + ); - // Ensure that current user can act on this Leave object - .then(requested_leave => { + return res.redirect_with_session("../"); + } - // Case when requested Leave is originated from current user - if ( String(requested_leave.userId) === String(req.user.id) ) { - return Promise.resolve( requested_leave ) + Promise + // Get the Leave object for submitted ID + .try(() => + req.app.get("db_model").Leave.findOne({ where: { id: request_id } }) + ) + + // Ensure that current user can act on this Leave object + .then(requested_leave => { + // Case when requested Leave is originated from current user + if (String(requested_leave.userId) === String(req.user.id)) { + return Promise.resolve(requested_leave); + } + + // Case when requested Leave is originated from one of employees + // current user can manage + return req.user.promise_users_I_can_manage().then(users => { + if (users.find(u => String(u.id) === String(requested_leave.userId))) { + return Promise.resolve(requested_leave); } - // Case when requested Leave is originated from one of employees - // current user can manage - return req.user - .promise_users_I_can_manage() - .then(users => { - if ( users.find(u => String(u.id) === String(requested_leave.userId)) ) { - return Promise.resolve( requested_leave ); - } - - return Promise.resolve(); - }); - }) + return Promise.resolve(); + }); + }) - .then(leave_to_process => { + .then(leave_to_process => { + // Ensure that Leave is in status from it could be revoked + if (!leave_to_process) { + throw new Error( + "Provided ID " + + request_id + + " does not correspond to any leave requests to be revoked by user " + + req.user.id + ); + } - // Ensure that Leave is in status from it could be revoked - if (! leave_to_process) { - throw new Error('Provided ID '+request_id - +' does not correspond to any leave requests to be revoked by user ' - + req.user.id - ); - } + // Do the action + return leave_to_process.promise_to_revoke(); + }) - // Do the action - return leave_to_process.promise_to_revoke(); + // Ensure that Leave object has all content necessary for sending emails + .then(processed_leave => + processed_leave.reload({ + include: [ + { model: req.app.get("db_model").User, as: "user" }, + { model: req.app.get("db_model").User, as: "approver" }, + { model: req.app.get("db_model").LeaveType, as: "leave_type" } + ] }) + ) - // Ensure that Leave object has all content necessary for sending emails - .then(processed_leave => processed_leave.reload({ - include : [ - {model : req.app.get('db_model').User, as : 'user'}, - {model : req.app.get('db_model').User, as : 'approver'}, - {model : req.app.get('db_model').LeaveType, as : 'leave_type' }, - ], - })) - - // Send relevant emails - .then(processed_leave => { - - var Email = new EmailTransport(); + // Send relevant emails + .then(processed_leave => { + var Email = new EmailTransport(); - return Email.promise_leave_request_revoke_emails({ - leave : processed_leave, - }) - .then(function(){ - return Promise.resolve(processed_leave); - }); - }) + return Email.promise_leave_request_revoke_emails({ + leave: processed_leave + }).then(function() { + return Promise.resolve(processed_leave); + }); + }) - // Deal with next page: where to land and what to show - .then(processed_leave => { - req.session.flash_message( - 'You have requested leave to be revoked. ' - + ( - processed_leave.user.is_auto_approve() - ? '' - : 'Your supervisor needs to approve it' - ) - ); + // Deal with next page: where to land and what to show + .then(processed_leave => { + req.session.flash_message( + "You have requested leave to be revoked. " + + (processed_leave.user.is_auto_approve() + ? "" + : "Your supervisor needs to approve it") + ); - return res.redirect_with_session('../'); - }) + return res.redirect_with_session("../"); + }) - // Deal with issues if any occurs - .catch(error => { - console.error('An error occurred when attempting to revoke leave request ' - +request_id+' by user '+req.user.id+' Error: '+error - ); - req.session.flash_error('Failed to revoke leave request'); - return res.redirect_with_session('../'); - }); - } -); + // Deal with issues if any occurs + .catch(error => { + console.error( + "An error occurred when attempting to revoke leave request " + + request_id + + " by user " + + req.user.id + + " Error: " + + error + ); + req.session.flash_error("Failed to revoke leave request"); + return res.redirect_with_session("../"); + }); +}); module.exports = router; diff --git a/lib/route/settings.js b/lib/route/settings.js index 02c7df464..2bbe93be4 100644 --- a/lib/route/settings.js +++ b/lib/route/settings.js @@ -4,211 +4,230 @@ "use strict"; -const - express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - moment_tz = require('moment-timezone'), - config = require('../config'), - Exception = require('../error'), - {extractUserErrorMessage, extractSystemErrorMessage} = Exception, - CompanyRemover = require('../model/company/remover'), - {calculateCarryOverAllowance} = require('../model/calculateCarryOverAllowance'), - uuidv4 = require('uuid/v4'), - _ = require('underscore'); - -const - CompanyExporter = require('../model/company/exporter'); +const express = require("express"), + router = express.Router(), + validator = require("validator"), + Promise = require("bluebird"), + moment = require("moment"), + moment_tz = require("moment-timezone"), + config = require("../config"), + Exception = require("../error"), + { extractUserErrorMessage, extractSystemErrorMessage } = Exception, + CompanyRemover = require("../model/company/remover"), + { + calculateCarryOverAllowance + } = require("../model/calculateCarryOverAllowance"), + uuidv4 = require("uuid/v4"), + _ = require("underscore"); + +const CompanyExporter = require("../model/company/exporter"); // Make sure that current user is authorized to deal with settings -router.all(/.*/, require('../middleware/ensure_user_is_admin')); +router.all(/.*/, require("../middleware/ensure_user_is_admin")); +router.get("/general/", function(req, res) { + res.locals.custom_java_script.push("/js/settings_general.js"); -router.get('/general/', function(req, res){ + res.locals.custom_css.push("/css/bootstrap-datepicker3.standalone.css"); - res.locals.custom_java_script.push( - '/js/settings_general.js' - ); - - res.locals.custom_css.push( - '/css/bootstrap-datepicker3.standalone.css' - ); - - var model = req.app.get('db_model'); + var model = req.app.get("db_model"); var company; - req.user.getCompany({ - include : [ - { model : model.BankHoliday, as : 'bank_holidays' }, - { model : model.LeaveType, as : 'leave_types' }, - ], - order : [ - [{model: model.BankHoliday, as : 'bank_holidays'}, 'date' ], - [{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(), + req.user + .getCompany({ + include: [ + { model: model.BankHoliday, as: "bank_holidays" }, + { model: model.LeaveType, as: "leave_types" } + ], + order: [ + [{ model: model.BankHoliday, as: "bank_holidays" }, "date"], + [{ 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() + }); }); - }); }); -router.post('/company/', function(req, res){ - - const - name = validator.trim(req.param('name')), - country_code = validator.trim(req.param('country')), - date_format = validator.trim(req.param('date_format')), - timezone = validator.trim(req.param('timezone')), - carriedOverDays = validator.trim(req.param('carry_over')), - share_all_absences= validator.toBoolean( - req.param('share_all_absences') - ); +router.post("/company/", function(req, res) { + const name = validator.trim(req.param("name")), + country_code = validator.trim(req.param("country")), + date_format = validator.trim(req.param("date_format")), + timezone = validator.trim(req.param("timezone")), + carriedOverDays = validator.trim(req.param("carry_over")), + share_all_absences = validator.toBoolean(req.param("share_all_absences")); - if (!validator.isAlphanumeric(country_code)){ - req.session.flash_error('Country should contain only letters and numbers'); + if (!validator.isAlphanumeric(country_code)) { + req.session.flash_error("Country should contain only letters and numbers"); } - if ( ! moment_tz.tz.names().find(tz_str => tz_str === timezone) ) { - req.session.flash_error('Time zone is unknown'); + if (!moment_tz.tz.names().find(tz_str => tz_str === timezone)) { + req.session.flash_error("Time zone is unknown"); } - if ( ! validator.isNumeric(carriedOverDays)) { - req.session.flash_error('Carried over allowance has to be a number'); + if (!validator.isNumeric(carriedOverDays)) { + req.session.flash_error("Carried over allowance has to be a number"); } // In case of validation error redirect back to edit form - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('/settings/general/'); + if (req.session.flash_has_errors()) { + return res.redirect_with_session("/settings/general/"); } - req.user.getCompany() - - // Validate provided date format - .then(function(company){ - - if ( _.indexOf( company.get_available_date_formats(), date_format ) < 0 ) { - var error_msg = 'Unknown date format was provided'; - req.session.flash_error(error_msg); - throw new Error(error_msg); - } + req.user + .getCompany() - return Promise.resolve( company ); - }) + // Validate provided date format + .then(function(company) { + if (_.indexOf(company.get_available_date_formats(), date_format) < 0) { + var error_msg = "Unknown date format was provided"; + req.session.flash_error(error_msg); + throw new Error(error_msg); + } - .then(company => { - company.name = name; - company.country = country_code; - company.share_all_absences= share_all_absences; - company.date_format = date_format; - company.timezone = timezone; - company.carry_over = carriedOverDays; + return Promise.resolve(company); + }) - return company.save(); - }) - .then(function(){ - req.session.flash_message('Company was successfully updated'); - return res.redirect_with_session('/settings/general/'); - }) - .catch(function(error){ - console.log( - `An error occurred when trying to edit company for user ${req.user.id}: ${error} at ${error.stack}` - ); + .then(company => { + company.name = name; + company.country = country_code; + company.share_all_absences = share_all_absences; + company.date_format = date_format; + company.timezone = timezone; + company.carry_over = carriedOverDays; + + return company.save(); + }) + .then(function() { + req.session.flash_message("Company was successfully updated"); + return res.redirect_with_session("/settings/general/"); + }) + .catch(function(error) { + console.log( + `An error occurred when trying to edit company for user ${ + req.user.id + }: ${error} at ${error.stack}` + ); - req.session.flash_error( - 'Failed to update company details, please contact customer service' - ); + req.session.flash_error( + "Failed to update company details, please contact customer service" + ); - return res.redirect_with_session('/settings/general/'); - }); + return res.redirect_with_session("/settings/general/"); + }); }); -router.post('/carryOverUnusedAllowance/', (req, res) => { +router.post("/carryOverUnusedAllowance/", (req, res) => { req.user .getCompany() .then(company => company.getUsers()) - .then(users => calculateCarryOverAllowance({users})) - .then(() => req.session.flash_message( - 'Unused allowance was successfully carried over' - )) + .then(users => calculateCarryOverAllowance({ users })) + .then(() => + req.session.flash_message( + "Unused allowance was successfully carried over" + ) + ) .catch(error => { const logMarker = uuidv4(); console.log( - `[${logMarker}] An error occurred while trying to carry over unused allowance by user ${req.user.id}: ${error} at ${error.stack}` + `[${logMarker}] An error occurred while trying to carry over unused allowance by user ${ + req.user.id + }: ${error} at ${error.stack}` ); req.session.flash_error( `Failed to carry over unused allowances, please contact customer service and provide incident ID: ${logMarker}` ); }) - .finally(() => res.redirect_with_session('/settings/general/')); + .finally(() => res.redirect_with_session("/settings/general/")); }); -router.post('/schedule/', function(req, res){ - - var company, schedule, user, - model = req.app.get('db_model'); +router.post("/schedule/", function(req, res) { + var company, + schedule, + user, + model = req.app.get("db_model"); - req.user.getCompany() + req.user + .getCompany() // Obtain scheduler object - .then(function(c){ + .then(function(c) { company = c; - if ( ! req.body.user_id) { + if (!req.body.user_id) { // We are dealing with company wide schedule: easy return company.promise_schedule(); } // Rest is attempt to fetch user specific schedule for given user - return company.getUsers({ - where : { - id : validator.trim( req.body.user_id ), - } - }) - .then(function(u){ - user = u.pop(); + return company + .getUsers({ + where: { + id: validator.trim(req.body.user_id) + } + }) + .then(function(u) { + user = u.pop(); - if ( ! user) { - throw new Error( - "Failed to find user "+req.body.user_id+" for company "+company.id - ); - } + if (!user) { + throw new Error( + "Failed to find user " + + req.body.user_id + + " for company " + + company.id + ); + } - return user.promise_schedule_I_obey(); - }) - .then(function(sch){ - if (sch.is_user_specific()) { - // User specific schedule exists in database - return Promise.resolve(sch); - } + return user.promise_schedule_I_obey(); + }) + .then(function(sch) { + if (sch.is_user_specific()) { + // User specific schedule exists in database + return Promise.resolve(sch); + } - // No user specific schedule in database: create in memory default instance - return model.Schedule - .promise_to_build_default_for({ user_id : user.id }); - }); + // No user specific schedule in database: create in memory default instance + return model.Schedule.promise_to_build_default_for({ + user_id: user.id + }); + }); }) // Update schedule object - .then(function(sch){ + .then(function(sch) { schedule = sch; - ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'] - .forEach(function(day){ schedule.set(day, req.body[day]) }); + [ + "monday", + "tuesday", + "wednesday", + "thursday", + "friday", + "saturday", + "sunday" + ].forEach(function(day) { + schedule.set(day, req.body[day]); + }); - if (schedule.is_user_specific() && _.has(req.body, 'revoke_user_specific_schedule') ) { + if ( + schedule.is_user_specific() && + _.has(req.body, "revoke_user_specific_schedule") + ) { return schedule.destroy(); } else { return schedule.save(); @@ -216,237 +235,238 @@ router.post('/schedule/', function(req, res){ }) // Action is successfully done - .then(function(){ - req.session.flash_message( schedule.is_user_specific() - ? 'Schedule for user was saved' - : 'Schedule for company was saved' + .then(function() { + req.session.flash_message( + schedule.is_user_specific() + ? "Schedule for user was saved" + : "Schedule for company was saved" ); }) // Action failed - .catch(function(error){ - console.error('An error occurred while saving schedule: ' + error); - req.session.flash_error( schedule.is_user_specific() - ? 'Failed to save user schedule' - : 'Failed to save company schedule' + .catch(function(error) { + console.error("An error occurred while saving schedule: " + error); + req.session.flash_error( + schedule.is_user_specific() + ? "Failed to save user schedule" + : "Failed to save company schedule" ); - }) // Depending on context redirect user to particular page - .finally(function(){ - res.redirect_with_session(schedule.is_user_specific() - ? (user ? '/users/edit/'+user.id+'/schedule/' : '/users/') - : '/settings/general/' + .finally(function() { + res.redirect_with_session( + schedule.is_user_specific() + ? user + ? "/users/edit/" + user.id + "/schedule/" + : "/users/" + : "/settings/general/" ); }); }); -router.post('/bankholidays/', function(req,res){ - var name = validator.trim(req.param('name')), - date = validator.trim(req.param('date')), - model= req.app.get('db_model'); +router.post("/bankholidays/", function(req, res) { + var name = validator.trim(req.param("name")), + date = validator.trim(req.param("date")), + model = req.app.get("db_model"); - req.user.getCompany({ - include : [{ model : model.BankHoliday, as : 'bank_holidays' }], - order : [[{model: model.BankHoliday, as : 'bank_holidays'}, 'date' ]], + req.user + .getCompany({ + include: [{ model: model.BankHoliday, as: "bank_holidays" }], + order: [[{ model: model.BankHoliday, as: "bank_holidays" }, "date"]] }) - .then(function(company){ - - var promise_new_bank_holiday = Promise.resolve(1); - - if (validator.trim(req.param('name__new'))) { - var attributes = get_and_validate_bank_holiday({ - req : req, - suffix : 'new', - item_name : 'New Bank Holiday' - }); - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); - } - attributes.companyId = company.id; - promise_new_bank_holiday = model.BankHoliday.create(attributes); - + .then(function(company) { + var promise_new_bank_holiday = Promise.resolve(1); + + if (validator.trim(req.param("name__new"))) { + var attributes = get_and_validate_bank_holiday({ + req: req, + suffix: "new", + item_name: "New Bank Holiday" + }); + if (req.session.flash_has_errors()) { + return Promise.resolve(1); } + attributes.companyId = company.id; + promise_new_bank_holiday = model.BankHoliday.create(attributes); + } - return Promise.all([ - promise_new_bank_holiday, - _.map( - - company.bank_holidays, - function(bank_holiday, index){ - - var attributes = get_and_validate_bank_holiday({ - req : req, - suffix : index, - item_name : bank_holiday.name, - }); - - // If there were any validation errors: do not update bank holiday - // (it affects all bank holidays, that is if one failed - // validation - all bank holidays are not to be updated) - if ( req.session.flash_has_errors() ) { - return Promise.resolve(1); - } + return Promise.all([ + promise_new_bank_holiday, + _.map(company.bank_holidays, function(bank_holiday, index) { + var attributes = get_and_validate_bank_holiday({ + req: req, + suffix: index, + item_name: bank_holiday.name + }); - return bank_holiday.updateAttributes(attributes); - } + // If there were any validation errors: do not update bank holiday + // (it affects all bank holidays, that is if one failed + // validation - all bank holidays are not to be updated) + if (req.session.flash_has_errors()) { + return Promise.resolve(1); + } - ) // End of map that create bank_holiday update promises - ]); + return bank_holiday.updateAttributes(attributes); + }) // End of map that create bank_holiday update promises + ]); }) - .then(function(){ - - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('/settings/general/'); - } else { - req.session.flash_message('Changes to bank holidays were saved'); - return res.redirect_with_session('/settings/general/'); - } + .then(function() { + if (req.session.flash_has_errors()) { + return res.redirect_with_session("/settings/general/"); + } else { + req.session.flash_message("Changes to bank holidays were saved"); + return res.redirect_with_session("/settings/general/"); + } }) - .catch(function(error){ - console.error( - 'An error occurred when trying to edit Bank holidays by user '+req.user.id - + ' : ' + error - ); + .catch(function(error) { + console.error( + "An error occurred when trying to edit Bank holidays by user " + + req.user.id + + " : " + + error + ); - req.session.flash_error( - 'Failed to update bank holidayes details, please contact customer service' - ); + req.session.flash_error( + "Failed to update bank holidayes details, please contact customer service" + ); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); - }); -router.post('/bankholidays/import/', (req, res) => { - let model = req.app.get('db_model'), - config_countries = config.get('countries'); +router.post("/bankholidays/import/", (req, res) => { + let model = req.app.get("db_model"), + config_countries = config.get("countries"); - Promise - .try(() => req.user.getCompany({ - scope : ['with_bank_holidays'], - })) + Promise.try(() => + req.user.getCompany({ + scope: ["with_bank_holidays"] + }) + ) .then(company => { - // re-organize existing bank holiday in look up map manner let existing_bank_holidays_map = {}; company.bank_holidays.forEach(bh => { - existing_bank_holidays_map[ company.normalise_date(bh.date) ] = 1; + existing_bank_holidays_map[company.normalise_date(bh.date)] = 1; }); // Fetch all default bank holidays known for current contry let bank_holidays_to_import = - config_countries[ (company.country || 'GB') ].bank_holidays; + config_countries[company.country || "GB"].bank_holidays; // prepare list of bank holidays that needs to be added bank_holidays_to_import = bank_holidays_to_import // Ignore those which dates already used - .filter(bh => ! existing_bank_holidays_map.hasOwnProperty( company.normalise_date( bh.date ) )) + .filter( + bh => + !existing_bank_holidays_map.hasOwnProperty( + company.normalise_date(bh.date) + ) + ) // and transform bank holidays into import friendly structure - .map( - bh => ({ name : bh.name, date : bh.date, companyId : company.id }) - ); + .map(bh => ({ name: bh.name, date: bh.date, companyId: company.id })); - return model.BankHoliday.bulkCreate( bank_holidays_to_import ); + return model.BankHoliday.bulkCreate(bank_holidays_to_import); }) - .then( created_bank_holidays => { - - if ( created_bank_holidays.length && created_bank_holidays.length > 0) { + .then(created_bank_holidays => { + if (created_bank_holidays.length && created_bank_holidays.length > 0) { req.session.flash_message( - 'New bank holidays were added: ' - + created_bank_holidays.map(bh => bh.name).join(', ') + "New bank holidays were added: " + + created_bank_holidays.map(bh => bh.name).join(", ") ); } else { - - req.session.flash_message('No more new bank holidays exist'); + req.session.flash_message("No more new bank holidays exist"); } - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }) .catch(error => { - console.log( - 'An error occurred when trying to import default bank holidays by user '+req.user.id + "An error occurred when trying to import default bank holidays by user " + + req.user.id ); console.dir(error); - if ( error && error.tom_error) { - req.session.flash_error( Exception.extract_user_error_message(error) ); + if (error && error.tom_error) { + req.session.flash_error(Exception.extract_user_error_message(error)); } - req.session.flash_error( - 'Failed to import bank holidays' - ); + req.session.flash_error("Failed to import bank holidays"); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); }); -router.post('/bankholidays/delete/:bank_holiday_number/', function(req, res){ - - // bank_holiday_number is a index number of bank_holiday to be removed based - // on the list of bank holidays on the page, this is not an ID - var bank_holiday_number = req.param('bank_holiday_number'); +router.post("/bankholidays/delete/:bank_holiday_number/", function(req, res) { + // bank_holiday_number is a index number of bank_holiday to be removed based + // on the list of bank holidays on the page, this is not an ID + var bank_holiday_number = req.param("bank_holiday_number"); - var model = req.app.get('db_model'); + var model = req.app.get("db_model"); - if (!validator.isInt(bank_holiday_number)) { - console.error( - 'User '+req.user.id+' submited non-int bank holiday number ' - +bank_holiday_number - ); + if (!validator.isInt(bank_holiday_number)) { + console.error( + "User " + + req.user.id + + " submited non-int bank holiday number " + + bank_holiday_number + ); - req.session.flash_error('Cannot remove bank holiday: wronge parameters'); + req.session.flash_error("Cannot remove bank holiday: wronge parameters"); - return res.redirect_with_session('/settings/general/'); - } + return res.redirect_with_session("/settings/general/"); + } - req.user.getCompany({ - include : [{ model : model.BankHoliday, as : 'bank_holidays' }], - order : [[{model: model.BankHoliday, as : 'bank_holidays'}, 'date' ]], + req.user + .getCompany({ + include: [{ model: model.BankHoliday, as: "bank_holidays" }], + order: [[{ model: model.BankHoliday, as: "bank_holidays" }, "date"]] }) - .then(function(company){ - var bank_holiday_to_remove = company.bank_holidays[ bank_holiday_number ]; + .then(function(company) { + var bank_holiday_to_remove = company.bank_holidays[bank_holiday_number]; - // Check if user specify valid department number - if (! bank_holiday_to_remove) { - - console.error( - 'User '+req.user.id+' tried to remove non-existing bank holiday number' - +bank_holiday_number+' out of '+company.bank_holidays.length - ); + // Check if user specify valid department number + if (!bank_holiday_to_remove) { + console.error( + "User " + + req.user.id + + " tried to remove non-existing bank holiday number" + + bank_holiday_number + + " out of " + + company.bank_holidays.length + ); - req.session.flash_error('Cannot remove bank holiday: wronge parameters'); + req.session.flash_error( + "Cannot remove bank holiday: wronge parameters" + ); - return res.redirect_with_session('/settings/general/'); - } + return res.redirect_with_session("/settings/general/"); + } - return bank_holiday_to_remove.destroy(); + return bank_holiday_to_remove.destroy(); }) - .then(function(){ - req.session.flash_message('Bank holiday was successfully removed'); - return res.redirect_with_session('/settings/general/'); + .then(function() { + req.session.flash_message("Bank holiday was successfully removed"); + return res.redirect_with_session("/settings/general/"); }); }); -router.post('/leavetypes', function(req, res){ - - var model = req.app.get('db_model'); +router.post("/leavetypes", function(req, res) { + var model = req.app.get("db_model"); req.user .get_company_with_all_leave_types() - .then(function(company){ - + .then(function(company) { var promise_new_leave_type = Promise.resolve(1); - if (validator.trim(req.param('name__new'))) { + if (validator.trim(req.param("name__new"))) { var attributes = get_and_validate_leave_type({ - req : req, - suffix : 'new', - item_name : 'New Leave Type' + req: req, + suffix: "new", + item_name: "New Leave Type" }); attributes.companyId = company.id; promise_new_leave_type = model.LeaveType.create(attributes); @@ -454,191 +474,194 @@ router.post('/leavetypes', function(req, res){ return Promise.all([ promise_new_leave_type, - _.map( - company.leave_types, - function(leave_type, index){ - - let attributes = get_and_validate_leave_type({ - req : req, - suffix : leave_type.id, - item_name : leave_type.name, - }); - - // Update leave type only if there are attributes submitted for it - return attributes - ? leave_type.updateAttributes(attributes) - : Promise.resolve(1); - } + _.map(company.leave_types, function(leave_type, index) { + let attributes = get_and_validate_leave_type({ + req: req, + suffix: leave_type.id, + item_name: leave_type.name + }); - ) // End of map that create leave type update promises + // Update leave type only if there are attributes submitted for it + return attributes + ? leave_type.updateAttributes(attributes) + : Promise.resolve(1); + }) // End of map that create leave type update promises ]); }) .then(() => { - req.session.flash_message('Changes to leave types were saved'); - return res.redirect_with_session('/settings/general/'); + req.session.flash_message("Changes to leave types were saved"); + return res.redirect_with_session("/settings/general/"); }) .catch(error => { console.error( - 'An error occurred when trying to edit Leave types by user '+req.user.id - + ' : ' + error + "An error occurred when trying to edit Leave types by user " + + req.user.id + + " : " + + error ); - if (error.hasOwnProperty('user_message')) { - req.session.flash_error( error.user_message ); + if (error.hasOwnProperty("user_message")) { + req.session.flash_error(error.user_message); } req.session.flash_error( - 'Failed to update leave types details, please contact customer service' + "Failed to update leave types details, please contact customer service" ); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); }); +router.post("/leavetypes/delete/:leave_type_id/", function(req, res) { + var leave_type_id = req.param("leave_type_id"); -router.post('/leavetypes/delete/:leave_type_id/', function(req, res){ - - var leave_type_id = req.param('leave_type_id'); + var model = req.app.get("db_model"); - var model = req.app.get('db_model'); - - if (!validator.isInt(leave_type_id)) { - console.error( - 'User '+req.user.id+' submited non-int leave_type number ' - +bank_holiday_number - ); + if (!validator.isInt(leave_type_id)) { + console.error( + "User " + + req.user.id + + " submited non-int leave_type number " + + bank_holiday_number + ); - req.session.flash_error('Cannot remove leave_type: wronge parameters'); + req.session.flash_error("Cannot remove leave_type: wronge parameters"); - return res.redirect_with_session('/settings/general/'); - } + return res.redirect_with_session("/settings/general/"); + } - req.user.getCompany({ - include : [{ - model : model.LeaveType, - as : 'leave_types', - include : [{model: model.Leave, as: 'leaves'}], - }], - order : [[{model: model.LeaveType, as : 'leave_types'}, 'name' ]], + req.user + .getCompany({ + include: [ + { + model: model.LeaveType, + as: "leave_types", + include: [{ model: model.Leave, as: "leaves" }] + } + ], + order: [[{ model: model.LeaveType, as: "leave_types" }, "name"]] }) - .then(function(company){ - var leave_type_to_remove = company.leave_types.find( lt => String(lt.id) === String(leave_type_id) ); - - // Check if user specify valid department number - if (! leave_type_to_remove) { - - req.session.flash_error('Cannot remove leave type: wronge parameters'); - - throw new Error( - 'User '+req.user.id+' tried to remove non-existing leave type number' - +leave_type_id+' out of '+company.leave_types.length - ); + .then(function(company) { + var leave_type_to_remove = company.leave_types.find( + lt => String(lt.id) === String(leave_type_id) + ); + // Check if user specify valid department number + if (!leave_type_to_remove) { + req.session.flash_error("Cannot remove leave type: wronge parameters"); + + throw new Error( + "User " + + req.user.id + + " tried to remove non-existing leave type number" + + leave_type_id + + " out of " + + company.leave_types.length + ); // Check if there exist leaves for current type and if so, do not remove it - } else if (leave_type_to_remove.leaves.length > 0) { - - req.session.flash_error('Cannot remove leave type: type is in use'); + } else if (leave_type_to_remove.leaves.length > 0) { + req.session.flash_error("Cannot remove leave type: type is in use"); - throw new Error('Failed to remove Leave type because it is in used.'); - } + throw new Error("Failed to remove Leave type because it is in used."); + } - return leave_type_to_remove.destroy(); + return leave_type_to_remove.destroy(); }) - .then(function(){ - req.session.flash_message('Leave type was successfully removed'); - return res.redirect_with_session('/settings/general/'); + .then(function() { + req.session.flash_message("Leave type was successfully removed"); + return res.redirect_with_session("/settings/general/"); }) - .catch(function(error){ - console.error( - 'An error occurred when trying to remove leave type by user' + req.user.id - + ' : ' + error - ); + .catch(function(error) { + console.error( + "An error occurred when trying to remove leave type by user" + + req.user.id + + " : " + + error + ); - req.session.flash_error( - 'Failed to remove Leave Type' - ); + req.session.flash_error("Failed to remove Leave Type"); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); }); -router.get('/company/integration-api/', (req, res) => { - req.user - .getCompany() - .then(company => res.render('settings_company_integration_api', { - company, - })); +router.get("/company/integration-api/", (req, res) => { + req.user.getCompany().then(company => + res.render("settings_company_integration_api", { + company + }) + ); }); -router.post('/company/integration-api/', (req, res) => { - const featureIsEnabled = validator.toBoolean(req.body.integration_api_enabled); +router.post("/company/integration-api/", (req, res) => { + const featureIsEnabled = validator.toBoolean( + req.body.integration_api_enabled + ); let action = req.user.getCompany(); action = action.then(company => { - company.set('integration_api_enabled', featureIsEnabled); + company.set("integration_api_enabled", featureIsEnabled); return company.save(); }); if (req.body.regenerate_token) { - action = action.then( company => company.regenerateIntegrationApiToken() ); + action = action.then(company => company.regenerateIntegrationApiToken()); } action = action.then(company => { - req.session.flash_message('Settings were saved'); + req.session.flash_message("Settings were saved"); - return res.redirect_with_session('./'); + return res.redirect_with_session("./"); }); action = action.catch(error => { - console.log(`Failed to save Integration API configuration, reason: ${ extractSystemErrorMessage(error) }`); + console.log( + `Failed to save Integration API configuration, reason: ${extractSystemErrorMessage( + error + )}` + ); req.session.flash_error( - `Failed to save settings. ${ extractUserErrorMessage(error) }` + `Failed to save settings. ${extractUserErrorMessage(error)}` ); - return res.redirect_with_session('./'); - }) + return res.redirect_with_session("./"); + }); }); -router.get('/company/authentication/', function(req, res){ - - req.user - .getCompany() - .then(function(company){ - res.render('settings_company_authentication', { - company : company, - ldap_config : company.get('ldap_auth_config'), - }); +router.get("/company/authentication/", function(req, res) { + req.user.getCompany().then(function(company) { + res.render("settings_company_authentication", { + company: company, + ldap_config: company.get("ldap_auth_config") }); + }); }); - -router.post('/company/authentication/', function(req, res){ - +router.post("/company/authentication/", function(req, res) { req.user .getCompany() - .then(function(company){ - + .then(function(company) { var parameters = get_and_validate_ldap_auth_configuration({ - req : req, + req: req }); // Updaye in memory Company object but do not save changes until new LDAP // configuration checked against current user // (this is needed to prevent situation when admin by lock herself out) - company.set('ldap_auth_config', parameters.ldap_config); - company.setDataValue('ldap_auth_enabled', parameters.ldap_auth_enabled); + company.set("ldap_auth_config", parameters.ldap_config); + company.setDataValue("ldap_auth_enabled", parameters.ldap_auth_enabled); var ldap_server = company.get_ldap_server(); - + // Handle event based errors from ldapauth-fork var ldapError = ""; - ldap_server.on('error', function(err) { + ldap_server.on("error", function(err) { ldapError = err; }); - + var auth_func = function(email, password) { return new Promise(function(resolve, reject) { // Wait one second before cheking for event based errors @@ -655,119 +678,121 @@ router.post('/company/authentication/', function(req, res){ resolve(user); } }); - }); - }; - - return auth_func(req.user.email, parameters.password_to_check) - .then(function(){ - return company.save(); - }) - .catch(function(error){ - error = new Error( - "Failed to validate new LDAP settings with provided current user password. "+error - ); - error.show_to_user = true; - throw error; - }); + }); + }; + + return auth_func(req.user.email, parameters.password_to_check) + .then(function() { + return company.save(); + }) + .catch(function(error) { + error = new Error( + "Failed to validate new LDAP settings with provided current user password. " + + error + ); + error.show_to_user = true; + throw error; + }); }) - .then(function(){ - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('/settings/company/authentication/'); + .then(function() { + if (req.session.flash_has_errors()) { + return res.redirect_with_session("/settings/company/authentication/"); } else { - req.session.flash_message('LDAP configuration was updated'); - return res.redirect_with_session('/settings/company/authentication/'); + req.session.flash_message("LDAP configuration was updated"); + return res.redirect_with_session("/settings/company/authentication/"); } }) - .catch(function(error){ + .catch(function(error) { console.error( - "An error occured while trying to update LDAP configuration: %s", error + "An error occured while trying to update LDAP configuration: %s", + error ); req.session.flash_error( - 'Failed to update LDAP configuration. ' + - ( error.show_to_user ? error : 'Please contact customer service') + "Failed to update LDAP configuration. " + + (error.show_to_user ? error : "Please contact customer service") ); - return res.redirect_with_session('/settings/company/authentication/'); + return res.redirect_with_session("/settings/company/authentication/"); }); }); function get_and_validate_bank_holiday(args) { - var req = args.req, - index = args.suffix, - item_name = args.item_name; + var req = args.req, + index = args.suffix, + item_name = args.item_name; // Get user parameters - var name = validator.trim(req.param('name__'+index)), - date = validator.trim(req.param('date__'+index)); + var name = validator.trim(req.param("name__" + index)), + date = validator.trim(req.param("date__" + index)); // Validate provided parameters // // Note, we allow users to put whatever they want into the name. // The XSS defence is in the templates - date = req.user.company.normalise_date( date ); + date = req.user.company.normalise_date(date); - if ( ! validator.isDate(date) ) { - req.session.flash_error( - 'New day for '+item_name+' should be date' - ); + if (!validator.isDate(date)) { + req.session.flash_error("New day for " + item_name + " should be date"); } return { - name : name, - date : date, + name: name, + date: date }; } function get_and_validate_leave_type(args) { - let - req = args.req, - suffix = args.suffix, + let req = args.req, + suffix = args.suffix, item_name = args.item_name; // Get user parameters - let - name = validator.trim(req.param('name__'+suffix)), - color = validator.trim(req.param('color__'+suffix)) || 'leave_type_color_1', - limit = validator.trim(req.param('limit__'+suffix)) || 0, - first_record = validator.trim(req.param('first_record')) || 0, - use_allowance = validator.toBoolean( - req.param('use_allowance__'+suffix) - ); + let name = validator.trim(req.param("name__" + suffix)), + color = + validator.trim(req.param("color__" + suffix)) || "leave_type_color_1", + limit = validator.trim(req.param("limit__" + suffix)) || 0, + first_record = validator.trim(req.param("first_record")) || 0, + use_allowance = validator.toBoolean(req.param("use_allowance__" + suffix)); // If no name for leave type was provided: do nothing - treat case // as no need to update the leave type - if ( ! name ) { + if (!name) { return false; } // VPP TODO move that into resusable component - let throw_user_error = function(message){ + let throw_user_error = function(message) { let error = new Error(message); error.user_message = message; throw error; }; // Validate provided parameters - if ( ! validator.matches(color, /^leave_type_color_\d+$/)) { - throw_user_error( 'New color for '+item_name+' should be valid css class' ); + if (!validator.matches(color, /^leave_type_color_\d+$/)) { + throw_user_error( + "New color for " + item_name + " should be valid css class" + ); } - if ( ! validator.isNumeric(limit) ){ - throw_user_error( 'New limit for '+item_name+' should be a valide number' ); - - } else if ( limit < 0) { - throw_user_error( 'New limit for '+item_name+' should be positive number or 0' ); + if (!validator.isNumeric(limit)) { + throw_user_error( + "New limit for " + item_name + " should be a valide number" + ); + } else if (limit < 0) { + throw_user_error( + "New limit for " + item_name + " should be positive number or 0" + ); } return { - name : name, - color : color, - use_allowance : use_allowance, - limit : limit, - sort_order : ( (first_record && (String(first_record)===String(suffix))? 1 : 0) ), + name: name, + color: color, + use_allowance: use_allowance, + limit: limit, + sort_order: first_record && String(first_record) === String(suffix) ? 1 : 0 }; } @@ -776,25 +801,26 @@ function get_and_validate_ldap_auth_configuration(args) { // Get parameters // - var url = validator.trim(req.param('url')), - binddn = validator.trim(req.param('binddn')), - bindcredentials = validator.trim(req.param('bindcredentials')), - searchbase = validator.trim(req.param('searchbase')), - ldap_auth_enabled = validator.toBoolean(req.param('ldap_auth_enabled')), - allow_unauthorized_cert = validator.toBoolean(req.param('allow_unauthorized_cert')), - - // Fetch the password of current user that is valid in LDAP system - password_to_check = validator.trim(req.param('password_to_check')); + var url = validator.trim(req.param("url")), + binddn = validator.trim(req.param("binddn")), + bindcredentials = validator.trim(req.param("bindcredentials")), + searchbase = validator.trim(req.param("searchbase")), + ldap_auth_enabled = validator.toBoolean(req.param("ldap_auth_enabled")), + allow_unauthorized_cert = validator.toBoolean( + req.param("allow_unauthorized_cert") + ), + // Fetch the password of current user that is valid in LDAP system + password_to_check = validator.trim(req.param("password_to_check")); // Validate provided parameters - if (!validator.matches(url, /^ldaps?:\/\/[a-z0-9\.\-]+:\d+$/i)){ + if (!validator.matches(url, /^ldaps?:\/\/[a-z0-9\.\-]+:\d+$/i)) { req.session.flash_error( "URL to LDAP server must be of following format: 'ldap://HOSTNAME:PORT'" ); } - if ( req.session.flash_has_errors() ) { + if (req.session.flash_has_errors()) { var error = new Error("Validation failed"); error.show_to_user = true; throw error; @@ -802,92 +828,101 @@ function get_and_validate_ldap_auth_configuration(args) { // Return the configuration object return { - ldap_config : { - url : url, - binddn : binddn, - bindcredentials : bindcredentials, - searchbase : searchbase, - allow_unauthorized_cert : allow_unauthorized_cert, + ldap_config: { + url: url, + binddn: binddn, + bindcredentials: bindcredentials, + searchbase: searchbase, + allow_unauthorized_cert: allow_unauthorized_cert }, - ldap_auth_enabled : ldap_auth_enabled, - password_to_check : password_to_check, + ldap_auth_enabled: ldap_auth_enabled, + password_to_check: password_to_check }; } -router.get('/company/backup/', (req, res) => { +router.get("/company/backup/", (req, res) => { const companyExporter = new CompanyExporter({ - dbSchema : req.app.get('db_model'), + dbSchema: req.app.get("db_model") }); let company; req.user .getCompany() - .then(c => Promise.resolve(company = c)) + .then(c => Promise.resolve((company = c))) // Generate company summary - .then(company => companyExporter.promiseCompanySummary({ company : company })) + .then(company => + companyExporter.promiseCompanySummary({ company: company }) + ) // Get CSV presentation of company summary .then(companySummary => companySummary.promise_as_csv_string()) .then(csv_content => { - - res.attachment( - company.name_for_machine()+'_backup.csv' - ); + res.attachment(company.name_for_machine() + "_backup.csv"); res.send(csv_content); }) - .catch(function(error){ + .catch(function(error) { console.error( - "An error occured while downloading company summary: %s, at %s", error, error.stack + "An error occured while downloading company summary: %s, at %s", + error, + error.stack ); req.session.flash_error( "Failed to download company summary. " + - ( error.show_to_user ? error : 'Please contact customer service') + (error.show_to_user ? error : "Please contact customer service") ); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); }); -router.post('/company/delete/', (req, res) => { - +router.post("/company/delete/", (req, res) => { let company; req.user .getCompany() - .then(c => Promise.resolve(company = c)) - .then(company => CompanyRemover.promiseToRemove({ - company : company, - byUser : req.user, - confirmName : req.body.confirm_name, - })) + .then(c => Promise.resolve((company = c))) + .then(company => + CompanyRemover.promiseToRemove({ + company: company, + byUser: req.user, + confirmName: req.body.confirm_name + }) + ) .then(() => { - req.session.flash_message(`Company ${company.name} and related data were successfully removed`); + req.session.flash_message( + `Company ${company.name} and related data were successfully removed` + ); - return res.redirect_with_session('/'); + return res.redirect_with_session("/"); }) .catch(error => { - console.log( - `Failed to remove ${company.id} by user ${req.user.id}. Reason: ${ Exception.extract_system_error_message(error) }, at ${error.stack}` + `Failed to remove ${company.id} by user ${ + req.user.id + }. Reason: ${Exception.extract_system_error_message(error)}, at ${ + error.stack + }` ); req.session.flash_error( - `Failed to remove company. Reason: ${ Exception.extract_user_error_message(error) }` + `Failed to remove company. Reason: ${Exception.extract_user_error_message( + error + )}` ); - return res.redirect_with_session('/settings/general/'); + return res.redirect_with_session("/settings/general/"); }); }); -const getAvailableCarriedOverOptions = () => ([ - {days : 0, label : 'None'}, - ...[...Array(21).keys()].filter(i=>i>0).map(i=>({days:i, label:i})), - {days: 1000, label: 'All'}, -]); +const getAvailableCarriedOverOptions = () => [ + { days: 0, label: "None" }, + ...[...Array(21).keys()].filter(i => i > 0).map(i => ({ days: i, label: i })), + { days: 1000, label: "All" } +]; module.exports = router; diff --git a/lib/route/users.js b/lib/route/users.js index 5ee8805fb..7690a774a 100644 --- a/lib/route/users.js +++ b/lib/route/users.js @@ -1,428 +1,432 @@ - "use strict"; -const - express = require('express'), - router = express.Router(), - validator = require('validator'), - Promise = require('bluebird'), - moment = require('moment'), - _ = require('underscore'), - uuid = require('node-uuid'), - csv = Promise.promisifyAll(require('csv')), - fs = require("fs"), - formidable = require('formidable'), - LeaveCollectionUtil = require('../model/leave_collection')(), - Exception = require('../error'), - UserImporter = require('../model/user_importer'), - EmailTransport = require('../email'), - {getAuditCaptureForUser} = require('../model/audit'); +const express = require("express"), + router = express.Router(), + validator = require("validator"), + Promise = require("bluebird"), + moment = require("moment"), + _ = require("underscore"), + uuid = require("node-uuid"), + csv = Promise.promisifyAll(require("csv")), + fs = require("fs"), + formidable = require("formidable"), + LeaveCollectionUtil = require("../model/leave_collection")(), + Exception = require("../error"), + UserImporter = require("../model/user_importer"), + EmailTransport = require("../email"), + { getAuditCaptureForUser } = require("../model/audit"); // Make sure that current user is authorized to deal with settings -router.all(/.*/, require('../middleware/ensure_user_is_admin')); +router.all(/.*/, require("../middleware/ensure_user_is_admin")); -router.get('/add/', function(req, res){ - req.user - .get_company_for_add_user() - .then(function(company){ - res.render('user_add', { - company : company, - }); +router.get("/add/", function(req, res) { + req.user.get_company_for_add_user().then(function(company) { + res.render("user_add", { + company: company }); + }); }); -router.post('/add/', function(req, res){ - - const - model = req.app.get('db_model'), +router.post("/add/", function(req, res) { + const model = req.app.get("db_model"), Email = new EmailTransport(); - let current_company, - new_user_attributes; + let current_company, new_user_attributes; req.user - .get_company_for_add_user() - .then(function(company){ + .get_company_for_add_user() + .then(function(company) { + current_company = company; + + new_user_attributes = get_and_validate_user_parameters({ + req: req, + item_name: "user", + departments: company.departments, + // If current company has LDAP auth do not require password + require_password: company.ldap_auth_enabled ? false : true + }); - current_company = company; + return Promise.resolve(); + }) - new_user_attributes = get_and_validate_user_parameters({ - req : req, - item_name : 'user', - departments : company.departments, - // If current company has LDAP auth do not require password - require_password : (company.ldap_auth_enabled ? false : true ), - }); + // Make sure that we do not add user with existing emails + .then(() => + UserImporter.validate_email_to_be_free({ + email: new_user_attributes.email + }) + ) - return Promise.resolve(); - }) + // Add new user to database + .then(() => + UserImporter.add_user({ + name: new_user_attributes.name, + lastname: new_user_attributes.lastname, + email: new_user_attributes.email, + department_id: new_user_attributes.DepartmentId, + start_date: new_user_attributes.start_date, + end_date: new_user_attributes.end_date, + admin: new_user_attributes.admin, + auto_approve: new_user_attributes.auto_approve, + company_id: req.user.companyId, + password: new_user_attributes.password + }) + ) - // Make sure that we do not add user with existing emails - .then(() => UserImporter - .validate_email_to_be_free({ email : new_user_attributes.email }) - ) - - // Add new user to database - .then(() => UserImporter.add_user({ - name : new_user_attributes.name, - lastname : new_user_attributes.lastname, - email : new_user_attributes.email, - department_id : new_user_attributes.DepartmentId, - start_date : new_user_attributes.start_date, - end_date : new_user_attributes.end_date, - admin : new_user_attributes.admin, - auto_approve : new_user_attributes.auto_approve, - company_id : req.user.companyId, - password : new_user_attributes.password, - })) - - .then(new_user => Email.promise_add_new_user_email({ - company : current_company, - admin_user : req.user, - new_user : new_user, - })) - - .then(function(){ - if ( req.session.flash_has_errors() ) { - return res.redirect_with_session('../add/'); - } else { - req.session.flash_message('New user account successfully added'); - return res.redirect_with_session('../'); - } - }) + .then(new_user => + Email.promise_add_new_user_email({ + company: current_company, + admin_user: req.user, + new_user: new_user + }) + ) - .catch(function(error){ - console.log( - 'An error occurred when trying to add new user account by user '+req.user.id - ); - console.dir(error); + .then(function() { + if (req.session.flash_has_errors()) { + return res.redirect_with_session("../add/"); + } else { + req.session.flash_message("New user account successfully added"); + return res.redirect_with_session("../"); + } + }) - if ( error && error.tom_error) { - req.session.flash_error( Exception.extract_user_error_message(error) ); - } + .catch(function(error) { + console.log( + "An error occurred when trying to add new user account by user " + + req.user.id + ); + console.dir(error); - req.session.flash_error( - 'Failed to add new user' - ); + if (error && error.tom_error) { + req.session.flash_error(Exception.extract_user_error_message(error)); + } - return res.redirect_with_session('../add/'); - }); + req.session.flash_error("Failed to add new user"); + + return res.redirect_with_session("../add/"); + }); }); -router.get('/import/', function(req, res){ - req.user - .getCompany() - .then(company => res.render( - 'users_import', { - company : company, - } - )); +router.get("/import/", function(req, res) { + req.user.getCompany().then(company => + res.render("users_import", { + company: company + }) + ); }); -router.post('/import/', function(req, res){ - let - form = new formidable.IncomingForm(), - model = req.app.get('db_model'), +router.post("/import/", function(req, res) { + let form = new formidable.IncomingForm(), + model = req.app.get("db_model"), parseAsync = Promise.promisify(form.parse); parseAsync .call(form, req) .then(args => { - let files = args[1]; if (files.users_import.size === 0) { Exception.throw_user_error({ - user_error : 'No .CSV file to restore from was provided', - system_error : 'User ' + req.user.id + ' tried to import employees ' - + 'without submitting .CSV file', + user_error: "No .CSV file to restore from was provided", + system_error: + "User " + + req.user.id + + " tried to import employees " + + "without submitting .CSV file" }); - } else if ( files.users_import.size > 2097152 ) { + } else if (files.users_import.size > 2097152) { Exception.throw_user_error({ - user_error : '.CSV file could not be bigger then 2M', - system_error : 'User ' + req.user.id + ' tried to submit file bigger then ' - + '2M', + user_error: ".CSV file could not be bigger then 2M", + system_error: + "User " + req.user.id + " tried to submit file bigger then " + "2M" }); } return fs.readFileAsync(files.users_import.path, "utf8"); }) - .then(csv_data_string => csv.parseAsync(csv_data_string,{trim:true})) + .then(csv_data_string => csv.parseAsync(csv_data_string, { trim: true })) .then(parsed_data => { - // Limit number of employees to be imported at one go // if (parsed_data.length > 201) { Exception.throw_user_error({ - user_error : 'Cannot import more then 200 employees per one go. ' - + 'Please splite .CSV file into chunks of no more then 200 employees ' - + 'and process them each at the time', - system_error : 'User ' + req.user.id + ' tried to import more then 200 ' - + 'user at one time' + user_error: + "Cannot import more then 200 employees per one go. " + + "Please splite .CSV file into chunks of no more then 200 employees " + + "and process them each at the time", + system_error: + "User " + + req.user.id + + " tried to import more then 200 " + + "user at one time" }); } return UserImporter.add_users_in_bulk({ - to_company_id : req.user.companyId, - bulk_header : parsed_data.shift(), - bulk_data : parsed_data, + to_company_id: req.user.companyId, + bulk_header: parsed_data.shift(), + bulk_data: parsed_data }); }) .then(action_result => { console.dir(action_result); - if ( action_result.users.length > 0 ) { + if (action_result.users.length > 0) { req.session.flash_message( - 'Successfully imported users with following emails: ' - + action_result.users.map(user => user.email).sort().join(', ') + "Successfully imported users with following emails: " + + action_result.users + .map(user => user.email) + .sort() + .join(", ") ); } if (action_result.errors.length > 0) { - action_result.errors.forEach(err => req.session.flash_error( - 'Failed to add user ' + err.email + '. Reason: ' + err.error - )); + action_result.errors.forEach(err => + req.session.flash_error( + "Failed to add user " + err.email + ". Reason: " + err.error + ) + ); } - res.redirect_with_session('/users/import/'); + res.redirect_with_session("/users/import/"); }) - .catch(function(error){ + .catch(function(error) { console.error( - 'An error occurred when trying to import users for company' - + req.user.companyId - + '. Reason: ' + Exception.extract_system_error_message(error) + "An error occurred when trying to import users for company" + + req.user.companyId + + ". Reason: " + + Exception.extract_system_error_message(error) ); req.session.flash_error( - 'Failed to import users, reason: ' - + Exception.extract_user_error_message(error) + "Failed to import users, reason: " + + Exception.extract_user_error_message(error) ); - res.redirect_with_session('/users/import/'); + res.redirect_with_session("/users/import/"); }); }); -router.post('/import-sample/', function(req, res){ - +router.post("/import-sample/", function(req, res) { req.user .getCompany({ - scope : ['with_active_users', 'with_simple_departments'], + scope: ["with_active_users", "with_simple_departments"] }) .then(company => { + res.attachment(company.name_for_machine() + ".csv"); - res.attachment( - company.name_for_machine()+'.csv' - ); - - let content = company.users.map( user => [ + let content = company.users.map(user => [ user.email, user.lastname, user.name, - company.departments.find( dep => dep.id === user.DepartmentId ).name + company.departments.find(dep => dep.id === user.DepartmentId).name ]); - content.unshift( ['email','lastname', 'name', 'department'] ); + content.unshift(["email", "lastname", "name", "department"]); - return csv.stringifyAsync( content ); + return csv.stringifyAsync(content); }) .then(csv_data_string => res.send(csv_data_string)); - }); -router.get('/edit/:user_id/', function(req, res){ - var user_id = validator.trim(req.param('user_id')); +router.get("/edit/:user_id/", function(req, res) { + var user_id = validator.trim(req.param("user_id")); - Promise.try(function(){ - ensure_user_id_is_integer({req : req, user_id : user_id}); + Promise.try(function() { + ensure_user_id_is_integer({ req: req, user_id: user_id }); }) - .then(function(){ - return req.user.get_company_for_user_details({ - user_id : user_id, - }); - }) - .then(function(company){ - - var employee = company.users[0]; - - return employee.promise_schedule_I_obey() - .then(function(){ - res.render('user_details', { - company : company, - employee : employee, - show_main_tab : true, + .then(function() { + return req.user.get_company_for_user_details({ + user_id: user_id + }); + }) + .then(function(company) { + var employee = company.users[0]; + + return employee.promise_schedule_I_obey().then(function() { + res.render("user_details", { + company: company, + employee: employee, + show_main_tab: true }); }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to open employee details by user '+req.user.id - + ' : ' + error - ); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to open employee details by user " + + req.user.id + + " : " + + error + ); - return res.redirect_with_session('../../'); - }); + return res.redirect_with_session("../../"); + }); }); -router.get('/edit/:user_id/absences/', function(req, res){ - let - user_id = validator.trim(req.param('user_id')), +router.get("/edit/:user_id/absences/", function(req, res) { + let user_id = validator.trim(req.param("user_id")), user_allowance; - Promise - - .try( () => ensure_user_id_is_integer({req : req, user_id : user_id}) ) - .then(() => req.user.get_company_for_user_details({ user_id : user_id }) ) - .then(function(company){ - let employee = company.users[0]; - return employee.reload_with_session_details(); - }) - .then( employee => employee.reload_with_leave_details({})) - .then(employee => Promise.join( - - employee - .promise_allowance() - .then( allowance_obj => Promise.resolve([user_allowance = allowance_obj, employee]) ), + Promise.try(() => ensure_user_id_is_integer({ req: req, user_id: user_id })) + .then(() => req.user.get_company_for_user_details({ user_id: user_id })) + .then(function(company) { + let employee = company.users[0]; + return employee.reload_with_session_details(); + }) + .then(employee => employee.reload_with_leave_details({})) + .then(employee => + Promise.join( + employee + .promise_allowance() + .then(allowance_obj => + Promise.resolve([(user_allowance = allowance_obj), employee]) + ), - employee - .promise_adjustmet_for_year(moment.utc().format('YYYY')), + employee.promise_adjustmet_for_year(moment.utc().format("YYYY")), - employee - .promise_carried_over_allowance_for_year(moment.utc().format('YYYY')), + employee.promise_carried_over_allowance_for_year( + moment.utc().format("YYYY") + ), - (args, employee_adjustment, carried_over_allowance) => { - args.push(null); - args.push(employee_adjustment); - args.push(carried_over_allowance); - return Promise.resolve(args); - }) - ) - .then(args => { - let - allowance_obj = args[0], - - remaining_allowance = allowance_obj.total_number_of_days_in_allowance - allowance_obj.number_of_days_taken_from_allowance, - employee = args[1], - total_days_number = allowance_obj.total_number_of_days_in_allowance, - employee_adjustment = args[3], - carried_over_allowance = args[4]; - - let leave_statistics = { - total_for_current_year : total_days_number, - remaining : remaining_allowance, - }; - - leave_statistics.used_so_far = allowance_obj.number_of_days_taken_from_allowance; - - leave_statistics.used_so_far_percent = leave_statistics.total_for_current_year > 0 - ? 100 * leave_statistics.used_so_far / leave_statistics.total_for_current_year - : 0; - - leave_statistics.remaining_percent = leave_statistics.total_for_current_year > 0 - ? 100 * (leave_statistics.total_for_current_year - leave_statistics.used_so_far) / leave_statistics.total_for_current_year - : 0; - - return employee - .promise_schedule_I_obey() - .then(function(){ + (args, employee_adjustment, carried_over_allowance) => { + args.push(null); + args.push(employee_adjustment); + args.push(carried_over_allowance); + return Promise.resolve(args); + } + ) + ) + .then(args => { + let allowance_obj = args[0], + remaining_allowance = + allowance_obj.total_number_of_days_in_allowance - + allowance_obj.number_of_days_taken_from_allowance, + employee = args[1], + total_days_number = allowance_obj.total_number_of_days_in_allowance, + employee_adjustment = args[3], + carried_over_allowance = args[4]; + + let leave_statistics = { + total_for_current_year: total_days_number, + remaining: remaining_allowance + }; + + leave_statistics.used_so_far = + allowance_obj.number_of_days_taken_from_allowance; + + leave_statistics.used_so_far_percent = + leave_statistics.total_for_current_year > 0 + ? (100 * leave_statistics.used_so_far) / + leave_statistics.total_for_current_year + : 0; + + leave_statistics.remaining_percent = + leave_statistics.total_for_current_year > 0 + ? (100 * + (leave_statistics.total_for_current_year - + leave_statistics.used_so_far)) / + leave_statistics.total_for_current_year + : 0; + + return employee.promise_schedule_I_obey().then(function() { employee .promise_my_active_leaves_ever({}) .then(leaves => LeaveCollectionUtil.promise_to_group_leaves(leaves)) - .then(function(grouped_leaves){ - - res.render('user_details', { - employee : employee, - grouped_leaves : grouped_leaves, - show_absence_tab : true, - leave_type_statistics : employee.get_leave_statistics_by_types(), - leave_statistics : leave_statistics, - employee_adjustment : employee_adjustment, + .then(function(grouped_leaves) { + res.render("user_details", { + employee: employee, + grouped_leaves: grouped_leaves, + show_absence_tab: true, + leave_type_statistics: employee.get_leave_statistics_by_types(), + leave_statistics: leave_statistics, + employee_adjustment: employee_adjustment, carried_over_allowance: carried_over_allowance, - user_allowance : user_allowance, + user_allowance: user_allowance }); - }); }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to open employee absences by user '+req.user.id - + ' : ' + error - ); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to open employee absences by user " + + req.user.id + + " : " + + error + ); - return res.redirect_with_session('../../../'); - }); + return res.redirect_with_session("../../../"); + }); }); +router.get("/edit/:user_id/schedule/", function(req, res) { + var user_id = validator.trim(req.param("user_id")); -router.get('/edit/:user_id/schedule/', function(req, res){ - var user_id = validator.trim(req.param('user_id')); - - Promise.try(function(){ - ensure_user_id_is_integer({req : req, user_id : user_id}); - }) - .then(function(){ - return req.user.get_company_for_user_details({ - user_id : user_id, - }); + Promise.try(function() { + ensure_user_id_is_integer({ req: req, user_id: user_id }); }) - .then(function(company){ - - var employee = company.users[0]; - - return employee - .promise_schedule_I_obey() - .then(function(schedule){ - res.render('user_details', { - employee : employee, - schedule : schedule, - show_schedule_tab : true, + .then(function() { + return req.user.get_company_for_user_details({ + user_id: user_id + }); + }) + .then(function(company) { + var employee = company.users[0]; + + return employee.promise_schedule_I_obey().then(function(schedule) { + res.render("user_details", { + employee: employee, + schedule: schedule, + show_schedule_tab: true }); }); - }) - .catch(function(error){ - console.error( - 'An error occurred when trying to open employee absences by user '+req.user.id - + ' : ' + error - ); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to open employee absences by user " + + req.user.id + + " : " + + error + ); - return res.redirect_with_session('../../../'); - }); + return res.redirect_with_session("../../../"); + }); }); - // Special step performed while savinf existing employee accont details // // In case when employee had "end date" populated and now it is going // to be updated to be in future - check if during the time user was inactive // new user was added (including other companies) // -var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args){ - var - employee = args.employee, +var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args) { + var employee = args.employee, new_user_attributes = args.new_user_attributes, - req = args.req, - model = args.model; + req = args.req, + model = args.model; if ( // Employee has end_date defined employee.end_date && - ( - ! new_user_attributes.end_date - || - ( - // new "end_date" is provided - // new "end_date" is in future - new_user_attributes.end_date && - moment.utc( new_user_attributes.end_date ).startOf('day').toDate() >= req.user.company.get_today().startOf('day').toDate() - ) - ) + (!new_user_attributes.end_date || + // new "end_date" is provided + // new "end_date" is in future + (new_user_attributes.end_date && + moment + .utc(new_user_attributes.end_date) + .startOf("day") + .toDate() >= + req.user.company + .get_today() + .startOf("day") + .toDate())) ) { - return model.User.find_by_email(new_user_attributes.email) - .then(function(user){ - - if (user && user.companyId !== employee.companyId) { - var error_msg = 'There is an active account with similar email somewhere within system.'; - req.session.flash_error(error_msg); - throw new Error(error_msg); - } + return model.User.find_by_email(new_user_attributes.email).then(function( + user + ) { + if (user && user.companyId !== employee.companyId) { + var error_msg = + "There is an active account with similar email somewhere within system."; + req.session.flash_error(error_msg); + throw new Error(error_msg); + } - return Promise.resolve(); - }); + return Promise.resolve(); + }); } return Promise.resolve(); @@ -431,204 +435,213 @@ var ensure_user_was_not_useed_elsewhere_while_being_inactive = function(args){ // Extra step: in case when employee is going to have new email, // check that it is not duplicated // -var ensure_email_is_not_used_elsewhere = function(args){ - var - employee = args.employee, +var ensure_email_is_not_used_elsewhere = function(args) { + var employee = args.employee, new_user_attributes = args.new_user_attributes, - req = args.req, - model = args.model; + req = args.req, + model = args.model; if (new_user_attributes.email === employee.email) { return Promise.resolve(); } - return model.User - .find_by_email(new_user_attributes.email) - .then(function(user){ - - if (user) { - req.session.flash_error('Email is already in use'); - throw new Error('Email is already used'); - } + return model.User.find_by_email(new_user_attributes.email).then(function( + user + ) { + if (user) { + req.session.flash_error("Email is already in use"); + throw new Error("Email is already used"); + } - return Promise.resolve(); - }); + return Promise.resolve(); + }); }; -var ensure_we_are_not_removing_last_admin = function(args){ - var - employee = args.employee, +var ensure_we_are_not_removing_last_admin = function(args) { + var employee = args.employee, new_user_attributes = args.new_user_attributes, - req = args.req, - model = args.model; + req = args.req, + model = args.model; if ( // It is about to change admin rights - new_user_attributes.admin !== employee.admin + new_user_attributes.admin !== employee.admin && // and it is revoking admin rights - && ! new_user_attributes.admin + !new_user_attributes.admin ) { - return model.User - .count({ where : { - companyId : employee.companyId, - id : { $ne : employee.id}, - admin : true, - }}) - .then(function(number_of_admins_to_be_left){ - if (number_of_admins_to_be_left > 0) { - return Promise.resolve(); - } + return model.User.count({ + where: { + companyId: employee.companyId, + id: { $ne: employee.id }, + admin: true + } + }).then(function(number_of_admins_to_be_left) { + if (number_of_admins_to_be_left > 0) { + return Promise.resolve(); + } - req.session.flash_error('This is last admin witihn company. Cannot revoke admin rights.'); - throw new Error('Attempt to revoke admin rights from last admin in comapny '+employee.companyId); - }); + req.session.flash_error( + "This is last admin witihn company. Cannot revoke admin rights." + ); + throw new Error( + "Attempt to revoke admin rights from last admin in comapny " + + employee.companyId + ); + }); } return Promise.resolve(); }; -router.post('/edit/:user_id/', function(req, res){ - var user_id = validator.trim(req.param('user_id')); +router.post("/edit/:user_id/", function(req, res) { + var user_id = validator.trim(req.param("user_id")); var new_user_attributes, employee, - model = req.app.get('db_model'); + model = req.app.get("db_model"); - Promise.try(function(){ - ensure_user_id_is_integer({req : req, user_id : user_id}); + Promise.try(function() { + ensure_user_id_is_integer({ req: req, user_id: user_id }); }) - .then(function(){ - return req.user.get_company_for_user_details({ - user_id : user_id, - }); - }) - .then(function(company){ + .then(function() { + return req.user.get_company_for_user_details({ + user_id: user_id + }); + }) + .then(function(company) { + new_user_attributes = get_and_validate_user_parameters({ + req: req, + item_name: "user", + departments: company.departments + }); - new_user_attributes = get_and_validate_user_parameters({ - req : req, - item_name : 'user', - departments : company.departments, - }); + if (new_user_attributes.password) { + new_user_attributes.password = model.User.hashify_password( + new_user_attributes.password + ); + } - if (new_user_attributes.password) { - new_user_attributes.password = model.User.hashify_password( - new_user_attributes.password - ); - } + employee = company.users[0]; - employee = company.users[0]; + return Promise.resolve(); + }) - return Promise.resolve(); - }) + // Ensure that new email if it was changed is not used anywhere else + // withing system + .then(function() { + return ensure_email_is_not_used_elsewhere({ + employee: employee, + new_user_attributes: new_user_attributes, + req: req, + model: model + }); + }) - // Ensure that new email if it was changed is not used anywhere else - // withing system - .then(function(){ return ensure_email_is_not_used_elsewhere({ - employee : employee, - new_user_attributes : new_user_attributes, - req : req, - model : model, - })}) - - // Double check user in case it is re-activated - .then(function(){ return ensure_user_was_not_useed_elsewhere_while_being_inactive({ - employee : employee, - new_user_attributes : new_user_attributes, - req : req, - model : model, - })}) - - .then(function(){ return ensure_we_are_not_removing_last_admin({ - employee : employee, - new_user_attributes : new_user_attributes, - req : req, - model : model, - })}) - - // All validations are passed: update database - .then(function(){ - - let adjustment = new_user_attributes.adjustment; - delete new_user_attributes.adjustment; - - const captureAuditTrail = getAuditCaptureForUser({ - byUser: req.user, - forUser: employee.get({plain: true}), - newAttributes: new_user_attributes, - }); + // Double check user in case it is re-activated + .then(function() { + return ensure_user_was_not_useed_elsewhere_while_being_inactive({ + employee: employee, + new_user_attributes: new_user_attributes, + req: req, + model: model + }); + }) - employee + .then(function() { + return ensure_we_are_not_removing_last_admin({ + employee: employee, + new_user_attributes: new_user_attributes, + req: req, + model: model + }); + }) - // Update user record - .updateAttributes(new_user_attributes) + // All validations are passed: update database + .then(function() { + let adjustment = new_user_attributes.adjustment; + delete new_user_attributes.adjustment; - .then(() => captureAuditTrail()) + const captureAuditTrail = getAuditCaptureForUser({ + byUser: req.user, + forUser: employee.get({ plain: true }), + newAttributes: new_user_attributes + }); - // Update adjustment if necessary - .then(() => { - if ( adjustment !== undefined ) { - return employee.promise_to_update_adjustment({ - year : moment.utc().format('YYYY'), - adjustment : adjustment, - }); - } + employee - return Promise.resolve(); - }) + // Update user record + .updateAttributes(new_user_attributes) - .then(function(){ - req.session.flash_message( - 'Details for '+employee.full_name()+' were updated' - ); - return res.redirect_with_session(req.body.back_to_absences ? './absences/' : '.'); - }); - }) + .then(() => captureAuditTrail()) - .catch(function(error){ - console.error( - 'An error occurred when trying to save chnages to user account by user '+req.user.id - + ' : ' + error - ); + // Update adjustment if necessary + .then(() => { + if (adjustment !== undefined) { + return employee.promise_to_update_adjustment({ + year: moment.utc().format("YYYY"), + adjustment: adjustment + }); + } - req.session.flash_error( - 'Failed to save changes.' - ); + return Promise.resolve(); + }) - return res.redirect_with_session(req.body.back_to_absences ? './absences/' : '.'); - }); -}); + .then(function() { + req.session.flash_message( + "Details for " + employee.full_name() + " were updated" + ); + return res.redirect_with_session( + req.body.back_to_absences ? "./absences/" : "." + ); + }); + }) + .catch(function(error) { + console.error( + "An error occurred when trying to save chnages to user account by user " + + req.user.id + + " : " + + error + ); + + req.session.flash_error("Failed to save changes."); + + return res.redirect_with_session( + req.body.back_to_absences ? "./absences/" : "." + ); + }); +}); -router.post('/delete/:user_id/', function(req, res){ - const user_id = validator.trim(req.param('user_id')); - let auditCapture; +router.post("/delete/:user_id/", function(req, res) { + const user_id = validator.trim(req.param("user_id")); + let auditCapture; - Promise.try(() => ensure_user_id_is_integer({req, user_id})) - .then(() => req.user.get_company_for_user_details({user_id})) + Promise.try(() => ensure_user_id_is_integer({ req, user_id })) + .then(() => req.user.get_company_for_user_details({ user_id })) .then(company => { const employee = company.users[0]; - const employeePlain = employee.get({plain: true}); + const employeePlain = employee.get({ plain: true }); auditCapture = getAuditCaptureForUser({ - byUser: req.user, - forUser: employeePlain, + byUser: req.user, + forUser: employeePlain, newAttributes: Object.assign( {}, - ...Object.keys(employeePlain).map(k => ({[k]:null})) - ), + ...Object.keys(employeePlain).map(k => ({ [k]: null })) + ) }); return employee.remove(); }) .then(() => auditCapture()) .then(() => { req.session.flash_message( - 'Employee records were removed from the system' + "Employee records were removed from the system" ); - return res.redirect_with_session('../..'); + return res.redirect_with_session("../.."); }) .catch(error => { console.error( - `An error occurred when trying to remove user ${user_id} by user ` - + `${req.user.id}. Error: ${error}` + `An error occurred when trying to remove user ${user_id} by user ` + + `${req.user.id}. Error: ${error}` ); req.session.flash_error(`Failed to remove user. ${error}`); @@ -637,150 +650,175 @@ router.post('/delete/:user_id/', function(req, res){ }); }); - -router.all('/search/', function(req, res){ - +router.all("/search/", function(req, res) { // Currently we support search only by email and only JSON type requests - if ( ! req.accepts('json')) { + if (!req.accepts("json")) { // redirect client to the users index page - return res.redirect_with_session('../'); + return res.redirect_with_session("../"); } - var email = validator.trim( req.param('email') ).toLowerCase(); + var email = validator.trim(req.param("email")).toLowerCase(); - if ( ! validator.isEmail( email )) { - req.session.flash_error('Provided email does not look like valid one: "'+email+'"'); + if (!validator.isEmail(email)) { + req.session.flash_error( + 'Provided email does not look like valid one: "' + email + '"' + ); return res.json([]); } // search for users only related to currently login admin // var promise_result = req.user.getCompany({ - include : [{ - model : req.app.get('db_model').User, - as : 'users', - where : { - email : email + include: [ + { + model: req.app.get("db_model").User, + as: "users", + where: { + email: email + } } - }] + ] }); - promise_result.then(function(company){ + promise_result.then(function(company) { if (company.users.length > 0) { - res.json(company.users) + res.json(company.users); } else { res.json([]); } }); }); - /* Handle the root for users section, it shows the list of all users * */ -router.get('/', function(req, res) { - - var department_id = req.param('department'), - users_filter = {}, - model = req.app.get('db_model'); - - if (validator.isNumeric( department_id )) { - users_filter = { DepartmentId : department_id }; - } else { - department_id = undefined; - } +router.get("/", function(req, res) { + var department_id = req.param("department"), + users_filter = {}, + model = req.app.get("db_model"); + + if (validator.isNumeric(department_id)) { + users_filter = { DepartmentId: department_id }; + } else { + department_id = undefined; + } - req.user.getCompany({ - include : [ + req.user + .getCompany({ + include: [ { - model : model.User, - as : 'users', - where : users_filter, - required : false, - include : [ - { model : model.Department, as : 'department' }, + model: model.User, + as: "users", + where: users_filter, + required: false, + include: [ + { model: model.Department, as: "department" }, // Following is needed to be able to calculate how many days were // taken from allowance { - model : model.Leave, - as : 'my_leaves', - required : false, - where : { + model: model.Leave, + as: "my_leaves", + required: false, + where: { // status : model.Leave.status_approved(), - status : [ + status: [ model.Leave.status_approved(), model.Leave.status_new(), - model.Leave.status_pended_revoke(), + model.Leave.status_pended_revoke() ], - $or : { - date_start : { - $between : [ - moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), + $or: { + date_start: { + $between: [ + moment + .utc() + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc() + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] }, - date_end : { - $between : [ - moment.utc().startOf('year').format('YYYY-MM-DD'), - moment.utc().endOf('year').format('YYYY-MM-DD HH:mm'), + date_end: { + $between: [ + moment + .utc() + .startOf("year") + .format("YYYY-MM-DD"), + moment + .utc() + .endOf("year") + .format("YYYY-MM-DD HH:mm") ] } } }, - include : [{ - model : model.LeaveType, - as : 'leave_type', - }, + include: [ + { + model: model.LeaveType, + as: "leave_type" + } ] // End of my_leaves include } - ], - }, + ] + } ], - order : [ - [{ model : model.User, as : 'users' }, 'lastname'], + order: [ + [{ model: model.User, as: "users" }, "lastname"], [ - { model : model.User, as : 'users' }, - { model : model.Department, as : 'department'}, + { model: model.User, as: "users" }, + { model: model.Department, as: "department" }, model.Department.default_order_field() - ], + ] ] }) // Make sure that objects have all necessary attributes to render page // (template system is sync only) - .then(function(company){ - return company.getBank_holidays() - // stick bank holidays to company - .then(function(bank_holidays){ - company.bank_holidays = bank_holidays; - return company.getDepartments({ - order : [ model.Department.default_order_field() ], - }); - }) - // stick departments to company as well - .then(function(departments){ - company.departments = departments; - return Promise.resolve(company); - }) + .then(function(company) { + return ( + company + .getBank_holidays() + // stick bank holidays to company + .then(function(bank_holidays) { + company.bank_holidays = bank_holidays; + return company.getDepartments({ + order: [model.Department.default_order_field()] + }); + }) + // stick departments to company as well + .then(function(departments) { + company.departments = departments; + return Promise.resolve(company); + }) + ); }) // Make sure that user's leaves have reference back to user in question - .then(function(company){ - company.users.forEach(function(user){ + .then(function(company) { + company.users.forEach(function(user) { user.company = company; - user.my_leaves.forEach(function(leave){ leave.user = user }); + user.my_leaves.forEach(function(leave) { + leave.user = user; + }); }); return Promise.resolve(company); }) // Update users to have neccessary data for leave calculations - .then(function(company){ - return Promise.resolve(company.users).map(function(user){ - return user.promise_schedule_I_obey(); - },{ - concurrency : 10, - }) - .then(function(){ return Promise.resolve(company) }); + .then(function(company) { + return Promise.resolve(company.users) + .map( + function(user) { + return user.promise_schedule_I_obey(); + }, + { + concurrency: 10 + } + ) + .then(function() { + return Promise.resolve(company); + }); }) /* @@ -793,19 +831,22 @@ router.get('/', function(req, res) { * so we need to get all data before passing it into template as template * * */ - .then(company => Promise - .resolve(company.users) - .map(user => user - .promise_allowance() - .then(allowance_obj => Promise.resolve({ - user_row : user, - number_of_days_available_in_allowance : allowance_obj.number_of_days_available_in_allowance, - })), - { - concurrency : 10 - } - ) - .then(users_info => Promise.resolve([company, users_info])) + .then(company => + Promise.resolve(company.users) + .map( + user => + user.promise_allowance().then(allowance_obj => + Promise.resolve({ + user_row: user, + number_of_days_available_in_allowance: + allowance_obj.number_of_days_available_in_allowance + }) + ), + { + concurrency: 10 + } + ) + .then(users_info => Promise.resolve([company, users_info])) ) // We are moving away from passing complex objects into templates @@ -816,66 +857,74 @@ router.get('/', function(req, res) { // So prepare special rendering datastructure here .then(args => promise_user_list_data_for_rendering(args)) - .then(function(args){ - let - company = args[0], + .then(function(args) { + let company = args[0], users_info = args[1]; - if ( req.param('as-csv') ) { + if (req.param("as-csv")) { return users_list_as_csv({ - users_info : users_info, - company : company, - req : res, - res : res, + users_info: users_info, + company: company, + req: res, + res: res }); } - res.render('users', { - company : company, - department_id : Number(department_id), - title : company.name + "'s people", - users_info : users_info, + res.render("users", { + company: company, + department_id: Number(department_id), + title: company.name + "'s people", + users_info: users_info }); }); }); function promise_user_list_data_for_rendering(args) { - let - company = args[0], + let company = args[0], users_info = args[1]; let users_info_for_rendering = users_info.map(ui => ({ - user_id : ui.user_row.id, - user_email : ui.user_row.email, - user_name : ui.user_row.name, - user_lastname : ui.user_row.lastname, - user_full_name : ui.user_row.full_name(), - department_id : ui.user_row.department.id, - department_name : ui.user_row.department.name, - is_admin : ui.user_row.admin, - number_of_days_available_in_allowance : ui.number_of_days_available_in_allowance, - number_of_days_taken_from_allowance : ui.user_row.calculate_number_of_days_taken_from_allowance(), + user_id: ui.user_row.id, + user_email: ui.user_row.email, + user_name: ui.user_row.name, + user_lastname: ui.user_row.lastname, + user_full_name: ui.user_row.full_name(), + department_id: ui.user_row.department.id, + department_name: ui.user_row.department.name, + is_admin: ui.user_row.admin, + number_of_days_available_in_allowance: + ui.number_of_days_available_in_allowance, + number_of_days_taken_from_allowance: ui.user_row.calculate_number_of_days_taken_from_allowance() })); return Promise.resolve([company, users_info_for_rendering]); -}; +} function users_list_as_csv(args) { let users_info = args.users_info, - company = args.company, - req = args.req, - res = args.res; + company = args.company, + req = args.req, + res = args.res; // Compose file name res.attachment( - company.name_for_machine() - + '_employees_on_' - + company.get_today().format('YYYY_MMM_DD') - + '.csv' + company.name_for_machine() + + "_employees_on_" + + company.get_today().format("YYYY_MMM_DD") + + ".csv" ); // Compose result CSV header - let content = [['email', 'lastname', 'name', 'department', 'remaining allowance', 'days used']]; + let content = [ + [ + "email", + "lastname", + "name", + "department", + "remaining allowance", + "days used" + ] + ]; // ... and body users_info.forEach(ui => { @@ -889,129 +938,137 @@ function users_list_as_csv(args) { ]); }); - return csv.stringifyAsync( content ) + return csv + .stringifyAsync(content) .then(csv_data_string => res.send(csv_data_string)); } function get_and_validate_user_parameters(args) { - var req = args.req, - item_name = args.item_name, - require_password = args.require_password || false; - - // Get user parameters - var name = validator.trim(req.param('name')), - lastname = validator.trim(req.param('lastname')), - email = validator.trim(req.param('email_address')), - department_id = validator.trim(req.param('department')), - start_date = validator.trim(req.param('start_date')), - end_date = validator.trim(req.param('end_date')), - adjustment = validator.trim(req.param('adjustment')), - password = validator.trim(req.param('password_one')), - password_confirm = validator.trim(req.param('password_confirm')), - admin = validator.toBoolean(req.param('admin')), - auto_approve = validator.toBoolean(req.param('auto_approve')); - - // Validate provided parameters - - if (!validator.isEmail(email)) { - req.session.flash_error( - 'New email of '+item_name+' should be valid email address' - ); - } - - if (!validator.isNumeric(department_id)) { - req.session.flash_error( - 'New department number of '+item_name+' should be a valid number' - ); - } + var req = args.req, + item_name = args.item_name, + require_password = args.require_password || false; + + // Get user parameters + var name = validator.trim(req.param("name")), + lastname = validator.trim(req.param("lastname")), + email = validator.trim(req.param("email_address")), + department_id = validator.trim(req.param("department")), + start_date = validator.trim(req.param("start_date")), + end_date = validator.trim(req.param("end_date")), + adjustment = validator.trim(req.param("adjustment")), + password = validator.trim(req.param("password_one")), + password_confirm = validator.trim(req.param("password_confirm")), + admin = validator.toBoolean(req.param("admin")), + auto_approve = validator.toBoolean(req.param("auto_approve")); + + // Validate provided parameters + + if (!validator.isEmail(email)) { + req.session.flash_error( + "New email of " + item_name + " should be valid email address" + ); + } - if (adjustment && ! validator.isFloat(adjustment) ) { - req.session.flash_error( - 'New allowance adjustment of '+item_name+' should be a valid number' - ); - } else if (adjustment && ! ( adjustment % 1 === 0 || Math.abs( adjustment % 1 ) === 0.5 )) { - req.session.flash_error( - 'New allowance adjustment of '+item_name+' should be either whole integer number or with half' - ); - } + if (!validator.isNumeric(department_id)) { + req.session.flash_error( + "New department number of " + item_name + " should be a valid number" + ); + } - start_date = req.user.company.normalise_date( start_date ); + if (adjustment && !validator.isFloat(adjustment)) { + req.session.flash_error( + "New allowance adjustment of " + item_name + " should be a valid number" + ); + } else if ( + adjustment && + !(adjustment % 1 === 0 || Math.abs(adjustment % 1) === 0.5) + ) { + req.session.flash_error( + "New allowance adjustment of " + + item_name + + " should be either whole integer number or with half" + ); + } - if (!validator.isDate(start_date)) { - req.session.flash_error( - 'New start date for '+item_name+' should be valid date' - ); - } + start_date = req.user.company.normalise_date(start_date); - if (end_date ){ + if (!validator.isDate(start_date)) { + req.session.flash_error( + "New start date for " + item_name + " should be valid date" + ); + } - end_date = req.user.company.normalise_date( end_date ); + if (end_date) { + end_date = req.user.company.normalise_date(end_date); - if ( ! validator.isDate(end_date)) { - req.session.flash_error( - 'New end date for '+item_name+' should be valid date' - ); - } + if (!validator.isDate(end_date)) { + req.session.flash_error( + "New end date for " + item_name + " should be valid date" + ); } + } - if ( - start_date && - end_date && - moment.utc(start_date).toDate() > moment.utc(end_date).toDate() - ){ - req.session.flash_error( - 'End date for '+item_name+' is before start date' - ); - } + if ( + start_date && + end_date && + moment.utc(start_date).toDate() > moment.utc(end_date).toDate() + ) { + req.session.flash_error( + "End date for " + item_name + " is before start date" + ); + } - if (password && password !== password_confirm) { - req.session.flash_error('Confirmed password does not match initial one'); - } + if (password && password !== password_confirm) { + req.session.flash_error("Confirmed password does not match initial one"); + } - if (require_password && ! password) { - req.session.flash_error('Password is required'); - } + if (require_password && !password) { + req.session.flash_error("Password is required"); + } - if ( req.session.flash_has_errors() ) { - throw new Error( 'Got validation errors' ); - } + if (req.session.flash_has_errors()) { + throw new Error("Got validation errors"); + } - // Normalize email as we operate only with lower case letters in emails - email = email.toLowerCase(); - - var attributes = { - name : name, - lastname : lastname, - email : email, - DepartmentId : department_id, - start_date : start_date, - end_date : (end_date || null), - admin : admin, - auto_approve : auto_approve, - }; - - if (adjustment || String(adjustment) === '0') { - attributes.adjustment = adjustment; - } + // Normalize email as we operate only with lower case letters in emails + email = email.toLowerCase(); + + var attributes = { + name: name, + lastname: lastname, + email: email, + DepartmentId: department_id, + start_date: start_date, + end_date: end_date || null, + admin: admin, + auto_approve: auto_approve + }; + + if (adjustment || String(adjustment) === "0") { + attributes.adjustment = adjustment; + } - if ( password ) { - attributes.password = password; - } + if (password) { + attributes.password = password; + } - return attributes; + return attributes; } -function ensure_user_id_is_integer(args){ - var req = args.req, - user_id = args.user_id; +function ensure_user_id_is_integer(args) { + var req = args.req, + user_id = args.user_id; - if (! validator.isInt(user_id)){ - throw new Error( - 'User '+req.user.id+' tried to edit user with non-integer ID: '+user_id - ); - } + if (!validator.isInt(user_id)) { + throw new Error( + "User " + + req.user.id + + " tried to edit user with non-integer ID: " + + user_id + ); + } - return; + return; } module.exports = router; diff --git a/lib/route/utils/pager.js b/lib/route/utils/pager.js index c5cae9edd..db1f76049 100644 --- a/lib/route/utils/pager.js +++ b/lib/route/utils/pager.js @@ -9,48 +9,46 @@ * * an attribute "items_per_page" wich * globaly defines how many items per page are shown * * a method "get_pager_object" that return the pager object to be passed into the pager.hbs -* -* Pager object has following entries: -* -* * page_prev : number to address previous page, if 0 then previous page is disabled -* * page_next : page number to next opage, if 0 no more pages after current one -* * page : number of current page, page counting starts with 1 -* * filter : an object that contains other GET parameters to be placed into the -* pager's links; keys are the names of parameters and values are values -* * page_qnty : total number of pages available for current pager -* * count : total number of pages items -* * pages : simple array with item for each page, each item is corresponding page number -* + * + * Pager object has following entries: + * + * * page_prev : number to address previous page, if 0 then previous page is disabled + * * page_next : page number to next opage, if 0 no more pages after current one + * * page : number of current page, page counting starts with 1 + * * filter : an object that contains other GET parameters to be placed into the + * pager's links; keys are the names of parameters and values are values + * * page_qnty : total number of pages available for current pager + * * count : total number of pages items + * * pages : simple array with item for each page, each item is corresponding page number + * * */ "use strict"; -module.exports = function(){ +module.exports = function() { return { + items_per_page: 10, - items_per_page : 10, - - get_pager_object : function(args){ - - var - total_items_count = args.total_items_count, - filter = args.filter, - page = args.current_page; + get_pager_object: function(args) { + var total_items_count = args.total_items_count, + filter = args.filter, + page = args.current_page; - var page_qnty = Math.ceil( total_items_count / this.items_per_page ); + var page_qnty = Math.ceil(total_items_count / this.items_per_page); var pager = { - filter : filter, - page : page, - page_qnty : page_qnty, - page_prev : (page > 1 ? page - 1 : 0), - page_next : (page >= page_qnty ? 0 : page + 1), - count : total_items_count, - pages : Array.apply(null, Array( page_qnty )) - .map(function (x, i) { return i+1; }), + filter: filter, + page: page, + page_qnty: page_qnty, + page_prev: page > 1 ? page - 1 : 0, + page_next: page >= page_qnty ? 0 : page + 1, + count: total_items_count, + pages: Array.apply(null, Array(page_qnty)).map(function(x, i) { + return i + 1; + }) }; return pager; - }, + } }; }; diff --git a/lib/route/validator/leave_request.js b/lib/route/validator/leave_request.js index ac2cf72c6..9b66fe857 100644 --- a/lib/route/validator/leave_request.js +++ b/lib/route/validator/leave_request.js @@ -1,86 +1,86 @@ - -'use strict'; - -var validator = require('validator'), - moment = require('moment'), - LeaveRequestParameters = require('../../model/leave_request_parameters'); - -module.exports = function(args){ - var req = args.req; - - var user = validator.trim( req.param('user') ), - leave_type = validator.trim( req.param('leave_type') ), - from_date = validator.trim( req.param('from_date') ), - from_date_part = validator.trim( req.param('from_date_part') ), - to_date = validator.trim( req.param('to_date') ), - to_date_part = validator.trim( req.param('to_date_part') ), - reason = validator.trim( req.param('reason') ); - - if (user && !validator.isNumeric(user)){ - req.session.flash_error('Incorrect employee'); - } - - if (!validator.isNumeric(leave_type)){ - req.session.flash_error('Incorrect leave type'); +"use strict"; + +var validator = require("validator"), + moment = require("moment"), + LeaveRequestParameters = require("../../model/leave_request_parameters"); + +module.exports = function(args) { + var req = args.req; + + var user = validator.trim(req.param("user")), + leave_type = validator.trim(req.param("leave_type")), + from_date = validator.trim(req.param("from_date")), + from_date_part = validator.trim(req.param("from_date_part")), + to_date = validator.trim(req.param("to_date")), + to_date_part = validator.trim(req.param("to_date_part")), + reason = validator.trim(req.param("reason")); + + if (user && !validator.isNumeric(user)) { + req.session.flash_error("Incorrect employee"); + } + + if (!validator.isNumeric(leave_type)) { + req.session.flash_error("Incorrect leave type"); + } + + var date_validator = function(date_str, label) { + try { + // Basic check + if (!date_str) throw new Error("date needs to be defined"); + + date_str = req.user.company.normalise_date(date_str); + + // Ensure that normalisation went OK + if (!validator.isDate(date_str)) throw new Error("Invalid date format"); + } catch (e) { + console.log("Got an error " + e); + req.session.flash_error(label + " should be a date"); } - - var date_validator = function(date_str, label) { - try { - - // Basic check - if (! date_str ) throw new Error("date needs to be defined"); - - date_str = req.user.company.normalise_date(date_str); - - // Ensure that normalisation went OK - if (! validator.isDate(date_str)) throw new Error("Invalid date format"); - - } catch (e) { - console.log('Got an error ' + e); - req.session.flash_error(label + ' should be a date'); - } - } - - date_validator(from_date, 'From date'); - - if ( !validator.matches(from_date_part, /^[123]$/) - || !validator.matches(to_date_part, /^[123]$/) - ){ - req.session.flash_error('Incorrect day part'); - } - - date_validator(to_date, 'To date'); - - // Check if it makes sence to continue validation (as following code relies on - // to and from dates to be valid ones) - if ( req.session.flash_has_errors() ) { - throw new Error( 'Got validation errors' ); - } - - // Convert dates inot format used internally - from_date = req.user.company.normalise_date(from_date); - to_date = req.user.company.normalise_date(to_date); - - if (from_date.substr(0,4) !== to_date.substr(0,4)) { - req.session.flash_error('Current implementation does not allow inter year leaves. Please split your request into two parts'); - } - - if ( req.session.flash_has_errors() ) { - throw new Error( 'Got validation errors' ); - } - - var valid_attributes = { - leave_type : leave_type, - from_date : from_date, - from_date_part : from_date_part, - to_date : to_date, - to_date_part : to_date_part, - reason : reason, - }; - - if ( user ) { - valid_attributes.user = user; - } - - return new LeaveRequestParameters( valid_attributes ); + }; + + date_validator(from_date, "From date"); + + if ( + !validator.matches(from_date_part, /^[123]$/) || + !validator.matches(to_date_part, /^[123]$/) + ) { + req.session.flash_error("Incorrect day part"); + } + + date_validator(to_date, "To date"); + + // Check if it makes sence to continue validation (as following code relies on + // to and from dates to be valid ones) + if (req.session.flash_has_errors()) { + throw new Error("Got validation errors"); + } + + // Convert dates inot format used internally + from_date = req.user.company.normalise_date(from_date); + to_date = req.user.company.normalise_date(to_date); + + if (from_date.substr(0, 4) !== to_date.substr(0, 4)) { + req.session.flash_error( + "Current implementation does not allow inter year leaves. Please split your request into two parts" + ); + } + + if (req.session.flash_has_errors()) { + throw new Error("Got validation errors"); + } + + var valid_attributes = { + leave_type: leave_type, + from_date: from_date, + from_date_part: from_date_part, + to_date: to_date, + to_date_part: to_date_part, + reason: reason + }; + + if (user) { + valid_attributes.user = user; + } + + return new LeaveRequestParameters(valid_attributes); }; diff --git a/lib/view/helpers.js b/lib/view/helpers.js index 3ee5d8708..f05f56153 100644 --- a/lib/view/helpers.js +++ b/lib/view/helpers.js @@ -1,38 +1,39 @@ - "use strict"; -var - moment = require('moment'), - moment_tz = require('moment-timezone'), - config = require('../config'); +var moment = require("moment"), + moment_tz = require("moment-timezone"), + config = require("../config"); var as_date_formatted = function(date_str, format, options) { + if (!date_str) return ""; - if (! date_str) return ''; - - if ( ! format ) { - format = get_current_format( options ); + if (!format) { + format = get_current_format(options); } // Special case when we have to take time zone into consideration // when printing date (usually it is needed for those dates recorded // automatically as UTC time stampts) - if ( options.tom_take_timezone_into_consideration ) { - return moment_tz.utc(date_str).tz( get_timezone( options ) ).format( format ); + if (options.tom_take_timezone_into_consideration) { + return moment_tz + .utc(date_str) + .tz(get_timezone(options)) + .format(format); } return moment.utc(date_str).format(format); -} +}; // Note: that currently it returns only truely value of given property, that is if there property // exists and its value is falsy, that undef is returned back -var get_property_from_options = function(options, property_name){ +var get_property_from_options = function(options, property_name) { var value; - if ( options.hasOwnProperty('data') - && options.data.hasOwnProperty('root') - && options.data.root.hasOwnProperty(property_name) - && options.data.root[property_name] + if ( + options.hasOwnProperty("data") && + options.data.hasOwnProperty("root") && + options.data.root.hasOwnProperty(property_name) && + options.data.root[property_name] ) { value = options.data.root[property_name]; } @@ -40,14 +41,14 @@ var get_property_from_options = function(options, property_name){ return value; }; -var get_current_format = function(options){ +var get_current_format = function(options) { + var format = "YYYY-MM-DD"; - var format = 'YYYY-MM-DD'; + var user = + get_property_from_options(options, "logged_user") || + get_property_from_options(options, "user"); - var user = get_property_from_options(options, 'logged_user') - || get_property_from_options(options, 'user'); - - if ( user && user.hasOwnProperty('company') ) { + if (user && user.hasOwnProperty("company")) { format = user.company.get_default_date_format(); } @@ -55,41 +56,40 @@ var get_current_format = function(options){ }; var get_timezone = function(options) { + let timezone = "Europe/London"; - let timezone = 'Europe/London'; - - var user = get_property_from_options(options, 'logged_user') - || get_property_from_options(options, 'user'); + var user = + get_property_from_options(options, "logged_user") || + get_property_from_options(options, "user"); - if ( user && user.hasOwnProperty('company') ) { + if (user && user.hasOwnProperty("company")) { timezone = user.company.timezone; } return timezone; }; -module.exports = function(){ +module.exports = function() { return { // Handlebars does not allow to have conditions in IF, here is // workaround picked from here: http://stackoverflow.com/questions/8853396/logical-operator-in-a-handlebars-js-if-conditional - if_equal : function(v1, v2, options){ - if(v1 === v2) { + if_equal: function(v1, v2, options) { + if (v1 === v2) { return options.fn(this); } return options.inverse(this); }, // Given string with UTC date return string with date formated in customer specific manner - as_date : function(date_string, options) { - + as_date: function(date_string, options) { return as_date_formatted(date_string, undefined, options); }, // Return string with given date formated as a timestamp - as_datetime : function (date_str, options) { + as_datetime: function(date_str, options) { return as_date_formatted( date_str, - get_current_format(options) + ' HH:mm:ss', + get_current_format(options) + " HH:mm:ss", options ); }, @@ -98,8 +98,7 @@ module.exports = function(){ // timezone. It is needed for rendering dates that were recorded in database // automatically in UTC, dates that were recorded based on explicit input // from users should not be used with this method (but with "as_date" instead) - as_date_from_timestamp : function(date_string, options){ - + as_date_from_timestamp: function(date_string, options) { // Add custom flag to options so further down the call stack // we would know that date needs to be corrected with // current timezone @@ -109,8 +108,7 @@ module.exports = function(){ }, // Similar to "as_datetime" but with the same twist as "as_date_from_timestamp" - as_datetime_from_timestamp : function(date_str, options){ - + as_datetime_from_timestamp: function(date_str, options) { // Add custom flag to options so further down the call stack // we would know that date needs to be corrected with // current timezone @@ -118,39 +116,38 @@ module.exports = function(){ return as_date_formatted( date_str, - get_current_format(options) + ' HH:mm:ss', + get_current_format(options) + " HH:mm:ss", options ); }, // Given string with UTC date and string with moment.js format return corresponding string - as_date_formatted : as_date_formatted, + as_date_formatted: as_date_formatted, // Get access to config value holding application domain - get_application_domain : function() { - return config.get('application_domain'); + get_application_domain: function() { + return config.get("application_domain"); }, // Return URL to the web site with promotion materials for TimeOff.Management - get_promotion_website_domain : function() { - return config.get('promotion_website_domain'); + get_promotion_website_domain: function() { + return config.get("promotion_website_domain"); }, - concatenate : function() { - var arg = Array.prototype.slice.call(arguments,0); + concatenate: function() { + var arg = Array.prototype.slice.call(arguments, 0); arg.pop(); - return arg.join(''); + return arg.join(""); }, // Should we include Google Analitics snipet? // (based on application config) - is_ga_analitics_on : function(options) { - if ( !!config.get('ga_analytics_on') ) { + is_ga_analitics_on: function(options) { + if (!!config.get("ga_analytics_on")) { return options.fn(this); } return options.inverse(this); - }, - + } }; }; diff --git a/migrations/20170103144054-add_default_date_format.js b/migrations/20170103144054-add_default_date_format.js index f48da0c09..8b0603263 100644 --- a/migrations/20170103144054-add_default_date_format.js +++ b/migrations/20170103144054-add_default_date_format.js @@ -1,27 +1,21 @@ -'use strict'; +"use strict"; module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('Companies').then(function(attributes){ - - if (attributes.hasOwnProperty('date_format')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("Companies").then(function(attributes) { + if (attributes.hasOwnProperty("date_format")) { return 1; } - return queryInterface.addColumn( - 'Companies', - 'date_format', - { - type : Sequelize.STRING, - allowNull : false, - defaultValue : 'YYYY-MM-DD', - } - ); + return queryInterface.addColumn("Companies", "date_format", { + type: Sequelize.STRING, + allowNull: false, + defaultValue: "YYYY-MM-DD" + }); }); }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('Companies', 'date_format'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Companies", "date_format"); } }; diff --git a/migrations/20170329060832-rename_allowence_to_allowance.js b/migrations/20170329060832-rename_allowence_to_allowance.js index ed040078e..3870997b8 100644 --- a/migrations/20170329060832-rename_allowence_to_allowance.js +++ b/migrations/20170329060832-rename_allowence_to_allowance.js @@ -1,65 +1,73 @@ -'use strict'; +"use strict"; -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('Departments').then(function(attributes){ - - if (attributes.hasOwnProperty('allowance')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("Departments").then(function(attributes) { + if (attributes.hasOwnProperty("allowance")) { return 1; } - if ('sqlite' === queryInterface.sequelize.getDialect()) { - - console.log('Going into SQLIite case'); + if ("sqlite" === queryInterface.sequelize.getDialect()) { + console.log("Going into SQLIite case"); + + return ( + queryInterface + // Create Temp Departments based on current model definitiom + .createTable("Departments_backup", models.Department.attributes) + + .then(function() { + return queryInterface.sequelize.query("PRAGMA foreign_keys=off;"); + }) + + // Copy data form original Departments into new Temp one + .then(function() { + return queryInterface.sequelize.query( + "INSERT INTO `Departments_backup` (id, name, include_public_holidays, createdAt, updatedAt, companyId, bossId, allowance) SELECT id, name, include_public_holidays, createdAt, updatedAt, companyId, bossId, allowence FROM `" + + models.Department.tableName + + "`" + ); + }) + + .then(function() { + return queryInterface.dropTable(models.Department.tableName); + }) + + .then(function() { + return queryInterface.renameTable( + "Departments_backup", + models.Department.tableName + ); + }) + + .then(function() { + return queryInterface.sequelize.query("PRAGMA foreign_keys=on;"); + }) + + .then(function() { + queryInterface.addIndex(models.Department.tableName, [ + "companyId" + ]); + }) + + .then(function() { + queryInterface.addIndex(models.Department.tableName, ["id"]); + }) + ); + } else { + console.log("Generic option"); return queryInterface - // Create Temp Departments based on current model definitiom - .createTable('Departments_backup', models.Department.attributes) - - .then(function(){ - return queryInterface.sequelize.query('PRAGMA foreign_keys=off;'); - }) - - // Copy data form original Departments into new Temp one - .then(function(){ - return queryInterface.sequelize.query( - 'INSERT INTO `Departments_backup` (id, name, include_public_holidays, createdAt, updatedAt, companyId, bossId, allowance) SELECT id, name, include_public_holidays, createdAt, updatedAt, companyId, bossId, allowence FROM `'+ models.Department.tableName +'`'); - }) - - .then(function(){ - return queryInterface.dropTable( models.Department.tableName ); - }) - - .then(function(){ - return queryInterface.renameTable('Departments_backup', models.Department.tableName); - }) - - .then(function(){ - return queryInterface.sequelize.query('PRAGMA foreign_keys=on;'); - }) - - .then(function(){ - queryInterface.addIndex(models.Department.tableName, ['companyId']); - }) - - .then(function(){ - queryInterface.addIndex(models.Department.tableName, ['id']); + .renameColumn("Departments", "allowence", "allowance") + .then(function(d) { + console.dir(d); }); - - } else { - - console.log('Generic option'); - - return queryInterface.renameColumn('Departments', 'allowence', 'allowance') - .then(function(d){ console.dir(d) }); } }); }, - down: function (queryInterface, Sequelize) { - return queryInterface.renameColumn('Departments', 'allowance', 'allowence'); + down: function(queryInterface, Sequelize) { + return queryInterface.renameColumn("Departments", "allowance", "allowence"); } }; diff --git a/migrations/20170530-add_auto_approve_flag_to_user.js b/migrations/20170530-add_auto_approve_flag_to_user.js index f3d63691d..366bd387f 100644 --- a/migrations/20170530-add_auto_approve_flag_to_user.js +++ b/migrations/20170530-add_auto_approve_flag_to_user.js @@ -1,27 +1,23 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('Users').then(function(attributes){ - - if (attributes.hasOwnProperty('auto_approve')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("Users").then(function(attributes) { + if (attributes.hasOwnProperty("auto_approve")) { return 1; } return queryInterface.addColumn( - 'Users', - 'auto_approve', + "Users", + "auto_approve", models.User.attributes.auto_approve ); }); - }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('Users', 'auto_approve'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Users", "auto_approve"); } }; diff --git a/migrations/20171218-company-wide-message.js b/migrations/20171218-company-wide-message.js index 99751b343..0d6ce2920 100644 --- a/migrations/20171218-company-wide-message.js +++ b/migrations/20171218-company-wide-message.js @@ -1,27 +1,23 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('Companies').then(function(attributes){ - - if (attributes.hasOwnProperty('company_wide_message')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("Companies").then(function(attributes) { + if (attributes.hasOwnProperty("company_wide_message")) { return 1; } return queryInterface.addColumn( - 'Companies', - 'company_wide_message', + "Companies", + "company_wide_message", models.Company.attributes.company_wide_message ); }); - }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('Companies', 'company_wide_message'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Companies", "company_wide_message"); } }; diff --git a/migrations/20171219-allowance-adjustment-per-year.js b/migrations/20171219-allowance-adjustment-per-year.js index 19ef8e023..d7c6c18e0 100644 --- a/migrations/20171219-allowance-adjustment-per-year.js +++ b/migrations/20171219-allowance-adjustment-per-year.js @@ -1,36 +1,33 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'), - Promise = require('bluebird'); +var models = require("../lib/model/db"), + Promise = require("bluebird"); module.exports = { - up: function (queryInterface, Sequelize) { - + up: function(queryInterface, Sequelize) { return queryInterface .createTable( models.UserAllowanceAdjustment.tableName, models.UserAllowanceAdjustment.attributes ) - .then(() => queryInterface.describeTable('Users')) - .then(function(attributes){ - - if ( ! attributes.hasOwnProperty('adjustment')) { + .then(() => queryInterface.describeTable("Users")) + .then(function(attributes) { + if (!attributes.hasOwnProperty("adjustment")) { return Promise.resolve(); } - let sql = 'INSERT INTO user_allowance_adjustment (year, adjustment, user_id, created_at) ' - + 'SELECT 2017 AS year, adjustment as adjustment, id as user_id, date() || \' \' || time() as created_at ' - + 'FROM users'; + let sql = + "INSERT INTO user_allowance_adjustment (year, adjustment, user_id, created_at) " + + "SELECT 2017 AS year, adjustment as adjustment, id as user_id, date() || ' ' || time() as created_at " + + "FROM users"; - return queryInterface.sequelize.query( sql ); + return queryInterface.sequelize.query(sql); }) .then(() => Promise.resolve()); - }, - down: function (queryInterface, Sequelize) { + down: function(queryInterface, Sequelize) { // No way back! return Promise.resolve(); } diff --git a/migrations/20171220-drop-adjustment-column-from-user.js b/migrations/20171220-drop-adjustment-column-from-user.js index 4385d3368..8a515e883 100644 --- a/migrations/20171220-drop-adjustment-column-from-user.js +++ b/migrations/20171220-drop-adjustment-column-from-user.js @@ -1,53 +1,53 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'), - Promise = require('bluebird'); +var models = require("../lib/model/db"), + Promise = require("bluebird"); module.exports = { - up: function (queryInterface, Sequelize) { - - return queryInterface - .describeTable('Users') - .then(attributes => { + up: function(queryInterface, Sequelize) { + return queryInterface.describeTable("Users").then(attributes => { + if (!attributes.hasOwnProperty("adjustment")) { + return Promise.resolve(); + } - if ( ! attributes.hasOwnProperty('adjustment')) { - return Promise.resolve(); - } + if ("sqlite" !== queryInterface.sequelize.getDialect()) { + // For non SQLite: it is easy + return queryInterface.removeColumn(models.User.tableName, "adjustment"); + } - if ('sqlite' !== queryInterface.sequelize.getDialect()) { - // For non SQLite: it is easy - return queryInterface.removeColumn( - models.User.tableName, - 'adjustment' - ); - } + // For SQLite it is "fun" - // For SQLite it is "fun" - - return queryInterface + return ( + queryInterface // Create Temp Users based on current model definitiom - .createTable('Users_backup', models.User.attributes) + .createTable("Users_backup", models.User.attributes) - .then(function(){ - return queryInterface.sequelize.query('PRAGMA foreign_keys=off;'); + .then(function() { + return queryInterface.sequelize.query("PRAGMA foreign_keys=off;"); }) // Copy data form original Users into new Temp one - .then(function(){ + .then(function() { return queryInterface.sequelize.query( - 'INSERT INTO `Users_backup` (`id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve`) SELECT `id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve` FROM `'+ models.User.tableName +'`'); + "INSERT INTO `Users_backup` (`id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve`) SELECT `id`, `email`, `password`, `name`, `lastname`, `activated`, `admin`, `start_date`, `end_date`, `createdAt`, `updatedAt`, `companyId`, `DepartmentId`, `auto_approve` FROM `" + + models.User.tableName + + "`" + ); }) - .then(() => queryInterface.dropTable( models.User.tableName )) - .then(() => queryInterface.renameTable('Users_backup', models.User.tableName)) - .then(() => queryInterface.sequelize.query('PRAGMA foreign_keys=on;')) - .then(() => queryInterface.addIndex(models.User.tableName, ['companyId'])) - - }); + .then(() => queryInterface.dropTable(models.User.tableName)) + .then(() => + queryInterface.renameTable("Users_backup", models.User.tableName) + ) + .then(() => queryInterface.sequelize.query("PRAGMA foreign_keys=on;")) + .then(() => + queryInterface.addIndex(models.User.tableName, ["companyId"]) + ) + ); + }); }, - down: function (queryInterface, Sequelize) { + down: function(queryInterface, Sequelize) { // No way back! return Promise.resolve(); } diff --git a/migrations/20171222-add-carry-over-allowance-column.js b/migrations/20171222-add-carry-over-allowance-column.js index 4c91e9a5e..ba3e41104 100644 --- a/migrations/20171222-add-carry-over-allowance-column.js +++ b/migrations/20171222-add-carry-over-allowance-column.js @@ -1,28 +1,28 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - return queryInterface.describeTable('user_allowance_adjustment') - .then(function(attributes){ - - if (attributes.hasOwnProperty('carried_over_allowance')) { + up: function(queryInterface, Sequelize) { + return queryInterface + .describeTable("user_allowance_adjustment") + .then(function(attributes) { + if (attributes.hasOwnProperty("carried_over_allowance")) { return 1; } return queryInterface.addColumn( - 'user_allowance_adjustment', - 'carried_over_allowance', + "user_allowance_adjustment", + "carried_over_allowance", models.UserAllowanceAdjustment.attributes.carried_over_allowance ); }); }, - down: function (queryInterface, Sequelize) { - return queryInterface - .removeColumn('user_allowance_adjustment', 'carried_over_allowance'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn( + "user_allowance_adjustment", + "carried_over_allowance" + ); } }; diff --git a/migrations/20171228-add-time-zone-field-to-company.js b/migrations/20171228-add-time-zone-field-to-company.js index f6236f614..3e64af726 100644 --- a/migrations/20171228-add-time-zone-field-to-company.js +++ b/migrations/20171228-add-time-zone-field-to-company.js @@ -1,28 +1,23 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - return queryInterface.describeTable('Companies') - .then(function(attributes){ - - if (attributes.hasOwnProperty('timezone')) { - return 1; - } + up: function(queryInterface, Sequelize) { + return queryInterface.describeTable("Companies").then(function(attributes) { + if (attributes.hasOwnProperty("timezone")) { + return 1; + } - return queryInterface.addColumn( - 'Companies', - 'timezone', - models.Company.attributes.timezone - ); - }); + return queryInterface.addColumn( + "Companies", + "timezone", + models.Company.attributes.timezone + ); + }); }, - down: function (queryInterface, Sequelize) { - return queryInterface - .removeColumn('Companies', 'timezone'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Companies", "timezone"); } }; diff --git a/migrations/20180102-company-mode.js b/migrations/20180102-company-mode.js index 5cb5c6f80..edfc430a9 100644 --- a/migrations/20180102-company-mode.js +++ b/migrations/20180102-company-mode.js @@ -1,27 +1,23 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('Companies').then(function(attributes){ - - if (attributes.hasOwnProperty('mode')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("Companies").then(function(attributes) { + if (attributes.hasOwnProperty("mode")) { return 1; } return queryInterface.addColumn( - 'Companies', - 'mode', + "Companies", + "mode", models.Company.attributes.mode ); }); - }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('Companies', 'mode'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Companies", "mode"); } }; diff --git a/migrations/20180103-sort-order-for-leave-types.js b/migrations/20180103-sort-order-for-leave-types.js index 4899d3997..29ef8c71a 100644 --- a/migrations/20180103-sort-order-for-leave-types.js +++ b/migrations/20180103-sort-order-for-leave-types.js @@ -1,27 +1,23 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - queryInterface.describeTable('LeaveTypes').then(function(attributes){ - - if (attributes.hasOwnProperty('sort_order')) { + up: function(queryInterface, Sequelize) { + queryInterface.describeTable("LeaveTypes").then(function(attributes) { + if (attributes.hasOwnProperty("sort_order")) { return 1; } return queryInterface.addColumn( - 'LeaveTypes', - 'sort_order', + "LeaveTypes", + "sort_order", models.LeaveType.attributes.sort_order ); }); - }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('LeaveTypes', 'sort_order'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("LeaveTypes", "sort_order"); } }; diff --git a/migrations/20180427-add-is_accrued_allowance-to-department.js b/migrations/20180427-add-is_accrued_allowance-to-department.js index ae3525eab..0b51e6db5 100644 --- a/migrations/20180427-add-is_accrued_allowance-to-department.js +++ b/migrations/20180427-add-is_accrued_allowance-to-department.js @@ -1,28 +1,25 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - return queryInterface.describeTable('Departments') - .then(function(attributes){ - - if (attributes.hasOwnProperty('is_accrued_allowance')) { + up: function(queryInterface, Sequelize) { + return queryInterface + .describeTable("Departments") + .then(function(attributes) { + if (attributes.hasOwnProperty("is_accrued_allowance")) { return 1; } return queryInterface.addColumn( - 'Departments', - 'is_accrued_allowance', + "Departments", + "is_accrued_allowance", models.Department.attributes.is_accrued_allowance ); }); }, - down: function (queryInterface, Sequelize) { - return queryInterface - .removeColumn('Departments', 'is_accrued_allowance'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Departments", "is_accrued_allowance"); } }; diff --git a/migrations/20181119-integration-api-token-per-company.js b/migrations/20181119-integration-api-token-per-company.js index ea55ab084..7a6e0b4b8 100644 --- a/migrations/20181119-integration-api-token-per-company.js +++ b/migrations/20181119-integration-api-token-per-company.js @@ -1,40 +1,38 @@ +"use strict"; -'use strict'; - -var models = require('../lib/model/db'); +var models = require("../lib/model/db"); module.exports = { up: (queryInterface, Sequelize) => { - - queryInterface.describeTable('Companies').then(attributes => { - - if (attributes.hasOwnProperty('integration_api_token')) { + queryInterface.describeTable("Companies").then(attributes => { + if (attributes.hasOwnProperty("integration_api_token")) { return 1; } return queryInterface.addColumn( - 'Companies', - 'integration_api_token', + "Companies", + "integration_api_token", models.Company.attributes.integration_api_token ); }); - queryInterface.describeTable('Companies').then(attributes => { - - if (attributes.hasOwnProperty('integration_api_enabled')) { + queryInterface.describeTable("Companies").then(attributes => { + if (attributes.hasOwnProperty("integration_api_enabled")) { return 1; } return queryInterface.addColumn( - 'Companies', - 'integration_api_enabled', + "Companies", + "integration_api_enabled", models.Company.attributes.integration_api_enabled ); }); - }, - down: (queryInterface, Sequelize) => queryInterface - .removeColumn('Companies', 'integration_api_token') - .then(() => queryInterface.removeColumn('Companies', 'integration_api_enabled')), + down: (queryInterface, Sequelize) => + queryInterface + .removeColumn("Companies", "integration_api_token") + .then(() => + queryInterface.removeColumn("Companies", "integration_api_enabled") + ) }; diff --git a/migrations/20181213-carry-over-conf.js b/migrations/20181213-carry-over-conf.js index 18b1a4281..0499e1106 100644 --- a/migrations/20181213-carry-over-conf.js +++ b/migrations/20181213-carry-over-conf.js @@ -1,26 +1,23 @@ +"use strict"; -'use strict'; - -const models = require('../lib/model/db'); +const models = require("../lib/model/db"); module.exports = { up: (queryInterface, Sequelize) => { - - queryInterface.describeTable('Companies').then((attributes) => { - - if (attributes.hasOwnProperty('carry_over')) { + queryInterface.describeTable("Companies").then(attributes => { + if (attributes.hasOwnProperty("carry_over")) { return 1; } return queryInterface.addColumn( - 'Companies', - 'carry_over', + "Companies", + "carry_over", models.Company.attributes.carry_over ); }); }, - down: function (queryInterface, Sequelize) { - return queryInterface.removeColumn('Companies', 'carry_over'); + down: function(queryInterface, Sequelize) { + return queryInterface.removeColumn("Companies", "carry_over"); } }; diff --git a/migrations/20190118-chnage-type-value-for-api-token.js b/migrations/20190118-chnage-type-value-for-api-token.js index 7ab0b7c8f..77d49b263 100644 --- a/migrations/20190118-chnage-type-value-for-api-token.js +++ b/migrations/20190118-chnage-type-value-for-api-token.js @@ -1,31 +1,42 @@ +"use strict"; -'use strict'; - -const models = require('../lib/model/db'); +const models = require("../lib/model/db"); module.exports = { - up: function (queryInterface, Sequelize) { - - return queryInterface.describeTable('Companies').then(attributes => { - - if (attributes.integration_api_token.type === 'UUID') { + up: function(queryInterface, Sequelize) { + return queryInterface.describeTable("Companies").then(attributes => { + if (attributes.integration_api_token.type === "UUID") { return 1; } - - return queryInterface - // Create Temp Compaies based on current model definitiom - .createTable('Companies_backup', models.Company.attributes) - .then(() => queryInterface.sequelize.query('PRAGMA foreign_keys=off;')) - .then(() => queryInterface.sequelize.query( - 'INSERT INTO `Companies_backup` (`id`,`name`,`country`,`start_of_new_year`,`createdAt`,`updatedAt`,share_all_absences,ldap_auth_enabled,ldap_auth_config,`date_format`,`company_wide_message`,`mode`,`timezone`,`integration_api_token`,`integration_api_enabled`,`carry_over`) SELECT `id`,`name`,`country`,`start_of_new_year`,`createdAt`,`updatedAt`,share_all_absences,ldap_auth_enabled,ldap_auth_config,`date_format`,`company_wide_message`,`mode`,`timezone`,`integration_api_token`,`integration_api_enabled`,`carry_over` FROM `'+models.Company.tableName+'`')) - .then(() => queryInterface.dropTable( models.Company.tableName )) - .then(() => queryInterface.renameTable('Companies_backup', models.Company.tableName)) - .then(() => queryInterface.sequelize.query('PRAGMA foreign_keys=on;')) - .then(() => queryInterface.addIndex(models.Company.tableName, ['id'])); + + return ( + queryInterface + // Create Temp Compaies based on current model definitiom + .createTable("Companies_backup", models.Company.attributes) + .then(() => + queryInterface.sequelize.query("PRAGMA foreign_keys=off;") + ) + .then(() => + queryInterface.sequelize.query( + "INSERT INTO `Companies_backup` (`id`,`name`,`country`,`start_of_new_year`,`createdAt`,`updatedAt`,share_all_absences,ldap_auth_enabled,ldap_auth_config,`date_format`,`company_wide_message`,`mode`,`timezone`,`integration_api_token`,`integration_api_enabled`,`carry_over`) SELECT `id`,`name`,`country`,`start_of_new_year`,`createdAt`,`updatedAt`,share_all_absences,ldap_auth_enabled,ldap_auth_config,`date_format`,`company_wide_message`,`mode`,`timezone`,`integration_api_token`,`integration_api_enabled`,`carry_over` FROM `" + + models.Company.tableName + + "`" + ) + ) + .then(() => queryInterface.dropTable(models.Company.tableName)) + .then(() => + queryInterface.renameTable( + "Companies_backup", + models.Company.tableName + ) + ) + .then(() => queryInterface.sequelize.query("PRAGMA foreign_keys=on;")) + .then(() => queryInterface.addIndex(models.Company.tableName, ["id"])) + ); }); }, - down: function (queryInterface, Sequelize) { + down: function(queryInterface, Sequelize) { // No way back! return Promise.resolve(); } diff --git a/package.json b/package.json index 6d5758a66..58755943d 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,12 @@ "chai": "^2.2.0", "mocha": "^3.5.3", "node-sass": "^4.5.3", + "prettier": "1.17.0", "request-promise": "^4.2.2", "selenium-webdriver": "2.53.3" }, "scripts": { + "prettier": "prettier --write \"**/*.js\"", "test": "node node_modules/mocha/bin/mocha --recursive t/*", "start": "node bin/wwww", "db-update": "node node_modules/.bin/sequelize db:migrate --config=config/db.json --models-path=lib/model/db/", diff --git a/public/js/bootstrap-datepicker.js b/public/js/bootstrap-datepicker.js index fb56652e1..1b52511b4 100644 --- a/public/js/bootstrap-datepicker.js +++ b/public/js/bootstrap-datepicker.js @@ -4,1915 +4,2057 @@ * Copyright 2012 Stefan Petre * Improvements by Andrew Rowls * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - */(function(factory){ - if (typeof define === "function" && define.amd) { - define(["jquery"], factory); - } else if (typeof exports === 'object') { - factory(require('jquery')); + */ (function(factory) { + if (typeof define === "function" && define.amd) { + define(["jquery"], factory); + } else if (typeof exports === "object") { + factory(require("jquery")); + } else { + factory(jQuery); + } +})(function($, undefined) { + function UTCDate() { + return new Date(Date.UTC.apply(Date, arguments)); + } + function UTCToday() { + var today = new Date(); + return UTCDate(today.getFullYear(), today.getMonth(), today.getDate()); + } + function isUTCEquals(date1, date2) { + return ( + date1.getUTCFullYear() === date2.getUTCFullYear() && + date1.getUTCMonth() === date2.getUTCMonth() && + date1.getUTCDate() === date2.getUTCDate() + ); + } + function alias(method) { + return function() { + return this[method].apply(this, arguments); + }; + } + function isValidDate(d) { + return d && !isNaN(d.getTime()); + } + + var DateArray = (function() { + var extras = { + get: function(i) { + return this.slice(i)[0]; + }, + contains: function(d) { + // Array.indexOf is not cross-browser; + // $.inArray doesn't work with Dates + var val = d && d.valueOf(); + for (var i = 0, l = this.length; i < l; i++) + if (this[i].valueOf() === val) return i; + return -1; + }, + remove: function(i) { + this.splice(i, 1); + }, + replace: function(new_array) { + if (!new_array) return; + if (!$.isArray(new_array)) new_array = [new_array]; + this.clear(); + this.push.apply(this, new_array); + }, + clear: function() { + this.length = 0; + }, + copy: function() { + var a = new DateArray(); + a.replace(this); + return a; + } + }; + + return function() { + var a = []; + a.push.apply(a, arguments); + $.extend(a, extras); + return a; + }; + })(); + + // Picker object + + var Datepicker = function(element, options) { + $(element).data("datepicker", this); + this._process_options(options); + + this.dates = new DateArray(); + this.viewDate = this.o.defaultViewDate; + this.focusDate = null; + + this.element = $(element); + this.isInline = false; + this.isInput = this.element.is("input"); + this.component = this.element.hasClass("date") + ? this.element.find(".add-on, .input-group-addon, .btn") + : false; + this.hasInput = this.component && this.element.find("input").length; + if (this.component && this.component.length === 0) this.component = false; + + this.picker = $(DPGlobal.template); + this._buildEvents(); + this._attachEvents(); + + if (this.isInline) { + this.picker.addClass("datepicker-inline").appendTo(this.element); } else { - factory(jQuery); + this.picker.addClass("datepicker-dropdown dropdown-menu"); } -}(function($, undefined){ - - function UTCDate(){ - return new Date(Date.UTC.apply(Date, arguments)); - } - function UTCToday(){ - var today = new Date(); - return UTCDate(today.getFullYear(), today.getMonth(), today.getDate()); - } - function isUTCEquals(date1, date2) { - return ( - date1.getUTCFullYear() === date2.getUTCFullYear() && - date1.getUTCMonth() === date2.getUTCMonth() && - date1.getUTCDate() === date2.getUTCDate() - ); - } - function alias(method){ - return function(){ - return this[method].apply(this, arguments); - }; - } - function isValidDate(d) { - return d && !isNaN(d.getTime()); - } - - var DateArray = (function(){ - var extras = { - get: function(i){ - return this.slice(i)[0]; - }, - contains: function(d){ - // Array.indexOf is not cross-browser; - // $.inArray doesn't work with Dates - var val = d && d.valueOf(); - for (var i=0, l=this.length; i < l; i++) - if (this[i].valueOf() === val) - return i; - return -1; - }, - remove: function(i){ - this.splice(i,1); - }, - replace: function(new_array){ - if (!new_array) - return; - if (!$.isArray(new_array)) - new_array = [new_array]; - this.clear(); - this.push.apply(this, new_array); - }, - clear: function(){ - this.length = 0; - }, - copy: function(){ - var a = new DateArray(); - a.replace(this); - return a; - } - }; - - return function(){ - var a = []; - a.push.apply(a, arguments); - $.extend(a, extras); - return a; - }; - })(); - - - // Picker object - - var Datepicker = function(element, options){ - $(element).data('datepicker', this); - this._process_options(options); - - this.dates = new DateArray(); - this.viewDate = this.o.defaultViewDate; - this.focusDate = null; - - this.element = $(element); - this.isInline = false; - this.isInput = this.element.is('input'); - this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .btn') : false; - this.hasInput = this.component && this.element.find('input').length; - if (this.component && this.component.length === 0) - this.component = false; - - this.picker = $(DPGlobal.template); - this._buildEvents(); - this._attachEvents(); - - if (this.isInline){ - this.picker.addClass('datepicker-inline').appendTo(this.element); - } - else { - this.picker.addClass('datepicker-dropdown dropdown-menu'); - } - - if (this.o.rtl){ - this.picker.addClass('datepicker-rtl'); - } - - this.viewMode = this.o.startView; - - if (this.o.calendarWeeks) - this.picker.find('thead .datepicker-title, tfoot .today, tfoot .clear') - .attr('colspan', function(i, val){ - return parseInt(val) + 1; - }); - - this._allow_update = false; - - this.setStartDate(this._o.startDate); - this.setEndDate(this._o.endDate); - this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled); - this.setDaysOfWeekHighlighted(this.o.daysOfWeekHighlighted); - this.setDatesDisabled(this.o.datesDisabled); - - this.fillDow(); - this.fillMonths(); - - this._allow_update = true; - - this.update(); - this.showMode(); - - if (this.isInline){ - this.show(); - } - }; - - Datepicker.prototype = { - constructor: Datepicker, - - _process_options: function(opts){ - // Store raw options for reference - this._o = $.extend({}, this._o, opts); - // Processed options - var o = this.o = $.extend({}, this._o); - - // Check if "de-DE" style date is available, if not language should - // fallback to 2 letter code eg "de" - var lang = o.language; - if (!dates[lang]){ - lang = lang.split('-')[0]; - if (!dates[lang]) - lang = defaults.language; - } - o.language = lang; - - switch (o.startView){ - case 2: - case 'decade': - o.startView = 2; - break; - case 1: - case 'year': - o.startView = 1; - break; - default: - o.startView = 0; - } - - switch (o.minViewMode){ - case 1: - case 'months': - o.minViewMode = 1; - break; - case 2: - case 'years': - o.minViewMode = 2; - break; - default: - o.minViewMode = 0; - } - - switch (o.maxViewMode) { - case 0: - case 'days': - o.maxViewMode = 0; - break; - case 1: - case 'months': - o.maxViewMode = 1; - break; - default: - o.maxViewMode = 2; - } - - o.startView = Math.min(o.startView, o.maxViewMode); - o.startView = Math.max(o.startView, o.minViewMode); - - // true, false, or Number > 0 - if (o.multidate !== true){ - o.multidate = Number(o.multidate) || false; - if (o.multidate !== false) - o.multidate = Math.max(0, o.multidate); - } - o.multidateSeparator = String(o.multidateSeparator); - - o.weekStart %= 7; - o.weekEnd = (o.weekStart + 6) % 7; - - var format = DPGlobal.parseFormat(o.format); - if (o.startDate !== -Infinity){ - if (!!o.startDate){ - if (o.startDate instanceof Date) - o.startDate = this._local_to_utc(this._zero_time(o.startDate)); - else - o.startDate = DPGlobal.parseDate(o.startDate, format, o.language); - } - else { - o.startDate = -Infinity; - } - } - if (o.endDate !== Infinity){ - if (!!o.endDate){ - if (o.endDate instanceof Date) - o.endDate = this._local_to_utc(this._zero_time(o.endDate)); - else - o.endDate = DPGlobal.parseDate(o.endDate, format, o.language); - } - else { - o.endDate = Infinity; - } - } - - o.daysOfWeekDisabled = o.daysOfWeekDisabled||[]; - if (!$.isArray(o.daysOfWeekDisabled)) - o.daysOfWeekDisabled = o.daysOfWeekDisabled.split(/[,\s]*/); - o.daysOfWeekDisabled = $.map(o.daysOfWeekDisabled, function(d){ - return parseInt(d, 10); - }); - - o.daysOfWeekHighlighted = o.daysOfWeekHighlighted||[]; - if (!$.isArray(o.daysOfWeekHighlighted)) - o.daysOfWeekHighlighted = o.daysOfWeekHighlighted.split(/[,\s]*/); - o.daysOfWeekHighlighted = $.map(o.daysOfWeekHighlighted, function(d){ - return parseInt(d, 10); - }); - - o.datesDisabled = o.datesDisabled||[]; - if (!$.isArray(o.datesDisabled)) { - var datesDisabled = []; - datesDisabled.push(DPGlobal.parseDate(o.datesDisabled, format, o.language)); - o.datesDisabled = datesDisabled; - } - o.datesDisabled = $.map(o.datesDisabled,function(d){ - return DPGlobal.parseDate(d, format, o.language); - }); - - var plc = String(o.orientation).toLowerCase().split(/\s+/g), - _plc = o.orientation.toLowerCase(); - plc = $.grep(plc, function(word){ - return /^auto|left|right|top|bottom$/.test(word); - }); - o.orientation = {x: 'auto', y: 'auto'}; - if (!_plc || _plc === 'auto') - ; // no action - else if (plc.length === 1){ - switch (plc[0]){ - case 'top': - case 'bottom': - o.orientation.y = plc[0]; - break; - case 'left': - case 'right': - o.orientation.x = plc[0]; - break; - } - } - else { - _plc = $.grep(plc, function(word){ - return /^left|right$/.test(word); - }); - o.orientation.x = _plc[0] || 'auto'; - - _plc = $.grep(plc, function(word){ - return /^top|bottom$/.test(word); - }); - o.orientation.y = _plc[0] || 'auto'; - } - if (o.defaultViewDate) { - var year = o.defaultViewDate.year || new Date().getFullYear(); - var month = o.defaultViewDate.month || 0; - var day = o.defaultViewDate.day || 1; - o.defaultViewDate = UTCDate(year, month, day); - } else { - o.defaultViewDate = UTCToday(); - } - }, - _events: [], - _secondaryEvents: [], - _applyEvents: function(evs){ - for (var i=0, el, ch, ev; i < evs.length; i++){ - el = evs[i][0]; - if (evs[i].length === 2){ - ch = undefined; - ev = evs[i][1]; - } - else if (evs[i].length === 3){ - ch = evs[i][1]; - ev = evs[i][2]; - } - el.on(ev, ch); - } - }, - _unapplyEvents: function(evs){ - for (var i=0, el, ev, ch; i < evs.length; i++){ - el = evs[i][0]; - if (evs[i].length === 2){ - ch = undefined; - ev = evs[i][1]; - } - else if (evs[i].length === 3){ - ch = evs[i][1]; - ev = evs[i][2]; - } - el.off(ev, ch); - } - }, - _buildEvents: function(){ - var events = { - keyup: $.proxy(function(e){ - if ($.inArray(e.keyCode, [27, 37, 39, 38, 40, 32, 13, 9]) === -1) - this.update(); - }, this), - keydown: $.proxy(this.keydown, this), - paste: $.proxy(this.paste, this) - }; - - if (this.o.showOnFocus === true) { - events.focus = $.proxy(this.show, this); - } - if (this.isInput) { // single input - this._events = [ - [this.element, events] - ]; + if (this.o.rtl) { + this.picker.addClass("datepicker-rtl"); + } + + this.viewMode = this.o.startView; + + if (this.o.calendarWeeks) + this.picker + .find("thead .datepicker-title, tfoot .today, tfoot .clear") + .attr("colspan", function(i, val) { + return parseInt(val) + 1; + }); + + this._allow_update = false; + + this.setStartDate(this._o.startDate); + this.setEndDate(this._o.endDate); + this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled); + this.setDaysOfWeekHighlighted(this.o.daysOfWeekHighlighted); + this.setDatesDisabled(this.o.datesDisabled); + + this.fillDow(); + this.fillMonths(); + + this._allow_update = true; + + this.update(); + this.showMode(); + + if (this.isInline) { + this.show(); + } + }; + + Datepicker.prototype = { + constructor: Datepicker, + + _process_options: function(opts) { + // Store raw options for reference + this._o = $.extend({}, this._o, opts); + // Processed options + var o = (this.o = $.extend({}, this._o)); + + // Check if "de-DE" style date is available, if not language should + // fallback to 2 letter code eg "de" + var lang = o.language; + if (!dates[lang]) { + lang = lang.split("-")[0]; + if (!dates[lang]) lang = defaults.language; + } + o.language = lang; + + switch (o.startView) { + case 2: + case "decade": + o.startView = 2; + break; + case 1: + case "year": + o.startView = 1; + break; + default: + o.startView = 0; + } + + switch (o.minViewMode) { + case 1: + case "months": + o.minViewMode = 1; + break; + case 2: + case "years": + o.minViewMode = 2; + break; + default: + o.minViewMode = 0; + } + + switch (o.maxViewMode) { + case 0: + case "days": + o.maxViewMode = 0; + break; + case 1: + case "months": + o.maxViewMode = 1; + break; + default: + o.maxViewMode = 2; + } + + o.startView = Math.min(o.startView, o.maxViewMode); + o.startView = Math.max(o.startView, o.minViewMode); + + // true, false, or Number > 0 + if (o.multidate !== true) { + o.multidate = Number(o.multidate) || false; + if (o.multidate !== false) o.multidate = Math.max(0, o.multidate); + } + o.multidateSeparator = String(o.multidateSeparator); + + o.weekStart %= 7; + o.weekEnd = (o.weekStart + 6) % 7; + + var format = DPGlobal.parseFormat(o.format); + if (o.startDate !== -Infinity) { + if (!!o.startDate) { + if (o.startDate instanceof Date) + o.startDate = this._local_to_utc(this._zero_time(o.startDate)); + else + o.startDate = DPGlobal.parseDate(o.startDate, format, o.language); + } else { + o.startDate = -Infinity; + } + } + if (o.endDate !== Infinity) { + if (!!o.endDate) { + if (o.endDate instanceof Date) + o.endDate = this._local_to_utc(this._zero_time(o.endDate)); + else o.endDate = DPGlobal.parseDate(o.endDate, format, o.language); + } else { + o.endDate = Infinity; + } + } + + o.daysOfWeekDisabled = o.daysOfWeekDisabled || []; + if (!$.isArray(o.daysOfWeekDisabled)) + o.daysOfWeekDisabled = o.daysOfWeekDisabled.split(/[,\s]*/); + o.daysOfWeekDisabled = $.map(o.daysOfWeekDisabled, function(d) { + return parseInt(d, 10); + }); + + o.daysOfWeekHighlighted = o.daysOfWeekHighlighted || []; + if (!$.isArray(o.daysOfWeekHighlighted)) + o.daysOfWeekHighlighted = o.daysOfWeekHighlighted.split(/[,\s]*/); + o.daysOfWeekHighlighted = $.map(o.daysOfWeekHighlighted, function(d) { + return parseInt(d, 10); + }); + + o.datesDisabled = o.datesDisabled || []; + if (!$.isArray(o.datesDisabled)) { + var datesDisabled = []; + datesDisabled.push( + DPGlobal.parseDate(o.datesDisabled, format, o.language) + ); + o.datesDisabled = datesDisabled; + } + o.datesDisabled = $.map(o.datesDisabled, function(d) { + return DPGlobal.parseDate(d, format, o.language); + }); + + var plc = String(o.orientation) + .toLowerCase() + .split(/\s+/g), + _plc = o.orientation.toLowerCase(); + plc = $.grep(plc, function(word) { + return /^auto|left|right|top|bottom$/.test(word); + }); + o.orientation = { x: "auto", y: "auto" }; + if (!_plc || _plc === "auto"); + else if (plc.length === 1) { + // no action + switch (plc[0]) { + case "top": + case "bottom": + o.orientation.y = plc[0]; + break; + case "left": + case "right": + o.orientation.x = plc[0]; + break; + } + } else { + _plc = $.grep(plc, function(word) { + return /^left|right$/.test(word); + }); + o.orientation.x = _plc[0] || "auto"; + + _plc = $.grep(plc, function(word) { + return /^top|bottom$/.test(word); + }); + o.orientation.y = _plc[0] || "auto"; + } + if (o.defaultViewDate) { + var year = o.defaultViewDate.year || new Date().getFullYear(); + var month = o.defaultViewDate.month || 0; + var day = o.defaultViewDate.day || 1; + o.defaultViewDate = UTCDate(year, month, day); + } else { + o.defaultViewDate = UTCToday(); + } + }, + _events: [], + _secondaryEvents: [], + _applyEvents: function(evs) { + for (var i = 0, el, ch, ev; i < evs.length; i++) { + el = evs[i][0]; + if (evs[i].length === 2) { + ch = undefined; + ev = evs[i][1]; + } else if (evs[i].length === 3) { + ch = evs[i][1]; + ev = evs[i][2]; + } + el.on(ev, ch); + } + }, + _unapplyEvents: function(evs) { + for (var i = 0, el, ev, ch; i < evs.length; i++) { + el = evs[i][0]; + if (evs[i].length === 2) { + ch = undefined; + ev = evs[i][1]; + } else if (evs[i].length === 3) { + ch = evs[i][1]; + ev = evs[i][2]; + } + el.off(ev, ch); + } + }, + _buildEvents: function() { + var events = { + keyup: $.proxy(function(e) { + if ($.inArray(e.keyCode, [27, 37, 39, 38, 40, 32, 13, 9]) === -1) + this.update(); + }, this), + keydown: $.proxy(this.keydown, this), + paste: $.proxy(this.paste, this) + }; + + if (this.o.showOnFocus === true) { + events.focus = $.proxy(this.show, this); + } + + if (this.isInput) { + // single input + this._events = [[this.element, events]]; + } else if (this.component && this.hasInput) { + // component: input + button + this._events = [ + // For components that are not readonly, allow keyboard nav + [this.element.find("input"), events], + [ + this.component, + { + click: $.proxy(this.show, this) } - else if (this.component && this.hasInput) { // component: input + button - this._events = [ - // For components that are not readonly, allow keyboard nav - [this.element.find('input'), events], - [this.component, { - click: $.proxy(this.show, this) - }] - ]; + ] + ]; + } else if (this.element.is("div")) { + // inline datepicker + this.isInline = true; + } else { + this._events = [ + [ + this.element, + { + click: $.proxy(this.show, this) } - else if (this.element.is('div')){ // inline datepicker - this.isInline = true; - } - else { - this._events = [ - [this.element, { - click: $.proxy(this.show, this) - }] - ]; - } - this._events.push( - // Component: listen for blur on element descendants - [this.element, '*', { - blur: $.proxy(function(e){ - this._focused_from = e.target; - }, this) - }], - // Input: listen for blur on element - [this.element, { - blur: $.proxy(function(e){ - this._focused_from = e.target; - }, this) - }] - ); - - if (this.o.immediateUpdates) { - // Trigger input updates immediately on changed year/month - this._events.push([this.element, { - 'changeYear changeMonth': $.proxy(function(e){ - this.update(e.date); - }, this) - }]); - } - - this._secondaryEvents = [ - [this.picker, { - click: $.proxy(this.click, this) - }], - [$(window), { - resize: $.proxy(this.place, this) - }], - [$(document), { - mousedown: $.proxy(function(e){ - // Clicked outside the datepicker, hide it - if (!( - this.element.is(e.target) || - this.element.find(e.target).length || - this.picker.is(e.target) || - this.picker.find(e.target).length || - this.picker.hasClass('datepicker-inline') - )){ - this.hide(); - } - }, this) - }] - ]; - }, - _attachEvents: function(){ - this._detachEvents(); - this._applyEvents(this._events); - }, - _detachEvents: function(){ - this._unapplyEvents(this._events); - }, - _attachSecondaryEvents: function(){ - this._detachSecondaryEvents(); - this._applyEvents(this._secondaryEvents); - }, - _detachSecondaryEvents: function(){ - this._unapplyEvents(this._secondaryEvents); - }, - _trigger: function(event, altdate){ - var date = altdate || this.dates.get(-1), - local_date = this._utc_to_local(date); - - this.element.trigger({ - type: event, - date: local_date, - dates: $.map(this.dates, this._utc_to_local), - format: $.proxy(function(ix, format){ - if (arguments.length === 0){ - ix = this.dates.length - 1; - format = this.o.format; - } - else if (typeof ix === 'string'){ - format = ix; - ix = this.dates.length - 1; - } - format = format || this.o.format; - var date = this.dates.get(ix); - return DPGlobal.formatDate(date, format, this.o.language); - }, this) - }); - }, - - show: function(){ - var element = this.component ? this.element.find('input') : this.element; - if (element.attr('readonly') && this.o.enableOnReadonly === false) - return; - if (!this.isInline) - this.picker.appendTo(this.o.container); - this.place(); - this.picker.show(); - this._attachSecondaryEvents(); - this._trigger('show'); - if ((window.navigator.msMaxTouchPoints || 'ontouchstart' in document) && this.o.disableTouchKeyboard) { - $(this.element).blur(); - } - return this; - }, - - hide: function(){ - if (this.isInline) - return this; - if (!this.picker.is(':visible')) - return this; - this.focusDate = null; - this.picker.hide().detach(); - this._detachSecondaryEvents(); - this.viewMode = this.o.startView; - this.showMode(); - - if ( - this.o.forceParse && - ( - this.isInput && this.element.val() || - this.hasInput && this.element.find('input').val() - ) - ) - this.setValue(); - this._trigger('hide'); - return this; - }, - - remove: function(){ - this.hide(); - this._detachEvents(); - this._detachSecondaryEvents(); - this.picker.remove(); - delete this.element.data().datepicker; - if (!this.isInput){ - delete this.element.data().date; - } - return this; - }, - - paste: function(evt){ - var dateString; - if (evt.originalEvent.clipboardData && evt.originalEvent.clipboardData.types - && $.inArray('text/plain', evt.originalEvent.clipboardData.types) !== -1) { - dateString = evt.originalEvent.clipboardData.getData('text/plain'); - } - else if (window.clipboardData) { - dateString = window.clipboardData.getData('Text'); - } - else { - return; - } - this.setDate(dateString); - this.update(); - evt.preventDefault(); - }, - - _utc_to_local: function(utc){ - return utc && new Date(utc.getTime() + (utc.getTimezoneOffset()*60000)); - }, - _local_to_utc: function(local){ - return local && new Date(local.getTime() - (local.getTimezoneOffset()*60000)); - }, - _zero_time: function(local){ - return local && new Date(local.getFullYear(), local.getMonth(), local.getDate()); - }, - _zero_utc_time: function(utc){ - return utc && new Date(Date.UTC(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate())); - }, - - getDates: function(){ - return $.map(this.dates, this._utc_to_local); - }, - - getUTCDates: function(){ - return $.map(this.dates, function(d){ - return new Date(d); - }); - }, - - getDate: function(){ - return this._utc_to_local(this.getUTCDate()); - }, - - getUTCDate: function(){ - var selected_date = this.dates.get(-1); - if (typeof selected_date !== 'undefined') { - return new Date(selected_date); - } else { - return null; - } - }, - - clearDates: function(){ - var element; - if (this.isInput) { - element = this.element; - } else if (this.component) { - element = this.element.find('input'); - } - - if (element) { - element.val(''); - } - - this.update(); - this._trigger('changeDate'); - - if (this.o.autoclose) { - this.hide(); - } - }, - setDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; - this.update.apply(this, args); - this._trigger('changeDate'); - this.setValue(); - return this; - }, - - setUTCDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; - this.update.apply(this, $.map(args, this._utc_to_local)); - this._trigger('changeDate'); - this.setValue(); - return this; - }, - - setDate: alias('setDates'), - setUTCDate: alias('setUTCDates'), - - setValue: function(){ - var formatted = this.getFormattedDate(); - if (!this.isInput){ - if (this.component){ - this.element.find('input').val(formatted); - } - } - else { - this.element.val(formatted); - } - return this; - }, - - getFormattedDate: function(format){ - if (format === undefined) - format = this.o.format; - - var lang = this.o.language; - return $.map(this.dates, function(d){ - return DPGlobal.formatDate(d, format, lang); - }).join(this.o.multidateSeparator); - }, - - setStartDate: function(startDate){ - this._process_options({startDate: startDate}); - this.update(); - this.updateNavArrows(); - return this; - }, - - setEndDate: function(endDate){ - this._process_options({endDate: endDate}); - this.update(); - this.updateNavArrows(); - return this; - }, - - setDaysOfWeekDisabled: function(daysOfWeekDisabled){ - this._process_options({daysOfWeekDisabled: daysOfWeekDisabled}); - this.update(); - this.updateNavArrows(); - return this; - }, - - setDaysOfWeekHighlighted: function(daysOfWeekHighlighted){ - this._process_options({daysOfWeekHighlighted: daysOfWeekHighlighted}); - this.update(); - return this; - }, - - setDatesDisabled: function(datesDisabled){ - this._process_options({datesDisabled: datesDisabled}); - this.update(); - this.updateNavArrows(); - }, - - place: function(){ - if (this.isInline) - return this; - var calendarWidth = this.picker.outerWidth(), - calendarHeight = this.picker.outerHeight(), - visualPadding = 10, - container = $(this.o.container), - windowWidth = container.width(), - scrollTop = this.o.container === 'body' ? $(document).scrollTop() : container.scrollTop(), - appendOffset = container.offset(); - - var parentsZindex = []; - this.element.parents().each(function(){ - var itemZIndex = $(this).css('z-index'); - if (itemZIndex !== 'auto' && itemZIndex !== 0) parentsZindex.push(parseInt(itemZIndex)); - }); - var zIndex = Math.max.apply(Math, parentsZindex) + this.o.zIndexOffset; - var offset = this.component ? this.component.parent().offset() : this.element.offset(); - var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false); - var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false); - var left = offset.left - appendOffset.left, - top = offset.top - appendOffset.top; - - if (this.o.container !== 'body') { - top += scrollTop; - } - - this.picker.removeClass( - 'datepicker-orient-top datepicker-orient-bottom '+ - 'datepicker-orient-right datepicker-orient-left' - ); - - if (this.o.orientation.x !== 'auto'){ - this.picker.addClass('datepicker-orient-' + this.o.orientation.x); - if (this.o.orientation.x === 'right') - left -= calendarWidth - width; - } - // auto x orientation is best-placement: if it crosses a window - // edge, fudge it sideways - else { - if (offset.left < 0) { - // component is outside the window on the left side. Move it into visible range - this.picker.addClass('datepicker-orient-left'); - left -= offset.left - visualPadding; - } else if (left + calendarWidth > windowWidth) { - // the calendar passes the widow right edge. Align it to component right side - this.picker.addClass('datepicker-orient-right'); - left += width - calendarWidth; - } else { - // Default to left - this.picker.addClass('datepicker-orient-left'); - } - } - - // auto y orientation is best-situation: top or bottom, no fudging, - // decision based on which shows more of the calendar - var yorient = this.o.orientation.y, - top_overflow; - if (yorient === 'auto'){ - top_overflow = -scrollTop + top - calendarHeight; - yorient = top_overflow < 0 ? 'bottom' : 'top'; - } - - this.picker.addClass('datepicker-orient-' + yorient); - if (yorient === 'top') - top -= calendarHeight + parseInt(this.picker.css('padding-top')); - else - top += height; - - if (this.o.rtl) { - var right = windowWidth - (left + width); - this.picker.css({ - top: top, - right: right, - zIndex: zIndex - }); - } else { - this.picker.css({ - top: top, - left: left, - zIndex: zIndex - }); - } - return this; - }, - - _allow_update: true, - update: function(){ - if (!this._allow_update) - return this; - - var oldDates = this.dates.copy(), - dates = [], - fromArgs = false; - if (arguments.length){ - $.each(arguments, $.proxy(function(i, date){ - if (date instanceof Date) - date = this._local_to_utc(date); - dates.push(date); - }, this)); - fromArgs = true; - } - else { - dates = this.isInput - ? this.element.val() - : this.element.data('date') || this.element.find('input').val(); - if (dates && this.o.multidate) - dates = dates.split(this.o.multidateSeparator); - else - dates = [dates]; - delete this.element.data().date; - } - - dates = $.map(dates, $.proxy(function(date){ - return DPGlobal.parseDate(date, this.o.format, this.o.language); - }, this)); - dates = $.grep(dates, $.proxy(function(date){ - return ( - !this.dateWithinRange(date) || - !date - ); - }, this), true); - this.dates.replace(dates); - - if (this.dates.length) - this.viewDate = new Date(this.dates.get(-1)); - else if (this.viewDate < this.o.startDate) - this.viewDate = new Date(this.o.startDate); - else if (this.viewDate > this.o.endDate) - this.viewDate = new Date(this.o.endDate); - else - this.viewDate = this.o.defaultViewDate; - - if (fromArgs){ - // setting date by clicking - this.setValue(); - } - else if (dates.length){ - // setting date by typing - if (String(oldDates) !== String(this.dates)) - this._trigger('changeDate'); - } - if (!this.dates.length && oldDates.length) - this._trigger('clearDate'); - - this.fill(); - this.element.change(); - return this; - }, - - fillDow: function(){ - var dowCnt = this.o.weekStart, - html = '
       '+dates[this.o.language].daysMin[(dowCnt++)%7]+'
       ' + + dates[this.o.language].daysMin[dowCnt++ % 7] + + "
      '+ calWeek +''+prevMonth.getUTCDate() + '
      ' + calWeek + "" + + prevMonth.getUTCDate() + + "
      «»
      '+ - DPGlobal.headTemplate+ - ''+ - DPGlobal.footTemplate+ - '
      '+ - '
      '+ - '
      '+ - ''+ - DPGlobal.headTemplate+ - DPGlobal.contTemplate+ - DPGlobal.footTemplate+ - '
      '+ - '
      '+ - '
      '+ - ''+ - DPGlobal.headTemplate+ - DPGlobal.contTemplate+ - DPGlobal.footTemplate+ - '
      '+ - '
      '+ - '
      '; - - $.fn.datepicker.DPGlobal = DPGlobal; - - - /* DATEPICKER NO CONFLICT - * =================== */ - - $.fn.datepicker.noConflict = function(){ - $.fn.datepicker = old; - return this; - }; - - /* DATEPICKER VERSION - * =================== */ - $.fn.datepicker.version = '1.5.1'; - - /* DATEPICKER DATA-API - * ================== */ - - $(document).on( - 'focus.datepicker.data-api click.datepicker.data-api', - '[data-provide="datepicker"]', - function(e){ - var $this = $(this); - if ($this.data('datepicker')) - return; - e.preventDefault(); - // component click requires us to explicitly show it - datepickerPlugin.call($this, 'show'); - } - ); - $(function(){ - datepickerPlugin.call($('[data-provide="datepicker-inline"]')); - }); - -})); + } else if (this.o.multidate === false) { + this.dates.clear(); + this.dates.push(date); + } else { + this.dates.push(date); + } + + if (typeof this.o.multidate === "number") + while (this.dates.length > this.o.multidate) this.dates.remove(0); + }, + + _setDate: function(date, which) { + if (!which || which === "date") + this._toggle_multidate(date && new Date(date)); + if (!which || which === "view") this.viewDate = date && new Date(date); + + this.fill(); + this.setValue(); + if (!which || which !== "view") { + this._trigger("changeDate"); + } + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find("input"); + } + if (element) { + element.change(); + } + if (this.o.autoclose && (!which || which === "date")) { + this.hide(); + } + }, + + moveDay: function(date, dir) { + var newDate = new Date(date); + newDate.setUTCDate(date.getUTCDate() + dir); + + return newDate; + }, + + moveWeek: function(date, dir) { + return this.moveDay(date, dir * 7); + }, + + moveMonth: function(date, dir) { + if (!isValidDate(date)) return this.o.defaultViewDate; + if (!dir) return date; + var new_date = new Date(date.valueOf()), + day = new_date.getUTCDate(), + month = new_date.getUTCMonth(), + mag = Math.abs(dir), + new_month, + test; + dir = dir > 0 ? 1 : -1; + if (mag === 1) { + test = + dir === -1 + ? // If going back one month, make sure month is not current month + // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02) + function() { + return new_date.getUTCMonth() === month; + } + : // If going forward one month, make sure month is as expected + // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02) + function() { + return new_date.getUTCMonth() !== new_month; + }; + new_month = month + dir; + new_date.setUTCMonth(new_month); + // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11 + if (new_month < 0 || new_month > 11) new_month = (new_month + 12) % 12; + } else { + // For magnitudes >1, move one month at a time... + for (var i = 0; i < mag; i++) + // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)... + new_date = this.moveMonth(new_date, dir); + // ...then reset the day, keeping it in the new month + new_month = new_date.getUTCMonth(); + new_date.setUTCDate(day); + test = function() { + return new_month !== new_date.getUTCMonth(); + }; + } + // Common date-resetting loop -- if date is beyond end of month, make it + // end of month + while (test()) { + new_date.setUTCDate(--day); + new_date.setUTCMonth(new_month); + } + return new_date; + }, + + moveYear: function(date, dir) { + return this.moveMonth(date, dir * 12); + }, + + moveAvailableDate: function(date, dir, fn) { + do { + date = this[fn](date, dir); + + if (!this.dateWithinRange(date)) return false; + + fn = "moveDay"; + } while (this.dateIsDisabled(date)); + + return date; + }, + + weekOfDateIsDisabled: function(date) { + return $.inArray(date.getUTCDay(), this.o.daysOfWeekDisabled) !== -1; + }, + + dateIsDisabled: function(date) { + return ( + this.weekOfDateIsDisabled(date) || + $.grep(this.o.datesDisabled, function(d) { + return isUTCEquals(date, d); + }).length > 0 + ); + }, + + dateWithinRange: function(date) { + return date >= this.o.startDate && date <= this.o.endDate; + }, + + keydown: function(e) { + if (!this.picker.is(":visible")) { + if (e.keyCode === 40 || e.keyCode === 27) { + // allow down to re-show picker + this.show(); + e.stopPropagation(); + } + return; + } + var dateChanged = false, + dir, + newViewDate, + focusDate = this.focusDate || this.viewDate; + switch (e.keyCode) { + case 27: // escape + if (this.focusDate) { + this.focusDate = null; + this.viewDate = this.dates.get(-1) || this.viewDate; + this.fill(); + } else this.hide(); + e.preventDefault(); + e.stopPropagation(); + break; + case 37: // left + case 38: // up + case 39: // right + case 40: // down + if ( + !this.o.keyboardNavigation || + this.o.daysOfWeekDisabled.length === 7 + ) + break; + dir = e.keyCode === 37 || e.keyCode === 38 ? -1 : 1; + if (e.ctrlKey) { + newViewDate = this.moveAvailableDate(focusDate, dir, "moveYear"); + + if (newViewDate) this._trigger("changeYear", this.viewDate); + } else if (e.shiftKey) { + newViewDate = this.moveAvailableDate(focusDate, dir, "moveMonth"); + + if (newViewDate) this._trigger("changeMonth", this.viewDate); + } else if (e.keyCode === 37 || e.keyCode === 39) { + newViewDate = this.moveAvailableDate(focusDate, dir, "moveDay"); + } else if (!this.weekOfDateIsDisabled(focusDate)) { + newViewDate = this.moveAvailableDate(focusDate, dir, "moveWeek"); + } + if (newViewDate) { + this.focusDate = this.viewDate = newViewDate; + this.setValue(); + this.fill(); + e.preventDefault(); + } + break; + case 13: // enter + if (!this.o.forceParse) break; + focusDate = this.focusDate || this.dates.get(-1) || this.viewDate; + if (this.o.keyboardNavigation) { + this._toggle_multidate(focusDate); + dateChanged = true; + } + this.focusDate = null; + this.viewDate = this.dates.get(-1) || this.viewDate; + this.setValue(); + this.fill(); + if (this.picker.is(":visible")) { + e.preventDefault(); + e.stopPropagation(); + if (this.o.autoclose) this.hide(); + } + break; + case 9: // tab + this.focusDate = null; + this.viewDate = this.dates.get(-1) || this.viewDate; + this.fill(); + this.hide(); + break; + } + if (dateChanged) { + if (this.dates.length) this._trigger("changeDate"); + else this._trigger("clearDate"); + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find("input"); + } + if (element) { + element.change(); + } + } + }, + + showMode: function(dir) { + if (dir) { + this.viewMode = Math.max( + this.o.minViewMode, + Math.min(this.o.maxViewMode, this.viewMode + dir) + ); + } + this.picker + .children("div") + .hide() + .filter(".datepicker-" + DPGlobal.modes[this.viewMode].clsName) + .show(); + this.updateNavArrows(); + } + }; + + var DateRangePicker = function(element, options) { + $(element).data("datepicker", this); + this.element = $(element); + this.inputs = $.map(options.inputs, function(i) { + return i.jquery ? i[0] : i; + }); + delete options.inputs; + + datepickerPlugin + .call($(this.inputs), options) + .on("changeDate", $.proxy(this.dateUpdated, this)); + + this.pickers = $.map(this.inputs, function(i) { + return $(i).data("datepicker"); + }); + this.updateDates(); + }; + DateRangePicker.prototype = { + updateDates: function() { + this.dates = $.map(this.pickers, function(i) { + return i.getUTCDate(); + }); + this.updateRanges(); + }, + updateRanges: function() { + var range = $.map(this.dates, function(d) { + return d.valueOf(); + }); + $.each(this.pickers, function(i, p) { + p.setRange(range); + }); + }, + dateUpdated: function(e) { + // `this.updating` is a workaround for preventing infinite recursion + // between `changeDate` triggering and `setUTCDate` calling. Until + // there is a better mechanism. + if (this.updating) return; + this.updating = true; + + var dp = $(e.target).data("datepicker"); + + if (typeof dp === "undefined") { + return; + } + + var new_date = dp.getUTCDate(), + i = $.inArray(e.target, this.inputs), + j = i - 1, + k = i + 1, + l = this.inputs.length; + if (i === -1) return; + + $.each(this.pickers, function(i, p) { + if (!p.getUTCDate()) p.setUTCDate(new_date); + }); + + if (new_date < this.dates[j]) { + // Date being moved earlier/left + while (j >= 0 && new_date < this.dates[j]) { + this.pickers[j--].setUTCDate(new_date); + } + } else if (new_date > this.dates[k]) { + // Date being moved later/right + while (k < l && new_date > this.dates[k]) { + this.pickers[k++].setUTCDate(new_date); + } + } + this.updateDates(); + + delete this.updating; + }, + remove: function() { + $.map(this.pickers, function(p) { + p.remove(); + }); + delete this.element.data().datepicker; + } + }; + + function opts_from_el(el, prefix) { + // Derive options from element data-attrs + var data = $(el).data(), + out = {}, + inkey, + replace = new RegExp("^" + prefix.toLowerCase() + "([A-Z])"); + prefix = new RegExp("^" + prefix.toLowerCase()); + function re_lower(_, a) { + return a.toLowerCase(); + } + for (var key in data) + if (prefix.test(key)) { + inkey = key.replace(replace, re_lower); + out[inkey] = data[key]; + } + return out; + } + + function opts_from_locale(lang) { + // Derive options from locale plugins + var out = {}; + // Check if "de-DE" style date is available, if not language should + // fallback to 2 letter code eg "de" + if (!dates[lang]) { + lang = lang.split("-")[0]; + if (!dates[lang]) return; + } + var d = dates[lang]; + $.each(locale_opts, function(i, k) { + if (k in d) out[k] = d[k]; + }); + return out; + } + + var old = $.fn.datepicker; + var datepickerPlugin = function(option) { + var args = Array.apply(null, arguments); + args.shift(); + var internal_return; + this.each(function() { + var $this = $(this), + data = $this.data("datepicker"), + options = typeof option === "object" && option; + if (!data) { + var elopts = opts_from_el(this, "date"), + // Preliminary otions + xopts = $.extend({}, defaults, elopts, options), + locopts = opts_from_locale(xopts.language), + // Options priority: js args, data-attrs, locales, defaults + opts = $.extend({}, defaults, locopts, elopts, options); + if ($this.hasClass("input-daterange") || opts.inputs) { + $.extend(opts, { + inputs: opts.inputs || $this.find("input").toArray() + }); + data = new DateRangePicker(this, opts); + } else { + data = new Datepicker(this, opts); + } + $this.data("datepicker", data); + } + if (typeof option === "string" && typeof data[option] === "function") { + internal_return = data[option].apply(data, args); + } + }); + + if ( + internal_return === undefined || + internal_return instanceof Datepicker || + internal_return instanceof DateRangePicker + ) + return this; + + if (this.length > 1) + throw new Error( + "Using only allowed for the collection of a single element (" + + option + + " function)" + ); + else return internal_return; + }; + $.fn.datepicker = datepickerPlugin; + + var defaults = ($.fn.datepicker.defaults = { + autoclose: false, + beforeShowDay: $.noop, + beforeShowMonth: $.noop, + beforeShowYear: $.noop, + calendarWeeks: false, + clearBtn: false, + toggleActive: false, + daysOfWeekDisabled: [], + daysOfWeekHighlighted: [], + datesDisabled: [], + endDate: Infinity, + forceParse: true, + format: "mm/dd/yyyy", + keyboardNavigation: true, + language: "en", + minViewMode: 0, + maxViewMode: 2, + multidate: false, + multidateSeparator: ",", + orientation: "auto", + rtl: false, + startDate: -Infinity, + startView: 0, + todayBtn: false, + todayHighlight: false, + weekStart: 0, + disableTouchKeyboard: false, + enableOnReadonly: true, + showOnFocus: true, + zIndexOffset: 10, + container: "body", + immediateUpdates: false, + title: "" + }); + var locale_opts = ($.fn.datepicker.locale_opts = [ + "format", + "rtl", + "weekStart" + ]); + $.fn.datepicker.Constructor = Datepicker; + var dates = ($.fn.datepicker.dates = { + en: { + days: [ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday" + ], + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"], + months: [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" + ], + monthsShort: [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec" + ], + today: "Today", + clear: "Clear", + titleFormat: "MM yyyy" + } + }); + + var DPGlobal = { + modes: [ + { + clsName: "days", + navFnc: "Month", + navStep: 1 + }, + { + clsName: "months", + navFnc: "FullYear", + navStep: 1 + }, + { + clsName: "years", + navFnc: "FullYear", + navStep: 10 + } + ], + isLeapYear: function(year) { + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + }, + getDaysInMonth: function(year, month) { + return [ + 31, + DPGlobal.isLeapYear(year) ? 29 : 28, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31 + ][month]; + }, + validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g, + nonpunctuation: /[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g, + parseFormat: function(format) { + if ( + typeof format.toValue === "function" && + typeof format.toDisplay === "function" + ) + return format; + // IE treats \0 as a string end in inputs (truncating the value), + // so it's a bad format delimiter, anyway + var separators = format.replace(this.validParts, "\0").split("\0"), + parts = format.match(this.validParts); + if (!separators || !separators.length || !parts || parts.length === 0) { + throw new Error("Invalid date format."); + } + return { separators: separators, parts: parts }; + }, + parseDate: function(date, format, language) { + if (!date) return undefined; + if (date instanceof Date) return date; + if (typeof format === "string") format = DPGlobal.parseFormat(format); + if (format.toValue) return format.toValue(date, format, language); + var part_re = /([\-+]\d+)([dmwy])/, + parts = date.match(/([\-+]\d+)([dmwy])/g), + fn_map = { + d: "moveDay", + m: "moveMonth", + w: "moveWeek", + y: "moveYear" + }, + part, + dir, + i, + fn; + if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)) { + date = new Date(); + for (i = 0; i < parts.length; i++) { + part = part_re.exec(parts[i]); + dir = parseInt(part[1]); + fn = fn_map[part[2]]; + date = Datepicker.prototype[fn](date, dir); + } + return UTCDate( + date.getUTCFullYear(), + date.getUTCMonth(), + date.getUTCDate() + ); + } + parts = (date && date.match(this.nonpunctuation)) || []; + date = new Date(); + var parsed = {}, + setters_order = ["yyyy", "yy", "M", "MM", "m", "mm", "d", "dd"], + setters_map = { + yyyy: function(d, v) { + return d.setUTCFullYear(v); + }, + yy: function(d, v) { + return d.setUTCFullYear(2000 + v); + }, + m: function(d, v) { + if (isNaN(d)) return d; + v -= 1; + while (v < 0) v += 12; + v %= 12; + d.setUTCMonth(v); + while (d.getUTCMonth() !== v) d.setUTCDate(d.getUTCDate() - 1); + return d; + }, + d: function(d, v) { + return d.setUTCDate(v); + } + }, + val, + filtered; + setters_map["M"] = setters_map["MM"] = setters_map["mm"] = + setters_map["m"]; + setters_map["dd"] = setters_map["d"]; + date = UTCToday(); + var fparts = format.parts.slice(); + // Remove noop parts + if (parts.length !== fparts.length) { + fparts = $(fparts) + .filter(function(i, p) { + return $.inArray(p, setters_order) !== -1; + }) + .toArray(); + } + // Process remainder + function match_part() { + var m = this.slice(0, parts[i].length), + p = parts[i].slice(0, m.length); + return m.toLowerCase() === p.toLowerCase(); + } + if (parts.length === fparts.length) { + var cnt; + for (i = 0, cnt = fparts.length; i < cnt; i++) { + val = parseInt(parts[i], 10); + part = fparts[i]; + if (isNaN(val)) { + switch (part) { + case "MM": + filtered = $(dates[language].months).filter(match_part); + val = $.inArray(filtered[0], dates[language].months) + 1; + break; + case "M": + filtered = $(dates[language].monthsShort).filter(match_part); + val = $.inArray(filtered[0], dates[language].monthsShort) + 1; + break; + } + } + parsed[part] = val; + } + var _date, s; + for (i = 0; i < setters_order.length; i++) { + s = setters_order[i]; + if (s in parsed && !isNaN(parsed[s])) { + _date = new Date(date); + setters_map[s](_date, parsed[s]); + if (!isNaN(_date)) date = _date; + } + } + } + return date; + }, + formatDate: function(date, format, language) { + if (!date) return ""; + if (typeof format === "string") format = DPGlobal.parseFormat(format); + if (format.toDisplay) return format.toDisplay(date, format, language); + var val = { + d: date.getUTCDate(), + D: dates[language].daysShort[date.getUTCDay()], + DD: dates[language].days[date.getUTCDay()], + m: date.getUTCMonth() + 1, + M: dates[language].monthsShort[date.getUTCMonth()], + MM: dates[language].months[date.getUTCMonth()], + yy: date + .getUTCFullYear() + .toString() + .substring(2), + yyyy: date.getUTCFullYear() + }; + val.dd = (val.d < 10 ? "0" : "") + val.d; + val.mm = (val.m < 10 ? "0" : "") + val.m; + date = []; + var seps = $.extend([], format.separators); + for (var i = 0, cnt = format.parts.length; i <= cnt; i++) { + if (seps.length) date.push(seps.shift()); + date.push(val[format.parts[i]]); + } + return date.join(""); + }, + headTemplate: + "" + + "" + + '' + + "" + + "" + + '«' + + '' + + '»' + + "" + + "", + contTemplate: '', + footTemplate: + "" + + "" + + '' + + "" + + "" + + '' + + "" + + "" + }; + DPGlobal.template = + '
      ' + + '
      ' + + '' + + DPGlobal.headTemplate + + "" + + DPGlobal.footTemplate + + "
      " + + "
      " + + '
      ' + + '' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + "
      " + + "
      " + + '
      ' + + '' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + "
      " + + "
      " + + "
      "; + + $.fn.datepicker.DPGlobal = DPGlobal; + + /* DATEPICKER NO CONFLICT + * =================== */ + + $.fn.datepicker.noConflict = function() { + $.fn.datepicker = old; + return this; + }; + + /* DATEPICKER VERSION + * =================== */ + $.fn.datepicker.version = "1.5.1"; + + /* DATEPICKER DATA-API + * ================== */ + + $(document).on( + "focus.datepicker.data-api click.datepicker.data-api", + '[data-provide="datepicker"]', + function(e) { + var $this = $(this); + if ($this.data("datepicker")) return; + e.preventDefault(); + // component click requires us to explicitly show it + datepickerPlugin.call($this, "show"); + } + ); + $(function() { + datepickerPlugin.call($('[data-provide="datepicker-inline"]')); + }); +}); diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js index c8f82e592..393a5a9f7 100644 --- a/public/js/bootstrap.min.js +++ b/public/js/bootstrap.min.js @@ -3,5 +3,1659 @@ * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.4",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.4",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.4",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.4",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
      ').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth
      ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport),this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-mp.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.4",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.4",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.4",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a(document.body).height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file +if ("undefined" == typeof jQuery) + throw new Error("Bootstrap's JavaScript requires jQuery"); ++(function(a) { + "use strict"; + var b = a.fn.jquery.split(" ")[0].split("."); + if ((b[0] < 2 && b[1] < 9) || (1 == b[0] && 9 == b[1] && b[2] < 1)) + throw new Error( + "Bootstrap's JavaScript requires jQuery version 1.9.1 or higher" + ); +})(jQuery), + +(function(a) { + "use strict"; + function b() { + var a = document.createElement("bootstrap"), + b = { + WebkitTransition: "webkitTransitionEnd", + MozTransition: "transitionend", + OTransition: "oTransitionEnd otransitionend", + transition: "transitionend" + }; + for (var c in b) if (void 0 !== a.style[c]) return { end: b[c] }; + return !1; + } + (a.fn.emulateTransitionEnd = function(b) { + var c = !1, + d = this; + a(this).one("bsTransitionEnd", function() { + c = !0; + }); + var e = function() { + c || a(d).trigger(a.support.transition.end); + }; + return setTimeout(e, b), this; + }), + a(function() { + (a.support.transition = b()), + a.support.transition && + (a.event.special.bsTransitionEnd = { + bindType: a.support.transition.end, + delegateType: a.support.transition.end, + handle: function(b) { + return a(b.target).is(this) + ? b.handleObj.handler.apply(this, arguments) + : void 0; + } + }); + }); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var c = a(this), + e = c.data("bs.alert"); + e || c.data("bs.alert", (e = new d(this))), + "string" == typeof b && e[b].call(c); + }); + } + var c = '[data-dismiss="alert"]', + d = function(b) { + a(b).on("click", c, this.close); + }; + (d.VERSION = "3.3.4"), + (d.TRANSITION_DURATION = 150), + (d.prototype.close = function(b) { + function c() { + g.detach() + .trigger("closed.bs.alert") + .remove(); + } + var e = a(this), + f = e.attr("data-target"); + f || ((f = e.attr("href")), (f = f && f.replace(/.*(?=#[^\s]*$)/, ""))); + var g = a(f); + b && b.preventDefault(), + g.length || (g = e.closest(".alert")), + g.trigger((b = a.Event("close.bs.alert"))), + b.isDefaultPrevented() || + (g.removeClass("in"), + a.support.transition && g.hasClass("fade") + ? g + .one("bsTransitionEnd", c) + .emulateTransitionEnd(d.TRANSITION_DURATION) + : c()); + }); + var e = a.fn.alert; + (a.fn.alert = b), + (a.fn.alert.Constructor = d), + (a.fn.alert.noConflict = function() { + return (a.fn.alert = e), this; + }), + a(document).on("click.bs.alert.data-api", c, d.prototype.close); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.button"), + f = "object" == typeof b && b; + e || d.data("bs.button", (e = new c(this, f))), + "toggle" == b ? e.toggle() : b && e.setState(b); + }); + } + var c = function(b, d) { + (this.$element = a(b)), + (this.options = a.extend({}, c.DEFAULTS, d)), + (this.isLoading = !1); + }; + (c.VERSION = "3.3.4"), + (c.DEFAULTS = { loadingText: "loading..." }), + (c.prototype.setState = function(b) { + var c = "disabled", + d = this.$element, + e = d.is("input") ? "val" : "html", + f = d.data(); + (b += "Text"), + null == f.resetText && d.data("resetText", d[e]()), + setTimeout( + a.proxy(function() { + d[e](null == f[b] ? this.options[b] : f[b]), + "loadingText" == b + ? ((this.isLoading = !0), d.addClass(c).attr(c, c)) + : this.isLoading && + ((this.isLoading = !1), d.removeClass(c).removeAttr(c)); + }, this), + 0 + ); + }), + (c.prototype.toggle = function() { + var a = !0, + b = this.$element.closest('[data-toggle="buttons"]'); + if (b.length) { + var c = this.$element.find("input"); + "radio" == c.prop("type") && + (c.prop("checked") && this.$element.hasClass("active") + ? (a = !1) + : b.find(".active").removeClass("active")), + a && + c + .prop("checked", !this.$element.hasClass("active")) + .trigger("change"); + } else + this.$element.attr("aria-pressed", !this.$element.hasClass("active")); + a && this.$element.toggleClass("active"); + }); + var d = a.fn.button; + (a.fn.button = b), + (a.fn.button.Constructor = c), + (a.fn.button.noConflict = function() { + return (a.fn.button = d), this; + }), + a(document) + .on("click.bs.button.data-api", '[data-toggle^="button"]', function(c) { + var d = a(c.target); + d.hasClass("btn") || (d = d.closest(".btn")), + b.call(d, "toggle"), + c.preventDefault(); + }) + .on( + "focus.bs.button.data-api blur.bs.button.data-api", + '[data-toggle^="button"]', + function(b) { + a(b.target) + .closest(".btn") + .toggleClass("focus", /^focus(in)?$/.test(b.type)); + } + ); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.carousel"), + f = a.extend({}, c.DEFAULTS, d.data(), "object" == typeof b && b), + g = "string" == typeof b ? b : f.slide; + e || d.data("bs.carousel", (e = new c(this, f))), + "number" == typeof b + ? e.to(b) + : g + ? e[g]() + : f.interval && e.pause().cycle(); + }); + } + var c = function(b, c) { + (this.$element = a(b)), + (this.$indicators = this.$element.find(".carousel-indicators")), + (this.options = c), + (this.paused = null), + (this.sliding = null), + (this.interval = null), + (this.$active = null), + (this.$items = null), + this.options.keyboard && + this.$element.on("keydown.bs.carousel", a.proxy(this.keydown, this)), + "hover" == this.options.pause && + !("ontouchstart" in document.documentElement) && + this.$element + .on("mouseenter.bs.carousel", a.proxy(this.pause, this)) + .on("mouseleave.bs.carousel", a.proxy(this.cycle, this)); + }; + (c.VERSION = "3.3.4"), + (c.TRANSITION_DURATION = 600), + (c.DEFAULTS = { interval: 5e3, pause: "hover", wrap: !0, keyboard: !0 }), + (c.prototype.keydown = function(a) { + if (!/input|textarea/i.test(a.target.tagName)) { + switch (a.which) { + case 37: + this.prev(); + break; + case 39: + this.next(); + break; + default: + return; + } + a.preventDefault(); + } + }), + (c.prototype.cycle = function(b) { + return ( + b || (this.paused = !1), + this.interval && clearInterval(this.interval), + this.options.interval && + !this.paused && + (this.interval = setInterval( + a.proxy(this.next, this), + this.options.interval + )), + this + ); + }), + (c.prototype.getItemIndex = function(a) { + return ( + (this.$items = a.parent().children(".item")), + this.$items.index(a || this.$active) + ); + }), + (c.prototype.getItemForDirection = function(a, b) { + var c = this.getItemIndex(b), + d = + ("prev" == a && 0 === c) || + ("next" == a && c == this.$items.length - 1); + if (d && !this.options.wrap) return b; + var e = "prev" == a ? -1 : 1, + f = (c + e) % this.$items.length; + return this.$items.eq(f); + }), + (c.prototype.to = function(a) { + var b = this, + c = this.getItemIndex( + (this.$active = this.$element.find(".item.active")) + ); + return a > this.$items.length - 1 || 0 > a + ? void 0 + : this.sliding + ? this.$element.one("slid.bs.carousel", function() { + b.to(a); + }) + : c == a + ? this.pause().cycle() + : this.slide(a > c ? "next" : "prev", this.$items.eq(a)); + }), + (c.prototype.pause = function(b) { + return ( + b || (this.paused = !0), + this.$element.find(".next, .prev").length && + a.support.transition && + (this.$element.trigger(a.support.transition.end), this.cycle(!0)), + (this.interval = clearInterval(this.interval)), + this + ); + }), + (c.prototype.next = function() { + return this.sliding ? void 0 : this.slide("next"); + }), + (c.prototype.prev = function() { + return this.sliding ? void 0 : this.slide("prev"); + }), + (c.prototype.slide = function(b, d) { + var e = this.$element.find(".item.active"), + f = d || this.getItemForDirection(b, e), + g = this.interval, + h = "next" == b ? "left" : "right", + i = this; + if (f.hasClass("active")) return (this.sliding = !1); + var j = f[0], + k = a.Event("slide.bs.carousel", { relatedTarget: j, direction: h }); + if ((this.$element.trigger(k), !k.isDefaultPrevented())) { + if ( + ((this.sliding = !0), g && this.pause(), this.$indicators.length) + ) { + this.$indicators.find(".active").removeClass("active"); + var l = a(this.$indicators.children()[this.getItemIndex(f)]); + l && l.addClass("active"); + } + var m = a.Event("slid.bs.carousel", { + relatedTarget: j, + direction: h + }); + return ( + a.support.transition && this.$element.hasClass("slide") + ? (f.addClass(b), + f[0].offsetWidth, + e.addClass(h), + f.addClass(h), + e + .one("bsTransitionEnd", function() { + f.removeClass([b, h].join(" ")).addClass("active"), + e.removeClass(["active", h].join(" ")), + (i.sliding = !1), + setTimeout(function() { + i.$element.trigger(m); + }, 0); + }) + .emulateTransitionEnd(c.TRANSITION_DURATION)) + : (e.removeClass("active"), + f.addClass("active"), + (this.sliding = !1), + this.$element.trigger(m)), + g && this.cycle(), + this + ); + } + }); + var d = a.fn.carousel; + (a.fn.carousel = b), + (a.fn.carousel.Constructor = c), + (a.fn.carousel.noConflict = function() { + return (a.fn.carousel = d), this; + }); + var e = function(c) { + var d, + e = a(this), + f = a( + e.attr("data-target") || + ((d = e.attr("href")) && d.replace(/.*(?=#[^\s]+$)/, "")) + ); + if (f.hasClass("carousel")) { + var g = a.extend({}, f.data(), e.data()), + h = e.attr("data-slide-to"); + h && (g.interval = !1), + b.call(f, g), + h && f.data("bs.carousel").to(h), + c.preventDefault(); + } + }; + a(document) + .on("click.bs.carousel.data-api", "[data-slide]", e) + .on("click.bs.carousel.data-api", "[data-slide-to]", e), + a(window).on("load", function() { + a('[data-ride="carousel"]').each(function() { + var c = a(this); + b.call(c, c.data()); + }); + }); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + var c, + d = + b.attr("data-target") || + ((c = b.attr("href")) && c.replace(/.*(?=#[^\s]+$)/, "")); + return a(d); + } + function c(b) { + return this.each(function() { + var c = a(this), + e = c.data("bs.collapse"), + f = a.extend({}, d.DEFAULTS, c.data(), "object" == typeof b && b); + !e && f.toggle && /show|hide/.test(b) && (f.toggle = !1), + e || c.data("bs.collapse", (e = new d(this, f))), + "string" == typeof b && e[b](); + }); + } + var d = function(b, c) { + (this.$element = a(b)), + (this.options = a.extend({}, d.DEFAULTS, c)), + (this.$trigger = a( + '[data-toggle="collapse"][href="#' + + b.id + + '"],[data-toggle="collapse"][data-target="#' + + b.id + + '"]' + )), + (this.transitioning = null), + this.options.parent + ? (this.$parent = this.getParent()) + : this.addAriaAndCollapsedClass(this.$element, this.$trigger), + this.options.toggle && this.toggle(); + }; + (d.VERSION = "3.3.4"), + (d.TRANSITION_DURATION = 350), + (d.DEFAULTS = { toggle: !0 }), + (d.prototype.dimension = function() { + var a = this.$element.hasClass("width"); + return a ? "width" : "height"; + }), + (d.prototype.show = function() { + if (!this.transitioning && !this.$element.hasClass("in")) { + var b, + e = + this.$parent && + this.$parent.children(".panel").children(".in, .collapsing"); + if ( + !( + e && + e.length && + ((b = e.data("bs.collapse")), b && b.transitioning) + ) + ) { + var f = a.Event("show.bs.collapse"); + if ((this.$element.trigger(f), !f.isDefaultPrevented())) { + e && + e.length && + (c.call(e, "hide"), b || e.data("bs.collapse", null)); + var g = this.dimension(); + this.$element + .removeClass("collapse") + .addClass("collapsing") + [g](0) + .attr("aria-expanded", !0), + this.$trigger + .removeClass("collapsed") + .attr("aria-expanded", !0), + (this.transitioning = 1); + var h = function() { + this.$element + .removeClass("collapsing") + .addClass("collapse in") + [g](""), + (this.transitioning = 0), + this.$element.trigger("shown.bs.collapse"); + }; + if (!a.support.transition) return h.call(this); + var i = a.camelCase(["scroll", g].join("-")); + this.$element + .one("bsTransitionEnd", a.proxy(h, this)) + .emulateTransitionEnd(d.TRANSITION_DURATION) + [g](this.$element[0][i]); + } + } + } + }), + (d.prototype.hide = function() { + if (!this.transitioning && this.$element.hasClass("in")) { + var b = a.Event("hide.bs.collapse"); + if ((this.$element.trigger(b), !b.isDefaultPrevented())) { + var c = this.dimension(); + this.$element[c](this.$element[c]())[0].offsetHeight, + this.$element + .addClass("collapsing") + .removeClass("collapse in") + .attr("aria-expanded", !1), + this.$trigger.addClass("collapsed").attr("aria-expanded", !1), + (this.transitioning = 1); + var e = function() { + (this.transitioning = 0), + this.$element + .removeClass("collapsing") + .addClass("collapse") + .trigger("hidden.bs.collapse"); + }; + return a.support.transition + ? void this.$element[c](0) + .one("bsTransitionEnd", a.proxy(e, this)) + .emulateTransitionEnd(d.TRANSITION_DURATION) + : e.call(this); + } + } + }), + (d.prototype.toggle = function() { + this[this.$element.hasClass("in") ? "hide" : "show"](); + }), + (d.prototype.getParent = function() { + return a(this.options.parent) + .find( + '[data-toggle="collapse"][data-parent="' + + this.options.parent + + '"]' + ) + .each( + a.proxy(function(c, d) { + var e = a(d); + this.addAriaAndCollapsedClass(b(e), e); + }, this) + ) + .end(); + }), + (d.prototype.addAriaAndCollapsedClass = function(a, b) { + var c = a.hasClass("in"); + a.attr("aria-expanded", c), + b.toggleClass("collapsed", !c).attr("aria-expanded", c); + }); + var e = a.fn.collapse; + (a.fn.collapse = c), + (a.fn.collapse.Constructor = d), + (a.fn.collapse.noConflict = function() { + return (a.fn.collapse = e), this; + }), + a(document).on( + "click.bs.collapse.data-api", + '[data-toggle="collapse"]', + function(d) { + var e = a(this); + e.attr("data-target") || d.preventDefault(); + var f = b(e), + g = f.data("bs.collapse"), + h = g ? "toggle" : e.data(); + c.call(f, h); + } + ); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + (b && 3 === b.which) || + (a(e).remove(), + a(f).each(function() { + var d = a(this), + e = c(d), + f = { relatedTarget: this }; + e.hasClass("open") && + (e.trigger((b = a.Event("hide.bs.dropdown", f))), + b.isDefaultPrevented() || + (d.attr("aria-expanded", "false"), + e.removeClass("open").trigger("hidden.bs.dropdown", f))); + })); + } + function c(b) { + var c = b.attr("data-target"); + c || + ((c = b.attr("href")), + (c = c && /#[A-Za-z]/.test(c) && c.replace(/.*(?=#[^\s]*$)/, ""))); + var d = c && a(c); + return d && d.length ? d : b.parent(); + } + function d(b) { + return this.each(function() { + var c = a(this), + d = c.data("bs.dropdown"); + d || c.data("bs.dropdown", (d = new g(this))), + "string" == typeof b && d[b].call(c); + }); + } + var e = ".dropdown-backdrop", + f = '[data-toggle="dropdown"]', + g = function(b) { + a(b).on("click.bs.dropdown", this.toggle); + }; + (g.VERSION = "3.3.4"), + (g.prototype.toggle = function(d) { + var e = a(this); + if (!e.is(".disabled, :disabled")) { + var f = c(e), + g = f.hasClass("open"); + if ((b(), !g)) { + "ontouchstart" in document.documentElement && + !f.closest(".navbar-nav").length && + a('
      ') + .insertAfter(a(this)) + .on("click", b); + var h = { relatedTarget: this }; + if ( + (f.trigger((d = a.Event("show.bs.dropdown", h))), + d.isDefaultPrevented()) + ) + return; + e.trigger("focus").attr("aria-expanded", "true"), + f.toggleClass("open").trigger("shown.bs.dropdown", h); + } + return !1; + } + }), + (g.prototype.keydown = function(b) { + if ( + /(38|40|27|32)/.test(b.which) && + !/input|textarea/i.test(b.target.tagName) + ) { + var d = a(this); + if ( + (b.preventDefault(), + b.stopPropagation(), + !d.is(".disabled, :disabled")) + ) { + var e = c(d), + g = e.hasClass("open"); + if ((!g && 27 != b.which) || (g && 27 == b.which)) + return ( + 27 == b.which && e.find(f).trigger("focus"), d.trigger("click") + ); + var h = " li:not(.disabled):visible a", + i = e.find('[role="menu"]' + h + ', [role="listbox"]' + h); + if (i.length) { + var j = i.index(b.target); + 38 == b.which && j > 0 && j--, + 40 == b.which && j < i.length - 1 && j++, + ~j || (j = 0), + i.eq(j).trigger("focus"); + } + } + } + }); + var h = a.fn.dropdown; + (a.fn.dropdown = d), + (a.fn.dropdown.Constructor = g), + (a.fn.dropdown.noConflict = function() { + return (a.fn.dropdown = h), this; + }), + a(document) + .on("click.bs.dropdown.data-api", b) + .on("click.bs.dropdown.data-api", ".dropdown form", function(a) { + a.stopPropagation(); + }) + .on("click.bs.dropdown.data-api", f, g.prototype.toggle) + .on("keydown.bs.dropdown.data-api", f, g.prototype.keydown) + .on( + "keydown.bs.dropdown.data-api", + '[role="menu"]', + g.prototype.keydown + ) + .on( + "keydown.bs.dropdown.data-api", + '[role="listbox"]', + g.prototype.keydown + ); + })(jQuery), + +(function(a) { + "use strict"; + function b(b, d) { + return this.each(function() { + var e = a(this), + f = e.data("bs.modal"), + g = a.extend({}, c.DEFAULTS, e.data(), "object" == typeof b && b); + f || e.data("bs.modal", (f = new c(this, g))), + "string" == typeof b ? f[b](d) : g.show && f.show(d); + }); + } + var c = function(b, c) { + (this.options = c), + (this.$body = a(document.body)), + (this.$element = a(b)), + (this.$dialog = this.$element.find(".modal-dialog")), + (this.$backdrop = null), + (this.isShown = null), + (this.originalBodyPad = null), + (this.scrollbarWidth = 0), + (this.ignoreBackdropClick = !1), + this.options.remote && + this.$element.find(".modal-content").load( + this.options.remote, + a.proxy(function() { + this.$element.trigger("loaded.bs.modal"); + }, this) + ); + }; + (c.VERSION = "3.3.4"), + (c.TRANSITION_DURATION = 300), + (c.BACKDROP_TRANSITION_DURATION = 150), + (c.DEFAULTS = { backdrop: !0, keyboard: !0, show: !0 }), + (c.prototype.toggle = function(a) { + return this.isShown ? this.hide() : this.show(a); + }), + (c.prototype.show = function(b) { + var d = this, + e = a.Event("show.bs.modal", { relatedTarget: b }); + this.$element.trigger(e), + this.isShown || + e.isDefaultPrevented() || + ((this.isShown = !0), + this.checkScrollbar(), + this.setScrollbar(), + this.$body.addClass("modal-open"), + this.escape(), + this.resize(), + this.$element.on( + "click.dismiss.bs.modal", + '[data-dismiss="modal"]', + a.proxy(this.hide, this) + ), + this.$dialog.on("mousedown.dismiss.bs.modal", function() { + d.$element.one("mouseup.dismiss.bs.modal", function(b) { + a(b.target).is(d.$element) && (d.ignoreBackdropClick = !0); + }); + }), + this.backdrop(function() { + var e = a.support.transition && d.$element.hasClass("fade"); + d.$element.parent().length || d.$element.appendTo(d.$body), + d.$element.show().scrollTop(0), + d.adjustDialog(), + e && d.$element[0].offsetWidth, + d.$element.addClass("in").attr("aria-hidden", !1), + d.enforceFocus(); + var f = a.Event("shown.bs.modal", { relatedTarget: b }); + e + ? d.$dialog + .one("bsTransitionEnd", function() { + d.$element.trigger("focus").trigger(f); + }) + .emulateTransitionEnd(c.TRANSITION_DURATION) + : d.$element.trigger("focus").trigger(f); + })); + }), + (c.prototype.hide = function(b) { + b && b.preventDefault(), + (b = a.Event("hide.bs.modal")), + this.$element.trigger(b), + this.isShown && + !b.isDefaultPrevented() && + ((this.isShown = !1), + this.escape(), + this.resize(), + a(document).off("focusin.bs.modal"), + this.$element + .removeClass("in") + .attr("aria-hidden", !0) + .off("click.dismiss.bs.modal") + .off("mouseup.dismiss.bs.modal"), + this.$dialog.off("mousedown.dismiss.bs.modal"), + a.support.transition && this.$element.hasClass("fade") + ? this.$element + .one("bsTransitionEnd", a.proxy(this.hideModal, this)) + .emulateTransitionEnd(c.TRANSITION_DURATION) + : this.hideModal()); + }), + (c.prototype.enforceFocus = function() { + a(document) + .off("focusin.bs.modal") + .on( + "focusin.bs.modal", + a.proxy(function(a) { + this.$element[0] === a.target || + this.$element.has(a.target).length || + this.$element.trigger("focus"); + }, this) + ); + }), + (c.prototype.escape = function() { + this.isShown && this.options.keyboard + ? this.$element.on( + "keydown.dismiss.bs.modal", + a.proxy(function(a) { + 27 == a.which && this.hide(); + }, this) + ) + : this.isShown || this.$element.off("keydown.dismiss.bs.modal"); + }), + (c.prototype.resize = function() { + this.isShown + ? a(window).on("resize.bs.modal", a.proxy(this.handleUpdate, this)) + : a(window).off("resize.bs.modal"); + }), + (c.prototype.hideModal = function() { + var a = this; + this.$element.hide(), + this.backdrop(function() { + a.$body.removeClass("modal-open"), + a.resetAdjustments(), + a.resetScrollbar(), + a.$element.trigger("hidden.bs.modal"); + }); + }), + (c.prototype.removeBackdrop = function() { + this.$backdrop && this.$backdrop.remove(), (this.$backdrop = null); + }), + (c.prototype.backdrop = function(b) { + var d = this, + e = this.$element.hasClass("fade") ? "fade" : ""; + if (this.isShown && this.options.backdrop) { + var f = a.support.transition && e; + if ( + ((this.$backdrop = a( + '
      ' + ).appendTo(this.$body)), + this.$element.on( + "click.dismiss.bs.modal", + a.proxy(function(a) { + return this.ignoreBackdropClick + ? void (this.ignoreBackdropClick = !1) + : void ( + a.target === a.currentTarget && + ("static" == this.options.backdrop + ? this.$element[0].focus() + : this.hide()) + ); + }, this) + ), + f && this.$backdrop[0].offsetWidth, + this.$backdrop.addClass("in"), + !b) + ) + return; + f + ? this.$backdrop + .one("bsTransitionEnd", b) + .emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION) + : b(); + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass("in"); + var g = function() { + d.removeBackdrop(), b && b(); + }; + a.support.transition && this.$element.hasClass("fade") + ? this.$backdrop + .one("bsTransitionEnd", g) + .emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION) + : g(); + } else b && b(); + }), + (c.prototype.handleUpdate = function() { + this.adjustDialog(); + }), + (c.prototype.adjustDialog = function() { + var a = + this.$element[0].scrollHeight > document.documentElement.clientHeight; + this.$element.css({ + paddingLeft: !this.bodyIsOverflowing && a ? this.scrollbarWidth : "", + paddingRight: this.bodyIsOverflowing && !a ? this.scrollbarWidth : "" + }); + }), + (c.prototype.resetAdjustments = function() { + this.$element.css({ paddingLeft: "", paddingRight: "" }); + }), + (c.prototype.checkScrollbar = function() { + var a = window.innerWidth; + if (!a) { + var b = document.documentElement.getBoundingClientRect(); + a = b.right - Math.abs(b.left); + } + (this.bodyIsOverflowing = document.body.clientWidth < a), + (this.scrollbarWidth = this.measureScrollbar()); + }), + (c.prototype.setScrollbar = function() { + var a = parseInt(this.$body.css("padding-right") || 0, 10); + (this.originalBodyPad = document.body.style.paddingRight || ""), + this.bodyIsOverflowing && + this.$body.css("padding-right", a + this.scrollbarWidth); + }), + (c.prototype.resetScrollbar = function() { + this.$body.css("padding-right", this.originalBodyPad); + }), + (c.prototype.measureScrollbar = function() { + var a = document.createElement("div"); + (a.className = "modal-scrollbar-measure"), this.$body.append(a); + var b = a.offsetWidth - a.clientWidth; + return this.$body[0].removeChild(a), b; + }); + var d = a.fn.modal; + (a.fn.modal = b), + (a.fn.modal.Constructor = c), + (a.fn.modal.noConflict = function() { + return (a.fn.modal = d), this; + }), + a(document).on( + "click.bs.modal.data-api", + '[data-toggle="modal"]', + function(c) { + var d = a(this), + e = d.attr("href"), + f = a( + d.attr("data-target") || (e && e.replace(/.*(?=#[^\s]+$)/, "")) + ), + g = f.data("bs.modal") + ? "toggle" + : a.extend({ remote: !/#/.test(e) && e }, f.data(), d.data()); + d.is("a") && c.preventDefault(), + f.one("show.bs.modal", function(a) { + a.isDefaultPrevented() || + f.one("hidden.bs.modal", function() { + d.is(":visible") && d.trigger("focus"); + }); + }), + b.call(f, g, this); + } + ); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.tooltip"), + f = "object" == typeof b && b; + (e || !/destroy|hide/.test(b)) && + (e || d.data("bs.tooltip", (e = new c(this, f))), + "string" == typeof b && e[b]()); + }); + } + var c = function(a, b) { + (this.type = null), + (this.options = null), + (this.enabled = null), + (this.timeout = null), + (this.hoverState = null), + (this.$element = null), + this.init("tooltip", a, b); + }; + (c.VERSION = "3.3.4"), + (c.TRANSITION_DURATION = 150), + (c.DEFAULTS = { + animation: !0, + placement: "top", + selector: !1, + template: + '', + trigger: "hover focus", + title: "", + delay: 0, + html: !1, + container: !1, + viewport: { selector: "body", padding: 0 } + }), + (c.prototype.init = function(b, c, d) { + if ( + ((this.enabled = !0), + (this.type = b), + (this.$element = a(c)), + (this.options = this.getOptions(d)), + (this.$viewport = + this.options.viewport && + a(this.options.viewport.selector || this.options.viewport)), + this.$element[0] instanceof document.constructor && + !this.options.selector) + ) + throw new Error( + "`selector` option must be specified when initializing " + + this.type + + " on the window.document object!" + ); + for (var e = this.options.trigger.split(" "), f = e.length; f--; ) { + var g = e[f]; + if ("click" == g) + this.$element.on( + "click." + this.type, + this.options.selector, + a.proxy(this.toggle, this) + ); + else if ("manual" != g) { + var h = "hover" == g ? "mouseenter" : "focusin", + i = "hover" == g ? "mouseleave" : "focusout"; + this.$element.on( + h + "." + this.type, + this.options.selector, + a.proxy(this.enter, this) + ), + this.$element.on( + i + "." + this.type, + this.options.selector, + a.proxy(this.leave, this) + ); + } + } + this.options.selector + ? (this._options = a.extend({}, this.options, { + trigger: "manual", + selector: "" + })) + : this.fixTitle(); + }), + (c.prototype.getDefaults = function() { + return c.DEFAULTS; + }), + (c.prototype.getOptions = function(b) { + return ( + (b = a.extend({}, this.getDefaults(), this.$element.data(), b)), + b.delay && + "number" == typeof b.delay && + (b.delay = { show: b.delay, hide: b.delay }), + b + ); + }), + (c.prototype.getDelegateOptions = function() { + var b = {}, + c = this.getDefaults(); + return ( + this._options && + a.each(this._options, function(a, d) { + c[a] != d && (b[a] = d); + }), + b + ); + }), + (c.prototype.enter = function(b) { + var c = + b instanceof this.constructor + ? b + : a(b.currentTarget).data("bs." + this.type); + return c && c.$tip && c.$tip.is(":visible") + ? void (c.hoverState = "in") + : (c || + ((c = new this.constructor( + b.currentTarget, + this.getDelegateOptions() + )), + a(b.currentTarget).data("bs." + this.type, c)), + clearTimeout(c.timeout), + (c.hoverState = "in"), + c.options.delay && c.options.delay.show + ? void (c.timeout = setTimeout(function() { + "in" == c.hoverState && c.show(); + }, c.options.delay.show)) + : c.show()); + }), + (c.prototype.leave = function(b) { + var c = + b instanceof this.constructor + ? b + : a(b.currentTarget).data("bs." + this.type); + return ( + c || + ((c = new this.constructor( + b.currentTarget, + this.getDelegateOptions() + )), + a(b.currentTarget).data("bs." + this.type, c)), + clearTimeout(c.timeout), + (c.hoverState = "out"), + c.options.delay && c.options.delay.hide + ? void (c.timeout = setTimeout(function() { + "out" == c.hoverState && c.hide(); + }, c.options.delay.hide)) + : c.hide() + ); + }), + (c.prototype.show = function() { + var b = a.Event("show.bs." + this.type); + if (this.hasContent() && this.enabled) { + this.$element.trigger(b); + var d = a.contains( + this.$element[0].ownerDocument.documentElement, + this.$element[0] + ); + if (b.isDefaultPrevented() || !d) return; + var e = this, + f = this.tip(), + g = this.getUID(this.type); + this.setContent(), + f.attr("id", g), + this.$element.attr("aria-describedby", g), + this.options.animation && f.addClass("fade"); + var h = + "function" == typeof this.options.placement + ? this.options.placement.call(this, f[0], this.$element[0]) + : this.options.placement, + i = /\s?auto?\s?/i, + j = i.test(h); + j && (h = h.replace(i, "") || "top"), + f + .detach() + .css({ top: 0, left: 0, display: "block" }) + .addClass(h) + .data("bs." + this.type, this), + this.options.container + ? f.appendTo(this.options.container) + : f.insertAfter(this.$element); + var k = this.getPosition(), + l = f[0].offsetWidth, + m = f[0].offsetHeight; + if (j) { + var n = h, + o = this.options.container + ? a(this.options.container) + : this.$element.parent(), + p = this.getPosition(o); + (h = + "bottom" == h && k.bottom + m > p.bottom + ? "top" + : "top" == h && k.top - m < p.top + ? "bottom" + : "right" == h && k.right + l > p.width + ? "left" + : "left" == h && k.left - l < p.left + ? "right" + : h), + f.removeClass(n).addClass(h); + } + var q = this.getCalculatedOffset(h, k, l, m); + this.applyPlacement(q, h); + var r = function() { + var a = e.hoverState; + e.$element.trigger("shown.bs." + e.type), + (e.hoverState = null), + "out" == a && e.leave(e); + }; + a.support.transition && this.$tip.hasClass("fade") + ? f + .one("bsTransitionEnd", r) + .emulateTransitionEnd(c.TRANSITION_DURATION) + : r(); + } + }), + (c.prototype.applyPlacement = function(b, c) { + var d = this.tip(), + e = d[0].offsetWidth, + f = d[0].offsetHeight, + g = parseInt(d.css("margin-top"), 10), + h = parseInt(d.css("margin-left"), 10); + isNaN(g) && (g = 0), + isNaN(h) && (h = 0), + (b.top = b.top + g), + (b.left = b.left + h), + a.offset.setOffset( + d[0], + a.extend( + { + using: function(a) { + d.css({ top: Math.round(a.top), left: Math.round(a.left) }); + } + }, + b + ), + 0 + ), + d.addClass("in"); + var i = d[0].offsetWidth, + j = d[0].offsetHeight; + "top" == c && j != f && (b.top = b.top + f - j); + var k = this.getViewportAdjustedDelta(c, b, i, j); + k.left ? (b.left += k.left) : (b.top += k.top); + var l = /top|bottom/.test(c), + m = l ? 2 * k.left - e + i : 2 * k.top - f + j, + n = l ? "offsetWidth" : "offsetHeight"; + d.offset(b), this.replaceArrow(m, d[0][n], l); + }), + (c.prototype.replaceArrow = function(a, b, c) { + this.arrow() + .css(c ? "left" : "top", 50 * (1 - a / b) + "%") + .css(c ? "top" : "left", ""); + }), + (c.prototype.setContent = function() { + var a = this.tip(), + b = this.getTitle(); + a.find(".tooltip-inner")[this.options.html ? "html" : "text"](b), + a.removeClass("fade in top bottom left right"); + }), + (c.prototype.hide = function(b) { + function d() { + "in" != e.hoverState && f.detach(), + e.$element + .removeAttr("aria-describedby") + .trigger("hidden.bs." + e.type), + b && b(); + } + var e = this, + f = a(this.$tip), + g = a.Event("hide.bs." + this.type); + return ( + this.$element.trigger(g), + g.isDefaultPrevented() + ? void 0 + : (f.removeClass("in"), + a.support.transition && f.hasClass("fade") + ? f + .one("bsTransitionEnd", d) + .emulateTransitionEnd(c.TRANSITION_DURATION) + : d(), + (this.hoverState = null), + this) + ); + }), + (c.prototype.fixTitle = function() { + var a = this.$element; + (a.attr("title") || "string" != typeof a.attr("data-original-title")) && + a + .attr("data-original-title", a.attr("title") || "") + .attr("title", ""); + }), + (c.prototype.hasContent = function() { + return this.getTitle(); + }), + (c.prototype.getPosition = function(b) { + b = b || this.$element; + var c = b[0], + d = "BODY" == c.tagName, + e = c.getBoundingClientRect(); + null == e.width && + (e = a.extend({}, e, { + width: e.right - e.left, + height: e.bottom - e.top + })); + var f = d ? { top: 0, left: 0 } : b.offset(), + g = { + scroll: d + ? document.documentElement.scrollTop || document.body.scrollTop + : b.scrollTop() + }, + h = d + ? { width: a(window).width(), height: a(window).height() } + : null; + return a.extend({}, e, g, h, f); + }), + (c.prototype.getCalculatedOffset = function(a, b, c, d) { + return "bottom" == a + ? { top: b.top + b.height, left: b.left + b.width / 2 - c / 2 } + : "top" == a + ? { top: b.top - d, left: b.left + b.width / 2 - c / 2 } + : "left" == a + ? { top: b.top + b.height / 2 - d / 2, left: b.left - c } + : { top: b.top + b.height / 2 - d / 2, left: b.left + b.width }; + }), + (c.prototype.getViewportAdjustedDelta = function(a, b, c, d) { + var e = { top: 0, left: 0 }; + if (!this.$viewport) return e; + var f = (this.options.viewport && this.options.viewport.padding) || 0, + g = this.getPosition(this.$viewport); + if (/right|left/.test(a)) { + var h = b.top - f - g.scroll, + i = b.top + f - g.scroll + d; + h < g.top + ? (e.top = g.top - h) + : i > g.top + g.height && (e.top = g.top + g.height - i); + } else { + var j = b.left - f, + k = b.left + f + c; + j < g.left + ? (e.left = g.left - j) + : k > g.width && (e.left = g.left + g.width - k); + } + return e; + }), + (c.prototype.getTitle = function() { + var a, + b = this.$element, + c = this.options; + return (a = + b.attr("data-original-title") || + ("function" == typeof c.title ? c.title.call(b[0]) : c.title)); + }), + (c.prototype.getUID = function(a) { + do a += ~~(1e6 * Math.random()); + while (document.getElementById(a)); + return a; + }), + (c.prototype.tip = function() { + return (this.$tip = this.$tip || a(this.options.template)); + }), + (c.prototype.arrow = function() { + return (this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")); + }), + (c.prototype.enable = function() { + this.enabled = !0; + }), + (c.prototype.disable = function() { + this.enabled = !1; + }), + (c.prototype.toggleEnabled = function() { + this.enabled = !this.enabled; + }), + (c.prototype.toggle = function(b) { + var c = this; + b && + ((c = a(b.currentTarget).data("bs." + this.type)), + c || + ((c = new this.constructor( + b.currentTarget, + this.getDelegateOptions() + )), + a(b.currentTarget).data("bs." + this.type, c))), + c.tip().hasClass("in") ? c.leave(c) : c.enter(c); + }), + (c.prototype.destroy = function() { + var a = this; + clearTimeout(this.timeout), + this.hide(function() { + a.$element.off("." + a.type).removeData("bs." + a.type); + }); + }); + var d = a.fn.tooltip; + (a.fn.tooltip = b), + (a.fn.tooltip.Constructor = c), + (a.fn.tooltip.noConflict = function() { + return (a.fn.tooltip = d), this; + }); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.popover"), + f = "object" == typeof b && b; + (e || !/destroy|hide/.test(b)) && + (e || d.data("bs.popover", (e = new c(this, f))), + "string" == typeof b && e[b]()); + }); + } + var c = function(a, b) { + this.init("popover", a, b); + }; + if (!a.fn.tooltip) throw new Error("Popover requires tooltip.js"); + (c.VERSION = "3.3.4"), + (c.DEFAULTS = a.extend({}, a.fn.tooltip.Constructor.DEFAULTS, { + placement: "right", + trigger: "click", + content: "", + template: + '' + })), + (c.prototype = a.extend({}, a.fn.tooltip.Constructor.prototype)), + (c.prototype.constructor = c), + (c.prototype.getDefaults = function() { + return c.DEFAULTS; + }), + (c.prototype.setContent = function() { + var a = this.tip(), + b = this.getTitle(), + c = this.getContent(); + a.find(".popover-title")[this.options.html ? "html" : "text"](b), + a + .find(".popover-content") + .children() + .detach() + .end() + [ + this.options.html + ? "string" == typeof c + ? "html" + : "append" + : "text" + ](c), + a.removeClass("fade top bottom left right in"), + a.find(".popover-title").html() || a.find(".popover-title").hide(); + }), + (c.prototype.hasContent = function() { + return this.getTitle() || this.getContent(); + }), + (c.prototype.getContent = function() { + var a = this.$element, + b = this.options; + return ( + a.attr("data-content") || + ("function" == typeof b.content ? b.content.call(a[0]) : b.content) + ); + }), + (c.prototype.arrow = function() { + return (this.$arrow = this.$arrow || this.tip().find(".arrow")); + }); + var d = a.fn.popover; + (a.fn.popover = b), + (a.fn.popover.Constructor = c), + (a.fn.popover.noConflict = function() { + return (a.fn.popover = d), this; + }); + })(jQuery), + +(function(a) { + "use strict"; + function b(c, d) { + (this.$body = a(document.body)), + (this.$scrollElement = a(a(c).is(document.body) ? window : c)), + (this.options = a.extend({}, b.DEFAULTS, d)), + (this.selector = (this.options.target || "") + " .nav li > a"), + (this.offsets = []), + (this.targets = []), + (this.activeTarget = null), + (this.scrollHeight = 0), + this.$scrollElement.on( + "scroll.bs.scrollspy", + a.proxy(this.process, this) + ), + this.refresh(), + this.process(); + } + function c(c) { + return this.each(function() { + var d = a(this), + e = d.data("bs.scrollspy"), + f = "object" == typeof c && c; + e || d.data("bs.scrollspy", (e = new b(this, f))), + "string" == typeof c && e[c](); + }); + } + (b.VERSION = "3.3.4"), + (b.DEFAULTS = { offset: 10 }), + (b.prototype.getScrollHeight = function() { + return ( + this.$scrollElement[0].scrollHeight || + Math.max( + this.$body[0].scrollHeight, + document.documentElement.scrollHeight + ) + ); + }), + (b.prototype.refresh = function() { + var b = this, + c = "offset", + d = 0; + (this.offsets = []), + (this.targets = []), + (this.scrollHeight = this.getScrollHeight()), + a.isWindow(this.$scrollElement[0]) || + ((c = "position"), (d = this.$scrollElement.scrollTop())), + this.$body + .find(this.selector) + .map(function() { + var b = a(this), + e = b.data("target") || b.attr("href"), + f = /^#./.test(e) && a(e); + return ( + (f && f.length && f.is(":visible") && [[f[c]().top + d, e]]) || + null + ); + }) + .sort(function(a, b) { + return a[0] - b[0]; + }) + .each(function() { + b.offsets.push(this[0]), b.targets.push(this[1]); + }); + }), + (b.prototype.process = function() { + var a, + b = this.$scrollElement.scrollTop() + this.options.offset, + c = this.getScrollHeight(), + d = this.options.offset + c - this.$scrollElement.height(), + e = this.offsets, + f = this.targets, + g = this.activeTarget; + if ((this.scrollHeight != c && this.refresh(), b >= d)) + return g != (a = f[f.length - 1]) && this.activate(a); + if (g && b < e[0]) return (this.activeTarget = null), this.clear(); + for (a = e.length; a--; ) + g != f[a] && + b >= e[a] && + (void 0 === e[a + 1] || b < e[a + 1]) && + this.activate(f[a]); + }), + (b.prototype.activate = function(b) { + (this.activeTarget = b), this.clear(); + var c = + this.selector + + '[data-target="' + + b + + '"],' + + this.selector + + '[href="' + + b + + '"]', + d = a(c) + .parents("li") + .addClass("active"); + d.parent(".dropdown-menu").length && + (d = d.closest("li.dropdown").addClass("active")), + d.trigger("activate.bs.scrollspy"); + }), + (b.prototype.clear = function() { + a(this.selector) + .parentsUntil(this.options.target, ".active") + .removeClass("active"); + }); + var d = a.fn.scrollspy; + (a.fn.scrollspy = c), + (a.fn.scrollspy.Constructor = b), + (a.fn.scrollspy.noConflict = function() { + return (a.fn.scrollspy = d), this; + }), + a(window).on("load.bs.scrollspy.data-api", function() { + a('[data-spy="scroll"]').each(function() { + var b = a(this); + c.call(b, b.data()); + }); + }); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.tab"); + e || d.data("bs.tab", (e = new c(this))), + "string" == typeof b && e[b](); + }); + } + var c = function(b) { + this.element = a(b); + }; + (c.VERSION = "3.3.4"), + (c.TRANSITION_DURATION = 150), + (c.prototype.show = function() { + var b = this.element, + c = b.closest("ul:not(.dropdown-menu)"), + d = b.data("target"); + if ( + (d || + ((d = b.attr("href")), (d = d && d.replace(/.*(?=#[^\s]*$)/, ""))), + !b.parent("li").hasClass("active")) + ) { + var e = c.find(".active:last a"), + f = a.Event("hide.bs.tab", { relatedTarget: b[0] }), + g = a.Event("show.bs.tab", { relatedTarget: e[0] }); + if ( + (e.trigger(f), + b.trigger(g), + !g.isDefaultPrevented() && !f.isDefaultPrevented()) + ) { + var h = a(d); + this.activate(b.closest("li"), c), + this.activate(h, h.parent(), function() { + e.trigger({ type: "hidden.bs.tab", relatedTarget: b[0] }), + b.trigger({ type: "shown.bs.tab", relatedTarget: e[0] }); + }); + } + } + }), + (c.prototype.activate = function(b, d, e) { + function f() { + g + .removeClass("active") + .find("> .dropdown-menu > .active") + .removeClass("active") + .end() + .find('[data-toggle="tab"]') + .attr("aria-expanded", !1), + b + .addClass("active") + .find('[data-toggle="tab"]') + .attr("aria-expanded", !0), + h ? (b[0].offsetWidth, b.addClass("in")) : b.removeClass("fade"), + b.parent(".dropdown-menu").length && + b + .closest("li.dropdown") + .addClass("active") + .end() + .find('[data-toggle="tab"]') + .attr("aria-expanded", !0), + e && e(); + } + var g = d.find("> .active"), + h = + e && + a.support.transition && + ((g.length && g.hasClass("fade")) || !!d.find("> .fade").length); + g.length && h + ? g + .one("bsTransitionEnd", f) + .emulateTransitionEnd(c.TRANSITION_DURATION) + : f(), + g.removeClass("in"); + }); + var d = a.fn.tab; + (a.fn.tab = b), + (a.fn.tab.Constructor = c), + (a.fn.tab.noConflict = function() { + return (a.fn.tab = d), this; + }); + var e = function(c) { + c.preventDefault(), b.call(a(this), "show"); + }; + a(document) + .on("click.bs.tab.data-api", '[data-toggle="tab"]', e) + .on("click.bs.tab.data-api", '[data-toggle="pill"]', e); + })(jQuery), + +(function(a) { + "use strict"; + function b(b) { + return this.each(function() { + var d = a(this), + e = d.data("bs.affix"), + f = "object" == typeof b && b; + e || d.data("bs.affix", (e = new c(this, f))), + "string" == typeof b && e[b](); + }); + } + var c = function(b, d) { + (this.options = a.extend({}, c.DEFAULTS, d)), + (this.$target = a(this.options.target) + .on("scroll.bs.affix.data-api", a.proxy(this.checkPosition, this)) + .on( + "click.bs.affix.data-api", + a.proxy(this.checkPositionWithEventLoop, this) + )), + (this.$element = a(b)), + (this.affixed = null), + (this.unpin = null), + (this.pinnedOffset = null), + this.checkPosition(); + }; + (c.VERSION = "3.3.4"), + (c.RESET = "affix affix-top affix-bottom"), + (c.DEFAULTS = { offset: 0, target: window }), + (c.prototype.getState = function(a, b, c, d) { + var e = this.$target.scrollTop(), + f = this.$element.offset(), + g = this.$target.height(); + if (null != c && "top" == this.affixed) return c > e ? "top" : !1; + if ("bottom" == this.affixed) + return null != c + ? e + this.unpin <= f.top + ? !1 + : "bottom" + : a - d >= e + g + ? !1 + : "bottom"; + var h = null == this.affixed, + i = h ? e : f.top, + j = h ? g : b; + return null != c && c >= e + ? "top" + : null != d && i + j >= a - d + ? "bottom" + : !1; + }), + (c.prototype.getPinnedOffset = function() { + if (this.pinnedOffset) return this.pinnedOffset; + this.$element.removeClass(c.RESET).addClass("affix"); + var a = this.$target.scrollTop(), + b = this.$element.offset(); + return (this.pinnedOffset = b.top - a); + }), + (c.prototype.checkPositionWithEventLoop = function() { + setTimeout(a.proxy(this.checkPosition, this), 1); + }), + (c.prototype.checkPosition = function() { + if (this.$element.is(":visible")) { + var b = this.$element.height(), + d = this.options.offset, + e = d.top, + f = d.bottom, + g = a(document.body).height(); + "object" != typeof d && (f = e = d), + "function" == typeof e && (e = d.top(this.$element)), + "function" == typeof f && (f = d.bottom(this.$element)); + var h = this.getState(g, b, e, f); + if (this.affixed != h) { + null != this.unpin && this.$element.css("top", ""); + var i = "affix" + (h ? "-" + h : ""), + j = a.Event(i + ".bs.affix"); + if ((this.$element.trigger(j), j.isDefaultPrevented())) return; + (this.affixed = h), + (this.unpin = "bottom" == h ? this.getPinnedOffset() : null), + this.$element + .removeClass(c.RESET) + .addClass(i) + .trigger(i.replace("affix", "affixed") + ".bs.affix"); + } + "bottom" == h && this.$element.offset({ top: g - b - f }); + } + }); + var d = a.fn.affix; + (a.fn.affix = b), + (a.fn.affix.Constructor = c), + (a.fn.affix.noConflict = function() { + return (a.fn.affix = d), this; + }), + a(window).on("load", function() { + a('[data-spy="affix"]').each(function() { + var c = a(this), + d = c.data(); + (d.offset = d.offset || {}), + null != d.offsetBottom && (d.offset.bottom = d.offsetBottom), + null != d.offsetTop && (d.offset.top = d.offsetTop), + b.call(c, d); + }); + }); + })(jQuery); diff --git a/public/js/departments.js b/public/js/departments.js index 89f4f0992..ba4ae285e 100644 --- a/public/js/departments.js +++ b/public/js/departments.js @@ -1,12 +1,14 @@ +$(document).ready(function() { + $("#add_new_department_btn").on("click", function(e) { + $("#add_new_department_row").removeClass("hidden"); + }); -$(document).ready(function () { - $('#add_new_department_btn').on('click', function(e){ - $('#add_new_department_row').removeClass('hidden'); - }); - - $('button.departments-remove-btn').on('click', function(e){ - var delete_form = $('#delete_form'); - delete_form.attr('action', delete_form.attr('action') + $(this).attr('value') + '/'); - return delete_form.submit(); - }); + $("button.departments-remove-btn").on("click", function(e) { + var delete_form = $("#delete_form"); + delete_form.attr( + "action", + delete_form.attr("action") + $(this).attr("value") + "/" + ); + return delete_form.submit(); + }); }); diff --git a/public/js/global.js b/public/js/global.js index c324ca331..847ade6e2 100644 --- a/public/js/global.js +++ b/public/js/global.js @@ -1,92 +1,120 @@ - /* * Book Leave request pop-up window. * * */ -$(document).ready(function(){ +$(document).ready(function() { /* * When FROM field in New absense form chnages: update TO one if necessary */ - $('input.book-leave-from-input').on('change', function(e){ + $("input.book-leave-from-input").on("change", function(e) { e.stopPropagation(); - var from_date = $('input.book-leave-from-input').datepicker('getDate'); + var from_date = $("input.book-leave-from-input").datepicker("getDate"); - if ( ! from_date ) { + if (!from_date) { // no new value for FROM part, do nothing - console.log('No from date'); + console.log("No from date"); return; } - var to_date = $('input.book-leave-to-input').datepicker('getDate'); + var to_date = $("input.book-leave-to-input").datepicker("getDate"); - if ( ! to_date || ( to_date && to_date.getTime() < from_date.getTime() )) { - $('input.book-leave-to-input').datepicker('setDate', $('input.book-leave-from-input').datepicker('getFormattedDate')); + if (!to_date || (to_date && to_date.getTime() < from_date.getTime())) { + $("input.book-leave-to-input").datepicker( + "setDate", + $("input.book-leave-from-input").datepicker("getFormattedDate") + ); } }); }); - /* * Bootstrap-datepicker * * */ -!function(a){ +!(function(a) { a.fn.datepicker.dates["en-GB"] = { - days : [ - "Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday" - ], - daysShort : [ - "Sun","Mon","Tue","Wed","Thu","Fri","Sat" + days: [ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday" ], - daysMin : [ - "Su","Mo","Tu","We","Th","Fr","Sa" + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"], + months: [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" ], - months : [ - "January","February","March","April","May","June","July","August","September","October","November","December" + monthsShort: [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec" ], - monthsShort : [ - "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" - ], - today : "Today", - monthsTitle : "Months", - clear : "Clear", - weekStart : 1, - format : "dd/mm/yyyy" - } -}(jQuery); - -$(function () { - $('[data-toggle="tooltip"]').tooltip() -}) + today: "Today", + monthsTitle: "Months", + clear: "Clear", + weekStart: 1, + format: "dd/mm/yyyy" + }; +})(jQuery); + +$(function() { + $('[data-toggle="tooltip"]').tooltip(); +}); -$(function () { - $('[data-toggle="popover"]').popover() -}) +$(function() { + $('[data-toggle="popover"]').popover(); +}); /* * This is handler for invocation of "add secondary supervisors" modal * * */ -$('#add_secondary_supervisers_modal').on('show.bs.modal', function (event) { +$("#add_secondary_supervisers_modal").on("show.bs.modal", function(event) { var button = $(event.relatedTarget), - department_name = button.data('department_name'), - department_id = button.data('department_id'); + department_name = button.data("department_name"), + department_id = button.data("department_id"); var modal = $(this); - modal.find('.modal-title strong').text(department_name); + modal.find(".modal-title strong").text(department_name); // Make modal window to be no hiegher then window and its content // scrollable - $('.modal .modal-body').css('overflow-y', 'auto'); - $('.modal .modal-body').css('max-height', $(window).height() * 0.7); + $(".modal .modal-body").css("overflow-y", "auto"); + $(".modal .modal-body").css("max-height", $(window).height() * 0.7); - $(this).find(".modal-body") + $(this) + .find(".modal-body") // Show "loading" icon while content of modal is loaded - .html('

      Loading...

      ') - .load('/settings/departments/available-supervisors/'+department_id+'/'); + .html( + '

      Loading...

      ' + ) + .load("/settings/departments/available-supervisors/" + department_id + "/"); }); /* @@ -95,14 +123,15 @@ $('#add_secondary_supervisers_modal').on('show.bs.modal', function (event) { * If URL is not provided location of current page is used. * */ -function getUrlVars(url){ - if ( ! url ) { +function getUrlVars(url) { + if (!url) { url = window.location.href; } - var vars = {}, hash; - var hashes = url.slice( url.indexOf('?') + 1).split('&'); + var vars = {}, + hash; + var hashes = url.slice(url.indexOf("?") + 1).split("&"); for (var i = 0; i < hashes.length; i++) { - hash = hashes[i].split('='); + hash = hashes[i].split("="); vars[hash[0]] = hash[1]; } return vars; @@ -113,26 +142,25 @@ function getUrlVars(url){ * * */ -$(document).ready(function(){ - - $('#team_view_month_select_btn') +$(document).ready(function() { + $("#team_view_month_select_btn") .datepicker() - .on('changeDate', function(e) { - var url = $(e.currentTarget).data('tom'); + .on("changeDate", function(e) { + var url = $(e.currentTarget).data("tom"); var form = document.createElement("form"); - form.method = 'GET'; + form.method = "GET"; form.action = url; - var url_params = getUrlVars( url ); - url_params['date'] = e.format('yyyy-mm'); + var url_params = getUrlVars(url); + url_params["date"] = e.format("yyyy-mm"); // Move query parameters into the form - $.each( url_params, function(key, val){ + $.each(url_params, function(key, val) { var inp = document.createElement("input"); inp.name = key; inp.value = val; - inp.type = 'hidden'; + inp.type = "hidden"; form.appendChild(inp); }); @@ -142,31 +170,32 @@ $(document).ready(function(){ }); }); +$(document).ready(function() { + $("[data-tom-color-picker] a").on("click", function(e) { + e.stopPropagation(); -$(document).ready(function(){ - - $('[data-tom-color-picker] a') - .on('click', function(e){ - e.stopPropagation(); - - // Close dropdown - $(e.target).closest('.dropdown-menu').dropdown('toggle'); - - var new_class_name = $(e.target).data('tom-color-picker-css-class'); - - // Ensure newly selected color is on triggering element - $(e.target).closest('[data-tom-color-picker]') - .find('button.dropdown-toggle') - .attr('class', function(idx, c){ return c.replace(/leave_type_color_\d+/g, '') }) - .addClass( new_class_name ); - - // Capture newly picked up color in hidden input for submission - $(e.target).closest('[data-tom-color-picker]') - .find('input[type="hidden"]') - .attr('value', new_class_name); - - return false; - }); + // Close dropdown + $(e.target) + .closest(".dropdown-menu") + .dropdown("toggle"); + + var new_class_name = $(e.target).data("tom-color-picker-css-class"); + + // Ensure newly selected color is on triggering element + $(e.target) + .closest("[data-tom-color-picker]") + .find("button.dropdown-toggle") + .attr("class", function(idx, c) { + return c.replace(/leave_type_color_\d+/g, ""); + }) + .addClass(new_class_name); + + // Capture newly picked up color in hidden input for submission + $(e.target) + .closest("[data-tom-color-picker]") + .find('input[type="hidden"]') + .attr("value", new_class_name); + + return false; + }); }); - - diff --git a/public/js/jquery.min.js b/public/js/jquery.min.js index e6a051d0d..4027b8089 100644 --- a/public/js/jquery.min.js +++ b/public/js/jquery.min.js @@ -1,4 +1,5756 @@ /*! jQuery v1.11.2 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.2",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; -return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
      a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
      ","
      "],area:[1,"",""],param:[1,"",""],thead:[1,"","
      "],tr:[2,"","
      "],col:[2,"","
      "],td:[3,"","
      "],_default:k.htmlSerialize?[0,"",""]:[1,"X
      ","
      "]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("