Update KC Wahlen Button Reihenfolge

update Readme

.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,17 +52,68 @@ jobs:
       # =====================
       # PROD DEPLOY (FTP)
       # =====================
-      - name: Deploy to PROD via FTP
+      - 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 }}
+          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
-          apt-get install -y lftp
+          # openssh-client to auth; tar for packaging with excludes
+          apt-get install -y openssh-client tar
 
-          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
+          # 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" \
+            --exclude "*.md" \
+            .
+          
+          # 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"

README.md

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

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/admin-workshops.php

@@ -10,8 +10,9 @@ function kc_workshops_page() {
     // Liste aller Wahlen für Auswahl
     $wahlen_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_wahlen ORDER BY id DESC");
     
-    // Liste aller Phasen für Auswahl
-    $phasen_liste = $wpdb->get_results("SELECT * FROM {$prefix}kc_phasen ORDER BY nummer");
+    // Phasen werden pro Wahl über die Spalte `anzahl_einheiten` in `kc_wahlen` bestimmt.
+    // Eine separate Tabelle `kc_phasen` wird nicht benötigt.
+    $phasen_liste = [];
 
     // Workshop löschen
     if (isset($_GET['delete_workshop'])) {

includes/admin-zuteilungen.php

@@ -86,7 +86,8 @@ if (isset($_GET['export_csv']) && current_user_can('manage_options')) {
     $output = fopen('php://output', 'w');
     // Excel erwartet in DE meist ; als Trennzeichen
     $delimiter = ';';
-    fputcsv($output, ['Phase','Workshop','Teamer','Teilnehmer'], $delimiter);
+    // Kopfzeile mit separaten Namensspalten und Wunsch
+    fputcsv($output, ['Phase','Workshop','Teamer','Nachname','Vorname','Wunsch'], $delimiter);
     foreach($phases as $phase) {
         if (empty($workshop_groups[$phase])) continue;
         $display = [];
@@ -114,14 +115,27 @@ 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,
-                    $teilnehmer_name,
+                    $nachname,
+                    $vorname,
                     $wunsch
                 ], $delimiter);
             }

includes/frontend-form.php

@@ -5,14 +5,8 @@ add_shortcode('konficastle_workshopwahl', function($atts) {
 
     global $wpdb;
     
-    // 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>';
+    // Optionales Debug-Ausgabe-Fragment (standardmäßig leer, um Warnungen zu vermeiden)
+    $debug_output = '';
     
     $wahl = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}kc_wahlen WHERE id=%d", $wahl_id));
     if(!$wahl || !$wahl->freigegeben) {

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
+    }
+}
+
+?>