- Verbesserung der Suchfunktionen

8 files changed, 22 insertions, 15 deletions

diff --git a/protected/views/kategorie/_search.php b/protected/views/kategorie/_search.php
index 8322f02..7352abd 100644
--- a/protected/views/kategorie/_search.php
+++ b/protected/views/kategorie/_search.php
@@ -32,7 +32,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'published'); ?>
-		<?php echo $form->textField($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
 	</div>
 
 	<div class="row buttons">
diff --git a/protected/views/kategorie/index.php b/protected/views/kategorie/index.php
index 2afd66f..705ca3d 100644
--- a/protected/views/kategorie/index.php
+++ b/protected/views/kategorie/index.php
@@ -21,7 +21,6 @@ $this->menu=array(
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
-		'id',
 		'name',
 		'einheiten',
 		'default_menge:number',
diff --git a/protected/views/speisTrank/_search.php b/protected/views/speisTrank/_search.php
index 4300232..a88293a 100644
--- a/protected/views/speisTrank/_search.php
+++ b/protected/views/speisTrank/_search.php
@@ -12,7 +12,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'kategorie_id'); ?>
-		<?php echo $form->textField($model,'kategorie_id'); ?>
+		<?php echo $form->dropDownList($model, 'kategorie_id', CHtml::listData(Kategorie::model()->findAll(), 'id', 'name'), array("empty"=>"")); ?>
 	</div>
 
 	<div class="row">
@@ -27,7 +27,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'published'); ?>
-		<?php echo $form->textField($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
 	</div>
 
 	<div class="row buttons">
diff --git a/protected/views/speisTrank/index.php b/protected/views/speisTrank/index.php
index 48015fc..1f416cc 100644
--- a/protected/views/speisTrank/index.php
+++ b/protected/views/speisTrank/index.php
@@ -20,7 +20,10 @@ $this->menu=array(
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
-		array('header'=>'Kategorie', 'value'=>'($data->kategorie) ? $data->kategorie->name : "-"'),
+		array('header'=>'Kategorie',
+				'name'=>'kategorie_id',
+				'filter'=>CHtml::listData(Kategorie::model()->findAll(), 'id', 'name'),
+				'value'=>'($data->kategorie) ? $data->kategorie->name : "-"'),
 		'name',
 		'beschreibung:html',
 		array('header'=>'Öffentlich',
diff --git a/protected/views/standort/_search.php b/protected/views/standort/_search.php
index 4f39bd5..eeab539 100644
--- a/protected/views/standort/_search.php
+++ b/protected/views/standort/_search.php
@@ -27,7 +27,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'published'); ?>
-		<?php echo $form->textField($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
 	</div>
 
 	<div class="row buttons">
diff --git a/protected/views/standort/index.php b/protected/views/standort/index.php
index 5449010..9a88a74 100644
--- a/protected/views/standort/index.php
+++ b/protected/views/standort/index.php
@@ -61,7 +61,7 @@ $map->render();
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
-		'id',
+		'type',
 		'name',
 		'pos_lat',
 		'pos_long',
diff --git a/protected/views/veranstaltung/_search.php b/protected/views/veranstaltung/_search.php
index b4ec2ed..099603c 100644
--- a/protected/views/veranstaltung/_search.php
+++ b/protected/views/veranstaltung/_search.php
@@ -12,7 +12,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'verein_id'); ?>
-		<?php echo $form->textField($model,'verein_id'); ?>
+		<?php echo $form->dropDownList($model, 'verein_id', CHtml::listData(Verein::model()->findAll(), 'id', 'name'), array("empty"=>"")); ?>
 	</div>
 
 	<div class="row">
@@ -37,12 +37,12 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'standort_id'); ?>
-		<?php echo $form->textField($model,'standort_id'); ?>
+		<?php echo $form->dropDownList($model, 'standort_id', CHtml::listData(Standort::model()->findAll(array('condition'=>'type="Bühne"')), 'id', 'name'), array("empty"=>"")); ?>
 	</div>
 
 	<div class="row">
 		<?php echo $form->label($model,'published'); ?>
-		<?php echo $form->textField($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
 	</div>
 
 	<div class="row buttons">
diff --git a/protected/views/veranstaltung/index.php b/protected/views/veranstaltung/index.php
index 42d1d62..35f2ec7 100644
--- a/protected/views/veranstaltung/index.php
+++ b/protected/views/veranstaltung/index.php
@@ -20,12 +20,17 @@ $this->menu=array(
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
-		'id',
-		array('header'=>'Verein', 'value'=>'$data->verein->name'),
+		array('header'=>'Verein', 
+				'name'=>'verein_id',
+				'filter'=>CHtml::listData(Verein::model()->findAll(), 'id', 'name'),
+				'value'=>'$data->verein->name'),
 		'titel',
-		array('header'=>'Startzeit', 'value'=>Format::displayDateTime($model->startzeit)),
-		array('header'=>'Endzeit', 'value'=>Format::displayDateTime($model->endzeit)),
-		array('header'=>'Standort', 'value'=>'($data->standort) ? $data->standort->name : "Kein Standort"'),
+		array('header'=>'Startzeit', 'value'=>'Format::displayDateTime($data->startzeit)'),
+		array('header'=>'Endzeit', 'value'=>'Format::displayDateTime($data->endzeit)'),
+		array('header'=>'Standort',
+				'name'=>'standort_id',
+				'filter'=>CHtml::listData(Standort::model()->findAll(array('condition'=>'type="Bühne"')), 'id', 'name'),
+				'value'=>'($data->standort) ? $data->standort->name : "Kein Standort"'),
 		array('header'=>'Öffentlich',
 				'value'=>'CHtml::image($data->published ? "images/ok.png" : "images/nok.png", $data->published ? "ok.png" : "nok.png")', 'type'=>'raw'),
 		array(