Skip to content

30614 Add expiration date validation to edit #1583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eve-git merged 2 commits into from
Nov 27, 2025
Merged

30614 Add expiration date validation to edit #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f3f96
add expiration date validation to edit
eve-git Nov 26, 2025
d7ee04c
update
eve-git Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions app/components/ComboSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,14 @@ import {
} from '@headlessui/vue'
import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/20/solid'

const { options, multiple } = withDefaults(
defineProps<{
const { options, multiple, optionsDisplay = (option: any) => option} = defineProps<{
modelValue: any
options: ComputedRef<Array<any>>
/** Whether multiple options can be selected */
multiple?: boolean
/** Function called for getting the display string for a given option */
optionsDisplay?: (option: any) => string
}>(),
{
optionsDisplay: (option: any) => option,
}
)
}>()
Copy link
Collaborator Author

@eve-git eve-git Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the warning: withDefaults() is unnecessary when using destructure with defineProps().


const query = ref('')
const filteredOptions = computed(() =>
Expand Down
12 changes: 9 additions & 3 deletions app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,16 @@ function setDefaultInputValues() {
examine.addEditAction({
validate() {
let isValid = true
if (examine.expiryDate && !expiry.value) {
expiryDateErrorText.value = 'Expiry date is required'
isValid = false
if (examine.expiryDate) {
if (expiry.value) {
isValid = DateTime.fromISO(expiry.value).startOf('day') >= DateTime.now().startOf('day')
expiryDateErrorText.value = isValid ? '' : 'Expiry date must be today or later';
} else {
expiryDateErrorText.value = 'Expiry date is required'
isValid = false
}
}

if (consentFlag.value === ConsentFlag.Received && !consentDate.value) {
consentDateErrorText.value = 'Consent date is required'
isValid = false
Expand Down
11 changes: 5 additions & 6 deletions app/components/search/ResultsBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,13 @@
</td>
</tr>
</tbody>

<div
class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform"
>
<LoadingSpinner v-if="search.isLoading" />
</div>
</table>

<div v-if="search.isLoading"
class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
<LoadingSpinner />
</div>

<PopupDialog :show="showDateDialog">
Copy link
Collaborator Author

@eve-git eve-git Nov 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed the warning:

cannot be child of , according to HTML specifications. This can cause hydration errors or potentially disrupt future functionality.

<template #title>Choose a Date Range</template>
<SearchDateForm
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-examination",
"version": "1.2.45",
"version": "1.2.46",
"private": true,
"scripts": {
"build": "nuxt generate",
Expand Down
8 changes: 5 additions & 3 deletions app/pages/Stats.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@
<td>{{ item.furnished }}</td>
</tr>
</tbody>
<div class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
<LoadingSpinner v-if="isLoading" />
</div>
</table>
<div v-if="isLoading"
class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
<LoadingSpinner />
</div>

</div>
Copy link
Collaborator Author

@eve-git eve-git Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the warning:

cannot be child of , according to HTML specifications. This can cause hydration errors or potentially disrupt future functionality.

</div>
</template>
Expand Down
Loading