Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-implemented View Team Grades page. #45

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b0510db
migrated HeatMap functionality for review table from Ruby on Rails to…
Nisarg20 Mar 19, 2024
e5b4d3a
Merge pull request #1 from Program-3-Expertiza/GradesView_HeatMap_Imp…
Nisarg20 Mar 19, 2024
6f90fce
Update ReviewTable.tsx
ChaitanyaS182k Mar 20, 2024
227b1e2
Merge pull request #2 from Program-3-Expertiza/HeatMap_Hovering
ChaitanyaS182k Mar 20, 2024
6eb6203
Added Button to HomePage as well as Grade and Comment Section at the …
Aniruddha-Rajnekar Mar 20, 2024
f22198e
Heat Map Hovering effect fix
ChaitanyaS182k Mar 20, 2024
afe3315
Merge pull request #3 from Program-3-Expertiza/BackButton_CommitSecti…
Aniruddha-Rajnekar Mar 20, 2024
acbd1a6
Merge pull request #4 from Program-3-Expertiza/HeatMap_Hovering_Fix
ChaitanyaS182k Mar 20, 2024
d2561b5
Modularized the code
Nisarg20 Mar 20, 2024
15d3370
Update ReviewTable.tsx
Nisarg20 Mar 20, 2024
23622ab
Merge pull request #5 from Program-3-Expertiza/Heatmap_table_extended
Nisarg20 Mar 21, 2024
90e09b5
Update ReviewTable.tsx
Nisarg20 Mar 21, 2024
56a3b37
Updated Dummy data from type script file to json file. Added a visual…
Nisarg20 Mar 24, 2024
11ebcb5
Update ReviewTable.tsx
Nisarg20 Mar 24, 2024
a0b3a5e
Merge pull request #6 from Program-3-Expertiza/minor_bug_fixes
ChaitanyaS182k Mar 24, 2024
ab40e2d
Update ReviewTable.tsx
Nisarg20 Mar 24, 2024
b2eb31e
Renamed the Variable "test" to "ViewGrades"
Aniruddha-Rajnekar Mar 25, 2024
76b573f
Merge pull request #7 from Program-3-Expertiza/Renaming-Variables
Aniruddha-Rajnekar Mar 25, 2024
dc08b41
Added Show Submission Button and Color Legend
ChaitanyaS182k Apr 21, 2024
a830717
Merge pull request #8 from Program-3-Expertiza/ShowSubmission_Button
ChaitanyaS182k Apr 21, 2024
f967a6e
Added Toggle Question Button and modified the Color Legend
ChaitanyaS182k Apr 21, 2024
afa4e68
Merge pull request #9 from Program-3-Expertiza/Toggle_Questions
ChaitanyaS182k Apr 21, 2024
8ef4a37
Added multiple rounds button
ChaitanyaS182k Apr 22, 2024
d7cbb10
Merge pull request #10 from Program-3-Expertiza/All_Round_Scores
ChaitanyaS182k Apr 22, 2024
a245d71
Update App.tsx
Nisarg20 Apr 22, 2024
c9979b1
Color Legend table bug fixes
ChaitanyaS182k Apr 22, 2024
db55578
Merge pull request #11 from Program-3-Expertiza/Color_Legend_Table_Bu…
Nisarg20 Apr 22, 2024
3f3e80c
Added test cases for the React Components
ChaitanyaS182k Apr 24, 2024
1c8c126
Merge pull request #12 from Program-3-Expertiza/Test_Cases
ChaitanyaS182k Apr 24, 2024
d2d73b4
Add files via upload
ChaitanyaS182k Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 100 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
"@types/react-redux": "^7.1.25",
"@types/react-router-dom": "^5.3.3",
"axios": "^1.4.0",
"bootstrap": "^5.2.3",
"bootstrap": "^5.3.3",
"formik": "^2.2.9",
"jquery": "^3.7.1",
"jwt-decode": "^3.1.2",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
"react-datepicker": "^4.11.0",
"react-dom": "^18.2.0",
"react-i18next": "^14.1.0",
"react-icons": "^4.9.0",
"react-redux": "^8.0.5",
"react-router-dom": "^6.11.1",
Expand Down Expand Up @@ -61,6 +63,8 @@
]
},
"devDependencies": {
"@types/jquery": "^3.5.29",
"@types/jqueryui": "^1.12.21",
"@types/react-bootstrap": "^0.32.32",
"@types/react-datepicker": "^4.10.0",
"eslint": "^8.38.0",
Expand Down
9 changes: 0 additions & 9 deletions src/App.test.tsx

This file was deleted.

29 changes: 20 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import {createBrowserRouter,Navigate,RouterProvider} from "react-router-dom";
import { createBrowserRouter, Navigate, RouterProvider } from "react-router-dom";
import AdministratorLayout from "./layout/Administrator";
import ManageUserTypes, { loader as loadUsers } from "./pages/Administrator/ManageUserTypes";
import Login from "./pages/Authentication/Login";
Expand Down Expand Up @@ -30,6 +30,7 @@ import { loadCourseInstructorDataAndInstitutions } from "pages/Courses/CourseUti
import TA from "pages/TA/TA";
import TAEditor from "pages/TA/TAEditor";
import { loadTAs } from "pages/TA/TAUtil";
import ReviewTable from "./pages/ViewTeamGrades/ReviewTable";

function App() {
const router = createBrowserRouter([
Expand All @@ -41,7 +42,19 @@ function App() {
{ index: true, element: <ProtectedRoute element={<Home />} /> },
{ path: "login", element: <Login /> },
{ path: "logout", element: <ProtectedRoute element={<Logout />} /> },
{ path: "edit-questionnaire", element: <ProtectedRoute element={<Questionnaire />} /> },
// Add the ViewTeamGrades route
{
path: "view-team-grades",
element: <ProtectedRoute element={
<>
<ReviewTable />
</>
} />,
},
{
path: "edit-questionnaire",
element: <ProtectedRoute element={<Questionnaire />} />,
},
{
path: "assignments",
element: <ProtectedRoute element={<Assignment />} leastPrivilegeRole={ROLE.TA} />,
Expand Down Expand Up @@ -106,7 +119,6 @@ function App() {
},
],
},
// Fixed the missing comma and added an opening curly brace
{
path: "courses",
element: <ProtectedRoute element={<Courses />} leastPrivilegeRole={ROLE.TA} />,
Expand All @@ -132,7 +144,7 @@ function App() {
},
]
},
], // Added the missing closing curly brace
],
},
{
path: "administrator",
Expand Down Expand Up @@ -183,27 +195,26 @@ function App() {
path: "new",
element: <Navigate to="/users/new" />,
},

{
path: "edit/:id",
element: <Navigate to="/users/edit/:id" />,
},
],
},
// Add the "Questionnaire" route here
{
path: "questionnaire",
element: <Questionnaire />,
},
],
},
{ path: "*", element: <NotFound /> },
// Add the "Questionnaire" route here if it's not under the administrator section
{ path: "questionnaire", element: <Questionnaire /> },
{ path: "questionnaire", element: <Questionnaire /> }, // Added the Questionnaire route
],
},
]);

return <RouterProvider router={router} />;
}

export default App;
export default App;
3 changes: 3 additions & 0 deletions src/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ const Header: React.FC = () => {
<Nav.Link as={Link} to="/student_view">
Student View
</Nav.Link>
<Nav.Link as={Link} to="/view-team-grades">
ViewGrades
</Nav.Link>
</Nav>
<Nav.Item className="text-light ps-md-3 pe-md-3">
User: {auth.user.full_name}
Expand Down
22 changes: 22 additions & 0 deletions src/pages/ViewTeamGrades/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react';
import ReviewTable from './ReviewTable'; // Importing the ReviewTable component

// Interface defining the structure of ReviewData
export interface ReviewData {
questionNumber: string;
questionText: string;
reviews: { score: number; comment?: string }[]; // Array of objects with score and optional comment
RowAvg: number; // Average score for the row
maxScore: number; // Maximum possible score
}

// Functional component App, which renders the ReviewTable
const App: React.FC = () => {
return (
<div>
<ReviewTable /> {/* Rendering the ReviewTable component */}
</div>
);
};

export default App; // Exporting the App component as default
Loading