From 08f13958d245fe0d628ebd05618fcc4462c09b75 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2019 16:31:02 +0530 Subject: Modify labs in progess from list to table view --- lab_details.inc | 30 ++++++++++++++++++++++-------- 1 file 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 .= "
    "; + $preference_rows = array(); + $i = 1; while ($row = $result->fetchObject()) { - $page_content .= "
  1. "; - $page_content .= $row->university . " ({$row->lab_title})"; - $page_content .= "
  2. "; + $approval_date = date("Y", $row->approval_date); + $preference_rows[] = array( + $i, + $row->university, + $row->lab_title, + $approval_date + ); + $i++; } - $page_content .= "
"; + $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 -- cgit