diff --git a/index.dev.html b/index.dev.html index 22c361be..dee51234 100644 --- a/index.dev.html +++ b/index.dev.html @@ -37,6 +37,6 @@ window.less = {async: true, fileSync: true}; - + \ No newline at end of file diff --git a/index.html b/index.html index 87d344b8..d6e2f6ce 100644 --- a/index.html +++ b/index.html @@ -37,6 +37,6 @@ window.less = {async: true, fileSync: true}; - + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 331a4c7b..2f55ddcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "a2jauthor", - "version": "10.2.0-0", + "version": "10.2.0-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "a2jauthor", - "version": "10.2.0-0", + "version": "10.2.0-2", "license": "GNU AGPL v3.0", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", - "@caliorg/a2jviewer": "^8.2.0-1", + "@caliorg/a2jviewer": "^8.2.0-10", "bit-tabs": "^2.0.0", "blueimp-file-upload": "^9.10.1", "bootstrap": "^3.4.1", @@ -1181,9 +1181,9 @@ } }, "node_modules/@caliorg/a2jviewer": { - "version": "8.2.0-1", - "resolved": "https://registry.npmjs.org/@caliorg/a2jviewer/-/a2jviewer-8.2.0-1.tgz", - "integrity": "sha512-tp32ykS0qV5tzTPZums6ZSnLdZAU/XTmEGUcAyGxBxT+QY6FJzsiyRNTqD0KOH1JOezRhHM58apNzlg1b97d7A==", + "version": "8.2.0-10", + "resolved": "https://registry.npmjs.org/@caliorg/a2jviewer/-/a2jviewer-8.2.0-10.tgz", + "integrity": "sha512-DEOju3JWE9VWQu296NBA4rjoMVfJO3xoI+Mrpb8ohJenuer7cJ6oQCgPXvH3xF9bjMWPDemSp+gUJH7qSR8+cw==", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", "bit-tabs": "^2.0.0", @@ -14475,9 +14475,9 @@ } }, "@caliorg/a2jviewer": { - "version": "8.2.0-1", - "resolved": "https://registry.npmjs.org/@caliorg/a2jviewer/-/a2jviewer-8.2.0-1.tgz", - "integrity": "sha512-tp32ykS0qV5tzTPZums6ZSnLdZAU/XTmEGUcAyGxBxT+QY6FJzsiyRNTqD0KOH1JOezRhHM58apNzlg1b97d7A==", + "version": "8.2.0-10", + "resolved": "https://registry.npmjs.org/@caliorg/a2jviewer/-/a2jviewer-8.2.0-10.tgz", + "integrity": "sha512-DEOju3JWE9VWQu296NBA4rjoMVfJO3xoI+Mrpb8ohJenuer7cJ6oQCgPXvH3xF9bjMWPDemSp+gUJH7qSR8+cw==", "requires": { "@caliorg/a2jdeps": "^7.1.7", "bit-tabs": "^2.0.0", diff --git a/package.json b/package.json index f0fe567d..92e33a07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "a2jauthor", - "version": "10.2.0-0", + "version": "10.2.0-2", "description": "A2J Authoring App GUI.", "license": "GNU AGPL v3.0", "author": { @@ -24,7 +24,7 @@ }, "dependencies": { "@caliorg/a2jdeps": "^7.1.7", - "@caliorg/a2jviewer": "^8.2.0-1", + "@caliorg/a2jviewer": "^8.2.0-10", "bit-tabs": "^2.0.0", "blueimp-file-upload": "^9.10.1", "bootstrap": "^3.4.1", diff --git a/src/footer/footerVersion.js b/src/footer/footerVersion.js index e35edcca..0dd963e4 100644 --- a/src/footer/footerVersion.js +++ b/src/footer/footerVersion.js @@ -1,7 +1,7 @@ const version = { - number: '10.2.0-0', - date: '2024-02-08' + number: '10.2.0-2', + date: '2024-02-26' } export default version diff --git a/src/pages-tab/components/page-fields/page-fields.js b/src/pages-tab/components/page-fields/page-fields.js index f2abd8a0..c8df86b5 100644 --- a/src/pages-tab/components/page-fields/page-fields.js +++ b/src/pages-tab/components/page-fields/page-fields.js @@ -212,6 +212,53 @@ export const PageFieldsVM = DefineMap.extend('PageFieldsVM', { return el.value }, + setBound(el){ + }, + + checktoToday(el){ + return el.checked ? "TODAY": "" + }, + + parseDateBound(boundedDate){ + let textDate = "" // assume unfilled + + + if (boundedDate){ + + if (boundedDate !== "TODAY"){ + textDate = + boundedDate.substr(4) + '-' + + boundedDate.substr(0, 2) + '-' + + boundedDate.substr(2,2) + } + + } + + return textDate + + }, + + toggleDateBoundEnable(el){ + $(el).prop('disabled', !$(el).prop('disabled')) + }, + + mangleDateBound(el){ + + let str = el.value.split(',').join('') + str = str.split('-').join('') + console.log("JAWN: " + str) + + str = + str.substr(4,2) + '/' + + str.substr(6, 2) + '/' + + str.substr(0,4) + + str = str.match(new RegExp(el.pattern || '.', 'g')).join('') + + return str + + }, + applyPattern (el) { el.value = el.value.match(new RegExp(el.pattern || '.', 'g')).join('') return el.value diff --git a/src/pages-tab/components/page-fields/page-fields.stache b/src/pages-tab/components/page-fields/page-fields.stache index 38e6af1e..0ca7b2d1 100644 --- a/src/pages-tab/components/page-fields/page-fields.stache +++ b/src/pages-tab/components/page-fields/page-fields.stache @@ -101,20 +101,51 @@ {{#if(field.canMinMax)}}
+ - + +
+
+ +
+
-
+
- +
+
+ +
+
{{/if}} {{#if(field.canList)}}