Compare commits

12 Commits

Author SHA1 Message Date
4ab28370bc Update KC Wahlen Button Reihenfolge
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Has been cancelled
2026-02-26 22:58:11 +00:00
c56aa70617 Update README.md
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Failing after 2m29s
2026-02-19 09:50:08 +00:00
21553050f8 Update README.md
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Failing after 2m30s
2026-02-19 08:43:37 +00:00
f18664251e Update README.md
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Failing after 2m31s
update Readme
2026-02-19 08:35:05 +00:00
1a090dd8dc Update README.md
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Has been cancelled
2026-02-19 08:23:53 +00:00
82f2af7e7a Update install.php
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 15s
2026-02-06 18:45:45 +00:00
bbfa923c9d Merge pull request 'update deploy workflow' (#6) from develop into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 16s
Reviewed-on: #6
2026-02-06 18:43:57 +00:00
8827e5b324 Merge pull request 'develop' (#5) from develop into main
Some checks failed
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Failing after 4s
Reviewed-on: #5
2026-02-06 18:41:46 +00:00
f1fb4cd4ea Merge pull request 'develop' (#4) from develop into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 13s
Reviewed-on: #4
2026-01-31 13:26:30 +00:00
a827275995 Merge pull request 'develop loesung zu Lösung' (#3) from develop into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 14s
Reviewed-on: #3
2026-01-31 10:56:48 +00:00
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
Reviewed-on: #2
2026-01-31 09:56:01 +00:00
8029ebfb27 Merge pull request 'develop' (#1) from develop into main
All checks were successful
Deploy Workshop-Wahlen (DEV / PROD) / deploy (push) Successful in 12s
Reviewed-on: #1
2026-01-30 21:54:02 +00:00
3 changed files with 141 additions and 145 deletions

View File

@@ -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. 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).

View File

@@ -360,9 +360,9 @@ function kc_wahlen_page() {
echo '<td class="kc-actions">'; 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&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&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)); $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&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 löschen?\');">Löschen</a>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';

View File

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