Merge pull request #609 from alicolville/more-tweaks

More tweaks

.gitignore

@@ -12,4 +12,5 @@ includes/.DS_Store
 includes/react/frontend/node_modules
 docs/_site/*
 playwright/.auth/user.json
-playwright/playwright/.auth/user.json
+playwright/playwright/.auth/user.json
+.DS_Store

assets/js/libraries/additional-methods.js

@@ -1,11 +1,11 @@
 /*!
- * jQuery Validation Plugin v1.14.0
+ * jQuery Validation Plugin v1.19.5
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2015 Jörn Zaefferer
+ * Copyright (c) 2022 Jörn Zaefferer
  * Released under the MIT license
-*/
+ */
 (function( factory ) {
  if ( typeof define === "function" && define.amd ) {
  define( ["jquery", "./jquery.validate"], factory );
@@ -1509,5 +1509,4 @@ $.validator.addMethod( "ziprange", function( value, element ) {
  return this.optional( element ) || /^90[2-5]\d\{2\}-\d{4}$/.test( value );
 }, "Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx." );
 return $;
-}));
-
+}));

assets/js/libraries/chart-4.4.1.js → assets/js/libraries/chart-4.4.4.js

@@ -1,7 +1,7 @@
 /*!
- * Chart.js v4.4.1
+ * Chart.js v4.4.4
  * https://www.chartjs.org
- * (c) 2023 Chart.js Contributors
+ * (c) 2024 Chart.js Contributors
  * Released under the MIT License
  */
 import { r as requestAnimFrame, a as resolve, e as effects, c as color, i as isObject, d as defaults, b as isArray, v as valueOrDefault, u as unlistenArrayEvents, l as listenArrayEvents, f as resolveObjectKey, g as isNumberFinite, h as defined, s as sign, j as createContext, k as isNullOrUndef, _ as _arrayUnique, t as toRadians, m as toPercentage, n as toDimension, T as TAU, o as formatNumber, p as _angleBetween, H as HALF_PI, P as PI, q as _getStartAndCountOfVisiblePoints, w as _scaleRangesChanged, x as isNumber, y as _parseObjectDataRadialScale, z as getRelativePosition, A as _rlookupByKey, B as _lookupByKey, C as _isPointInArea, D as getAngleFromPoint, E as toPadding, F as each, G as getMaximumSize, I as _getParentNode, J as readUsedSize, K as supportsEventListenerOptions, L as throttled, M as _isDomSupported, N as _factorize, O as finiteOrDefault, Q as callback, R as _addGrace, S as _limitValue, U as toDegrees, V as _measureText, W as _int16Range, X as _alignPixel, Y as clipArea, Z as renderText, $ as unclipArea, a0 as toFont, a1 as _toLeftRightCenter, a2 as _alignStartEnd, a3 as overrides, a4 as merge, a5 as _capitalize, a6 as descriptors, a7 as isFunction, a8 as _attachContext, a9 as _createResolver, aa as _descriptors, ab as mergeIf, ac as uid, ad as debounce, ae as retinaScale, af as clearCanvas, ag as setsEqual, ah as _elementsEqual, ai as _isClickEvent, aj as _isBetween, ak as _readValueToProps, al as _updateBezierControlPoints, am as _computeSegments, an as _boundSegments, ao as _steppedInterpolation, ap as _bezierInterpolation, aq as _pointInLine, ar as _steppedLineTo, as as _bezierCurveTo, at as drawPoint, au as addRoundedRectPath, av as toTRBL, aw as toTRBLCorners, ax as _boundSegment, ay as _normalizeAngle, az as getRtlAdapter, aA as overrideTextDirection, aB as _textX, aC as restoreTextDirection, aD as drawPointLegend, aE as distanceBetweenPoints, aF as noop, aG as _setMinAndMaxByKey, aH as niceNum, aI as almostWhole, aJ as almostEquals, aK as _decimalPlaces, aL as Ticks, aM as log10, aN as _longestText, aO as _filterBetween, aP as _lookup } from './chunks/helpers.segment.js';
@@ -452,15 +452,18 @@ function applyStack(stack, value, dsIndex, options = {}) {
  }
  return value;
 }
