From 3a57892f9145bfadac4cf3bf4392020f99e0d541 Mon Sep 17 00:00:00 2001
From: Simon
Date: Sat, 5 Mar 2011 17:41:24 +0100
Subject: filter-oberffäche fertig, nun zur auswahl des bootmenus && funktion
 toArray bei jedem Mapper hinzugefügt, um populate bei Formularen nutzen zu
 können

---
 application/views/scripts/filter/editfilter.phtml  |  1 +
 .../views/scripts/filter/editfilterentry.phtml     |  3 ++
 application/views/scripts/filter/index.phtml       | 48 +++++++++++++++-------
 .../views/scripts/filter/removefilterentry.phtml   |  0
 4 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 application/views/scripts/filter/editfilterentry.phtml
 create mode 100644 application/views/scripts/filter/removefilterentry.phtml

(limited to 'application/views/scripts')

diff --git a/application/views/scripts/filter/editfilter.phtml b/application/views/scripts/filter/editfilter.phtml
index 9b54ac7..e3d1c36 100644
--- a/application/views/scripts/filter/editfilter.phtml
+++ b/application/views/scripts/filter/editfilter.phtml
@@ -3,6 +3,7 @@
 echo "<h2>".$this->filterID."</h2>";
 echo 'test';
 ?>
+-----------
 <?php
 echo 
 
diff --git a/application/views/scripts/filter/editfilterentry.phtml b/application/views/scripts/filter/editfilterentry.phtml
new file mode 100644
index 0000000..8bf501a
--- /dev/null
+++ b/application/views/scripts/filter/editfilterentry.phtml
@@ -0,0 +1,3 @@
+<?php
+$this->editfilterform->setAction($this->url());
+echo $this->editfilterform;
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index b3c3013..66f3e7f 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -20,12 +20,14 @@ tr.filter{background-color:#DDD;}
             <th>filterID</th>
 			<th>Title</th>
 			<th>Priority</th>
+			<th>TargetBootMenu</th>
         </tr>
 	<?php foreach ($this->filters as $filter): ?>
     <tr class='filter'>
 			<td><?php echo $this->escape($filter->getID()) ?></td>
             <td><?php echo $this->escape($filter->title) ?></td>
 			<td><?php echo $this->escape($filter->priority) ?></td>
+			<td><?php echo $this->escape($filter->bootmenuID) ?></td>
 			<td><a href="<?php echo $this->url(
 					array(
 						'controller' => 'filter',
@@ -52,27 +54,43 @@ tr.filter{background-color:#DDD;}
 					true) ?>">add filterentry</a></td>
 			</tr>
 			<tr><td></td>
-			<td colspan=5>
+			<td colspan=6>
 				<table style='width:100%;'>
 				<?php foreach ($this->filterentries as $filterentry): ?>
 					<?php
 						// TODO: Quick and dirty
 						// hier wird die gesamte liste durchgegangen... unperformant
 					if($filterentry->filterID == $filter->getID()): ?>
-					<tr>
-					<td><?php echo $filterentry->getFiltertypeID();?></td>
-					<td><?php echo $filterentry->getFiltervalue();?></td>
-					<td><?php echo $filterentry->getFiltervalue();?></td>
-					<td><a href="<?php echo $this->url(
-					array(
-						'controller' => 'filter',
-						'action'     => 'removefilterentry',
-						'filterID'	=> $filter->getID(),
-						'filtertypeID' => $filterentry->getFiltertypeID()
-					),
-					'default',
-					true) ?>">remove filterentry</a>			
-					</tr>
+						<tr>
+						<td><?php 
+							$filter2 = new Application_Model_FilterTypeMapper();
+							$erg = new Application_Model_FilterType();
+        					$filter2->find($filterentry->getFiltertypeID(),$erg);
+							//name zur ID finden
+							echo $erg->getFiltertypename();
+
+						?></td>
+						<td><?php echo $filterentry->getFiltervalue();?></td>
+						<td><?php echo $filterentry->getFiltervalue2();?></td>
+						<td><a href="<?php echo $this->url(
+						array(
+							'controller' => 'filter',
+							'action'     => 'editfilterentry',
+							'filterID'	=> $filter->getID(),
+							'filtertypeID' => $filterentry->getFiltertypeID()
+						),
+						'default',
+						true) ?>">edit filterentry</a>
+						<td><a href="<?php echo $this->url(
+						array(
+							'controller' => 'filter',
+							'action'     => 'removefilterentry',
+							'filterID'	=> $filter->getID(),
+							'filtertypeID' => $filterentry->getFiltertypeID()
+						),
+						'default',
+						true) ?>">remove filterentry</a>		
+						</tr>
 					<?php endif; ?>
 				 <?php endforeach ?> 		
 				</table>
diff --git a/application/views/scripts/filter/removefilterentry.phtml b/application/views/scripts/filter/removefilterentry.phtml
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3-55-g7522