feat: implements survey-unsubmit-list page

skku-royals · Mar 14, 2024 · e1188f7 · e1188f7
1 parent dc4754f
commit e1188f7
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 32 deletions.
diff --git a/backend/prisma/seed.ts b/backend/prisma/seed.ts
@@ -5,7 +5,8 @@ import {
   AccountStatus,
   RosterStatus,
   RosterType,
-  ScheduleType
+  ScheduleType,
+  AttendanceLocation
 } from '@prisma/client'
 import { hash } from 'argon2'
 
@@ -268,29 +269,34 @@ const seedingDatabase = async () => {
     {
       scheduleId: 1,
       rosterId: 1,
-      response: 'Present'
+      response: 'Present',
+      location: AttendanceLocation.Seoul
     },
     {
       scheduleId: 1,
       rosterId: 2,
-      response: 'Present'
+      response: 'Present',
+      location: AttendanceLocation.Seoul
     },
     {
       scheduleId: 1,
       rosterId: 3,
-      response: 'Present'
+      response: 'Present',
+      location: AttendanceLocation.Seoul
     },
     {
       scheduleId: 1,
       rosterId: 5,
       response: 'Tardy',
-      reason: '수업'
+      reason: '수업',
+      location: AttendanceLocation.Suwon
     },
     {
       scheduleId: 1,
       rosterId: 6,
       response: 'Tardy',
-      reason: '수업'
+      reason: '수업',
+      location: AttendanceLocation.Suwon
     },
     {
       scheduleId: 1,
@@ -314,6 +320,33 @@ const seedingDatabase = async () => {
   await prisma.attendance.createMany({
     data: attendances
   })
+
+  const surveyTargets: Prisma.SurveyTargetCreateManyInput[] = [
+    {
+      surveyGroupId: 2,
+      rosterId: 1
+    },
+    {
+      surveyGroupId: 2,
+      rosterId: 2
+    },
+    {
+      surveyGroupId: 2,
+      rosterId: 3
+    },
+    {
+      surveyGroupId: 2,
+      rosterId: 4
+    },
+    {
+      surveyGroupId: 2,
+      rosterId: 5
+    }
+  ]
+
+  await prisma.surveyTarget.createMany({
+    data: surveyTargets
+  })
 }
 
 const main = async () => {

diff --git a/frontend/src/app/(public)/survey/_components/SurveyGroupCardSection.tsx b/frontend/src/app/(public)/survey/_components/SurveyGroupCardSection.tsx
@@ -25,6 +25,14 @@ export default async function SurveyGroupCardSection() {
     return <Badge color={BadgeColor.indigo} content="시작전" />
   }
 
+  const isClosedSurvey = (surveyGroup: SurveyGroupListItem) => {
+    const now = new Date()
+    return (
+      now <= new Date(surveyGroup.startedAt) ||
+      now >= new Date(surveyGroup.endedAt)
+    )
+  }
+
   return (
     <>
       <h1 className="text-xl font-bold">출석조사 목록</h1>
@@ -48,27 +56,27 @@ export default async function SurveyGroupCardSection() {
                     시작:{' '}
                     <LocalTime
                       utc={surveyGroup.startedAt}
-                      format="YYYY-MM-DD A HH:mm"
+                      format="YYYY-MM-DD ddd HH:mm"
                     />
                   </p>
                   <p>
                     마감:{' '}
                     <LocalTime
                       utc={surveyGroup.endedAt}
-                      format="YYYY-MM-DD A HH:mm"
+                      format="YYYY-MM-DD ddd HH:mm"
                     />
                   </p>
                 </div>
               </CardContent>
               <CardFooter>
-                <Link href={`/survey/${surveyGroup.id}`}>
-                  <Button
-                    disabled={
-                      new Date() <= new Date(surveyGroup.startedAt) ||
-                      new Date() >= new Date(surveyGroup.endedAt)
-                    }
-                    size="sm"
-                  >
+                <Link
+                  href={
+                    isClosedSurvey(surveyGroup)
+                      ? '#'
+                      : `/survey/${surveyGroup.id}`
+                  }
+                >
+                  <Button disabled={isClosedSurvey(surveyGroup)} size="sm">
                     제출하러가기
                   </Button>
                 </Link>

diff --git a/frontend/src/app/console/account/_component/UserListTable.tsx b/frontend/src/app/console/account/_component/UserListTable.tsx
@@ -7,10 +7,6 @@ import type { ColumnDef } from '@tanstack/react-table'
 
 export default function UserListTable({ users }: { users: UserListItem[] }) {
   const columns: ColumnDef<UserListItem>[] = [
-    {
-      accessorKey: 'id',
-      header: 'ID'
-    },
     {
       accessorKey: 'username',
       header: '아이디'
@@ -38,7 +34,7 @@ export default function UserListTable({ users }: { users: UserListItem[] }) {
         return (
           <LocalTime
             utc={row.getValue('lastLogin')}
-            format="YYYY-MM-DD A hh:mm:ss"
+            format="YYYY-MM-DD ddd HH:mm:ss"
           />
         )
       }

diff --git a/frontend/src/app/console/schedule/[id]/_components/AthleteAttendanceListTable.tsx b/frontend/src/app/console/schedule/[id]/_components/AthleteAttendanceListTable.tsx
@@ -2,7 +2,7 @@
 
 import Badge, { BadgeColor } from '@/components/Badge'
 import { DataTable } from '@/components/DataTable'
-import { AttendanceStatus, RosterType } from '@/lib/enums'
+import { AttendanceLocation, AttendanceStatus, RosterType } from '@/lib/enums'
 import type { AttendanceListItem } from '@/lib/types/attendance'
 import type { RosterListItem } from '@/lib/types/roster'
 import type { ColumnDef } from '@tanstack/react-table'
@@ -39,6 +39,19 @@ export default function AthleteAttendanceListTable({
     }
   }
 
+  const renderAttendanceLocation = (attendance: AttendanceListItem) => {
+    if (attendance.response === AttendanceStatus.Absence) return
+
+    switch (attendance.location) {
+      case AttendanceLocation.Seoul:
+        return <Badge color={BadgeColor.purple} content="명륜" />
+      case AttendanceLocation.Suwon:
+        return <Badge color={BadgeColor.indigo} content="율전" />
+      default:
+        return <Badge color={BadgeColor.gray} content="통합" />
+    }
+  }
+
   const renderAthleteType = (roster: RosterListItem) => {
     if (roster.registerYear === new Date().getFullYear()) {
       return <Badge color={BadgeColor.yellow} content="신입생" />
@@ -47,10 +60,6 @@ export default function AthleteAttendanceListTable({
   }
 
   const columns: ColumnDef<AttendanceListItem>[] = [
-    {
-      accessorKey: 'id',
-      header: 'ID'
-    },
     {
       id: 'rosterProfile',
       header: '이름',
@@ -92,6 +101,15 @@ export default function AthleteAttendanceListTable({
         return renderAthletePosition(attendance.Roster)
       }
     },
+    {
+      accessorKey: 'location',
+      header: '위치',
+      cell: ({ row }) => {
+        const attendance = row.original
+
+        return renderAttendanceLocation(attendance)
+      }
+    },
     {
       id: 'type',
       header: '구분',
@@ -112,7 +130,7 @@ export default function AthleteAttendanceListTable({
     },
     {
       accessorKey: 'reason',
-      header: '불참사유'
+      header: '사유'
     }
   ]
 

diff --git a/frontend/src/app/console/schedule/[id]/page.tsx b/frontend/src/app/console/schedule/[id]/page.tsx
@@ -31,8 +31,6 @@ export default async function AttendanceStatisticPage({
     searchTerm
   )
 
-  console.log(attendanceList)
-
   return (
     <main className="mx-auto flex w-full flex-grow flex-col items-center justify-start">
       <div className="mt-4 flex w-full items-center justify-between px-4 text-left sm:px-6">

diff --git a/frontend/src/app/console/survey/[id]/unsubmit/_components/SurveyUnsubmitListTable.tsx b/frontend/src/app/console/survey/[id]/unsubmit/_components/SurveyUnsubmitListTable.tsx
@@ -0,0 +1,22 @@
+import { DataTable } from '@/components/DataTable'
+import type { UnsubmitRosterListItem } from '@/lib/types/roster'
+import type { ColumnDef } from '@tanstack/react-table'
+
+export default function SurveyUnsubmitListTable({
+  rosters
+}: {
+  rosters: UnsubmitRosterListItem[]
+}) {
+  const columns: ColumnDef<UnsubmitRosterListItem>[] = [
+    {
+      accessorKey: 'name',
+      header: '이름'
+    },
+    {
+      accessorKey: 'admissionYear',
+      header: '학번'
+    }
+  ]
+
+  return <DataTable columns={columns} data={rosters} />
+}
diff --git a/frontend/src/app/console/survey/[id]/unsubmit/page.tsx b/frontend/src/app/console/survey/[id]/unsubmit/page.tsx
@@ -0,0 +1,28 @@
+import { Button } from '@/components/ui/button'
+import { getSurveyUnsubmits } from '@/lib/actions'
+import Link from 'next/link'
+import SurveyUnsubmitListTable from './_components/SurveyUnsubmitListTable'
+
+export default async function SurveyUnsubmitPage({
+  params
+}: {
+  params: {
+    id: number
+  }
+}) {
+  const surveyUnsubmitList = await getSurveyUnsubmits(params.id)
+
+  return (
+    <main className="mx-auto flex w-full flex-grow flex-col items-center justify-start">
+      <div className="mt-4 flex w-full items-center justify-between px-4 text-left sm:px-6">
+        <h1 className="text-base font-bold sm:text-xl">미응답자 명단</h1>
+        <Link href="/console/survey">
+          <Button variant="outline">목록으로</Button>
+        </Link>
+      </div>
+      <div className="flex w-full flex-grow flex-col gap-5 py-4 sm:px-6">
+        <SurveyUnsubmitListTable rosters={surveyUnsubmitList.rosters} />
+      </div>
+    </main>
+  )
+}
diff --git a/frontend/src/app/console/survey/_components/SurveyGroupListTable.tsx b/frontend/src/app/console/survey/_components/SurveyGroupListTable.tsx
@@ -15,6 +15,7 @@ import {
 import type { SurveyGroupListItem } from '@/lib/types/survey'
 import type { ColumnDef } from '@tanstack/react-table'
 import { MoreHorizontal } from 'lucide-react'
+import Link from 'next/link'
 import { useState } from 'react'
 import DeleteSurveyGroupForm from './DeleteSurveyGroupForm'
 import UpdateSurveyGroupForm from './UpdateSurveyGroupForm'
@@ -85,7 +86,7 @@ export default function SurveyGroupListTable({
       cell: ({ row }) => {
         return (
           <LocalTime
-            format="YYYY-MM-DD A hh:mm:ss"
+            format="YYYY-MM-DD ddd hh:mm:ss"
             utc={row.getValue('startedAt')}
           />
         )
@@ -97,7 +98,7 @@ export default function SurveyGroupListTable({
       cell: ({ row }) => {
         return (
           <LocalTime
-            format="YYYY-MM-DD A hh:mm:ss"
+            format="YYYY-MM-DD ddd hh:mm:ss"
             utc={row.getValue('endedAt')}
           />
         )
@@ -127,6 +128,12 @@ export default function SurveyGroupListTable({
             <DropdownMenuContent align="end">
               <DropdownMenuLabel>메뉴</DropdownMenuLabel>
               <DropdownMenuSeparator />
+              <DropdownMenuItem>
+                <Link href={`/console/survey/${surveyGroup.id}/unsubmit`}>
+                  미응답자 확인
+                </Link>
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
               <DropdownMenuItem onClick={() => handleUpdateClick(surveyGroup)}>
                 수정
               </DropdownMenuItem>

diff --git a/frontend/src/lib/actions.ts b/frontend/src/lib/actions.ts
@@ -8,7 +8,8 @@ import type { ScheduleList, ScheduleListItem } from './types/schedule'
 import type {
   SurveyGroupList,
   SurveyGroupListItem,
-  SurveyGroupWithSchedules
+  SurveyGroupWithSchedules,
+  SurveyUnsubmitList
 } from './types/survey'
 import type { UserList, UserProfile } from './types/user'
 import { PAGINATION_LIMIT_DEFAULT } from './vars'
@@ -73,3 +74,9 @@ export const getAttendances = async (
     `/attendances?scheduleId=${scheduleId}&page=${page}&rosterType=${rosterType}&searchTerm=${searchTerm}&limit=${PAGINATION_LIMIT_DEFAULT}`
   )
 }
+
+export const getSurveyUnsubmits = async (surveyGroupId: number) => {
+  return await fetcher.get<SurveyUnsubmitList>(
+    `/surveys/groups/${surveyGroupId}/unsubmits`
+  )
+}
diff --git a/frontend/src/lib/types/roster.ts b/frontend/src/lib/types/roster.ts
@@ -37,3 +37,9 @@ export interface RosterList {
   total: number
   rosters: RosterListItem[]
 }
+
+export interface UnsubmitRosterListItem {
+  name: string
+  admissionYear: number
+  profileImageUrl?: string
+}
diff --git a/frontend/src/lib/types/survey.ts b/frontend/src/lib/types/survey.ts
@@ -1,3 +1,4 @@
+import type { UnsubmitRosterListItem } from './roster'
 import type { Schedule } from './schedule'
 
 type SurveyGroupBasic = {
@@ -19,3 +20,7 @@ export interface SurveyGroupWithSchedules {
   surveyGroup: SurveyGroupBasic
   schedules: Schedule[]
 }
+
+export interface SurveyUnsubmitList {
+  rosters: UnsubmitRosterListItem[]
+}