Implement iterative minimum participant checks for workshop assignments

.gitea/workflows/deploy.yml

@@ -35,6 +35,7 @@ jobs:
       # =====================
       - name: Deploy to DEV via FTP
         if: github.ref == 'refs/heads/develop'
+        shell: bash
         run: |
           apt-get update
           apt-get install -y lftp
@@ -51,25 +52,26 @@ jobs:
       # =====================
       # PROD DEPLOY (FTP)
       # =====================
-      - name: Deploy to PROD via Docker (SSH)
+      - name: Deploy to PROD via SSH
         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 }}
-          WP_CONTAINER: ${{ secrets.PROD_WP_CONTAINER }}
+          HOST_WP_ROOT: ${{ secrets.PROD_HOST_WP_ROOT }}
-          WP_PLUGIN_PATH: ${{ secrets.PROD_WP_PLUGIN_PATH }}
+          HOST_ABS_PLUGIN_PATH: ${{ secrets.PROD_HOST_ABS_PLUGIN_PATH }}
-          HOST_PLUGIN_PATH: ${{ secrets.PROD_HOST_PLUGIN_PATH }}
+        shell: bash
         run: |
           set -euo pipefail
           apt-get update
-          # docker-cli needed to talk to remote engine; openssh-client to auth; tar for packaging with excludes
+          # openssh-client to auth; tar for packaging with excludes
-          apt-get install -y docker.io openssh-client tar
+          apt-get install -y openssh-client tar
 
           # Prepare SSH key
           mkdir -p ~/.ssh
-          echo "$SSH_KEY" > ~/.ssh/prod_docker_key
+          # 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
@@ -79,22 +81,14 @@ jobs:
             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
 
-          # Point docker CLI to remote engine over SSH
-          export DOCKER_HOST=ssh://prod-docker
-
-          # Sanity checks
-          docker info > /dev/null
-          docker ps --format 'table {{.Names}}\t{{.Status}}'
-
-          # Defaults if path not provided
-          : "${WP_PLUGIN_PATH:=/var/www/html/wp-content/plugins/konficastle-workshopwahl}"
-
           # Create a tarball with excludes to avoid copying VCS and CI folders
           TAR_FILE="/tmp/kc-plugin.tar.gz"
           tar -czf "$TAR_FILE" \
@@ -104,26 +98,21 @@ jobs:
             --exclude Notes \
             --exclude "*.yml" \
             --exclude "*.yaml" \
-            --exclude "*.md" \
             .
           
-          if [ -n "${HOST_PLUGIN_PATH}" ]; then
+          # Choose target path: prefer absolute plugin path; otherwise derive from HOST_WP_ROOT
-            echo "Deploying to host path relative to root's home: ~/${HOST_PLUGIN_PATH}"
+          if [ -n "${HOST_ABS_PLUGIN_PATH}" ]; then
-            # Upload tarball to host home and extract to ~/${HOST_PLUGIN_PATH}
+            echo "Deploying to absolute host path: ${HOST_ABS_PLUGIN_PATH}"
-            scp -o StrictHostKeyChecking=accept-new -i ~/.ssh/prod_docker_key "$TAR_FILE" prod-docker:~/kc-plugin.tar.gz
+            REMOTE_PATH_DECL="PLUGIN_PATH=\"${HOST_ABS_PLUGIN_PATH%/}\""
-            ssh prod-docker "mkdir -p \"~/${HOST_PLUGIN_PATH}\" && rm -rf \"~/${HOST_PLUGIN_PATH}\"/* && tar -xzf \"~/kc-plugin.tar.gz\" -C \"~/${HOST_PLUGIN_PATH}\" && rm -f \"~/kc-plugin.tar.gz\""
+          elif [ -n "${HOST_WP_ROOT}" ]; then
-            # Verify on host
+            echo "Deploying to host path relative to remote home: \$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
-            ssh prod-docker "ls -la \"~/${HOST_PLUGIN_PATH}\" | head -n 50"
+            REMOTE_PATH_DECL="PLUGIN_PATH=\$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
           else
