From b53f83a45b9ce727a45b374a01fa9022307a2e9f Mon Sep 17 00:00:00 2001
From: Patrick Seeger <pseeger@ccwn.org>
Date: Fri, 20 Jun 2014 14:56:18 +0200
Subject: =?UTF-8?q?Anzeige=20von=20B=C3=BChnen=20um=20Hinweis=20auf=20Folg?=
 =?UTF-8?q?etag=20optimiert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protected/components/Format.php         | 10 ++++++++++
 protected/views/veranstaltung/stage.php | 29 +++++++++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/protected/components/Format.php b/protected/components/Format.php
index 8a80768..91ac90e 100644
--- a/protected/components/Format.php
+++ b/protected/components/Format.php
@@ -33,4 +33,14 @@ class Format {
 		}
 		return null;
 	}
+	
+	public static function displayDateForLists($value) {
+		if(Yii::app()->dateFormatter->format('HH',$value->startzeit) < 4)
+		{
+			return "<strong>".Yii::app()->dateFormatter->format('EEEE',$value->startzeit)."</strong><br />".
+			Yii::app()->dateFormatter->format('HH:mm',$value->startzeit)." Uhr";
+		} else{
+			return Yii::app()->dateFormatter->format('HH:mm',$value->startzeit)." Uhr";
+		}
+	}
 }
diff --git a/protected/views/veranstaltung/stage.php b/protected/views/veranstaltung/stage.php
index 02e811f..80744ab 100644
--- a/protected/views/veranstaltung/stage.php
+++ b/protected/views/veranstaltung/stage.php
@@ -12,11 +12,16 @@ $this->menu=array(
 $buehnen = new CActiveDataProvider('Standort', array(
     'criteria'=>array(
         'condition'=>"type='Bühne'",
+    	'with'=>'vereine'
         
     ),
 ));
 $mymenu = array();
 foreach ($buehnen->getData() as $buehne) {
+	$hasVerein = false;
+	foreach ($buehne->vereine as $verein) {
+		if ($verein->published) { $hasVerein=true;}
+	}
 	$mymenu = array_merge( $mymenu , array(array('label' => 'Bühnenprogramm '.$buehne->name, 'url'=>array('stage','id'=>$buehne->id))));
 }
 $this->menu = array_merge($this->menu, $mymenu);
@@ -43,22 +48,24 @@ $sonntag=new CActiveDataProvider('Veranstaltung', array(
 <h5>Freitag</h5>
 <?php
 $veranstaltung = new Veranstaltung();
+
 $this->widget('zii.widgets.grid.CGridView', array(
 		
 		'dataProvider'=>$veranstaltung->published()->thisYear()->freitag()->parentStage($model->id)->sorted()->search(),
 		'columns'=>array(
 				array(            // display 'create_time' using an expression
             		'name'=>'Startzeit',
-            		'value'=>'Yii::app()->dateFormatter->format(\'HH:mm\',$data->startzeit)." Uhr"',
+            		'value'=>'Format::displayDateForLists($data)',
 					'htmlOptions' => array('style'=>"width:20%;"),
+					'type' => 'html',
 				),
 				array(
-						'name'=> 'Titel',
-						'type' => 'Raw',
-						'value' => 'CHTML::link($data->titel,array("veranstaltung/view","id"=>$data->id))',
-						),
-						
+					'name'=> 'Titel',
+					'type' => 'Raw',
+					'value' => 'CHTML::link($data->titel,array("veranstaltung/view","id"=>$data->id))',
 				),
+						
+			),
 		'blankDisplay' => "Heute keine Termine bekannt",
 		'enableSorting' => false,
 		'enablePagination' => false,
@@ -77,8 +84,9 @@ $this->widget('zii.widgets.grid.CGridView', array(
 		'columns'=>array(
 				array(            // display 'create_time' using an expression
             		'name'=>'Startzeit',
-            		'value'=>'Yii::app()->dateFormatter->format(\'HH:mm\',$data->startzeit)." Uhr"',
-						'htmlOptions' => array('style'=>"width:20%;"),
+            		'value'=>'Format::displayDateForLists($data)',
+					'htmlOptions' => array('style'=>"width:20%;"),
+					'type' => 'html',
 				),
 								array(
 						'name'=> 'Titel',
@@ -103,8 +111,9 @@ $this->widget('zii.widgets.grid.CGridView', array(
 		'columns'=>array(
 				array(            // display 'create_time' using an expression
             		'name'=>'Startzeit',
-            		'value'=>'Yii::app()->dateFormatter->format(\'HH:mm\',$data->startzeit)." Uhr"',
-						'htmlOptions' => array('style'=>"width:20%;"),
+            		'value'=>'Format::displayDateForLists($data)',
+					'htmlOptions' => array('style'=>"width:20%;"),
+					'type' => 'html',
 				),
 								array(
 						'name'=> 'Titel',
-- 
cgit v1.0-28-g1787