diff --git a/civihr_employee_portal/civihr_employee_portal.module b/civihr_employee_portal/civihr_employee_portal.module index 3122bf30..28a6a4b3 100755 --- a/civihr_employee_portal/civihr_employee_portal.module +++ b/civihr_employee_portal/civihr_employee_portal.module @@ -10,6 +10,7 @@ use Drupal\civihr_employee_portal\Forms\OnboardingWizardCustomizationForm; use Drupal\civihr_employee_portal\Mail\PasswordResetSystemMail; use Drupal\civihr_employee_portal\Helpers\ImageResizer; use Drupal\civihr_employee_portal\Forms\ContactForm; +use CRM_HRLeaveAndAbsences_BAO_AbsenceType as AbsenceType; use Drupal\civihr_employee_portal\Helpers\Webform\WebformExportCustomFieldConvertor; use Drupal\civihr_employee_portal\Page\HRDetailsPage; @@ -406,6 +407,8 @@ function _rebuild_length_of_service_view() { function _rebuild_absence_activity_view() { $civi_settings = parse_url(CIVICRM_DSN); $civi_db_name = trim($civi_settings['path'], '/'); + $calculationUnitOptions = array_flip(AbsenceType::buildOptions('calculation_unit', 'validate')); + $hoursUnit = $calculationUnitOptions['hours']; db_query('DROP VIEW IF EXISTS absence_activity'); db_query("CREATE VIEW absence_activity AS @@ -420,7 +423,8 @@ function _rebuild_absence_activity_view() { lr.to_date AS absence_end_date, DATE_FORMAT(DATE(lr.to_date), '%Y-%m') AS absence_end_date_month, CONCAT(IF (DATE_FORMAT(lrd.date, '%w') = 0, 7, DATE_FORMAT(lrd.date, '%w')), '. ', DATE_FORMAT(lrd.date, '%W')) AS absence_day_of_week, - ABS(bc.amount) as absence_duration, + IF(at.calculation_unit != {$hoursUnit}, ABS(bc.amount), NULL) as absence_duration_days, + IF(at.calculation_unit = {$hoursUnit}, ABS(bc.amount), NULL) as absence_duration_hours, IF(lr.request_type != 'toil', ABS(bc.amount), NULL) AS absence_amount_taken, IF(lr.request_type = 'toil', bc.amount, NULL) AS absence_amount_accrued, IF(lr.request_type = 'toil', -bc.amount, -bc.amount) AS absence_absolute_amount, diff --git a/civihr_employee_portal/features/civihr_employee_portal_features/civihr_employee_portal_features.views_default.inc b/civihr_employee_portal/features/civihr_employee_portal_features/civihr_employee_portal_features.views_default.inc index 132ef93a..62acff87 100644 --- a/civihr_employee_portal/features/civihr_employee_portal_features/civihr_employee_portal_features.views_default.inc +++ b/civihr_employee_portal/features/civihr_employee_portal_features/civihr_employee_portal_features.views_default.inc @@ -367,10 +367,15 @@ function civihr_employee_portal_features_views_default_views() { $handler->display->display_options['fields']['absence_end_date_month']['relationship'] = 'absence_activity'; $handler->display->display_options['fields']['absence_end_date_month']['label'] = 'Absence end month'; /* Field: Absence Activity entity: Absence duration in days */ - $handler->display->display_options['fields']['absence_duration']['id'] = 'absence_duration'; - $handler->display->display_options['fields']['absence_duration']['table'] = 'absence_activity'; - $handler->display->display_options['fields']['absence_duration']['field'] = 'absence_duration'; - $handler->display->display_options['fields']['absence_duration']['relationship'] = 'absence_activity'; + $handler->display->display_options['fields']['absence_duration_days']['id'] = 'absence_duration_days'; + $handler->display->display_options['fields']['absence_duration_days']['table'] = 'absence_activity'; + $handler->display->display_options['fields']['absence_duration_days']['field'] = 'absence_duration_days'; + $handler->display->display_options['fields']['absence_duration_days']['relationship'] = 'absence_activity'; + /* Field: Absence Activity entity: Absence duration in hours */ + $handler->display->display_options['fields']['absence_duration_hours']['id'] = 'absence_duration_hours'; + $handler->display->display_options['fields']['absence_duration_hours']['table'] = 'absence_activity'; + $handler->display->display_options['fields']['absence_duration_hours']['field'] = 'absence_duration_hours'; + $handler->display->display_options['fields']['absence_duration_hours']['relationship'] = 'absence_activity'; /* Field: Absence Activity entity: Absence_type */ $handler->display->display_options['fields']['absence_type']['id'] = 'absence_type'; $handler->display->display_options['fields']['absence_type']['table'] = 'absence_activity'; @@ -994,6 +999,7 @@ function civihr_employee_portal_features_views_default_views() { t('Absence end date'), t('Absence end month'), t('Absence duration in days'), + t('Absence duration in hours'), t('Absence type'), t('Sickness reason'), t('Absence status'), diff --git a/civihr_employee_portal/js/reports.js b/civihr_employee_portal/js/reports.js index 3a85ea5e..94e2cdae 100644 --- a/civihr_employee_portal/js/reports.js +++ b/civihr_employee_portal/js/reports.js @@ -1,15 +1,10 @@ -(function($) { +(function ($) { 'use strict'; /** * Define HRReport object. */ - function HRReport() { - var data = []; - var pivotTableContainer = jQuery("#reportPivotTable"); - var derivedAttributes = {}; - var pivotConfig = {}; - + function HRReport () { this.initScrollbarFallback(); } @@ -26,19 +21,19 @@ /** * Init PivotTable.js library */ - HRReport.prototype.initPivotTable = function() { + HRReport.prototype.initPivotTable = function () { var that = this; this.pivotTableContainer.pivotUI(this.data, { - rendererName: "Table", + rendererName: 'Table', renderers: CRM.$.extend( jQuery.pivotUtilities.renderers, jQuery.pivotUtilities.c3_renderers, jQuery.pivotUtilities.export_renderers ), - vals: ["Count"], + vals: ['Count'], rows: [], cols: [], - aggregatorName: "Count", + aggregatorName: 'Count', unusedAttrsVertical: false, aggregators: that.getAggregators(), derivedAttributes: this.derivedAttributes, @@ -50,24 +45,24 @@ return that.pivotTableOnRefresh(config); } }, false); - } + }; /** * Update Pivot Table config data on refresh. * * @param {JSON} config */ - HRReport.prototype.pivotTableOnRefresh = function(config) { + HRReport.prototype.pivotTableOnRefresh = function (config) { Drupal.behaviors.civihr_employee_portal_reports.instance.updateCustomTemplate(); var configCopy = JSON.parse(JSON.stringify(config)); - //delete some values which are functions - delete configCopy["aggregators"]; - delete configCopy["renderers"]; - //delete some bulky default values - delete configCopy["rendererOptions"]; - delete configCopy["localeStrings"]; + // delete some values which are functions + delete configCopy['aggregators']; + delete configCopy['renderers']; + // delete some bulky default values + delete configCopy['rendererOptions']; + delete configCopy['localeStrings']; this.pivotConfig = configCopy; - } + }; /** * Return an object containing set of Pivot Table aggregators extended with @@ -75,60 +70,62 @@ * * @returns {jQuery.pivotUtilities.aggregators|_$.pivotUtilities.aggregators|aggregators} */ - HRReport.prototype.getAggregators = function() { + HRReport.prototype.getAggregators = function () { var aggregators = $.pivotUtilities.aggregators; var ordered = {}; // Create custom Aggregator behaving like 'Count Unique Values' but // not counting NULL, 0 or empty strings. - aggregators["Count Unique Values excluding null, 0 or empty"] = function(attributeArray) { + aggregators['Count Unique Values excluding null, 0 or empty'] = function (attributeArray) { var attribute = attributeArray[0]; - return function(data, rowKey, colKey) { + return function (data, rowKey, colKey) { return { uniq: [], - push: function(record) { + push: function (record) { var _ref = record[attribute]; if (!!+_ref && this.uniq.indexOf(_ref) < 0) { this.uniq.push(record[attribute]); } }, - value: function() { return this.uniq.length; }, - format: function(x) { return x; }, + value: function () { return this.uniq.length; }, + format: function (x) { return x; }, numInputs: 1 }; }; }; - aggregators["Sum field 1 by unique values of field 2"] = function(attributeArray) { + aggregators['Sum field 1 by unique values of field 2'] = function (attributeArray) { var attribute1 = attributeArray[0]; var attribute2 = attributeArray[1]; - return function(data, rowKey, colKey) { + return function (data, rowKey, colKey) { return { sum: 0, byFieldValues: [], - push: function(record) { + push: function (record) { if (!isNaN(parseFloat(record[attribute1]))) { if (record[attribute2] in this.byFieldValues) { return this.sum; } this.byFieldValues[record[attribute2]] = 1; - return this.sum += parseFloat(record[attribute1]); + this.sum += parseFloat(record[attribute1]); + + return this.sum; } }, - value: function() { + value: function () { return this.sum; }, - format: function(x) { return x.toFixed(2); }, + format: function (x) { return x.toFixed(2); }, numInputs: attribute1 != null ? 0 : 2 }; }; }; // Sort aggregators by keys. - Object.keys(aggregators).sort().forEach(function(key) { + Object.keys(aggregators).sort().forEach(function (key) { ordered[key] = aggregators[key]; }); return ordered; - } + }; /** * Do additional required operations on data returned from backend. @@ -136,23 +133,23 @@ * @param array data * @returns array */ - HRReport.prototype.processData = function(data) { + HRReport.prototype.processData = function (data) { // Set 'null' for all empty values. for (var i in data) { for (var j in data[i]) { - if (data[i][j] === "") { - data[i][j] = "null"; + if (data[i][j] === '') { + data[i][j] = 'null'; } } } return data; - } + }; /** * Update the pivot table dropdown and filter box * */ - HRReport.prototype.updateCustomTemplate = function() { + HRReport.prototype.updateCustomTemplate = function () { this.updateDropdown(); this.updateFilterbox(); }; @@ -161,7 +158,7 @@ * Update the pivot table dropdown to look like CiviHR style * */ - HRReport.prototype.updateDropdown = function() { + HRReport.prototype.updateDropdown = function () { $('.pvtUi select').each(function () { var selectClass = 'crm_custom-select crm_custom-select--full'; @@ -187,21 +184,20 @@ * the checkboxes and add a new checkbox to check all options * */ - HRReport.prototype.updateFilterbox = function() { - + HRReport.prototype.updateFilterbox = function () { var that = this; $('.pvtFilterBox').each(function () { $(this).find('.pvtSearch').removeClass('pvtSearch').addClass('form-text'); $(this).find('button').addClass('btn btn-primary btn-block'); if ($(this).find('.pvtFilterSelectAllWrap').length === 0) { - var filters = $(this).find(".pvtFilter"); + var filters = $(this).find('.pvtFilter'); $(this).find('.pvtFilterSelectAllWrap').remove(); $(this).find('.pvtCheckContainer').prepend(`

`); $(this).find('.pvtFilterSelectAll').on('click', function () { - filters.prop("checked", $(this).is(':checked')); + filters.prop('checked', $(this).is(':checked')); }); $(this).find('.pvtCheckContainer p').addClass('chr_custom-checkbox'); @@ -209,11 +205,11 @@ // Altering Employee length of service data to show number of days into // String format of Year, Months and Days of length of service. - if(that.lengthOfServiceFilter(this)) { - // Iterating through all the filter values. - $(this).find('p.chr_custom-checkbox').each(function(i) { + if (that.lengthOfServiceFilter(this)) { + // Iterating through all the filter values. + $(this).find('p.chr_custom-checkbox').each(function (i) { // Skip the Select All checkbox from filters. - if (!$(this).hasClass("pvtFilterSelectAllWrap")) { + if (!$(this).hasClass('pvtFilterSelectAllWrap')) { that.lengthOfServiceValue(this); } }); @@ -224,42 +220,40 @@ /* * Finding the filter box for field Employee length of service. * - * @param {string} filter_data + * @param {String} filterData * * @return {bool} */ - HRReport.prototype.lengthOfServiceFilter = function(filter_data) { - if($(filter_data).find('h4').text().indexOf("Employee length of service (") >= 0) { - return true; - } - return false; - } + HRReport.prototype.lengthOfServiceFilter = function (filterData) { + return $(filterData).find('h4').text().indexOf('Employee length of service (') >= 0; + }; /* * Finding and replacing the value of Employee length of service. * - * @param {string} filter_selector - DOM element that has value. + * @param {String} filterSelector - DOM element that has value. */ - HRReport.prototype.lengthOfServiceValue = function(filter_selector) { + HRReport.prototype.lengthOfServiceValue = function (filterSelector) { var that = this; // Fetching the Employee length of service from filter values. - var employee_length_service = $(filter_selector).find('span:first').text(); - if($.isNumeric(employee_length_service)) { - $(filter_selector).find('span:first').text(that.formatLengthsOfService(employee_length_service)); + var employeeLengthService = $(filterSelector).find('span:first').text(); + if ($.isNumeric(employeeLengthService)) { + $(filterSelector).find('span:first').text(that.formatLengthOfService(employeeLengthService)); } - } + }; /** * Processes results in people report view to format length of service for each * contact in a human readable form using moment lib. * - * @param {string} employee_length_service - Employee length of service field value. + * @param {String} employeeLengthService - Employee length of service field value. * - * @returns {string} Date format string for provide length of service. + * @returns {String} Date format string for provide length of service. */ - HRReport.prototype.formatLengthsOfService = function (employee_length_service) { + HRReport.prototype.formatLengthOfService = function (employeeLengthService) { var dateEnd = moment(); - var dateStart = moment().subtract(employee_length_service, 'days'); + var dateStart = moment().subtract(employeeLengthService, 'days'); + if (!dateStart || !dateEnd) { return null; } @@ -275,8 +269,8 @@ m.add(-months, 'months'); days = m.diff(dateStart, 'days'); - years = years > 0 ? (years > 1 ? years + ' years ' : years + ' year ') : ''; - months = months > 0 ? (months > 1 ? months + ' months ' : months + ' month ') : ''; + years = years > 0 ? (years > 1 ? years + ' years ' : years + ' year ') : ''; + months = months > 0 ? (months > 1 ? months + ' months ' : months + ' month ') : ''; days = days > 0 ? (days > 1 ? days + ' days' : days + ' day') : ''; return (years + months + days) || '0 days'; }; @@ -294,7 +288,7 @@ * Init the scrollbar fallback * */ - HRReport.prototype.initScrollbarFallback = function() { + HRReport.prototype.initScrollbarFallback = function () { var el = document.querySelector('.chr_custom-scrollbar'); if (el) { @@ -307,7 +301,7 @@ * * @param string filterValues */ - HRReport.prototype.refreshJson = function(filterValues) { + HRReport.prototype.refreshJson = function (filterValues) { var that = this; if (!this.jsonUrl) { return; @@ -322,7 +316,7 @@ data = that.processData(data); that.data = data; that.pivotTableContainer.pivotUI(data, { - rendererName: "Table", + rendererName: 'Table', renderers: CRM.$.extend( jQuery.pivotUtilities.renderers, jQuery.pivotUtilities.c3_renderers @@ -338,14 +332,14 @@ }, type: 'GET' }); - } + }; /** * Refresh data table using provided filter values * * @param string filterValues */ - HRReport.prototype.refreshTable = function(filterValues) { + HRReport.prototype.refreshTable = function (filterValues) { var that = this; if (!this.tableUrl) { return; @@ -363,12 +357,12 @@ }, type: 'GET' }); - } + }; /** * Return unique Drupal View's DOM ID of data table */ - HRReport.prototype.getReportTableDomID = function() { + HRReport.prototype.getReportTableDomID = function () { var reportTableDiv = CRM.$('#reportTable > div.view:first'); var reportTableClasses = reportTableDiv.attr('class').split(' '); for (var i in reportTableClasses) { @@ -377,14 +371,14 @@ } } return null; - } + }; /** * Reinitialize View instance of data table for given View's DOM ID * * @param string viewReportDataTableId */ - HRReport.prototype.refreshReportTableViewInstance = function(viewReportDataTableId) { + HRReport.prototype.refreshReportTableViewInstance = function (viewReportDataTableId) { var viewReportDataTableSettings = Drupal.settings.views.ajaxViews['views_dom_id:' + viewReportDataTableId]; var viewReportDataTableNewId = this.getReportTableDomID(); @@ -394,29 +388,29 @@ viewReportDataTableSettings.view_dom_id = viewReportDataTableNewId; Drupal.settings.views.ajaxViews['views_dom_id:' + viewReportDataTableNewId] = viewReportDataTableSettings; Drupal.views.instances['views_dom_id:' + viewReportDataTableNewId] = new Drupal.views.ajaxView(Drupal.settings.views.ajaxViews['views_dom_id:' + viewReportDataTableNewId]); - } + }; /** * Bind filters UI events */ - HRReport.prototype.bindFilters = function() { + HRReport.prototype.bindFilters = function () { // Filters bindings var that = this; if (!this.filters) { return; } - CRM.$('#report-filters input[type="submit"]').bind('click', function(e) { + CRM.$('#report-filters input[type="submit"]').bind('click', function (e) { e.preventDefault(); that.applyFilters(); }); - } + }; - HRReport.prototype.applyFilters = function() { + HRReport.prototype.applyFilters = function () { var that = this; var formSerialize = CRM.$('#report-filters form:first').serializeArray(); - formSerialize.map(function(input) { + formSerialize.map(function (input) { input.value = that.formatDate(input.value, 'DD/MM/YYYY', 'YYYY-MM-DD'); }); @@ -428,7 +422,7 @@ if (that.tableUrl) { that.refreshTable('?' + formSerialize); } - } + }; /** * Format a date passing the old format and @@ -439,7 +433,7 @@ * @param {String} newFormat * @return {String} formated date */ - HRReport.prototype.formatDate = function(date, oldFormat, newFormat) { + HRReport.prototype.formatDate = function (date, oldFormat, newFormat) { var mDate = moment(date, oldFormat); if (mDate.isValid()) { @@ -453,7 +447,7 @@ * Gets Report configuration by currently selected configId * and apply it to the Pivot Table instance. */ - HRReport.prototype.configGet = function() { + HRReport.prototype.configGet = function () { var that = this; var configId = this.getReportConfigurationId(); if (!configId) { @@ -463,68 +457,68 @@ CRM.$.ajax({ url: '/reports/' + that.reportName + '/configuration/' + configId, error: function () { - swal("Failed", "Error loading Report configuration!", "error"); + swal('Failed', 'Error loading Report configuration!', 'error'); }, success: function (data) { if (data.status === 'success') { that.configApply(data.config); } else { - swal("Failed", "Error loading Report configuration!", "error"); + swal('Failed', 'Error loading Report configuration!', 'error'); } }, type: 'GET' }); - } + }; /** * Save Report configuration with currently selected configId. */ - HRReport.prototype.configSave = function(message) { + HRReport.prototype.configSave = function (message) { var that = this; var configId = this.getReportConfigurationId(); if (!configId) { - swal("No configuration selected", "Please choose configuration to update.", "error"); + swal('No configuration selected', 'Please choose configuration to update.', 'error'); return false; } if (typeof message === 'undefined') { - message = "Are you sure you want to save this configuration changes?"; + message = 'Are you sure you want to save this configuration changes?'; } swal({ - title: "Save Report configuration?", - text: message, - type: "info", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: "Yes", - closeOnConfirm: false, - }, function() { - that.configSaveProcess(configId); + title: 'Save Report configuration?', + text: message, + type: 'info', + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: 'Yes', + closeOnConfirm: false + }, function () { + that.configSaveProcess(configId); }); - } + }; /** * Save new Report configuration basing on currently set configuration. */ - HRReport.prototype.configSaveNew = function() { + HRReport.prototype.configSaveNew = function () { var that = this; swal({ - title: "New Report configuration", - text: "Configuration name:", - type: "input", + title: 'New Report configuration', + text: 'Configuration name:', + type: 'input', showCancelButton: true, closeOnConfirm: false, - inputPlaceholder: "" + inputPlaceholder: '' }, function (inputValue) { if (inputValue === false) return false; - if (inputValue === "") { - swal.showInputError("Configuration name cannot be empty."); - return false + if (inputValue === '') { + swal.showInputError('Configuration name cannot be empty.'); + return false; } that.configSaveProcess(0, inputValue); }); - } + }; /** * Handle both Save and SaveNew actions server requests. @@ -532,7 +526,7 @@ * @param {Integer} configId * @param {String} configName */ - HRReport.prototype.configSaveProcess = function(configId, configName) { + HRReport.prototype.configSaveProcess = function (configId, configName) { var that = this; var reportName = this.reportName; @@ -543,7 +537,7 @@ json_config: that.pivotConfig }, error: function () { - swal("Failed", "Error saving Report configuration!", "error"); + swal('Failed', 'Error saving Report configuration!', 'error'); }, success: function (data) { if (data.status === 'success') { @@ -551,72 +545,73 @@ if (data['id']) { CRM.$('.report-config-select').append(''); // Sort options by their labels alphabetically. - CRM.$('.report-config-select').append(CRM.$(".report-config-select option").remove().sort(function(a, b) { - var at = $(a).text(), bt = $(b).text(); - return (at > bt) ? 1 : ((at < bt) ? -1 : 0); + CRM.$('.report-config-select').append(CRM.$('.report-config-select option').remove().sort(function (a, b) { + var aText = $(a).text(); + var bText = $(b).text(); + + return (aText > bText) ? 1 : ((aText < bText) ? -1 : 0); })); - CRM.$(".report-config-select").val(data['id']); + CRM.$('.report-config-select').val(data['id']); } - swal("Success", "Report configuration has been saved", "success"); + swal('Success', 'Report configuration has been saved', 'success'); } else if (data.status === 'already_exists') { // If there is already a configuration with this label then we ask for overwriting it. - CRM.$(".report-config-select").val(data['id']); + CRM.$('.report-config-select').val(data['id']); that.configSave('Configuration with this name already exists. Do you want to modify it?'); } else { - swal("Failed", "Error saving Report configuration!", "error"); + swal('Failed', 'Error saving Report configuration!', 'error'); } }, method: 'POST' }); - } + }; /** * Delete currently active configuration. */ - HRReport.prototype.configDelete = function() { + HRReport.prototype.configDelete = function () { var configId = this.getReportConfigurationId(); if (!configId) { - swal("No configuration selected", "Please choose configuration to delete.", "error"); + swal('No configuration selected', 'Please choose configuration to delete.', 'error'); return false; } var reportName = this.reportName; - var configId = this.getReportConfigurationId(); swal({ - title: "Delete Report configuration?", - text: "Are you sure you want to delete this configuration?", - type: "info", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: "Yes", - closeOnConfirm: false, - }, function() { + title: 'Delete Report configuration?', + text: 'Are you sure you want to delete this configuration?', + type: 'info', + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: 'Yes', + closeOnConfirm: false + }, function () { CRM.$.ajax({ url: '/reports/' + reportName + '/configuration/' + configId + '/delete', error: function () { - swal("Failed", "Error deleting Report configuration!", "error"); + swal('Failed', 'Error deleting Report configuration!', 'error'); }, success: function (data) { if (data.status === 'success') { CRM.$('.report-config-select option[value=' + configId + ']').remove(); - swal("Success", "Report configuration has been deleted", "success"); + swal('Success', 'Report configuration has been deleted', 'success'); } else { - swal("Failed", "Error deleting Report configuration!", "error"); + swal('Failed', 'Error deleting Report configuration!', 'error'); } }, method: 'POST' }); }); - } + }; /** * Return an ID of currently active Report configuration. * * @returns {Integer} */ - HRReport.prototype.getReportConfigurationId = function() { + HRReport.prototype.getReportConfigurationId = function () { return CRM.$('.report-config-select').val(); - } + }; /** * Apply given Pivot Table configuration. @@ -624,46 +619,46 @@ * @param {Object} config * @param {JSON} config */ - HRReport.prototype.configApply = function(config) { + HRReport.prototype.configApply = function (config) { var that = this; config['onRefresh'] = function (config) { return that.pivotTableOnRefresh(config); - } - this.pivotTableContainer.pivotUI(this.data, config , true); - } + }; + this.pivotTableContainer.pivotUI(this.data, config, true); + }; /** * Init angular in reports custom page, * and add the calendar icon * */ - HRReport.prototype.initAngular = function() { + HRReport.prototype.initAngular = function () { require([ 'common/angular', 'common/services/angular-date/date-format', 'common/directives/angular-date/date-input', 'common/moment', 'common/filters/angular-date/format-date' - ], function() { + ], function () { angular.module('civihrReports', [ 'ngAnimate', 'ui.bootstrap', 'common.angularDate' ]) - .directive('uibDatepickerPopupWrap', function sectionDirective() { - return({ - link: function(scope, element, attributes) { + .directive('uibDatepickerPopupWrap', function sectionDirective () { + return ({ + link: function (scope, element, attributes) { return $(element[0]).wrap(''); } }); }) - .controller('FiltersController', function() { + .controller('FiltersController', function () { this.format = 'dd/MM/yyyy'; this.placeholderFormat = 'dd/MM/yyyy'; this.date = new Date(); this.filtersCollapsed = true; }) - .controller('SettingsController', function() { + .controller('SettingsController', function () { this.isCollapsed = true; }); @@ -682,28 +677,40 @@ this.instance.initAngular(); // Tabs bindings - CRM.$('.report-tabs a').bind('click', function(e) { - e.preventDefault(); + CRM.$('.report-tabs a').bind('click', function (e) { CRM.$('.report-tabs li').removeClass('active'); CRM.$(this).parent().addClass('active'); CRM.$('.report-block').addClass('hidden'); CRM.$('.report-block.' + CRM.$(this).data('tab')).removeClass('hidden'); }); - CRM.$('.report-tabs a:first').click(); + + switchTabsOnLoad(); // Reports configuration bindings - CRM.$('.report-config-select').bind('change', function(e) { + CRM.$('.report-config-select').bind('change', function (e) { that.instance.configGet(); }); - CRM.$('.report-config-save-btn').bind('click', function(e) { + CRM.$('.report-config-save-btn').bind('click', function (e) { that.instance.configSave(); }); - CRM.$('.report-config-save-new-btn').bind('click', function(e) { + CRM.$('.report-config-save-new-btn').bind('click', function (e) { that.instance.configSaveNew(); }); - CRM.$('.report-config-delete-btn').bind('click', function(e) { + CRM.$('.report-config-delete-btn').bind('click', function (e) { that.instance.configDelete(); }); + + /** + * Switch to correct tab, on page load + */ + function switchTabsOnLoad () { + var tabSelector = '.report-tabs a'; + var hash = window.location.hash; + + hash ? tabSelector += '[data-tab="' + hash.substr(1) + '"]' : tabSelector += ':first'; + + CRM.$(tabSelector).click(); + } } - } + }; })(jQuery); diff --git a/civihr_employee_portal/templates/civihr-employee-portal-civihr-report-custom.tpl.php b/civihr_employee_portal/templates/civihr-employee-portal-civihr-report-custom.tpl.php index eb24ec73..6af86f40 100644 --- a/civihr_employee_portal/templates/civihr-employee-portal-civihr-report-custom.tpl.php +++ b/civihr_employee_portal/templates/civihr-employee-portal-civihr-report-custom.tpl.php @@ -24,113 +24,122 @@ class="panel-body-wrap panel-body-wrap--collapse" - - - - -
- -
-
- -
-
- Export + + +
+ +
+
+
+ Pivot Table
- -
- - - + +
+ + + } + + return "Over 20 years"; + } + }; + + Drupal.behaviors.civihr_employee_portal_reports.instance.init({ + reportName: '', + configurationList: , + data: data, + tableContainer: jQuery('#reportTable'), + pivotTableContainer: jQuery('#reportPivotTable'), + derivedAttributes: initialDerivedAttributes, + tableUrl: '', + jsonUrl: '', + filters: + }); + Drupal.behaviors.civihr_employee_portal_reports.instance.show(); + }); +
diff --git a/civihr_employee_portal/views/civihr_employee_portal.views.inc b/civihr_employee_portal/views/civihr_employee_portal.views.inc index a6427961..601d9cb8 100755 --- a/civihr_employee_portal/views/civihr_employee_portal.views.inc +++ b/civihr_employee_portal/views/civihr_employee_portal.views.inc @@ -704,15 +704,15 @@ function civihr_employee_portal_views_data_alter(&$data) { 'sort' => array('handler' => 'views_json_query_handler_sort'), ); - $data['absence_activity']['absence_duration'] = array( + $data['absence_activity']['absence_duration_days'] = array( 'title' => t('Absence duration in days'), - 'real field' => 'absence_duration', + 'real field' => 'absence_duration_days', 'field' => array( 'click sortable' => TRUE, ), 'argument' => array( 'handler' => 'views_json_query_argument_request_handler', - 'name_field' => 'absence_duration', + 'name_field' => 'absence_duration_days', 'string' => TRUE ), 'filter' => array( @@ -721,6 +721,25 @@ function civihr_employee_portal_views_data_alter(&$data) { ), 'sort' => array('handler' => 'views_json_query_handler_sort'), ); + + $data['absence_activity']['absence_duration_hours'] = array( + 'title' => t('Absence duration in hours'), + 'real field' => 'absence_duration_hours', + 'field' => array( + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_json_query_argument_request_handler', + 'name_field' => 'absence_duration_hours', + 'string' => TRUE + ), + 'filter' => array( + 'handler' => 'views_json_query_handler_filter', + 'help' => t('Filter results to a particular result set'), + ), + 'sort' => array('handler' => 'views_json_query_handler_sort'), + ); + $data['absence_activity']['absence_amount_taken'] = array( 'title' => t('Absence amount taken'), 'real field' => 'absence_amount_taken', diff --git a/civihr_employee_portal/views/views_export/views_civihr_report_leave_and_absence.inc b/civihr_employee_portal/views/views_export/views_civihr_report_leave_and_absence.inc index e5f831a9..bc25871d 100644 --- a/civihr_employee_portal/views/views_export/views_civihr_report_leave_and_absence.inc +++ b/civihr_employee_portal/views/views_export/views_civihr_report_leave_and_absence.inc @@ -360,10 +360,15 @@ $handler->display->display_options['fields']['absence_end_date_month']['field'] $handler->display->display_options['fields']['absence_end_date_month']['relationship'] = 'absence_activity'; $handler->display->display_options['fields']['absence_end_date_month']['label'] = 'Absence end month'; /* Field: Absence Activity entity: Absence duration in days */ -$handler->display->display_options['fields']['absence_duration']['id'] = 'absence_duration'; -$handler->display->display_options['fields']['absence_duration']['table'] = 'absence_activity'; -$handler->display->display_options['fields']['absence_duration']['field'] = 'absence_duration'; -$handler->display->display_options['fields']['absence_duration']['relationship'] = 'absence_activity'; +$handler->display->display_options['fields']['absence_duration_days']['id'] = 'absence_duration_days'; +$handler->display->display_options['fields']['absence_duration_days']['table'] = 'absence_activity'; +$handler->display->display_options['fields']['absence_duration_days']['field'] = 'absence_duration_days'; +$handler->display->display_options['fields']['absence_duration_days']['relationship'] = 'absence_activity'; +/* Field: Absence Activity entity: Absence duration in hours */ +$handler->display->display_options['fields']['absence_duration_hours']['id'] = 'absence_duration_hours'; +$handler->display->display_options['fields']['absence_duration_hours']['table'] = 'absence_activity'; +$handler->display->display_options['fields']['absence_duration_hours']['field'] = 'absence_duration_hours'; +$handler->display->display_options['fields']['absence_duration_hours']['relationship'] = 'absence_activity'; /* Field: Absence Activity entity: Absence_type */ $handler->display->display_options['fields']['absence_type']['id'] = 'absence_type'; $handler->display->display_options['fields']['absence_type']['table'] = 'absence_activity'; @@ -988,6 +993,7 @@ $translatables['civihr_report_leave_and_absence'] = array( t('Absence end date'), t('Absence end month'), t('Absence duration in days'), + t('Absence duration in hours'), t('Absence type'), t('Sickness reason'), t('Absence status'),