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

6 files changed, 90 insertions, 5 deletions

diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index a3e6f25..5d70735 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -1,4 +1,3 @@
-<?php echo $this->headTitle() ?>
 <h1>Filters</h1>
 
 <style>
@@ -83,7 +82,7 @@ tr.filter{background-color:#DDD;}
 						array(
 							'controller' => 'filter',
 							'action'     => 'editfilterentry',
-							'filterentriesID'	=> $filterentry['filtertypeID']
+							'filterentriesID'	=> $filterentry['filterentriesID']
 						),
 						'default',
 						true) ?>">edit filterentry</a>
@@ -91,7 +90,7 @@ tr.filter{background-color:#DDD;}
 						array(
 							'controller' => 'filter',
 							'action'     => 'removefilterentry',
-							'filterentriesID'	=> $filterentry['filtertypeID']
+							'filterentriesID'	=> $filterentry['filterentriesID']
 						),
 						'default',
 						true) ?>">remove filterentry</a>		
@@ -103,7 +102,8 @@ tr.filter{background-color:#DDD;}
         </tr>
     <?php endforeach ?> 
     </table>
- 
+
+	
 <?php else: ?>
  
     <p>There are no filters to display.</p>
diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml
index 25f1528..c3a6be9 100644
--- a/application/views/scripts/pool/index.phtml
+++ b/application/views/scripts/pool/index.phtml
@@ -79,7 +79,33 @@
 		</table>
     <?php endforeach ?> 
     </table>
- 
+<h2>Free clients</h2>
+<table border=1 >
+<tr><th>ClientID</th><th>MacAdress</th><th>Hardwarehash</th>
+<?php foreach ($this->pools as $pool): ?>
+			<th><?php echo $this->escape($pool->getTitle()) ?></th>
+		<?php endforeach ?> 
+</tr>
+<?php
+foreach ($this->freeclients as $client): ?>
+	<tr>
+		<td><?php echo $client['clientID']; ?></td>
+		<td><?php echo $client['macadress']; ?></td>
+		<td><?php echo $client['hardwarehash']; ?></td>
+		<?php foreach ($this->pools as $pool): ?>
+			<td><a href='<?php echo $this->url(
+					array(
+						'controller' => 'pool',
+						'action'     => 'linkclient',
+						'clientID'	=> $client['clientID'],
+						'poolID'	=> $pool->getID(),
+					),
+					'default',
+					true) ?>'>link</a></td>
+		<?php endforeach ?> 
+	</tr>
+<?php endforeach ?> 
+</table>
 <?php else: ?>
 
  
diff --git a/application/views/scripts/session/createsession.phtml b/application/views/scripts/session/createsession.phtml
new file mode 100644
index 0000000..11fe7ce
--- /dev/null
+++ b/application/views/scripts/session/createsession.phtml
@@ -0,0 +1,5 @@
+<h1>create session</h1>
+
+<?php
+echo $this->createsession;
+?>
diff --git a/application/views/scripts/session/deletesession.phtml b/application/views/scripts/session/deletesession.phtml
new file mode 100644
index 0000000..57f8698
--- /dev/null
+++ b/application/views/scripts/session/deletesession.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Session</b> and script/action name <b>deletesession</b></center>
\ No newline at end of file
diff --git a/application/views/scripts/session/editsession.phtml b/application/views/scripts/session/editsession.phtml
new file mode 100644
index 0000000..88fb273
--- /dev/null
+++ b/application/views/scripts/session/editsession.phtml
@@ -0,0 +1,5 @@
+<h1>edit session</h1>
+
+<?php
+echo $this->editsession;
+?>
diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml
new file mode 100644
index 0000000..d26e818
--- /dev/null
+++ b/application/views/scripts/session/index.phtml
@@ -0,0 +1,48 @@
+<h1>Session</h1>
+
+<p><a href="<?php echo $this->url(
+    array(
+        'controller' => 'session',
+        'action'     => 'createsession'
+    ),
+    'default',
+    true) ?>">create new session</a></p>
+
+<table border=1>
+<tr>
+	<th>SessionID</th>
+	<th>ClientID</th>
+	<th>BootosID</th>
+	<th>BootIsoID</th>
+	<th>Time</th>
+	<th>IP</th>
+	<th>IPv6</th>
+</tr>
+<?php foreach ($this->sessions as $session): ?>
+	<tr>
+		<td><?php echo $this->escape($session->getID()) ?></td>
+		<td><?php echo $this->escape($session->getClientID()) ?></td>
+		<td><?php echo $this->escape($session->getBootosID()) ?></td>
+		<td><?php echo $this->escape($session->getBootisoID()) ?></td>		
+		<td><?php echo $this->escape($session->getTime()) ?></td>
+		<td><?php echo $this->escape($session->getIp()) ?></td>
+		<td><?php echo $this->escape($session->getIp6()) ?></td>
+		<td><a href="<?php echo $this->url(
+					array(
+						'controller' => 'session',
+						'action'     => 'editsession',
+						'sessionID'	=> $session->getID()
+					),
+					'default',
+					true) ?>">edit filter</a></td>
+			<td><a href="<?php echo $this->url(
+					array(
+						'controller' => 'session',
+						'action'     => 'deletesession',
+						'sessionID'	=> $session->getID()
+					),
+					'default',
+					true) ?>">delete filter</a></td>
+	</tr>
+<?php endforeach ?> 
+</table>