hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-12-22 11:01:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix due date (#3042)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-04-21 17:55:29 +06:00 committed by GitHub
parent 134a4fe10c
commit 5ef4205a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/recruit-resources/src/components/KanbanCard.svelte
View File

@ -92,7 +92,7 @@
</div> </div>
<DueDatePresenter <DueDatePresenter
value={object.dueDate} value={object.dueDate}
shouldRender={object.dueDate !== null} shouldRender={object.dueDate !== null && object.dueDate !== undefined}
onChange={async (e) => { onChange={async (e) => {
await client.update(object, { dueDate: e }) await client.update(object, { dueDate: e })
}} }}

1
plugins/tracker-resources/src/components/issues/DueDatePresenter.svelte
View File

@ -41,6 +41,7 @@
$: shouldRenderPresenter = $: shouldRenderPresenter =
dueDateMs !== null && dueDateMs !== null &&
dueDateMs !== undefined &&
value.$lookup?.status?.category !== tracker.issueStatusCategory.Completed && value.$lookup?.status?.category !== tracker.issueStatusCategory.Completed &&
value.$lookup?.status?.category !== tracker.issueStatusCategory.Canceled value.$lookup?.status?.category !== tracker.issueStatusCategory.Canceled
</script> </script>

2
server/mongo/src/storage.ts
View File

@ -1063,7 +1063,7 @@ function fillDateSort (key: string, pipeline: any[], sort: any, options: FindOpt
} }
pipeline.push({ pipeline.push({
$addFields: { $addFields: {
[`sort_isNull_${key}`]: { $eq: [`$${key}`, null] } [`sort_isNull_${key}`]: { [key]: null }
} }
}) })
sort[`sort_isNull_${key}`] = options.sort[_key] === SortingOrder.Ascending ? 1 : -1 sort[`sort_isNull_${key}`] = options.sort[_key] === SortingOrder.Ascending ? 1 : -1