diff --git a/cms/src/routes/qualifying/[id]/+page.svelte b/cms/src/routes/qualifying/[id]/+page.svelte index 1fddcea..28cf70d 100644 --- a/cms/src/routes/qualifying/[id]/+page.svelte +++ b/cms/src/routes/qualifying/[id]/+page.svelte @@ -23,30 +23,6 @@ } return false; } - - function isRegistrationOpen() { - if (!data.register_startDate) return false; - const today = new Date().toISOString().slice(0, 10); - const startDate = data.register_startDate; - const endDate = data.register_endDate; - - if (endDate) { - return today >= startDate && today <= endDate; - } - return today >= startDate; - } - - function isRegistrationExpired() { - if (!data.register_endDate) return false; - const today = new Date().toISOString().slice(0, 10); - return today > data.register_endDate; - } - - function getRegistrationText() { - if (isRegistrationExpired()) return 'ดาวน์โหลดใบสมัคร'; - if (isRegistrationOpen()) return 'ใบสมัคร'; - return 'สมัครสอบ'; - }
@@ -120,9 +96,7 @@ {/each} {/if} {#if data.announcementExam && data.positions} -
- {getRegistrationText()} -
+
ใบสมัคร

@@ -148,7 +122,7 @@ target="_blank" > - {isRegistrationOpen() || isRegistrationExpired() ? 'ใบสมัคร' : ''} + ใบสมัคร {/if}
@@ -182,7 +156,7 @@ target="_blank" > - {isRegistrationOpen() || isRegistrationExpired() ? 'ใบสมัคร' : ''} + ใบสมัคร {/if}