Skip to content

Commit ade4593

Browse files
Robert MiddletonRobert Middleton
Robert Middleton
authored and
Robert Middleton
committed
Seating chart course home view.
1 parent 1c2f216 commit ade4593

File tree

6 files changed

+259
-107
lines changed

6 files changed

+259
-107
lines changed

‎graphql.schema.json‎

Lines changed: 156 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,23 @@
155155
"description": null,
156156
"fields": [
157157
{
158-
"name": "studentTargetMasteryList",
158+
"name": "target",
159+
"description": null,
160+
"args": [],
161+
"type": {
162+
"kind": "NON_NULL",
163+
"name": null,
164+
"ofType": {
165+
"kind": "OBJECT",
166+
"name": "Target",
167+
"ofType": null
168+
}
169+
},
170+
"isDeprecated": false,
171+
"deprecationReason": null
172+
},
173+
{
174+
"name": "studentObjectiveMasteryList",
159175
"description": null,
160176
"args": [],
161177
"type": {
@@ -169,7 +185,7 @@
169185
"name": null,
170186
"ofType": {
171187
"kind": "OBJECT",
172-
"name": "StudentTargetMastery",
188+
"name": "StudentObjectiveMastery",
173189
"ofType": null
174190
}
175191
}
@@ -3294,6 +3310,65 @@
32943310
"enumValues": null,
32953311
"possibleTypes": null
32963312
},
3313+
{
3314+
"kind": "OBJECT",
3315+
"name": "ObjectiveMastery",
3316+
"description": null,
3317+
"fields": [
3318+
{
3319+
"name": "objectiveId",
3320+
"description": null,
3321+
"args": [],
3322+
"type": {
3323+
"kind": "NON_NULL",
3324+
"name": null,
3325+
"ofType": {
3326+
"kind": "SCALAR",
3327+
"name": "String",
3328+
"ofType": null
3329+
}
3330+
},
3331+
"isDeprecated": false,
3332+
"deprecationReason": null
3333+
},
3334+
{
3335+
"name": "targetId",
3336+
"description": null,
3337+
"args": [],
3338+
"type": {
3339+
"kind": "NON_NULL",
3340+
"name": null,
3341+
"ofType": {
3342+
"kind": "SCALAR",
3343+
"name": "String",
3344+
"ofType": null
3345+
}
3346+
},
3347+
"isDeprecated": false,
3348+
"deprecationReason": null
3349+
},
3350+
{
3351+
"name": "mastery",
3352+
"description": null,
3353+
"args": [],
3354+
"type": {
3355+
"kind": "NON_NULL",
3356+
"name": null,
3357+
"ofType": {
3358+
"kind": "SCALAR",
3359+
"name": "String",
3360+
"ofType": null
3361+
}
3362+
},
3363+
"isDeprecated": false,
3364+
"deprecationReason": null
3365+
}
3366+
],
3367+
"inputFields": null,
3368+
"interfaces": [],
3369+
"enumValues": null,
3370+
"possibleTypes": null
3371+
},
32973372
{
32983373
"kind": "OBJECT",
32993374
"name": "ObjectiveProgress",
@@ -4836,22 +4911,6 @@
48364911
"name": "classMissionMastery",
48374912
"description": null,
48384913
"args": [
4839-
{
4840-
"name": "courseId",
4841-
"description": null,
4842-
"type": {
4843-
"kind": "NON_NULL",
4844-
"name": null,
4845-
"ofType": {
4846-
"kind": "SCALAR",
4847-
"name": "String",
4848-
"ofType": null
4849-
}
4850-
},
4851-
"defaultValue": null,
4852-
"isDeprecated": false,
4853-
"deprecationReason": null
4854-
},
48554914
{
48564915
"name": "missionId",
48574916
"description": null,
@@ -4882,7 +4941,7 @@
48824941
"description": null,
48834942
"args": [
48844943
{
4885-
"name": "courseId",
4944+
"name": "targetId",
48864945
"description": null,
48874946
"type": {
48884947
"kind": "NON_NULL",
@@ -5916,7 +5975,7 @@
59165975
},
59175976
{
59185977
"kind": "OBJECT",
5919-
"name": "StudentTargetMastery",
5978+
"name": "StudentObjectiveMastery",
59205979
"description": null,
59215980
"fields": [
59225981
{
@@ -5936,7 +5995,7 @@
59365995
"deprecationReason": null
59375996
},
59385997
{
5939-
"name": "targetMasteryList",
5998+
"name": "objectiveMasteryList",
59405999
"description": null,
59416000
"args": [],
59426001
"type": {
@@ -5950,7 +6009,7 @@
59506009
"name": null,
59516010
"ofType": {
59526011
"kind": "OBJECT",
5953-
"name": "TargetMastery",
6012+
"name": "ObjectiveMastery",
59546013
"ofType": null
59556014
}
59566015
}
@@ -5965,6 +6024,81 @@
59656024
"enumValues": null,
59666025
"possibleTypes": null
59676026
},
6027+
{
6028+
"kind": "INPUT_OBJECT",
6029+
"name": "StudentObjectiveMasteryInput",
6030+
"description": null,
6031+
"fields": null,
6032+
"inputFields": [
6033+
{
6034+
"name": "studentId",
6035+
"description": null,
6036+
"type": {
6037+
"kind": "NON_NULL",
6038+
"name": null,
6039+
"ofType": {
6040+
"kind": "SCALAR",
6041+
"name": "String",
6042+
"ofType": null
6043+
}
6044+
},
6045+
"defaultValue": null,
6046+
"isDeprecated": false,
6047+
"deprecationReason": null
6048+
},
6049+
{
6050+
"name": "objectiveId",
6051+
"description": null,
6052+
"type": {
6053+
"kind": "NON_NULL",
6054+
"name": null,
6055+
"ofType": {
6056+
"kind": "SCALAR",
6057+
"name": "String",
6058+
"ofType": null
6059+
}
6060+
},
6061+
"defaultValue": null,
6062+
"isDeprecated": false,
6063+
"deprecationReason": null
6064+
},
6065+
{
6066+
"name": "targetId",
6067+
"description": null,
6068+
"type": {
6069+
"kind": "NON_NULL",
6070+
"name": null,
6071+
"ofType": {
6072+
"kind": "SCALAR",
6073+
"name": "String",
6074+
"ofType": null
6075+
}
6076+
},
6077+
"defaultValue": null,
6078+
"isDeprecated": false,
6079+
"deprecationReason": null
6080+
},
6081+
{
6082+
"name": "mastery",
6083+
"description": null,
6084+
"type": {
6085+
"kind": "NON_NULL",
6086+
"name": null,
6087+
"ofType": {
6088+
"kind": "SCALAR",
6089+
"name": "String",
6090+
"ofType": null
6091+
}
6092+
},
6093+
"defaultValue": null,
6094+
"isDeprecated": false,
6095+
"deprecationReason": null
6096+
}
6097+
],
6098+
"interfaces": null,
6099+
"enumValues": null,
6100+
"possibleTypes": null
6101+
},
59686102
{
59696103
"kind": "OBJECT",
59706104
"name": "SubGoal",
@@ -6587,65 +6721,6 @@
65876721
"enumValues": null,
65886722
"possibleTypes": null
65896723
},
6590-
{
6591-
"kind": "OBJECT",
6592-
"name": "TargetMastery",
6593-
"description": null,
6594-
"fields": [
6595-
{
6596-
"name": "targetId",
6597-
"description": null,
6598-
"args": [],
6599-
"type": {
6600-
"kind": "NON_NULL",
6601-
"name": null,
6602-
"ofType": {
6603-
"kind": "SCALAR",
6604-
"name": "String",
6605-
"ofType": null
6606-
}
6607-
},
6608-
"isDeprecated": false,
6609-
"deprecationReason": null
6610-
},
6611-
{
6612-
"name": "targetName",
6613-
"description": null,
6614-
"args": [],
6615-
"type": {
6616-
"kind": "NON_NULL",
6617-
"name": null,
6618-
"ofType": {
6619-
"kind": "SCALAR",
6620-
"name": "String",
6621-
"ofType": null
6622-
}
6623-
},
6624-
"isDeprecated": false,
6625-
"deprecationReason": null
6626-
},
6627-
{
6628-
"name": "progress",
6629-
"description": null,
6630-
"args": [],
6631-
"type": {
6632-
"kind": "NON_NULL",
6633-
"name": null,
6634-
"ofType": {
6635-
"kind": "SCALAR",
6636-
"name": "Float",
6637-
"ofType": null
6638-
}
6639-
},
6640-
"isDeprecated": false,
6641-
"deprecationReason": null
6642-
}
6643-
],
6644-
"inputFields": null,
6645-
"interfaces": [],
6646-
"enumValues": null,
6647-
"possibleTypes": null
6648-
},
66496724
{
66506725
"kind": "OBJECT",
66516726
"name": "TargetProgress",

‎src/Components/CourseHome/CourseHome.tsx‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
// TODO fix linting complaints
2+
13
/* eslint-disable no-nested-ternary */
24
/* eslint-disable no-param-reassign */
35
/* eslint-disable @typescript-eslint/restrict-template-expressions */
46
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
57
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
68
/* eslint-disable @typescript-eslint/no-unsafe-call */
79
import React, { useState } from 'react';
8-
import { useParams } from 'react-router-dom';
910
import {
1011
createStyles,
1112
FormControl,
@@ -28,6 +29,9 @@ const useStyles = makeStyles((theme: Theme) =>
2829
flexGrow: 1,
2930
backgroundColor: theme.palette.background.paper,
3031
},
32+
menuItem: {
33+
fontSize: '20px',
34+
},
3135
})
3236
);
3337

@@ -36,7 +40,6 @@ function CourseHome() {
3640
const [viewType, setViewType] = useState('List');
3741

3842
const { data: missionMasteryData } = useClassMissionMasteryQuery();
39-
console.log(missionMasteryData);
4043

4144
const handleChange = (event: React.ChangeEvent<{ value: unknown }>) => {
4245
setViewType(event.target.value as string);
@@ -88,16 +91,28 @@ function CourseHome() {
8891
<div className={classes.tableContainer}>
8992
<FormControl style={{ minWidth: '150px', marginLeft: '21px', marginTop: '6px' }}>
9093
<InputLabel>View As</InputLabel>
91-
<Select value={viewType} onChange={handleChange}>
92-
<MenuItem value="Chart">Seating Chart</MenuItem>
93-
<MenuItem value="List">List</MenuItem>
94+
<Select
95+
value={viewType}
96+
onChange={handleChange}
97+
classes={{ root: classes.menuItem }}
98+
>
99+
<MenuItem value="List" classes={{ root: classes.menuItem }}>
100+
List
101+
</MenuItem>
102+
<MenuItem value="Chart" classes={{ root: classes.menuItem }}>
103+
Seating Chart
104+
</MenuItem>
94105
</Select>
95106
</FormControl>
96107

97-
<div className="base-table">
108+
<div style={{ marginTop: '12px', borderTop: '1px', borderTopStyle: 'solid' }}>
98109
{missionMasteryData ? (
99110
viewType === 'List' ? (
100-
<ListView classMissionMasterydata={missionMasteryData.classMissionMastery} />
111+
<div className="base-table">
112+
<ListView
113+
classMissionMasterydata={missionMasteryData.classMissionMastery}
114+
/>
115+
</div>
101116
) : (
102117
<SeatingChartView
103118
classMissionMasterydata={missionMasteryData.classMissionMastery}

‎src/Components/CourseHome/ListView.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// TODO fix linting complaints
2+
3+
/* eslint-disable @typescript-eslint/no-explicit-any */
14
/* eslint-disable react/destructuring-assignment */
25
/* eslint-disable no-param-reassign */
36
/* eslint-disable @typescript-eslint/restrict-template-expressions */
@@ -18,7 +21,6 @@ function ListView(classMissionMasterydata: any) {
1821
});
1922
};
2023

21-
console.log(classMissionMasterydata);
2224
const data: any[] = [];
2325
classMissionMasterydata.classMissionMasterydata.studentMissionMasteryList.map(
2426
(studentMissionMastery: any) =>
@@ -32,6 +34,7 @@ function ListView(classMissionMasterydata: any) {
3234
})
3335
);
3436

37+
// TODO remove when names are populated
3538
data.forEach((dataEntry) => {
3639
if (dataEntry.row.name.indexOf('null') !== -1) {
3740
dataEntry.row.name = 'Mary Lee';

0 commit comments

Comments
 (0)