Skip to content

Commit 4792840

Browse files
rmfay1rmfay1
committed
added learning objective rubric grading
2 parents 7c24d26 + e960e6a commit 4792840

File tree

25 files changed

+879
-305
lines changed

25 files changed

+879
-305
lines changed

‎codegen.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema:
88
]
99

1010
documents:
11-
- src/hooks/*.graphql
11+
- src/**/*.graphql
1212
generates:
1313
src/__generated__/types.ts:
1414
plugins:
@@ -42,6 +42,7 @@ generates:
4242
nonOptionalTypename: true
4343
useTypeImports: false
4444
withHooks: true
45+
preResolveTypes: true
4546
./graphql.schema.json:
4647
plugins:
4748
- 'introspection'

‎graphql.schema.json‎

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4757,6 +4757,55 @@
47574757
"isDeprecated": false,
47584758
"deprecationReason": null
47594759
},
4760+
{
4761+
"name": "taskSubmissionSummary",
4762+
"description": null,
4763+
"args": [
4764+
{
4765+
"name": "course",
4766+
"description": null,
4767+
"type": {
4768+
"kind": "NON_NULL",
4769+
"name": null,
4770+
"ofType": {
4771+
"kind": "SCALAR",
4772+
"name": "String",
4773+
"ofType": null
4774+
}
4775+
},
4776+
"defaultValue": null,
4777+
"isDeprecated": false,
4778+
"deprecationReason": null
4779+
},
4780+
{
4781+
"name": "taskId",
4782+
"description": null,
4783+
"type": {
4784+
"kind": "NON_NULL",
4785+
"name": null,
4786+
"ofType": {
4787+
"kind": "SCALAR",
4788+
"name": "String",
4789+
"ofType": null
4790+
}
4791+
},
4792+
"defaultValue": null,
4793+
"isDeprecated": false,
4794+
"deprecationReason": null
4795+
}
4796+
],
4797+
"type": {
4798+
"kind": "NON_NULL",
4799+
"name": null,
4800+
"ofType": {
4801+
"kind": "OBJECT",
4802+
"name": "TaskSubmissionSummary",
4803+
"ofType": null
4804+
}
4805+
},
4806+
"isDeprecated": false,
4807+
"deprecationReason": null
4808+
},
47604809
{
47614810
"name": "quizblock",
47624811
"description": null,
@@ -6591,6 +6640,105 @@
65916640
"enumValues": null,
65926641
"possibleTypes": null
65936642
},
6643+
{
6644+
"kind": "OBJECT",
6645+
"name": "StudentTaskSubmissionResult",
6646+
"description": null,
6647+
"fields": [
6648+
{
6649+
"name": "studentName",
6650+
"description": null,
6651+
"args": [],
6652+
"type": {
6653+
"kind": "NON_NULL",
6654+
"name": null,
6655+
"ofType": {
6656+
"kind": "SCALAR",
6657+
"name": "String",
6658+
"ofType": null
6659+
}
6660+
},
6661+
"isDeprecated": false,
6662+
"deprecationReason": null
6663+
},
6664+
{
6665+
"name": "studentId",
6666+
"description": null,
6667+
"args": [],
6668+
"type": {
6669+
"kind": "NON_NULL",
6670+
"name": null,
6671+
"ofType": {
6672+
"kind": "SCALAR",
6673+
"name": "String",
6674+
"ofType": null
6675+
}
6676+
},
6677+
"isDeprecated": false,
6678+
"deprecationReason": null
6679+
},
6680+
{
6681+
"name": "pointsAwarded",
6682+
"description": "Todo\nThe pointsAwarded is calculated on fly when a single task submission is queried. Here we are querying a list of task submission, the pointsAwarded would not be accurate since we are not recalcuated it.",
6683+
"args": [],
6684+
"type": {
6685+
"kind": "SCALAR",
6686+
"name": "Int",
6687+
"ofType": null
6688+
},
6689+
"isDeprecated": false,
6690+
"deprecationReason": null
6691+
},
6692+
{
6693+
"name": "graded",
6694+
"description": null,
6695+
"args": [],
6696+
"type": {
6697+
"kind": "NON_NULL",
6698+
"name": null,
6699+
"ofType": {
6700+
"kind": "SCALAR",
6701+
"name": "Boolean",
6702+
"ofType": null
6703+
}
6704+
},
6705+
"isDeprecated": false,
6706+
"deprecationReason": null
6707+
},
6708+
{
6709+
"name": "teacherComment",
6710+
"description": null,
6711+
"args": [],
6712+
"type": {
6713+
"kind": "SCALAR",
6714+
"name": "String",
6715+
"ofType": null
6716+
},
6717+
"isDeprecated": false,
6718+
"deprecationReason": null
6719+
},
6720+
{
6721+
"name": "submitted",
6722+
"description": null,
6723+
"args": [],
6724+
"type": {
6725+
"kind": "NON_NULL",
6726+
"name": null,
6727+
"ofType": {
6728+
"kind": "SCALAR",
6729+
"name": "Boolean",
6730+
"ofType": null
6731+
}
6732+
},
6733+
"isDeprecated": false,
6734+
"deprecationReason": null
6735+
}
6736+
],
6737+
"inputFields": null,
6738+
"interfaces": [],
6739+
"enumValues": null,
6740+
"possibleTypes": null
6741+
},
65946742
{
65956743
"kind": "OBJECT",
65966744
"name": "SubGoal",
@@ -8325,6 +8473,57 @@
83258473
"enumValues": null,
83268474
"possibleTypes": null
83278475
},
8476+
{
8477+
"kind": "OBJECT",
8478+
"name": "TaskSubmissionSummary",
8479+
"description": null,
8480+
"fields": [
8481+
{
8482+
"name": "task",
8483+
"description": null,
8484+
"args": [],
8485+
"type": {
8486+
"kind": "NON_NULL",
8487+
"name": null,
8488+
"ofType": {
8489+
"kind": "OBJECT",
8490+
"name": "Task",
8491+
"ofType": null
8492+
}
8493+
},
8494+
"isDeprecated": false,
8495+
"deprecationReason": null
8496+
},
8497+
{
8498+
"name": "results",
8499+
"description": null,
8500+
"args": [],
8501+
"type": {
8502+
"kind": "NON_NULL",
8503+
"name": null,
8504+
"ofType": {
8505+
"kind": "LIST",
8506+
"name": null,
8507+
"ofType": {
8508+
"kind": "NON_NULL",
8509+
"name": null,
8510+
"ofType": {
8511+
"kind": "OBJECT",
8512+
"name": "StudentTaskSubmissionResult",
8513+
"ofType": null
8514+
}
8515+
}
8516+
}
8517+
},
8518+
"isDeprecated": false,
8519+
"deprecationReason": null
8520+
}
8521+
],
8522+
"inputFields": null,
8523+
"interfaces": [],
8524+
"enumValues": null,
8525+
"possibleTypes": null
8526+
},
83288527
{
83298528
"kind": "OBJECT",
83308529
"name": "TextBlock",

‎src/Components/Content/Content.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import SingleTargetOverview from '../SingleTargetOverview/SingleTargetOverview';
1111
import SingleMissionOverview from '../SingleStudentOverview/SingleMissionOverview';
1212

1313
import TaskView from '../../Screens/TaskView/TaskView';
14+
import TaskListView from '../TaskListView';
15+
import TaskSubmissionSummaryView from '../TaskSubmissionSummaryView';
1416
import { ClassMastery } from '../../Screens/ClassMastery';
1517
import './Content.css';
1618

@@ -45,10 +47,13 @@ export default function Content() {
4547
<Route path="/singleMissionOverview/:name">
4648
<SingleMissionOverview />
4749
</Route>
48-
{/* <Route path="/viewTask">
49-
<TaskView taskId="90e0c730e56" />
50-
</Route> */}
51-
<Route path="/viewTask/:taskId">
50+
<Route path="/taskList">
51+
<TaskListView />
52+
</Route>
53+
<Route path="/taskSubmissionSummary/:taskId">
54+
<TaskSubmissionSummaryView />
55+
</Route>
56+
<Route path="/viewTask/:taskId/:username">
5257
<TaskView />
5358
</Route>
5459
<Route path="/classMastery">

‎src/Components/Sidebar/Sidebar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const sideBarItems = [
3939
},
4040
{
4141
name: 'Task',
42-
link: '/viewTask',
42+
link: '/taskList',
4343
Icon: IconPeople,
4444
},
4545
{

‎src/Components/TaskBlocks/FrBlock/FrBlock.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#pointsAwarded {
2+
width: 25% !important;
3+
float: left;
4+
}
5+
6+
.right {
7+
float: right;
8+
}

0 commit comments

Comments
 (0)