-function convertObjectDataToArray(data) {
+function convertObjectDataToArray(data, meta) {
+ const { iScale , vScale } = meta;
+ const iAxisKey = iScale.axis === 'x' ? 'x' : 'y';
+ const vAxisKey = vScale.axis === 'x' ? 'x' : 'y';
  const keys = Object.keys(data);
  const adata = new Array(keys.length);
  let i, ilen, key;
  for(i = 0, ilen = keys.length; i < ilen; ++i){
  key = keys[i];
  adata[i] = {
- x: key,
- y: data[key]
+ [iAxisKey]: key,
+ [vAxisKey]: data[key]
  };
  }
  return adata;
@@ -652,7 +655,8 @@ class DatasetController {
  const data = dataset.data || (dataset.data = []);
  const _data = this._data;
  if (isObject(data)) {
- this._data = convertObjectDataToArray(data);
+ const meta = this._cachedMeta;
+ this._data = convertObjectDataToArray(data, meta);
  } else if (_data !== data) {
  if (_data) {
  unlistenArrayEvents(_data, this);
@@ -1483,8 +1487,10 @@ class BarController extends DatasetController {
  const metasets = iScale.getMatchingVisibleMetas(this._type).filter((meta)=>meta.controller.options.grouped);
  const stacked = iScale.options.stacked;
  const stacks = [];
+ const currentParsed = this._cachedMeta.controller.getParsed(dataIndex);
+ const iScaleValue = currentParsed && currentParsed[iScale.axis];
  const skipNull = (meta)=>{
- const parsed = meta.controller.getParsed(dataIndex);
+ const parsed = meta._parsed.find((item)=>item[iScale.axis] === iScaleValue);
  const val = parsed && parsed[meta.vScale.axis];
  if (isNullOrUndef(val) || isNaN(val)) {
  return true;
@@ -1623,7 +1629,7 @@ class BarController extends DatasetController {
  const ilen = rects.length;
  let i = 0;
  for(; i < ilen; ++i){
- if (this.getParsed(i)[vScale.axis] !== null) {
+ if (this.getParsed(i)[vScale.axis] !== null && !rects[i].hidden) {
  rects[i].draw(this._ctx);
  }
  }
@@ -2752,7 +2758,7 @@ function binarySearch(metaset, axis, value, intersect) {
  const rangeMethod = axis === 'x' ? 'inXRange' : 'inYRange';
  let intersectsItem = false;
  evaluateInteractionItems(chart, axis, position, (element, datasetIndex, index)=>{
- if (element[rangeMethod](position[axis], useFinalPosition)) {
+ if (element[rangeMethod] && element[rangeMethod](position[axis], useFinalPosition)) {
  items.push({
  element,
  datasetIndex,
@@ -3251,10 +3257,14 @@ const eventListenerOptions = supportsEventListenerOptions ? {
  passive: true
 } : false;
 function addListener(node, type, listener) {
- node.addEventListener(type, listener, eventListenerOptions);
+ if (node) {
+ node.addEventListener(type, listener, eventListenerOptions);
+ }
 }
 function removeListener(chart, type, listener) {
- chart.canvas.removeEventListener(type, listener, eventListenerOptions);
+ if (chart && chart.canvas) {
+ chart.canvas.removeEventListener(type, listener, eventListenerOptions);
+ }
 }
 function fromNativeEvent(event, chart) {
  const type = EVENT_TYPES[event.type] || event.type;
@@ -3447,7 +3457,7 @@ function createProxyAndListen(chart, type, listener) {
  return getMaximumSize(canvas, width, height, aspectRatio);
  }
  isAttached(canvas) {
- const container = _getParentNode(canvas);
+ const container = canvas && _getParentNode(canvas);
  return !!(container && container.isConnected);
  }
 }
@@ -5506,7 +5516,7 @@ function needContext(proxy, names) {
  return false;
 }
 
-var version = "4.4.1";
+var version = "4.4.4";
 
 const KNOWN_POSITIONS = [
  'top',
@@ -6038,8 +6048,8 @@ class Chart {
  let i;
  if (this._resizeBeforeDraw) {
  const { width , height } = this._resizeBeforeDraw;
- this._resize(width, height);
  this._resizeBeforeDraw = null;
+ this._resize(width, height);
  }
  this.clear();
  if (this.width <= 0 || this.height <= 0) {
@@ -6678,7 +6688,8 @@ class ArcElement extends Element {
  ], useFinalPosition);
  const rAdjust = (this.options.spacing + this.options.borderWidth) / 2;
  const _circumference = valueOrDefault(circumference, endAngle - startAngle);
- const betweenAngles = _circumference >= TAU || _angleBetween(angle, startAngle, endAngle);
+ const nonZeroBetween = _angleBetween(angle, startAngle, endAngle) && startAngle !== endAngle;
+ const betweenAngles = _circumference >= TAU || nonZeroBetween;
  const withinRadius = _isBetween(distance, innerRadius + rAdjust, outerRadius + rAdjust);
  return betweenAngles && withinRadius;
  }
@@ -8887,20 +8898,26 @@ const positioners = {
  return false;
  }
  let i, len;
- let x = 0;
+ let xSet = new Set();
  let y = 0;
  let count = 0;
  for(i = 0, len = items.length; i < len; ++i){
  const el = items[i].element;
  if (el && el.hasValue()) {
  const pos = el.tooltipPosition();
- x += pos.x;
+ xSet.add(pos.x);
  y += pos.y;
  ++count;
  }
  }
+ if (count === 0 || xSet.size === 0) {
+ return false;
+ }
+ const xAverage = [
+ ...xSet
+ ].reduce((a, b)=>a + b) / xSet.size;
  return {
- x: x / count,
+ x: xAverage,
  y: y / count
  };
  },
@@ -10831,7 +10848,7 @@ class RadialLinearScale extends LinearScaleBase {
  }
  if (grid.display) {
  this.ticks.forEach((tick, index)=>{
- if (index !== 0) {
+ if (index !== 0 || index === 0 && this.min < 0) {
  offset = this.getDistanceFromCenterForValue(tick.value);
  const context = this.getContext(index);
  const optsAtIndex = grid.setContext(context);
@@ -10852,7 +10869,7 @@ class RadialLinearScale extends LinearScaleBase {
  ctx.strokeStyle = color;
  ctx.setLineDash(optsAtIndex.borderDash);
  ctx.lineDashOffset = optsAtIndex.borderDashOffset;
- offset = this.getDistanceFromCenterForValue(opts.ticks.reverse ? this.min : this.max);
+ offset = this.getDistanceFromCenterForValue(opts.reverse ? this.min : this.max);
  position = this.getPointPosition(i, offset);
  ctx.beginPath();
  ctx.moveTo(this.xCenter, this.yCenter);
@@ -10878,7 +10895,7 @@ class RadialLinearScale extends LinearScaleBase {
  ctx.textAlign = 'center';
  ctx.textBaseline = 'middle';
  this.ticks.forEach((tick, index)=>{
- if (index === 0 && !opts.reverse) {
+ if (index === 0 && this.min >= 0 && !opts.reverse) {
  return;
  }
  const optsAtIndex = tickOpts.setContext(this.getContext(index));