summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlab_details.inc30
1 files changed, 22 insertions, 8 deletions
diff --git a/lab_details.inc b/lab_details.inc
index 0c9d07f..e091852 100755
--- a/lab_details.inc
+++ b/lab_details.inc
@@ -18,7 +18,7 @@ function lab_migration_completed_labs_all()
$i = 1;
while ($row = $result->fetchObject())
{
- $approval_date = date("Y", $row->approval_date);
+ $approval_date = date("Y", $row->expected_completion_date);
$preference_rows[] = array(
$i,
$row->university,
@@ -55,15 +55,29 @@ function lab_migration_labs_progress_all()
}
else
{
- //$result = db_query($query);
- $page_content .= "<ol>";
+ $preference_rows = array();
+ $i = 1;
while ($row = $result->fetchObject())
{
- $page_content .= "<li>";
- $page_content .= $row->university . " ({$row->lab_title})";
- $page_content .= "</li>";
+ $approval_date = date("Y", $row->approval_date);
+ $preference_rows[] = array(
+ $i,
+ $row->university,
+ $row->lab_title,
+ $approval_date
+ );
+ $i++;
}
- $page_content .= "</ol>";
+ $preference_header = array(
+ 'No',
+ 'Institute',
+ 'Lab',
+ 'Year'
+ );
+ $page_content .= theme('table', array(
+ 'header' => $preference_header,
+ 'rows' => $preference_rows
+ ));
}
return $page_content;
- }
+ } \ No newline at end of file