-            echo "Deploying directly into container plugin path"
+            echo "Error: set PROD_HOST_ABS_PLUGIN_PATH (absolute) or PROD_HOST_WP_ROOT (relative)" >&2
-            # Defaults if path not provided (container path)
+            exit 1
-            : "${WP_PLUGIN_PATH:=/var/www/html/wp-content/plugins/konficastle-workshopwahl}"
-
-            # Copy tarball into the container
-            docker cp "$TAR_FILE" "${WP_CONTAINER}:/tmp/kc-plugin.tar.gz"
-
-            # Replace plugin contents inside the container and clean up
-            docker exec "${WP_CONTAINER}" bash -lc "mkdir -p '${WP_PLUGIN_PATH}' && rm -rf '${WP_PLUGIN_PATH}'/* && tar -xzf /tmp/kc-plugin.tar.gz -C '${WP_PLUGIN_PATH}' && rm -f /tmp/kc-plugin.tar.gz"
-            # List deployed files for verification inside container
-            docker exec "${WP_CONTAINER}" bash -lc "ls -la '${WP_PLUGIN_PATH}' | head -n 50"
           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"

includes/admin-teilnehmer.php

@@ -1,4 +1,103 @@
 <?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;
@@ -7,6 +106,14 @@ 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)) {
@@ -222,13 +329,10 @@ function kc_teilnehmer_page() {
     }
 
     // Übersicht
-    // Map für Wahl-ID => Name
+    // Map für Wahl-ID => Name ist bereits oben aufgebaut
-    $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
@@ -271,11 +375,19 @@ 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>';
@@ -316,11 +428,20 @@ 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; }
@@ -366,6 +487,7 @@ function kc_teilnehmer_page() {
                 if (show) shown++;
             });
             if (status) status.textContent = (wahlId ? (shown+" angezeigt") : "Alle anzeigen");
+            updateExportButton();
         }
 
         function attachPhaseEvents() {
@@ -396,6 +518,7 @@ function kc_teilnehmer_page() {
         if(btns.length) btns[0].classList.add("active");
         renderPhaseButtons("");
         applyFilter("", "");
+        updateExportButton();
     })();
     </script>';
     echo '</div>';

includes/admin-wahlen.php

@@ -360,9 +360,9 @@ 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 '</td>';
         echo '</tr>';

includes/zuteilungslogik.php

@@ -48,7 +48,21 @@ 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;
@@ -93,7 +107,7 @@ function kc_run_zuteilung($wahl_id) {
             return true;
         };
 
