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

develop #1

Merged
linus merged 59 commits from develop into main 2026-01-30 21:54:02 +00:00
Conversation 0 Commits 59 Files Changed 6 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a45a78753 - Show all commits

10
includes/frontend-ergebnis.php
View File

@@ -209,8 +209,8 @@ add_shortcode('konficastle_workshop_ergebnis', function($atts) {
foreach($teilnehmer as $t) {
$is_me = in_array(intval($t->id), $my_ids);
$name = esc_html($t->vorname.' '.$t->nachname);
$label = $name . ' <span style="color:#6b6b6b;font-size:85%;">('.intval($t->phase).')</span>';
echo '<div class="kc-participant'.($is_me ? ' me' : '').'">'. $label .'</div>';
$label = $name . ' <span style="color:#6b6b6b;font-size:85%;white-space:nowrap;">' . intval($t->phase) . '</span>';
echo '<div class="kc-participant'.($is_me ? ' me' : '').'" style="white-space:nowrap;">'. $label .'</div>';
}
echo '</div>'; // kc-participants
echo '</div>'; // content
@@ -225,11 +225,11 @@ add_shortcode('konficastle_workshop_ergebnis', function($atts) {
if (!empty($nicht_zugeteilt)) {
echo '<div class="kc-notassigned">';
echo '<b>Nicht zugeteilt:</b><br>';
echo '<ul style="margin:6px 0 0 18px;">';
echo '<div style="margin:6px 0 0 18px;">';
foreach($nicht_zugeteilt as $t) {
echo '<li>'.esc_html($t->vorname.' '.$t->nachname).' (Phase '.intval($t->phase).')</li>';
echo '<span style="display:inline-block;white-space:nowrap;margin-right:12px;">'.esc_html($t->vorname.' '.$t->nachname).' <span style="color:#6b6b6b;font-size:85%;">'.intval($t->phase).'</span></span>';
}
echo '</ul></div>';
echo '</div></div>';
}
echo '</div>'; // kc-result

2
includes/frontend-form.php
View File

@@ -20,7 +20,7 @@ add_shortcode('konficastle_workshopwahl', function($atts) {
$wahl = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}kc_wahlen WHERE id=%d", $wahl_id));
if(!$wahl || !$wahl->freigegeben) {
return $debug_output . '<div class="kc-error-msg">Die Workshopwahl ist aktuell nicht freigeschaltet.</div>';
return $debug_output . '<div class="kc-error-msg"></div>';
}
// Ermittle erlaubte Workshops pro Phase für diese Wahl.