linus/Workshop-Wahlen
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Activity

Compare commits

base: linus:develop
Branches Tags
linus:main linus:develop
linus:1.0
..
compare: linus:cd5a0f72dee6629fe909d6b26cbf061bb21aa650
Branches Tags
linus:develop linus:main
linus:1.0

2 Commits
develop ... cd5a0f72de

Author SHA1 Message Date
Linus Maximilian Nilson
cd5a0f72de Merge pull request 'frontend: hide results when wahl is freigegeben in shortcode' (#2) from to-main/frontend-ergebnis-hide-results into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 12s
Details 
Reviewed-on: #2
 2026-01-31 09:56:01 +00:00
Linus Maximilian Nilson
8029ebfb27 Merge pull request 'develop' (#1) from develop into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 12s
Details 
Reviewed-on: #1
 2026-01-30 21:54:02 +00:00
12 changed files with 207 additions and 2087 deletions
Expand all files Collapse all files

71
.gitea/workflows/deploy.yml
View File

@@ -35,7 +35,6 @@ jobs:
# =====================
- name: Deploy to DEV via FTP
if: github.ref == 'refs/heads/develop'
shell: bash
run: |
apt-get update
apt-get install -y lftp
@@ -52,67 +51,17 @@ jobs:
# =====================
# PROD DEPLOY (FTP)
# =====================
- name: Deploy to PROD via SSH
- name: Deploy to PROD via FTP
if: github.ref == 'refs/heads/main'
env:
SSH_HOST: ${{ secrets.PROD_SSH_HOST }}
SSH_USER: ${{ secrets.PROD_SSH_USER }}
SSH_PORT: ${{ secrets.PROD_SSH_PORT }}
SSH_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
HOST_WP_ROOT: ${{ secrets.PROD_HOST_WP_ROOT }}
HOST_ABS_PLUGIN_PATH: ${{ secrets.PROD_HOST_ABS_PLUGIN_PATH }}
shell: bash
run: |
set -euo pipefail
apt-get update
# openssh-client to auth; tar for packaging with excludes
apt-get install -y openssh-client tar
apt-get install -y lftp
# Prepare SSH key
mkdir -p ~/.ssh
# Write the multiline private key exactly as provided
printf "%s\n" "$SSH_KEY" > ~/.ssh/prod_docker_key
chmod 600 ~/.ssh/prod_docker_key
# Write SSH config so DOCKER_HOST can reference a named host
cat > ~/.ssh/config <<CFG
Host prod-docker
HostName ${SSH_HOST}
User ${SSH_USER}
Port ${SSH_PORT}
IdentityFile ~/.ssh/prod_docker_key
IdentitiesOnly yes
PubkeyAuthentication yes
StrictHostKeyChecking accept-new
CFG
# Prime known_hosts (optional, StrictHostKeyChecking accept-new will handle first connect)
ssh-keyscan -p "$SSH_PORT" "$SSH_HOST" >> ~/.ssh/known_hosts || true
# Create a tarball with excludes to avoid copying VCS and CI folders
TAR_FILE="/tmp/kc-plugin.tar.gz"
tar -czf "$TAR_FILE" \
--exclude .git \
--exclude .gitea \
--exclude .github \
--exclude Notes \
--exclude "*.yml" \
--exclude "*.yaml" \
.
# Choose target path: prefer absolute plugin path; otherwise derive from HOST_WP_ROOT
if [ -n "${HOST_ABS_PLUGIN_PATH}" ]; then
echo "Deploying to absolute host path: ${HOST_ABS_PLUGIN_PATH}"
REMOTE_PATH_DECL="PLUGIN_PATH=\"${HOST_ABS_PLUGIN_PATH%/}\""
elif [ -n "${HOST_WP_ROOT}" ]; then
echo "Deploying to host path relative to remote home: \$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
REMOTE_PATH_DECL="PLUGIN_PATH=\$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
else
echo "Error: set PROD_HOST_ABS_PLUGIN_PATH (absolute) or PROD_HOST_WP_ROOT (relative)" >&2
exit 1
fi
# Upload tarball to host home and extract
scp -o StrictHostKeyChecking=accept-new -o IdentitiesOnly=yes -i ~/.ssh/prod_docker_key "$TAR_FILE" prod-docker:~/kc-plugin.tar.gz
# Use \$HOME for remote expansion (tilde does not expand inside quotes)
ssh prod-docker "$REMOTE_PATH_DECL; mkdir -p \"\$PLUGIN_PATH\" && rm -rf \"\$PLUGIN_PATH\"/* && tar -xzf \"\$HOME/kc-plugin.tar.gz\" -C \"\$PLUGIN_PATH\" && rm -f \"\$HOME/kc-plugin.tar.gz\" && ls -la \"\$PLUGIN_PATH\" | head -n 50"
lftp -u "${{ secrets.FTP_USER }},${{ secrets.FTP_PASS }}" ftp://${{ secrets.FTP_HOST }}:${{ secrets.FTP_PORT }} <<EOF
set ftp:ssl-allow no
set net:timeout 20
set net:max-retries 2
set mirror:parallel-transfer-count 2
mirror -R --delete --verbose ./ /httpdocs/wp-content/plugins/konficastle-workshopwahl/
quit
EOF

4
README.md
View File

@@ -48,7 +48,3 @@ Dieses WordPress-Plugin ermöglicht die Verwaltung und Durchführung von Worksho
Für Detailfragen zu Datenbankstruktur, Shortcodes oder Zuteilungslogik siehe die jeweiligen Dateien im `includes/`-Verzeichnis.
## Release Notes
Siehe die ausführlichen Hinweise zur Version 1.0 in [RELEASE_NOTES.md](RELEASE_NOTES.md).

2
includes/admin-teamer.php
View File

@@ -131,7 +131,7 @@ function kc_teamer_page() {
<td>".esc_html($tm->nachname)."</td>
<td class='kc-actions'>
<a class='kc-btn edit' href='?page=kc_teamer&edit_teamer={$tm->id}'>Bearbeiten</a>
<a class='kc-btn del' href='?page=kc_teamer&delete_teamer={$tm->id}' onclick=\"return confirm('Wirklich löschen?');\">Löschen</a>
<a class='kc-btn del' href='?page=kc_teamer&delete_teamer={$tm->id}' onclick=\"return confirm('Wirklich loeschen?');\">Loeschen</a>
</td>
</tr>";
}

139
includes/admin-teilnehmer.php
View File

@@ -1,103 +1,4 @@
<?php
// CSV Export Handler: früh ausführen, damit kein HTML in der CSV landet
if (isset($_GET['export_teilnehmer_csv']) && current_user_can('manage_options')) {
global $wpdb;
$prefix = $wpdb->prefix;
$all_wahlen = $wpdb->get_results("SELECT id, name FROM {$prefix}kc_wahlen WHERE deleted=0 ORDER BY id DESC");
$all_workshops = $wpdb->get_results("SELECT id, name FROM {$prefix}kc_workshops ORDER BY name");
$wahl_name_map = [];
if (!empty($all_wahlen)) {
foreach ($all_wahlen as $w) {
$wahl_name_map[intval($w->id)] = $w->name;
}
}
$workshops_map = [];
if (!empty($all_workshops)) {
foreach ($all_workshops as $ws) {
$workshops_map[intval($ws->id)] = $ws->name;
}
}
$export_wahl_id = isset($_GET['wahl_id']) ? intval($_GET['wahl_id']) : 0;
$export_phase = isset($_GET['phase']) ? intval($_GET['phase']) : 0;
$sql = "SELECT * FROM {$prefix}kc_teilnehmer";
if ($export_wahl_id > 0 && $export_phase > 0) {
$sql .= $wpdb->prepare(" WHERE wahl_id=%d AND phase=%d", $export_wahl_id, $export_phase);
} elseif ($export_wahl_id > 0) {
$sql .= $wpdb->prepare(" WHERE wahl_id=%d", $export_wahl_id);
} elseif ($export_phase > 0) {
$sql .= $wpdb->prepare(" WHERE phase=%d", $export_phase);
}
$sql .= " ORDER BY wahl_id, phase, nachname, vorname";
$export_rows = $wpdb->get_results($sql);
$filename_suffix = '_alle';
if ($export_wahl_id > 0) {
$wahl_name_for_file = isset($wahl_name_map[$export_wahl_id]) ? $wahl_name_map[$export_wahl_id] : ('wahl_'.$export_wahl_id);
$wahl_slug = sanitize_title($wahl_name_for_file);
if ($wahl_slug === '') {
$wahl_slug = 'wahl_'.$export_wahl_id;
}
$filename_suffix = '_'.$wahl_slug;
if ($export_phase > 0) {
$filename_suffix .= '_phase_'.$export_phase;
}
} elseif ($export_phase > 0) {
$filename_suffix = '_phase_'.$export_phase;
}
header('Content-Type: text/csv; charset=utf-8');
header('Content-Disposition: attachment; filename="kc_teilnehmer'.$filename_suffix.'.csv"');
echo "\xEF\xBB\xBF";
$output = fopen('php://output', 'w');
$delimiter = ';';
fputcsv($output, ['Vorname','Nachname','Wahl','Phase','Wunsch 1','Wunsch 2','Wunsch 3'], $delimiter);
$csv_clean = function($value) {
$text = html_entity_decode((string)$value, ENT_QUOTES | ENT_HTML5, 'UTF-8');
$text = wp_strip_all_tags($text, true);
$text = preg_replace('/\s+/u', ' ', $text);
return trim($text);
};
foreach ($export_rows as $tn) {
$w1_id = intval($tn->wunsch1);
$w2_id = intval($tn->wunsch2);
$w3_id = intval($tn->wunsch3);
$w1_disp = $w1_id && isset($workshops_map[$w1_id]) ? $workshops_map[$w1_id] : ($w1_id ? strval($w1_id) : '');
$w2_disp = $w2_id && isset($workshops_map[$w2_id]) ? $workshops_map[$w2_id] : ($w2_id ? strval($w2_id) : '');
$w3_disp = $w3_id && isset($workshops_map[$w3_id]) ? $workshops_map[$w3_id] : ($w3_id ? strval($w3_id) : '');
$wahl_name = isset($wahl_name_map[intval($tn->wahl_id)]) ? $wahl_name_map[intval($tn->wahl_id)] : '';
$vorname = $csv_clean($tn->vorname);
$nachname = $csv_clean($tn->nachname);
$wahl_name_clean = $csv_clean($wahl_name);
$w1_clean = $csv_clean($w1_disp);
$w2_clean = $csv_clean($w2_disp);
$w3_clean = $csv_clean($w3_disp);
fputcsv($output, [
$vorname,
$nachname,
$wahl_name_clean,
intval($tn->phase),
$w1_clean,
$w2_clean,
$w3_clean
], $delimiter);
}
fclose($output);
exit;
}
function kc_teilnehmer_page() {
global $wpdb;
$prefix = $wpdb->prefix;
@@ -106,14 +7,6 @@ function kc_teilnehmer_page() {
$all_wahlen = $wpdb->get_results("SELECT id, name, anzahl_einheiten FROM {$prefix}kc_wahlen WHERE deleted=0 ORDER BY id DESC");
$all_workshops = $wpdb->get_results("SELECT id, name FROM {$prefix}kc_workshops ORDER BY name");
// Map of wahl id => name for quick lookup
$wahl_name_map = [];
if (!empty($all_wahlen)) {
foreach ($all_wahlen as $w) {
$wahl_name_map[intval($w->id)] = $w->name;
}
}
// Map of workshop id => name for quick lookup in overview
$workshops_map = [];
if (!empty($all_workshops)) {
@@ -329,10 +222,13 @@ function kc_teilnehmer_page() {
}
// Übersicht
// Map für Wahl-ID => Name ist bereits oben aufgebaut
// Map für Wahl-ID => Name
$wahl_name_map = [];
foreach($all_wahlen as $w) {
$wahl_name_map[intval($w->id)] = $w->name;
}
echo '<div class="kc-admin-table-wrap">';
echo '<h2 style="margin-top:0;">Alle Teilnehmer</h2>';
echo '<a id="kc-export-current-view" class="kc-btn" style="float:right;margin-right:8px;margin-bottom:12px;background:#2da66a;color:#fff;" href="?page=kc_teilnehmer&export_teilnehmer_csv=1">Teilnehmer-Export (Ansicht)</a>';
echo '<a class="kc-btn" style="float:right;margin-bottom:12px;" href="?page=kc_teilnehmer&new=1">+ Neuer Teilnehmer</a>';
// Wahl-Filter-Buttons sortiert nach KC1, KC2, KC3, dann Rest
@@ -375,21 +271,13 @@ function kc_teilnehmer_page() {
foreach ($gruppen as $wid => $phasen) {
$wahl_disp = isset($wahl_name_map[$wid]) ? esc_html($wahl_name_map[$wid]) : $wid;
$csv_wahl_url = add_query_arg([
'page' => 'kc_teilnehmer',
'export_teilnehmer_csv' => 1,
'wahl_id' => intval($wid)
], admin_url('admin.php'));
// Gesamtanzahl Teilnehmer für diese Wahl berechnen
$gesamt = 0;
foreach ($phasen as $tns) $gesamt += count($tns);
echo '<details style="margin:10px 0 18px 0;border:1px solid #eaeaea;border-radius:6px;padding:8px;">';
echo '<details open style="margin:10px 0 18px 0;border:1px solid #eaeaea;border-radius:6px;padding:8px;">';
echo '<summary style="font-weight:700;cursor:pointer;">'. $wahl_disp . ' <span style="color:#555;font-weight:600;">(' . $gesamt . ' TN)</span></summary>';
echo '<div style="text-align:right;margin:8px 0 4px 0;">';
echo '<a class="kc-btn" style="background:#2da66a;color:#fff;" href="'.esc_url($csv_wahl_url).'">Teilnehmer-Export dieser Wahl</a>';
echo '</div>';
foreach ($phasen as $phase => $tns) {
echo '<details style="margin:10px 0 10px 0;border:1px solid #f0f0f0;border-radius:6px;padding:8px;">';
echo '<details open style="margin:10px 0 10px 0;border:1px solid #f0f0f0;border-radius:6px;padding:8px;">';
echo '<summary style="font-weight:600;">Phase '.intval($phase).' <span style="color:#555;font-weight:600;">('.count($tns).' TN)</span></summary>';
echo '<table class="kc-admin-table" style="margin:8px 0;">';
echo '<thead><tr><th>Vorname</th><th>Nachname</th><th>Wahl</th><th>Phase</th><th>Wunsch 1</th><th>Wunsch 2</th><th>Wunsch 3</th><th>Aktion</th></tr></thead><tbody>';
@@ -411,7 +299,7 @@ function kc_teilnehmer_page() {
<td>".$w3_disp."</td>
<td class='kc-actions'>
<a class='kc-btn edit' href='?page=kc_teilnehmer&edit_teilnehmer={$tn->id}'>Bearbeiten</a>
<a class='kc-btn del' href='?page=kc_teilnehmer&delete_teilnehmer={$tn->id}' onclick=\"return confirm('Wirklich löschen?');\">Löschen</a>
<a class='kc-btn del' href='?page=kc_teilnehmer&delete_teilnehmer={$tn->id}' onclick=\"return confirm('Wirklich loeschen?');\">Loeschen</a>
</td>
</tr>";
}
@@ -428,20 +316,11 @@ function kc_teilnehmer_page() {
var rows = Array.prototype.slice.call(document.querySelectorAll(".kc-admin-table tbody tr"));
var status = document.getElementById("kc-wahl-filter-count");
var phaseRow = document.getElementById("kc-phase-filter-row");
var exportBtn = document.getElementById("kc-export-current-view");
// Wahl-Map für Phasen
var wahlMap = '.json_encode($wahl_map, JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP).';
var currentWahl = "";
var currentPhase = "";
function updateExportButton() {
if (!exportBtn) return;
var href = "?page=kc_teilnehmer&export_teilnehmer_csv=1";
if (currentWahl) href += "&wahl_id=" + encodeURIComponent(currentWahl);
if (currentPhase) href += "&phase=" + encodeURIComponent(currentPhase);
exportBtn.setAttribute("href", href);
}
function renderPhaseButtons(wahlId) {
phaseRow.innerHTML = "";
if (!wahlId || !wahlMap[wahlId]) { phaseRow.style.display = "none"; currentPhase = ""; return; }
@@ -487,7 +366,6 @@ function kc_teilnehmer_page() {
if (show) shown++;
});
if (status) status.textContent = (wahlId ? (shown+" angezeigt") : "Alle anzeigen");
updateExportButton();
}
function attachPhaseEvents() {
@@ -518,7 +396,6 @@ function kc_teilnehmer_page() {
if(btns.length) btns[0].classList.add("active");
renderPhaseButtons("");
applyFilter("", "");
updateExportButton();
})();
</script>';
echo '</div>';

6
includes/admin-wahlen.php
View File

@@ -352,7 +352,7 @@ function kc_wahlen_page() {
echo '<td>';
echo "<form method='post' style='display:inline'>";
echo "<input type='hidden' name='wahl_id' value='".intval($wahl->id)."'>";
echo "<button name='kc_wahl_freigabe' value='".($wahl->freigegeben?"0":"1")."' class='kc-btn edit' type='submit' style='background:".($wahl->freigegeben?"#e12b2b":"#b6d333").";color:#fff;font-weight:bold;'>".($wahl->freigegeben?"Schließen":"Freigeben (zum eintragen)")."</button>";
echo "<button name='kc_wahl_freigabe' value='".($wahl->freigegeben?"0":"1")."' class='kc-btn edit' type='submit' style='background:".($wahl->freigegeben?"#e12b2b":"#b6d333").";color:#fff;font-weight:bold;'>".($wahl->freigegeben?"Schlie<EFBFBD>en":"Freigeben (zum eintragen)")."</button>";
echo "</form>";
echo '<span style="color:'.($wahl->freigegeben?"#4176be":"#d40000").';margin-left:6px;font-size:90%;font-weight:bold;">'.($wahl->freigegeben ? "freigegeben" : "geschlossen").'</span>';
echo '</td>';
@@ -360,10 +360,10 @@ function kc_wahlen_page() {
echo '<td class="kc-actions">';
echo '<a class="kc-btn" href="?page=kc_wahlen&zuweisen='.intval($wahl->id).'">Workshops zuweisen</a>';
echo '<a class="kc-btn" href="?page=kc_wahlen&edit_wahl='.intval($wahl->id).'">Bearbeiten</a>';
echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
$nonce = wp_create_nonce('kc_run_zuteilung_' . intval($wahl->id));
echo '<a class="kc-btn" href="?page=kc_wahlen&run_zuteilung='.intval($wahl->id).'&_wpnonce='.$nonce.'" onclick="return confirm(\'Zuteilung wirklich starten? Dies überschreibt vorhandene Zuteilungen.\');">Zuteilung starten</a>';
echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
echo '<a href="?page=kc_wahlen&delete_wahl='.intval($wahl->id).'" class="kc-btn del" onclick="return confirm(\'Wirklich löschen?\');">Löschen</a>';
echo '<a href="?page=kc_wahlen&delete_wahl='.intval($wahl->id).'" class="kc-btn del" onclick="return confirm(\'Wirklich loeschen?\');">Loeschen</a>';
echo '</td>';
echo '</tr>';
}

7
includes/admin-workshops.php
View File

@@ -10,9 +10,8 @@ function kc_workshops_page() {
// Liste aller Wahlen für Auswahl
$wahlen_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_wahlen ORDER BY id DESC");
// Phasen werden pro Wahl über die Spalte `anzahl_einheiten` in `kc_wahlen` bestimmt.
// Eine separate Tabelle `kc_phasen` wird nicht benötigt.
$phasen_liste = [];
// Liste aller Phasen für Auswahl
$phasen_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_phasen ORDER BY nummer");
// Workshop löschen
if (isset($_GET['delete_workshop'])) {
@@ -543,7 +542,7 @@ function kc_workshops_page() {
<td>". $wahl_str ."</td>
<td class='kc-actions'>
<a class='kc-btn edit' href='?page=kc_workshops&edit_workshop={$ws->id}'>Bearbeiten</a>
<a class='kc-btn del' href='?page=kc_workshops&delete_workshop={$ws->id}' onclick=\"return confirm('Wirklich löschen?');\">Löschen</a>
<a class='kc-btn del' href='?page=kc_workshops&delete_workshop={$ws->id}' onclick=\"return confirm('Wirklich loeschen?');\">Loeschen</a>
</td>
</tr>";
}

20
includes/admin-zuteilungen.php
View File

@@ -86,8 +86,7 @@ if (isset($_GET['export_csv']) && current_user_can('manage_options')) {
$output = fopen('php://output', 'w');
// Excel erwartet in DE meist ; als Trennzeichen
$delimiter = ';';
// Kopfzeile mit separaten Namensspalten und Wunsch
fputcsv($output, ['Phase','Workshop','Teamer','Nachname','Vorname','Wunsch'], $delimiter);
fputcsv($output, ['Phase','Workshop','Teamer','Teilnehmer'], $delimiter);
foreach($phases as $phase) {
if (empty($workshop_groups[$phase])) continue;
$display = [];
@@ -115,27 +114,14 @@ if (isset($_GET['export_csv']) && current_user_can('manage_options')) {
foreach($teilnehmer as $t) {
$vorname = preg_replace('/<[^>]*>/', '', $t->vorname);
$nachname = preg_replace('/<[^>]*>/', '', $t->nachname);
$teilnehmer_name = trim($vorname . ', ' . $nachname);
$ws_name_clean = preg_replace('/<[^>]*>/', '', $ws_name);
$teamer_str_clean = preg_replace('/<[^>]*>/', '', $teamer_str);
// Wunsch-Text ermitteln
if ($t->wunsch_rang == 0) {
$wunsch = 'Vorzuteilung';
} elseif ($t->wunsch_rang == -1) {
$wunsch = 'zugelost';
} elseif ($t->wunsch_rang == 99) {
$wunsch = 'Zulosung';
} elseif ($t->wunsch_rang > 0) {
$wunsch = intval($t->wunsch_rang) . '.';
} else {
$wunsch = '';
}
fputcsv($output, [
$phase,
$ws_name_clean,
$teamer_str_clean,
$nachname,
$vorname,
$teilnehmer_name,
$wunsch
], $delimiter);
}

1483
includes/api.php
View File

File diff suppressed because it is too large Load Diff

311
includes/force-zuteilung.php
View File

@@ -4,14 +4,14 @@ function kc_force_zuteilung_page() {
$prefix = $wpdb->prefix;
kc_admin_tabs('kc_force_zuteilung');
// Force-Zuteilung l<EFBFBD>schen
// Force-Zuteilung löschen
if (isset($_GET['delete_force'])) {
$fid = intval($_GET['delete_force']);
$wpdb->delete("{$prefix}kc_force_zuteilung", ['id' => $fid]);
echo '<div class="notice notice-success">Force-Zuteilung gel<EFBFBD>scht!</div>';
echo '<div class="notice notice-success">Force-Zuteilung gelöscht!</div>';
}
// Force speichern (neu/<EFBFBD>ndern)
// Force speichern (neu/ändern)
if (isset($_POST['kc_force_save'])) {
$data = [
'teilnehmer_id' => intval($_POST['teilnehmer_id']),
@@ -29,143 +29,69 @@ function kc_force_zuteilung_page() {
}
}
// Listen f<EFBFBD>r Dropdowns
// Listen für Dropdowns
$teilnehmer_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_teilnehmer ORDER BY nachname, vorname");
$workshop_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_workshops ORDER BY name");
$wahlen = $wpdb->get_results("SELECT id, name, COALESCE(anzahl_einheiten,1) AS anzahl_einheiten FROM {$prefix}kc_wahlen WHERE deleted=0 ORDER BY name");
$wahlen = $wpdb->get_results("SELECT id, name FROM {$prefix}kc_wahlen WHERE deleted=0 ORDER BY name");
// Bearbeiten
if (isset($_GET['edit_force'])) {
$fid = intval($_GET['edit_force']);
$fz = $wpdb->get_row("SELECT * FROM {$prefix}kc_force_zuteilung WHERE id=$fid");
echo '<div class="kc-admin-table-wrap">';
echo '<h2>Force-Zuteilung bearbeiten</h2>';
echo '<div class="kc-form-container" style="max-width:880px;padding:18px 20px;border-radius:10px;background:#fff;border:1px solid #eef3f2;">';
echo '<form method="post">';
echo '<input type="hidden" name="fid" value="'.intval($fz->id).'">';
echo '<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;align-items:start">';
// Teilnehmer
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Teilnehmer <span class="kc-required">*</span></label>';
echo '<select name="teilnehmer_id" id="kc-force-teilnehmer-dropdown" style="width:100%">';
echo '<option value="">Teilnehmer auswählen…</option>';
foreach($teilnehmer_liste as $t) {
echo '<option value="'.esc_attr($t->id).'"'.($fz->teilnehmer_id==$t->id?' selected':'').'>'
.esc_html($t->vorname.' '.$t->nachname.' (ID: '.$t->id.')')
.'</option>';
}
echo '</select>';
echo '</div>';
// Wahl
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Wahl <span class="kc-required">*</span></label>';
echo '<select name="wahl_id" id="kc-force-wahl-dropdown" style="width:100%">';
echo '<option value="">Wahl auswählen…</option>';
foreach($wahlen as $w) {
echo '<option value="'.intval($w->id).'" data-einheiten="'.intval($w->anzahl_einheiten).'"'.($fz->wahl_id==$w->id?' selected':'').'>'.esc_html($w->name.' (ID '.$w->id.')').'</option>';
}
echo '</select>';
echo '</div>';
// Phase (select so JS can populate based on Wahl)
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Phase</label>';
echo '<select name="phase" style="width:100%;padding:8px;border-radius:6px;border:1px solid #ddd">';
echo '<option value="'.intval($fz->phase).'">'.intval($fz->phase).'</option>';
echo '</select>';
echo '</div>';
// Workshop
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Workshop <span class="kc-required">*</span></label>';
echo '<select name="workshop_id" id="kc-force-workshop-dropdown" style="width:100%">';
echo '<option value="">Workshop auswählen…</option>';
foreach($workshop_liste as $ws) {
echo '<option value="'.esc_attr($ws->id).'"'.($fz->workshop_id==$ws->id?' selected':'').'>'
.esc_html($ws->name)
.'</option>';
}
echo '</select>';
echo '</div>';
// Kommentar (full width)
echo '<div style="grid-column:1/ -1">';
echo '<div class="kc-form-row">';
echo '<label>Kommentar</label>';
echo '<input type="text" name="kommentar" value="'.esc_attr($fz->kommentar).'" style="width:100%;padding:8px;border-radius:6px;border:1px solid #ddd">';
echo '</div>';
echo '</div>';
echo '</div>'; // grid
echo '<div style="margin-top:12px;display:flex;gap:10px;justify-content:flex-start">';
echo '<button name="kc_force_save" class="kc-btn" style="padding:8px 16px;">Speichern</button>';
echo '<a href="?page=kc_force_zuteilung" class="kc-btn del" style="padding:8px 16px;">Abbrechen</a>';
echo '</div>';
echo '</form>';
echo '</div>';
// Prepare JS mapping of wahl_id -> number of phases
$wahl_phases = [];
foreach ($wahlen as $w) $wahl_phases[intval($w->id)] = intval($w->anzahl_einheiten);
echo '<script>var kcWahlPhases = ' . wp_json_encode($wahl_phases) . ';</script>';
echo <<<'JS'
<script>
jQuery(function($){
$("#kc-force-teilnehmer-dropdown").select2({placeholder:"Teilnehmer auswählen…",allowClear:true});
$("#kc-force-wahl-dropdown").select2({placeholder:"Wahl auswählen…",allowClear:true});
$("#kc-force-workshop-dropdown").select2({placeholder:"Workshop auswählen…",allowClear:true});
function refreshPhaseSelect($wahlSelect, $phaseSelect, current) {
// prefer data attribute on the selected option; fall back to kcWahlPhases mapping
var selOpt = $wahlSelect.find('option:selected');
var max = parseInt(selOpt.data('einheiten') || kcWahlPhases[parseInt($wahlSelect.val(),10)] || 1, 10);
$phaseSelect.empty();
for(var i=1;i<=max;i++){
var opt = $("<option>").val(i).text(i + (i===1? " (Phase)":" (Phase)"));
$phaseSelect.append(opt);
}
if (current) {
$phaseSelect.val(current);
}
$phaseSelect.prop("disabled", false);
}
// Bind change for all existing wahl selects on the page
$(document).on("change", "#kc-force-wahl-dropdown", function(){
var $w = $(this);
var $phase = $w.closest("form").find("[name='phase']");
// try immediate refresh; if no data found, fallback to AJAX
var sel = $w.find('option:selected');
var einheiten = sel.data('einheiten') || kcWahlPhases[parseInt($w.val(),10)];
if (einheiten) {
refreshPhaseSelect($w, $phase);
} else {
// AJAX fallback to ask server for anzahl_einheiten
$.get(ajaxurl, {action: 'kc_get_wahl', id: $w.val()}).done(function(r){
if (r && r.success && r.data && r.data.anzahl_einheiten) {
// set data attribute so future reads find it
sel.data('einheiten', parseInt(r.data.anzahl_einheiten,10));
}
refreshPhaseSelect($w, $phase);
}).fail(function(){ refreshPhaseSelect($w, $phase); });
}
});
// Initialize existing phase selects based on their selected wahl
$("[name='phase']").each(function(){
var $phase = $(this);
var $form = $phase.closest("form");
var $wahl = $form.find("#kc-force-wahl-dropdown");
var current = $phase.val();
refreshPhaseSelect($wahl, $phase, current);
});
});
</script>
JS;
echo '<h2>Force-Zuteilung bearbeiten</h2>
<form method="post">
<input type="hidden" name="fid" value="'.intval($fz->id).'">
<div class="kc-form-row">
<label>Teilnehmer <span class="kc-required">*</span></label>
<select name="teilnehmer_id" id="kc-force-teilnehmer-dropdown" style="width:100%">
<option value="">Teilnehmer auswählen…</option>';
foreach($teilnehmer_liste as $t) {
echo '<option value="'.esc_attr($t->id).'"'.($fz->teilnehmer_id==$t->id?' selected':'').'>'
.esc_html($t->vorname.' '.$t->nachname.' (ID: '.$t->id.')')
.'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Wahl <span class="kc-required">*</span></label>
<select name="wahl_id" id="kc-force-wahl-dropdown" style="width:100%">
<option value="">Wahl auswählen…</option>';
foreach($wahlen as $w) {
echo '<option value="'.intval($w->id).'"'.($fz->wahl_id==$w->id?' selected':'').'>'
.esc_html($w->name.' (ID '.$w->id.')').'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Phase</label>
<input type="number" name="phase" value="'.intval($fz->phase).'" style="width:100%">
</div>
<div class="kc-form-row">
<label>Workshop <span class="kc-required">*</span></label>
<select name="workshop_id" id="kc-force-workshop-dropdown" style="width:100%">
<option value="">Workshop auswählen…</option>';
foreach($workshop_liste as $ws) {
echo '<option value="'.esc_attr($ws->id).'"'.($fz->workshop_id==$ws->id?' selected':'').'>'
.esc_html($ws->name)
.'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Kommentar</label>
<input type="text" name="kommentar" value="'.esc_attr($fz->kommentar).'" style="width:100%">
</div>
<button name="kc_force_save" class="kc-btn">Speichern</button>
<a href="?page=kc_force_zuteilung" class="kc-btn del" style="margin-left:24px;">Abbrechen</a>
</form>
<script>
jQuery(function($){
$("#kc-force-teilnehmer-dropdown").select2({placeholder:"Teilnehmer auswählen…",allowClear:true});
$("#kc-force-wahl-dropdown").select2({placeholder:"Wahl auswählen…",allowClear:true});
$("#kc-force-workshop-dropdown").select2({placeholder:"Workshop auswählen…",allowClear:true});
});
</script>';
echo '</div>';
return;
}
@@ -173,82 +99,63 @@ JS;
// Neu anlegen
if (isset($_GET['new'])) {
echo '<div class="kc-admin-table-wrap">';
echo '<h2>Neue Force-Zuteilung</h2>';
echo '<div class="kc-form-container" style="max-width:880px;padding:18px 20px;border-radius:10px;background:#fff;border:1px solid #eef3f2;">';
echo '<form method="post">';
echo '<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;align-items:start">';
// Teilnehmer
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Teilnehmer <span class="kc-required">*</span></label>';
echo '<select name="teilnehmer_id" id="kc-force-teilnehmer-dropdown" style="width:100%">';
echo '<option value="">Teilnehmer auswählen…</option>';
foreach($teilnehmer_liste as $t) {
echo '<option value="'.esc_attr($t->id).'">'.esc_html($t->vorname.' '.$t->nachname.' (ID: '.$t->id.')').'</option>';
}
echo '</select>';
echo '</div>';
// Wahl
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Wahl <span class="kc-required">*</span></label>';
echo '<select name="wahl_id" id="kc-force-wahl-dropdown" style="width:100%">';
echo '<option value="">Wahl auswählen…</option>';
foreach($wahlen as $w) {
echo '<option value="'.intval($w->id).'" data-einheiten="'.intval($w->anzahl_einheiten).'">'.esc_html($w->name.' (ID '.$w->id.')').'</option>';
}
echo '</select>';
echo '</div>';
// Phase (select so JS can populate based on Wahl)
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Phase</label>';
echo '<select name="phase" style="width:100%;padding:8px;border-radius:6px;border:1px solid #ddd">';
echo '<option value="1">1</option>';
echo '</select>';
echo '</div>';
// Workshop
echo '<div class="kc-form-row" style="min-width:0">';
echo '<label>Workshop <span class="kc-required">*</span></label>';
echo '<select name="workshop_id" id="kc-force-workshop-dropdown" style="width:100%">';
echo '<option value="">Workshop auswählen…</option>';
foreach($workshop_liste as $ws) {
echo '<option value="'.esc_attr($ws->id).'">'.esc_html($ws->name).'</option>';
}
echo '</select>';
echo '</div>';
// Kommentar full width
echo '<div style="grid-column:1/ -1">';
echo '<div class="kc-form-row">';
echo '<label>Kommentar</label>';
echo '<input type="text" name="kommentar" style="width:100%;padding:8px;border-radius:6px;border:1px solid #ddd">';
echo '</div>';
echo '</div>';
echo '</div>'; // grid
echo '<div style="margin-top:12px;display:flex;gap:10px;justify-content:flex-start">';
echo '<button name="kc_force_save" class="kc-btn" style="padding:8px 16px;">Speichern</button>';
echo '<a href="?page=kc_force_zuteilung" class="kc-btn del" style="padding:8px 16px;">Abbrechen</a>';
echo '</div>';
echo '</form>';
echo '</div>';
echo '<script>
echo '<h2>Neue Force-Zuteilung</h2>
<form method="post">
<div class="kc-form-row">
<label>Teilnehmer <span class="kc-required">*</span></label>
<select name="teilnehmer_id" id="kc-force-teilnehmer-dropdown" style="width:100%">
<option value="">Teilnehmer auswählen…</option>';
foreach($teilnehmer_liste as $t) {
echo '<option value="'.esc_attr($t->id).'">'
.esc_html($t->vorname.' '.$t->nachname.' (ID: '.$t->id.')')
.'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Wahl <span class="kc-required">*</span></label>
<select name="wahl_id" id="kc-force-wahl-dropdown" style="width:100%">
<option value="">Wahl auswählen…</option>';
foreach($wahlen as $w) {
echo '<option value="'.intval($w->id).'">'
.esc_html($w->name.' (ID '.$w->id.')').'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Phase</label>
<input type="number" name="phase" value="1" style="width:100%">
</div>
<div class="kc-form-row">
<label>Workshop <span class="kc-required">*</span></label>
<select name="workshop_id" id="kc-force-workshop-dropdown" style="width:100%">
<option value="">Workshop auswählen…</option>';
foreach($workshop_liste as $ws) {
echo '<option value="'.esc_attr($ws->id).'">'
.esc_html($ws->name)
.'</option>';
}
echo ' </select>
</div>
<div class="kc-form-row">
<label>Kommentar</label>
<input type="text" name="kommentar" style="width:100%">
</div>
<button name="kc_force_save" class="kc-btn">Speichern</button>
<a href="?page=kc_force_zuteilung" class="kc-btn del" style="margin-left:24px;">Abbrechen</a>
</form>
<script>
jQuery(function($){
$("#kc-force-teilnehmer-dropdown").select2({placeholder:"Teilnehmer auswählen…",allowClear:true});
$("#kc-force-wahl-dropdown").select2({placeholder:"Wahl auswählen…",allowClear:true});
$("#kc-force-workshop-dropdown").select2({placeholder:"Workshop auswählen…",allowClear:true});
$("#kc-force-teilnehmer-dropdown").select2({placeholder:"Teilnehmer auswählen…",allowClear:true});
$("#kc-force-wahl-dropdown").select2({placeholder:"Wahl auswählen…",allowClear:true});
$("#kc-force-workshop-dropdown").select2({placeholder:"Workshop auswählen…",allowClear:true});
});
</script>';
echo '</div>';
return;
}
// <EFBFBD>bersicht
// Übersicht
echo '<div class="kc-admin-table-wrap">';
echo '<h2 style="margin-top:0;">Alle Force-Zuteilungen</h2>';
echo '<a class="kc-btn" style="float:right;margin-bottom:12px;" href="?page=kc_force_zuteilung&new=1">+ Neue Force-Zuteilung</a>';
@@ -269,7 +176,7 @@ JS;
<td>".esc_html($f->kommentar)."</td>
<td class='kc-actions'>
<a class='kc-btn edit' href='?page=kc_force_zuteilung&edit_force={$f->id}'>Bearbeiten</a>
<a class='kc-btn del' href='?page=kc_force_zuteilung&delete_force={$f->id}' onclick=\"return confirm('Wirklich löschen?');\">löschen</a>
<a class='kc-btn del' href='?page=kc_force_zuteilung&delete_force={$f->id}' onclick=\"return confirm('Wirklich loeschen?');\">Loeschen</a>
</td>
</tr>";
}

10
includes/frontend-form.php
View File

@@ -5,8 +5,14 @@ add_shortcode('konficastle_workshopwahl', function($atts) {
global $wpdb;
// Optionales Debug-Ausgabe-Fragment (standardmäßig leer, um Warnungen zu vermeiden)
$debug_output = '';
// KRITISCHER TEST: Ausgabe ganz am Anfang
//$debug_output = '<div style="background:yellow;padding:20px;margin:20px 0;border:3px solid red;">';
//$debug_output .= '<h3>DEBUG INFO</h3>';
//$debug_output .= 'Shortcode läuft!<br>';
//$debug_output .= 'REQUEST_METHOD: ' . ($_SERVER['REQUEST_METHOD'] ?? 'NICHT GESETZT') . '<br>';
//$debug_output .= 'POST vorhanden: ' . (empty($_POST) ? 'NEIN' : 'JA') . '<br>';
//$debug_output .= 'POST Inhalt: <pre>' . print_r($_POST, true) . '</pre>';
//$debug_output .= '</div>';
$wahl = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}kc_wahlen WHERE id=%d", $wahl_id));
if(!$wahl || !$wahl->freigegeben) {

218
includes/zuteilungslogik.php
View File

@@ -49,20 +49,6 @@ function kc_run_zuteilung($wahl_id) {
// 2) Kopie der Kapazitäten für diese Phase (werden während Zuordnung reduziert)
$caps = $workshop_caps;
// Minimalanzahlen einmalig laden
$ws_ids_in_wahl = array_keys($workshops);
$min_map = [];
if (!empty($ws_ids_in_wahl)) {
$placeholders = implode(',', array_fill(0, count($ws_ids_in_wahl), '%d'));
$min_rows = $wpdb->get_results($wpdb->prepare(
"SELECT id, min_teilnehmer FROM {$prefix}kc_workshops WHERE id IN ($placeholders)",
$ws_ids_in_wahl
));
foreach($min_rows as $r) {
$min_map[intval($r->id)] = intval($r->min_teilnehmer);
}
}
// 3) Force-Zuteilungen anwenden (nur für diese Phase)
foreach($forces_all as $f) {
if(intval($f->phase) !== $phase) continue;
@@ -107,7 +93,7 @@ function kc_run_zuteilung($wahl_id) {
return true;
};
// 5) Wunschrunden 1..3 (OHNE Minimalanzahl-Prüfung - volle Priorität!)
// 5) Wunschrunden 1..3
for($wunsch=1;$wunsch<=3;$wunsch++) {
$not_assigned = [];
foreach($remaining as $tn) {
@@ -124,7 +110,8 @@ function kc_run_zuteilung($wahl_id) {
if(count($remaining) > 1) shuffle($remaining);
}
// 6) Restliche zufällig verteilen (OHNE Minimalanzahl-Prüfung)
// 6) Restliche zufällig verteilen (auf alle freie Workshops)
$freie = array_keys(array_filter($caps, function($c){return $c>0;}));
foreach($remaining as $tn) {
$freie = array_keys(array_filter($caps, function($c){return $c>0;}));
if(count($freie) === 0) {
@@ -144,178 +131,87 @@ function kc_run_zuteilung($wahl_id) {
$assign($tn, $ws_id, 99);
}
// 6.5 ITERATIVE MINIMALANZAHL-SICHERUNG: Bis alle erfüllt sind
// 6.5 Consolidate workshops that did not reach their minimal Teilnehmerzahl
// Load minimal requirements for workshops in this Wahl
$ws_ids_in_wahl = array_keys($workshops);
$iteration = 0;
$max_iterations = 10;
if (!empty($ws_ids_in_wahl)) {
$placeholders = implode(',', array_fill(0, count($ws_ids_in_wahl), '%d'));
$min_rows = $wpdb->get_results($wpdb->prepare("SELECT id, min_teilnehmer FROM {$prefix}kc_workshops WHERE id IN ($placeholders)", $ws_ids_in_wahl));
$min_map = [];
foreach($min_rows as $r) $min_map[intval($r->id)] = intval($r->min_teilnehmer);
while($iteration < $max_iterations) {
$iteration++;
error_log("Phase $phase: Minimalanzahl-Check Iteration $iteration");
// Count current assignments per workshop
$assigned_counts_raw = $wpdb->get_results($wpdb->prepare("SELECT workshop_id, COUNT(*) AS cnt FROM {$prefix}kc_zuteilung WHERE wahl_id=%d AND phase=%d AND workshop_id IS NOT NULL GROUP BY workshop_id", $wahl_id, $phase), ARRAY_A);
$assigned_counts = [];
foreach($assigned_counts_raw as $ar) $assigned_counts[intval($ar['workshop_id'])] = intval($ar['cnt']);
if (!empty($ws_ids_in_wahl)) {
// Aktuelle Belegung zählen
$assigned_counts_raw = $wpdb->get_results($wpdb->prepare(
"SELECT workshop_id, COUNT(*) AS cnt
FROM {$prefix}kc_zuteilung
WHERE wahl_id=%d AND phase=%d AND workshop_id IS NOT NULL
GROUP BY workshop_id",
$wahl_id, $phase
), 'ARRAY_A');
$assigned_counts = [];
foreach($assigned_counts_raw as $ar) {
$assigned_counts[intval($ar['workshop_id'])] = intval($ar['cnt']);
// Find failing workshops (assigned >0 but < min)
$failing = [];
foreach($ws_ids_in_wahl as $wsid) {
$min_req = intval($min_map[$wsid] ?? 0);
$cnt = intval($assigned_counts[$wsid] ?? 0);
if ($cnt > 0 && $min_req > 0 && $cnt < $min_req) {
$failing[] = $wsid;
}
}
// Unterbesetzte Workshops finden (NUR die mit Teilnehmern, aber < min)
$failing = [];
foreach($ws_ids_in_wahl as $wsid) {
$min_req = $min_map[$wsid] ?? 0;
$cnt = $assigned_counts[$wsid] ?? 0;
if ($min_req > 0 && $cnt > 0 && $cnt < $min_req) {
$failing[] = $wsid;
}
}
if (empty($failing)) {
// Alle erfüllt!
error_log("Phase $phase: ✓ Alle Workshops erfüllen ihre Minimalanzahl (Iteration $iteration)");
break;
}
error_log("Phase $phase [Iter $iteration]: $" . count($failing) . " Workshops UNTER Mindestanzahl → umverteilen");
// Alle TN aus unterbesetzten Workshops sammeln
if (!empty($failing)) {
// collect participants from failing workshops
$to_reassign = [];
foreach($failing as $fw) {
$rows = $wpdb->get_results($wpdb->prepare(
"SELECT teilnehmer_id FROM {$prefix}kc_zuteilung
WHERE wahl_id=%d AND phase=%d AND workshop_id=%d",
$wahl_id, $phase, $fw
));
foreach($rows as $r) {
$to_reassign[] = intval($r->teilnehmer_id);
}
$rows = $wpdb->get_results($wpdb->prepare("SELECT teilnehmer_id FROM {$prefix}kc_zuteilung WHERE wahl_id=%d AND phase=%d AND workshop_id=%d", $wahl_id, $phase, $fw));
foreach($rows as $r) $to_reassign[] = intval($r->teilnehmer_id);
}
if (empty($to_reassign)) {
// Keine TN zu umverteilen
error_log("Phase $phase [Iter $iteration]: Keine Teilnehmer in unterbesetzten Workshops gefunden");
break;
}
if (!empty($to_reassign)) {
// remove those assignments
$fw_placeholders = implode(',', array_map('intval', $failing));
$wpdb->query("DELETE FROM {$prefix}kc_zuteilung WHERE wahl_id=".intval($wahl_id)." AND phase=".intval($phase)." AND workshop_id IN ($fw_placeholders)");
error_log("Phase $phase [Iter $iteration]: " . count($to_reassign) . " Teilnehmer werden entfernt und neu verteilt");
// Alle Zuweisungen aus unterbesetzten Workshops löschen
$fw_list = implode(',', array_map('intval', $failing));
$wpdb->query("DELETE FROM {$prefix}kc_zuteilung
WHERE wahl_id = " . intval($wahl_id) . "
AND phase = " . intval($phase) . "
AND workshop_id IN ($fw_list)");
// Kapazitäten wieder freigeben
foreach($failing as $fw) {
$freed = $assigned_counts[$fw] ?? 0;
$caps[$fw] = $workshop_caps[$fw]; // Auf max zurücksetzen
}
// "Sichere" Workshops für Umverteilung: Kein Min ODER Min erfüllt (OHNE underbesetzte)
$safe_workshops = [];
foreach($ws_ids_in_wahl as $wsid) {
if (in_array($wsid, $failing)) continue; // Unterbesetzte raus
$min_req = $min_map[$wsid] ?? 0;
$cnt = $assigned_counts[$wsid] ?? 0;
// Sicher wenn:
// A) Kein Minimum UND noch Platz, ODER
// B) Min > 0 UND Min schon erreicht UND noch Platz, ODER
// C) Min > 0 UND alles folgenden TN passen rein (reicht für Min)
$remaining_tns_to_reassign = count($to_reassign);
$cap_left = $caps[$wsid] ?? 0;
$can_fit = false;
if ($min_req == 0) {
$can_fit = $cap_left > 0;
} else {
// Wenn Min schon erfüllt, kann man noch hinzufügen
$current_cnt = $assigned_counts[$wsid] ?? 0;
if ($current_cnt >= $min_req && $cap_left > 0) {
$can_fit = true;
}
// ODER: Wenn noch Platz für den Rest + Min
elseif ($cap_left >= $min_req) {
$can_fit = true;
}
// free capacity for the failing workshops
foreach($failing as $fw) {
$freed = intval($assigned_counts[$fw] ?? 0);
if (!isset($caps[$fw])) $caps[$fw] = 0;
$caps[$fw] += $freed;
}
if ($can_fit) {
$safe_workshops[] = $wsid;
}
}
error_log("Phase $phase [Iter $iteration]: " . count($safe_workshops) . " sichere Workshops verfügbar");
// Teilnehmer auf sichere Workshops neu verteilen
foreach($to_reassign as $tid) {
$tn = $all_teilnehmer_by_id[$tid] ?? $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$prefix}kc_teilnehmer WHERE id = %d", $tid
));
if (!$tn) continue;
$reassigned = false;
// Zuerst Wünsche auf sichere Workshops
for($w = 1; $w <= 3; $w++) {
$choice = intval($tn->{"wunsch$w"});
if ($choice > 0 && in_array($choice, $safe_workshops) && isset($caps[$choice]) && $caps[$choice] > 0) {
if ($assign($tn, $choice, $w)) {
$reassigned = true;
break;
// Try to reassign each participant preferring their wishes 1..3
foreach($to_reassign as $tid) {
$tn = isset($all_teilnehmer_by_id[$tid]) ? $all_teilnehmer_by_id[$tid] : $wpdb->get_row($wpdb->prepare("SELECT * FROM {$prefix}kc_teilnehmer WHERE id=%d", $tid));
if (!$tn) continue;
$reassigned = false;
for($w=1;$w<=3;$w++) {
$choice = intval($tn->{"wunsch$w"});
if ($choice > 0 && isset($caps[$choice]) && $caps[$choice] > 0) {
$assigned = $assign($tn, $choice, $w);
if ($assigned) { $reassigned = true; break; }
}
}
}
if ($reassigned) continue;
if ($reassigned) continue;
// Zufällig auf sichere Workshops
if (!empty($safe_workshops)) {
$available = [];
foreach($safe_workshops as $wsid) {
if (isset($caps[$wsid]) && $caps[$wsid] > 0) {
$available[] = $wsid;
}
}
// otherwise assign to any workshop with free capacity
$available = array_keys(array_filter($caps, function($c){return $c>0;}));
if (!empty($available)) {
$target = $available[array_rand($available)];
if ($assign($tn, $target, 99)) {
$reassigned = true;
}
$assign($tn, $target, 99);
continue;
}
}
// Falls immer noch nichts frei → unzugewiesen
if (!$reassigned) {
// lastly, mark as unassigned
$wpdb->insert("{$prefix}kc_zuteilung", [
'wahl_id' => $wahl_id,
'wahl_id' => $wahl_id,
'teilnehmer_id' => $tn->id,
'vorname' => $tn->vorname,
'nachname' => $tn->nachname,
'phase' => $phase,
'workshop_id' => null,
'wunsch_rang' => -1
'vorname' => $tn->vorname,
'nachname' => $tn->nachname,
'phase' => $phase,
'workshop_id' => null,
'wunsch_rang' => -1
]);
}
}
}
}
if ($iteration >= $max_iterations) {
error_log("Phase $phase: WARNUNG - Max Iterationen ($max_iterations) erreicht. Es könnten noch unterbesetzte Workshops existieren.");
}
// 7) Kapazitätsprüfung (Debug / Log)
foreach($caps as $wsid=>$capleft) {
if($capleft < 0) {

13
konficastle-workshopwahl.php
View File

@@ -1,16 +1,4 @@
<?php
// AJAX endpoint to return wahl details (anzahl_einheiten)
add_action('wp_ajax_kc_get_wahl', function(){
global $wpdb;
$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
if (!$id) {
wp_send_json_error('missing id');
}
$row = $wpdb->get_row($wpdb->prepare("SELECT id, COALESCE(anzahl_einheiten,1) as anzahl_einheiten FROM {$wpdb->prefix}kc_wahlen WHERE id=%d", $id));
if (!$row) wp_send_json_error('not found');
wp_send_json_success(['id'=>intval($row->id),'anzahl_einheiten'=>intval($row->anzahl_einheiten)]);
});
/**
* Plugin Name: Workshop-Wahlen
* Description: Workshop-Wahl-System für Konfi-Castle.com
@@ -77,5 +65,4 @@ require_once plugin_dir_path(__FILE__).'includes/frontend-form.php';
require_once plugin_dir_path(__FILE__).'includes/frontend-ergebnis.php';
require_once plugin_dir_path(__FILE__).'includes/zuteilungslogik.php';
require_once plugin_dir_path(__FILE__).'includes/admin-data.php';
require_once plugin_dir_path(__FILE__).'includes/api.php';
require_once plugin_dir_path(__FILE__).'install.php';