diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
index 3a031982594..8fa6ba4fc6c 100644
--- a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+++ b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
@@ -1,116 +1,184 @@
diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts
index c9478d9e5bb..5a9bb144265 100644
--- a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts
+++ b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts
@@ -14,10 +14,19 @@ import { MatDialog } from '@angular/material/dialog';
import { DialogWithSpinnerComponent } from '../../../directives/dialog-with-spinner/dialog-with-spinner.component';
import { ActivatedRoute, Router } from '@angular/router';
import { MatButton } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
@Component({
- imports: [MatButton],
- styles: ['.button-div { margin-top: 10px; margin-bottom: 10px; }'],
+ imports: [MatButton, MatCardModule],
+ styles: `
+ .button-div {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ }
+ mat-card {
+ justify-content: space-between;
+ }
+ `,
templateUrl: './data-export.component.html'
})
export class DataExportComponent {
diff --git a/src/messages.xlf b/src/messages.xlf
index 663b6aa9c09..ef4f3b5a9dc 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -10294,6 +10294,30 @@
src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html
17,20
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 19,22
+
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 36,39
+
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 55,58
+
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 74,77
+
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 91,94
+
+
+ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
+ 108,111
+
src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html
123,126
@@ -15480,159 +15504,96 @@ Are you sure you want to proceed?
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts
- 133
-
-
-
- Export One Workgroup Per Row
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 8,12
-
-
-
- Export One Workgroup Per Row
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 12,17
-
-
-
- Export Student Work
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 19,23
-
-
- src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html
- 12,14
-
-
-
- Export Student Work
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 23,28
-
-
-
- Export Events
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 30,34
-
-
-
- Export Events
-
- src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 34,39
+ 142
-
- Export Latest Notebook Items
+
+ Each workgroup gets one row with all their work
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 41,45
+ 9,13
-
- Export Latest Notebook Items
+
+ All student work and annotations
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 45,50
+ 27,30
-
- Export All Notebook Items
+
+ All events that were logged during the unit
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 52,56
+ 45,49
-
- Export All Notebook Items
+
+ Custom data for certain activity types
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 56,61
+ 64,68
-
- Export Notifications
+
+ All data logged during the unit
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 63,67
+ 82,85
-
- Export Notifications
+
+ Time spent on each step in the unit
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 67,72
+ 99,102
-
- Export Student Assets
+
+ Latest notebook items and reports
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 74,78
+ 116,119
-
- Export Student Assets
+
+ Download
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 78,83
+ 125,128
-
-
- Export Item Data
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 85,89
-
-
- src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html
- 12,14
+ 142,145
-
-
- Export Item Data
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 89,94
+ 161,164
-
-
- Export Raw Data
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 96,100
-
-
- src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html
- 12,14
+ 178,181
-
- Export Raw Data
+
+ All notebook items and reports
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 100,105
+ 133,136
-
- Export Step Visits
+
+ Notifications sent to students and teachers
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 107,111
+ 151,154
-
- Export Step Visits
+
+ Student uploaded files
src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html
- 111,117
+ 169,172
@@ -15667,6 +15628,13 @@ Are you sure you want to proceed?
38,42
+
+ Export Item Data
+
+ src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html
+ 12,14
+
+
Include student names
@@ -15846,6 +15814,13 @@ Are you sure you want to proceed?
35,40
+
+ Export Raw Data
+
+ src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html
+ 12,14
+
+
Everything
@@ -16138,6 +16113,13 @@ Are you sure you want to proceed?
199
+
+ Export Student Work
+
+ src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html
+ 12,14
+
+
Export All Steps