diff options
| author | Sashi20 | 2019-09-25 11:50:33 +0530 |
|---|---|---|
| committer | GitHub | 2019-09-25 11:50:33 +0530 |
| commit | dacd05a8e7ee51c0283da3cd32879163e57848e7 (patch) | |
| tree | a015f175806d708f619a7f26c36a5e203a42ff41 | |
| parent | fba6b75ecdfb2e7b4c93c7b1b35fe02cccf69f79 (diff) | |
| parent | 432d12d3e01e376d4fee9ba7ff6a0da3b72d3bb8 (diff) | |
| download | DWSIM_lab_migration_module-dacd05a8e7ee51c0283da3cd32879163e57848e7.tar.gz DWSIM_lab_migration_module-dacd05a8e7ee51c0283da3cd32879163e57848e7.tar.bz2 DWSIM_lab_migration_module-dacd05a8e7ee51c0283da3cd32879163e57848e7.zip | |
Merge pull request #8 from Sashi20/master
Add link to download lab codes in completed labs table
| -rwxr-xr-x | download.inc | 4 | ||||
| -rwxr-xr-x | lab_details.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/download.inc b/download.inc index dcd5608..cb5783c 100755 --- a/download.inc +++ b/download.inc @@ -55,7 +55,7 @@ function lab_migration_download_solution() $query->fields('lab_migration_solution_files'); $query->condition('solution_id', $solution_id); $solution_files_q = $query->execute();*/ - $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.id = :solution_id", array(':solution_id' => $solution_id)); + $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.solution_id = :solution_id", array(':solution_id' => $solution_id)); //$solution_dependency_files_q = db_query("SELECT * FROM {lab_migration_solution_dependency} WHERE solution_id = %d", $solution_id); $query = db_select('lab_migration_solution_dependency'); $query->fields('lab_migration_solution_dependency'); @@ -213,7 +213,7 @@ function lab_migration_download_lab() $CODE_PATH = 'CODE' . $solution_row->code_number . '/'; //$solution_files_q = db_query("SELECT * FROM {lab_migration_solution_files} WHERE solution_id = %d", $solution_row->id); - $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.id = :solution_id", array(':solution_id' => $solution_row->id)); + $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.solution_id = :solution_id", array(':solution_id' => $solution_row->id)); /*$query = db_select('lab_migration_solution_files'); $query->fields('lab_migration_solution_files'); $query->condition('solution_id', $solution_row->id); diff --git a/lab_details.inc b/lab_details.inc index b04986e..93ebff7 100755 --- a/lab_details.inc +++ b/lab_details.inc @@ -22,7 +22,7 @@ function lab_migration_completed_labs_all() $preference_rows[] = array( $i, $row->university, - $row->lab_title, + l($row->lab_title, "lab-migration/lab-migration-run/" . $row->id), $completion_date ); $i++; |