added feature to rename modules

This commit is contained in:
2023-09-08 14:02:51 -06:00
parent c2ce788627
commit 4a80bf4928
7 changed files with 183 additions and 90 deletions

View File

@@ -93,7 +93,7 @@ public class CoursePlanner
var assignmentsTask = canvas.Assignments.GetAll(canvasId);
var quizzesTask = canvas.Quizzes.GetAll(canvasId);
var modulesTask = canvas.GetModules(canvasId);
var modulesTask = canvas.Modules.GetModules(canvasId);
var assignmentGroupsTask = canvas.AssignmentGroups.GetAll(canvasId);
CanvasAssignments = await assignmentsTask;
@@ -101,7 +101,7 @@ public class CoursePlanner
CanvasModules = await modulesTask;
CanvasAssignmentGroups = await assignmentGroupsTask;
CanvasModulesItems = await canvas.GetAllModulesItems(canvasId, CanvasModules);
CanvasModulesItems = await canvas.Modules.GetAllModulesItems(canvasId, CanvasModules);
LoadingCanvasData = false;
StateHasChanged?.Invoke();
@@ -154,10 +154,10 @@ public class CoursePlanner
canvas
);
LocalCourse = LocalCourse with { Modules = newModules };
CanvasModules = await canvas.GetModules(canvasId);
CanvasModules = await canvas.Modules.GetModules(canvasId);
await LocalCourse.SortCanvasModules(canvasId, CanvasModules, canvas);
CanvasModulesItems = await canvas.GetAllModulesItems(canvasId, CanvasModules);
CanvasModulesItems = await canvas.Modules.GetAllModulesItems(canvasId, CanvasModules);
LocalCourse = await LocalCourse.SyncModulesWithCanvasData(canvasId, CanvasModules, canvas);
@@ -167,7 +167,7 @@ public class CoursePlanner
LocalCourse = await LocalCourse.SyncQuizzesWithCanvas(canvasId, CanvasQuizzes, canvas);
await LocalCourse.SyncModuleItemsWithCanvas(canvasId, CanvasModulesItems, canvas);
CanvasModulesItems = await canvas.GetAllModulesItems(canvasId, CanvasModules);
CanvasModulesItems = await canvas.Modules.GetAllModulesItems(canvasId, CanvasModules);
LoadingCanvasData = false;
StateHasChanged?.Invoke();

View File

@@ -1,7 +1,4 @@
using System.Text.RegularExpressions;
using CanvasModel.Assignments;
using CanvasModel.Modules;
using CanvasModel.Quizzes;
using LocalModels;
using Management.Services.Canvas;
@@ -11,7 +8,7 @@ public static partial class ModuleSyncronizationExtensions
{
internal static async Task<IEnumerable<LocalModule>> EnsureAllModulesExistInCanvas(
this LocalCourse localCourse,
ulong canvasId,
ulong canvasCourseId,
IEnumerable<CanvasModule> canvasModules,
CanvasService canvas
)
@@ -21,11 +18,15 @@ public static partial class ModuleSyncronizationExtensions
var canvasModule = canvasModules.FirstOrDefault(cm => cm.Id == module.CanvasId);
if (canvasModule == null)
{
var newModule = await canvas.CreateModule(canvasId, module.Name);
var newModule = await canvas.Modules.CreateModule(canvasCourseId, module.Name);
return module with { CanvasId = newModule.Id };
}
else
return module;
if (canvasModule.Name != module.Name)
{
await canvas.Modules.UpdateModule(canvasCourseId, canvasModule.Id, module.Name, canvasModule.Position);
}
return module;
});
var newModules = await Task.WhenAll(moduleTasks);
return newModules ?? throw new Exception("Error ensuring all modules exist in canvas");
@@ -41,13 +42,13 @@ public static partial class ModuleSyncronizationExtensions
var currentCanvasPositions = canvasModules.ToDictionary(m => m.Id, m => m.Position);
foreach (var (localModule, i) in localCourse.Modules.Select((m, i) => (m, i)))
{
var correctPosition = i + 1;
uint correctPosition = (uint)(i + 1);
var moduleCanvasId =
localModule.CanvasId ?? throw new Exception("cannot sort module if no module canvas id");
var currentCanvasPosition = currentCanvasPositions[moduleCanvasId];
if (currentCanvasPosition != correctPosition)
{
await canvas.UpdateModule(canvasId, moduleCanvasId, localModule.Name, correctPosition);
await canvas.Modules.UpdateModule(canvasId, moduleCanvasId, localModule.Name, correctPosition);
}
}
}
@@ -59,7 +60,7 @@ public static partial class ModuleSyncronizationExtensions
CanvasService canvas
)
{
canvasModules = await canvas.GetModules(canvasId);
canvasModules = await canvas.Modules.GetModules(canvasId);
return localCourse with
{
Modules = localCourse.Modules.Select(m =>
@@ -134,9 +135,9 @@ public static partial class ModuleSyncronizationExtensions
}
}
foreach(var localQuiz in localModule.Quizzes)
foreach (var localQuiz in localModule.Quizzes)
{
var canvasModuleItemContentIds = canvasModulesItems[moduleCanvasId].Select(i => i.ContentId);
if (!canvasModuleItemContentIds.Contains(localQuiz.CanvasId))
{
@@ -178,7 +179,7 @@ public static partial class ModuleSyncronizationExtensions
);
var canvasModuleItems = anyUpdated
? await canvas.GetModuleItems(canvasId, moduleCanvasId)
? await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId)
: canvasModulesItems[moduleCanvasId];
await localModule.SortModuleItems(canvasId, moduleCanvasId, canvasModuleItems, canvas);