- Database setup

- Database schema
- Database dev data
- config for new database setup
- Update in AngebotVerein
- Update in Speis&Trank
- Update in Verein
- Update in Kategorie

32 files changed, 953 insertions, 118 deletions

diff --git a/protected/components/Format.php b/protected/components/Format.php
new file mode 100644
index 0000000..129a292
--- /dev/null
+++ b/protected/components/Format.php
@@ -0,0 +1,18 @@
+<?php
+class Format {
+	public static function currency($value, $currency = 'EUR') {
+		return Yii::app()->locale->numberFormatter->formatCurrency($value, $currency);
+	}
+	
+	public static function number($value, $einheit = '') {
+		return Yii::app()->locale->numberFormatter->formatDecimal($value).' '.$einheit;
+	}
+	
+	public static function decimal($value) {
+		return Yii::app()->locale->numberFormatter->formatDecimal($value);
+	}
+	
+	public static function percentage($value) {
+		return Yii::app()->locale->numberFormatter->formatPercentage($value);
+	}
+}
\ No newline at end of file
diff --git a/protected/components/Html.php b/protected/components/Html.php
index c4a246c..08fc6d9 100644
--- a/protected/components/Html.php
+++ b/protected/components/Html.php
@@ -1,6 +1,5 @@
 <?php
