- Initiale Verein-Veranstaltungsverwaltung

- components/Html ergänzt für Anzeige der Einheiten-Dropdown Box
- Logo-Upload für Admins
- AngebotVerein mit Autocomplete und "Einheiten-Tausch"

4 files changed, 264 insertions, 2 deletions

diff --git a/protected/controllers/MyAngebotController.php b/protected/controllers/MyAngebotController.php
index c53da98..a1b6064 100644
--- a/protected/controllers/MyAngebotController.php
+++ b/protected/controllers/MyAngebotController.php
@@ -30,6 +30,30 @@ class MyAngebotController extends Controller
 			),
 		);
 	}
+
+    /**
+     * Creates a new model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     */
+    public function actionCreate()
+    {
+        $model=new AngebotVerein;
+
+        // Uncomment the following line if AJAX validation is needed
+        // $this->performAjaxValidation($model);
+
+        if(isset($_POST['AngebotVerein']))
+        {
+            $model->attributes=$_POST['AngebotVerein'];
+            if($model->save())
+                $this->redirect(array('index'));
+        }
+
+        $this->render('create',array(
+            'model'=>$model,
+        	'angebote'=>Angebot::model()->findAll(),
+        ));
+    }
 	public function actionIndex()
 	{
 		$model=new AngebotVerein('search');
@@ -44,6 +68,47 @@ class MyAngebotController extends Controller
 		));
 	}
 	
