From 808730e1e3a617f405f587440bbed011db633243 Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Wed, 28 Nov 2012 13:34:39 +1100
Subject: [PATCH] More view updates

---
 application/classes/Model/STGPOOL.php        |  1 +
 application/config/config.php                |  2 +-
 application/views/domain/detail.php          |  4 +--
 application/views/node/detail_filesystem.php | 37 ++++++++++++++++++++
 application/views/node/detail_volumes.php    |  4 +--
 application/views/stgpool/detail.php         | 32 +++++++++++++++++
 6 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/application/classes/Model/STGPOOL.php b/application/classes/Model/STGPOOL.php
index 0a8cc07..994ade6 100644
--- a/application/classes/Model/STGPOOL.php
+++ b/application/classes/Model/STGPOOL.php
@@ -24,6 +24,7 @@ class Model_STGPOOL extends TSM_ORM {
 		'COPYGROUP_BU'=>array('foreign_key'=>'DESTINATION','far_key'=>'STGPOOL_NAME'),
 		'MGMTCLASS'=>array('foreign_key'=>'MIGDESTINATION','far_key'=>'STGPOOL_NAME'),
 		'VOLUME'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'),
+		'OCC'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'),
 	);
 
         // Return a list of volumes
diff --git a/application/config/config.php b/application/config/config.php
index 0be6738..7b2d597 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -16,7 +16,7 @@ return array(
 	'client_type'     => 'dsmadmc',
 	'client_errorlogname' => '/tmp/pta-tsm-errorlog.log',
 	'date_format'     => 'd-m-Y',
-	'tsmdatatypes'    => array('Bkup'=>'BACKUP','Arch'=>'ARCHIVE'),
+	'tsmdatatypes'    => array('Bkup'=>'BACKUP','Arch'=>'ARCHIVE','SpMg'=>'SPACE MANAGED'),
 	'tsmdbtypes'      => array('BACKUPFULL','BACKUPINCR','DBSNAPSHOT'),
 	'tsmpooltypes'    => array('PRIMARY','ACTIVEDATA','COPY'),
 	'tsmvolstatus'    => array('FULL','FILLING','PENDING','EMPTY'),
diff --git a/application/views/domain/detail.php b/application/views/domain/detail.php
index 33edfff..a509017 100644
--- a/application/views/domain/detail.php
+++ b/application/views/domain/detail.php
@@ -82,7 +82,7 @@
 				<?php $i=0; foreach ($do->getStoragePoolsType($btype,$type) as $spo) { ?>
 				<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
 					<td colspan="2">&nbsp;</td>
-					<td class="data"><?php echo $spo->STGPOOL_NAME; ?></td>
+					<td class="data"><?php echo HTML::anchor('stgpool/detail/'.$spo->STGPOOL_NAME,$spo->display('STGPOOL_NAME')); ?></td>
 					<td class="data-right"><?php echo $spo->display('NUMSCRATCHUSED'); ?></td>
 					<td class="data-right"><?php echo $spo->display('MAXSCRATCH'); ?></td>
 					<td class="data-right"><?php echo $spo->display('ACCESS'); ?></td>
@@ -90,7 +90,7 @@
 					<td class="data-right"><?php echo $spo->display('PCT_UTILIZED'); ?></td>
 					<td class="data-right"><?php echo $spo->display('PCT_MIGR'); ?></td>
 					<td class="data-right"><?php printf('%s/%s',$spo->HIGHMIG,$spo->LOWMIG); ?></td>
-					<td class="data-right"><?php echo $spo->display('NEXTSTGPOOL'); ?></td>
+					<td class="data-right"><?php echo $spo->NEXTSTGPOOL ? HTML::anchor('stgpool/detail/'.$spo->NEXTSTGPOOL,$spo->display('NEXTSTGPOOL')) : '&nbsp;'; ?></td>
 					<td class="data-right"><?php echo count($do->getStorageModeNodes($btype,$type,$spo)); ?></td>
 					<td class="data-right"><?php echo count($do->getStorageModeVols($ctype,$type,$spo)); ?></td>
 					<td class="data-right"><?php echo $do->getStorageModeFiles($btype,$type,$spo); ?></td>
diff --git a/application/views/node/detail_filesystem.php b/application/views/node/detail_filesystem.php
index 4acb4a9..04eec55 100644
--- a/application/views/node/detail_filesystem.php
+++ b/application/views/node/detail_filesystem.php
@@ -107,4 +107,41 @@
 			&nbsp;
 		</td>
 	</tr>
+	<tr>
+		<td style="width: 50%; vertical-align: top;">
+			<table class="box-full">
+				<tr>
+					<td class="head" colspan="2">HSM Information</td>
+				</tr>
+				<?php if ($node->getStoragePools('SpMg')) { ?>
+				<tr>
+					<td class="spacer">&nbsp;</td>
+				</tr>
+				<tr>
+					<td>File Space</td>
+					<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
+						 if (count($pools = $node->getStoragePoolsType('SpMg',$type)))
+							foreach ($pools as $pool_name) { ?>
+					<td class="right"><?php echo $pool_name; ?> <span style="vertical-align: super; font-size: 60%;"><?echo $type; ?></span></td>
+					<?php } ?>
+				</tr>
+				<?php $i=0;foreach ($node->FILESPACE->find_all() as $fso) { ?>
+				<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
+					<td class="data"><?php echo $fso->display('FILESPACE_NAME'); ?></td>
+					<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
+						 if (count($pools = $node->getStoragePoolsType('SpMg',$type)))
+							foreach ($pools as $pool_name) { ?>
+					<td class="data-right"><?php echo number_format($fso->pool_logical_util($pool_name,'SpMg'),2); ?> (<?php echo $fso->pool_numvols($pool_name,'SPACE MANAGED'); ?>)</td>
+					<?php } ?>
+				</tr>
+				<?php } ?>
+				<?php } else { ?>
+					<tr><td>There is NO HSM Data for this Node.</td></tr>
+				<?php } ?>
+			</table>
+		</td>
+		<td style="width: 50%; vertical-align: top;">
+			&nbsp;
+		</td>
+	</tr>
 </table>
diff --git a/application/views/node/detail_volumes.php b/application/views/node/detail_volumes.php
index 73f5c93..49b73f2 100644
--- a/application/views/node/detail_volumes.php
+++ b/application/views/node/detail_volumes.php
@@ -4,7 +4,7 @@
 		<td style="width: 100%; vertical-align: top;">
 			<table class="box-full">
 				<tr>
-					<td class="head" colspan="2"><?php echo $ctype=='BACKUP' ? _('Backup Volumes') : _('Archive Volumes'); ?></td>
+					<td class="head" colspan="2"><?php echo $ctype.' '._('Volumes'); ?></td>
 				</tr>
 				<?php if ($node->volumes($ctype)) { ?>
 				<tr>
@@ -41,7 +41,7 @@
 					<?php } ?>
 					<?php } ?>
 				<?php } else { ?>
-					<tr><td><?php echo $ctype=='BACKUP' ? _('There are NO Backup Volumes for this Node.') : _('There are NO Archive Volumes for this Node.'); ?></td></tr>
+					<tr><td><?php echo _('There are NO volumes for this Node.'); ?></td></tr>
 				<?php } ?>
 			</table>
 		</td>
