temporarily show participants again in the course-management

This commit is contained in:
Rouven Seifert 2023-09-29 17:49:45 +02:00
parent 0f0b183f5a
commit 39db962a2c
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 32 additions and 3 deletions

View file

@ -0,0 +1,25 @@
From 2f0cb978f180d073f02c2327bb627698116135e0 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 29 Sep 2023 17:37:01 +0200
Subject: [PATCH] show-participants-again
---
course-management/course/templates/subject/info.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/course-management/course/templates/subject/info.html b/course-management/course/templates/subject/info.html
index 55f1620..d1724a4 100644
--- a/course-management/course/templates/subject/info.html
+++ b/course-management/course/templates/subject/info.html
@@ -55,7 +55,7 @@
{% if course.saturated %}
<span class="badge badge-danger">{% trans 'full' %}</span>
{% else %}
- <span class="badge badge-success badge-pill">{% trans 'free places' %}</span>
+ <span class="badge badge-success badge-pill">{{ course.enrolled_students }}/{{ course.max_participants }}</span>
{% endif %}
{% else %}
<span class="badge badge-secondary">{% trans 'unavailable' %}</span>
--
2.42.0

View file

@ -0,0 +1,74 @@
{ pkgs, config, lib, ... }:
let
hostName = "kurse.${config.networking.domain}";
in
{
sops.secrets =
let inherit (config.services.course-management) user;
in
{
"course-management/secret-key".owner = user;
"course-management/adminpass".owner = user;
};
systemd.services.course-management.after = [ "postgresql.service" ];
services.course-management = {
inherit hostName;
enable = true;
package = (pkgs.course-management.overrideAttrs (_: {
patches = [
./0001-show-participants-again.patch
];
}));
settings = {
secretKeyFile = config.sops.secrets."course-management/secret-key".path;
adminPassFile = config.sops.secrets."course-management/adminpass".path;
admins = [{
name = "Root iFSR";
email = "root@${config.networking.domain}";
}];
database = {
ENGINE = "django.db.backends.postgresql";
NAME = "course-management";
};
email = lib.mkDefault {
fromEmail = "noreply@${config.networking.domain}";
serverEmail = "root@${config.networking.domain}";
};
};
};
services.postgresql = {
enable = lib.mkForce true; # upstream bacula config wants to disable it, so we need to force
ensureUsers = [{
name = "course-management";
ensurePermissions = {
"DATABASE \"course-management\"" = "ALL PRIVILEGES";
};
}];
ensureDatabases = [ "course-management" ];
};
services.nginx.virtualHosts.${hostName} = {
enableACME = true;
forceSSL = true;
# phil redirects
locations =
let
philDomain = "https://kurse-phil.ifsr.de";
courses = [ "238" "239" "240" "241" "242" "243" ];
subjects = [
"ESE 2023 PHIL Campustour"
"ESE 2023 PHIL Bowlingabend"
"ESE 2023 PHIL Filmabend"
"ESE 2023 PHIL Wandern"
"ESE 2023 PHIL Spieleabend Pen and Paper"
];
in
{
"~ \"^/course/(${builtins.concatStringsSep "|" courses})/\"".return = "301 ${philDomain}/course/$1";
"~ \"^/subject/(${builtins.concatStringsSep "|" subjects})/\"".return = "301 ${philDomain}/subject/$1";
};
};
}