Veranstaltungsanzeige bei Vereinen verschönert

2 files changed, 52 insertions, 18 deletions

diff --git a/protected/models/Veranstaltung.php b/protected/models/Veranstaltung.php
index 5d90e6d..044bc03 100644
--- a/protected/models/Veranstaltung.php
+++ b/protected/models/Veranstaltung.php
@@ -156,6 +156,14 @@ class Veranstaltung extends CActiveRecord
 		return $this;
 	}
 	
+	public function parentVerein($vereinId=0)
+	{
+		$this->getDbCriteria()->mergeWith(array(
+				'condition'=>"verein_id = $vereinId",
+		));
+		return $this;
+	}
+	
 	public function scopes()
 	{
 		return array(
diff --git a/protected/views/verein/view.php b/protected/views/verein/view.php
index 76ddd88..f7c066d 100644
--- a/protected/views/verein/view.php
+++ b/protected/views/verein/view.php
@@ -50,26 +50,52 @@ $this->widget('zii.widgets.CListView', array(
   ));?>
 <h4>Veranstaltungen</h4>
 <?php 
-$start = CDateTimeParser::parse(Yii::app()->params["start_date"]." ".Yii::app()->params["start_time"], "dd.MM.yyyy HH:mm");
-$astafStart = Yii::app()->dateFormatter->format("yyyy-MM-dd HH:mm", $start);
-$ende = CDateTimeParser::parse(Yii::app()->params["end_date"]." ".Yii::app()->params["end_time"], "dd.MM.yyyy HH:mm");
-$astafEnde = Yii::app()->dateFormatter->format("yyyy-MM-dd HH:mm", $ende);
-$dataProvider=new CActiveDataProvider('Veranstaltung', array(
-		'criteria'=>array(
-				'condition'=>'verein_id='.$model->id." and published=1 and startzeit between '$astafStart' and '$astafEnde' ",
-				'order' => 'startzeit asc',
+$veranstaltung = new Veranstaltung();
+$veranstaltung->with('standort');
+
+$veranstaltung->published()->thisYear()->sorted();
+
+$this->widget('zii.widgets.grid.CGridView', array(
+		
+		'dataProvider'=>$veranstaltung->parentVerein($model->id)->search(),
+		'columns'=>array(
+				array(
+            			'name'=>'startzeit',
+						'type'=>'html',
+						'sortable' => true,
+						'header' => "Wann?",
+            			'value'=>'Yii::app()->dateFormatter->format(\'EEEE\',$data->startzeit)."<br />".Yii::app()->dateFormatter->format(\'HH:mm\',$data->startzeit)." Uhr"',
+						'htmlOptions' => array('style'=>"width:15%;"),
 				),
-		'pagination'=>array(
-				'pageSize'=>20,
+				array(
+						'name'=> 'titel',
+						'header' =>'Was?',
+						'type' => 'Raw',
+						'value' => 'CHTML::link($data->titel,array("veranstaltung/view","id"=>$data->id))',
 						),
-));
-$this->widget('zii.widgets.CListView', array(
-      'dataProvider'=>$dataProvider,
-      'itemView'=>'/veranstaltung/_short',
-	  'sortableAttributes'=>array(
-        'titel','startzeit','endzeit', 
+				array(
+						'name' => "standort_id",
+						'type' => 'Raw',
+						'header' => "Wo?",
+						'sortable' => true,
+						'value' => 'CHTML::link($data->standort->name,array("standort/view","id"=>$data->standort->id))',
 				),
-	  'htmlOptions' => array('style' => 'width:100%'),
-  ));?>
+				
+			),
+		'blankDisplay' => "Heute keine Termine bekannt",
+		'showTableOnEmpty' => false,
+		'enableSorting' => true,
+		'enablePagination' => true,
+		'hideHeader' => false,
+		'template' => '{pager} {items} {pager}',
+		'htmlOptions' => array('class'=>''),
+		
+
+  ));
+
+
+?>
+  
+  
 </div>