-        // 5) Wunschrunden 1..3
+        // 5) Wunschrunden 1..3 (OHNE Minimalanzahl-Prüfung - volle Priorität!)
         for($wunsch=1;$wunsch<=3;$wunsch++) {
             $not_assigned = [];
             foreach($remaining as $tn) {
@@ -110,8 +124,7 @@ function kc_run_zuteilung($wahl_id) {
             if(count($remaining) > 1) shuffle($remaining);
         }
 
-        // 6) Restliche zufällig verteilen (auf alle freie Workshops)
+        // 6) Restliche zufällig verteilen (OHNE Minimalanzahl-Prüfung)
-        $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) {
@@ -131,86 +144,177 @@ function kc_run_zuteilung($wahl_id) {
             $assign($tn, $ws_id, 99);
         }
 
-        // 6.5 Consolidate workshops that did not reach their minimal Teilnehmerzahl
+        // 6.5 ITERATIVE MINIMALANZAHL-SICHERUNG: Bis alle erfüllt sind
-        // Load minimal requirements for workshops in this Wahl
         $ws_ids_in_wahl = array_keys($workshops);
-        if (!empty($ws_ids_in_wahl)) {
+        $iteration = 0;
-            $placeholders = implode(',', array_fill(0, count($ws_ids_in_wahl), '%d'));
+        $max_iterations = 10;
-            $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 = [];
+        while($iteration < $max_iterations) {
-            foreach($min_rows as $r) $min_map[intval($r->id)] = intval($r->min_teilnehmer);
+            $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');
 
-            // Count current assignments per workshop
+                $assigned_counts = [];
-            $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);
+                foreach($assigned_counts_raw as $ar) {
-            $assigned_counts = [];
+                    $assigned_counts[intval($ar['workshop_id'])] = intval($ar['cnt']);
-            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;
                 }
-            }
 
-            if (!empty($failing)) {
+                // Unterbesetzte Workshops finden (NUR die mit Teilnehmern, aber < min)
-                // collect participants from failing workshops
+                $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
                 $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));
+                    $rows = $wpdb->get_results($wpdb->prepare(
-                    foreach($rows as $r) $to_reassign[] = intval($r->teilnehmer_id);
+                        "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)) {
+                if (empty($to_reassign)) {
-                    // remove those assignments
+                    // Keine TN zu umverteilen
-                    $fw_placeholders = implode(',', array_map('intval', $failing));
+                    error_log("Phase $phase [Iter $iteration]: Keine Teilnehmer in unterbesetzten Workshops gefunden");
-                    $wpdb->query("DELETE FROM {$prefix}kc_zuteilung WHERE wahl_id=".intval($wahl_id)." AND phase=".intval($phase)." AND workshop_id IN ($fw_placeholders)");
+                    break;
+                }
 
-                    // free capacity for the failing workshops
+                error_log("Phase $phase [Iter $iteration]: " . count($to_reassign) . " Teilnehmer werden entfernt und neu verteilt");
-                    foreach($failing as $fw) {
+                
-                        $freed = intval($assigned_counts[$fw] ?? 0);
+                // Alle Zuweisungen aus unterbesetzten Workshops löschen
-                        if (!isset($caps[$fw])) $caps[$fw] = 0;
+                $fw_list = implode(',', array_map('intval', $failing));
-                        $caps[$fw] += $freed;
+                $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;
+                    }
+                }
 
-                    // Try to reassign each participant preferring their wishes 1..3
+                error_log("Phase $phase [Iter $iteration]: " . count($safe_workshops) . " sichere Workshops verfügbar");
-                    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));
+                // Teilnehmer auf sichere Workshops neu verteilen
-                        if (!$tn) continue;
+                foreach($to_reassign as $tid) {
-                        $reassigned = false;
+                    $tn = $all_teilnehmer_by_id[$tid] ?? $wpdb->get_row($wpdb->prepare(
-                        for($w=1;$w<=3;$w++) {
+                        "SELECT * FROM {$prefix}kc_teilnehmer WHERE id = %d", $tid
-                            $choice = intval($tn->{"wunsch$w"});
+                    ));
-                            if ($choice > 0 && isset($caps[$choice]) && $caps[$choice] > 0) {
+                    if (!$tn) continue;
-                                $assigned = $assign($tn, $choice, $w);
+
-                                if ($assigned) { $reassigned = true; break; }
+                    $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;
                             }
                         }
-                        if ($reassigned) continue;
+                    }
 
-                        // otherwise assign to any workshop with free capacity
+                    if ($reassigned) continue;
-                        $available = array_keys(array_filter($caps, function($c){return $c>0;}));
+
+                    // Zufällig auf sichere Workshops
+                    if (!empty($safe_workshops)) {
+                        $available = [];
+                        foreach($safe_workshops as $wsid) {
+                            if (isset($caps[$wsid]) && $caps[$wsid] > 0) {
+                                $available[] = $wsid;
+                            }
+                        }
                         if (!empty($available)) {
                             $target = $available[array_rand($available)];
-                            $assign($tn, $target, 99);
+                            if ($assign($tn, $target, 99)) {
-                            continue;
+                                $reassigned = true;
+                            }
                         }
+                    }
 
-                        // lastly, mark as unassigned
+                    // Falls immer noch nichts frei → unzugewiesen
+                    if (!$reassigned) {
                         $wpdb->insert("{$prefix}kc_zuteilung", [
-                            'wahl_id' => $wahl_id,
+                            'wahl_id'       => $wahl_id,
                             'teilnehmer_id' => $tn->id,
-                            'vorname' => $tn->vorname,
+                            'vorname'       => $tn->vorname,
-                            'nachname' => $tn->nachname,
+                            'nachname'      => $tn->nachname,
-                            'phase' => $phase,
+                            'phase'         => $phase,
-                            'workshop_id' => null,
+                            'workshop_id'   => null,
-                            'wunsch_rang' => -1
+                            '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) {

konficastle-workshopwahl.php

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