feat/CIA-1478: Update

dsm-cefet-rj · Dec 5, 2023 · 42e6cbd · 42e6cbd
1 parent 78e3f07
commit 42e6cbd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 71 deletions.
diff --git a/frontend/src/pages/Students/StudentsProfile.jsx b/frontend/src/pages/Students/StudentsProfile.jsx
@@ -68,32 +68,23 @@ const StudentsProfile = () => {
                   Aulas Marcadas
                 </h3>
               </div>
-              {/* <div>
+              <div>
                 <ul className="pt-4 md:p-5">
-                  {db.appointments.map((appointment) =>
-                    appointment.studentId == studentId ? (
-                      <li
-                        key={appointment.id}
-                        className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]"
-                      >
-                        <div>
-                          <span className="text-irisBlueColor text-[15px] leading-6 font-semibold">
-                            Data - Horário: {formatarData(appointment.date)}
-                          </span>
-                          <p className="text-[15px] leading-6 font-medium text-textColor">
-                            <strong>Professor: </strong>{" "}
-                            {teacherIdToNameMap[appointment.teacherId]}
-                          </p>
-                        </div>
-                        <p className="text-[15px] leading-5 font-medium text-textColor">
-                          <strong>Email - Professor: </strong>{" "}
-                          {teacherIdToEmailMap[appointment.teacherId]}
-                        </p>
-                      </li>
-                    ) : null
-                  )}
+                  <li className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]">
+                    <div>
+                      <span className="text-irisBlueColor text-[15px] leading-6 font-semibold">
+                        Data - Horário:
+                      </span>
+                      <p className="text-[15px] leading-6 font-medium text-textColor">
+                        <strong>Professor: </strong>{" "}
+                      </p>
+                    </div>
+                    <p className="text-[15px] leading-5 font-medium text-textColor">
+                      <strong>Email - Professor: </strong>{" "}
+                    </p>
+                  </li>
                 </ul>
-              </div> */}
+              </div>
             </div>
           </div>
         </div>

diff --git a/frontend/src/pages/Teachers/TeachersProfile.jsx b/frontend/src/pages/Teachers/TeachersProfile.jsx
@@ -76,32 +76,21 @@ const TeacherProfile = () => {
                   Agenda de Aulas Marcadas
                 </h3>
               </div>
-              {/* <div>
+              <div>
                 <ul className="pt-4 md:p-5">
-                  {db.appointments.map((appointment) =>
-                    appointment.teacherId === teacherIdForAppointments ? (
-                      <li
-                        key={appointment.id}
-                        className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]"
-                      >
-                        <div>
-                          <span className="text-irisBlueColor text-[15px] leading-6 font-semibold">
-                            Data - Horário: {formatarData(appointment.date)}
-                          </span>
-                          <p className="text-[15px] leading-6 font-medium text-textColor">
-                            <strong>Aluno: </strong>
-                            {studentIdToNameMap[appointment.studentId]}
-                          </p>
-                        </div>
-                        <p className="text-[15px] leading-5 font-medium text-textColor">
-                          <strong>Email - Aluno: </strong>
-                          {studentIdToEmailMap[appointment.studentId]}
-                        </p>
-                      </li>
-                    ) : null
-                  )}
+                  <li className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]">
+                    <div>
+                      <span className="text-irisBlueColor text-[15px] leading-6 font-semibold"></span>
+                      <p className="text-[15px] leading-6 font-medium text-textColor">
+                        <strong>Aluno: </strong>
+                      </p>
+                    </div>
+                    <p className="text-[15px] leading-5 font-medium text-textColor">
+                      <strong>Email - Aluno: </strong>
+                    </p>
+                  </li>
                 </ul>
-              </div> */}
+              </div>
             </div>
           </div>
         </div>

diff --git a/frontend/src/pages/Teachers/TeachersProfileCerto.jsx b/frontend/src/pages/Teachers/TeachersProfileCerto.jsx
@@ -1,7 +1,6 @@
 import { Link } from "react-router-dom";
 import db from "../../server/database/db.json";
 import TeachersAvailableHours from "../../components/Teacher/TeachersAvailableHours";
-import { formatarData } from "../../common/functions";
 import BlogItem from "../../components/BlogList/BlogItem";
 import { useSelector } from "react-redux";
 import { selectAllBlogPosts } from "../../features/blog/blogSlice";
@@ -92,28 +91,17 @@ const TeachersProfile = () => {
               </div>
               <div>
                 <ul className="pt-4 md:p-5">
-                  {db.appointments.map((appointment) =>
-                    appointment.teacherId === teacherIdForAppointments ? (
-                      <li
-                        key={appointment.id}
-                        className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]"
-                      >
-                        <div>
-                          <span className="text-irisBlueColor text-[15px] leading-6 font-semibold">
-                            Data - Horário: {formatarData(appointment.date)}
-                          </span>
-                          <p className="text-[15px] leading-6 font-medium text-textColor">
-                            <strong>Aluno: </strong>
-                            {studentIdToNameMap[appointment.studentId]}
-                          </p>
-                        </div>
-                        <p className="text-[15px] leading-5 font-medium text-textColor">
-                          <strong>Email - Aluno: </strong>
-                          {studentIdToEmailMap[appointment.studentId]}
-                        </p>
-                      </li>
-                    ) : null
-                  )}
+                  <li className="flex flex-col sm:flex-row sm:justify-between sm:items-end md:gap-5 mb-[30px]">
+                    <div>
+                      <span className="text-irisBlueColor text-[15px] leading-6 font-semibold"></span>
+                      <p className="text-[15px] leading-6 font-medium text-textColor">
+                        <strong>Aluno: </strong>
+                      </p>
+                    </div>
+                    <p className="text-[15px] leading-5 font-medium text-textColor">
+                      <strong>Email - Aluno: </strong>
+                    </p>
+                  </li>
                 </ul>
               </div>