fixed next envent not apearing in agenda and empty comming events bug

This commit is contained in:
2018-09-12 13:42:26 +02:00
parent f883747af3
commit a9a219f2ed
3 changed files with 27 additions and 22 deletions
@@ -9,11 +9,14 @@ function template_preprocess_edlp_agenda(&$vars){
*/ */
$view_builder = \Drupal::entityTypeManager()->getViewBuilder('node'); $view_builder = \Drupal::entityTypeManager()->getViewBuilder('node');
if(isset($vars['next_event_node'])){
$vars['next_event'] = array( $vars['next_event'] = array(
"#markup"=>"<h3>Prochaine Date</h3>", "#markup"=>"<h3>Prochaine Date</h3>",
"event"=>$view_builder->view($vars['next_event_node'], 'default') "event"=>$view_builder->view($vars['next_event_node'], 'default')
); );
}
if(count($vars['coming_events_nodes'])){
$future_list = array ( $future_list = array (
'#theme' => 'item_list', '#theme' => 'item_list',
'#items' => [], '#items' => [],
@@ -30,6 +33,7 @@ function template_preprocess_edlp_agenda(&$vars){
"#markup"=>"<h3>".t("Upcoming Events")."</h3>", "#markup"=>"<h3>".t("Upcoming Events")."</h3>",
"future_events"=>$future_list "future_events"=>$future_list
); );
}
$past_list = array ( $past_list = array (
@@ -29,7 +29,7 @@ class AgendaController extends ControllerBase {
$this->future_nids = $query->execute(); $this->future_nids = $query->execute();
$this->future_nodes = entity_load_multiple('node', $this->future_nids); $this->future_nodes = entity_load_multiple('node', $this->future_nids);
$this->next_event = array_shift($this->future_nodes); $this->next_event_node = array_shift($this->future_nodes);
$query = \Drupal::entityQuery('node') $query = \Drupal::entityQuery('node')
->condition('status', 1) ->condition('status', 1)
@@ -43,11 +43,11 @@ class AgendaController extends ControllerBase {
private function toRenderable(){ private function toRenderable(){
$this->query(); $this->query();
// dpm($this->future_nodes); // dpm($this->next_event_node);
return array( return array(
"#theme"=>'edlp_agenda', "#theme"=>'edlp_agenda',
'#next_event_node' => $this->next_event, '#next_event_node' => $this->next_event_node,
"#coming_events_nodes" => $this->future_nodes, "#coming_events_nodes" => $this->future_nodes,
"#past_events_nodes" => $this->past_nodes, "#past_events_nodes" => $this->past_nodes,
); );
@@ -1,6 +1,7 @@
<div class="col small-col-12 med-col-5 large-col-4 float-right"> <div class="col small-col-12 med-col-5 large-col-4 float-right">
<div class="wrapper"> <div class="wrapper">
<div class="agenda"> <div class="agenda">
{{ next_event }}
{{ coming_events }} {{ coming_events }}
{{ past_events }} {{ past_events }}
</div> </div>