diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts index 7938a4e274..454a60b26a 100644 --- a/src/app/doubtfire-angular.module.ts +++ b/src/app/doubtfire-angular.module.ts @@ -43,6 +43,7 @@ import {UIRouterUpgradeModule} from '@uirouter/angular-hybrid'; import {MatDialogModule as MatDialogModuleNew} from '@angular/material/dialog'; import {AlertService} from 'src/app/common/services/alert.service'; import {AlertComponent} from 'src/app/common/services/alert.service'; +import {MatSidenavModule} from '@angular/material/sidenav'; import {setTheme} from 'ngx-bootstrap/utils'; @@ -613,6 +614,7 @@ const MY_DATE_FORMAT = { MatDialogModuleNew, CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}), CodeEditorModule.forRoot(), + MatSidenavModule, ], }) diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html index 37191fb944..708f2fbfe3 100644 --- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html +++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html @@ -1,116 +1,129 @@ -
-
-
-
-

Task List

-

Plan the list of tasks for students to complete.

-
- -
- - - -
+
+
+
+

Task List

+

Plan the list of tasks for students to complete.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Task Name - {{ taskDefinition.abbreviation }} {{ taskDefinition.name }} - Grade - {{ taskDefinition.targetGradeText }} - Start Date - {{ taskDefinition.startDate | date: 'd LLL y' }} - Due Date - {{ taskDefinition.targetDate | date: 'd LLL y' }} - Deadline - {{ taskDefinition.dueDate | date: 'd LLL y' }} - - @if (taskDefinitionHasChanges(taskDefinition)) { + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + +
Task Name + {{ taskDefinition.abbreviation }} {{ taskDefinition.name }} + Grade + {{ taskDefinition.targetGradeText }} + Start Date + {{ taskDefinition.startDate | date: 'd LLL y' }} + Due Date + {{ taskDefinition.targetDate | date: 'd LLL y' }} + Deadline + {{ taskDefinition.dueDate | date: 'd LLL y' }} + + @if (taskDefinitionHasChanges(taskDefinition)) { + + } - } - -
+ + @if (selectedTaskDefinition) { + + } + +
+ + - -
@@ -132,11 +145,7 @@

Task List

- @if (selectedTaskDefinition) { - - } +
+
-->
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts index 8fea690462..302619ecc6 100644 --- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts +++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts @@ -1,15 +1,19 @@ -import { AfterViewInit, Component, Inject, Input, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatSort, Sort } from '@angular/material/sort'; -import { MatTable, MatTableDataSource } from '@angular/material/table'; -import { Subscription } from 'rxjs'; -import { confirmationModal, csvResultModalService, csvUploadModalService } from 'src/app/ajs-upgraded-providers'; -import { TaskDefinition } from 'src/app/api/models/task-definition'; -import { Unit } from 'src/app/api/models/unit'; -import { TaskDefinitionService } from 'src/app/api/services/task-definition.service'; -import { AlertService } from 'src/app/common/services/alert.service'; -import { addWeeks } from 'date-fns'; -import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service'; +import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core'; +import {MatPaginator} from '@angular/material/paginator'; +import {MatSort, Sort} from '@angular/material/sort'; +import {MatTable, MatTableDataSource} from '@angular/material/table'; +import {Subscription} from 'rxjs'; +import { + confirmationModal, + csvResultModalService, + csvUploadModalService, +} from 'src/app/ajs-upgraded-providers'; +import {TaskDefinition} from 'src/app/api/models/task-definition'; +import {Unit} from 'src/app/api/models/unit'; +import {TaskDefinitionService} from 'src/app/api/services/task-definition.service'; +import {AlertService} from 'src/app/common/services/alert.service'; +import {addWeeks} from 'date-fns'; +import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service'; @Component({ selector: 'f-unit-task-editor', @@ -17,14 +21,21 @@ import { FeedbackTemplateService } from 'src/app/api/services/feedback-template. styleUrls: ['unit-task-editor.component.scss'], }) export class UnitTaskEditorComponent implements AfterViewInit { - @ViewChild(MatTable, { static: false }) table: MatTable; - @ViewChild(MatSort, { static: false }) sort: MatSort; - @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator; + @ViewChild(MatTable, {static: false}) table: MatTable; + @ViewChild(MatSort, {static: false}) sort: MatSort; + @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator; @Input() unit: Unit; public taskDefinitionSource: MatTableDataSource; - public columns: string[] = ['name', 'grade', 'startDate', 'targetDate', 'deadlineDate', 'taskDefAction']; + public columns: string[] = [ + 'name', + // 'grade', + // 'startDate', + // 'targetDate', + // 'deadlineDate', + 'taskDefAction', + ]; public filter: string; public selectedTaskDefinition: TaskDefinition; @@ -34,7 +45,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { private alerts: AlertService, @Inject(csvResultModalService) private csvResultModalService: any, @Inject(csvUploadModalService) private csvUploadModal: any, - @Inject(confirmationModal) private confirmationModal: any + @Inject(confirmationModal) private confirmationModal: any, ) {} ngAfterViewInit(): void { @@ -43,8 +54,9 @@ export class UnitTaskEditorComponent implements AfterViewInit { this.taskDefinitionSource = new MatTableDataSource(taskDefinitions); this.taskDefinitionSource.paginator = this.paginator; this.taskDefinitionSource.sort = this.sort; - this.taskDefinitionSource.filterPredicate = (data: any, filter: string) => data.matches(filter); - }) + this.taskDefinitionSource.filterPredicate = (data: any, filter: string) => + data.matches(filter); + }), ); } @@ -154,7 +166,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { this.csvUploadModal.show( 'Upload Task Definitions as CSV', 'Test message', - { file: { name: 'Task Definition CSV Data', type: 'csv' } }, + {file: {name: 'Task Definition CSV Data', type: 'csv'}}, this.unit.getTaskDefinitionBatchUploadUrl(), (response: any) => { // at least one student? @@ -162,7 +174,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { if (response.success.length > 0) { this.unit.refresh(); } - } + }, ); } @@ -170,7 +182,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { this.csvUploadModal.show( 'Upload Task Sheets and Resources as Zip', 'Test message', - { file: { name: 'Task Sheets and Resources', type: 'zip' } }, + {file: {name: 'Task Sheets and Resources', type: 'zip'}}, this.unit.taskUploadUrl, (response: any) => { // at least one student? @@ -178,7 +190,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { if (response.success.length > 0) { this.unit.refresh(); } - } + }, ); }