+	public function actionUpdate($id) {
+		$model=$this->loadModel($id);
+
+        // Uncomment the following line if AJAX validation is needed
+        // $this->performAjaxValidation($model);
+
+        if(isset($_POST['AngebotVerein']))
+        {
+            $model->attributes=$_POST['AngebotVerein'];
+            if($model->save())
+                $this->redirect(array('index'));
+        }
+		$angebot = Angebot::model()->findAll();
+		$angebote = array();
+		foreach ($angebot as $a) {
+			$an = array();
+			$an["label"] = $a->name;
+			$an["value"] = $a->id;
+			$an["einheiten"] = $a->kategorie->einheiten;
+			array_push($angebote, $an);
+		}
+        $this->render('update',array(
+            'model'=>$model,
+        	'angebote'=>$angebote,
+        	'einheiten'=>$model->angebot->kategorie->einheiten
+        ));
+	}
+
+    /**
+     * Returns the data model based on the primary key given in the GET variable.
+     * If the data model is not found, an HTTP exception will be raised.
+     * @param integer the ID of the model to be loaded
+     */
+    public function loadModel($id)
+    {
+        $model=AngebotVerein::model()->findByPk($id);
+        if($model===null)
+            throw new CHttpException(404,'The requested page does not exist.');
+        return $model;
+    }
+
 	// Uncomment the following methods and override them if needed
 	/*
 	public function filters()
diff --git a/protected/controllers/MyVeranstaltungController.php b/protected/controllers/MyVeranstaltungController.php
new file mode 100644
index 0000000..97efa52
--- /dev/null
+++ b/protected/controllers/MyVeranstaltungController.php
@@ -0,0 +1,172 @@
+<?php
+
+class MyVeranstaltungController extends Controller
+{
+	/**
+	 * @var string the default layout for the views. Defaults to '//layouts/column2', meaning
+	 * using two-column layout. See 'protected/views/layouts/column2.php'.
+	 */
+	public $layout='//layouts/column2';
+
+	/**
+	 * @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 all users to perform 'index' and 'view' actions
+				'actions'=>array('index','view'),
+				'users'=>array('*'),
+			),
+			array('allow', // allow authenticated user to perform 'create' and 'update' actions
+				'actions'=>array('create','update','delete'),
+				'users'=>array('@'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+
+	/**
+	 * Displays a particular model.
+	 * @param integer $id the ID of the model to be displayed
+	 */
+	public function actionView($id)
+	{
+		$this->render('view',array(
+			'model'=>$this->loadModel($id),
+		));
+	}
+
+	/**
+	 * Creates a new model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 */
+	public function actionCreate()
+	{
+		$model=new Veranstaltung;
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+
+		$this->render('create',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Updates a particular model.
+	 * If update is successful, the browser will be redirected to the 'view' page.
+	 * @param integer $id the ID of the model to be updated
+	 */
+	public function actionUpdate($id)
+	{
+		$model=$this->loadModel($id);
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+
+		$this->render('update',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Deletes a particular model.
+	 * If deletion is successful, the browser will be redirected to the 'admin' page.
+	 * @param integer $id the ID of the model to be deleted
+	 */
+	public function actionDelete($id)
+	{
+		if(Yii::app()->request->isPostRequest)
+		{
+			// we only allow deletion via POST request
+			$this->loadModel($id)->delete();
+
+			// if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser
+			if(!isset($_GET['ajax']))
+				$this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin'));
+		}
+		else
+			throw new CHttpException(400,'Invalid request. Please do not repeat this request again.');
+	}
+
+	/**
+	 * Lists all models.
+	 */
+	/*public function actionIndex()
+	{
+		$dataProvider=new CActiveDataProvider('Veranstaltung');
+		$this->render('index',array(
+			'dataProvider'=>$dataProvider,
+		));
+	}*/
+
+	/**
+	 * Manages all models.
+	 */
+	public function actionIndex()
+	{
+		$model=new Veranstaltung('search');
+		$model->unsetAttributes();  // clear any default values
+		if(isset($_GET['Veranstaltung']))
+			$model->attributes=$_GET['Veranstaltung'];
+
+		$this->render('admin',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Returns the data model based on the primary key given in the GET variable.
+	 * If the data model is not found, an HTTP exception will be raised.
+	 * @param integer the ID of the model to be loaded
+	 */
+	public function loadModel($id)
+	{
+		$model=Veranstaltung::model()->findByPk($id);
+		if($model===null)
+			throw new CHttpException(404,'The requested page does not exist.');
+		return $model;
+	}
+
+	/**
+	 * Performs the AJAX validation.
+	 * @param CModel the model to be validated
+	 */
+	protected function performAjaxValidation($model)
+	{
+		if(isset($_POST['ajax']) && $_POST['ajax']==='veranstaltung-form')
+		{
+			echo CActiveForm::validate($model);
+			Yii::app()->end();
+		}
+	}
+}
diff --git a/protected/controllers/MyvereinController.php b/protected/controllers/MyvereinController.php
index fd7428d..056ee2d 100644
--- a/protected/controllers/MyvereinController.php
+++ b/protected/controllers/MyvereinController.php
@@ -68,8 +68,12 @@ class MyvereinController extends Controller
 		{
 			$model->attributes = $_POST['Verein'];
 			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
 			if($model->save()) {
+				Yii::trace("Verein gespeichert", "admin.astaf.verein");
+				Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
 				if (null !== $model->uploadedImage)  {
+					Yii::trace("Bild vorhanden", "admin.astaf.verein");
 					$suffix = substr($model->uploadedImage->getName(), strrpos($model->uploadedImage->getName(), "."));
 					$filename = "images/uploaded/".time()."-".$model->slug.$suffix;
 					$model->bild = $filename;
diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index bf30a04..a0a3828 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -61,9 +61,21 @@ class VereinController extends Controller
 		if(isset($_POST['Verein']))
 		{
 			$model->attributes=$_POST['Verein'];
-			if($model->save())
+			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			if($model->save()) {
+				Yii::trace("Verein gespeichert", "admin.astaf.verein");
+					Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
+				if (null !== $model->uploadedImage)  {
+					Yii::trace("Bild vorhanden", "admin.astaf.verein");
+					$suffix = substr($model->uploadedImage->getName(), strrpos($model->uploadedImage->getName(), "."));
+					$filename = "images/uploaded/".time()."-".$model->slug.$suffix;
+					$model->bild = $filename;
+					$model->uploadedImage->saveAs($filename);
+					$model->save();
+				}
 				$this->redirect(array('view','id'=>$model->id));
 			}
+		}
 		
 		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$slugs = User::model()->findAll();
@@ -89,9 +101,18 @@ class VereinController extends Controller
 		if(isset($_POST['Verein']))
 		{
 			$model->attributes=$_POST['Verein'];
-			if($model->save())
+			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			if($model->save()) {
+				if (null !== $model->uploadedImage)  {
+					$suffix = substr($model->uploadedImage->getName(), strrpos($model->uploadedImage->getName(), "."));
+					$filename = "images/uploaded/".time()."-".$model->slug.$suffix;
+					$model->bild = $filename;
+					$model->uploadedImage->saveAs($filename);
+					$model->save();
+				}
 				$this->redirect(array('view','id'=>$model->id));
 			}
+		}
 
 		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$slugs = User::model()->findAll();