diff --git a/src/app.html b/src/app.html index effe0d0..9613bd5 100644 --- a/src/app.html +++ b/src/app.html @@ -6,7 +6,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/lib/components/svelte/navbar/BottomNavBar.svelte b/src/lib/components/svelte/navbar/BottomNavBar.svelte index 06fc9db..1c4eee6 100644 --- a/src/lib/components/svelte/navbar/BottomNavBar.svelte +++ b/src/lib/components/svelte/navbar/BottomNavBar.svelte @@ -11,39 +11,43 @@ const handleRouteChange = (route: string) => { currentRoute.set(route); - goto(route); + // goto(route); };
- - - - +
diff --git a/src/lib/server/routes/donationHistory.ts b/src/lib/server/routes/donationHistory.ts index 0e7fae7..8bf700f 100644 --- a/src/lib/server/routes/donationHistory.ts +++ b/src/lib/server/routes/donationHistory.ts @@ -59,6 +59,17 @@ export const donationHistoryRouter = createRouter({ Reservation: true } }); + + await prisma.donators.update({ + where: { + id: reservation.donator_id + }, + data: { + reward_point: { + increment: data.rewarded_points + } + } + }); return donationHistory; }), getAllDonationHistoryByDonatorId: publicProcedure diff --git a/src/lib/server/routes/donationHistoryRouter.ts b/src/lib/server/routes/donationHistoryRouter.ts index e42e018..eeb27f8 100644 --- a/src/lib/server/routes/donationHistoryRouter.ts +++ b/src/lib/server/routes/donationHistoryRouter.ts @@ -55,6 +55,18 @@ export const donationHistoryRouter = createRouter({ Reservation: true } }); + + await prisma.donators.update({ + where: { + id: reservation.donator_id + }, + data: { + reward_point: { + increment: data.rewarded_points + } + } + }); + return donationHistory; }), getAllDonationHistoryByDonatorId: publicProcedure diff --git a/src/lib/server/routes/rewardRouter.ts b/src/lib/server/routes/rewardRouter.ts index 6302f47..970e25f 100644 --- a/src/lib/server/routes/rewardRouter.ts +++ b/src/lib/server/routes/rewardRouter.ts @@ -81,7 +81,7 @@ export const rewardRouter = createRouter({ name: newData.name, description: newData.description, required_points: newData.required_points, - amount_left: newData.required_points, + amount_left: newData.amount_left, image_src: newData.image_src } }); diff --git a/src/lib/server/routes/specialEventRouter.ts b/src/lib/server/routes/specialEventRouter.ts index a56da60..a172aff 100644 --- a/src/lib/server/routes/specialEventRouter.ts +++ b/src/lib/server/routes/specialEventRouter.ts @@ -67,6 +67,11 @@ export const specialEventRouter = createRouter({ return sp_event; }), + getEvents: publicProcedure.query(async () => { + const sp_events = await prisma.special_Events.findMany(); + return sp_events; + }), + isEvent: publicProcedure.query(async ({ ctx }) => { const sessionToken = ctx.sessionToken; const session = await prisma.session.findUnique({ diff --git a/src/routes/(donator)/history/+page.server.ts b/src/routes/(donator)/history/+page.server.ts index 30bdcc6..422077c 100644 --- a/src/routes/(donator)/history/+page.server.ts +++ b/src/routes/(donator)/history/+page.server.ts @@ -14,11 +14,14 @@ export const load = (async ({ fetch }) => { throw redirect(307, '/login'); } - const reservationLog = await trpc.reservationSlot.getLog.query(); - const donationHistoryData = await trpc.donationHistory.getDonationHistories.query(); - const pendingFeedback = await trpc.postFeedback.checkPendingFeedback.query({ - id: userContext.user.id - }); + // promise all + const [reservationLog, donationHistoryData, pendingFeedback] = await Promise.all([ + trpc.reservationSlot.getLog.query(), + trpc.donationHistory.getDonationHistories.query(), + trpc.postFeedback.checkPendingFeedback.query({ + id: userContext.user.id + }) + ]); console.log(pendingFeedback); diff --git a/src/routes/(donator)/history/donation/[donationId]/survey/+page.server.ts b/src/routes/(donator)/history/donation/[donationId]/survey/+page.server.ts index 081f2c1..21097c6 100644 --- a/src/routes/(donator)/history/donation/[donationId]/survey/+page.server.ts +++ b/src/routes/(donator)/history/donation/[donationId]/survey/+page.server.ts @@ -7,9 +7,13 @@ export const load = (async ({ params, fetch }) => { const trpc = trpcOnServer(fetch); - const donationHistory = await trpc.donationHistory.getDonationHistory.query({ - id: donationHistoryId - }); + // promise all + const [donationHistory, questions] = await Promise.all([ + trpc.donationHistory.getDonationHistory.query({ + id: donationHistoryId + }), + trpc.postFeedback.getPostFeedbackQuestions.query() + ]); if (!donationHistory) { throw redirect(307, '/history'); @@ -21,7 +25,6 @@ export const load = (async ({ params, fetch }) => { } const place = donationHistory?.Reservation.Reservation_Slot.Place; - const questions = await trpc.postFeedback.getPostFeedbackQuestions.query(); return { donationHistoryId: params.donationId, diff --git a/src/routes/(donator)/home/+page.server.ts b/src/routes/(donator)/home/+page.server.ts index 2ae3834..ad8c98d 100644 --- a/src/routes/(donator)/home/+page.server.ts +++ b/src/routes/(donator)/home/+page.server.ts @@ -4,7 +4,12 @@ import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const user = await trpc.auth.getUser.query(); + + const [user, announcements, sp_events] = await Promise.all([ + trpc.auth.getUser.query(), + trpc.announcement.getAnnouncements.query(), + trpc.specialEvent.getEvents.query() + ]); if (user?.type !== 'DONATOR') { throw redirect(307, '/login'); @@ -13,14 +18,15 @@ export const load: PageServerLoad = async ({ fetch }) => { if (user.user?.id === undefined) { throw redirect(307, '/login'); } - - // fetch announcemnet - const announcements = await trpc.announcement.getAnnouncements.query(); - // fetch for post feedback status const pendingFeedback = await trpc.postFeedback.checkPendingFeedback.query({ id: user.user.id }); - return { announcements, user: user.user, pendingFeedback: pendingFeedback ?? undefined }; + return { + announcements, + user: user.user, + pendingFeedback: pendingFeedback ?? undefined, + sp_events + }; }; diff --git a/src/routes/(donator)/home/+page.svelte b/src/routes/(donator)/home/+page.svelte index c97e5ab..2f28397 100644 --- a/src/routes/(donator)/home/+page.svelte +++ b/src/routes/(donator)/home/+page.svelte @@ -41,7 +41,7 @@ {/if}
- +
diff --git a/src/routes/(donator)/home/SpecialEventHero.svelte b/src/routes/(donator)/home/SpecialEventHero.svelte index d7f1e7e..655bd48 100644 --- a/src/routes/(donator)/home/SpecialEventHero.svelte +++ b/src/routes/(donator)/home/SpecialEventHero.svelte @@ -5,26 +5,11 @@ import specialEventMockImage from '$lib/images/home/special_event_banner.png'; interface Poster { - img: string; - href: string; + img_src: string | null; } - const mock_data: Poster[] = [ - { - img: '/images/mock_carousel.png', - href: 'www.google.com' - }, - { - img: '/images/mock_carousel.png', - href: 'www.google.com' - }, - { - img: '/images/mock_carousel.png', - href: 'www.google.com' - } - ]; - $: selectID = $page.url.hash; + export let sp_events: Poster[] = [];
@@ -34,21 +19,23 @@
- {#each mock_data as poster, key} - + {#each sp_events as poster, key} + {#if poster.img_src} + + {/if} {/each}
- {#each mock_data as _, key} + {#each sp_events as _, key} { - // fetch hospital - const hospital = await prisma.places.findMany({ - where: { - deleted_at: null - } - }); - - const reviews = await prisma.place_Review_History.groupBy({ - by: ['place_id'], - _sum: { - rating: true - }, - _count: { - id: true - } - }); + const [hospital, reviews] = await Promise.all([ + prisma.places.findMany({ + where: { + deleted_at: null + } + }), + prisma.place_Review_History.groupBy({ + by: ['place_id'], + _sum: { + rating: true + }, + _count: { + id: true + } + }) + ]); const hospitalWithReviews: HospitalWithReviews[] = hospital.map((hospital) => { const review = reviews.find((review) => review.place_id === hospital.id); diff --git a/src/routes/(donator)/reservation/[placeId]/confirm/+page.server.ts b/src/routes/(donator)/reservation/[placeId]/confirm/+page.server.ts index 58e9a41..87febdb 100644 --- a/src/routes/(donator)/reservation/[placeId]/confirm/+page.server.ts +++ b/src/routes/(donator)/reservation/[placeId]/confirm/+page.server.ts @@ -1,6 +1,5 @@ import { redirect } from '@sveltejs/kit'; import type { PageServerLoad } from './$types'; -import { mock_hospitalData } from '../utils'; import { get24HoursTimeString } from '../date/utils'; import { trpcOnServer } from '$lib/trpc'; import reservationController from '$lib/server/database/controllers/reservationController'; @@ -21,14 +20,11 @@ export const load = (async ({ url, params, fetch }) => { const selectedDate = new Date(+date); - // check for valid available dates - const hospital = await trpcServer.places.findById.query({ placeId: placeId }); - if (!hospital) { - throw redirect(307, `/reservation`); - } - - // get available dates - const availableDates = await reservationController.getAvailbleTimeSlots(placeId, selectedDate); + // promise all + const [hospital, availableDates] = await Promise.all([ + trpcServer.places.findById.query({ placeId: placeId }), + reservationController.getAvailbleTimeSlots(placeId, selectedDate) + ]); const filteredByDate = availableDates.find((d) => { // check date only diff --git a/src/routes/(donator)/reservation/[placeId]/date/+page.server.ts b/src/routes/(donator)/reservation/[placeId]/date/+page.server.ts index 1085580..7e57e16 100644 --- a/src/routes/(donator)/reservation/[placeId]/date/+page.server.ts +++ b/src/routes/(donator)/reservation/[placeId]/date/+page.server.ts @@ -9,12 +9,27 @@ import type { PageServerLoad } from './$types'; import { checkEquivalenceDate, get24HoursTimeString } from './utils'; export const load = (async ({ params }) => { + const { placeId } = params; + + const [hospital, alreadyReserved] = await Promise.all([ + prisma.places.findUnique({ + where: { + id: placeId + } + }), + prisma.reservation_Slots.findMany({ + where: { + Place: { + id: placeId + }, + reserve_date: { + gt: new Date() + } + } + }) + ]); + // check if placeId exists or not - const hospital = await prisma.places.findUnique({ - where: { - id: params.placeId - } - }); if (!hospital) { throw { @@ -23,19 +38,6 @@ export const load = (async ({ params }) => { }; } - const { placeId } = params; - - const alreadyReserved = await prisma.reservation_Slots.findMany({ - where: { - Place: { - id: placeId - }, - reserve_date: { - gt: new Date() - } - } - }); - const availableDates = getDatesFrom(new Date(), 14).map((date) => ({ date, periods: DEFAULT_TIME_SLOT.map((time) => ({ @@ -56,8 +58,5 @@ export const load = (async ({ params }) => { availableDates }; - // mock get hospital data from database - // const hospitalData: HospitalAvailability = mock_hospitalData(placeId); - return { hospitalData: hospitalAvailability }; }) satisfies PageServerLoad; diff --git a/src/routes/(donator)/reservation/survey/start/+page.server.ts b/src/routes/(donator)/reservation/survey/start/+page.server.ts index 7ab9b0d..7850b6f 100644 --- a/src/routes/(donator)/reservation/survey/start/+page.server.ts +++ b/src/routes/(donator)/reservation/survey/start/+page.server.ts @@ -19,7 +19,8 @@ export const load = (async () => { Survey_Choices: true } }); - const preSurveyQuestion = await surveyQuestion + + const preSurveyQuestion = surveyQuestion .filter((question) => question.type === 'PRE_SURVEY') .sort((q1, q2) => q1.order - q2.order) .map((questions) => ({ diff --git a/src/routes/(donator)/reward/+page.server.ts b/src/routes/(donator)/reward/+page.server.ts index 1ec1ae8..7514e30 100644 --- a/src/routes/(donator)/reward/+page.server.ts +++ b/src/routes/(donator)/reward/+page.server.ts @@ -4,8 +4,12 @@ import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const rewards = await trpc.reward.getAllRewards.query(); - const currentUser = await trpc.auth.getUser.query(); + + const [rewards, currentUser] = await Promise.all([ + trpc.reward.getAllRewards.query(), + trpc.auth.getUser.query() + ]); + const donator = await trpc.donators.findById.query({ donatorId: currentUser?.user.id || '' }); if (currentUser?.type !== 'DONATOR') { diff --git a/src/routes/(donator)/reward/history/[redeemId]/+page.server.ts b/src/routes/(donator)/reward/history/[redeemId]/+page.server.ts index 5c06133..f975907 100644 --- a/src/routes/(donator)/reward/history/[redeemId]/+page.server.ts +++ b/src/routes/(donator)/reward/history/[redeemId]/+page.server.ts @@ -3,6 +3,7 @@ import type { PageServerLoad } from './$types'; export const load = (async ({ params, fetch }) => { const trpc = trpcOnServer(fetch); + const redemptionHistory = await trpc.reward.getRedemptionHistoryById.query({ redemptionHistoryId: params.redeemId }); diff --git a/src/routes/moderator/home/+page.server.ts b/src/routes/moderator/home/+page.server.ts index 5668cc7..279982d 100644 --- a/src/routes/moderator/home/+page.server.ts +++ b/src/routes/moderator/home/+page.server.ts @@ -23,21 +23,25 @@ function groupDatesByDay(dateArray: Date[]): Record { export const load = (async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const places = await trpc.places.findAll.query(); - const medicalAccounts = await trpc.medicalStaff.findAll.query(); - const donators = await trpc.donators.findAll.query(); - - // Prisma Group by - const bloodTypeAggregations = await prisma.donation_History.groupBy({ - by: ['blood_type'], - _count: { - blood_type: true - } - }); // Sample array of date objects const dateArray: Date[] = []; - const donationHistories = await prisma.donation_History.findMany(); + + // promise all + const [places, medicalAccounts, donators, bloodTypeAggregations, donationHistories] = + await Promise.all([ + trpc.places.findAll.query(), + trpc.medicalStaff.findAll.query(), + trpc.donators.findAll.query(), + prisma.donation_History.groupBy({ + by: ['blood_type'], + _count: { + blood_type: true + } + }), + prisma.donation_History.findMany() + ]); + for (const data of donationHistories) { dateArray.push(new Date(data.created_at)); } diff --git a/src/routes/moderator/manage/staff/+page.server.ts b/src/routes/moderator/manage/staff/+page.server.ts index 8ca19a2..c623c77 100644 --- a/src/routes/moderator/manage/staff/+page.server.ts +++ b/src/routes/moderator/manage/staff/+page.server.ts @@ -3,8 +3,12 @@ import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const places = await trpc.places.findAll.query(); - const medicalAccounts = await trpc.medicalStaff.findAll.query(); + + const [places, medicalAccounts] = await Promise.all([ + trpc.places.findAll.query(), + trpc.medicalStaff.findAll.query() + ]); + return { places, medicalAccounts diff --git a/src/routes/staff/home/+page.server.ts b/src/routes/staff/home/+page.server.ts index 6cbecde..608c67f 100644 --- a/src/routes/staff/home/+page.server.ts +++ b/src/routes/staff/home/+page.server.ts @@ -23,14 +23,35 @@ function groupDatesByDay(dateArray: Date[]): Record { export const load = (async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const places = await trpc.places.findAll.query(); - const medicalAccounts = await trpc.medicalStaff.findAll.query(); - const donators = await trpc.donators.findAll.query(); - const currentUser = await trpc.auth.getUser.query(); + + const [ + places, + medicalAccounts, + donators, + currentUser, + reservations, + bloodTypeAggregations, + donationHistories, + specialEvent + ] = await Promise.all([ + trpc.places.findAll.query(), + trpc.medicalStaff.findAll.query(), + trpc.donators.findAll.query(), + trpc.auth.getUser.query(), + trpc.reservation.findAll.query(), + prisma.donation_History.groupBy({ + by: ['blood_type'], + _count: { + blood_type: true + } + }), + prisma.donation_History.findMany(), + trpc.specialEvent.getEvent.query() + ]); + const currentStaff = await trpc.medicalStaff.findById.query({ medicalStaffId: currentUser?.user.id || '' }); - const reservations = await trpc.reservation.findAll.query(); const allReservation = []; for (const reservation of reservations) { if (reservation.Reservation_Slot.place_id === currentStaff?.Place.id) { @@ -38,17 +59,8 @@ export const load = (async ({ fetch }) => { } } - // Prisma Group by - const bloodTypeAggregations = await prisma.donation_History.groupBy({ - by: ['blood_type'], - _count: { - blood_type: true - } - }); - // Sample array of date objects const dateArray: Date[] = []; - const donationHistories = await prisma.donation_History.findMany(); for (const data of donationHistories) { dateArray.push(new Date(data.created_at)); } @@ -73,8 +85,6 @@ export const load = (async ({ fetch }) => { }); } - const specialEvent = await trpc.specialEvent.getEvent.query(); - return { places, medicalAccounts, diff --git a/src/routes/staff/manage/reservation/+page.server.ts b/src/routes/staff/manage/reservation/+page.server.ts index b9478cd..9796d12 100644 --- a/src/routes/staff/manage/reservation/+page.server.ts +++ b/src/routes/staff/manage/reservation/+page.server.ts @@ -3,11 +3,15 @@ import type { PageServerLoad } from '../reward/$types'; export const load = (async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const user = await trpc.auth.getUser.query(); + + const [user, allReservation] = await Promise.all([ + trpc.auth.getUser.query(), + trpc.reservation.findAll.query() + ]); + const medicalAccount = await trpc.medicalStaff.findById.query({ medicalStaffId: user?.user.id || '' }); - const allReservation = await trpc.reservation.findAll.query(); const placeReservations = []; for (const reservation of allReservation) { if (reservation.Reservation_Slot.place_id === medicalAccount?.Place.id) { diff --git a/src/routes/staff/manage/reservation/+page.svelte b/src/routes/staff/manage/reservation/+page.svelte index 1ecd9dd..ef427ef 100644 --- a/src/routes/staff/manage/reservation/+page.svelte +++ b/src/routes/staff/manage/reservation/+page.svelte @@ -104,8 +104,8 @@ }; -
-
+
+

BLOODPROMPT

@@ -204,7 +204,7 @@
ค้นหา
-
+
diff --git a/src/routes/staff/manage/reward/+page.server.ts b/src/routes/staff/manage/reward/+page.server.ts index d6c8c79..da3ca07 100644 --- a/src/routes/staff/manage/reward/+page.server.ts +++ b/src/routes/staff/manage/reward/+page.server.ts @@ -2,12 +2,16 @@ import { trpcOnServer } from '$lib/trpc'; import type { PageServerLoad } from './$types'; export const load = (async ({ fetch }) => { const trpc = trpcOnServer(fetch); - const user = await trpc.auth.getUser.query(); + + const [user, rewards] = await Promise.all([ + trpc.auth.getUser.query(), + trpc.reward.getAllRewards.query() + ]); + const medicalStaff = await trpc.medicalStaff.findById.query({ medicalStaffId: user?.user.id || ' ' }); - const rewards = await trpc.reward.getAllRewards.query(); - let filteredRewards = (await rewards).filter((reward) => { + let filteredRewards = rewards.filter((reward) => { return reward.deleted_at === null; }); filteredRewards = filteredRewards.filter((reward) => reward.place_id === medicalStaff?.Place.id); diff --git a/src/routes/staff/manage/reward/[id]/edit/+page.svelte b/src/routes/staff/manage/reward/[id]/edit/+page.svelte index 11f1672..1f3a161 100644 --- a/src/routes/staff/manage/reward/[id]/edit/+page.svelte +++ b/src/routes/staff/manage/reward/[id]/edit/+page.svelte @@ -1,68 +1,59 @@
@@ -75,36 +66,26 @@
- + - { + if (browser) { + goto('/staff/manage/announcement') + }}} + >จัดการประกาศประชาสัมพันธ์ + on:click={()=>{ + if (browser) { + goto('/staff/manage/reservation') + }}} + >การจองคิว ออกจากระบบ
@@ -156,11 +133,7 @@
{ - if (browser) { - goto('/staff/login'); - } - }} + on:click={handleLogout} > ออกจากระบบ
@@ -253,7 +226,7 @@ />