Merge branch 'main' of https://github.com/themoment-team/hello-gsm-front

into develop
themoment-team · Oct 13, 2022 · 9eec355 · 9eec355
2 parents 8a869c9 + 4d2eba3
commit 9eec355
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/packages/hello-gsm/src/PageContainer/CalculatorPage/index.tsx b/packages/hello-gsm/src/PageContainer/CalculatorPage/index.tsx
@@ -599,6 +599,9 @@ const CalculatorPage: NextPage<UserIdxType> = ({
                       {...register(`absentValue.${i}`, {
                         required: true,
                         valueAsNumber: true,
+                        validate: {
+                          nagativeNumber: value => !(value < 0),
+                        },
                       })}
                       type="number"
                       placeholder="입력"
@@ -613,6 +616,9 @@ const CalculatorPage: NextPage<UserIdxType> = ({
                       {...register(`attendanceValue.${i}`, {
                         required: true,
                         valueAsNumber: true,
+                        validate: {
+                          nagativeNumber: value => !(value < 0),
+                        },
                       })}
                       type="number"
                       placeholder="입력"
@@ -627,6 +633,9 @@ const CalculatorPage: NextPage<UserIdxType> = ({
                       {...register(`attendanceValue.${3 + i}`, {
                         required: true,
                         valueAsNumber: true,
+                        validate: {
+                          nagativeNumber: value => !(value < 0),
+                        },
                       })}
                       type="number"
                       placeholder="입력"
@@ -641,6 +650,9 @@ const CalculatorPage: NextPage<UserIdxType> = ({
                       {...register(`attendanceValue.${6 + i}`, {
                         required: true,
                         valueAsNumber: true,
+                        validate: {
+                          nagativeNumber: value => !(value < 0),
+                        },
                       })}
                       type="number"
                       placeholder="입력"
@@ -654,6 +666,9 @@ const CalculatorPage: NextPage<UserIdxType> = ({
                       {...register(`volunteerValue.${i}`, {
                         required: true,
                         valueAsNumber: true,
+                        validate: {
+                          nagativeNumber: value => !(value < 0),
+                        },
                       })}
                       type="number"
                       placeholder="입력"

diff --git a/packages/hello-gsm/src/PageContainer/GEDCalculatorPage/index.tsx b/packages/hello-gsm/src/PageContainer/GEDCalculatorPage/index.tsx
@@ -139,13 +139,19 @@ const GEDCalculatorPage: NextPage<UserIdxType> = ({
                 {...register('curriculumScoreSubtotal', {
                   valueAsNumber: true,
                   required: true,
+                  validate: {
+                    nagativeNumber: value => !(value < 0),
+                  },
                 })}
                 type="number"
               />
               <S.ScoreInput
                 {...register('nonCurriculumScoreSubtotal', {
                   valueAsNumber: true,
                   required: true,
+                  validate: {
+                    nagativeNumber: value => !(value < 0),
+                  },
                 })}
                 type="number"
               />

diff --git a/packages/hello-gsm/src/PageContainer/Test/GEDCalculatorPage/index.tsx b/packages/hello-gsm/src/PageContainer/Test/GEDCalculatorPage/index.tsx
@@ -55,13 +55,19 @@ const TestGEDCalculatorPage: NextPage = () => {
                 {...register('curriculumScoreSubtotal', {
                   valueAsNumber: true,
                   required: true,
+                  validate: {
+                    nagativeNumber: value => !(value < 0),
+                  },
                 })}
                 type="number"
               />
               <S.ScoreInput
                 {...register('nonCurriculumScoreSubtotal', {
                   valueAsNumber: true,
                   required: true,
+                  validate: {
+                    nagativeNumber: value => !(value < 0),
+                  },
                 })}
                 type="number"
               />

diff --git a/packages/hello-gsm/src/shared/acceptable.ts b/packages/hello-gsm/src/shared/acceptable.ts
@@ -1,6 +1,6 @@
 // 10월 17일 9시부터 10월 20일 17시 까지
-const acceptable = true;
-//   new Date() >= new Date('2022-10-17 9:00') &&
-//   new Date() <= new Date('2022-10-20 17:00');
+const acceptable =
+  new Date() >= new Date('2022-10-17 9:00') &&
+  new Date() <= new Date('2022-10-20 17:00');
 
 export default acceptable;