fix: allow deadline extension (#109)

* fix: enforce deadlines * fix: allow deadline extension
code4romania · Feb 29, 2024 · 472516c · 472516c
1 parent 46913ee
commit 472516c
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 22 deletions.
diff --git a/client/src/lib/reports.js b/client/src/lib/reports.js
@@ -0,0 +1,3 @@
+export function deadlineHasPassed(deadline) {
+  return new Date(deadline).setHours(23, 59, 59) < new Date().getTime();
+}
diff --git a/client/src/pages/Home/index.tsx b/client/src/pages/Home/index.tsx
@@ -8,15 +8,21 @@ import empty from "@/assets/empty.svg";
 import TableHeadReports from "@/components/index/TableHeadReports";
 import TableRowReport from "@/components/TableRowReport";
 import EmptyScreen from "@/components/EmptyScreen";
+import { deadlineHasPassed } from "@/lib/reports";
 
 const Home = () => {
   const user = useAppSelector((state) => state.userState.user);
-  const hasReports = !!user?.reports?.length;
+  const reports = user?.reports?.map((report) => ({
+    ...report,
+    finished: deadlineHasPassed(report.deadline) || report.finished
+  }));
+
+  const hasReports = !!reports?.length;
   const hasReportsInProgress = useMemo(
     () =>
       hasReports &&
-      user.reports.filter((report) => !report.finished).length > 0,
-    [hasReports, user?.reports]
+      reports.filter((report) => !report.finished).length > 0,
+    [hasReports, reports]
   );
 
   return (
@@ -57,7 +63,7 @@ const Home = () => {
                 <table className="min-w-full divide-y divide-gray-300">
                   <TableHeadReports />
                   <tbody className="divide-y divide-gray-200 bg-white">
-                    {user.reports?.map((report) => {
+                    {reports?.map((report) => {
                       return (
                         <TableRowReport
                           key={report.id}

diff --git a/client/src/pages/authenticated/Report/ReportInProgress.tsx b/client/src/pages/authenticated/Report/ReportInProgress.tsx
@@ -1,10 +1,14 @@
-import React, { useCallback, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import Button from "@/components/Button";
 import { DonutChart } from "react-circle-chart";
 import CreateEvaluation from "@/components/CreateEvaluation";
 import TableEvaluations from "@/components/TableEvaluations";
 import Confirm from "@/components/Confirm";
 import { useUpdateReportMutation } from "@/redux/api/userApi";
+import { ErrorMessage } from "@hookform/error-message";
+import { object, string, date, preprocess, array, TypeOf } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod/dist/zod";
+import { useForm } from "react-hook-form";
 
 const CallToAction = ({ reportId }: { reportId: number }) => {
   const [updateReport] = useUpdateReportMutation();
@@ -38,6 +42,35 @@ const ReportInProgress = ({ report }) => {
     [report?.evaluations]
   );
   const canFinish = evaluationsCompleted.length > 0;
+  const [editDeadline, setEditDeadline] = useState(false);
+
+  const [updateReport, { isSuccess }] = useUpdateReportMutation();
+  useEffect(() => {
+    if (isSuccess) {
+      setEditDeadline(false);
+    }
+  }, [isSuccess]);
+
+  const reportSchema = object({
+    deadline: preprocess((arg) => {
+      if (typeof arg == "string" || arg instanceof Date) return new Date(arg);
+    }, date().min(new Date(), { message: "Alegeti o data in viitor" })),
+  });
+
+  type ReportInput = TypeOf<typeof reportSchema>;
+
+  const { register, handleSubmit, formState } = useForm<ReportInput>({
+    resolver: zodResolver(reportSchema),
+  });
+
+  const today = new Date().toISOString().split('T')[0];
+
+  const onSubmitHandler = useCallback((form: ReportInput) => {
+    updateReport({
+      id: reportId,
+      deadline: form.deadline,
+    });
+  }, []);
 
   return (
     <div>
@@ -89,33 +122,59 @@ const ReportInProgress = ({ report }) => {
               Perioada de evaluare
             </div>
             <div className="flex mt-4 space-x-8">
-              {report.createdAt && (
-                <div>
-                  <div className="text-sm leading-5 font-medium">
-                    Data de început:
-                  </div>
-                  <div className="mt-2.5">
-                    {new Date(report.createdAt).toLocaleDateString("ro-RO", {
-                      month: "short",
-                      day: "numeric",
-                      year: "numeric",
-                    })}
-                  </div>
+              <div>
+                <div className="text-sm leading-5 font-medium">
+                  Data de început:
                 </div>
-              )}
-              {report.deadline && (
+                <div className="mt-2.5">
+                  {new Date(report.createdAt).toLocaleDateString("ro-RO", {
+                    month: "short",
+                    day: "numeric",
+                    year: "numeric",
+                  })}
+                </div>
+              </div>
+
+              {!editDeadline ? (
                 <div>
                   <div className="text-sm leading-5 font-medium">
                     Data de final:
                   </div>
+
                   <div className="mt-2.5">
-                    {new Date(report.deadline).toLocaleDateString("ro-RO", {
+                    <div>{new Date(report.deadline).toLocaleDateString("ro-RO", {
                       month: "short",
                       day: "numeric",
                       year: "numeric",
-                    })}
+                    })}</div>
+                    <button className="whitespace-nowrap text-sm font-medium text-teal-600 hover:underline mt-2" onClick={() => setEditDeadline(true)}>Editează</button>
                   </div>
                 </div>
+              ) : (
+                <form onSubmit={handleSubmit(onSubmitHandler)}>
+                  <div>
+                    <div className="text-sm leading-5 font-medium mb-1">
+                      Data de final:
+                    </div>
+                    <input
+                      type="date"
+                      className="border-gray-300 rounded-md"
+                      min={today}
+                      defaultValue={report.deadline}
+                      {...register('deadline')}
+                    />
+                    <div className="text-red-600 text-sm mt-1">
+                      <ErrorMessage name="deadline" errors={formState.errors} />
+                    </div>
+                  </div>
+
+                  <div className="flex space-x-4">
+                    <Button color="white" type={"reset"} onClick={()=>setEditDeadline(false)}>
+                      Renunță
+                    </Button>
+                    <Button type="submit">Salvează modificări</Button>
+                  </div>
+                </form>
               )}
             </div>
           </div>

diff --git a/server/src/api/evaluation/controllers/evaluation.js b/server/src/api/evaluation/controllers/evaluation.js
@@ -16,6 +16,7 @@ const sendMailToUserWhenEvaluationIsFinished = (to, data) =>
 
 const { createCoreController } = require("@strapi/strapi").factories;
 const { UnauthorizedError, ForbiddenError } = require("@strapi/utils").errors;
+const { deadlineHasPassed } = require("../../../helpers/reports");
 
 module.exports = createCoreController(
   "api::evaluation.evaluation",
@@ -33,7 +34,7 @@ module.exports = createCoreController(
       );
       const { report, email: userEmail, ...response } = data;
 
-      if (report.finished && !isFDSC) {
+      if ((report.finished || deadlineHasPassed(report.deadline)) && !isFDSC) {
         throw new UnauthorizedError(
           `Perioada de evaluare a luat sfarsit. Va rugam luati legatura cu organizatia ${report.user.ongName} pentru mai multe detalii.`
         );

diff --git a/server/src/api/report/controllers/report.js b/server/src/api/report/controllers/report.js
@@ -5,6 +5,7 @@
  */
 
 const { createCoreController } = require("@strapi/strapi").factories;
+const { deadlineHasPassed } = require("../../../helpers/reports");
 
 module.exports = createCoreController("api::report.report", ({ strapi }) => ({
   async create(ctx) {
@@ -32,6 +33,11 @@ module.exports = createCoreController("api::report.report", ({ strapi }) => ({
     const data = await strapi.entityService.findOne("api::report.report", id, {
       populate: ["evaluations.dimensions.quiz", "user"],
     });
+
+    if (deadlineHasPassed(data.deadline)) {
+      data.finished = true;
+    }
+
     return data;
   },
 }));
diff --git a/server/src/helpers/reports.js b/server/src/helpers/reports.js
@@ -0,0 +1,6 @@
+const deadlineHasPassed = (deadline) =>
+  new Date(deadline).setHours(23, 59, 59) < new Date().getTime();
+
+module.exports = {
+  deadlineHasPassed
+}