slightly different compose

This commit is contained in:
2024-01-03 10:35:39 -07:00
parent 654f2be54c
commit 42a9922afa
6 changed files with 24 additions and 77 deletions

33
.vscode/launch.json vendored
View File

@@ -1,33 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/Management.Web/bin/Debug/net8.0/Management.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/Management.Web",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}

41
.vscode/tasks.json vendored
View File

@@ -1,41 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/Management.Web/Management.Web.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/Management.Web/Management.Web.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/Management.Web/Management.Web.csproj"
],
"problemMatcher": "$msCompile"
}
]
}

View File

@@ -1,5 +1,4 @@
@using Management.Web.Shared.Components @using Management.Web.Shared.Components
@using Management.Web.Shared.Components.AssignmentForm
@using Management.Web.Shared.Components.Forms @using Management.Web.Shared.Components.Forms
@using CanvasModel.Assignments @using CanvasModel.Assignments
@@ -158,6 +157,9 @@
deletingAssignmentFromCanvas = false; deletingAssignmentFromCanvas = false;
StateHasChanged(); StateHasChanged();
} }
private bool showHelp { get; set; } = false;
} }
<div class="d-flex flex-column p-2 h-100 w-100" style="height: 100%;" > <div class="d-flex flex-column p-2 h-100 w-100" style="height: 100%;" >
@@ -168,7 +170,7 @@
<section class="flex-grow-1 p-1 border rounded-4 bg-dark-subtle" style="min-height: 0;"> <section class="flex-grow-1 p-1 border rounded-4 bg-dark-subtle" style="min-height: 0;">
@if (assignmentContext.Assignment != null) @if (assignmentContext.Assignment != null)
{ {
<AssignmentMarkdownEditor /> @* <AssignmentMarkdownEditor ShowHelp="@showhelp" /> *@
} }
</section> </section>
@@ -180,6 +182,9 @@
</div> </div>
} }
<button class="btn btn-outline-secondary mx-3" @onclick="() => showHelp = !showHelp">
Toggle Help
</button>
<ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" /> <ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
<button <button
class="btn btn-outline-secondary mx-3" class="btn btn-outline-secondary mx-3"

View File

@@ -5,6 +5,8 @@
@code @code
{ {
[Parameter, EditorRequired]
public bool ShowHelp { get; set; } = false;
protected override void OnInitialized() protected override void OnInitialized()
{ {
assignmentContext.StateHasChanged += reload; assignmentContext.StateHasChanged += reload;
@@ -60,7 +62,18 @@
} }
private MarkupString preview { get => (MarkupString)Markdown.ToHtml(assignmentContext?.Assignment?.Description ?? ""); } private MarkupString preview { get => (MarkupString)Markdown.ToHtml(assignmentContext?.Assignment?.Description ?? ""); }
private string HelpText()
{
var groupNames = string.Join(", " , planner.LocalCourse?.Settings.AssignmentGroups.Select(g => g.Name));
return $@"
SubmissionTypes:
- {AssignmentSubmissionType.ONLINE_TEXT_ENTRY}
- {AssignmentSubmissionType.ONLINE_UPLOAD}
Assignment Group Names:
{groupNames}
";
}
} }
@if(assignmentContext.Assignment != null && planner.LocalCourse != null) @if(assignmentContext.Assignment != null && planner.LocalCourse != null)

View File

@@ -15,6 +15,7 @@ public class SemesterPlanner
{ {
var month = ((startDate.Month + monthDiff - 1) % 12) + 1; var month = ((startDate.Month + monthDiff - 1) % 12) + 1;
var year = startDate.Year + ((startDate.Month + monthDiff - 1) / 12); var year = startDate.Year + ((startDate.Month + monthDiff - 1) / 12);
return new CalendarMonth(year, month); return new CalendarMonth(year, month);
}); });
} }

View File

@@ -8,9 +8,11 @@ services:
- .env - .env
environment: environment:
- storageDirectory=/app/storage - storageDirectory=/app/storage
- TZ=America/Denver
volumes: volumes:
# - ./storage:/app/storage # - ./storage:/app/storage
# - ~/projects/faculty/1410/2023-fall-alex/modules:/app/storage/1410 # - ~/projects/faculty/1410/2023-fall-alex/modules:/app/storage/1410
- ~/projects/faculty/1810/2024-spring-alex/modules:/app/storage/web_intro - ~/projects/faculty/1810/2024-spring-alex/modules:/app/storage/web_intro
- ~/projects/faculty/1400/2024_spring_alex/modules:/app/storage/1400 - ~/projects/faculty/1400/2024_spring_alex/modules:/app/storage/1400
- ~/projects/faculty/1405/2024_spring_alex/modules:/app/storage/1405 - ~/projects/faculty/1405/2024_spring_alex/modules:/app/storage/1405
- ~/projects/faculty/4620_Distributed/2024Spring/modules:/app/storage/distributed