summaryrefslogtreecommitdiff
path: root/migrated_labs.inc
diff options
context:
space:
mode:
Diffstat (limited to 'migrated_labs.inc')
-rw-r--r--migrated_labs.inc16
1 files changed, 11 insertions, 5 deletions
diff --git a/migrated_labs.inc b/migrated_labs.inc
index 285e12c..eed0f41 100644
--- a/migrated_labs.inc
+++ b/migrated_labs.inc
@@ -21,12 +21,18 @@ function migrated_labs()
$file_links .= '<br/>' . l('Suplementary Files', $dl_root_path . $sup_data->filepath);
$migration_status = '';
- switch ($labs_data) {
- case 1: $migration_status = '(In Progress)'; break;
- case 3: $migration_status = '(Completed)'; break;
+ if ($labs_data->solution_status == 0) {
+ $migration_status = 'In Progress';
+ } else if ($labs_data->solution_status == 1) {
+ $migration_status = 'Migrated';
+ if (($user->uid == $labs_data->uid) || user_access('manage proposal')) {
+ $sol_q = db_query("SELECT * FROM {lab_migration_files} WHERE link_id = %d AND filetype = 'A'", $labs_data->id);
+ $sol_data = db_fetch_object($sol_q);
+ $file_links .= '<br/>' . l('Solution File', $dl_root_path . $sol_data->filepath);
+ }
}
- $labs_rows[] = array($labs_data->university . '<br/>' . $migration_status, $labs_data->lab_title, $labs_data->problem_topic . $file_links, l($labs_data->name_title . ' ' . $labs_data->name, 'user/' . $labs_data->uid) . '<br/>' . $labs_data->department);
+ $labs_rows[] = array($labs_data->university, $labs_data->lab_title, $labs_data->problem_topic . $file_links, l($labs_data->name_title . ' ' . $labs_data->name, 'user/' . $labs_data->uid) . '<br/>' . $labs_data->department, $migration_status);
}
/* check if there are any pending proposals */
@@ -35,7 +41,7 @@ function migrated_labs()
return '';
}
- $labs_header = array('University/Institute', 'Title of the Lab', 'Title of the Problem', 'Name of the Proposer and Department');
+ $labs_header = array('University/Institute', 'Title of the Lab', 'Title of the Problem', 'Name of the Proposer and Department', 'Status');
$output = theme_table($labs_header, $labs_rows);
return $output;
}