Skip to content

Commit 6a0a5fe

Browse files
authored
Merge pull request #87 from INU-Software-Design/feature/student-parent-page
โฌ†๏ธ update : ํ”ผ๋“œ๋ฐฑ ์ถ”๊ฐ€
2 parents 057a1c4 + 52ac2f5 commit 6a0a5fe

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

โ€Žsrc/components/shared/Header.tsxโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ export const Header = ({ children }: { children: ReactNode }) => {
8787
includeAttendance: selectedReports.includes("์ถœ๊ฒฐ"),
8888
includeCounseling: selectedReports.includes("์ƒ๋‹ด"),
8989
includeBehavior: selectedReports.includes("ํ–‰๋™"),
90-
startDate: "2025-03-01",
91-
endDate: "2025-06-04",
90+
includeFeedback: selectedReports.includes("ํ”ผ๋“œ๋ฐฑ"),
9291
},
9392
{
9493
headers: { Authorization: `Bearer ${accessToken}` },
@@ -147,8 +146,9 @@ export const Header = ({ children }: { children: ReactNode }) => {
147146
className="absolute w-[400px] h-[400px] bg-white z-50 p-6 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-base rounded-lg shadow-lg flex flex-col"
148147
>
149148
<p className="text-[#333333] text-2xl mb-4">๋‹ค์šด๋กœ๋“œ ๋ฐ›์„ ๋ณด๊ณ ์„œ๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”</p>
149+
<p className="text-[#333333] text-base mb-4">์ „์ฒด ๋ฏธ์„ ํƒ ํ›„ ๋‹ค์šด๋กœ๋“œ ํด๋ฆญ ์‹œ ํ•™์  ๋ฐ์ดํ„ฐ๋งŒ ๋‹ค์šด๋กœ๋“œ</p>
150150

151-
{["์„ฑ์ ", "์ถœ๊ฒฐ", "์ƒ๋‹ด", "ํ–‰๋™"].map((label) => (
151+
{["์„ฑ์ ", "์ถœ๊ฒฐ", "์ƒ๋‹ด", "ํ–‰๋™", "ํ”ผ๋“œ๋ฐฑ"].map((label) => (
152152
<label key={label} className="flex items-center gap-2 mb-4">
153153
<input
154154
type="checkbox"

โ€Žsrc/components/shared/StudentHeader.tsxโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ export const StudentHeader = ({ children }: { children: ReactNode }) => {
9595
includeAttendance: selectedReports.includes("์ถœ๊ฒฐ"),
9696
includeCounseling: selectedReports.includes("์ƒ๋‹ด"),
9797
includeBehavior: selectedReports.includes("ํ–‰๋™"),
98-
startDate: "2025-03-01",
99-
endDate: "2025-06-04",
98+
includeFeedback: selectedReports.includes("ํ”ผ๋“œ๋ฐฑ"),
10099
},
101100
{
102101
headers: { Authorization: `Bearer ${accessToken}` },
@@ -157,9 +156,10 @@ export const StudentHeader = ({ children }: { children: ReactNode }) => {
157156
onClick={(e) => e.stopPropagation()}
158157
className="absolute w-[400px] h-[400px] bg-white z-50 p-6 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-base rounded-lg shadow-lg flex flex-col"
159158
>
160-
<p className="text-[#333333] text-2xl mb-4">๋‹ค์šด๋กœ๋“œ ๋ฐ›์„ ๋ณด๊ณ ์„œ๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”</p>
159+
<p className="text-[#333333] text-2xl">๋‹ค์šด๋กœ๋“œ ๋ฐ›์„ ๋ณด๊ณ ์„œ๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”</p>
160+
<p className="text-[#333333] text-base mb-4">์ „์ฒด ๋ฏธ์„ ํƒ ํ›„ ๋‹ค์šด๋กœ๋“œ ํด๋ฆญ ์‹œ ํ•™์  ๋ฐ์ดํ„ฐ๋งŒ ๋‹ค์šด๋กœ๋“œ</p>
161161

162-
{["์„ฑ์ ", "์ถœ๊ฒฐ", "์ƒ๋‹ด", "ํ–‰๋™"].map((label) => (
162+
{["์„ฑ์ ", "์ถœ๊ฒฐ", "์ƒ๋‹ด", "ํ–‰๋™", "ํ”ผ๋“œ๋ฐฑ"].map((label) => (
163163
<label key={label} className="flex items-center gap-2 mb-4">
164164
<input
165165
type="checkbox"

0 commit comments

Comments
ย (0)