Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [10.0.1-26](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-25...v10.0.1-26) (2026-03-26)

### [10.0.1-25](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-24...v10.0.1-25) (2026-03-26)


### Features

* display sso redirecting state ([248c992](https://github.com/b0ink/doubtfire-deploy/commit/248c992f46488f61916e00a87ca32ed987721f31))
* pause feedback threshold during teaching period breaks ([#1138](https://github.com/b0ink/doubtfire-deploy/issues/1138)) ([12fbf81](https://github.com/b0ink/doubtfire-deploy/commit/12fbf8147107dc185a9a9cbea940efac93a0f316))

### [10.0.1-24](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-23...v10.0.1-24) (2026-03-24)


### Features

* confirm recursive fix in mobile tutor view ([b64601a](https://github.com/b0ink/doubtfire-deploy/commit/b64601a425c7a64bccfaf47c1e4fccb0343b1589))

### [10.0.1-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-22...v10.0.1-23) (2026-03-24)

### [10.0.1-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-21...v10.0.1-22) (2026-03-23)


Expand Down
74 changes: 52 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "doubtfire",
"version": "10.0.1-22",
"version": "10.0.1-26",
"homepage": "http://github.com/doubtfire-lms/",
"description": "Learning and feedback tool.",
"license": "AGPL-3.0",
Expand Down Expand Up @@ -59,7 +59,7 @@
"angular-mocks": "1.8.3",
"angular-nvd3": "1.0.9",
"angular-resource": "1.5.11",
"angular-sanitize": "1.5.11",
"angular-sanitize": "1.8.3",
"angular-ui-bootstrap": "0.13.4",
"angular-ui-codemirror": "0.3.0",
"angular-xeditable": "0.9.0",
Expand Down
108 changes: 106 additions & 2 deletions src/app/api/models/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ import {
import {Grade} from './grade';
import {LOCALE_ID} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {Observable, map} from 'rxjs';
import {Observable, firstValueFrom, map} from 'rxjs';
import {gradeTaskModal, uploadSubmissionModal} from 'src/app/ajs-upgraded-providers';
import {AlertService} from 'src/app/common/services/alert.service';
import {MappingFunctions} from '../services/mapping-fn';
import {TaskPrerequisite} from './task-prerequisite';

export const FeedbackModerationAction = {
ShowMore: 'show_more',
Expand Down Expand Up @@ -151,6 +152,49 @@ export class Task extends Entity {
return this.project.unit;
}

private getBreakOverlapMilliseconds(
startTime: number,
endTime: number,
breaks: readonly {startDate: Date; numberOfWeeks: number}[],
): number {
const millisecondsPerDay = 1000 * 60 * 60 * 24;

return breaks.reduce((overlap, teachingBreak) => {
const breakStart = new Date(teachingBreak.startDate).getTime();
const breakDuration = (teachingBreak.numberOfWeeks ?? 0) * 7 * millisecondsPerDay;
const breakEnd = breakStart + breakDuration;

if (!Number.isFinite(breakStart) || breakDuration <= 0) {
return overlap;
}

const overlapStart = Math.max(startTime, breakStart);
const overlapEnd = Math.min(endTime, breakEnd);

return overlap + Math.max(0, overlapEnd - overlapStart);
}, 0);
}

public daysSinceSubmission(nowTime = Date.now()): number {
const millisecondsPerDay = 1000 * 60 * 60 * 24;
const submissionTime = new Date(this.submissionDate).getTime();

if (!Number.isFinite(submissionTime) || nowTime <= submissionTime) {
return 0;
}

const teachingBreaks = this.unit.teachingPeriod?.breaks ?? [];
const pausedMilliseconds = this.getBreakOverlapMilliseconds(
submissionTime,
nowTime,
teachingBreaks,
);

return Math.floor(
Math.max(0, nowTime - submissionTime - pausedMilliseconds) / millisecondsPerDay,
);
}

/**
* Determine if a task matches a given search text.
*
Expand Down Expand Up @@ -681,6 +725,58 @@ export class Task extends Entity {
);
}

private mapUnitTaskPrerequisites(prerequisites: TaskPrerequisite[]): TaskPrerequisite[] {
const definitions = this.unit.taskDefinitions;

return prerequisites.map((prerequisite) => {
prerequisite.taskDefinition = definitions.find(
(td) => td.id === prerequisite.taskDefinitionId,
);
prerequisite.prerequisite = definitions.find((td) => td.id === prerequisite.prerequisiteId);
return prerequisite;
});
}

private buildProjectTaskForDefinition(definition: TaskDefinition): Task {
const dependentTask = new Task(this.project);
dependentTask.project = this.project;
dependentTask.definition = definition;
return dependentTask;
}

private async dependentTaskNeedsRecursiveFix(definition: TaskDefinition): Promise<boolean> {
const cachedTask = this.project.findTaskForDefinition(definition.id);
if (cachedTask) {
return cachedTask.status === 'ready_for_feedback';
}

const dependentTask = this.buildProjectTaskForDefinition(definition);
const taskWithSubmissionDetails = await firstValueFrom(dependentTask.getSubmissionDetails());
return taskWithSubmissionDetails.status === 'ready_for_feedback';
}

public async hasReadyForFeedbackDependents(): Promise<boolean> {
const allPrerequisites = await firstValueFrom(this.unit.getTaskPrerequisites());
const dependentPrerequisites = this.mapUnitTaskPrerequisites(allPrerequisites).filter(
(prerequisite) => prerequisite.prerequisiteId === this.definition.id,
);

for (const prerequisite of dependentPrerequisites) {
if (!prerequisite.taskDefinition) {
continue;
}

const shouldTriggerRecursiveFix = await this.dependentTaskNeedsRecursiveFix(
prerequisite.taskDefinition,
);
if (shouldTriggerRecursiveFix) {
return true;
}
}

return false;
}

public get overseerEnabled(): boolean {
return this.unit.overseerEnabled && this.definition.assessmentEnabled;
}
Expand Down Expand Up @@ -826,7 +922,11 @@ export class Task extends Entity {
});
}

public updateTaskStatus(status: TaskStatusEnum, markAsDiscussed?: boolean) {
public updateTaskStatus(
status: TaskStatusEnum,
markAsDiscussed?: boolean,
triggerRecursiveFix?: boolean,
) {
const oldStatus = this.status;
const alerts: AlertService = AppInjector.get(AlertService);

Expand All @@ -851,6 +951,10 @@ export class Task extends Entity {
options.body['discussed'] = true;
}

if (triggerRecursiveFix === true) {
options.body['trigger_recursive_fix'] = true;
}

const hasId: boolean = this.id > 0;

taskService
Expand Down
Loading