alex/canvasManagement
1
0
Fork 0
mirror of https://github.com/alexmickelson/canvasManagement.git synced 2026-03-25 23:28:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

module item sorting fixed

Browse Source
This commit is contained in:
Alex Mickelson
2024-01-12 17:02:13 -07:00
parent 324bb94eda
commit b28bea77e9
8 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Management.Web/Pages/Course/Module/ModuleItems/QuizListItem.razor
View File

@@ -39,7 +39,7 @@
@onclick="OnClick"
role="button"
>
<ModuleItemLayout Name=Quiz.Name IsSyncedWithCanvas=existsInCanvas>
<ModuleItemLayout Name=@Quiz.Name IsSyncedWithCanvas=@existsInCanvas>
@if(!existsInCanvas)
{
<div class="mx-3 text-body-tertiary">

3
Management/Features/Configuration/AssignmentEditorContext.cs
View File

@@ -159,7 +159,8 @@ public class AssignmentEditorContext
createdAssignmentCanvasId
);
await planner.LocalCourse.Modules.First().SortModuleItems(
var module = getCurrentLocalModule(Assignment, planner.LocalCourse);
await module.SortModuleItems(
(ulong)courseCanvasId,
canvasModule.Id,
canvas

3
Management/Features/Configuration/PageEditorContext.cs
View File

@@ -121,7 +121,8 @@ public class PageEditorContext(
canvasPage
);
await planner.LocalCourse.Modules.First().SortModuleItems(
var currentModule = getCurrentLocalModule(Page, planner.LocalCourse);
await currentModule.SortModuleItems(
(ulong)courseCanvasId,
canvasModule.Id,
canvas

11
Management/Features/Configuration/Synchronization/ModuleSyncronizationExtensions.cs
View File

@@ -40,15 +40,20 @@ public static partial class ModuleSyncronizationExtensions
var canvasModuleItems = await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId);
var moduleItemsInCorrectOrder = canvasModuleItems
.OrderBy(canvasItem => {
if(canvasItem.Type == "Page")
{
var localPage = localModule.Pages.FirstOrDefault(p => p.Name == canvasItem.Title);
Console.WriteLine(JsonSerializer.Serialize(localModule.Pages));
if(localPage != null)
return localPage.DueAt;
return localPage.DueAt.Date;
}
return canvasItem.ContentDetails?.DueAt;
return canvasItem.ContentDetails?.DueAt?.Date;
})
.Select((a, i) => (Item: a, Position: i + 1));
.ThenBy(canvasItem => canvasItem.Title)
.Select((a, i) => (Item: a, Position: i + 1))
.ToArray();
foreach (var (moduleItem, position) in moduleItemsInCorrectOrder)
{

4
Management/Services/Canvas/CanvasAssignmentService.cs
View File

@@ -24,8 +24,8 @@ public class CanvasAssignmentService(
assignments =>
assignments.Select(
a => a with { DueAt = a.DueAt?.ToLocalTime(), LockAt = a.LockAt?.ToLocalTime() }
)
);
).ToArray()
).ToArray();
}
public async Task<ulong> Create(

11
Management/Services/Canvas/CanvasModuleService.cs
View File

@@ -62,7 +62,16 @@ public class CanvasModuleService
var (items, response) = await webRequestor.GetAsync<IEnumerable<CanvasModuleItem>>(request);
if (items == null)
throw new Exception($"Error getting canvas module items for {url}");
return items;
return items.Select(i =>
i with {
ContentDetails = i.ContentDetails == null
? null
: i.ContentDetails with {
DueAt = i.ContentDetails.DueAt?.ToLocalTime(),
LockAt = i.ContentDetails.LockAt?.ToLocalTime(),
}
}
);
}
public async Task<Dictionary<CanvasModule, IEnumerable<CanvasModuleItem>>> GetAllModulesItems(

2
build.sh
View File

@@ -2,7 +2,7 @@
MAJOR_VERSION="1"
MINOR_VERSION="4"
MINOR_VERSION="5"
VERSION="$MAJOR_VERSION.$MINOR_VERSION"
dotnet publish Management.Web/ \