mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-11-18 02:20:37 -05:00
Business report: week periods and line charts with last-year comparison
- This week and last week periods; weeks start on Redmine's "Start calendars on" day - Sales and Hours line charts above the bars, same figures and colors, drawn with Redmine's bundled Chart.js: a point per day (a week), week (up to ~3 months) or month - "Compare with last year" toggle adds dashed, faded last-year lines instantly and is kept in the URL; days/weeks go back 52 weeks so weekdays line up, months to the same month - Legend: one entry per figure (hides both years' lines) plus a single "last year" entry Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BiwYMjhoQvL7XsKKfRz4pM
This commit is contained in:
6 files changed
+318
-7
No files matched your search
@@ -140,10 +140,11 @@ Estimates and invoices keep their number, date, customer, total and **man-hours*
|
|||||||
|
|
||||||
### Business report
|
### Business report
|
||||||
|
|
||||||
**Business report** in the top menu compares, for a period (this or last month, quarter or year, or custom dates):
|
**Business report** in the top menu compares, for a period (this or last week, month, quarter or year, or custom dates; weeks start on the day set in Redmine's *Start calendars on* setting, Monday when it follows the language):
|
||||||
|
|
||||||
* **Sales**: estimates written, invoices written and payments received (totals and counts), invoiced vs. estimated, collected vs. invoiced, and what's still owed on those invoices.
|
* **Sales**: estimates written, invoices written and payments received (totals and counts), invoiced vs. estimated, collected vs. invoiced, and what's still owed on those invoices.
|
||||||
* **Hours**: estimated hours on estimates, issues' estimated time, invoiced hours on invoices and time spent, with spent vs. estimated, and the **cost performance index** (CPI = invoiced hours ÷ spent hours): green at 1.00 or more, yellow below 1, red below 0.80. Each month shows its CPI too.
|
* **Hours**: estimated hours on estimates, issues' estimated time, invoiced hours on invoices and time spent, with spent vs. estimated, and the **cost performance index** (CPI = invoiced hours ÷ spent hours): green at 1.00 or more, yellow below 1, red below 0.80. Each month shows its CPI too.
|
||||||
|
* **Charts**: above each set of bars, a line chart of the same figures in the same colors (Chart.js 4.5.1, MIT licensed, bundled with the plugin in assets/javascripts so it doesn't clash with other plugins' copies such as redmine_indicator's Chart.js 2), with a point per day for a week, per week for up to about three months, and per month beyond. Hovering a point shows its figures. **Compare with last year** adds last year's lines, dashed and faded, without reloading: days and weeks go back 52 weeks so weekdays line up, months go back to the same month. Clicking a figure in the legend hides it (and its last-year line); clicking *last year* stops comparing. Today's line stops at today.
|
||||||
* **By month**: every figure month by month, with totals.
|
* **By month**: every figure month by month, with totals.
|
||||||
|
|
||||||
Estimates, invoices and payments count by their QuickBooks date. Issues' estimated time counts issues created in the period, leaving out parents so subtasks aren't counted twice. Spent time counts time logged in the period. While estimates, invoices or payments are syncing, the report says so (with how many have been read) and refreshes every 30 seconds; the settings page's Synchronization table shows the same per type. Estimates and invoices synced before these figures were added have no total or hours until a full sync (the report says how many); run one again after changing the labor products/services.
|
Estimates, invoices and payments count by their QuickBooks date. Issues' estimated time counts issues created in the period, leaving out parents so subtasks aren't counted twice. Spent time counts time logged in the period. While estimates, invoices or payments are syncing, the report says so (with how many have been read) and refreshes every 30 seconds; the settings page's Synchronization table shows the same per type. Estimates and invoices synced before these figures were added have no total or hours until a full sync (the report says how many); run one again after changing the labor products/services.
|
||||||
|
|||||||
@@ -17,7 +17,10 @@ class QboReportsController < ApplicationController
|
|||||||
|
|
||||||
def index
|
def index
|
||||||
@report = RedmineQboBilling::BusinessReport.new(period: params[:period].presence || 'this_year',
|
@report = RedmineQboBilling::BusinessReport.new(period: params[:period].presence || 'this_year',
|
||||||
from: params[:from], to: params[:to], today: User.current.today)
|
from: params[:from], to: params[:to], today: User.current.today,
|
||||||
|
week_start: RedmineQboBilling::BusinessReport.week_start_from_setting(Setting.start_of_week))
|
||||||
|
# Last year's lines on the charts
|
||||||
|
@compare = params[:compare] == '1'
|
||||||
# Syncs still running for what the report counts: its figures are incomplete until they finish
|
# Syncs still running for what the report counts: its figures are incomplete until they finish
|
||||||
@syncing = QboSyncStatus.by_entity(%w[Estimate Invoice Payment]).values.sort_by(&:entity)
|
@syncing = QboSyncStatus.by_entity(%w[Estimate Invoice Payment]).values.sort_by(&:entity)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -7,6 +7,44 @@
|
|||||||
<% bar = ->(value, max) { max > 0 ? (value.to_f / max * 100).round(1) : 0 } %>
|
<% bar = ->(value, max) { max > 0 ? (value.to_f / max * 100).round(1) : 0 } %>
|
||||||
<% fmt_hours = ->(h) { format('%.1f', h.to_f) } %>
|
<% fmt_hours = ->(h) { format('%.1f', h.to_f) } %>
|
||||||
<% pct = ->(v) { v.nil? ? '–' : "#{v}%" } %>
|
<% pct = ->(v) { v.nil? ? '–' : "#{v}%" } %>
|
||||||
|
<%# Line charts: a label and a tooltip title per point, from the chart's granularity %>
|
||||||
|
<% chart = @report.chart %>
|
||||||
|
<% months_abbr = ::I18n.t('date.abbr_month_names') %>
|
||||||
|
<% days_abbr = ::I18n.t('date.abbr_day_names') %>
|
||||||
|
<% one_year = @report.from.year == @report.to.year %>
|
||||||
|
<% point_label = lambda do |date|
|
||||||
|
case chart[:granularity]
|
||||||
|
when :day then "#{days_abbr[date.wday]} #{date.day}"
|
||||||
|
when :week then "#{months_abbr[date.month]} #{date.day}"
|
||||||
|
else one_year ? months_abbr[date.month] : "#{months_abbr[date.month]} #{date.year}"
|
||||||
|
end
|
||||||
|
end %>
|
||||||
|
<% point_title = lambda do |first, last|
|
||||||
|
case chart[:granularity]
|
||||||
|
when :day then format_date(first)
|
||||||
|
when :week then "#{format_date(first)} – #{format_date(last)}"
|
||||||
|
else "#{::I18n.t('date.month_names')[first.month]} #{first.year}"
|
||||||
|
end
|
||||||
|
end %>
|
||||||
|
<% previous_ends = chart[:previous_points].each_with_index.map { |p, i| Date.parse(p) + (Date.parse(chart[:ends][i]) - Date.parse(chart[:points][i])) } %>
|
||||||
|
<% chart_points = {
|
||||||
|
labels: chart[:points].map { |p| point_label.call(Date.parse(p)) },
|
||||||
|
titles: chart[:points].each_with_index.map { |p, i| point_title.call(Date.parse(p), Date.parse(chart[:ends][i])) },
|
||||||
|
previous_titles: chart[:previous_points].each_with_index.map { |p, i| point_title.call(Date.parse(p), previous_ends[i]) },
|
||||||
|
last_year: l(:label_report_last_year)
|
||||||
|
} %>
|
||||||
|
<% chart_series = lambda do |keys|
|
||||||
|
keys.map do |key, label, color|
|
||||||
|
{ label: label, color: color, current: chart[:current][key], previous: chart[:previous][key] }
|
||||||
|
end
|
||||||
|
end %>
|
||||||
|
<% sales_series = chart_series.call([[:estimates, l(:label_report_estimates_written), '#628db6'],
|
||||||
|
[:invoices, l(:label_report_invoices_written), '#e8a33d'],
|
||||||
|
[:payments, l(:label_report_payments_received), '#5aa05a']]) %>
|
||||||
|
<% hours_series = chart_series.call([[:estimate_hours, l(:label_report_estimate_hours), '#628db6'],
|
||||||
|
[:issue_hours, l(:label_report_issue_hours), '#9b7fc0'],
|
||||||
|
[:invoice_hours, l(:label_report_invoice_hours), '#e8a33d'],
|
||||||
|
[:spent_hours, l(:label_report_spent_hours), '#5aa05a']]) %>
|
||||||
|
|
||||||
<h2><%= l(:label_business_report) %></h2>
|
<h2><%= l(:label_business_report) %></h2>
|
||||||
|
|
||||||
@@ -22,6 +60,10 @@
|
|||||||
<%= date_field_tag 'to', @report.to.iso8601, id: 'qbo-report-to' %>
|
<%= date_field_tag 'to', @report.to.iso8601, id: 'qbo-report-to' %>
|
||||||
</span>
|
</span>
|
||||||
<%= submit_tag l(:button_apply), name: nil %>
|
<%= submit_tag l(:button_apply), name: nil %>
|
||||||
|
<label class="qbo-report-compare">
|
||||||
|
<%= check_box_tag 'compare', '1', @compare, id: 'qbo-report-compare' %>
|
||||||
|
<%= l(:label_report_compare_last_year) %>
|
||||||
|
</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
@@ -58,6 +100,9 @@
|
|||||||
<div class="splitcontent">
|
<div class="splitcontent">
|
||||||
<div class="splitcontentleft">
|
<div class="splitcontentleft">
|
||||||
<h3><%= l(:label_report_money) %></h3>
|
<h3><%= l(:label_report_money) %></h3>
|
||||||
|
<div class="qbo-report-chart">
|
||||||
|
<canvas id="qbo-chart-sales" data-kind="money" data-series="<%= sales_series.to_json %>"></canvas>
|
||||||
|
</div>
|
||||||
<table class="list qbo-report">
|
<table class="list qbo-report">
|
||||||
<tbody>
|
<tbody>
|
||||||
<% [[:estimates, l(:label_report_estimates_written)], [:invoices, l(:label_report_invoices_written)],
|
<% [[:estimates, l(:label_report_estimates_written)], [:invoices, l(:label_report_invoices_written)],
|
||||||
@@ -79,6 +124,9 @@
|
|||||||
|
|
||||||
<div class="splitcontentright">
|
<div class="splitcontentright">
|
||||||
<h3><%= l(:label_report_hours) %></h3>
|
<h3><%= l(:label_report_hours) %></h3>
|
||||||
|
<div class="qbo-report-chart">
|
||||||
|
<canvas id="qbo-chart-hours" data-kind="hours" data-series="<%= hours_series.to_json %>"></canvas>
|
||||||
|
</div>
|
||||||
<table class="list qbo-report">
|
<table class="list qbo-report">
|
||||||
<tbody>
|
<tbody>
|
||||||
<% [[:estimate_hours, l(:label_report_estimate_hours)], [:issue_hours, l(:label_report_issue_hours)],
|
<% [[:estimate_hours, l(:label_report_estimate_hours)], [:issue_hours, l(:label_report_issue_hours)],
|
||||||
@@ -181,6 +229,8 @@
|
|||||||
table.qbo-report-months .hours-start { border-left: 2px solid #ddd; }
|
table.qbo-report-months .hours-start { border-left: 2px solid #ddd; }
|
||||||
table.qbo-report-months tfoot td { border-top: 2px solid #ccc; }
|
table.qbo-report-months tfoot td { border-top: 2px solid #ccc; }
|
||||||
#qbo-report-form select, #qbo-report-form input { vertical-align: middle; }
|
#qbo-report-form select, #qbo-report-form input { vertical-align: middle; }
|
||||||
|
#qbo-report-form .qbo-report-compare { margin-left: 12px; white-space: nowrap; }
|
||||||
|
.qbo-report-chart { position: relative; height: 260px; margin: 4px 4px 16px; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<%= javascript_tag do %>
|
<%= javascript_tag do %>
|
||||||
@@ -190,4 +240,142 @@
|
|||||||
$dates.on('change', function() { $period.val('custom'); });
|
$dates.on('change', function() { $period.val('custom'); });
|
||||||
$period.on('change', function() { if ($period.val() !== 'custom') { $('#qbo-report-form').submit(); } });
|
$period.on('change', function() { if ($period.val() !== 'custom') { $('#qbo-report-form').submit(); } });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Line charts (Chart.js 4): the same figures and colors as the bars, a point per day,
|
||||||
|
// week or month. "Compare with last year" adds last year's lines, dashed and faded, without reloading.
|
||||||
|
(function() {
|
||||||
|
var points = <%= raw chart_points.to_json %>;
|
||||||
|
// The currency layout the tables use, e.g. "$%n"
|
||||||
|
var currencyFormat = <%= raw number_to_currency(0, precision: 0).to_s.sub('0', '%n').to_json %>;
|
||||||
|
var charts = [];
|
||||||
|
|
||||||
|
function money(v, decimals) {
|
||||||
|
var n = Number(v || 0).toLocaleString(undefined, { minimumFractionDigits: decimals, maximumFractionDigits: decimals });
|
||||||
|
return currencyFormat.replace('%n', n);
|
||||||
|
}
|
||||||
|
function hours(v) { return Number(v || 0).toFixed(1); }
|
||||||
|
function faded(hex) {
|
||||||
|
var n = parseInt(hex.slice(1), 16);
|
||||||
|
return 'rgba(' + (n >> 16 & 255) + ',' + (n >> 8 & 255) + ',' + (n & 255) + ',0.45)';
|
||||||
|
}
|
||||||
|
|
||||||
|
function draw(Chart, canvas, compare) {
|
||||||
|
var series = JSON.parse(canvas.getAttribute('data-series'));
|
||||||
|
var isMoney = canvas.getAttribute('data-kind') === 'money';
|
||||||
|
var datasets = [];
|
||||||
|
series.forEach(function(s) {
|
||||||
|
datasets.push({ label: s.label, data: s.current, borderColor: s.color, backgroundColor: s.color,
|
||||||
|
fill: false, cubicInterpolationMode: 'monotone', pointRadius: 3, pointHoverRadius: 5, spanGaps: false, order: 1 });
|
||||||
|
});
|
||||||
|
series.forEach(function(s) {
|
||||||
|
datasets.push({ label: s.label + ' (' + points.last_year + ')', data: s.previous, previous: true,
|
||||||
|
borderColor: faded(s.color), backgroundColor: faded(s.color), borderDash: [6, 4],
|
||||||
|
borderWidth: 2, fill: false, cubicInterpolationMode: 'monotone', pointRadius: 2, pointHoverRadius: 4,
|
||||||
|
hidden: !compare, order: 2 });
|
||||||
|
});
|
||||||
|
return new Chart(canvas, {
|
||||||
|
type: 'line',
|
||||||
|
data: { labels: points.labels, datasets: datasets },
|
||||||
|
options: {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
interaction: { mode: 'index', intersect: false },
|
||||||
|
plugins: {
|
||||||
|
// One entry per figure (clicking it hides this year's and last year's line), plus a single
|
||||||
|
// dashed "last year" entry while comparing (clicking it turns comparing off)
|
||||||
|
legend: {
|
||||||
|
position: 'bottom',
|
||||||
|
labels: {
|
||||||
|
boxWidth: 12,
|
||||||
|
generateLabels: function(chart) {
|
||||||
|
var items = Chart.defaults.plugins.legend.labels.generateLabels(chart).filter(function(item) {
|
||||||
|
return !chart.data.datasets[item.datasetIndex].previous;
|
||||||
|
});
|
||||||
|
if (chart.data.datasets.some(function(ds) { return ds.previous && !ds.hidden; })) {
|
||||||
|
items.push({ text: points.last_year, fillStyle: 'rgba(0,0,0,0)', strokeStyle: '#999', lineWidth: 2,
|
||||||
|
lineDash: [4, 3], hidden: false, datasetIndex: -1 });
|
||||||
|
}
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onClick: function(e, item, legend) {
|
||||||
|
var chart = legend.chart;
|
||||||
|
if (item.datasetIndex === -1) { $('#qbo-report-compare').prop('checked', false).trigger('change'); return; }
|
||||||
|
var visible = !chart.isDatasetVisible(item.datasetIndex);
|
||||||
|
chart.setDatasetVisibility(item.datasetIndex, visible);
|
||||||
|
// last year's line follows (shown only while comparing)
|
||||||
|
chart.getDatasetMeta(item.datasetIndex + series.length).hidden = visible ? null : true;
|
||||||
|
chart.update();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
tooltip: {
|
||||||
|
callbacks: {
|
||||||
|
title: function(items) {
|
||||||
|
if (!items.length) { return ''; }
|
||||||
|
var i = items[0].dataIndex, lines = [points.titles[i]];
|
||||||
|
if (items.some(function(it) { return it.dataset.previous; })) {
|
||||||
|
lines.push(points.last_year + ': ' + points.previous_titles[i]);
|
||||||
|
}
|
||||||
|
return lines;
|
||||||
|
},
|
||||||
|
label: function(item) {
|
||||||
|
return item.dataset.label + ': ' + (isMoney ? money(item.raw, 2) : hours(item.raw));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scales: {
|
||||||
|
y: { beginAtZero: true, ticks: { precision: isMoney ? 0 : 1, callback: function(v) { return isMoney ? money(v, 0) : v; } } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Chart.js from the module: its default export or a named one. Chart.js 2 has no register() and is skipped.
|
||||||
|
function chartClass(mod) {
|
||||||
|
var found = [mod && mod.default, mod && mod.Chart, mod && mod.default && mod.default.Chart];
|
||||||
|
for (var i = 0; i < found.length; i++) {
|
||||||
|
if (typeof found[i] === 'function' && typeof found[i].register === 'function') { return found[i]; }
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setCompare(on) {
|
||||||
|
charts.forEach(function(chart) {
|
||||||
|
var n = chart.data.datasets.length / 2;
|
||||||
|
for (var j = 0; j < n; j++) {
|
||||||
|
chart.data.datasets[j + n].hidden = !on;
|
||||||
|
// a figure hidden from the legend keeps last year's line hidden too
|
||||||
|
chart.getDatasetMeta(j + n).hidden = chart.isDatasetVisible(j) ? null : true;
|
||||||
|
}
|
||||||
|
chart.update();
|
||||||
|
});
|
||||||
|
// Keep the choice in the address, so reloading or changing the period keeps it
|
||||||
|
if (window.history && history.replaceState) {
|
||||||
|
var url = new URL(window.location.href);
|
||||||
|
if (on) { url.searchParams.set('compare', '1'); } else { url.searchParams.delete('compare'); }
|
||||||
|
history.replaceState(null, '', url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$(function() {
|
||||||
|
var $compare = $('#qbo-report-compare');
|
||||||
|
// Chart.js 4 ships with this plugin (assets/javascripts), so the charts don't depend on how Redmine or
|
||||||
|
// other plugins provide it (redmine_indicator puts Chart.js 2 on every page)
|
||||||
|
import(<%= raw asset_path('plugin_assets/redmine_qbo/chart-4.5.1.min.js').to_json %>).then(function(mod) {
|
||||||
|
var Chart = chartClass(mod);
|
||||||
|
if (!Chart) {
|
||||||
|
console.warn('Business report: Chart.js did not load', Object.keys(mod || {}));
|
||||||
|
$('.qbo-report-chart').hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$('.qbo-report-chart canvas').each(function() { charts.push(draw(Chart, this, $compare.is(':checked'))); });
|
||||||
|
window.qboReportCharts = charts;
|
||||||
|
}).catch(function(error) {
|
||||||
|
console.warn('Business report: Chart.js did not load', error);
|
||||||
|
$('.qbo-report-chart').hide();
|
||||||
|
});
|
||||||
|
$compare.on('change', function() { setCompare(this.checked); });
|
||||||
|
});
|
||||||
|
})();
|
||||||
<% end %>
|
<% end %>
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
/*!
|
||||||
|
* Chart.js v4.5.1
|
||||||
|
* https://www.chartjs.org
|
||||||
|
* (c) 2025 Chart.js Contributors
|
||||||
|
* Released under the MIT License
|
||||||
|
*/
|
||||||
|
function t(){}const e=(()=>{let t=0;return()=>t++})();function i(t){return null==t}function s(t){if(Array.isArray&&Array.isArray(t))return!0;const e=Object.prototype.toString.call(t);return"[object"===e.slice(0,7)&&"Array]"===e.slice(-6)}function n(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)}function o(t){return("number"==typeof t||t instanceof Number)&&isFinite(+t)}function a(t,e){return o(t)?t:e}function r(t,e){return void 0===t?e:t}const l=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100*e:+t;function h(t,e,i){if(t&&"function"==typeof t.call)return t.apply(i,e)}function c(t,e,i,o){let a,r,l;if(s(t))if(r=t.length,o)for(a=r-1;a>=0;a--)e.call(i,t[a],a);else for(a=0;a<r;a++)e.call(i,t[a],a);else if(n(t))for(l=Object.keys(t),r=l.length,a=0;a<r;a++)e.call(i,t[l[a]],l[a])}function d(t,e){let i,s,n,o;if(!t||!e||t.length!==e.length)return!1;for(i=0,s=t.length;i<s;++i)if(n=t[i],o=e[i],n.datasetIndex!==o.datasetIndex||n.index!==o.index)return!1;return!0}function u(t){if(s(t))return t.map(u);if(n(t)){const e=Object.create(null),i=Object.keys(t),s=i.length;let n=0;for(;n<s;++n)e[i[n]]=u(t[i[n]]);return e}return t}function f(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}function g(t,e,i,s){if(!f(t))return;const o=e[t],a=i[t];n(o)&&n(a)?p(o,a,s):e[t]=u(a)}function p(t,e,i){const o=s(e)?e:[e],a=o.length;if(!n(t))return t;const r=(i=i||{}).merger||g;let l;for(let e=0;e<a;++e){if(l=o[e],!n(l))continue;const s=Object.keys(l);for(let e=0,n=s.length;e<n;++e)r(s[e],t,l,i)}return t}function m(t,e){return p(t,e,{merger:x})}function x(t,e,i){if(!f(t))return;const s=e[t],o=i[t];n(s)&&n(o)?m(s,o):Object.prototype.hasOwnProperty.call(e,t)||(e[t]=u(o))}const b={"":t=>t,x:t=>t.x,y:t=>t.y};function _(t,e){const i=b[e]||(b[e]=function(t){const e=function(t){const e=t.split("."),i=[];let s="";for(const t of e)s+=t,s.endsWith("\\")?s=s.slice(0,-1)+".":(i.push(s),s="");return i}(t);return t=>{for(const i of e){if(""===i)break;t=t&&t[i]}return t}}(e));return i(t)}function y(t){return t.charAt(0).toUpperCase()+t.slice(1)}const v=t=>void 0!==t,M=t=>"function"==typeof t,w=(t,e)=>{if(t.size!==e.size)return!1;for(const i of t)if(!e.has(i))return!1;return!0};const k=Math.PI,S=2*k,P=S+k,D=Number.POSITIVE_INFINITY,O=k/180,C=k/2,A=k/4,T=2*k/3,L=Math.log10,E=Math.sign;function R(t,e,i){return Math.abs(t-e)<i}function I(t){const e=Math.round(t);t=R(t,e,t/1e3)?e:t;const i=Math.pow(10,Math.floor(L(t))),s=t/i;return(s<=1?1:s<=2?2:s<=5?5:10)*i}function F(t){return!function(t){return"symbol"==typeof t||"object"==typeof t&&null!==t&&!(Symbol.toPrimitive in t||"toString"in t||"valueOf"in t)}(t)&&!isNaN(parseFloat(t))&&isFinite(t)}function z(t,e,i){let s,n,o;for(s=0,n=t.length;s<n;s++)o=t[s][i],isNaN(o)||(e.min=Math.min(e.min,o),e.max=Math.max(e.max,o))}function V(t){return t*(k/180)}function B(t){return t*(180/k)}function W(t){if(!o(t))return;let e=1,i=0;for(;Math.round(t*e)/e!==t;)e*=10,i++;return i}function N(t,e){const i=e.x-t.x,s=e.y-t.y,n=Math.sqrt(i*i+s*s);let o=Math.atan2(s,i);return o<-.5*k&&(o+=S),{angle:o,distance:n}}function H(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))}function j(t,e){return(t-e+P)%S-k}function $(t){return(t%S+S)%S}function Y(t,e,i,s){const n=$(t),o=$(e),a=$(i),r=$(o-n),l=$(a-n),h=$(n-o),c=$(n-a);return n===o||n===a||s&&o===a||r>l&&h<c}function U(t,e,i){return Math.max(e,Math.min(i,t))}function X(t,e,i,s=1e-6){return t>=Math.min(e,i)-s&&t<=Math.max(e,i)+s}function q(t,e,i){i=i||(i=>t[i]<e);let s,n=t.length-1,o=0;for(;n-o>1;)s=o+n>>1,i(s)?o=s:n=s;return{lo:o,hi:n}}const K=(t,e,i,s)=>q(t,i,s?s=>{const n=t[s][e];return n<i||n===i&&t[s+1][e]===i}:s=>t[s][e]<i),G=(t,e,i)=>q(t,i,(s=>t[s][e]>=i));const J=["push","pop","shift","splice","unshift"];function Z(t,e){const i=t._chartjs;if(!i)return;const s=i.listeners,n=s.indexOf(e);-1!==n&&s.splice(n,1),s.length>0||(J.forEach((e=>{delete t[e]})),delete t._chartjs)}function Q(t){const e=new Set(t);return e.size===t.length?t:Array.from(e)}const tt="undefined"==typeof window?function(t){return t()}:window.requestAnimationFrame;function et(t,e){let i=[],s=!1;return function(...n){i=n,s||(s=!0,tt.call(window,(()=>{s=!1,t.apply(e,i)})))}}const it=t=>"start"===t?"left":"end"===t?"right":"center",st=(t,e,i)=>"start"===t?e:"end"===t?i:(e+i)/2;function nt(t,e,s){const n=e.length;let o=0,a=n;if(t._sorted){const{iScale:r,vScale:l,_parsed:h}=t,c=t.dataset&&t.dataset.options?t.dataset.options.spanGaps:null,d=r.axis,{min:u,max:f,minDefined:g,maxDefined:p}=r.getUserBounds();if(g){if(o=Math.min(K(h,d,u).lo,s?n:K(e,d,r.getPixelForValue(u)).lo),c){const t=h.slice(0,o+1).reverse().findIndex((t=>!i(t[l.axis])));o-=Math.max(0,t)}o=U(o,0,n-1)}if(p){let t=Math.max(K(h,r.axis,f,!0).hi+1,s?0:K(e,d,r.getPixelForValue(f),!0).hi+1);if(c){const e=h.slice(t-1).findIndex((t=>!i(t[l.axis])));t+=Math.max(0,e)}a=U(t,o,n)-o}else a=n-o}return{start:o,count:a}}function ot(t){const{xScale:e,yScale:i,_scaleRanges:s}=t,n={xmin:e.min,xmax:e.max,ymin:i.Line truncated
|
||||||
|
/*!
|
||||||
|
* @kurkle/color v0.3.2
|
||||||
|
* https://github.com/kurkle/color#readme
|
||||||
|
* (c) 2023 Jukka Kurkela
|
||||||
|
* Released under the MIT License
|
||||||
|
*/
|
||||||
|
function ut(t){return t+.5|0}const ft=(t,e,i)=>Math.max(Math.min(t,i),e);function gt(t){return ft(ut(2.55*t),0,255)}function pt(t){return ft(ut(255*t),0,255)}function mt(t){return ft(ut(t/2.55)/100,0,1)}function xt(t){return ft(ut(100*t),0,100)}const bt={0:0,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,A:10,B:11,C:12,D:13,E:14,F:15,a:10,b:11,c:12,d:13,e:14,f:15},_t=[..."0123456789ABCDEF"],yt=t=>_t[15&t],vt=t=>_t[(240&t)>>4]+_t[15&t],Mt=t=>(240&t)>>4==(15&t);function wt(t){var e=(t=>Mt(t.r)&&Mt(t.g)&&Mt(t.b)&&Mt(t.a))(t)?yt:vt;return t?"#"+e(t.r)+e(t.g)+e(t.b)+((t,e)=>t<255?e(t):"")(t.a,e):void 0}const kt=/^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;function St(t,e,i){const s=e*Math.min(i,1-i),n=(e,n=(e+t/30)%12)=>i-s*Math.max(Math.min(n-3,9-n,1),-1);return[n(0),n(8),n(4)]}function Pt(t,e,i){const s=(s,n=(s+t/60)%6)=>i-i*e*Math.max(Math.min(n,4-n,1),0);return[s(5),s(3),s(1)]}function Dt(t,e,i){const s=St(t,1,.5);let n;for(e+i>1&&(n=1/(e+i),e*=n,i*=n),n=0;n<3;n++)s[n]*=1-e-i,s[n]+=e;return s}function Ot(t){const e=t.r/255,i=t.g/255,s=t.b/255,n=Math.max(e,i,s),o=Math.min(e,i,s),a=(n+o)/2;let r,l,h;return n!==o&&(h=n-o,l=a>.5?h/(2-n-o):h/(n+o),r=function(t,e,i,s,n){return t===n?(e-i)/s+(e<i?6:0):e===n?(i-t)/s+2:(t-e)/s+4}(e,i,s,h,n),r=60*r+.5),[0|r,l||0,a]}function Ct(t,e,i,s){return(Array.isArray(e)?t(e[0],e[1],e[2]):t(e,i,s)).map(pt)}function At(t,e,i){return Ct(St,t,e,i)}function Tt(t){return(t%360+360)%360}function Lt(t){const e=kt.exec(t);let i,s=255;if(!e)return;e[5]!==i&&(s=e[6]?gt(+e[5]):pt(+e[5]));const n=Tt(+e[2]),o=+e[3]/100,a=+e[4]/100;return i="hwb"===e[1]?function(t,e,i){return Ct(Dt,t,e,i)}(n,o,a):"hsv"===e[1]?function(t,e,i){return Ct(Pt,t,e,i)}(n,o,a):At(n,o,a),{r:i[0],g:i[1],b:i[2],a:s}}const Et={x:"dark",Z:"light",Y:"re",X:"blu",W:"gr",V:"medium",U:"slate",A:"ee",T:"ol",S:"or",B:"ra",C:"lateg",D:"ights",R:"in",Q:"turquois",E:"hi",P:"ro",O:"al",N:"le",M:"de",L:"yello",F:"en",K:"ch",G:"arks",H:"ea",I:"ightg",J:"wh"},Rt={OiceXe:"f0f8ff",antiquewEte:"faebd7",aqua:"ffff",aquamarRe:"7fffd4",azuY:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"0",blanKedOmond:"ffebcd",Xe:"ff",XeviTet:"8a2be2",bPwn:"a52a2a",burlywood:"deb887",caMtXe:"5f9ea0",KartYuse:"7fff00",KocTate:"d2691e",cSO:"ff7f50",cSnflowerXe:"6495ed",cSnsilk:"fff8dc",crimson:"dc143c",cyan:"ffff",xXe:"8b",xcyan:"8b8b",xgTMnPd:"b8860b",xWay:"a9a9a9",xgYF:"6400",xgYy:"a9a9a9",xkhaki:"bdb76b",xmagFta:"8b008b",xTivegYF:"556b2f",xSange:"ff8c00",xScEd:"9932cc",xYd:"8b0000",xsOmon:"e9967a",xsHgYF:"8fbc8f",xUXe:"483d8b",xUWay:"2f4f4f",xUgYy:"2f4f4f",xQe:"ced1",xviTet:"9400d3",dAppRk:"ff1493",dApskyXe:"bfff",dimWay:"696969",dimgYy:"696969",dodgerXe:"1e90ff",fiYbrick:"b22222",flSOwEte:"fffaf0",foYstWAn:"228b22",fuKsia:"ff00ff",gaRsbSo:"dcdcdc",ghostwEte:"f8f8ff",gTd:"ffd700",gTMnPd:"daa520",Way:"808080",gYF:"8000",gYFLw:"adff2f",gYy:"808080",honeyMw:"f0fff0",hotpRk:"ff69b4",RdianYd:"cd5c5c",Rdigo:"4b0082",ivSy:"fffff0",khaki:"f0e68c",lavFMr:"e6e6fa",lavFMrXsh:"fff0f5",lawngYF:"7cfc00",NmoncEffon:"fffacd",ZXe:"add8e6",ZcSO:"f08080",Zcyan:"e0ffff",ZgTMnPdLw:"fafad2",ZWay:"d3d3d3",ZgYF:"90ee90",ZgYy:"d3d3d3",ZpRk:"ffb6c1",ZsOmon:"ffa07a",ZsHgYF:"20b2aa",ZskyXe:"87cefa",ZUWay:"778899",ZUgYy:"778899",ZstAlXe:"b0c4de",ZLw:"ffffe0",lime:"ff00",limegYF:"32cd32",lRF:"faf0e6",magFta:"ff00ff",maPon:"800000",VaquamarRe:"66cdaa",VXe:"cd",VScEd:"ba55d3",VpurpN:"9370db",VsHgYF:"3cb371",VUXe:"7b68ee",VsprRggYF:"fa9a",VQe:"48d1cc",VviTetYd:"c71585",midnightXe:"191970",mRtcYam:"f5fffa",mistyPse:"ffe4e1",moccasR:"ffe4b5",navajowEte:"ffdead",navy:"80",Tdlace:"fdf5e6",Tive:"808000",TivedBb:"6b8e23",Sange:"ffa500",SangeYd:"ff4500",ScEd:"da70d6",pOegTMnPd:"eee8aa",pOegYF:"98fb98",pOeQe:"afeeee",pOeviTetYd:"db7093",papayawEp:"ffefd5",pHKpuff:"ffdab9",peru:"cd853f",pRk:"ffc0cb",plum:"dda0dd",powMrXe:"b0e0e6",purpN:"800080",YbeccapurpN:"663399",Yd:"ff0000",Psybrown:"bc8f8f",PyOXe:"4169e1",saddNbPwn:"8b4513",sOmon:"fa8072",sandybPwn:"f4a460",sHgYF:"2e8b57",sHshell:"fff5ee",siFna:"a0522d",silver:"c0c0c0",skyXe:"87ceeb",UXe:"6a5acd",UWay:"708090",UgYy:"708090",snow:"fffafa",sprRggYF:"ff7f",stAlXe:"4682b4",tan:"d2b48c",teO:"8080",tEstN:"d8bfd8",tomato:"ff6347",Qe:"40e0d0",viTet:"ee82ee",JHt:"f5deb3",wEte:"ffffff",wEtesmoke:"f5f5f5",Lw:"ffff00",LwgYF:"9acd32"};let It;function Ft(t){It||(It=function(){const t={},e=Object.keys(Rt),i=Object.keys(Et);let s,n,o,a,r;for(s=0;s<e.length;s++){for(a=r=e[s],n=0;n<i.length;n++)o=i[n],r=r.replace(o,Et[o]);o=parseInt(Rt[a],16),t[r]=[o>>16&255,o>>8&255,255&o]}return t}(),It.transparent=[0,0,0,0]);const e=It[t.toLowerCase()];return e&&{r:e[0],g:e[1],b:e[2],a:4===e.length?e[3]:255}}const zt=/^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;const Vt=t=>t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055,Bt=t=>t<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4);function Wt(t,e,i){if(t){let s=Ot(t);s[e]=Math.max(0,Math.min(s[e]+s[e]*i,0===e?360:1)),s=ALine truncated
|
||||||
@@ -309,6 +309,8 @@ en:
|
|||||||
permission_view_business_reports: "View business reports"
|
permission_view_business_reports: "View business reports"
|
||||||
label_business_report: "Business report"
|
label_business_report: "Business report"
|
||||||
label_report_period: "Period"
|
label_report_period: "Period"
|
||||||
|
label_report_period_this_week: "This week"
|
||||||
|
label_report_period_last_week: "Last week"
|
||||||
label_report_period_this_month: "This month"
|
label_report_period_this_month: "This month"
|
||||||
label_report_period_last_month: "Last month"
|
label_report_period_last_month: "Last month"
|
||||||
label_report_period_this_quarter: "This quarter"
|
label_report_period_this_quarter: "This quarter"
|
||||||
@@ -319,6 +321,8 @@ en:
|
|||||||
label_report_money: "Sales"
|
label_report_money: "Sales"
|
||||||
label_report_hours: "Hours"
|
label_report_hours: "Hours"
|
||||||
label_report_by_month: "By month"
|
label_report_by_month: "By month"
|
||||||
|
label_report_compare_last_year: "Compare with last year"
|
||||||
|
label_report_last_year: "last year"
|
||||||
label_report_estimates_written: "Estimates written"
|
label_report_estimates_written: "Estimates written"
|
||||||
label_report_invoices_written: "Invoices written"
|
label_report_invoices_written: "Invoices written"
|
||||||
label_report_payments_received: "Payments received"
|
label_report_payments_received: "Payments received"
|
||||||
|
|||||||
@@ -18,15 +18,21 @@ module RedmineQboBilling
|
|||||||
# the day they were created (only issues without subtasks, so parents' totals aren't counted twice), and
|
# the day they were created (only issues without subtasks, so parents' totals aren't counted twice), and
|
||||||
# spent time by the day it was spent.
|
# spent time by the day it was spent.
|
||||||
class BusinessReport
|
class BusinessReport
|
||||||
PERIODS = %w[this_month last_month this_quarter last_quarter this_year last_year custom].freeze
|
PERIODS = %w[this_week last_week this_month last_month this_quarter last_quarter this_year last_year custom].freeze
|
||||||
|
WEEK_DAYS = { 1 => :monday, 6 => :saturday, 7 => :sunday }.freeze
|
||||||
|
# Chart points: a day each for up to two weeks, a week each up to about three months, else a month each
|
||||||
|
DAILY_UP_TO = 14
|
||||||
|
WEEKLY_UP_TO = 93
|
||||||
MONEY = %i[estimates invoices payments].freeze
|
MONEY = %i[estimates invoices payments].freeze
|
||||||
HOURS = %i[estimate_hours issue_hours invoice_hours spent_hours].freeze
|
HOURS = %i[estimate_hours issue_hours invoice_hours spent_hours].freeze
|
||||||
|
|
||||||
attr_reader :from, :to, :period
|
attr_reader :from, :to, :period
|
||||||
|
|
||||||
# The dates for a period, from today: [from, to]. "custom" uses the given dates (either can be blank).
|
# The dates for a period, from today: [from, to]. "custom" uses the given dates (either can be blank).
|
||||||
def self.range_for(period, today: Date.current, from: nil, to: nil)
|
def self.range_for(period, today: Date.current, from: nil, to: nil, week_start: :monday)
|
||||||
case period.to_s
|
case period.to_s
|
||||||
|
when 'this_week' then [today.beginning_of_week(week_start), today.end_of_week(week_start)]
|
||||||
|
when 'last_week' then w = today - 7; [w.beginning_of_week(week_start), w.end_of_week(week_start)]
|
||||||
when 'this_month' then [today.beginning_of_month, today.end_of_month]
|
when 'this_month' then [today.beginning_of_month, today.end_of_month]
|
||||||
when 'last_month' then m = today.prev_month; [m.beginning_of_month, m.end_of_month]
|
when 'last_month' then m = today.prev_month; [m.beginning_of_month, m.end_of_month]
|
||||||
when 'this_quarter' then [today.beginning_of_quarter, today.end_of_quarter]
|
when 'this_quarter' then [today.beginning_of_quarter, today.end_of_quarter]
|
||||||
@@ -49,11 +55,87 @@ module RedmineQboBilling
|
|||||||
|
|
||||||
# data (for tests): { estimates: [[date, total, hours]], invoices: [[date, total, hours, balance]],
|
# data (for tests): { estimates: [[date, total, hours]], invoices: [[date, total, hours, balance]],
|
||||||
# payments: [[date, total]], issues: [[date, estimated_hours]], time_entries: [[date, hours]] }
|
# payments: [[date, total]], issues: [[date, estimated_hours]], time_entries: [[date, hours]] }
|
||||||
def initialize(period: 'this_year', from: nil, to: nil, today: Date.current, data: nil)
|
# week_start: the first day of a week (:monday, :saturday or :sunday); see week_start_from_setting.
|
||||||
|
# previous_data (for tests): last year's data, like data.
|
||||||
|
def initialize(period: 'this_year', from: nil, to: nil, today: Date.current, data: nil, week_start: :monday,
|
||||||
|
previous_data: nil)
|
||||||
@period = PERIODS.include?(period.to_s) ? period.to_s : 'this_year'
|
@period = PERIODS.include?(period.to_s) ? period.to_s : 'this_year'
|
||||||
@from, @to = self.class.range_for(@period, today: today, from: from, to: to)
|
@week_start = week_start
|
||||||
|
@from, @to = self.class.range_for(@period, today: today, from: from, to: to, week_start: week_start)
|
||||||
@today = today
|
@today = today
|
||||||
@data = data
|
@data = data
|
||||||
|
@previous_data = previous_data
|
||||||
|
end
|
||||||
|
|
||||||
|
# Redmine's "Start calendars on" setting (1 Monday, 6 Saturday, 7 Sunday); Monday when it follows the language
|
||||||
|
def self.week_start_from_setting(value)
|
||||||
|
WEEK_DAYS[value.to_i] || :monday
|
||||||
|
end
|
||||||
|
|
||||||
|
# ---- charts ----
|
||||||
|
|
||||||
|
# :day, :week or :month, from the length of the period
|
||||||
|
def granularity
|
||||||
|
days = (to - from).to_i + 1
|
||||||
|
return :day if days <= DAILY_UP_TO
|
||||||
|
days <= WEEKLY_UP_TO ? :week : :month
|
||||||
|
end
|
||||||
|
|
||||||
|
# The chart's points as [first day, last day] pairs covering the period
|
||||||
|
def buckets
|
||||||
|
@buckets ||= begin
|
||||||
|
list = []
|
||||||
|
case granularity
|
||||||
|
when :day
|
||||||
|
(from..to).each { |day| list << [day, day] }
|
||||||
|
when :week
|
||||||
|
start = from.beginning_of_week(@week_start)
|
||||||
|
while start <= to
|
||||||
|
list << [[start, from].max, [start + 6, to].min]
|
||||||
|
start += 7
|
||||||
|
end
|
||||||
|
else
|
||||||
|
start = from.beginning_of_month
|
||||||
|
while start <= to
|
||||||
|
list << [[start, from].max, [start.end_of_month, to].min]
|
||||||
|
start = start.next_month
|
||||||
|
end
|
||||||
|
end
|
||||||
|
list
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# The same points a year earlier. Days and weeks go back 52 weeks, so a Monday lines up with a Monday;
|
||||||
|
# months go back to the same month.
|
||||||
|
def previous_buckets
|
||||||
|
@previous_buckets ||= if granularity == :month
|
||||||
|
buckets.map { |a, b| [a.prev_year, b.prev_year] }
|
||||||
|
else
|
||||||
|
buckets.map { |a, b| [a - 364, b - 364] }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Everything the line charts need: the points' start dates, this period's figures per point (nil after
|
||||||
|
# today, so the line stops there), and last year's for the same points (the toggle shows them).
|
||||||
|
# { granularity:, points: ["2026-10-26", ...],
|
||||||
|
# current: { estimates: [...], invoices:, payments:, estimate_hours:, issue_hours:, invoice_hours:, spent_hours: },
|
||||||
|
# previous: { same keys } }
|
||||||
|
def chart
|
||||||
|
current = sums_by_bucket(data, buckets)
|
||||||
|
current.each_value { |values| buckets.each_with_index { |(a, _), i| values[i] = nil if a > @today } }
|
||||||
|
{
|
||||||
|
granularity: granularity,
|
||||||
|
points: buckets.map { |a, _| a.iso8601 },
|
||||||
|
ends: buckets.map { |_, b| b.iso8601 },
|
||||||
|
previous_points: previous_buckets.map { |a, _| a.iso8601 },
|
||||||
|
current: current,
|
||||||
|
previous: sums_by_bucket(previous_data, previous_buckets)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
# Last year's data for the chart's points
|
||||||
|
def previous_data
|
||||||
|
@previous_data ||= load_data(previous_buckets.first[0], previous_buckets.last[1])
|
||||||
end
|
end
|
||||||
|
|
||||||
def data
|
def data
|
||||||
@@ -146,7 +228,26 @@ module RedmineQboBilling
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_data
|
# { money key or hours key => [sum per bucket] } for the data, in buckets ([first day, last day] pairs)
|
||||||
|
def sums_by_bucket(rows, bucket_list)
|
||||||
|
sums = (MONEY + HOURS).index_with { |_| Array.new(bucket_list.size, 0.0) }
|
||||||
|
find = lambda do |date|
|
||||||
|
bucket_list.index { |a, b| date >= a && date <= b }
|
||||||
|
end
|
||||||
|
columns = {
|
||||||
|
estimates: [:estimates, 1], invoices: [:invoices, 1], payments: [:payments, 1],
|
||||||
|
estimate_hours: [:estimates, 2], issue_hours: [:issues, 1], invoice_hours: [:invoices, 2], spent_hours: [:time_entries, 1]
|
||||||
|
}
|
||||||
|
columns.each do |key, (source, col)|
|
||||||
|
Array(rows[source]).each do |row|
|
||||||
|
i = find.call(row[0]) or next
|
||||||
|
sums[key][i] += MONEY.include?(key) ? to_d(row[col]).to_f : row[col].to_f
|
||||||
|
end
|
||||||
|
end
|
||||||
|
sums.transform_values { |values| values.map { |v| v.round(2) } }
|
||||||
|
end
|
||||||
|
|
||||||
|
def load_data(from = self.from, to = self.to)
|
||||||
dates = from..to
|
dates = from..to
|
||||||
times = from.in_time_zone.beginning_of_day..to.in_time_zone.end_of_day
|
times = from.in_time_zone.beginning_of_day..to.in_time_zone.end_of_day
|
||||||
leaf = "#{Issue.table_name}.rgt IS NULL OR #{Issue.table_name}.rgt - #{Issue.table_name}.lft = 1"
|
leaf = "#{Issue.table_name}.rgt IS NULL OR #{Issue.table_name}.rgt - #{Issue.table_name}.lft = 1"
|
||||||
|
|||||||
Reference in new issue
Block a user