diverse anzeigen und experimente

13 files changed, 328 insertions, 154 deletions

diff --git a/protected/views/speisTrank/_angebot_vereine.php b/protected/views/speisTrank/_angebot_vereine.php
new file mode 100644
index 0000000..2d65d35
--- /dev/null
+++ b/protected/views/speisTrank/_angebot_vereine.php
@@ -0,0 +1,12 @@
+<?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/_search.php b/protected/views/speisTrank/_search.php
new file mode 100644
index 0000000..a88293a
--- /dev/null
+++ b/protected/views/speisTrank/_search.php
@@ -0,0 +1,39 @@
+<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,'id'); ?>
+		<?php echo $form->textField($model,'id'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'kategorie_id'); ?>
+		<?php echo $form->dropDownList($model, 'kategorie_id', CHtml::listData(Kategorie::model()->findAll(), 'id', 'name'), array("empty"=>"")); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'name'); ?>
+		<?php echo $form->textField($model,'name',array('size'=>60,'maxlength'=>80)); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'beschreibung'); ?>
+		<?php echo $form->textArea($model,'beschreibung',array('rows'=>6, 'cols'=>50)); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
+	</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/speisTrank/index.php b/protected/views/speisTrank/index.php
new file mode 100644
index 0000000..1f416cc
--- /dev/null
+++ b/protected/views/speisTrank/index.php
@@ -0,0 +1,40 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank',
+);
+
+$this->menu=array(
+	array('label'=>'Kulinarisches Angebot erstellen', 'url'=>array('create')),
+);
+?>
+<h1>Speis &amp; Trank</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'=>'Kategorie',
+				'name'=>'kategorie_id',
+				'filter'=>CHtml::listData(Kategorie::model()->findAll(), 'id', 'name'),
+				'value'=>'($data->kategorie) ? $data->kategorie->name : "-"'),
+		'name',
+		'beschreibung:html',
+		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',
+			"buttons"=>array(
+				"delete"=>array("label"=>"Löschen"),
+				"update"=>array("label"=>"Bearbeiten"),
+				"view"=>array("label"=>"Anzeigen")
+				)
+		),
+	),
+)); ?>
diff --git a/protected/views/speisTrank/view.php b/protected/views/speisTrank/view.php
new file mode 100644
index 0000000..2dc3841
--- /dev/null
+++ b/protected/views/speisTrank/view.php
@@ -0,0 +1,21 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank'=>array('index'),
+	$model->name,
+);
+
+$this->menu=array(
+	array('label'=>'Speis & Trank', 'url'=>array('index')),
+	array('label'=>'Kulinarisches Angebot erstellen', 'url'=>array('create')),
+	array('label'=>$model->name.' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
+	array('label'=>$model->name.' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')),
+);
+?>
+
+<h3><?php echo $model->name." (".$model->kategorie->name.")"; ?></h3>
+
+<p><?php echo $model->beschreibung; ?></p>
+<h5>Angeboten durch:</h5>
+<?php $this->renderPartial('_angebot_vereine',array(
+			'angebot_vereine'=>$model->angebot_vereine,
+		)); ?>
\ No newline at end of file
diff --git a/protected/views/standort/_search.php b/protected/views/standort/_search.php
new file mode 100644
index 0000000..eeab539
--- /dev/null
+++ b/protected/views/standort/_search.php
@@ -0,0 +1,39 @@
+<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,'id'); ?>
+		<?php echo $form->textField($model,'id'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'name'); ?>
+		<?php echo $form->textField($model,'name',array('size'=>60,'maxlength'=>80)); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'pos_lat'); ?>
+		<?php echo $form->textField($model,'pos_lat'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'pos_long'); ?>
+		<?php echo $form->textField($model,'pos_long'); ?>
+	</div>
+
+	<div class="row">
+		<?php echo $form->label($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
+	</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/standort/index.php b/protected/views/standort/index.php
new file mode 100644
index 0000000..9a88a74
--- /dev/null
+++ b/protected/views/standort/index.php
@@ -0,0 +1,77 @@
+<?php
+$this->breadcrumbs=array(
+	'Standorte'
+);
+
+$this->menu=array(
+	array('label'=>'Standort erstellen', 'url'=>array('create')),
+);
+?>
+
+<h1>Standorte</h1>
+
+<?php $this->renderPartial('/common/_comparison_text'); ?>
+
+<?php $this->renderPartial('/common/_advanced_search',array(
+	'model'=>$model,
+)); ?>
+
+<?php
+$map = new Map();
+foreach ($standorte as $standort) {
+	$infoWindow = new EGMapInfoWindow("<div class='gmaps-label' style='color: #000; font-weight:bold'>".$standort->name."<br/>".CHtml::link("Bearbeiten", array("standort/update", "id"=>$standort->id), array("update"=>"#edit"))."</div>");
+	$dragendfunction = "function (event) {
+	var save = confirm('Neue Koordinaten wirklich speichern?');
+	if (save) {
+		$.ajax({
+			'type':'POST',
+    		'url':'".$this->createUrl('standort/savecoords', array('id'=>$standort->id))."',
+    		'data':({'lat': event.latLng.lat(), 'lng': event.latLng.lng()}),
+    		'cache':false,
+    		'statusCode': {
+    			404: function() {
+      					alert('Der Standort existiert nicht.');
+    			},
+    			500: function()  {
+    					alert('Fehler beim Speichern.');
+    			},
+    			400: function() {
+    					alert('Fehlende Parameter');
+    			},
+    			200: function() {
+    					alert('Neue Koordinaten erfolgreich gespeichert');
+    			}
+  			}
+		});
+	}
+	console.info(event)
+	}
+	";
+	// Saving coordinates after user dragged our marker.
+	$dragevent = new EGMapEvent('dragend', $dragendfunction, false, EGMapEvent::TYPE_EVENT_DEFAULT);
+	$marker = new EGMapMarker($standort->pos_lat, $standort->pos_long, array('title' => $model->name, 'draggable'=>true), 'marker', array('dragevent'=>$dragevent));
+	$marker->addHtmlInfoWindow($infoWindow);
+	$map->addMarker($marker, $standort->published);
+}
+$map->render();
+?>
+
+<?php $this->widget('zii.widgets.grid.CGridView', array(
+	'id'=>'standort-grid',
+	'dataProvider'=>$model->search(),
+	'filter'=>$model,
+	'columns'=>array(
+		'type',
+		'name',
+		'pos_lat',
+		'pos_long',
+		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',
+			'template'=>'{update} {delete}'
+		),
+	),
+)); ?>
+
+
diff --git a/protected/views/standort/view.php b/protected/views/standort/view.php
new file mode 100644
index 0000000..26312a3
--- /dev/null
+++ b/protected/views/standort/view.php
@@ -0,0 +1,67 @@
+<?php
+$this->breadcrumbs=array(
+	'Speis & Trank'=>array('index'),
+	$model->name,
+);
+
+$this->menu=array(
+	array('label'=>'Standorte', 'url'=>array('index')),
+	array('label'=>'Standort erstellen', 'url'=>array('create')),
+	array('label'=>$model->name.' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
+	array('label'=>$model->name.' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')),
+);
+?>
+
+<h3>Standort "<?php echo $model->name ?>"</h3>
+<p>
+<?php Yii::import('ext.egmap.*');
+ 
+$gMap = new EGMap();
+$gMap->zoom = 20;
+$mapTypeControlOptions = array(
+  'position'=> EGMapControlPosition::LEFT_BOTTOM,
+  'style'=>EGMap::MAPTYPECONTROL_STYLE_DROPDOWN_MENU
+);
+ 
+$gMap->width = '100%';
+$gMap->setOptions(array("mapTypeId"=>EGMap::TYPE_HYBRID));
+$gMap->mapTypeControlOptions= $mapTypeControlOptions;
+ 
+$gMap->setCenter($model->pos_lat, $model->pos_long);
+$info_window_a = new EGMapInfoWindow('<div>'.$model->name.'</div>');
+$icon = new EGMapMarkerImage("http://google-maps-icons.googlecode.com/files/gazstation.png");
+
+$icon->setSize(32, 37);
+$icon->setAnchor(16, 16.5);
+$icon->setOrigin(0, 0);
+$marker = new EGMapMarkerWithLabel($model->pos_lat, $model->pos_long, array('title' => $model->name,'icon'=> $icon));
+$marker->draggable=false;
+$marker->raiseOnDrag= true;
+$marker->addHtmlInfoWindow($info_window_a);
+
+$gMap->addMarker($marker);
+
+// enabling marker clusterer just for fun
+// to view it zoom-out the map
+$gMap->enableMarkerClusterer(new EGMapMarkerClusterer());
+
+$gMap->renderMap();
+?>
+</p>
+<p>
+<?php
+$dataProvider=new CActiveDataProvider('Verein', array(
+		'criteria'=>array(
+				'condition'=>'standort_id='.$model->id,
+		),
+		'pagination'=>array(
+				'pageSize'=>20,
+		),
+));
+$this->widget('zii.widgets.CListView', array(
+		'dataProvider'=>$dataProvider,
+		'itemView'=>'/verein/_short',
+		
+  ));?>
+
+</p>
\ No newline at end of file
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php
deleted file mode 100644
index dbda2db..0000000
--- a/protected/views/verein/_form.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<div class="form">
-
-<?php $form=$this->beginWidget('CActiveForm', array(
-	'id'=>'verein-form',
-	'enableAjaxValidation'=>false,
-	"htmlOptions"=>array('enctype'=>'multipart/form-data'),
-)); ?>
-
-	<?php $this->renderPartial('/common/_required_fields_text'); ?>
-
-	<?php echo $form->errorSummary($model); ?>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'slug'); ?>
-		<?php
-		if (Yii::app()->user->isAdmin) {
-			echo $form->dropDownList($model, "slug", CHtml::listData($slugs, "username", "username"), array('empty' => '-- Bitte Benutzer wählen --'));
-		} else {
-			echo CHtml::encode($model->slug);
-		}
-		?>
-		<?php echo $form->error($model,'slug'); ?>
-	</div>
-	
-	<div class="row">
-		<?php echo $form->labelEx($model,'name'); ?>
-		<?php echo $form->textField($model,'name',array('size'=>60,'maxlength'=>255)); ?>
-		<?php echo $form->error($model,'name'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'url'); ?>
-		<?php echo $form->textField($model,'url',array('size'=>60,'maxlength'=>255)); ?>
-		<?php echo $form->error($model,'url'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'bild'); ?>
-		<?php echo CHtml::image($model->bild); ?><br/>
-		<?php echo $form->fileField($model,'uploadedImage', array('size'=>60)); ?>
-		<?php echo $form->error($model,'bild'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'email'); ?>
-		<?php echo $form->textField($model,'email',array('size'=>60,'maxlength'=>100)); ?>
-		<?php echo $form->error($model,'email'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'kontaktdaten'); ?>
-		<?php $this->widget('application.extensions.tinymce.ETinyMce',
-                array(
-                    'name'=>'kontaktdaten',
-                	"value"=>$model->kontaktdaten,
-                    'useSwitch' => false,
-                    'editorTemplate'=>'simple',
-                	"language"=>"de",
-                	"height"=>"150px",
-                    )
-                );
-		?> 
-		<?php /*echo $form->textArea($model,'kontaktdaten',array('rows'=>6, 'cols'=>50)); */?>
-		<?php echo $form->error($model,'kontaktdaten'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'beschreibung'); ?>
-		<?php $this->widget('application.extensions.tinymce.ETinyMce',
-                array(
-                    'name'=>'beschreibung',
-                	"value"=>$model->beschreibung,
-                    'useSwitch' => false,
-                    'editorTemplate'=>'simple',
-                	"language"=>"de",
-                	"height"=>"200px",
-                    )
-                );
-		?>
-		<?php /*echo $form->textArea($model,'beschreibung',array('rows'=>6, 'cols'=>50)); */?>
-		<?php echo $form->error($model,'beschreibung'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'standort'); ?>
-		<?php
-		if (Yii::app()->user->isAdmin) {
-			echo $form->dropDownList($model, "standort_id", CHtml::listData($standorte, "id", "name"), array('empty' => '-- Bitte Standort wählen --'));
-		} else {
-			echo CHtml::encode($model->standort->name);
-		}
-		?>
-		<?php echo $form->error($model,'standort_id'); ?>
-	</div>
-
-	<div class="row">
-		<?php echo $form->labelEx($model,'published'); ?>
-		<?php
-		if (Yii::app()->user->isAdmin) {
-			echo $form->checkbox($model,'published');
-		} else {
-			echo CHtml::image($model->published ? "images/ok.png" : "images/nok.png", $model->published ? "ok.png" : "nok.png");
-		}
-		?>
-		<?php echo $form->error($model,'published'); ?>
-	</div>
-
-	<div class="row buttons">
-		<?php echo CHtml::submitButton('Speichern'); ?>
-	</div>
-
-<?php $this->endWidget(); ?>
-
-</div><!-- form -->
\ No newline at end of file
diff --git a/protected/views/verein/_shortangebot.php b/protected/views/verein/_shortangebot.php
index e90da5b..a23b4fa 100644
--- a/protected/views/verein/_shortangebot.php
+++ b/protected/views/verein/_shortangebot.php
@@ -4,7 +4,5 @@ if(strlen(strip_tags($data->beschreibung))>80) {
 	$myBeschreibung = $tmp[0]."...";
 } else {
 	$myBeschreibung = strip_tags($data->beschreibung);
-}?>
-
-
-<?php echo CHTML::link("<h6>".$data->name."</h6><p>".$myBeschreibung."</p>" ,array("angebot/view","id"=>$data->id)); ?>
\ No newline at end of file
+}
+echo CHTML::link("<strong>".$data->name."</strong> ".$myBeschreibung ,array("speisTrank/view","id"=>$data->id)); ?><br />
\ No newline at end of file
diff --git a/protected/views/verein/_shortangebotverein.php b/protected/views/verein/_shortangebotverein.php
new file mode 100644
index 0000000..e49580e
--- /dev/null
+++ b/protected/views/verein/_shortangebotverein.php
@@ -0,0 +1,8 @@
+<?php 
+if(strlen(strip_tags($data->angebot->beschreibung))>80) {
+	$tmp = str_split(strip_tags($data->angebot->beschreibung),77);
+	$myBeschreibung = $tmp[0]."...";
+} else {
+	$myBeschreibung = strip_tags($data->angebot->beschreibung);
+}
+echo CHTML::link("<strong>".$data->angebot->name."</strong> (".$data->menge." ".$data->einheit.") für ".$data->preis."€ ".$myBeschreibung ,array("speisTrank/view","id"=>$data->angebot_id)); ?><br />
\ No newline at end of file
diff --git a/protected/views/verein/create.php b/protected/views/verein/create.php
deleted file mode 100644
index 46f088e..0000000
--- a/protected/views/verein/create.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$this->breadcrumbs=array(
-	'Vereine'=>array('index'),
-	'Verein erstellen',
-);
-
-$this->menu=array(
-	array('label'=>'Vereine verwalten', 'url'=>array('index'))
-);
-?>
-
-<h1>Verein erstellen</h1>
-
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
\ No newline at end of file
diff --git a/protected/views/verein/update.php b/protected/views/verein/update.php
deleted file mode 100644
index 5230605..0000000
--- a/protected/views/verein/update.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$this->breadcrumbs=array(
-	'Vereine'=>array('index'),
-	'"'.$model->name.'" bearbeiten',
-);
-
-$this->menu=array(
-	array('label'=>'Vereine verwalten', 'url'=>array('admin')),
-	array('label'=>'Verein erstellen', 'url'=>array('create')),
-	array('label'=>'Verein anzeigen', 'url'=>array('view', 'id'=>$model->id))
-);
-?>
-
-<h1>Verein '<?php echo $model->name; ?>' bearbeiten</h1>
-
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
\ No newline at end of file
diff --git a/protected/views/verein/view.php b/protected/views/verein/view.php
index 7c5bb32..95e1cf2 100644
--- a/protected/views/verein/view.php
+++ b/protected/views/verein/view.php
@@ -13,18 +13,35 @@ $this->menu=array(
 ?>
 
 <h3><?php echo $model->name; ?></h3>
+<p>Der Verein <?php echo $model->name ?> befindet sich <?php echo CHtml::Link($model->standort->name,array('standort/view','id'=>$model->standort->id))?>.</p>
 <?php if ($model->bild) {
 	echo CHtml::image($model->bild,'Vereinslogo '.$model->name, array("class" => "float-left bordered"));
 }?>
+<div class="box info float-right"><?php echo $model->kontaktdaten ?></div>
 <p><?php echo $model->beschreibung?></p>
-<div class="float-left box">
-<?php $this->widget('zii.widgets.CListView', array(
+
+<div class="float-left" >
+<?php /*$this->widget('zii.widgets.CListView', array(
       'dataProvider'=>new CArrayDataProvider($model->angebote, array()),
       'itemView'=>'_shortangebot',   // refers to the partial view named '_post'
-      'sortableAttributes'=>array(
-          'name',
-          /*'create_time'=>'Post Time',*/
+  ));*/?>
+
+<?php 
+$dataProvider=new CActiveDataProvider('AngebotVerein', array(
+		'criteria'=>array(
+				'condition'=>'verein_id='.$model->id,
+				'with'=>array('angebot'),
 		),
+		'pagination'=>array(
+				'pageSize'=>20,
+		),
+));
+$this->widget('zii.widgets.CListView', array(
+      'dataProvider'=>$dataProvider,
+      'itemView'=>'_shortangebotverein',
+	  'sortableAttributes'=>array(
+        'preis','menge', 
+    ),   // refers to the partial view named '_post'
   ));?>
   
 <ul><?php
@@ -35,5 +52,5 @@ foreach ($model->veranstaltungen as $value) {
 ?>
 </ul>
 </div>
-<div class="box info float-right"><h6>Kontaktdaten</h6><?php echo $model->kontaktdaten?></div>
+