.zfproject fix

Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

Conflicts:
	.zfproject.xml

3 files changed, 71 insertions, 7 deletions

diff --git a/application/views/scripts/filter/addfilterentry.phtml b/application/views/scripts/filter/addfilterentry.phtml
new file mode 100644
index 0000000..8bf501a
--- /dev/null
+++ b/application/views/scripts/filter/addfilterentry.phtml
@@ -0,0 +1,3 @@
+<?php
+$this->editfilterform->setAction($this->url());
+echo $this->editfilterform;
diff --git a/application/views/scripts/filter/editfilter.phtml b/application/views/scripts/filter/editfilter.phtml
index 452a096..9b54ac7 100644
--- a/application/views/scripts/filter/editfilter.phtml
+++ b/application/views/scripts/filter/editfilter.phtml
@@ -1 +1,15 @@
-<br /><br /><center>View script for controller <b>Filter</b> and script/action name <b>editfilter</b></center>
\ No newline at end of file
+<h1>Edit Filter</h1>
+<?php
+echo "<h2>".$this->filterID."</h2>";
+echo 'test';
+?>
+<?php
+echo 
+
+$this->editfilterform->setAction($this->url());
+
+
+$this->editfilterform;
+
+
+?>
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 33043dc..b3c3013 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -1,4 +1,9 @@
 <h1>Filters</h1>
+<style>
+table{font-family:verdana;font-size:12px;}
+td{border:1px solid #CCC;}
+tr.filter{background-color:#DDD;}
+</style>
 <p><a href="<?php echo $this->url(
     array(
         'controller' => 'filter',
@@ -12,13 +17,15 @@
     <!-- A table of filters. -->
     <table border=1>
         <tr>
-            <th>filterid</th>
-			<th>filterID</th>
+            <th>filterID</th>
+			<th>Title</th>
+			<th>Priority</th>
         </tr>
 	<?php foreach ($this->filters as $filter): ?>
-    <tr>
+    <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><a href="<?php echo $this->url(
 					array(
 						'controller' => 'filter',
@@ -27,11 +34,51 @@
 					),
 					'default',
 					true) ?>">edit filter</a></td>
+			<td><a href="<?php echo $this->url(
+					array(
+						'controller' => 'filter',
+						'action'     => 'removefilter',
+						'filterID'	=> $filter->getID()
+					),
+					'default',
+					true) ?>">delete filter</a></td>
+			<td><a href="<?php echo $this->url(
+					array(
+						'controller' => 'filter',
+						'action'     => 'addfilterentry',
+						'filterID'	=> $filter->getID()
+					),
+					'default',
+					true) ?>">add filterentry</a></td>
+			</tr>
+			<tr><td></td>
+			<td colspan=5>
+				<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>
+					<?php endif; ?>
+				 <?php endforeach ?> 		
+				</table>
+			</td>			
         </tr>
     <?php endforeach ?> 
-
-
- 
     </table>
  
 <?php else: ?>