quick commit

Author: rmfay1

src/Components/Content/Content.tsx

@@ -35,7 +35,7 @@ export default function Content() {
             <Route path="/studentOverview">
                <StudentOverview />
             </Route>
-            <Route path="/singleStudentOverview">
+            <Route path="/singleStudentOverview/:username">
                <SingleStudentOverview />
             </Route>
             <Route path="/singleStudentMasteryOverview">
@@ -44,7 +44,7 @@ export default function Content() {
             <Route path="/singleTargetOverview/:name">
                <SingleTargetOverview />
             </Route>
-            <Route path="/singleMissionOverview/:name">
+            <Route path="/singleMissionOverview/:name/:username">
                <SingleMissionOverview />
             </Route>
             <Route path="/taskList">

src/Components/SingleStudentMasteryOverview/SingleStudentMasteryOverview.tsx

@@ -509,7 +509,7 @@ function SingleStudentMasteryOverview() {
       firstName: test?.firstName,
       lastName: test?.lastName,
    };
-   console.log(inputUser.id);
+   console.log(inputUser.firstName);
 
    const { data } = useGetTargetProgressQuery({
       variables: {

src/Components/SingleStudentOverview/MasteryCard.tsx

@@ -83,6 +83,7 @@ type Props = {
    progress: TaskStats[];
    status: number;
    user: User;
+   username: string;
 };
 
 function getProgressBar(status: number) {
@@ -111,10 +112,10 @@ function getStatusTitle(status: number) {
    return 'Mastered';
 }
 
-export default function MasteryCard({ name, progress, status, user }: Props) {
+export default function MasteryCard({ name, progress, status, user, username }: Props) {
    const history = useHistory();
    return (
-      <Link to={{ pathname: `/singleMissionOverview/${name}`, state: user }}>
+      <Link to={{ pathname: `/singleMissionOverview/${name}/${username}`, state: user }}>
          <div className="mission-card">
             <div className="mission-card-header" />
             <div className="mission-card-body">

src/Components/SingleStudentOverview/SingleMissionOverview.tsx

@@ -140,6 +140,8 @@ function getMissionProgress(missionData: MissionProgress[], name: string) {
 function SingleMissionOverview() {
    // const { data: users } = useQuery<User>(GET_USERS);
    const { name } = useParams<Record<string, string | undefined>>();
+   // const { username } = useParams<Record<string, string | undefined>>();
+   const username = 'Google_114813486146105420824';
    const classes = useStyles();
    const history = useHistory();
    console.log(history);
@@ -199,7 +201,7 @@ function SingleMissionOverview() {
                   // <Link to={`/viewTask/${task.taskId}`} data-testid="task-btn">
                   <Link
                      to={{
-                        pathname: `/viewTask/${task.taskId}`,
+                        pathname: `/viewTask/${task.taskId}/${username}`,
                         state: getTaskObjectiveProgress(task),
                      }}
                      data-testid="task-btn"

src/Components/SingleStudentOverview/SingleStudentOverview.tsx

@@ -6,7 +6,7 @@ import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import styled from 'styled-components';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useParams } from 'react-router-dom';
 import { Divider } from '@material-ui/core';
 import StudentPicture from '../../assets/images/images-1.png';
 import { User } from '../../interfaces/User';
@@ -133,7 +133,7 @@ function SingleStudentOverview() {
    // const { userId } = useParams();
    const classes = useStyles();
    const history = useHistory();
-
+   const { username } = useParams<Record<string, string>>();
    const COMP_TASK_PERCENT = 100;
 
    const testVal: any = history.location.state;
@@ -185,6 +185,7 @@ function SingleStudentOverview() {
                   progress={mission.progress as TaskStats[]}
                   status={calculateStatus(mission.progress as TaskStats[])}
                   user={inputUser}
+                  username={username}
                />
             ))}
          </RowDiv>

src/Components/TaskBlocks/FrBlock/FrBlock.css

@@ -1,4 +1,4 @@
-#pointsAwarded {
+.indiv-points {
    width: 25% !important;
    float: left;
 }

src/Components/TaskBlocks/FrBlock/FrBlock.tsx

@@ -76,6 +76,7 @@ function FrBlock({
                                  value={values.pointsAwarded}
                                  bsCustomPrefix="d-inline"
                                  id="pointsAwarded"
+                                 className="indiv-points"
                                  onChange={handleChange}
                                  onBlur={handleBlur}
                               />

src/Components/TaskBlocks/McBlock/McBlock.tsx

@@ -103,6 +103,7 @@ function McBlock({
                               value={values.pointsAwarded}
                               bsCustomPrefix="d-inline"
                               id="pointsAwarded"
+                              className="indiv-points"
                               onChange={handleChange}
                               onBlur={handleBlur}
                            />

src/Screens/TaskView/Rubric/ObjectiveRubric.tsx

@@ -34,7 +34,10 @@ function ObjectiveRubric({ taskId, username }: { taskId: string; username: strin
             {objectiveProgresses.map((objectiveProgress1: TaskObjectiveProgress) => (
                <div className="row">
                   <div className="col-8" style={{ width: '50%' }}>
-                     <MasteryRubricGrading objectiveProgress={objectiveProgress1} username={username} />
+                     <MasteryRubricGrading
+                        objectiveProgress={objectiveProgress1}
+                        username={username}
+                     />
                   </div>
                   <div className="col-4" style={{ paddingTop: '25px', width: '50%' }}>
                      <Typography>{objectiveProgress1.objective.objectiveName}</Typography>