Skip to content

Veranstaltungsreihen #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Uatschitchun wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Veranstaltungsreihen #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
244b01c
Veranstaltungsreihen:
Mar 30, 2023
4f74508
Fix to multiday events
Apr 1, 2023
41ed28f
Hopefully last fixes to multiday events:
Apr 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions advanced-custom-fields/veranstaltungen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ function cptui_register_my_cpts_veranstaltungen() {
'key' => 'field_5fc8d0b28edb0',
'label' => __('Beschreibung','quartiersplattform'),
'name' => 'text',
'type' => 'textarea',
'type' => 'textarea', // 'wysiwyg'
// 'tabs' => 'visual', // 'visual' || 'text' || 'all'
// 'toolbar' => 'basic', // 'full' || 'basic'
// 'media_upload' => 1,
// 'delay' => 1,
'instructions' => __('Worum geht es bei deiner Veranstaltung?','quartiersplattform'),
'required' => 0,
'conditional_logic' => 0,
Expand All @@ -127,15 +131,15 @@ function cptui_register_my_cpts_veranstaltungen() {
'label' => __('Datum','quartiersplattform'),
'name' => 'event_date',
'type' => 'date_picker',
'instructions' => __('Wann wird deine Veranstaltung stattfinden?','quartiersplattform'),
'instructions' => __('Wann wird deine Veranstaltung stattfinden bzw. beginnen?','quartiersplattform'),
'required' => 1,
'conditional_logic' => 0,
'wrapper' => array(
'width' => '',
'class' => '',
'id' => '',
),
'display_format' => 'F j, Y',
'display_format' => 'j. F Y',
'return_format' => 'Y-m-d',
'first_day' => 1,
),
Expand Down Expand Up @@ -172,6 +176,23 @@ function cptui_register_my_cpts_veranstaltungen() {
'display_format' => 'H:i',
'return_format' => 'H:i:s',
),
array(
'key' => 'field_5fc8d1ae96113',
'label' => __('Enddatum (bei mehrtägigen Veranstaltungen)','quartiersplattform'),
'name' => 'event_end_date',
'type' => 'date_picker',
'instructions' => __('Wann findet die mehrtägige Veranstaltung zuletzt statt?','quartiersplattform'),
'required' => 0,
'conditional_logic' => 0,
'wrapper' => array(
'width' => '',
'class' => '',
'id' => '',
),
'display_format' => 'j. F Y',
'return_format' => 'Y-m-d',
'first_day' => 1,
),
array(
'key' => 'field_5fc8d1c4d15c8',
'label' => __('Website','quartiersplattform'),
Expand Down Expand Up @@ -296,5 +317,5 @@ function cptui_register_my_cpts_veranstaltungen() {
'active' => true,
'description' => '',
));
endif;

endif;
32 changes: 20 additions & 12 deletions components/calendar/calendar_download.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
<?php

// needed variabels
$date = get_field('event_date', $post);
$time = get_field('event_time', $post);
$time_end = get_field('event_end_time', $post);
// needed variables
$date_start = get_field('event_date', $post); // Start date
$time_start = get_field('event_time', $post); // Start time
$time_end = get_field('event_end_time', $post); // End time
$date_end = get_field('event_end_date', $post); // End date

$title = get_the_title();
$start = date('Ymd', strtotime("$date $time")) . "T" . date('His', strtotime("$date $time"));
$ende = date('Ymd', strtotime("$date $time")) . "T" . date('His', strtotime("$date $time_end"));
$start = !empty($date_start) ? date('Ymd', strtotime("$date_start $time_start")) . "T" . date('His', strtotime("$date_start $time_start")) : '';

if (empty($ende) || strtotime($start) > strtotime($ende) ) {
if (empty($date_end)) {
// Enddatum not given - single day event
$date_end = $date_start;
}

if (empty($time_end) || strtotime($start) > strtotime("$date_end $time_end")) {
// one hour after start
$ende = date('Ymd', strtotime($start) + (60*60)) . "T" . date('His', strtotime($start) + (60*60));
$time_end = date('H:i:s', strtotime("$time_start +1 hour"));
}

$ende = date('Ymd', strtotime("$date_end $time_end")) . "T" . date('His', strtotime("$date_end $time_end"));

// directory
$links = get_template_directory_uri();
$destination_folder = $_SERVER['DOCUMENT_ROOT'];
Expand All @@ -28,18 +35,19 @@
}
// acf fields - ticket
if (get_field('ticket')) {
$website = get_field('ticket');'';
$website = get_field('ticket');
}
else {
$website = '';
}

$description = get_field( "text" );
$description = get_field("text");
$file_name = $post->post_name;
$dir = "/assets/generated/calendar-files/";

$kb_start = $start;
$kb_end = $ende;

$kb_current_time = date("Ymd")."T".date("His");
$kb_title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
$kb_location = preg_replace('/([\,;])/','\\\$1',$location);
Expand Down Expand Up @@ -71,7 +79,7 @@
'DTEND:'.$kb_end.$eol.
'LOCATION:'.$kb_location.$eol.
'DTSTAMP:'.$kb_current_time.$eol.
// 'RRULE:FREQ='.$kb_freq.';UNTIL='.ende_der_widerholung.
//'RRULE:FREQ='.$kb_freq.';UNTIL='.$kb_until.$eol.
'SUMMARY:'.$kb_title.$eol.
'URL;VALUE=URI:'.$kb_url.$eol.
'DESCRIPTION:'.$kb_description.$eol.
Expand All @@ -84,4 +92,4 @@

?>

<a class="button" href="<?php echo get_bloginfo('template_url') .'/assets/generated/calendar-files/'.$kb_file_name.'.ics' ?>" target="_self"><?php _e('.iCal Herunterladen','quartiersplattform'); ?></a>
<a class="button" href="<?php echo get_bloginfo('template_url') .'/assets/generated/calendar-files/'.$kb_file_name.'.ics' ?>" target="_self"><?php _e('.iCal Herunterladen','quartiersplattform'); ?></a>
70 changes: 44 additions & 26 deletions components/project/events.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,59 @@
<?php
// Aktuelle Veranstaltungen
// Veranstaltungen
$args_chronik = array(
'post_type'=>'veranstaltungen',
'post_status'=>'publish',
'posts_per_page'=> 10,
'offset' => '0',
'post_type' => 'veranstaltungen',
'post_status' => 'publish',
'posts_per_page' => 10,
'tax_query' => array(
array(
'taxonomy' => 'projekt',
'field' => 'slug',
'terms' => $post->post_name,
),
),
'meta_query' => array(
'relation' => 'AND',
'date_clause' => array(
'key' => 'event_date',
'value' => date("Y-m-d"),
'compare' => '>=',
'type' => 'DATE'
'relation' => 'OR',
array(
'relation' => 'AND',
'date_clause' => array(
'key' => 'event_date',
'value' => date('Y-m-d'),
'compare' => '>=',
'type' => 'DATE'
),
'time_clause' => array(
'key' => 'event_time',
'compare' => '=',
),
),
'time_clause' => array(
'key' => 'event_time',
'compare' => '=',
array(
'relation' => 'AND',
'end_date_clause' => array(
'key' => 'event_end_date',
'value' => date('Y-m-d'),
'compare' => '>=',
'type' => 'DATE'
),
'end_time_clause' => array(
'key' => 'event_end_time',
'compare' => '=',
),
'date_clause' => array(
'key' => 'event_date',
'value' => date('Y-m-d'),
'compare' => '<',
'type' => 'DATE'
),
),
),
'orderby' => array(
'date_clause' => 'ASC',
'time_clause' => 'ASC',
),
'tax_query' => array(
array(
'taxonomy' => 'projekt',
'field' => 'slug',
'terms' => ".$post->post_name."
)
)

);

if (count_query($args_chronik)) {
echo "<h3 class='margin-bottom'>".__('Aktuelle Veranstaltung', 'quartiersplattform')."</h3>";

echo "<h3 class='margin-bottom'>" . __('Aktuelle Veranstaltung', 'quartiersplattform') . "</h3>";
card_list($args_chronik);
}

?>
?>
50 changes: 36 additions & 14 deletions components/views/veranstaltungen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,43 @@

// Aktuelle veranstaltungen
$veranstaltungen = array(
'post_type'=>'veranstaltungen',
'post_status'=>'publish',
'posts_per_page'=> -1,
'offset' => '0',
'post_type' => 'veranstaltungen',
'post_status' => 'publish',
'posts_per_page' => -1,
'offset' => '0',
'meta_query' => array(
'relation' => 'AND',
'date_clause' => array(
'key' => 'event_date',
'value' => date("Y-m-d"),
'compare' => '>=',
'type' => 'DATE'
'relation' => 'OR',
array(
'relation' => 'AND',
'date_clause' => array(
'key' => 'event_date',
'value' => date('Y-m-d'),
'compare' => '>=',
'type' => 'DATE'
),
'time_clause' => array(
'key' => 'event_time',
'compare' => '=',
),
),
'time_clause' => array(
'key' => 'event_time',
'compare' => '=',
array(
'relation' => 'AND',
'end_date_clause' => array(
'key' => 'event_end_date',
'value' => date('Y-m-d'),
'compare' => '>=',
'type' => 'DATE'
),
'end_time_clause' => array(
'key' => 'event_end_time',
'compare' => '=',
),
'date_clause' => array(
'key' => 'event_date',
'value' => date('Y-m-d'),
'compare' => '<',
'type' => 'DATE'
),
),
),
'orderby' => array(
Expand All @@ -41,4 +63,4 @@
no_content_card("calendar-badge-plus", __("Momentan gibt es keine Veranstaltungen",'quartiersplattform'), $text, $link_text = __('Veranstaltung erstellen','quartiersplattform'), $link_url = "");
}

?>
?>
20 changes: 18 additions & 2 deletions elements/card-veranstaltungen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@

<div class="veranstaltung card landscape background-image shadow gardient" style="background-image: url('<?php the_post_thumbnail_url('landscape_m') ?>')">
<a class="card-link" href="<?php echo esc_url( get_permalink() ); ?>">
<span class="date"><?php _e('Veranstaltung', 'quartiersplattform'); ?> - <?php echo qp_date(get_field('event_date')); ?></span>
<span class="date">
<?php
if (get_field('event_end_date')) {
echo _e('Aktion', 'quartiersplattform')." - ".qp_date(get_field('event_date'))." - ".qp_date(get_field('event_end_date'));
} else {
echo _e('Veranstaltung', 'quartiersplattform')." - ".qp_date(get_field('event_date'));
}
?>
</span>
<div class="content">
<h3 class="heading-size-3 "><?php shorten(get_the_title(), '30'); ?></h3>
<?php if (get_post_status() == 'draft' && qp_project_owner()) { ?>
Expand Down Expand Up @@ -69,7 +77,15 @@

<div class="card shadow veranstaltung-ohne-bild">
<a class="card-link" href="<?php echo esc_url( get_permalink() ); ?>">
<span class="date"><?php _e('Veranstaltung', 'quartiersplattform'); ?> - <?php echo qp_date(get_field('event_date')); ?></span>
<span class="date">
<?php
if (get_field('event_end_date')) {
echo _e('Aktion', 'quartiersplattform')." - ".qp_date(get_field('event_date'))." - ".qp_date(get_field('event_end_date'));
} else {
echo _e('Veranstaltung', 'quartiersplattform')." - ".qp_date(get_field('event_date'));
}
?>
</span>

<div class="content">
<h3 class="heading-size-3 small-margin-bottom">
Expand Down
7 changes: 4 additions & 3 deletions pages/form-veranstaltungen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@
'post_title' => true,
'uploader' => qp_form_uploader(),
'fields' => array(
'field_5fc8d0b28edb0', //Text
'field_5fc8d0b28edb0', //Beschreibung
'field_5fc8d15b8765b', //Date
'field_5fc8d16e8765c', //Start AP1
'field_5fc8d18b8765d', //End AP1
'field_5fc8d18b8765d', //End AP1
'field_5fc8d1ae96113', //EndDate
'field_5fc8d1e0d15c9', //Livestream
'field_5fc8d1f4d15ca', //Ticket
'field_5fc8d1c4d15c8', //Website
Expand All @@ -86,4 +87,4 @@

</main><!-- #site-content -->

<?php get_footer(); ?>
<?php get_footer(); ?>
Loading