-
+
diff --git a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
index 87be5fbef8..17dc7efdf9 100644
--- a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
+++ b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
@@ -2,12 +2,13 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
import { MatPaginator } from '@angular/material/paginator';
import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatSort } from '@angular/material/sort';
+import { MatSort, Sort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { TeachingPeriodBreak } from 'src/app/api/models/teaching-period';
import { TeachingPeriod } from 'src/app/api/models/teaching-period';
import { TeachingPeriodBreakService } from 'src/app/api/services/teaching-period-break.service';
import { TeachingPeriodService } from 'src/app/api/services/teaching-period.service';
+import { TeachingPeriodUnitImportService } from '../teaching-period-unit-import/teaching-period-unit-import.dialog';
@Component({
selector: 'f-teaching-period-list',
@@ -20,8 +21,13 @@ export class TeachingPeriodListComponent implements OnInit {
public dataSource = new MatTableDataSource();
- displayedColumns: string[] = ['active', 'name', 'startDate', 'endDate', 'activeUntil'];
- constructor(private teachingPeriodsService: TeachingPeriodService, public dialog: MatDialog) {}
+ displayedColumns: string[] = ['active', 'name', 'startDate', 'endDate', 'activeUntil', 'actions'];
+
+ constructor(
+ private teachingPeriodsService: TeachingPeriodService,
+ public dialog: MatDialog,
+ public teachingPeriodUnitImportService: TeachingPeriodUnitImportService,
+ ) {}
ngOnInit(): void {
// update the Teaching Periods
@@ -35,6 +41,10 @@ export class TeachingPeriodListComponent implements OnInit {
});
}
+ importUnits(teachingPeriod: TeachingPeriod) {
+ this.teachingPeriodUnitImportService.openImportUnitsDialog(teachingPeriod);
+ }
+
addTeachingPeriod() {
this.dialog.open(NewTeachingPeriodDialogComponent, {
data: {},
@@ -46,6 +56,39 @@ export class TeachingPeriodListComponent implements OnInit {
this.dialog.open(NewTeachingPeriodDialogComponent, { data: { teachingPeriod: teachingPeriod } });
});
}
+
+ /**
+ * Function used by implemented sortTableData to determine the order
+ * of values within the EntityForm once sorting has been triggered.
+ *
+ * @param aValue value to be compared against bValue.
+ * @param bValue value to be compared against aValue.
+ *
+ * @returns truthy comparison between aValue and bValue.
+ */
+ protected sortCompare(aValue: number | string, bValue: number | string, isAsc: boolean) {
+ return (aValue < bValue ? -1 : 1) * (isAsc ? 1 : -1);
+ }
+
+ // Sorting function to sort data when sort
+ // event is triggered
+ sortTableData(sort: Sort) {
+ if (!sort.active || sort.direction === '') {
+ return;
+ }
+ switch (sort.active) {
+ case 'active':
+ case 'name':
+ case 'startDate':
+ case 'endDate':
+ case 'activeUntil':
+ this.dataSource.data = this.dataSource.data.sort((a, b) => {
+ const isAsc = sort.direction === 'asc';
+ return this.sortCompare(a[sort.active], b[sort.active], isAsc);
+ });
+ return;
+ }
+ }
}
@Component({
diff --git a/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts b/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts
index 2925b4b59e..53416abcc8 100644
--- a/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts
+++ b/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts
@@ -126,6 +126,10 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit {
public codeChange(code: string, value: UnitImportData) {
value.relatedUnits = this.relatedUnits(code);
+ // add source unit to realted units - so that it is retained on code change
+ if (value.sourceUnit && !value.relatedUnits.find((u) => u.value.id === value.sourceUnit.id)) {
+ value.relatedUnits.unshift({value: value.sourceUnit, text: value.sourceUnit.codeAndPeriod});
+ }
value.sourceUnit = value.relatedUnits.length > 0 ? value.relatedUnits[0].value : null;
}
@@ -197,36 +201,43 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit {
}
private importExistingUnit(unitToImport: UnitImportData, idx: number) {
- unitToImport.sourceUnit.rolloverTo({ teaching_period_id: this.data.teachingPeriod.id }).subscribe({
- next: (newUnit: Unit) => {
- unitToImport.done = true;
- // Employ the convenor
- if (unitToImport.convenor && unitToImport.convenor !== newUnit.mainConvenorUser) {
- newUnit.addStaff(unitToImport.convenor, 'Convenor').subscribe({
- next: (newRole) => {
- console.log(`Employed ${unitToImport.convenor.name} in ${newUnit.code}`);
- newUnit.changeMainConvenor(newRole).subscribe({
- next: () => {
- console.log(`Set ${unitToImport.convenor.name} as main convenor in ${newUnit.code}`);
- },
- error: (failure) => {
- console.log(failure);
- },
- });
- },
- error: (failure) => {
- console.log(failure);
- },
- });
- }
- this.importUnit(idx + 1);
- },
- error: (failure) => {
- console.log(failure);
- unitToImport.done = false;
- this.importUnit(idx + 1);
- },
- });
+ unitToImport.sourceUnit
+ .rolloverTo({
+ new_unit_code: unitToImport.unitCode,
+ teaching_period_id: this.data.teachingPeriod.id,
+ })
+ .subscribe({
+ next: (newUnit: Unit) => {
+ unitToImport.done = true;
+ // Employ the convenor
+ if (unitToImport.convenor && unitToImport.convenor !== newUnit.mainConvenorUser) {
+ newUnit.addStaff(unitToImport.convenor, 'Convenor').subscribe({
+ next: (newRole) => {
+ console.log(`Employed ${unitToImport.convenor.name} in ${newUnit.code}`);
+ newUnit.changeMainConvenor(newRole).subscribe({
+ next: () => {
+ console.log(
+ `Set ${unitToImport.convenor.name} as main convenor in ${newUnit.code}`,
+ );
+ },
+ error: (failure) => {
+ console.log(failure);
+ },
+ });
+ },
+ error: (failure) => {
+ console.log(failure);
+ },
+ });
+ }
+ this.importUnit(idx + 1);
+ },
+ error: (failure) => {
+ console.log(failure);
+ unitToImport.done = false;
+ this.importUnit(idx + 1);
+ },
+ });
}
private createNewUnit(unitToImport: UnitImportData, idx: number) {
diff --git a/src/app/api/models/d2l/d2l_assessment_mapping.service.ts b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
new file mode 100644
index 0000000000..cef683fb23
--- /dev/null
+++ b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { EntityService } from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiURL';
+import { HttpClient } from '@angular/common/http';
+import { D2lAssessmentMapping } from './d2l_assessment_mapping';
+import { Unit } from '../doubtfire-model';
+
+@Injectable()
+export class D2lAssessmentMappingService extends EntityService {
+ protected readonly endpointFormat = 'units/:unitId:/d2l/:id:';
+
+ constructor(httpClient: HttpClient) {
+ super(httpClient, API_URL);
+
+ this.mapping.addKeys('id', 'orgUnitId', 'gradeObjectId');
+
+ this.mapping.mapAllKeysToJsonExcept('id');
+ }
+
+ public createInstanceFrom(_json: object, other: Unit): D2lAssessmentMapping {
+ return new D2lAssessmentMapping(other);
+ }
+}
diff --git a/src/app/api/models/d2l/d2l_assessment_mapping.ts b/src/app/api/models/d2l/d2l_assessment_mapping.ts
new file mode 100644
index 0000000000..ac228bdbb6
--- /dev/null
+++ b/src/app/api/models/d2l/d2l_assessment_mapping.ts
@@ -0,0 +1,15 @@
+import {Entity} from 'ngx-entity-service';
+import {Unit} from '../unit';
+
+export class D2lAssessmentMapping extends Entity {
+ id: number;
+ unit: Unit;
+
+ orgUnitId: string;
+ gradeObjectId: string;
+
+ constructor(unit: Unit) {
+ super();
+ this.unit = unit;
+ }
+}
diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index 3cb4911083..4f3da308e8 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -32,6 +32,11 @@ export * from './task-comment/discussion-comment';
export * from '../services/task-outcome-alignment.service';
export * from './task-similarity';
export * from './tii-action';
+export * from './scorm-datamodel';
+export * from './scorm-player-context';
+export * from './test-attempt';
+export * from './task-comment/scorm-comment';
+export * from './task-comment/scorm-extension-comment';
// Users -- are students or staff
export * from './user/user';
@@ -56,3 +61,5 @@ export * from '../services/teaching-period-break.service';
export * from '../services/learning-outcome.service';
export * from '../services/group-set.service';
export * from '../services/task-similarity.service';
+export * from '../services/test-attempt.service';
+export * from '../models/d2l/d2l_assessment_mapping.service';
diff --git a/src/app/api/models/scorm-datamodel.ts b/src/app/api/models/scorm-datamodel.ts
new file mode 100644
index 0000000000..0fdc2d3a06
--- /dev/null
+++ b/src/app/api/models/scorm-datamodel.ts
@@ -0,0 +1,50 @@
+export class ScormDataModel {
+ dataModel: {[key: string]: any} = {};
+ readonly msgPrefix = 'SCORM DataModel: ';
+
+ constructor() {
+ this.dataModel = {};
+ }
+
+ public restore(dataModel: string) {
+ // console.log(this.msgPrefix + 'restoring DataModel with provided data');
+ this.dataModel = JSON.parse(dataModel);
+ }
+
+ public get(key: string): string {
+ // console.log(`SCORM DataModel: get ${key} ${this.dataModel[key]}`);
+ return this.dataModel[key] ?? '';
+ }
+
+ public dump(): {[key: string]: any} {
+ return this.dataModel;
+ }
+
+ public set(key: string, value: any): string {
+ // console.log(this.msgPrefix + 'set: ', key, value);
+ this.dataModel[key] = value;
+ if (key.match('cmi.interactions.\\d+.id')) {
+ // cmi.interactions._count must be incremented after a new interaction is created
+ const interactionPath = key.match('cmi.interactions.\\d+');
+ const objectivesCounterForInteraction = interactionPath.toString() + '.objectives._count';
+ // console.log('Incrementing cmi.interactions._count');
+ this.dataModel['cmi.interactions._count']++;
+ // cmi.interactions.n.objectives._count must be initialized after an interaction is created
+ // console.log(`Initializing ${objectivesCounterForInteraction}`);
+ this.dataModel[objectivesCounterForInteraction] = 0;
+ }
+ if (key.match('cmi.interactions.\\d+.objectives.\\d+.id')) {
+ const interactionPath = key.match('cmi.interactions.\\d+.objectives');
+ const objectivesCounterForInteraction = interactionPath.toString() + '._count';
+ // cmi.interactions.n.objectives._count must be incremented after objective creation
+ // console.log(`Incrementing ${objectivesCounterForInteraction}`);
+ this.dataModel[objectivesCounterForInteraction.toString()]++;
+ }
+ if (key.match('cmi.objectives.\\d+.id')) {
+ // cmi.objectives._count must be incremented after a new objective is created
+ // console.log('Incrementing cmi.objectives._count');
+ this.dataModel['cmi.objectives._count']++;
+ }
+ return 'true';
+ }
+}
diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
new file mode 100644
index 0000000000..e8eed9b12e
--- /dev/null
+++ b/src/app/api/models/scorm-player-context.ts
@@ -0,0 +1,66 @@
+import {User} from 'src/app/api/models/doubtfire-model';
+
+type DataModelState = 'Uninitialized' | 'Initialized' | 'Terminated';
+
+type DataModelError = Record;
+const CMIErrorCodes: DataModelError = {
+ 0: 'No Error',
+ 101: 'General Exception',
+ 102: 'General Initialization Failure',
+ 103: 'Already Initialized',
+ 104: 'Content Instance Terminated',
+ 111: 'General Termination Failure',
+ 112: 'Termination Before Initialization',
+ 113: 'Termination After Termination',
+ 122: 'Retrieve Data Before Initialization',
+ 123: 'Retrieve Data After Termination',
+ 132: 'Store Data Before Initialization',
+ 133: 'Store Data After Termination',
+ 142: 'Commit Before Initialization',
+ 143: 'Commit After Termination',
+ 201: 'General Argument Error',
+ 301: 'General Get Failure',
+ 351: 'General Set Failure',
+ 391: 'General Commit Failure',
+ 401: 'Undefined Data Model Element',
+ 402: 'Unimplemented Data Model Element',
+ 403: 'Data Model Element Value Not Initialized',
+ 404: 'Data Model Element Is Read Only',
+ 405: 'Data Model Element Is Write Only',
+ 406: 'Data Model Element Type Mismatch',
+ 407: 'Data Model Element Value Out Of Range',
+ 408: 'Data Model Dependency Not Established',
+};
+
+export class ScormPlayerContext {
+ mode: 'browse' | 'normal' | 'review' | 'preview';
+ state: DataModelState;
+
+ private _errorCode: number;
+ get errorCode() {
+ return this._errorCode;
+ }
+ set errorCode(value: number) {
+ this._errorCode = value;
+ }
+
+ getErrorMessage(value: string): string {
+ return CMIErrorCodes[value];
+ }
+
+ projectId: number;
+ taskDefId: number;
+ user: User;
+
+ attemptId: number;
+ learnerName: string;
+ learnerId: number;
+
+ constructor(user: User) {
+ this.user = user;
+ this.learnerId = user.id;
+ this.learnerName = user.firstName + ' ' + user.lastName;
+ this.state = 'Uninitialized';
+ this.errorCode = 0;
+ }
+}
diff --git a/src/app/api/models/task-comment/scorm-comment.ts b/src/app/api/models/task-comment/scorm-comment.ts
new file mode 100644
index 0000000000..b15a2c50c8
--- /dev/null
+++ b/src/app/api/models/task-comment/scorm-comment.ts
@@ -0,0 +1,12 @@
+import {Task, TaskComment, TestAttempt} from '../doubtfire-model';
+
+export class ScormComment extends TaskComment {
+ testAttempt: TestAttempt;
+
+ // UI rendering data
+ lastInScormSeries: boolean = false;
+
+ constructor(task: Task) {
+ super(task);
+ }
+}
diff --git a/src/app/api/models/task-comment/scorm-extension-comment.ts b/src/app/api/models/task-comment/scorm-extension-comment.ts
new file mode 100644
index 0000000000..b8aac7909b
--- /dev/null
+++ b/src/app/api/models/task-comment/scorm-extension-comment.ts
@@ -0,0 +1,33 @@
+import {Observable} from 'rxjs';
+import {tap} from 'rxjs/operators';
+import {AppInjector} from 'src/app/app-injector';
+import {TaskCommentService} from '../../services/task-comment.service';
+import {TaskComment, Task} from '../doubtfire-model';
+
+export class ScormExtensionComment extends TaskComment {
+ assessed: boolean;
+ granted: boolean;
+ dateAssessed: Date;
+ taskScormExtensions: number;
+
+ constructor(task: Task) {
+ super(task);
+ }
+
+ private assessScormExtension(): Observable {
+ const tcs: TaskCommentService = AppInjector.get(TaskCommentService);
+ return tcs.assessScormExtension(this).pipe(
+ tap((tc: TaskComment) => {
+ const scormExtension: ScormExtensionComment = tc as ScormExtensionComment;
+
+ const task = tc.task;
+ task.scormExtensions = scormExtension.taskScormExtensions;
+ }),
+ );
+ }
+
+ public grant(): Observable {
+ this.granted = true;
+ return this.assessScormExtension();
+ }
+}
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e856..b848686768 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -21,7 +21,7 @@ export class TaskDefinition extends Entity {
targetDate: Date;
dueDate: Date;
startDate: Date;
- uploadRequirements: UploadRequirement[];
+ uploadRequirements: UploadRequirement[] = [];
tutorialStream: TutorialStream = null;
plagiarismChecks: SimilarityCheck[] = [];
plagiarismReportUrl: string;
@@ -31,6 +31,12 @@ export class TaskDefinition extends Entity {
groupSet: GroupSet = null;
hasTaskSheet: boolean;
hasTaskResources: boolean;
+ scormEnabled: boolean;
+ hasScormData: boolean;
+ scormAllowReview: boolean;
+ scormBypassTest: boolean;
+ scormTimeDelayEnabled: boolean;
+ scormAttemptLimit: number = 0;
hasTaskAssessmentResources: boolean;
isGraded: boolean;
maxQualityPts: number;
@@ -152,6 +158,20 @@ export class TaskDefinition extends Entity {
}`;
}
+ public getScormDataUrl(asAttachment: boolean = false) {
+ const constants = AppInjector.get(DoubtfireConstants);
+ return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/scorm_data.json${
+ asAttachment ? '?as_attachment=true' : ''
+ }`;
+ }
+
+ /**
+ * Open the SCORM test in a new tab - using preview mode.
+ */
+ public previewScormTest(): void {
+ window.open(`#/task_def_id/${this.id}/preview-scorm`, '_blank');
+ }
+
public get targetGradeText(): string {
return Grade.GRADES[this.targetGrade];
}
@@ -176,6 +196,12 @@ export class TaskDefinition extends Entity {
}/task_resources`;
}
+ public get scormDataUploadUrl(): string {
+ return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
+ this.id
+ }/scorm_data`;
+ }
+
public get taskAssessmentResourcesUploadUrl(): string {
return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
this.id
@@ -198,6 +224,11 @@ export class TaskDefinition extends Entity {
return httpClient.delete(this.taskResourcesUploadUrl).pipe(tap(() => (this.hasTaskResources = false)));
}
+ public deleteScormData(): Observable {
+ const httpClient = AppInjector.get(HttpClient);
+ return httpClient.delete(this.scormDataUploadUrl).pipe(tap(() => (this.hasScormData = false)));
+ }
+
public deleteTaskAssessmentResources(): Observable {
const httpClient = AppInjector.get(HttpClient);
return httpClient
diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 0ab0f8f2d9..7470b9b143 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -287,17 +287,18 @@ export class TaskStatus {
[
'discuss',
{
- detail: "You're almost complete!",
- reason: 'Your work looks good and your tutor believes it is complete.',
- action: 'To mark as complete, attend class and discuss it with your tutor.',
+ detail: 'Your work needs to be discussed further.',
+ reason: 'Your work looks good and your tutor believes it is on track.',
+ action: 'For this to be marked as complete, attend class and discuss it with your tutor.',
},
],
[
'demonstrate',
{
- detail: "You're almost complete!",
- reason: 'Your work looks good and your tutor believes it is complete.',
- action: 'To mark as complete, attend class and demonstrate how your submission works to your tutor.',
+ detail: 'Your work needs to be demonstrated.',
+ reason: 'Your work looks good and your tutor believes it is on track.',
+ action:
+ 'For this to be marked as complete you need to attend class and demonstrate how your submission works for your tutor.',
},
],
[
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2aa167adfd..f5019d4ac4 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -15,6 +15,9 @@ import {
TaskCommentService,
TaskSimilarity,
TaskSimilarityService,
+ TestAttempt,
+ TestAttemptService,
+ ScormComment,
} from './doubtfire-model';
import {Grade} from './grade';
import {LOCALE_ID} from '@angular/core';
@@ -30,6 +33,7 @@ export class Task extends Entity {
status: TaskStatusEnum = 'not_started';
dueDate: Date;
extensions: number;
+ scormExtensions: number;
submissionDate: Date;
completionDate: Date;
timesAssessed: number;
@@ -53,6 +57,7 @@ export class Task extends Entity {
public readonly commentCache: EntityCache = new EntityCache();
public readonly similarityCache: EntityCache = new EntityCache();
+ public readonly testAttemptCache: EntityCache = new EntityCache();
private _unit: Unit;
@@ -381,6 +386,14 @@ export class Task extends Entity {
if (comments[i].replyToId) {
comments[i].originalComment = comments.find((tc) => tc.id === comments[i].replyToId);
}
+
+ // Scorm series
+ if (comments[i].commentType === 'scorm') {
+ comments[i].firstInSeries = i === 0 || comments[i - 1].commentType !== 'scorm';
+ (comments[i] as ScormComment).lastInScormSeries =
+ i + 1 === comments.length || comments[i + 1]?.commentType !== 'scorm';
+ if (!comments[i].firstInSeries) comments[i].shouldShowTimestamp = false;
+ }
}
comments[comments.length - 1].shouldShowAvatar = true;
@@ -396,7 +409,7 @@ export class Task extends Entity {
public taskKeyToIdString(): string {
const key = this.taskKey();
- return `task-key-${key.studentId}-${key.taskDefAbbr}`.replace(/[.#]/g, '-');
+ return `task-key-${key.studentId}-${key.taskDefAbbr}`.replace(/[.# ]/g, '-');
}
public get similaritiesDetected(): boolean {
@@ -507,6 +520,33 @@ export class Task extends Entity {
);
}
+ public get scormEnabled(): boolean {
+ return this.definition.scormEnabled && this.definition.hasScormData;
+ }
+
+ public get scormPassed(): boolean {
+ if (this.latestCompletedTestAttempt) {
+ return this.latestCompletedTestAttempt.successStatus;
+ }
+ return false;
+ }
+
+ /**
+ * Launch the SCORM player for this task in a new window.
+ */
+ public launchScormPlayer(): void {
+ const url = `#/projects/${this.project.id}/task_def_id/${this.taskDefId}/scorm-player/normal`;
+ window.open(url, '_blank');
+ }
+
+ public get isReadyForUpload(): boolean {
+ return !this.scormEnabled || this.definition.scormBypassTest || this.scormPassed;
+ }
+
+ public get latestCompletedTestAttempt(): TestAttempt {
+ return this.testAttemptCache.currentValues.find((attempt) => attempt.terminated);
+ }
+
public submissionUrl(asAttachment: boolean = false): string {
return `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${
this.project.id
@@ -659,12 +699,15 @@ export class Task extends Entity {
public triggerTransition(status: TaskStatusEnum): void {
if (this.status === status) return;
+ const alerts: AlertService = AppInjector.get(AlertService);
const requiresFileUpload =
['ready_for_feedback', 'need_help'].includes(status) && this.requiresFileUpload();
- if (requiresFileUpload) {
+ if (requiresFileUpload && this.isReadyForUpload) {
this.presentTaskSubmissionModal(status);
+ } else if (requiresFileUpload && !this.isReadyForUpload) {
+ alerts.error('Complete Knowledge Check first to submit files', 6000);
} else {
this.updateTaskStatus(status);
}
@@ -764,4 +807,21 @@ export class Task extends Entity {
},
);
}
+
+ /**
+ * Fetch the SCORM test attempts for this task.
+ */
+ public fetchTestAttempts(): Observable {
+ const testAttemptService: TestAttemptService = AppInjector.get(TestAttemptService);
+ return testAttemptService.query(
+ {
+ project_id: this.project.id,
+ task_def_id: this.taskDefId,
+ },
+ {
+ cache: this.testAttemptCache,
+ constructorParams: this,
+ },
+ );
+ }
}
diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
new file mode 100644
index 0000000000..4497028a75
--- /dev/null
+++ b/src/app/api/models/test-attempt.ts
@@ -0,0 +1,28 @@
+import {Entity} from 'ngx-entity-service';
+import {Task} from './doubtfire-model';
+
+export class TestAttempt extends Entity {
+ id: number;
+ terminated: boolean;
+ completionStatus: boolean;
+ successStatus: boolean;
+ scoreScaled: number;
+ cmiDatamodel: string;
+ attemptedTime: Date;
+
+ task: Task;
+
+ constructor(task: Task) {
+ super();
+ this.task = task;
+ }
+
+ /**
+ * Open a test attempt window in review mode
+ */
+ public review() {
+ const url = `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.id}`;
+
+ window.open(url, '_blank');
+ }
+}
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 5c70a6eb42..f157355da0 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -22,9 +22,11 @@ import {
Project,
TutorialStreamService,
UnitRoleService,
+ D2lAssessmentMappingService,
} from './doubtfire-model';
import {LearningOutcome} from './learning-outcome';
import {AlertService} from 'src/app/common/services/alert.service';
+import { D2lAssessmentMapping } from './d2l/d2l_assessment_mapping';
export class Unit extends Entity {
id: number;
@@ -63,6 +65,8 @@ export class Unit extends Entity {
extensionWeeksOnResubmitRequest: number;
allowStudentChangeTutorial: boolean;
+ d2lMapping: D2lAssessmentMapping;
+
public readonly learningOutcomesCache: EntityCache =
new EntityCache();
public readonly tutorialStreamsCache: EntityCache =
@@ -93,6 +97,12 @@ export class Unit extends Entity {
};
}
+ public hasChanges(): boolean {
+ const unitService = AppInjector.get(UnitService);
+ const changes = this.toJson(unitService.mapping);
+ return JSON.stringify(changes) !== '{"unit":{}}';
+ }
+
public get nameAndPeriod(): string {
return `${this.name} (${
this.teachingPeriod ? this.teachingPeriod.name : this.startDate.toLocaleDateString()
@@ -231,8 +241,8 @@ export class Unit extends Entity {
return Math.round((startToNow / totalDuration) * 100);
}
- public rolloverTo(body: {start_date: Date; end_date: Date}): Observable;
- public rolloverTo(body: {teaching_period_id: number}): Observable;
+ public rolloverTo(body: {new_unit_code?: string, start_date: Date; end_date: Date}): Observable;
+ public rolloverTo(body: {new_unit_code?: string, teaching_period_id: number}): Observable;
public rolloverTo(body: any): Observable {
const unitService = AppInjector.get(UnitService);
@@ -547,4 +557,24 @@ export class Unit extends Entity {
`${this.name}-tutor-assessments.csv`,
);
}
+
+ public hasD2lMapping(): boolean {
+ const doubtfireConstants = AppInjector.get(DoubtfireConstants);
+ return (
+ doubtfireConstants.IsD2LEnabled.value &&
+ this.d2lMapping !== undefined &&
+ this.d2lMapping.orgUnitId !== undefined &&
+ this.d2lMapping.orgUnitId.length > 0
+ );
+ }
+
+ public loadD2lMapping(): Observable {
+ const d2lMappingSvc = AppInjector.get(D2lAssessmentMappingService);
+
+ return d2lMappingSvc.get({unitId: this.id}).pipe(
+ tap((mappings) => {
+ this.d2lMapping = mappings;
+ }),
+ );
+ }
}
diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index b2cb12f402..0e84fa22e5 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -1,5 +1,5 @@
import {User, UserService} from 'src/app/api/models/doubtfire-model';
-import {Inject, Injectable} from '@angular/core';
+import {Injectable} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
import {StateService, UIRouter, UIRouterGlobals} from '@uirouter/angular';
@@ -24,12 +24,21 @@ export class AuthenticationService {
public checkUserCookie(): void {
const userData = JSON.parse(localStorage.getItem(this.USERNAME_KEY));
- const user = new User();
+
+ // Exit if no user data
+ if (!userData || !userData.id) {
+ return;
+ }
+
+ // Get current user from the user service - ensure the object exists there
+ const user = this.userService.cache.getOrCreate(userData.id, this.userService, {
+ username: userData.username,
+ });
+
+ // Merge in the cached data
Object.assign(user, userData);
- if (userData && this.tryChangeUser(user)) {
- // Ensure current user is in cache
- this.userService.cache.add(user);
+ if (this.tryChangeUser(user)) {
this.userService.currentUser = user;
const resetTime = new Date(
@@ -191,4 +200,12 @@ export class AuthenticationService {
setTimeout(() => this.router.stateService.go('timeout'), 500);
}
}
+
+ public getScormToken(): Observable {
+ return this.httpClient.get(this.AUTH_URL + '/scorm').pipe(
+ map((response) => {
+ return response['scorm_auth_token'];
+ }),
+ );
+ }
}
diff --git a/src/app/api/services/mapping-fn.ts b/src/app/api/services/mapping-fn.ts
index 7302bb387f..9124152095 100644
--- a/src/app/api/services/mapping-fn.ts
+++ b/src/app/api/services/mapping-fn.ts
@@ -1,23 +1,34 @@
+import moment from 'moment';
+
export class MappingFunctions {
- public static mapDateToEndOfDay(data, key, entity, params?) {
+ public static mapDateToEndOfDay(data, key, _entity, _params?) {
const jsonDate = new Date(data[key]);
- return new Date(jsonDate.getFullYear(), jsonDate.getMonth(), jsonDate.getDate(), 23, 59, 59, 999);
+ return new Date(
+ jsonDate.getFullYear(),
+ jsonDate.getMonth(),
+ jsonDate.getDate(),
+ 23, // all dates map to end of day
+ 59,
+ 59,
+ 999,
+ );
}
- public static mapDateToDay(data, key, entity, params?) {
+ public static mapDateToDay(data, key: string, _entity, _params?) {
const jsonDate = new Date(data[key]);
return new Date(jsonDate.getFullYear(), jsonDate.getMonth(), jsonDate.getDate());
}
- public static mapDate(data, key, entity, params?) {
+ public static mapDate(data, key: string, _entity, _params?) {
return new Date(data[key]);
}
public static mapDayToJson(entity: T, key: string): string {
if (entity[key]) {
- const month = entity[key].getMonth() + 1;
- const day = entity[key].getDate();
- return `${entity[key].getFullYear()}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+ const dateValue = moment.isMoment(entity[key]) ? entity[key].toDate() : entity[key];
+ const month = dateValue.getMonth() + 1;
+ const day = dateValue.getDate();
+ return `${dateValue.getFullYear()}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
} else {
return undefined;
}
@@ -50,12 +61,12 @@ export class MappingFunctions {
}
/**
- * Calculate the time between two dates
- *
- * @param date1 days from this date
- * @param date2 to this date
- * @returns the time from date1 to date2
- */
+ * Calculate the time between two dates
+ *
+ * @param date1 days from this date
+ * @param date2 to this date
+ * @returns the time from date1 to date2
+ */
public static timeBetween(date1: Date, date2: Date): number {
return date2.getTime() - date1.getTime();
}
@@ -67,7 +78,7 @@ export class MappingFunctions {
* @param date2 to this date
* @returns the days from date1 to date2
*/
- public static daysBetween(date1: Date, date2: Date): number {
+ public static daysBetween(date1: Date, date2: Date): number {
const diff = this.timeBetween(date1, date2);
return Math.ceil(diff / (1000 * 3600 * 24));
}
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index e9ffc791ed..6bb50481a3 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -143,7 +143,7 @@ export class ProjectService extends CachedEntityService {
keys: 'tutorialEnrolments',
toEntityOp: (data: object, key: string, project: Project, params?: any) => {
const unit: Unit = project.unit;
- data[key].forEach((tutorialEnrolment: { tutorial_id: number; }) => {
+ data[key]?.forEach((tutorialEnrolment: {tutorial_id: number}) => {
if (tutorialEnrolment.tutorial_id) {
const tutorial = unit.tutorialsCache.get(tutorialEnrolment.tutorial_id);
project.tutorialEnrolmentsCache.add(tutorial);
@@ -154,12 +154,16 @@ export class ProjectService extends CachedEntityService {
{
keys: 'groups',
toEntityOp: (data: object, key: string, project: Project, params?: any) => {
- data[key].forEach((group) => {
- const theGroup = project.unit.groupSetsCache.get(group.group_set_id).groupsCache.getOrCreate(group.id, this.groupService, group, {constructorParams: project.unit});
+ data[key]?.forEach((group) => {
+ const theGroup = project.unit.groupSetsCache
+ .get(group.group_set_id)
+ .groupsCache.getOrCreate(group.id, this.groupService, group, {
+ constructorParams: project.unit,
+ });
project.groupCache.add(theGroup);
theGroup.projectsCache.add(project);
- })
+ });
},
toJsonFn: (entity: Project, key: string) => {
return entity.unit?.id;
@@ -169,7 +173,7 @@ export class ProjectService extends CachedEntityService {
keys: 'tasks',
toEntityOp: (data: object, key: string, project: Project, params?: any) => {
// create tasks from json
- data['tasks'].forEach(taskData => {
+ data['tasks']?.forEach((taskData) => {
project.taskCache.getOrCreate(taskData['id'], this.taskService, taskData, {constructorParams: project});
});
@@ -179,14 +183,14 @@ export class ProjectService extends CachedEntityService {
{
keys: 'taskOutcomeAlignments',
toEntityOp: (data: object, key: string, project: Project, params?: any) => {
- data[key].forEach(alignment => {
+ data[key]?.forEach((alignment) => {
project.taskOutcomeAlignmentsCache.getOrCreate(
alignment['id'],
taskOutcomeAlignmentService,
alignment,
{
- constructorParams: project
- }
+ constructorParams: project,
+ },
);
});
}
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
new file mode 100644
index 0000000000..0f1af9889c
--- /dev/null
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -0,0 +1,283 @@
+import {Injectable} from '@angular/core';
+import {UserService} from './user.service';
+import API_URL from 'src/app/config/constants/apiURL';
+import {ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class ScormAdapterService {
+ private dataModel: ScormDataModel;
+ private context: ScormPlayerContext;
+ private xhr: XMLHttpRequest;
+
+ constructor(private userService: UserService) {
+ this.dataModel = new ScormDataModel();
+ this.context = new ScormPlayerContext(this.userService.currentUser);
+ this.xhr = new XMLHttpRequest();
+ }
+
+ set projectId(projectId: number) {
+ this.context.projectId = projectId;
+ }
+
+ set taskDefId(taskDefId: number) {
+ this.context.taskDefId = taskDefId;
+ }
+
+ set mode(mode: 'browse' | 'normal' | 'review' | 'preview') {
+ this.context.mode = mode;
+ }
+
+ set testAttemptId(testAttemptId: number) {
+ this.context.attemptId = testAttemptId;
+ }
+
+ get state() {
+ return this.context.state;
+ }
+
+ destroy() {
+ this.dataModel = new ScormDataModel();
+ this.context.state = 'Uninitialized';
+ }
+
+ Initialize(): string {
+ // console.log('API_1484_11: Initialize');
+
+ // TODO: error handling and reporting
+ switch (this.context.state) {
+ case 'Initialized':
+ this.context.errorCode = 103;
+ // console.log('Already Initialized');
+ break;
+ case 'Terminated':
+ this.context.errorCode = 104;
+ // console.log('Content Instance Terminated');
+ break;
+ }
+
+ if (this.context.mode === 'review') {
+ this.xhr.open('GET', `${API_URL}/test_attempts/${this.context.attemptId}/review`, false);
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+
+ this.xhr.send();
+ // console.log(this.xhr.responseText);
+
+ const reviewSession = JSON.parse(this.xhr.responseText);
+ this.dataModel.restore(reviewSession.cmi_datamodel);
+ // console.log(this.dataModel.dump());
+
+ this.context.state = 'Initialized';
+ return 'true';
+ }
+
+ // TODO: move this part into the player component
+ this.xhr.open(
+ 'GET',
+ `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts/latest`,
+ false,
+ );
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+
+ let noTestFound = false;
+ let startNewTest = false;
+
+ this.xhr.onload = () => {
+ if (this.xhr.status == 404) {
+ noTestFound = true;
+ }
+
+ // if (this.xhr.status >= 200 && this.xhr.status < 400) {
+ // console.log('Retrieved the latest attempt.');
+ // } else if (this.xhr.status == 404) {
+ // console.log('Not found.');
+ // noTestFound = true;
+ // } else {
+ // console.error('Error saving DataModel:', this.xhr.responseText);
+ // }
+ };
+
+ this.xhr.send();
+ // console.log(this.xhr.responseText);
+
+ if (!noTestFound) {
+ const latestSession = JSON.parse(this.xhr.responseText);
+ // console.log('Latest exam session:', latestSession);
+ this.context.attemptId = latestSession.id;
+ if (latestSession.completion_status) {
+ startNewTest = true;
+ }
+ } else {
+ startNewTest = true;
+ }
+
+ if (!startNewTest) {
+ this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+ this.xhr.send();
+ // console.log(this.xhr.responseText);
+
+ const currentSession = JSON.parse(this.xhr.responseText);
+ // console.log('Current exam session:', currentSession);
+ this.context.attemptId = currentSession.id;
+ this.dataModel.restore(currentSession.cmi_datamodel);
+ // console.log(this.dataModel.dump());
+ } else {
+ this.xhr.open(
+ 'POST',
+ `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts`,
+ false,
+ );
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+ this.xhr.send();
+ // console.log(this.xhr.responseText);
+
+ const currentSession = JSON.parse(this.xhr.responseText);
+ // console.log('Current exam session:', currentSession);
+ this.context.attemptId = currentSession.id;
+ this.dataModel.restore(currentSession.cmi_datamodel);
+ // console.log(this.dataModel.dump());
+ }
+
+ this.context.state = 'Initialized';
+ return 'true';
+ }
+
+ Terminate(): string {
+ // console.log('API_1484_11: Terminate');
+
+ // TODO: error handling and reporting
+ switch (this.context.state) {
+ case 'Uninitialized':
+ this.context.errorCode = 112;
+ // console.log('Termination Before Initialization');
+ break;
+ case 'Terminated':
+ this.context.errorCode = 113;
+ // console.log('Termination After Termination');
+ break;
+ }
+
+ this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+ this.xhr.setRequestHeader('Content-Type', 'application/json');
+ const requestData = {
+ cmi_datamodel: JSON.stringify(this.dataModel.dump()),
+ terminated: true,
+ };
+ this.xhr.send(JSON.stringify(requestData));
+ // console.log(this.xhr.responseText);
+
+ // all done, clearing datamodel and setting state to terminated
+ this.dataModel = new ScormDataModel();
+ this.context.state = 'Terminated';
+ return 'true';
+ }
+
+ GetValue(element: string): string {
+ const value = this.dataModel.get(element);
+
+ // TODO: error reporting
+ // TODO: can't get until init is done
+ switch (this.context.state) {
+ case 'Uninitialized':
+ this.context.errorCode = 122;
+ // console.log('Retrieve Data Before Initialization');
+ break;
+ case 'Terminated':
+ this.context.errorCode = 123;
+ // console.log('Retrieve Data After Termination');
+ break;
+ }
+
+ // console.log(`API_1484_11: GetValue:`, element, value);
+ return value;
+ }
+
+ SetValue(element: string, value: any): string {
+ // console.log(`API_1484_11: SetValue:`, element, value);
+
+ // TODO: error reporting
+ // TODO: can't set until init is done
+ switch (this.context.state) {
+ case 'Uninitialized':
+ this.context.errorCode = 132;
+ // console.log('Store Data Before Initialization');
+ break;
+ case 'Terminated':
+ this.context.errorCode = 133;
+ // console.log('Store Data After Termination');
+ break;
+ }
+
+ this.dataModel.set(element, value);
+ return 'true';
+ }
+
+ Commit(): string {
+ // console.log('API_1484_11: Commit');
+
+ // TODO: error reporting
+ // TODO: can't commit until init is done
+ switch (this.context.state) {
+ case 'Uninitialized':
+ this.context.errorCode = 142;
+ // console.log('Commit Before Initialization');
+ break;
+ case 'Terminated':
+ this.context.errorCode = 143;
+ // console.log('Commit After Termination');
+ break;
+ }
+
+ this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, true);
+ this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+ this.xhr.setRequestHeader('Username', this.context.user.username);
+ this.xhr.setRequestHeader('Content-Type', 'application/json');
+ const requestData = {
+ cmi_datamodel: JSON.stringify(this.dataModel.dump()),
+ };
+
+ // this.xhr.onload = () => {
+ // if (this.xhr.status >= 200 && this.xhr.status < 400) {
+ // console.log('DataModel saved successfully.');
+ // } else {
+ // console.error('Error saving DataModel:', this.xhr.responseText);
+ // }
+ // };
+
+ // this.xhr.onerror = () => {
+ // console.error('Request failed.');
+ // };
+
+ this.xhr.send(JSON.stringify(requestData));
+ this.context.errorCode = 0;
+ return 'true';
+ }
+
+ GetLastError(): string {
+ const lastError = this.context.errorCode.toString();
+ // if (lastError !== '0') {
+ // console.log(`API_1484_11: GetLastError: ${lastError}`);
+ // }
+ return lastError;
+ }
+
+ GetErrorString(errorCode: string): string {
+ const errorString = this.context.getErrorMessage(errorCode);
+ // console.log(`API_1484_11: GetErrorString:`, errorCode, errorString);
+ return errorString;
+ }
+
+ GetDiagnostic(errorCode: string): string {
+ // TODO: implement this
+ // console.log(`API_1484_11: GetDiagnostic:`, errorCode);
+ return 'GetDiagnostic is currently not implemented';
+ }
+}
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index 9e646be77d..4f178ce771 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -1,4 +1,4 @@
-import { Task, TaskComment, UserService } from 'src/app/api/models/doubtfire-model';
+import { ScormComment, Task, TaskComment, TestAttemptService, UserService } from 'src/app/api/models/doubtfire-model';
import { EventEmitter, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { tap } from 'rxjs/operators';
@@ -11,6 +11,7 @@ import API_URL from 'src/app/config/constants/apiURL';
import { EmojiService } from 'src/app/common/services/emoji.service';
import { MappingFunctions } from './mapping-fn';
import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+import { ScormExtensionComment } from '../models/task-comment/scorm-extension-comment';
@Injectable()
export class TaskCommentService extends CachedEntityService {
@@ -22,6 +23,10 @@ export class TaskCommentService extends CachedEntityService {
'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_extension/:id:';
private readonly requestExtensionEndpointFormat =
'projects/:projectId:/task_def_id/:taskDefinitionId:/request_extension';
+ private readonly scormExtensionGrantEndpointFormat =
+ 'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_scorm_extension/:id:';
+ private readonly scormRequestExtensionEndpointFormat =
+ 'projects/:projectId:/task_def_id/:taskDefinitionId:/request_scorm_extension';
private readonly discussionCommentReplyEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/reply";
private readonly getDiscussionCommentPromptEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/prompt_number/:prompt_number:";
@@ -32,7 +37,8 @@ export class TaskCommentService extends CachedEntityService {
httpClient: HttpClient,
private emojiService: EmojiService,
private userService: UserService,
- private downloader: FileDownloaderService
+ private downloader: FileDownloaderService,
+ private testAttemptService: TestAttemptService,
) {
super(httpClient, API_URL);
@@ -41,7 +47,7 @@ export class TaskCommentService extends CachedEntityService {
{
keys: 'author',
toEntityFn: (data: object, key: string, comment: TaskComment) => {
- const user = this.userService.cache.getOrCreate(data[key].id, userService, data[key]);
+ const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
comment.initials = `${user.firstName[0]}${user.lastName[0]}`.toUpperCase();
return user;
}
@@ -49,7 +55,7 @@ export class TaskCommentService extends CachedEntityService {
{
keys: 'recipient',
toEntityFn: (data: object, key: string, comment: TaskComment) => {
- return this.userService.cache.getOrCreate(data[key].id, userService, data[key]);
+ return this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
}
},
'recipientReadTime',
@@ -85,7 +91,26 @@ export class TaskCommentService extends CachedEntityService {
'status',
'numberOfPrompts',
'timeDiscussionComplete',
- 'timeDiscussionStarted'
+ 'timeDiscussionStarted',
+
+ // Scorm Comments
+ {
+ keys: 'testAttempt',
+ toEntityFn: (data: object, key: string, comment: ScormComment) => {
+ const testAttempt = this.testAttemptService.cache.getOrCreate(
+ data[key].id,
+ testAttemptService,
+ data[key],
+ {
+ constructorParams: comment.task,
+ },
+ );
+ return testAttempt;
+ },
+ },
+
+ // Scorm Extension Comments
+ ['taskScormExtensions', 'scorm_extensions']
);
this.mapping.addJsonKey(
@@ -103,6 +128,10 @@ export class TaskCommentService extends CachedEntityService {
return new DiscussionComment(other);
case 'extension':
return new ExtensionComment(other);
+ case 'scorm':
+ return new ScormComment(other);
+ case 'scorm_extension':
+ return new ScormExtensionComment(other);
default:
return new TaskComment(other);
}
@@ -145,7 +174,7 @@ export class TaskCommentService extends CachedEntityService {
const opts: RequestOptions = { endpointFormat: this.commentEndpointFormat };
// Based on the comment type - add to the body and configure the end point
- if (commentType === 'text') {
+ if (commentType === 'text' || commentType === 'scorm') {
body.append('comment', data);
} else if (commentType === 'discussion') {
opts.endpointFormat = this.discussionEndpointFormat;
@@ -202,6 +231,39 @@ export class TaskCommentService extends CachedEntityService {
);
}
+ public assessScormExtension(extension: ScormExtensionComment): Observable {
+ const opts: RequestOptions = {
+ endpointFormat: this.scormExtensionGrantEndpointFormat,
+ entity: extension,
+ };
+
+ return super.update(
+ {
+ id: extension.id,
+ projectId: extension.project.id,
+ taskDefinitionId: extension.task.definition.id,
+ },
+ opts,
+ );
+ }
+
+ public requestScormExtension(reason: string, task: any): Observable {
+ const opts: RequestOptions = {
+ endpointFormat: this.scormRequestExtensionEndpointFormat,
+ body: {
+ comment: reason,
+ },
+ cache: task.commentCache,
+ };
+ return super.create(
+ {
+ projectId: task.project.id,
+ taskDefinitionId: task.definition.id,
+ },
+ opts,
+ );
+ }
+
public postDiscussionReply(comment: TaskComment, replyAudio: Blob): Observable{
const form = new FormData();
const pathIds = {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 13a1dd2797..0914929fbe 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -41,7 +41,7 @@ export class TaskDefinitionService extends CachedEntityService {
keys: 'uploadRequirements',
toJsonFn: (taskDef: TaskDefinition, key: string) => {
return JSON.stringify(
- taskDef.uploadRequirements.map((upreq) => {
+ taskDef.uploadRequirements?.map((upreq) => {
return {
key: upreq.key,
name: upreq.name,
@@ -49,13 +49,19 @@ export class TaskDefinitionService extends CachedEntityService {
tii_check: upreq.tiiCheck,
tii_pct: upreq.tiiPct,
};
- })
+ }),
);
},
toEntityFn: (data: object, key: string, taskDef: TaskDefinition, params?: any) => {
return (
- data[key] as Array<{ key: string; name: string; type: string; tii_check: boolean; tii_pct: number }>
- ).map((upreq) => {
+ data[key] as Array<{
+ key: string;
+ name: string;
+ type: string;
+ tii_check: boolean;
+ tii_pct: number;
+ }>
+ )?.map((upreq) => {
return {
key: upreq.key,
name: upreq.name,
@@ -93,6 +99,12 @@ export class TaskDefinitionService extends CachedEntityService {
'hasTaskSheet',
'hasTaskResources',
'hasTaskAssessmentResources',
+ 'scormEnabled',
+ 'hasScormData',
+ 'scormAllowReview',
+ 'scormBypassTest',
+ 'scormTimeDelayEnabled',
+ 'scormAttemptLimit',
'isGraded',
'maxQualityPts',
'overseerImageId',
@@ -103,7 +115,8 @@ export class TaskDefinitionService extends CachedEntityService {
'id',
'hasTaskSheet',
'hasTaskResources',
- 'hasTaskAssessmentResources'
+ 'hasTaskAssessmentResources',
+ 'hasScormData'
);
}
@@ -128,4 +141,10 @@ export class TaskDefinitionService extends CachedEntityService {
formData.append('file', file);
return AppInjector.get(HttpClient).post(taskDefinition.taskAssessmentResourcesUploadUrl, formData);
}
+
+ public uploadScormData(taskDefinition: TaskDefinition, file: File): Observable {
+ const formData = new FormData();
+ formData.append('file', file);
+ return AppInjector.get(HttpClient).post(taskDefinition.scormDataUploadUrl, formData);
+ }
}
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 344494c0eb..737fe1ea4c 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -46,6 +46,7 @@ export class TaskService extends CachedEntityService {
toEntityFn: MappingFunctions.mapDateToEndOfDay,
},
'extensions',
+ 'scormExtensions',
{
keys: 'submissionDate',
toEntityFn: MappingFunctions.mapDateToDay,
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
new file mode 100644
index 0000000000..3e2c461619
--- /dev/null
+++ b/src/app/api/services/test-attempt.service.ts
@@ -0,0 +1,88 @@
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiURL';
+import {Task, TestAttempt} from 'src/app/api/models/doubtfire-model';
+import {Observable} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {HttpClient} from '@angular/common/http';
+
+@Injectable()
+export class TestAttemptService extends CachedEntityService {
+ protected readonly endpointFormat =
+ 'projects/:project_id:/task_def_id/:task_def_id:/test_attempts';
+ protected readonly latestCompletedEndpoint =
+ this.endpointFormat + '/latest?completed=:completed:';
+
+ constructor(httpClient: HttpClient) {
+ super(httpClient, API_URL);
+
+ this.mapping.addKeys(
+ 'id',
+ 'terminated',
+ 'completionStatus',
+ 'successStatus',
+ 'scoreScaled',
+ 'cmiDatamodel',
+ 'attemptedTime',
+ );
+ }
+
+ public override createInstanceFrom(_json: object, constructorParams: Task): TestAttempt {
+ return new TestAttempt(constructorParams);
+ }
+
+ public getLatestCompletedAttempt(task: Task): Observable {
+ return this.get(
+ {
+ project_id: task.project.id,
+ task_def_id: task.taskDefId,
+ completed: true,
+ },
+ {
+ endpointFormat: this.latestCompletedEndpoint,
+ constructorParams: task,
+ },
+ );
+ }
+
+ public overrideSuccessStatus(testAttemptId: number, successStatus: boolean): void {
+ const http = AppInjector.get(HttpClient);
+
+ http
+ .patch(
+ `${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/${testAttemptId}?success_status=${successStatus}`,
+ {},
+ )
+ .subscribe({
+ next: (_data) => {
+ (AppInjector.get(AlertService) as AlertService).success(
+ 'Attempt pass status successfully overridden.',
+ 6000,
+ );
+ },
+ error: (message) => {
+ (AppInjector.get(AlertService) as AlertService).error(message, 6000);
+ },
+ });
+ }
+
+ public deleteAttempt(testAttemptId: number): void {
+ const http = AppInjector.get(HttpClient);
+
+ http
+ .delete(`${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/${testAttemptId}`, {})
+ .subscribe({
+ next: (_data) => {
+ (AppInjector.get(AlertService) as AlertService).success(
+ 'Attempt successfully deleted.',
+ 6000,
+ );
+ },
+ error: (message) => {
+ (AppInjector.get(AlertService) as AlertService).error(message, 6000);
+ },
+ });
+ }
+}
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 740e9b6cc1..c3c38c7406 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -58,7 +58,7 @@ export class UnitService extends CachedEntityService {
const unitRoleService = AppInjector.get(UnitRoleService);
// Add staff
entity.staffCache.clear();
- data[key].forEach(staff => {
+ data[key]?.forEach(staff => {
entity.staffCache.add(unitRoleService.buildInstance(staff));
});
}
@@ -66,7 +66,9 @@ export class UnitService extends CachedEntityService {
{
keys: ['mainConvenor', 'main_convenor_id'],
toEntityFn: (data, key, entity) => {
- return entity.staffCache.get(data[key]);
+ let result = entity.staffCache.get(data[key]);
+ entity.mainConvenorUser = result?.user;
+ return result;
},
toJsonFn: (unit: Unit, key: string) => {
return unit.mainConvenor?.id;
@@ -133,7 +135,7 @@ export class UnitService extends CachedEntityService {
{
keys: 'ilos',
toEntityOp: (data: object, key: string, unit: Unit) => {
- data[key].forEach(ilo => {
+ data[key]?.forEach(ilo => {
unit.learningOutcomesCache.getOrCreate(ilo['id'], this.learningOutcomeService, ilo);
});
}
@@ -160,7 +162,7 @@ export class UnitService extends CachedEntityService {
{
keys: 'groupSets',
toEntityOp: (data, key, unit) => {
- data[key].forEach((groupSetJson: object) => {
+ data[key]?.forEach((groupSetJson: object) => {
unit.groupSetsCache.add(this.groupSetService.buildInstance(groupSetJson, {constructorParams: unit}));
});
}
@@ -168,7 +170,7 @@ export class UnitService extends CachedEntityService {
{
keys: 'groups',
toEntityOp: (data, key, unit) => {
- data[key].forEach((groupJson: object) => {
+ data[key]?.forEach((groupJson: object) => {
const group = this.groupService.buildInstance(groupJson, {constructorParams: unit});
group.groupSet.groupsCache.add(group);
});
diff --git a/src/app/common/file-downloader/file-downloader.service.ts b/src/app/common/file-downloader/file-downloader.service.ts
index 3b549edbd6..57b8fff783 100644
--- a/src/app/common/file-downloader/file-downloader.service.ts
+++ b/src/app/common/file-downloader/file-downloader.service.ts
@@ -2,6 +2,16 @@ import {HttpClient, HttpResponse} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {AlertService} from '../services/alert.service';
+interface FileDownloaderData {
+ url: string;
+ response: HttpResponse;
+ success: (url: string, response: HttpResponse) => void;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ failure: (error: any) => void;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ binaryData: Blob[];
+}
+
@Injectable({
providedIn: 'root',
})
@@ -11,20 +21,99 @@ export class FileDownloaderService {
private alerts: AlertService,
) {}
+ private processPartialBlob(data: FileDownloaderData) {
+ // We now need to ask for the next part of the file
+ const range = data.response.headers.get('Content-Range');
+ if (range) {
+ // The range header is in the format "bytes start-end/totalSize"
+ const parts = range.split('/');
+
+ // Split into the range and the total size
+ if (parts.length === 2) {
+ // Parse the total size and the range
+ const totalSize = parseInt(parts[1], 10);
+
+ // Extract the range after the "bytes" part
+ const contentRange = parts[0].split(' ')[1];
+
+ // Extract the parts of the range
+ const contentRangeParts = contentRange.split('-');
+
+ // If we have two parts, we have a valid range and size
+ if (contentRangeParts.length === 2) {
+ const start = parseInt(contentRangeParts[0], 10);
+ const end = parseInt(contentRangeParts[1], 10);
+
+ // Check the start is the same as the length of the binary data received
+ if (start !== data.binaryData.map((value) => value.size).reduce((pv, cv) => pv + cv, 0)) {
+ console.log('Error: start != oldLen');
+ this.alerts.error('Error downloading file part received out of order');
+ }
+ data.binaryData.push(data.response.body);
+
+ // If the end is less than the total size, we need to request the next part
+ if (end + 1 < totalSize) {
+ const rangeHeader = {Range: `bytes=${end + 1}-${totalSize}`};
+ this.httpClient
+ .get(data.url, {responseType: 'blob', observe: 'response', headers: rangeHeader})
+ .subscribe({
+ next: (response2) => {
+ data.response = response2;
+ this.processHttpResponse(data);
+ },
+ error: (error) => {
+ if (data.failure) data.failure(error);
+ },
+ });
+ return;
+ } else {
+ // we have all of the data, so we can report success
+ this.reportSuccess(data);
+ }
+ }
+ }
+ } else {
+ // no range... so we can't do anything!
+ console.log('Error reading response from server - no range with 206 response');
+ if (data.failure) data.failure('Unable to read data from server');
+ }
+ }
+
+ private processHttpResponse(data: FileDownloaderData) {
+ // Check if we have a partial content response
+ if (data.response.status === 206) {
+ this.processPartialBlob(data);
+ } else {
+ // Save the binary data we have received so far
+ data.binaryData.push(data.response.body);
+ this.reportSuccess(data);
+ }
+ }
+
+ private reportSuccess(data: FileDownloaderData) {
+ const resourceUrl: string = window.URL.createObjectURL(
+ new Blob(data.binaryData, {type: data.response.body.type}),
+ );
+ data.success(resourceUrl, data.response);
+ }
+
public downloadBlob(
url: string,
success: (url: string, response: HttpResponse) => void,
- failure: (error: any) => void,
+ failure: (error) => void,
) {
+ // Declare binary data outside of the subscription so that it can be accessed in the second requests when partial content is returned
+ const binaryData = [];
+
this.httpClient.get(url, {responseType: 'blob', observe: 'response'}).subscribe({
next: (response) => {
- const binaryData = [];
- binaryData.push(response.body);
- // response.headers.get('content-type')
- const resourceUrl: string = window.URL.createObjectURL(
- new Blob(binaryData, {type: response.body.type}),
- );
- success(resourceUrl, response);
+ this.processHttpResponse({
+ url: url,
+ response: response,
+ success: success,
+ failure: failure,
+ binaryData: binaryData,
+ });
},
error: (error) => {
if (failure) failure(error);
@@ -36,28 +125,42 @@ export class FileDownloaderService {
window.URL.revokeObjectURL(url);
}
+ /**
+ * Download or save a blob to a file. This will trigger the user to "download"
+ * the blob, with the suggested filename.
+ *
+ * @param blobUrl the url of the blob to download/save to file
+ * @param filename the name of the file
+ */
+ public downloadBlobToFile(blobUrl: string, filename: string): void {
+ const downloadLink = document.createElement('a');
+ downloadLink.href = blobUrl;
+ downloadLink.target = '_blank';
+ downloadLink.setAttribute('download', filename);
+ document.body.appendChild(downloadLink);
+
+ downloadLink.click();
+ downloadLink.parentNode.removeChild(downloadLink);
+ }
+
public downloadFile(url: string, defaultFilename: string) {
this.downloadBlob(
url,
(resourceUrl: string, response: HttpResponse) => {
- const downloadLink = document.createElement('a');
- downloadLink.href = resourceUrl;
- downloadLink.target = '_blank';
const filenameRegex = /filename[^;=\n]*=((['']).*?\2|[^;\n]*)/;
+
const matches = filenameRegex.exec(response.headers.get('Content-Disposition'));
+ let filename: string;
+
if (matches != null && matches[1]) {
- const filename = matches[1].replace(/['']/g, '');
- downloadLink.setAttribute('download', filename);
+ filename = matches[1].replace(/['']/g, '');
} else {
- downloadLink.setAttribute('download', defaultFilename);
+ filename = defaultFilename;
}
- document.body.appendChild(downloadLink);
-
- downloadLink.click();
- downloadLink.parentNode.removeChild(downloadLink);
+ this.downloadBlobToFile(resourceUrl, filename);
},
- (error: any) => {
+ (error) => {
this.alerts.error(`Error downloading file - ${error}`);
},
);
diff --git a/src/app/common/file-uploader/file-uploader.coffee b/src/app/common/file-uploader/file-uploader.coffee
index 9f8dac5ff9..c492dac115 100644
--- a/src/app/common/file-uploader/file-uploader.coffee
+++ b/src/app/common/file-uploader/file-uploader.coffee
@@ -68,7 +68,7 @@ angular.module('doubtfire.common.file-uploader', ["ngFileUpload"])
extensions: ['pas', 'cpp', 'c', 'cs', 'csv', 'h', 'hpp', 'java', 'py', 'js', 'html', 'coffee', 'rb', 'css',
'scss', 'yaml', 'yml', 'xml', 'json', 'ts', 'r', 'rmd', 'rnw', 'rhtml', 'rpres', 'tex',
'vb', 'sql', 'txt', 'md', 'jack', 'hack', 'asm', 'hdl', 'tst', 'out', 'cmp', 'vm', 'sh', 'bat',
- 'dat', 'ipynb', 'pml']
+ 'dat', 'ipynb', 'pml', 'vue']
icon: 'fa-file-code-o'
name: 'code'
image:
diff --git a/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html
new file mode 100644
index 0000000000..f39a9580b5
--- /dev/null
+++ b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html
@@ -0,0 +1,45 @@
+
Extra attempt request
+
+
+ Please explain why you require an extra attempt for this knowledge check, the teaching team will
+ assess the request shortly.
+
+
+
+ Reason
+
+ {{ extensionData.controls.extensionReason.value.length }} / {{ reasonMaxLength }}
+ @if (extensionData.controls.extensionReason.hasError('required')) {
+ You must enter a reason
+ }
+ @if (extensionData.controls.extensionReason.hasError('minlength')) {
+ The reason must be at least {{ reasonMinLength }} characters long
+ }
+ @if (extensionData.controls.extensionReason.hasError('maxlength')) {
+ The reason must be less than {{ reasonMaxLength }} characters long
+ }
+
+
- Maximum Score
+ Quality Stars
- Provide a score alongside the task status. We recommend avoiding this practice.
+ Provide a number of stars alongside the task status. Make sure you have a clear reason for
+ each star within your task description.
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 ee0f135c26..72c309371d 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
@@ -8,6 +8,7 @@ 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';
@Component({
selector: 'f-unit-task-editor',
@@ -183,7 +184,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
task.abbreviation = abbr;
task.description = 'New Description';
task.startDate = new Date();
- task.targetDate = new Date();
+ task.targetDate = addWeeks(new Date(), 2);
task.uploadRequirements = [];
task.weighting = 4;
task.targetGrade = 0;
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
new file mode 100644
index 0000000000..ccf3c460a1
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
@@ -0,0 +1,83 @@
+
+
+
D2L Grade Transfer
+
+
+
+ There are no D2L mapping details for this unit. Please update in the Unit Administration page.
+
+
+
+
+ Make sure that all student grades are ready to be transferred. Then run the following actions
+ in order.
+
+
+
+
+
+
+ 1. Login to D2L.
+
+ This will open a new window, where you need to login to D2L to authenticate for the
+ grade transfer process.
+
+
+
+
+
+
+ 2. Begin Grade Transfer
+
This will start transferring grades to D2L. This may take a few minutes.
+
+
+
+
+
+ 3. Update the weight
+
+ Use the following button to open D2L. Update the weight based on the weight of the
+ portfolio in the unit. If this is the only assessment consider changing to a Points
+ grading scheme in D2L.
+
+
+
+
+
+
+ 34. Wait for
+ Email
+
Once the transfer is complete, you will receive an email with the results.
+
+
+
+
+
+ 45. Download
+ record
+
+ Once the transfer is complete, you can download the record of the transfer. This will
+ show you any errors that may have occurred.
+
+
+
+
+
+
+
+
+
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
new file mode 100644
index 0000000000..0e78119808
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
@@ -0,0 +1,13 @@
+mat-form-field {
+ padding: 1rem;
+}
+
+li {
+ width: 100%;
+ margin-top: 1rem;
+ margin-bottom: 1rem;
+}
+
+li button {
+ margin-right: 1rem;
+}
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
new file mode 100644
index 0000000000..a5ea244d6b
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
@@ -0,0 +1,157 @@
+//
+// Modal to show Doubtfire version info
+//
+import {HttpClient} from '@angular/common/http';
+import {Injectable, Component, Inject, OnInit} from '@angular/core';
+import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {D2lAssessmentMapping} from 'src/app/api/models/d2l/d2l_assessment_mapping';
+import {D2lAssessmentMappingService} from 'src/app/api/models/doubtfire-model';
+import {Unit} from 'src/app/api/models/unit';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+
+@Component({
+ selector: 'f-d2l-transfer',
+ templateUrl: 'd2l-transfer.component.html',
+ styleUrl: 'd2l-transfer.component.scss',
+})
+export class D2lTransferComponent implements OnInit {
+ public d2lDataMapping: D2lAssessmentMapping = new D2lAssessmentMapping(this.data);
+ private apiEndpoint: string;
+ private weightedUnit: boolean = false;
+
+ constructor(
+ @Inject(MAT_DIALOG_DATA) public data: Unit,
+ @Inject(MatDialogRef)
+ public dialogRef: MatDialogRef,
+ private alertService: AlertService,
+ public d2lAssessmentMappingService: D2lAssessmentMappingService,
+ public httpClient: HttpClient,
+ public doubtfireConstants: DoubtfireConstants,
+ public fileDownloader: FileDownloaderService,
+ ) {}
+
+ public ngOnInit(): void {
+ this.data.loadD2lMapping().subscribe({
+ next: (d2lDataMapping) => {
+ this.d2lDataMapping = d2lDataMapping;
+
+ // If we have the org unit it, then we can check the grading standard
+ if (this.d2lDataMapping.orgUnitId) {
+ this.checkUnitGradesWeighted();
+ }
+ },
+ error: (_err) => {
+ // No mapping found, create a new one
+ this.d2lDataMapping = new D2lAssessmentMapping(this.data);
+ },
+ });
+
+ this.httpClient.get(`${this.doubtfireConstants.API_URL}/d2l/endpoint`).subscribe({
+ next: (response) => {
+ this.apiEndpoint = response;
+ },
+ error: (err) => {
+ this.alertService.error(`Failed to get locaiton of D2L instance: ${err}`);
+ },
+ });
+ }
+
+ public checkUnitGradesWeighted(): void {
+ this.httpClient
+ .get(`${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades/weighted`)
+ .subscribe({
+ next: (response) => {
+ this.weightedUnit = response;
+ },
+ error: (err) => {
+ this.alertService.error(`Failed to get unit weighted status: ${err}`);
+ },
+ });
+ }
+
+ public openD2l(): void {
+ const url = `${this.doubtfireConstants.API_URL}/d2l/login_url`;
+ this.httpClient.post(url, {}).subscribe({
+ next: (response) => {
+ window.open(response, '_blank');
+ },
+ error: (err) => {
+ this.alertService.error(`Failed to get D2L login URL: ${err}`);
+ },
+ });
+ }
+
+ public openWeightPage(): void {
+ const url = `${this.apiEndpoint}/d2l/lms/grades/admin/manage/item_props_newedit.d2l?objectId=${this.d2lDataMapping.gradeObjectId}&ou=${this.d2lDataMapping.orgUnitId}&scroll=weight`;
+ console.log(url);
+ window.open(url, '_blank');
+ }
+
+ public hasD2lMapping(): boolean {
+ return this.d2lDataMapping.id !== undefined;
+ }
+
+ public hasWeight(): boolean {
+ return this.weightedUnit;
+ }
+
+ public startTransfer(): void {
+ const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
+ this.httpClient.post(url, {}).subscribe({
+ next: () => {
+ this.alertService.success('Transfer started');
+ },
+ error: (err) => {
+ this.alertService.error(`Failed to start transfer: ${err}`);
+ },
+ });
+ }
+
+ public downloadRecord(): void {
+ this.httpClient
+ .get(
+ `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades/available`,
+ )
+ .subscribe({
+ next: (response) => {
+ if (response.running) {
+ this.alertService.error('Transfer in progress, please wait');
+ } else if (response.available) {
+ const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
+ this.fileDownloader.downloadFile(url, `${this.data.code}-d2l-grades.csv`);
+ } else {
+ this.alertService.error(
+ 'No grade transfer results are available, and grade transfer does not appear to be in progress',
+ );
+ }
+ },
+ error: (err) => {
+ this.alertService.error(`Failed to download record: ${err}`);
+ },
+ });
+ }
+}
+
+/**
+ * The about doubtfire modal service - used to create and show the modal
+ */
+// eslint-disable-next-line max-classes-per-file
+@Injectable()
+export class D2lTransferModal {
+ constructor(public dialog: MatDialog) {}
+
+ public open(unit: Unit): void {
+ // Show dialog while the data above is being fetched
+ this.dialog.open(D2lTransferComponent, {
+ width: '600px',
+ data: unit,
+ });
+ }
+}
+
+interface GradesAvailableResponse {
+ available: boolean;
+ running: boolean;
+}
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index ebbc09ec9b..42bebca567 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -14,9 +14,11 @@ angular.module('doubtfire.units.states.portfolios', [])
roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
}
)
-.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService) ->
+.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService, D2lTransferModal) ->
# TODO: (@alexcu) Break this down into smaller directives/substates
+ $scope.unit.loadD2lMapping().subscribe()
+
$scope.downloadGrades = -> fileDownloaderService.downloadFile($scope.unit.gradesUrl, "#{$scope.unit.code}-grades.csv")
$scope.downloadPortfolios = -> fileDownloaderService.downloadFile($scope.unit.portfoliosUrl, "#{$scope.unit.code}-portfolios.zip")
@@ -121,7 +123,15 @@ angular.module('doubtfire.units.states.portfolios', [])
$scope.selectedStudent = student
$scope.project = null
newProjectService.loadProject(student, $scope.unit).subscribe({
- next: (project) -> $scope.project = project
+ next: (project) ->
+ $scope.project = project
+ $scope.project.preloadedUrl = $scope.project.portfolioUrl()
error: (message) -> alertService.error( message, 6000)
})
+
+ $scope.hasD2lMapping = ->
+ $scope.unit.hasD2lMapping()
+
+ $scope.transferToD2L = ->
+ D2lTransferModal.open($scope.unit)
)
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 51f09b077c..e43941ec2c 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -27,7 +27,11 @@