@akc42/app-utils 5.0.0 → 5.0.2

package/README.md

@@ -111,7 +111,23 @@ Additional support is provided with
 
 ## csv
 
-  the modules default export is a function which can be called with a name and optionally a parameters object.  The name is formed into url to `/api/csv/<name>`  to make a download request and if they exist the parameters object is turned into a query string.  The response from that uri is downloaded (expected to be a csv file).
+  the modules default export is a function which can be called with a name and optionally a parameters object.  The name
+  is formed into url to `/api/csv/<name>`  to make a download request and if they exist the parameters object is turned
+  into a query string.  The response from that uri is downloaded (expected to be a csv file).
+
+## Date Utilities
+
+There are a few operations on dates and times that happen quite frequently.  This module provides 4 functions to handle them, all of which take a single parameter. We generally assume everything is in `localtime`, but there is no specific reference to this, so we just assume the answer is in the same timezone as the input.
+
+1. **minToTime** take the number of minutes from midnight and provides the string HH:MM based on the 24 hour clock. The
+   number of minutes should be between 0 and 1439, otherwise zero length string is returned.
+2. **timeToMin** takes the time and returns the number of minutes from midnight.  An invalid time string causes a -1 to
+   be returned.
+3. **strToUrlDate** converts a string formatted as DD/MM/YYYY (leading zeros may be omitted for DD and MM and YYYY must
+   be between 1900 and 2199) and returns a string formatted as YYYY-MM-DD. It the date is invalid (including using the
+   29 February on a non leap year) a zero length string is returned.
+4. **urlDateToStr** converts a string formatted as YYYY-MM-DD and returns it as DD/MM/YYYY. Leading zeros must not be
+   omitted. If the date is invalid (including any month that is too many days) that a zero length string is returned.
 
 ## debug
 

package/app-utils.js

@@ -11,7 +11,27 @@ import {partMap} from './partMap.js';
 import pdf from './pdf.js';
 import Route from './route.js';
 import submit from './submit-function.js';
-import {switchPath, generateUri, nagivate} from './switch-path.js';
+import {switchPath, generateUri, navigate} from './switch-path.js';
+import { minToTime,timeToMin,strToUrlDate,urlDateToStr } from './date-utils.js';
 
-export {api,ApiError,AppKeys,calcTextColor,config, connectUrl, csv, Debug, disconnectUrl, domHost, generateUri,
-  getMasterTabPromise, Logger, navigate, partMap, pdf, reReadConfig, Route,setConfig, submit, switchPath };
+function capitalise(name) {
+  if (name.length > 0 ) {
+    let words = name.split(' ');
+    for(let i = 0; i < words.length; i++) {
+      if (i > 0 && ( words[i].toLowerCase() === 'de' || words[i].toLowerCase() === 'la')) {
+        words[i] = words[i].toLowerCase();
+      } else if (words[i].length > 2 && words[i].toUpperCase().substring(0,2) === `O'` ) {
+        const newword = capitalise(words[i].substring(2))
+        words[i] = words[i].substring(0,2).toUpperCase() + newword;
+      } else {
+        words[i] = words[i].charAt(0).toUpperCase() + words[i].substring(1).toLowerCase();
+      }
+    }
+    return words.join(' ');
+  }
+  return '';
+};
+
+export {api,ApiError,AppKeys,calcTextColor,capitalise, config, connectUrl, csv, Debug, disconnectUrl, domHost, generateUri,
+  getMasterTabPromise, Logger, minToTime, navigate, partMap, pdf, reReadConfig, Route,setConfig, strToUrlDate, submit, 
+  switchPath, timeToMin, urlDateToStr };

package/colour.js

@@ -1,6 +1,6 @@
 /**
 @licence
-    Copyright (c) 2023 Alan Chandler, all rights reserved
+    Copyright (c) 2026 Alan Chandler, all rights reserved
 
     This file is part of @akc42/app-utils.
 

package/date-utils.js

@@ -0,0 +1,63 @@
+/**
+@licence
+    Copyright (c) 2026 Alan Chandler, all rights reserved
+
+    This file is part of @akc42/app-utils.
+
+    @akc42/app-utils is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    @akc42/app-utils is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with @akc42/app-utils.  If not, see <http://www.gnu.org/licenses/>.
+*/
+const timeRegex = /^((?:0?[0-9]|1[0-9]|2[0-3]))(?::((?:0?[0-9]|[1-5][0-9])))?$/;
+export function minToTime(m) {
+  if (m === 0) return '00:00';
+  if (isNaN(m) || m < 0 || m > 1439) return '';
+
+  var hr = Math.floor(m/60);
+  var mn = Math.floor(m % 60);
+  return hr.toString().padStart(2,'0') + ':' + mn.toString().padStart(2,'0');
+};
+
+export function timeToMin(time) {
+  if (typeof time !== 'string') return -1; //protective against crashes
+  if (time.length === 0) return -1;
+  const matches = timeRegex.exec(time);
+  if (matches) {
+    let mins = 0;
+    if (typeof matches[2] !== 'undefined') mins = parseInt(matches[2],10);
+    let hours = parseInt(matches[1], 10);
+    if (Number.isInteger(hours) && Number.isInteger(mins)) return  (hours * 60) + mins;
+  }
+  return -1;
+};
+
+const urlRegex = /^((?:19|2[01])(?:(?:(?:0[48]|[2468][048]|[13579][26])(?=-02-29))|\d{2}(?!-02-(?:29|3[01]))))-((?:02(?!-3[01])|0[469](?!-31)|11(?!-31)|(?:0[13578]|1[02])))-([0][1-9]|[12][0-9]|3[01])$/;
+const strRegex = /^((?:0?|[1-9])\d)\/((?:0?|[1-9])\d)\/((?:19|2[01])\d{2})$/;
+
+export function urlDateToStr(urlDay) {
+  let matches;
+  //eslint-disable-next-line no-cond-assign
+  if (matches = urlRegex.exec(urlDay.toString())) {
+    return matches[3] + '/' + matches[2] + '/' + matches[1];
+  }
+  return '';
+};
+
+export function strToUrlDate(str) {
+  let matches;
+  if (matches = strRegex.exec(str.toString())) {
+    const urlDate = matches[3] + '-' + matches[2].padStart(2,'0') + '-' + matches[1].padStart(2,'0');
+    if (urlRegex.test(urlDate)) return urlDate; 
+  }
+  return '';
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akc42/app-utils",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "General Utilities for SPAs",
   "mains": "app-utils.js",
   "scripts": {

package/pdf.js

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License
     along with @akc42/app-utils.  If not, see <http://www.gnu.org/licenses/>.
 */
-import api from './post-api.js';
+import api from './api.js';
 export default (url,params) => {
   api(`pdf/${url}`,params,true);
 }