-class Html extends CHtml
-{
+class Html extends CHtml {
 	/**
 	 * Makes the given URL relative to the /image directory
 	 */
@@ -19,5 +18,23 @@ class Html extends CHtml
 	public static function jsUrl($url) {
 		return Yii::app()->baseUrl.'/js/'.$url;
 	}
+
+	public static function enumItem($model, $attribute) {
+		$attr = $attribute;
+		self::resolveName($model, $attr);
+		preg_match('/\((.*)\)/', $model->tableSchema->columns[$attr]->dbType, $matches);
+		foreach (explode(',', $matches[1]) as $value) {
+			$value = str_replace("'", null, $value);
+			$values[$value] = Yii::t('enumItem', $value);
+		}
+
+		return $values;
+	}
+
+	public static function enumDropDownList($model, $attribute, $htmlOptions = array()) {
+		return CHtml::activeDropDownList($model, $attribute, Html::enumItem($model,  $attribute), $htmlOptions);
+	}
+	
+	
 }
 ?>
\ No newline at end of file
diff --git a/protected/config/maincfg.php b/protected/config/maincfg.php
index 8b37493..78c3c6a 100644
--- a/protected/config/maincfg.php
+++ b/protected/config/maincfg.php
@@ -51,10 +51,10 @@ return array(
 		),*/
 		// uncomment the following to use a MySQL database
 		'db'=>array(
-			'connectionString' => 'mysql:host=localhost;dbname=astaf_yii_dev',
+			'connectionString' => 'mysql:host=localhost;dbname=astaf',
 			'emulatePrepare' => true,
-			'username' => 'root',
-			'password' => '',
+			'username' => 'astaf',
+			'password' => 'AsTaF4',
 			'charset' => 'utf8',
 		),
 		'errorHandler'=>array(
diff --git a/protected/controllers/MyAngebotController.php b/protected/controllers/MyAngebotController.php
new file mode 100644
index 0000000..c53da98
--- /dev/null
+++ b/protected/controllers/MyAngebotController.php
@@ -0,0 +1,73 @@
+<?php
+
+class MyAngebotController extends Controller
+{
+
+	/**
+	 * @return array action filters
+	 */
+	public function filters()
+	{
+		return array(
+			'accessControl', // perform access control for CRUD operations
+		);
+	}
+
+	/**
+	 * Specifies the access control rules.
+	 * This method is used by the 'accessControl' filter.
+	 * @return array access control rules
+	 */
+	public function accessRules()
+	{
+		return array(
+			array('allow', // // allow authenticated user
+				'actions'=>array('create','index','delete','update','view'),
+				'users'=>array('@'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+	public function actionIndex()
+	{
+		$model=new AngebotVerein('search');
+		$model->unsetAttributes();  // clear any default values
+		if (isset($_GET['AngebotVerein'])) {
+			$model->attributes = $_GET['AngebotVerein'];
+		}
+		$model->verein_id = Yii::app()->user->vereinId;
+
+		$this->render('index',array(
+			'model'=>$model,
+		));
+	}
+
+	// Uncomment the following methods and override them if needed
+	/*
+	public function filters()
+	{
+		// return the filter configuration for this controller, e.g.:
+		return array(
+			'inlineFilterName',
+			array(
+				'class'=>'path.to.FilterClass',
+				'propertyName'=>'propertyValue',
+			),
+		);
+	}
+
+	public function actions()
+	{
+		// return external action classes, e.g.:
+		return array(
+			'action1'=>'path.to.ActionClass',
+			'action2'=>array(
+				'class'=>'path.to.AnotherActionClass',
+				'propertyName'=>'propertyValue',
+			),
+		);
+	}
+	*/
+}
\ No newline at end of file
diff --git a/protected/controllers/SiteController.php b/protected/controllers/SiteController.php
index 961a968..2ee57b9 100644
--- a/protected/controllers/SiteController.php
+++ b/protected/controllers/SiteController.php
@@ -28,7 +28,7 @@ class SiteController extends Controller
 	public function actionIndex()
 	{
 		if (!Yii::app()->user->isGuest && Yii::app()->user->isAdmin) {
-			$this->redirect(array("/verein/"));
+			$this->redirect(array("/verein/index"));
 		}
 		$this->redirect(array("/myverein/"));
 	}
diff --git a/protected/controllers/SpeisTrankController.php b/protected/controllers/SpeisTrankController.php
index 6f0931e..1da7883 100644
--- a/protected/controllers/SpeisTrankController.php
+++ b/protected/controllers/SpeisTrankController.php
@@ -26,12 +26,8 @@ class SpeisTrankController extends Controller
 	public function accessRules()
 	{
 		return array(
-			array('allow', // allow authenticated user to perform 'create' and 'update' actions
-				'actions'=>array('update','view'),
-				'users'=>array('@'),
-			),
 			array('allow', // allow admin user to perform 'admin' and 'delete' actions
-				'actions'=>array('create','index','delete'),
+				'actions'=>array('create','index','delete','update','view'),
 				'users'=>array('admin'),
 			),
 			array('deny',  // deny all users
diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index 30c05bc..7648a3e 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -65,7 +65,7 @@ class VereinController extends Controller
 				$this->redirect(array('view','id'=>$model->id));
 		}
 		
-		$standorte = Standort::model()->findAll(array("condition"=>"published=1"));
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$this->render('create',array(
 			'model'=>$model,
 			'standorte'=>$standorte
@@ -91,7 +91,7 @@ class VereinController extends Controller
 				$this->redirect(array('view','id'=>$model->id));
 		}
 
-		$standorte = Standort::model()->findAll(array("condition"=>"published=1"));
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$this->render('update',array(
 			'model'=>$model,
 			'standorte'=>$standorte
diff --git a/protected/data/create_database.mysql.sql b/protected/data/create_database.mysql.sql
new file mode 100644
index 0000000..38103fb
--- /dev/null
+++ b/protected/data/create_database.mysql.sql
@@ -0,0 +1,5 @@
+DROP DATABASE IF EXISTS `astaf`;
+CREATE DATABASE `astaf`;
+GRANT ALL ON `astaf`.* TO 'astaf'@'localhost' IDENTIFIED BY 'AsTaF4';
+FLUSH PRIVILEGES;
+USE `astaf`;
\ No newline at end of file
diff --git a/protected/data/devdata.astaf.mysql.sql b/protected/data/devdata.astaf.mysql.sql
index e69de29..dffc759 100644
--- a/protected/data/devdata.astaf.mysql.sql
+++ b/protected/data/devdata.astaf.mysql.sql
@@ -0,0 +1,56 @@
+-- User
+
+INSERT INTO `astaf_user` (`id`, `username`, `algorithm`, `salt`, `password`, `created_at`, `last_login`, `is_active`, `is_super_admin`) VALUES
+(1, 'admin', 'sha1', '8b01941a7d381938bc91d9db7aba03e7', 'c5d9e312d79f800fee5a29e5d574fa167d92b126', '2008-04-21 18:16:39', '2010-06-24 08:29:42', 1, 1),
+(2, 'CCWN', 'sha1', '0e41841b83ec522ea110d87a7933c4a2', 'b08fb3bc63fef35eadfecd561fd34d18f39efd63', '2008-06-03 21:39:23', '2010-06-15 13:26:48', 1, 0);
+
+-- Kategorien
+INSERT INTO `kategorie` (`id`, `name`, `einheiten`, `default_menge`, `default_einheit`, `published`) VALUES
+(1, 'Alkoholfreie Getränke', 'Milliliter, Liter, Flasche, Glas', 0.5, 'Liter', 1),
+(2, 'Essen', 'Portion, Teller', 1, 'Portion', 1),
+(3, 'Alkoholische Getränke', 'Milliliter, Liter, Flasche, Glas', 0.5, 'Liter', 1),
+(4, 'Spezialitäten', 'Portion, Glas, Teller', 1, 'Portion', 1),
+(5, 'Testkategorie', 'Test,as', NULL, '456', 0);
+
+-- Standorte
+INSERT INTO `standort` (`id`, `type`, `name`, `pos_lat`, `pos_long`, `published`) VALUES
+(1, 'Stand', 'vor dem Hochwachturm', 48.8317358074, 9.31517913938, 1),
+(2, 'Stand', 'in den Brühlwiesen beim Bürgerzentrum', 48.8313765015, 9.31986093521, 1),
+(3, 'Stand', 'auf dem Platz nördlich vom Beinsteiner Torturm', 48.8336744259, 9.31851580739, 1),
+(4, 'Stand', 'auf dem Parkplatz Foto Saur, Bürgermühlenweg', 48.8308212055, 9.31567803025, 1),
+(5, 'Stand', 'auf dem Rathausplatz und Platz neben der Nikolauskirche', 48.8319997676, 9.31680858135, 1),
+(6, 'Stand', 'auf dem Rathausplatz', 48.8320474392, 9.31663155556, 1),
+(7, 'Stand', 'unter den Arkaden des Alten Rathauses', 48.8322734373, 9.31635260582, 1),
+(8, 'Stand', 'am Marktplatz und Martkbrunnen', 48.8324076231, 9.31626677513, 1),
+(9, 'Stand', 'im Schlosskeller unter dem Rathaus', 48.8323228742, 9.31676030159, 1),
+(10, 'Stand', 'auf dem Platz vor der Scheuerngasse 2', 48.8321948678, 9.31608840823, 1);
+
+-- Vereine
+INSERT INTO `verein` (`id`, `name`, `url`, `bild`, `email`, `slug`, `kontaktdaten`, `beschreibung`, `standort_id`, `published`) VALUES
+(1, 'Computerclub Waiblingen e.V.', 'http://ccwn.org', 'images/uploaded/1334304302CCWN.jpg', 'vorstand@ccwn.org', 'CCWN', '<p>Computerclub Waiblingen e.V.<br />Postfach 1169<br />71301 Waiblingen<br />vorstand@ccwn.org</p><p><a href="http://www.ccwn.org" target="_blank" title="Webseite Computerclub Waiblingen">http://www.ccwn.org</a></p>', '<p>Der Computerclub Waiblingen ist ein seit 1984 existierender Verein mit Sitz in Waiblingen. Wir treffen uns regelm&auml;&szlig;ig Dienstags ab 19:30 Uhr in Waiblingen Neustadt in der Gastst&auml;tte S&ouml;hrenberg.</p><p>Wir sind seit vielen Jahren am Altstadtfest vertreten und verkaufen haupts&auml;chlich Andechser Spezialit&auml;tenbiere. Auch bei Fragen und Anregungen zum Internetangebot des Altstadtfestes sind Sie bei uns an der richtigen Adresse.&nbsp; </p>', 25, 1);
+
+-- Termine
+INSERT INTO `termin` (`id`, `verein_id`, `titel`, `startzeit`, `endzeit`, `beschreibung`, `published`) VALUES
+(1, 1, 'Freibierverlosung', '2010-06-25 19:00:00', '2010-06-27 22:00:00', 'Wir verlosen Freibier auf http://www.astaf.de. Die Gutscheine k&ouml;nnen w&auml;hrend des gesamten Altstadtfestes an unserem Stand eingel&ouml;st werden.', 1);
+
+-- Angebote
+INSERT INTO `angebot` (`id`, `kategorie_id`, `name`, `beschreibung`, `published`) VALUES
+(1, 4, 'Andechser Doppelbock', 'Stark und s&uuml;ffig. Aus dunklen bayerischen Malzen, im traditionellen Dreimaischverfahren eingebraut. Mit 7% Alkohol und 18,5% Stammw&uuml;rze - und das nicht nur zur Starkbierzeit. Der ganz besonderer Genu&szlig; f&uuml;r Leib und Seele.', 1),
+(2, 1, 'Fanta Orange', 'Erfrischende Orangenlimonade', 1),
+(3, 3, 'Cluss Kellerpils', 'Bierspezialit&auml;t aus Heilbronn', 1),
+(4, 3, 'Radler', 'Biermixgetr&auml;nkt aus s&uuml;&szlig;em Sprudel und Bier', 1),
+(5, 3, 'Wein rot/weiss/rosé', 'Verschiedene lokale Weine', 1),
+(6, 3, 'Weinschorle', 'Mischung aus saurem Sprudel und Wein', 1),
+(7, 3, 'Sekt', '&nbsp;', 1),
+(8, 3, 'Sekt Orange', 'Sekt mit Orangensaft', 1);
+
+-- Angebot -> Verein
+INSERT INTO `angebot_verein` (`angebot_id`, `verein_id`, `menge`, `einheit`, `preis`, `published`) VALUES
+(1, 1, 500, '', 3.5, 1),
+(2, 1, 250, '', 1, 1),
+(3, 1, 330, '', 1.5, 1),
+(4, 1, 200, '', 1.5, 1),
+(5, 1, 330, '', 1.5, 1),
+(6, 1, 0, '', 1.5, 1),
+(7, 1, 330, '', 1.5, 1),
+(8, 1, 0, '', 0, 1);
diff --git a/protected/data/schema.astaf.mysql.sql b/protected/data/schema.astaf.mysql.sql
index 8fc9eb3..56138ef 100644
--- a/protected/data/schema.astaf.mysql.sql
+++ b/protected/data/schema.astaf.mysql.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 15. Apr 2012 um 16:09
+-- Erstellungszeit: 24. Apr 2012 um 18:40
 -- Server Version: 5.5.16
 -- PHP-Version: 5.3.8
 
@@ -11,9 +11,10 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 SET time_zone = "+00:00";
 
 --
--- Datenbank: `astaf_yii_dev`
+-- Datenbank: `astaf`
 --
 
+
 -- --------------------------------------------------------
 
 --
@@ -24,12 +25,12 @@ DROP TABLE IF EXISTS `angebot`;
 CREATE TABLE IF NOT EXISTS `angebot` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `kategorie_id` int(11) DEFAULT NULL,
-  `name` varchar(80) DEFAULT NULL,
-  `beschreibung` text,
+  `name` varchar(80) CHARACTER SET latin1 DEFAULT NULL,
+  `beschreibung` text CHARACTER SET latin1,
   `published` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `angebot_FI_1` (`kategorie_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=247 ;
 
 -- --------------------------------------------------------
 
@@ -42,12 +43,12 @@ CREATE TABLE IF NOT EXISTS `angebot_verein` (
   `angebot_id` int(11) NOT NULL,
   `verein_id` int(11) NOT NULL,
   `menge` double NOT NULL,
-  `einheit` varchar(20) CHARACTER SET utf8 NOT NULL,
-  `preis` float DEFAULT NULL,
-  `published` int(11) DEFAULT NULL,
+  `einheit` varchar(20) NOT NULL,
+  `preis` float NOT NULL,
+  `published` tinyint(1) DEFAULT NULL,
   PRIMARY KEY (`angebot_id`,`verein_id`,`menge`,`einheit`),
   KEY `angebot_verein_FI_2` (`verein_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
@@ -58,17 +59,17 @@ CREATE TABLE IF NOT EXISTS `angebot_verein` (
 DROP TABLE IF EXISTS `astaf_user`;
 CREATE TABLE IF NOT EXISTS `astaf_user` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `username` varchar(128) NOT NULL,
-  `algorithm` varchar(128) NOT NULL DEFAULT 'sha1',
-  `salt` varchar(128) NOT NULL,
-  `password` varchar(128) NOT NULL,
+  `username` varchar(128) CHARACTER SET latin1 NOT NULL,
+  `algorithm` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT 'sha1',
+  `salt` varchar(128) CHARACTER SET latin1 NOT NULL,
+  `password` varchar(128) CHARACTER SET latin1 NOT NULL,
   `created_at` datetime DEFAULT NULL,
   `last_login` datetime DEFAULT NULL,
   `is_active` int(11) NOT NULL DEFAULT '1',
   `is_super_admin` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `sf_guard_user_username_unique` (`username`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=56 ;
 
 -- --------------------------------------------------------
 
@@ -79,13 +80,13 @@ CREATE TABLE IF NOT EXISTS `astaf_user` (
 DROP TABLE IF EXISTS `kategorie`;
 CREATE TABLE IF NOT EXISTS `kategorie` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) CHARACTER SET utf8 NOT NULL,
-  `einheiten` varchar(100) CHARACTER SET utf8 NOT NULL,
+  `name` varchar(100) NOT NULL,
+  `einheiten` varchar(100) NOT NULL,
   `default_menge` double DEFAULT NULL,
-  `default_einheit` varchar(20) CHARACTER SET utf8 NOT NULL,
+  `default_einheit` varchar(20) NOT NULL,
   `published` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;
 
 -- --------------------------------------------------------
 
@@ -96,12 +97,13 @@ CREATE TABLE IF NOT EXISTS `kategorie` (
 DROP TABLE IF EXISTS `standort`;
 CREATE TABLE IF NOT EXISTS `standort` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` enum('Bühne','Stand') NOT NULL DEFAULT 'Stand',
   `name` varchar(80) DEFAULT NULL,
   `pos_lat` double DEFAULT NULL,
   `pos_long` double DEFAULT NULL,
   `published` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=56 ;
 
 -- --------------------------------------------------------
 
@@ -113,14 +115,14 @@ DROP TABLE IF EXISTS `termin`;
 CREATE TABLE IF NOT EXISTS `termin` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `verein_id` int(11) DEFAULT NULL,
-  `titel` varchar(100) DEFAULT NULL,
+  `titel` varchar(100) CHARACTER SET latin1 DEFAULT NULL,
   `startzeit` datetime DEFAULT NULL,
   `endzeit` datetime DEFAULT NULL,
-  `beschreibung` text,
+  `beschreibung` text CHARACTER SET latin1,
   `published` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `termin_FI_1` (`verein_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=222 ;
 
 -- --------------------------------------------------------
 
@@ -131,15 +133,15 @@ CREATE TABLE IF NOT EXISTS `termin` (
 DROP TABLE IF EXISTS `verein`;
 CREATE TABLE IF NOT EXISTS `verein` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
-  `url` varchar(255) DEFAULT NULL,
-  `bild` varchar(100) DEFAULT NULL,
-  `email` varchar(100) DEFAULT NULL,
-  `slug` varchar(100) DEFAULT NULL,
-  `kontaktdaten` text,
-  `beschreibung` text,
+  `name` varchar(255) DEFAULT NULL,
+  `url` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `bild` varchar(100) CHARACTER SET latin1 DEFAULT NULL,
+  `email` varchar(100) CHARACTER SET latin1 DEFAULT NULL,
+  `slug` varchar(100) CHARACTER SET latin1 DEFAULT NULL,
+  `kontaktdaten` text CHARACTER SET latin1,
+  `beschreibung` text CHARACTER SET latin1,
   `standort_id` int(11) DEFAULT NULL,
   `published` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `verein_FI_1` (`standort_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=0 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=57 ;
diff --git a/protected/models/Angebot.php b/protected/models/Angebot.php
index 7791bcb..9561687 100644
--- a/protected/models/Angebot.php
+++ b/protected/models/Angebot.php
@@ -38,6 +38,7 @@ class Angebot extends CActiveRecord
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
+			array('name, kategorie_id', 'required'),
 			array('kategorie_id, published', 'numerical', 'integerOnly'=>true),
 			array('name', 'length', 'max'=>80),
 			array('beschreibung', 'safe'),
diff --git a/protected/models/AngebotVerein.php b/protected/models/AngebotVerein.php
index 54cb734..65339ed 100644
--- a/protected/models/AngebotVerein.php
+++ b/protected/models/AngebotVerein.php
@@ -6,7 +6,8 @@
  * The followings are the available columns in table 'angebot_verein':
  * @property integer $angebot_id
  * @property integer $verein_id
- * @property integer $menge
+ * @property double $menge
+ * @property string $einheit
  * @property double $preis
  * @property integer $published
  */
@@ -38,12 +39,13 @@ class AngebotVerein extends CActiveRecord
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('angebot_id, verein_id, menge', 'required'),
-			array('angebot_id, verein_id, menge, published', 'numerical', 'integerOnly'=>true),
-			array('preis', 'numerical'),
+			array('angebot_id, verein_id, menge, einheit, preis', 'required'),
+			array('angebot_id, verein_id, published', 'numerical', 'integerOnly'=>true),
+			array('menge, preis', 'numerical'),
+			array('einheit', 'length', 'max'=>20),
 			// The following rule is used by search().
 			// Please remove those attributes that should not be searched.
-			array('angebot_id, verein_id, menge, preis, published', 'safe', 'on'=>'search'),
+			array('angebot_id, verein_id, menge, einheit, preis, published', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -55,6 +57,8 @@ class AngebotVerein extends CActiveRecord
 		// NOTE: you may need to adjust the relation name and the related
 		// class name for the relations automatically generated below.
 		return array(
+				"angebot"=>array(self::HAS_ONE, "Angebot", array('id'=>'angebot_id')),
+				"verein"=>array(self::HAS_ONE, "Verein", array('id'=>'verein_id'))
 		);
 	}
 
@@ -67,8 +71,9 @@ class AngebotVerein extends CActiveRecord
 			'angebot_id' => 'Angebot',
 			'verein_id' => 'Verein',
 			'menge' => 'Menge',
+			'einheit' => 'Einheit',
 			'preis' => 'Preis',
-			'published' => 'Published',
+			'published' => 'Öffentlich',
 		);
 	}
 
@@ -86,6 +91,7 @@ class AngebotVerein extends CActiveRecord
 		$criteria->compare('angebot_id',$this->angebot_id);
 		$criteria->compare('verein_id',$this->verein_id);
 		$criteria->compare('menge',$this->menge);
+		$criteria->compare('einheit',$this->einheit,true);
 		$criteria->compare('preis',$this->preis);
 		$criteria->compare('published',$this->published);
 
diff --git a/protected/models/Standort.php b/protected/models/Standort.php
index 48493f6..b7eddcf 100644
--- a/protected/models/Standort.php
+++ b/protected/models/Standort.php
@@ -5,6 +5,7 @@
  *
  * The followings are the available columns in table 'standort':
  * @property integer $id
+ * @property string $type
  * @property string $name
  * @property double $pos_lat
  * @property double $pos_long
@@ -43,13 +44,14 @@ class Standort extends CActiveRecord
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('name, pos_lat, pos_long', 'required'),
+			array('name, pos_lat, pos_long, type', 'required'),
 			array('published', 'numerical', 'integerOnly'=>true),
 			array('pos_lat, pos_long', 'numerical'),
+			array('type', 'length', 'max'=>6),
 			array('name', 'length', 'max'=>80),
 			// The following rule is used by search().
 			// Please remove those attributes that should not be searched.
-			array('id, name, pos_lat, pos_long, published', 'safe', 'on'=>'search'),
+			array('id, type, name, pos_lat, pos_long, published', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -71,6 +73,7 @@ class Standort extends CActiveRecord
 	{
 		return array(
 			'id' => 'ID',
+			'type' => 'Type',
 			'name' => 'Name',
 			'pos_lat' => 'Pos Lat',
 			'pos_long' => 'Pos Long',
@@ -90,6 +93,7 @@ class Standort extends CActiveRecord
 		$criteria=new CDbCriteria;
 
 		$criteria->compare('id',$this->id);
+		$criteria->compare('type',$this->type,true);
 		$criteria->compare('name',$this->name,true);
 		$criteria->compare('pos_lat',$this->pos_lat);
 		$criteria->compare('pos_long',$this->pos_long);
diff --git a/protected/models/Verein.php b/protected/models/Verein.php
index dba05db..d740c8a 100644
--- a/protected/models/Verein.php
+++ b/protected/models/Verein.php
@@ -48,8 +48,8 @@ class Verein extends CActiveRecord
 			array('standort_id, published', 'numerical', 'integerOnly'=>true),
 			array('name, url', 'length', 'max'=>255),
 			array('bild, email, slug', 'length', 'max'=>100),
-			array("url", "url", "allowEmpty"=>true, "message"=>"Die eingebene URL ist ung�ltig."),
-			array("email", "email", "message"=>"Die eingebene eMail-Adresse ist ung�ltig."),
+			array("url", "url", "allowEmpty"=>true, "message"=>"Die eingebene URL ist ungültig."),
+			array("email", "email", "message"=>"Die eingebene eMail-Adresse ist ungültig."),
 			array("uploadedImage", "file", "types"=>"jpg, gif, png", "allowEmpty"=>true, "wrongType"=>'Die Datei "{file}" konnte nicht hochgeladen werden. Es sind nur Dateien mit den folgenden Endungen erlaubt: {extensions}.'),
 			array('kontaktdaten, beschreibung', 'safe'),
 			// The following rule is used by search().
diff --git a/protected/runtime/application.log b/protected/runtime/application.log
index 587f0b9..b25ea6a 100644
--- a/protected/runtime/application.log
+++ b/protected/runtime/application.log
@@ -3743,3 +3743,542 @@ Stack trace:
 REQUEST_URI=/admin.astaf.de/index.php?r=standort/view&id=54
 HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=standort/create
 ---
+2012/04/22 11:39:28 [error] [php] include(ZHtml.php) [<a href='function.include'>function.include</a>]: failed to open stream: No such file or directory (D:\Projects\Astaf\workspace\yii\framework\YiiBase.php:418)
+Stack trace:
+#0 D:\Projects\Astaf\workspace\admin.astaf.de\protected\components\Html.php(36): spl_autoload_call()
+#1 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\standort\_form.php(20): enumDropDownList()
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require()
+#3 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): StandortController->renderInternal()
+#4 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): StandortController->renderFile()
+#5 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\standort\create.php(14): StandortController->renderPartial()
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require()
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): StandortController->renderInternal()
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): StandortController->renderFile()
+#9 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): StandortController->renderPartial()
+#10 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\StandortController.php(70): StandortController->render()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): StandortController->actionCreate()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): StandortController->runAction()
+#14 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CAccessControlFilter->filter()
+#16 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): StandortController->filterAccessControl()
+#17 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter()
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): StandortController->runActionWithFilters()
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): StandortController->run()
+#21 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController()
+#22 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#23 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CWebApplication->run()
+REQUEST_URI=/admin.astaf.de/index.php?r=standort/create
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\components\Html.php (36)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\standort\_form.php (20)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\standort\create.php (14)
+2012/04/22 12:23:14 [error] [exception.CDbException] exception 'CDbException' with message 'ActiveRecord-Klasse "Angebot" hat eine ungültige Konfiguration für die Relation "angebot_vereine". Relations-Typ, verknüpftes ActiveRecord und Fremdschlüssel müssen angegeben werden.' in D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php:2312
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(2291): CActiveRecordMetaData->addRelation('angebot_vereine', Array)
+#1 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(379): CActiveRecordMetaData->__construct(Object(Angebot))
+#2 D:\Projects\Astaf\workspace\admin.astaf.de\protected\models\Angebot.php(22): CActiveRecord::model('Angebot')
+#3 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(149): Angebot::model()
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(87): SpeisTrankController->loadModel('9')
+#5 [internal function]: SpeisTrankController->actionUpdate('9')
+#6 D:\Projects\Astaf\workspace\yii\framework\web\actions\CAction.php(107): ReflectionMethod->invokeArgs(Object(SpeisTrankController), Array)
+#7 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(48): CAction->runWithParamsInternal(Object(SpeisTrankController), Object(ReflectionMethod), Array)
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#9 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#10 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#12 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#13 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('update')
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('speisTrank/upda...')
+#18 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#19 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#20 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=speisTrank/update&id=9
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=speisTrank/index
+---
+2012/04/22 19:21:47 [error] [php] Missing argument 1 for CActiveDataProvider::__construct(), called in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\_angebot_vereine.php on line 2 and defined (D:\Projects\Astaf\workspace\yii\framework\web\CActiveDataProvider.php:70)
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): SpeisTrankController->renderInternal()
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): SpeisTrankController->renderFile()
+#2 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\view.php(28): SpeisTrankController->renderPartial()
+#3 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require()
+#4 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): SpeisTrankController->renderInternal()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): SpeisTrankController->renderFile()
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): SpeisTrankController->renderPartial()
+#7 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(51): SpeisTrankController->render()
+#8 unknown(0): SpeisTrankController->actionView()
+#9 D:\Projects\Astaf\workspace\yii\framework\web\actions\CAction.php(107): ReflectionMethod->invokeArgs()
+#10 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(48): CInlineAction->runWithParamsInternal()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): SpeisTrankController->runAction()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CAccessControlFilter->filter()
+#15 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): SpeisTrankController->filterAccessControl()
+#16 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter()
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): SpeisTrankController->runActionWithFilters()
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): SpeisTrankController->run()
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController()
+#21 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#22 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CWebApplication->run()
+REQUEST_URI=/admin.astaf.de/index.php?r=speisTrank/view&id=9
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\_angebot_vereine.php (2)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\view.php (28)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php (51)
+2012/04/22 19:21:59 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.kategorie ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('kategorie')
+#1 D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php(607) : eval()'d code(1): CActiveRecord->__get('kategorie')
+#2 D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php(607): eval()
+#3 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CDataColumn.php(139): CComponent->evaluateExpression('($data->kategor...', Array)
+#4 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridColumn.php(138): CDataColumn->renderDataCellContent(0, Object(AngebotVerein))
+#5 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(517): CGridColumn->renderDataCell(0)
+#6 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(490): CGridView->renderTableRow(0)
+#7 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(400): CGridView->renderTableBody()
+#8 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(158): CGridView->renderItems()
+#9 [internal function]: CBaseListView->renderSection(Array)
+#10 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(141): preg_replace_callback('/{(\w+)}/', Array, '{summary}?{item...')
+#11 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(126): CBaseListView->renderContent()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(174): CBaseListView->run()
+#13 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\_angebot_vereine.php(13): CBaseController->widget('zii.widgets.gri...', Array)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#17 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\view.php(28): CController->renderPartial('_angebot_verein...', Array)
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#21 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('view', Array, true)
+#22 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(51): CController->render('view', Array)
+#23 [internal function]: SpeisTrankController->actionView('9')
+#24 D:\Projects\Astaf\workspace\yii\framework\web\actions\CAction.php(107): ReflectionMethod->invokeArgs(Object(SpeisTrankController), Array)
+#25 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(48): CAction->runWithParamsInternal(Object(SpeisTrankController), Object(ReflectionMethod), Array)
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#27 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#28 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#29 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#30 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#31 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#32 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#33 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#34 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('view')
+#35 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('speisTrank/view')
+#36 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#37 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#38 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=speisTrank/view&id=9
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=speisTrank/update&id=9
+---
+2012/04/22 19:24:42 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.id ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('id')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CArrayDataProvider.php(102): CActiveRecord->__get('id')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CDataProvider.php(159): CArrayDataProvider->fetchKeys()
+#3 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(186): CDataProvider->getKeys()
+#4 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(127): CBaseListView->renderKeys()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(174): CBaseListView->run()
+#6 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\_angebot_vereine.php(11): CBaseController->widget('zii.widgets.gri...', Array)
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#9 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#10 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\view.php(28): CController->renderPartial('_angebot_verein...', Array)
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('view', Array, true)
+#15 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(51): CController->render('view', Array)
+#16 [internal function]: SpeisTrankController->actionView('9')
+#17 D:\Projects\Astaf\workspace\yii\framework\web\actions\CAction.php(107): ReflectionMethod->invokeArgs(Object(SpeisTrankController), Array)
+#18 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(48): CAction->runWithParamsInternal(Object(SpeisTrankController), Object(ReflectionMethod), Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#20 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#21 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#22 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#23 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#24 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('view')
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('speisTrank/view')
+#29 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#30 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#31 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=speisTrank/view&id=9
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=speisTrank/update&id=9
+---
+2012/04/22 19:24:44 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.id ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('id')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CArrayDataProvider.php(102): CActiveRecord->__get('id')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CDataProvider.php(159): CArrayDataProvider->fetchKeys()
+#3 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(186): CDataProvider->getKeys()
+#4 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(127): CBaseListView->renderKeys()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(174): CBaseListView->run()
+#6 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\_angebot_vereine.php(11): CBaseController->widget('zii.widgets.gri...', Array)
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#9 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#10 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\speisTrank\view.php(28): CController->renderPartial('_angebot_verein...', Array)
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('view', Array, true)
+#15 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\SpeisTrankController.php(51): CController->render('view', Array)
+#16 [internal function]: SpeisTrankController->actionView('9')
+#17 D:\Projects\Astaf\workspace\yii\framework\web\actions\CAction.php(107): ReflectionMethod->invokeArgs(Object(SpeisTrankController), Array)
+#18 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(48): CAction->runWithParamsInternal(Object(SpeisTrankController), Object(ReflectionMethod), Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#20 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#21 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#22 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#23 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#24 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('view')
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('speisTrank/view')
+#29 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#30 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#31 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=speisTrank/view&id=9
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=speisTrank/update&id=9
+---
+2012/04/22 19:55:14 [error] [exception.CException] exception 'CException' with message 'MyAngebotController kann den angeforderten View "_search" nicht finden.' in D:\Projects\Astaf\workspace\yii\framework\web\CController.php:879
+Stack trace:
+#0 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\common\_advanced_search.php(19): CController->renderPartial('_search', Array)
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#3 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(13): CController->renderPartial('/common/_advanc...', Array)
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#9 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(42): CController->render('index', Array)
+#10 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#12 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#13 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#15 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#16 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#21 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#22 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#23 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/22 19:55:25 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.id ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('id')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(2044): CActiveRecord->__get('id')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1774): CHtml::resolveValue(Object(AngebotVerein), 'id')
+#3 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1205): CHtml::activeInputField('text', Object(AngebotVerein), 'id', Array)
+#4 D:\Projects\Astaf\workspace\yii\framework\web\widgets\CActiveForm.php(575): CHtml::activeTextField(Object(AngebotVerein), 'id', Array)
+#5 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\_search.php(10): CActiveForm->textField(Object(AngebotVerein), 'id')
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#9 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\common\_advanced_search.php(19): CController->renderPartial('_search', Array)
+#10 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#13 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(13): CController->renderPartial('/common/_advanc...', Array)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#18 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(42): CController->render('index', Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#21 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#22 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#23 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#24 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#29 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#30 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#31 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#32 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/22 19:57:10 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.kategorie_id ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('kategorie_id')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(2044): CActiveRecord->__get('kategorie_id')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1774): CHtml::resolveValue(Object(AngebotVerein), 'kategorie_id')
+#3 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1205): CHtml::activeInputField('text', Object(AngebotVerein), 'kategorie_id', Array)
+#4 D:\Projects\Astaf\workspace\yii\framework\web\widgets\CActiveForm.php(575): CHtml::activeTextField(Object(AngebotVerein), 'kategorie_id', Array)
+#5 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\_search.php(10): CActiveForm->textField(Object(AngebotVerein), 'kategorie_id')
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#9 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\common\_advanced_search.php(19): CController->renderPartial('_search', Array)
+#10 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#13 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(13): CController->renderPartial('/common/_advanc...', Array)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#18 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(42): CController->render('index', Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#21 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#22 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#23 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#24 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#29 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#30 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#31 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#32 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/22 19:57:15 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.name ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('name')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(2044): CActiveRecord->__get('name')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1774): CHtml::resolveValue(Object(AngebotVerein), 'name')
+#3 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1205): CHtml::activeInputField('text', Object(AngebotVerein), 'name', Array)
+#4 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CDataColumn.php(105): CHtml::activeTextField(Object(AngebotVerein), 'name', Array)
+#5 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridColumn.php(106): CDataColumn->renderFilterCellContent()
+#6 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(450): CGridColumn->renderFilterCell()
+#7 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(428): CGridView->renderFilter()
+#8 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(398): CGridView->renderTableHeader()
+#9 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(158): CGridView->renderItems()
+#10 [internal function]: CBaseListView->renderSection(Array)
+#11 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(141): preg_replace_callback('/{(\w+)}/', Array, '{summary}?{item...')
+#12 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(126): CBaseListView->renderContent()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(174): CBaseListView->run()
+#14 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(29): CBaseController->widget('zii.widgets.gri...', Array)
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#19 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(42): CController->render('index', Array)
+#20 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#21 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#22 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#23 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#24 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#26 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#29 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#30 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#31 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#32 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#33 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/22 19:58:16 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "AngebotVerein.kategorie ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('kategorie')
+#1 D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php(607) : eval()'d code(1): CActiveRecord->__get('kategorie')
+#2 D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php(607): eval()
+#3 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CDataColumn.php(139): CComponent->evaluateExpression('($data->kategor...', Array)
+#4 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridColumn.php(138): CDataColumn->renderDataCellContent(0, Object(AngebotVerein))
+#5 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(517): CGridColumn->renderDataCell(0)
+#6 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(490): CGridView->renderTableRow(0)
+#7 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\grid\CGridView.php(400): CGridView->renderTableBody()
+#8 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(158): CGridView->renderItems()
+#9 [internal function]: CBaseListView->renderSection(Array)
+#10 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(141): preg_replace_callback('/{(\w+)}/', Array, '{summary}?{item...')
+#11 D:\Projects\Astaf\workspace\yii\framework\zii\widgets\CBaseListView.php(126): CBaseListView->renderContent()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(174): CBaseListView->run()
+#13 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(32): CBaseController->widget('zii.widgets.gri...', Array)
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#15 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#18 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(42): CController->render('index', Array)
+#19 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#20 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#21 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#22 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#23 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#24 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#25 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#26 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#27 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#28 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#29 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#30 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#31 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#32 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/22 20:04:32 [error] [php] Indirect modification of overloaded property AngebotVerein::$attributes has no effect (D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php:40)
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): MyAngebotController->runAction()
+#1 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CAccessControlFilter->filter()
+#3 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): MyAngebotController->filterAccessControl()
+#4 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): MyAngebotController->runActionWithFilters()
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): MyAngebotController->run()
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController()
+#9 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#10 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CWebApplication->run()
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:05 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:05 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:08 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:08 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:28 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:28 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:30 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:05:30 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:00 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:00 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:18 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:18 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:19 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:19 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:20 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:20 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:48 [warning] [application] Ungesichertes Attribut "0" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:06:48 [warning] [application] Ungesichertes Attribut "1" konnte nicht gesetzt werden.
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (40)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/22 20:23:39 [error] [php] Trying to get property of non-object (D:\Projects\Astaf\workspace\admin.astaf.de\protected\models\AngebotVerein.php:91)
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): MyAngebotController->renderInternal()
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): MyAngebotController->renderFile()
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): MyAngebotController->renderPartial()
+#3 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(44): MyAngebotController->render()
+#4 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams()
+#6 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): MyAngebotController->runAction()
+#7 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#8 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CAccessControlFilter->filter()
+#9 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): MyAngebotController->filterAccessControl()
+#10 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): MyAngebotController->runActionWithFilters()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): MyAngebotController->run()
+#14 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController()
+#15 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#16 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CWebApplication->run()
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\models\AngebotVerein.php (91)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php (17)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php (44)
+2012/04/22 20:31:45 [error] [exception.CException] exception 'CException' with message 'Eigenschaft "Angebot.angebot_id ist nicht definiert.' in D:\Projects\Astaf\workspace\yii\framework\base\CComponent.php:131
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\db\ar\CActiveRecord.php(144): CComponent->__get('angebot_id')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1696): CActiveRecord->__get('angebot_id')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\helpers\CHtml.php(1659): CHtml::value(Object(Angebot), 'angebot_id')
+#3 D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\myAngebot\index.php(20): CHtml::listData(Array, 'angebot_id', 'name')
+#4 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(127): require('D:\Projects\Ast...')
+#5 D:\Projects\Astaf\workspace\yii\framework\web\CBaseController.php(96): CBaseController->renderInternal('D:\Projects\Ast...', Array, true)
+#6 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): CBaseController->renderFile('D:\Projects\Ast...', Array, true)
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): CController->renderPartial('index', Array, true)
+#8 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\MyAngebotController.php(44): CController->render('index', Array)
+#9 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): MyAngebotController->actionIndex()
+#10 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams(Array)
+#11 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): CController->runAction(Object(CInlineAction))
+#12 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CFilter->filter(Object(CFilterChain))
+#14 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): CController->filterAccessControl(Object(CFilterChain))
+#15 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter(Object(CFilterChain))
+#16 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#17 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): CController->runActionWithFilters(Object(CInlineAction), Array)
+#18 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('index')
+#19 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('myAngebot/index')
+#20 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#21 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#22 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=myAngebot/index
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=myAngebot/index
+---
+2012/04/24 18:45:06 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "admin".' in D:\Projects\Astaf\workspace\yii\framework\web\CController.php:484
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(271): CController->missingAction('admin')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('admin')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('verein/admin')
+#3 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=verein/admin
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=site/login
+---
+2012/04/24 18:45:44 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "admin".' in D:\Projects\Astaf\workspace\yii\framework\web\CController.php:484
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(271): CController->missingAction('admin')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('admin')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('verein/admin')
+#3 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=verein/admin
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=site/login
+---
+2012/04/24 18:46:02 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "admin".' in D:\Projects\Astaf\workspace\yii\framework\web\CController.php:484
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(271): CController->missingAction('admin')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('admin')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('verein/admin')
+#3 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=verein/admin
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=site/login
+---
diff --git a/protected/runtime/gii-1.1.10/ControllerCode.php b/protected/runtime/gii-1.1.10/ControllerCode.php
new file mode 100644
index 0000000..80bf100
--- /dev/null
+++ b/protected/runtime/gii-1.1.10/ControllerCode.php
@@ -0,0 +1,6 @@
+<?php
+return array (
+  'template' => 'default',
+  'baseClass' => 'Controller',
+  'actions' => 'index',
+);
diff --git a/protected/views/kategorie/_form.php b/protected/views/kategorie/_form.php
index 156fdd1..a6b9971 100644
--- a/protected/views/kategorie/_form.php
+++ b/protected/views/kategorie/_form.php
@@ -6,7 +6,7 @@ $form=$this->beginWidget('CActiveForm', array(
 	'enableAjaxValidation'=>false,
 )); ?>
 
-	<p class="note">Mit <span class="required">*</span> gekennzeichnete Felder sind Pflichtfelder.</p>
+	<?php $this->renderPartial('/common/_required_fields_text'); ?>
 
 	<?php echo $form->errorSummary($model); ?>
 
diff --git a/protected/views/kategorie/index.php b/protected/views/kategorie/index.php
index 3629458..2afd66f 100644
--- a/protected/views/kategorie/index.php
+++ b/protected/views/kategorie/index.php
@@ -1,39 +1,20 @@
 <?php
 $this->breadcrumbs=array(
-	'Kategorien verwalten',
+	'Kategorien',
 );
 
 $this->menu=array(
 	array('label'=>'Kategorie erstellen', 'url'=>array('create')),
 );
-
-Yii::app()->clientScript->registerScript('search', "
-$('.search-button').click(function(){
-	$('.search-form').toggle();
-	return false;
-});
-$('.search-form form').submit(function(){
-	$.fn.yiiGridView.update('kategorie-grid', {
-		data: $(this).serialize()
-	});
-	return false;
-});
-");
 ?>
 
-<h1>Kategorien verwalten</h1>
+<h1>Kategorien</h1>
 
-<p>
-Die optionale Eingabe von Vergleichsoperatoren (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b>
-or <b>=</b>) zu Beginn eines Suchwertes dient der Spezifikation, wie der Vergleich erfolgen soll.
-</p>
+<?php $this->renderPartial('/common/_comparison_text'); ?>
 
-<?php echo CHtml::link('Erweiterte Suche','#',array('class'=>'search-button')); ?>
-<div class="search-form" style="display:none">
-<?php $this->renderPartial('_search',array(
+<?php $this->renderPartial('/common/_advanced_search',array(
 	'model'=>$model,
 )); ?>
-</div><!-- search-form -->
 
 <?php $this->widget('zii.widgets.grid.CGridView', array(
 	'id'=>'kategorie-grid',
diff --git a/protected/views/kategorie/update.php b/protected/views/kategorie/update.php
index e8a09e6..b090579 100644
--- a/protected/views/kategorie/update.php
+++ b/protected/views/kategorie/update.php
@@ -1,12 +1,11 @@
 <?php
 $this->breadcrumbs=array(
-	'Kategories'=>array('index'),
-	$model->name=>array('view','id'=>$model->id),
-	'Kategorie bearbeiten',
+	'Kategorien'=>array('index'),
+	'"'.$model->name.'" bearbeiten',
 );
 
 $this->menu=array(
-	array('label'=>'Kategorien verwalten', 'url'=>array('index')),
+	array('label'=>'Kategorien', 'url'=>array('index')),
 	array('label'=>'Kategorie erstellen', 'url'=>array('create')),
 	array('label'=>'Kategorie anzeigen', 'url'=>array('view', 'id'=>$model->id)),
 );
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 6f00be2..85ee278 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -37,6 +37,8 @@
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "kategorie"),
 				array("label"=>"Speis & Trank", "url"=>array("/speisTrank/index"),
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "speisTrank"),
+				array("label"=>"Speis & Trank", "url"=>array("/myAngebot/index"),
+						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myAngebot"),
 				array("label"=>"Veranstaltungen", "url"=>array("/veranstaltung/index"),
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "veranstaltung"),
 				array("label"=>"Benutzer", "url"=>array("/user/admin"),
diff --git a/protected/views/myAngebot/_form.php b/protected/views/myAngebot/_form.php
new file mode 100644
index 0000000..f48ecc9
--- /dev/null
+++ b/protected/views/myAngebot/_form.php
@@ -0,0 +1,51 @@
+<div class="form">
+
+<?php $form=$this->beginWidget('CActiveForm', array(
+	'id'=>'angebot-form',
+	'enableAjaxValidation'=>false,
+)); ?>
+
+	<?php $this->renderPartial('/common/_required_fields_text'); ?>
+
+	<?php echo $form->errorSummary($model); ?>
+	
+	<div class="row">
+		<?php echo $form->labelEx($model, 'angebot_id'); ?>
+		<?php echo $this->widget('zii.widgets.jui.CJuiAutoComplete', array(
+    'name'=>'city',
+    'source'=>array('ac1', 'ac2', 'ac3'),
+    // additional javascript options for the autocomplete plugin
+    'options'=>array(
+        'minLength'=>'2',
+    ),
+    'htmlOptions'=>array(
+        'style'=>'height:20px;'
+    ),
+)); ?>
+		<?php echo $form->error($model, 'angebot_id'); ?>
+	</div>
+	
+	<div class="row">
+		<?php echo $form->labelEx($model,'menge'); ?>
+		<?php echo $form->textField($model,'menge',array('size'=>60,'maxlength'=>80)); ?>
+		<?php echo $form->error($model,'menge'); ?>
+	</div>
+	
+	<div class="row">
+		<?php echo $form->labelEx($model,'preis'); ?>
+		<?php echo $form->textField($model,'preis',array('size'=>60,'maxlength'=>80)); ?>
+		<?php echo $form->error($model,'preis'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->labelEx($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
+		<?php echo $form->error($model,'published'); ?>
+	</div>
+
+	<div class="row buttons">
+		<?php echo CHtml::submitButton($model->isNewRecord ? 'Erstellen' : 'Speichern'); ?>
+	</div>
+
+<?php $this->endWidget(); ?>
+</div>
\ No newline at end of file
diff --git a/protected/views/myAngebot/_search.php b/protected/views/myAngebot/_search.php
new file mode 100644
index 0000000..790eae1
--- /dev/null
+++ b/protected/views/myAngebot/_search.php
@@ -0,0 +1,29 @@
+<div class="wide form">
+
+<?php $form=$this->beginWidget('CActiveForm', array(
+	'action'=>Yii::app()->createUrl($this->route),
+	'method'=>'get',
+)); ?>
+
+	<div class="row">
+		<?php echo $form->label($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'menge'); ?>
+		<?php echo $form->textField($model,'menge'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'preis'); ?>
+		<?php echo $form->textField($model,'preis'); ?>
+	</div>
+
+	<div class="row buttons">
+		<?php echo CHtml::submitButton('Search'); ?>
+	</div>
+
+<?php $this->endWidget(); ?>
+
+</div><!-- search-form -->
\ No newline at end of file
diff --git a/protected/views/myAngebot/create.php b/protected/views/myAngebot/create.php
new file mode 100644
index 0000000..1a6bf5a
--- /dev/null
+++ b/protected/views/myAngebot/create.php
@@ -0,0 +1,14 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank'=>array('index'),
+	'Kulinarisches Angebot erstellen',
+);
+
+$this->menu=array(
+	array('label'=>'Speis & Trank', 'url'=>array('index')),
+);
+?>
+
+<h1>Kulinarisches Angebot erstellen</h1>
+
+<?php echo $this->renderPartial('_form', array('model'=>$model)); ?>
\ No newline at end of file
diff --git a/protected/views/myAngebot/index.php b/protected/views/myAngebot/index.php
new file mode 100644
index 0000000..0c7fc43
--- /dev/null
+++ b/protected/views/myAngebot/index.php
@@ -0,0 +1,30 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank',
+);?>
+
+
+<h1>Meine Angebote</h1>
+
+<?php $this->renderPartial('/common/_comparison_text'); ?>
+
+<?php $this->renderPartial('/common/_advanced_search',array(
+	'model'=>$model,
+)); ?>
+
+<?php $this->widget('zii.widgets.grid.CGridView', array(
+	'id'=>'angebot-grid',
+	'dataProvider'=>$model->search(),
+	'filter'=>$model,
+	'columns'=>array(
+		array('header'=>'Angebot', 'value'=>'$data->angebot->name', 'name'=>'angebot_id', 'filter'=>CHtml::listData(Angebot::model()->findAll(), 'id', 'name')),
+		array('header'=>'Verein', 'value'=>'$data->verein->name'),
+		array('header'=>'Menge', 'value'=>'Format::number($data->menge, $data->einheit)'),
+		array('header'=>'Preis', 'value'=>'Format::currency($data->preis)'),
+		array('header'=>'Öffentlich',
+				'value'=>'CHtml::image($data->published ? "images/ok.png" : "images/nok.png", $data->published ? "ok.png" : "nok.png")', 'type'=>'raw'),
+		array(
+			'class'=>'CButtonColumn'
+		),
+	),
+)); ?>
\ No newline at end of file
diff --git a/protected/views/myAngebot/update.php b/protected/views/myAngebot/update.php
new file mode 100644
index 0000000..e3bc87a
--- /dev/null
+++ b/protected/views/myAngebot/update.php
@@ -0,0 +1,17 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank'=>array('index'),
+	$model->name.' bearbeiten',
+	
+);
+
+$this->menu=array(
+	array('label'=>'Speis & Trank', 'url'=>array('index')),
+	array('label'=>'Kulinarisches Angebot erstellen', 'url'=>array('create')),
+	array('label'=>$model->name.' anzeigen', 'url'=>array('view', 'id'=>$model->id)),
+);
+?>
+
+<h1><?php echo $model->name; ?> bearbeiten</h1>
+
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'kategorien'=>$kategorien)); ?>
\ No newline at end of file
diff --git a/protected/views/speisTrank/_angebot_vereine.php b/protected/views/speisTrank/_angebot_vereine.php
index 93c1ebd..2d65d35 100644
--- a/protected/views/speisTrank/_angebot_vereine.php
+++ b/protected/views/speisTrank/_angebot_vereine.php
@@ -1,8 +1,12 @@
-<ul>
-<?php foreach($angebot_vereine as $verein): ?>
-	<li>
-	<?php echo CHtml::link(Verein::model()->findByPk($verein->verein_id)->name, array("/verein/view", "id"=>$verein->verein_id)); ?>
-	<?php echo $verein->menge." ".$verein->einheit?> für <?php echo $verein->preis?>€
-	</li>
-<?php endforeach; ?>
-</ul>
\ No newline at end of file
+<?php
+$dataProvider = new CArrayDataProvider($angebot_vereine);
+$dataProvider->keyField = false;
+$this->widget('zii.widgets.grid.CGridView', array(
+	'id'=>'angebot-vereine-grid',
+	'dataProvider'=>$dataProvider,
+	'columns'=>array(
+		array('header'=>'Verein', 'value'=>'CHtml::link(Verein::model()->findByPk($data->verein_id)->name, array("/verein/view", "id"=>$data->verein_id))', 'type'=>'raw'),
+		array('header'=>'Menge', 'value'=>'Format::number($data->menge, $data->einheit)'),
+		array('header'=>'Preis', 'value'=>'Format::currency($data->preis)')
+	),
+)); ?>
\ No newline at end of file
diff --git a/protected/views/speisTrank/_form.php b/protected/views/speisTrank/_form.php
index 27349a4..ca1ba6f 100644
--- a/protected/views/speisTrank/_form.php
+++ b/protected/views/speisTrank/_form.php
@@ -44,7 +44,7 @@
 	</div>
 
 	<div class="row buttons">
-		<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save'); ?>
+		<?php echo CHtml::submitButton($model->isNewRecord ? 'Erstellen' : 'Speichern'); ?>
 	</div>
 
 <?php $this->endWidget(); ?>
diff --git a/protected/views/standort/_form.php b/protected/views/standort/_form.php
index fb17125..f37dc3d 100644
--- a/protected/views/standort/_form.php
+++ b/protected/views/standort/_form.php
@@ -16,6 +16,12 @@
 	</div>
 
     <div class="row">
+        <?php echo $form->labelEx($model,'type'); ?>
+        <?php echo Html::enumDropDownList($model, 'type'); ?>
+        <?php echo $form->error($model,'type'); ?>
+    </div>
+
+	<div class="row">
 		<?php echo $form->labelEx($model,'pos_lat'); ?>
 		<?php echo $form->textField($model,'pos_lat'); ?>
 		<?php echo $form->error($model,'pos_lat'); ?>
diff --git a/protected/views/user/_form.php b/protected/views/user/_form.php
index dda3df4..163e11c 100644
--- a/protected/views/user/_form.php
+++ b/protected/views/user/_form.php
@@ -5,7 +5,7 @@
 	'enableAjaxValidation'=>false,
 )); ?>
 
-	<p class="note">Fields with <span class="required">*</span> are required.</p>
+	<?php $this->renderPartial('/common/_required_fields_text'); ?>
 
 	<?php echo $form->errorSummary($model); ?>
 
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php
index 9950421..9aab04d 100644
--- a/protected/views/verein/_form.php
+++ b/protected/views/verein/_form.php
@@ -6,7 +6,7 @@
 	"htmlOptions"=>array('enctype'=>'multipart/form-data'),
 )); ?>
 
-	<p class="note">Mit <span class="required">*</span> gekennzeichnete Felder sind Pflichtfelder.</p>
+	<?php $this->renderPartial('/common/_required_fields_text'); ?>
 
 	<?php echo $form->errorSummary($model); ?>
 
diff --git a/protected/views/verein/index.php b/protected/views/verein/index.php
index a396dbb..ca98727 100644
--- a/protected/views/verein/index.php
+++ b/protected/views/verein/index.php
@@ -1,40 +1,20 @@
 <?php
 $this->breadcrumbs=array(
-	'Vereine'=>array('index'),
-	'Verwalten',
+	'Vereine',
 );
 
 $this->menu=array(
 	array('label'=>'Verein erstellen', 'url'=>array('create')),
 );
-
-Yii::app()->clientScript->registerScript('search', "
-$('.search-button').click(function(){
-	$('.search-form').toggle();
-	return false;
-});
-$('.search-form form').submit(function(){
-	$.fn.yiiGridView.update('verein-grid', {
-		data: $(this).serialize()
-	});
-	return false;
-});
-");
 ?>
 
-<h1>Vereine verwalten</h1>
+<h1>Vereine</h1>
 
-<p>
-Die optionale Eingabe von Vergleichsoperatoren (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b>
-or <b>=</b>) zu Beginn eines Suchwertes dient der Spezifikation, wie der Vergleich erfolgen soll.
-</p>
+<?php $this->renderPartial('/common/_comparison_text'); ?>
 
-<?php echo CHtml::link('Erweiterte Suche','#',array('class'=>'search-button')); ?>
-<div class="search-form" style="display:none">
-<?php $this->renderPartial('_search',array(
+<?php $this->renderPartial('/common/_advanced_search',array(
 	'model'=>$model,
 )); ?>
-</div><!-- search-form -->
 
 <?php $this->widget('zii.widgets.grid.CGridView', array(
 	'id'=>'verein-grid',
diff --git a/protected/views/verein/update.php b/protected/views/verein/update.php
index 2ce51a8..0d37b80 100644
--- a/protected/views/verein/update.php
+++ b/protected/views/verein/update.php
@@ -1,8 +1,7 @@
 <?php
 $this->breadcrumbs=array(
 	'Vereine'=>array('index'),
-	$model->name=>array('view','id'=>$model->id),
-	'Bearbeiten',
+	'"'.$model->name.'" bearbeiten',
 );
 
 $this->menu=array(