consolodating date logic

This commit is contained in:
2024-08-24 15:46:21 -06:00
parent 446889206f
commit 368a438daa
6 changed files with 34 additions and 28 deletions

View File

@@ -1,8 +1,21 @@
import { LocalAssignment, localAssignmentMarkdown } from "@/models/local/assignmnet/localAssignment";
import { LocalCourse, LocalCourseSettings, localCourseYamlUtils } from "@/models/local/localCourse";
import {
LocalAssignment,
localAssignmentMarkdown,
} from "@/models/local/assignmnet/localAssignment";
import {
LocalCourse,
LocalCourseSettings,
localCourseYamlUtils,
} from "@/models/local/localCourse";
import { LocalModule } from "@/models/local/localModules";
import { LocalCoursePage, localPageMarkdownUtils } from "@/models/local/page/localCoursePage";
import { LocalQuiz, localQuizMarkdownUtils } from "@/models/local/quiz/localQuiz";
import {
LocalCoursePage,
localPageMarkdownUtils,
} from "@/models/local/page/localCoursePage";
import {
LocalQuiz,
localQuizMarkdownUtils,
} from "@/models/local/quiz/localQuiz";
import { promises as fs } from "fs";
import path from "path";
@@ -60,7 +73,7 @@ export const courseMarkdownLoader = {
const settingsString = await fs.readFile(settingsPath, "utf-8");
const settings = localCourseYamlUtils.parseSettingYaml(settingsString);
const folderName = path.basename(courseDirectory);
return { ...settings, name: folderName };
},

View File

@@ -7,13 +7,8 @@ import { QuestionType } from "@/models/local/quiz/localQuizQuestion";
import { fileStorageService } from "../fileStorage/fileStorageService";
describe("FileStorageTests", () => {
let storageDirectory: string;
beforeEach(() => {
const tempDirectory = path.resolve("./temp");
storageDirectory = path.join(tempDirectory, "fileStorageTests");
console.log(storageDirectory);
const storageDirectory = process.env.STORAGE_DIRECTORY ?? "/tmp/canvasManagerTests";
if (fs.existsSync(storageDirectory)) {
fs.rmdirSync(storageDirectory, { recursive: true });
}
@@ -121,7 +116,7 @@ describe("FileStorageTests", () => {
{ points: 4, label: "do task 1" },
{ points: 2, label: "do task 2" },
],
allowedFileUploadExtensions: []
allowedFileUploadExtensions: [],
},
],
quizzes: [],
@@ -171,11 +166,11 @@ describe("FileStorageTests", () => {
questionType: QuestionType.ESSAY,
points: 1,
answers: [],
matchDistractors: []
matchDistractors: [],
},
],
showCorrectAnswers: false,
allowedAttempts: 0
allowedAttempts: 0,
},
],
pages: [],
@@ -220,7 +215,7 @@ describe("FileStorageTests", () => {
{ points: 4, label: "do task 1" },
{ points: 2, label: "do task 2" },
],
allowedFileUploadExtensions: []
allowedFileUploadExtensions: [],
},
],
quizzes: [
@@ -239,10 +234,10 @@ describe("FileStorageTests", () => {
questionType: QuestionType.SHORT_ANSWER,
points: 1,
answers: [],
matchDistractors: []
matchDistractors: [],
},
],
showCorrectAnswers: false
showCorrectAnswers: false,
},
],
pages: [],