peter/wiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make dates work with new properties

Browse Source
This commit is contained in:
Peter Stuifzand 2021-08-17 22:07:44 +02:00
parent 61bef3b785
commit 4dc3d16713
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/src/editor.js
View File

@ -279,7 +279,7 @@ function Editor(holder, input) {
if (col.children && col.children.length > 0) { if (col.children && col.children.length > 0) {
value = col.children[0].text value = col.children[0].text
} }
transform(typeof value === 'string' ? value.replace(/^:/, '=') : '', $(td), id, editor, rowData) transform(typeof value === 'string' ? value.replace(/^:/, '=') : '', $(td), id, editor, {row: rowData})
return td return td
}) })
]) ])
@ -365,6 +365,7 @@ function Editor(holder, input) {
element.html(converted) element.html(converted)
}) })
.catch(e => console.warn(e))
} else { } else {
let re = /^([A-Z0-9 ]+)::\s*(.*)$/i; let re = /^([A-Z0-9 ]+)::\s*(.*)$/i;
let res = text.match(re) let res = text.match(re)
@ -633,22 +634,21 @@ function Editor(holder, input) {
let query = $input.val() let query = $input.val()
Promise.any([ match(query, /{{query(!?):\s*([^}]+)}}/)
match(query, /{{query(!?):\s*([^}]+)}}/) .then(res => {
]).then(res => { if (res[1] === '!') {
if (res[1] === '!') { return search.startQuery(res[2])
return search.startQuery(res[2]) .then(hits => _.uniqBy(_.flatMap(hits, formatTitleResult), _.property('text')))
.then(hits => _.uniqBy(_.flatMap(hits, formatTitleResult), _.property('text'))) .then(results => editor.replaceChildren(id, results))
.then(results => editor.replaceChildren(id, results)) .finally(() => editor.render())
.finally(() => editor.render()) } else {
} else { return search.startQuery(res[2])
return search.startQuery(res[2]) .then(hits => _.groupBy(hits, (it) => it.title))
.then(hits => _.groupBy(hits, (it) => it.title)) .then(hits => _.flatMap(hits, formatLineResult))
.then(hits => _.flatMap(hits, formatLineResult)) .then(results => editor.replaceChildren(id, results))
.then(results => editor.replaceChildren(id, results)) .finally(() => editor.render())
.finally(() => editor.render()) }
} })
}).catch(() => console.log('match error'))
}); });
return editor return editor
}) })

6
editor/src/formula.js
View File

@ -1,4 +1,6 @@
import moment from "moment"; import moment from "moment";
import "moment/locale/nl"
moment.locale('nl')
/** /**
* @param {string|moment.Moment} x * @param {string|moment.Moment} x
@ -13,6 +15,10 @@ function date(x) {
if (r) { if (r) {
return moment(r[1], "DD MMM YYYY") return moment(r[1], "DD MMM YYYY")
} }
return moment(x, "DD MMM YYYY")
}
if (_.isObject(x) && _.has(x, 'title')) {
return moment(x.title, "DD MMM YYYY")
} }
return moment(x, "YYYY-MM-DD"); return moment(x, "YYYY-MM-DD");
} }