diff --git a/application/views/stgpool/detail.php b/application/views/stgpool/detail.php
index 9e07d80..fb819f8 100644
--- a/application/views/stgpool/detail.php
+++ b/application/views/stgpool/detail.php
@@ -270,4 +270,36 @@
 			</table>
 		</td>
 	</tr>
+	<tr>
+		<td style="width: 100%; vertical-align: top;" colspan="2">
+			<table class="box-full">
+				<tr>
+					<td class="head" colspan="5">Nodes with data in this Storage Pool</td>
+				</tr>
+				<tr>
+					<td class="spacer">&nbsp;</td>
+				</tr>
+				<tr>
+					<td>Node</td>
+					<td>Type</td>
+					<td>File Space</td>
+					<td>Num Files</td>
+					<td>Physical</td>
+					<td>Logical</td>
+					<td>Reporting</td>
+				</tr>
+                                <?php $i=0; foreach ($so->OCC->find_all() as $oo) { ?>
+                                <tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
+                                        <td class="data"><?php echo HTML::anchor('node/detail/'.$oo->NODE_NAME,$oo->NODE_NAME); ?></td>
+                                        <td class="data"><?php echo $oo->display('TYPE'); ?></td>
+                                        <td class="data"><?php echo $oo->display('FILESPACE_NAME'); ?></td>
+                                        <td class="data"><?php echo $oo->display('NUM_FILES'); ?></td>
+                                        <td class="data"><?php echo $oo->display('PHYSICAL_MB'); ?></td>
+                                        <td class="data"><?php echo $oo->display('LOGICAL_MB'); ?></td>
+                                        <td class="data"><?php echo $oo->display('REPORTING_MB'); ?></td>
+                                </tr>
+                                <?php } ?>
+			</table>
+		</td>
+	</tr>
 </table>