Update KC Wahlen Button Reihenfolge

update Readme

.gitea/workflows/deploy.yml

@@ -98,6 +98,7 @@ jobs:
             --exclude Notes \
             --exclude "*.yml" \
             --exclude "*.yaml" \
+            --exclude "*.md" \
             .
           
           # Choose target path: prefer absolute plugin path; otherwise derive from HOST_WP_ROOT

README.md

@@ -47,8 +47,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).
-

includes/admin-teilnehmer.php

@@ -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,19 +271,11 @@ 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 '<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 '<summary style="font-weight:600;">Phase '.intval($phase).' <span style="color:#555;font-weight:600;">('.count($tns).' TN)</span></summary>';
@@ -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>';

includes/zuteilungslogik.php

@@ -48,21 +48,7 @@ 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,177 +131,86 @@ 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;
-        
-        while($iteration < $max_iterations) {
-            $iteration++;
-            error_log("Phase $phase: Minimalanzahl-Check Iteration $iteration");
-            
-            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');
+        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);
 
-                $assigned_counts = [];
-                foreach($assigned_counts_raw as $ar) {
-                    $assigned_counts[intval($ar['workshop_id'])] = intval($ar['cnt']);
+            // 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']);
+
+            // 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)) {
+                    // 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)");
+
+                    // 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 (empty($to_reassign)) {
-                    // Keine TN zu umverteilen
-                    error_log("Phase $phase [Iter $iteration]: Keine Teilnehmer in unterbesetzten Workshops gefunden");
-                    break;
-                }
-
-                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;  
-                        }
-                    }
-                    
-                    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) {

install.php

@@ -1,139 +1,140 @@
-<?php
-if (!defined('ABSPATH')) exit;
-
-/**
- * Create plugin database tables on activation and remove them on deactivation.
- */
-function kc_install_tables() {
-    global $wpdb;
-    $prefix = $wpdb->prefix;
-    $charset_collate = $wpdb->get_charset_collate();
-
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-    // Tables definitions
-    $tables_sql = [];
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahlen (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        name varchar(191) NOT NULL,
-        beschreibung text DEFAULT NULL,
-        anzahl_einheiten tinyint NOT NULL DEFAULT 1,
-        min_kapazitaet int NOT NULL DEFAULT 0,
-        max_kapazitaet int NOT NULL DEFAULT 0,
-        freigegeben tinyint(1) NOT NULL DEFAULT 0,
-        deleted tinyint(1) NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_workshops (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        name varchar(191) NOT NULL,
-        beschreibung text DEFAULT NULL,
-        max_teilnehmer int NOT NULL DEFAULT 0,
-        min_teilnehmer int NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_teamer (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        vorname varchar(191) DEFAULT NULL,
-        nachname varchar(191) DEFAULT NULL,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_teilnehmer (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        vorname varchar(191) DEFAULT NULL,
-        nachname varchar(191) DEFAULT NULL,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
-        wunsch1 bigint(20) unsigned DEFAULT NULL,
-        wunsch2 bigint(20) unsigned DEFAULT NULL,
-        wunsch3 bigint(20) unsigned DEFAULT NULL,
-		deleted tinyint(1) NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahl_workshops (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        workshop_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_force_zuteilung (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
-        workshop_id bigint(20) unsigned DEFAULT NULL,
-        kommentar text DEFAULT NULL,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_zuteilung (
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        vorname varchar(191) DEFAULT NULL,
-        nachname varchar(191) DEFAULT NULL,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
-        workshop_id bigint(20) unsigned DEFAULT NULL,
-        wunsch_rang tinyint DEFAULT NULL,
-        PRIMARY KEY (id)
-    ) $charset_collate";
-	
-	$tables_sql[] = "CREATE TABLE {$prefix}kc_workshop_teamer (
-		id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-		workshop_id bigint(20) unsigned DEFAULT NULL,
-		teamer_id bigint(20) unsigned DEFAULT NULL,
-		PRIMARY KEY (id)
-	) $charset_collate";
-
-    foreach ($tables_sql as $sql) {
-        dbDelta($sql);
-    }
-
-    // Post-creation migration guard: ensure min_teilnehmer exists for older installs
-    $col = $wpdb->get_var($wpdb->prepare("SHOW COLUMNS FROM {$prefix}kc_workshops LIKE %s", 'min_teilnehmer'));
-    if (empty($col)) {
-        // try to add the column (no-op on newer installs)
-        $wpdb->query("ALTER TABLE {$prefix}kc_workshops ADD COLUMN min_teilnehmer INT NOT NULL DEFAULT 0");
-    }
-
-    // Optionally store plugin version
-    add_option('kc_workshopwahl_db_version', '1.0');
-}
-
-function kc_uninstall_tables() {
-    global $wpdb;
-    $prefix = $wpdb->prefix;
-
-    $tables = [
-        "{$prefix}kc_zuteilung",
-        "{$prefix}kc_force_zuteilung",
-        "{$prefix}kc_wahl_workshops",
-        "{$prefix}kc_teilnehmer",
-        "{$prefix}kc_teamer",
-        "{$prefix}kc_workshops",
-        "{$prefix}kc_wahlen",
-		"{$prefix}kc_workshop_teamer"
-    ];
-
-    foreach ($tables as $t) {
-        $wpdb->query("DROP TABLE IF EXISTS $t");
-    }
-
-    delete_option('kc_workshopwahl_db_version');
-}
-
-// Backwards-compat wrapper for register_activation_hook usage
-if (!function_exists('kc_register_hooks_internal')) {
-    function kc_register_hooks_internal() {
-        // intentionally left blank
-    }
-}
-
-?>
+<?php
+if (!defined('ABSPATH')) exit;
+
+/**
+ * Create plugin database tables on activation and remove them on deactivation.
+ 
+ */
+function kc_install_tables() {
+    global $wpdb;
+    $prefix = $wpdb->prefix;
+    $charset_collate = $wpdb->get_charset_collate();
+
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+    // Tables definitions
+    $tables_sql = [];
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahlen (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        name varchar(191) NOT NULL,
+        beschreibung text DEFAULT NULL,
+        anzahl_einheiten tinyint NOT NULL DEFAULT 1,
+        min_kapazitaet int NOT NULL DEFAULT 0,
+        max_kapazitaet int NOT NULL DEFAULT 0,
+        freigegeben tinyint(1) NOT NULL DEFAULT 0,
+        deleted tinyint(1) NOT NULL DEFAULT 0,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_workshops (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        name varchar(191) NOT NULL,
+        beschreibung text DEFAULT NULL,
+        max_teilnehmer int NOT NULL DEFAULT 0,
+        min_teilnehmer int NOT NULL DEFAULT 0,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_teamer (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        vorname varchar(191) DEFAULT NULL,
+        nachname varchar(191) DEFAULT NULL,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_teilnehmer (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        vorname varchar(191) DEFAULT NULL,
+        nachname varchar(191) DEFAULT NULL,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        phase tinyint NOT NULL DEFAULT 1,
+        wunsch1 bigint(20) unsigned DEFAULT NULL,
+        wunsch2 bigint(20) unsigned DEFAULT NULL,
+        wunsch3 bigint(20) unsigned DEFAULT NULL,
+		deleted tinyint(1) NOT NULL DEFAULT 0,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahl_workshops (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        workshop_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        phase tinyint NOT NULL DEFAULT 1,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_force_zuteilung (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        phase tinyint NOT NULL DEFAULT 1,
+        workshop_id bigint(20) unsigned DEFAULT NULL,
+        kommentar text DEFAULT NULL,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_zuteilung (
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        vorname varchar(191) DEFAULT NULL,
+        nachname varchar(191) DEFAULT NULL,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        phase tinyint NOT NULL DEFAULT 1,
+        workshop_id bigint(20) unsigned DEFAULT NULL,
+        wunsch_rang tinyint DEFAULT NULL,
+        PRIMARY KEY (id)
+    ) $charset_collate";
+	
+	$tables_sql[] = "CREATE TABLE {$prefix}kc_workshop_teamer (
+		id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		workshop_id bigint(20) unsigned DEFAULT NULL,
+		teamer_id bigint(20) unsigned DEFAULT NULL,
+		PRIMARY KEY (id)
+	) $charset_collate";
+
+    foreach ($tables_sql as $sql) {
+        dbDelta($sql);
+    }
+
+    // Post-creation migration guard: ensure min_teilnehmer exists for older installs
+    $col = $wpdb->get_var($wpdb->prepare("SHOW COLUMNS FROM {$prefix}kc_workshops LIKE %s", 'min_teilnehmer'));
+    if (empty($col)) {
+        // try to add the column (no-op on newer installs)
+        $wpdb->query("ALTER TABLE {$prefix}kc_workshops ADD COLUMN min_teilnehmer INT NOT NULL DEFAULT 0");
+    }
+
+    // Optionally store plugin version
+    add_option('kc_workshopwahl_db_version', '1.0');
+}
+
+function kc_uninstall_tables() {
+    global $wpdb;
+    $prefix = $wpdb->prefix;
+
+    $tables = [
+        "{$prefix}kc_zuteilung",
+        "{$prefix}kc_force_zuteilung",
+        "{$prefix}kc_wahl_workshops",
+        "{$prefix}kc_teilnehmer",
+        "{$prefix}kc_teamer",
+        "{$prefix}kc_workshops",
+        "{$prefix}kc_wahlen",
+		"{$prefix}kc_workshop_teamer"
+    ];
+
+    foreach ($tables as $t) {
+        $wpdb->query("DROP TABLE IF EXISTS $t");
+    }
+
+    delete_option('kc_workshopwahl_db_version');
+}
+
+// Backwards-compat wrapper for register_activation_hook usage
+if (!function_exists('kc_register_hooks_internal')) {
+    function kc_register_hooks_internal() {
+        // intentionally left blank
+    }
+}
+
+?>

konficastle-workshopwahl.php

@@ -77,5 +77,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';