browse apps: Improve table display

This commit is contained in:
Alexander Nicolaysen Sørnes
2008-06-13 21:27:17 +02:00
committed by Chris Morgan
parent d995dc1a16
commit 132431e9a2

View File

@@ -1033,13 +1033,21 @@ class Application {
public static function objectGetHeader($sState) public static function objectGetHeader($sState)
{ {
$oTableRow = new TableRowSortable(); $oTableRow = new TableRowSortable();
if($sState == 'accepted')
{
$oTableRow->AddSortableTextCell('Application', 'appName');
$oTableRow->AddSortableTextCelL('Entry#', 'appId');
$oTableRow->AddTextCell('Description');
} else
{
$oTableRow->AddSortableTextCell('Submission Date', 'submitTime'); $oTableRow->AddSortableTextCell('Submission Date', 'submitTime');
/* Only show submitter when processing queued entries */ /* Only show submitter when processing queued entries */
if($sState != 'accepted')
$oTableRow->AddTextCell('Submitter'); $oTableRow->AddTextCell('Submitter');
$oTableRow->AddSortableTextCell('Vendor', 'vendorName'); $oTableRow->AddSortableTextCell('Vendor', 'vendorName');
$oTableRow->AddSortableTextCell('Application', 'appName'); $oTableRow->AddSortableTextCell('Application', 'appName');
}
return $oTableRow; return $oTableRow;
} }
@@ -1051,13 +1059,19 @@ class Application {
$sVendor = $oVendor->objectMakeLink(); $sVendor = $oVendor->objectMakeLink();
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
/* Only show submitter when processing queued entries */ if($this->sState == 'accepted')
if($this->sState != 'accepted') {
$oTableRow->AddTextCell($this->objectMakeLink());
$oTableRow->AddTextCell($this->iAppId);
$oTableRow->AddTextCell(util_trim_description($this->sDescription));
} else
{
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($oUser->objectMakeLink());
$oTableRow->AddTextCell($sVendor); $oTableRow->AddTextCell($sVendor);
$oTableRow->AddTextCell(($this->sState == 'accepted') ? $this->objectMakeLink() : $this->sName); $oTableRow->AddTextCell( $this->sName);
}
$oOMTableRow = new OMTableRow($oTableRow); $oOMTableRow = new OMTableRow($oTableRow);
return $oOMTableRow; return $oOMTableRow;