From 0c8389e24445f5c27ebc9583b847868fffa7616f Mon Sep 17 00:00:00 2001 From: Dillon Dumesnil Date: Fri, 31 Jul 2020 12:09:47 -0700 Subject: [PATCH] AA-280: Add assignment type to dates tab display (#137) --- .../data/__factories__/datesTabData.factory.js | 1 + .../data/__snapshots__/redux.test.js.snap | 1 + src/course-home/dates-tab/Day.jsx | 7 ++++++- src/course-home/dates-tab/fakeData.js | 17 +++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/course-home/data/__factories__/datesTabData.factory.js b/src/course-home/data/__factories__/datesTabData.factory.js index ee3b7c35..6f173fef 100644 --- a/src/course-home/data/__factories__/datesTabData.factory.js +++ b/src/course-home/data/__factories__/datesTabData.factory.js @@ -9,6 +9,7 @@ Factory.define('datesTabData') }, course_date_blocks: [ { + assigment_type: 'Homework', date: '2013-02-05T05:00:00Z', date_type: 'course-start-date', description: '', diff --git a/src/course-home/data/__snapshots__/redux.test.js.snap b/src/course-home/data/__snapshots__/redux.test.js.snap index 465bf405..5e3dcfd6 100644 --- a/src/course-home/data/__snapshots__/redux.test.js.snap +++ b/src/course-home/data/__snapshots__/redux.test.js.snap @@ -71,6 +71,7 @@ Object { "course-v1:edX+DemoX+Demo_Course_1": Object { "courseDateBlocks": Array [ Object { + "assigmentType": "Homework", "date": "2013-02-05T05:00:00Z", "dateType": "course-start-date", "description": "", diff --git a/src/course-home/dates-tab/Day.jsx b/src/course-home/dates-tab/Day.jsx index 2801d690..d795381c 100644 --- a/src/course-home/dates-tab/Day.jsx +++ b/src/course-home/dates-tab/Day.jsx @@ -57,7 +57,12 @@ function Day({ const textColor = available ? 'text-dark-500' : 'text-dark-200'; return (
-
{title}{itemBadges}
+
+ + {item.assignmentType && `${item.assignmentType}: `}{title} + + {itemBadges} +
{item.description &&
{item.description}
} {item.extraInfo &&
{item.extraInfo}
}
diff --git a/src/course-home/dates-tab/fakeData.js b/src/course-home/dates-tab/fakeData.js index 5603d6eb..f135da3b 100644 --- a/src/course-home/dates-tab/fakeData.js +++ b/src/course-home/dates-tab/fakeData.js @@ -24,6 +24,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "complete": true, "date": "2020-05-04T02:59:40.942669Z", "date_type": "assignment-due-date", @@ -33,6 +34,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2020-05-05T02:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -41,6 +43,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2020-05-27T02:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -50,6 +53,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2020-05-27T02:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -59,6 +63,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "complete": true, "date": "2020-05-28T08:59:40.942669Z", "date_type": "assignment-due-date", @@ -69,6 +74,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2020-05-28T08:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -78,6 +84,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "complete": true, "date": "2020-05-29T08:59:40.942669Z", "date_type": "assignment-due-date", @@ -88,6 +95,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "complete": true, "date": "2020-05-29T08:59:40.942669Z", "date_type": "assignment-due-date", @@ -107,6 +115,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-17T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -116,6 +125,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-17T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -125,6 +135,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-17T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -134,6 +145,7 @@ export default function fakeDatesData() { "extra_info": "ORA Dates are set by the instructor, and can't be changed" }, { + "assignment_type": "Homework", "date": "2030-08-18T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -143,6 +155,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-18T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -152,6 +165,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-19T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -159,6 +173,7 @@ export default function fakeDatesData() { "title": "One Unreleased 1" }, { + "assignment_type": "Homework", "date": "2030-08-19T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -168,6 +183,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-20T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "", @@ -176,6 +192,7 @@ export default function fakeDatesData() { "extra_info": null }, { + "assignment_type": "Homework", "date": "2030-08-20T05:59:40.942669Z", "date_type": "assignment-due-date", "description": "",