From 34b9adec46d8f2d031f156fe1890a24fe5f89fb9 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Mon, 29 Jul 2019 12:38:58 +0530 Subject: Modify completed case studies to display only university --- cfd_case_study_details.inc | 9 ++++----- manage_proposal.inc | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cfd_case_study_details.inc b/cfd_case_study_details.inc index d545f24..89a5645 100755 --- a/cfd_case_study_details.inc +++ b/cfd_case_study_details.inc @@ -30,7 +30,7 @@ function cfd_case_study_completed_proposals_all() $query1->condition('proposal_id', $proposal_id); $case_study_files = $query1->execute(); $case_study_abstract = $case_study_files->fetchObject(); - $project_title = WordWrap(l($row->project_title, "case-study-project/case-study-run/" . $row->id),10,"\n",true); + $project_title = l($row->project_title, "case-study-project/case-study-run/" . $row->id); $year = date("Y", $row->actual_completion_date); $solver_used = WordWrap($row->solver_used,10,"\n",true); $preference_rows[] = array( @@ -40,7 +40,6 @@ function cfd_case_study_completed_proposals_all() l('Download', "case-study-project/download/project-file/" . $row->id), $row->contributor_name, $row->university, - $row->institute, $year ); $i++; @@ -51,8 +50,8 @@ function cfd_case_study_completed_proposals_all() 'Solver used', 'Abstract File', 'Contributor Name', - 'University', - 'Institute', + 'Institute/ University', + //'Institute', 'Year' ); $output .= theme('table', array( @@ -96,7 +95,7 @@ function cfd_case_study_progress_all() 'No', 'Case Study Project', 'Contributor Name', - 'Institute', + 'Institute/ University', 'Year' ); $page_content .= theme('table', array( diff --git a/manage_proposal.inc b/manage_proposal.inc index 74c663b..74ad41d 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -871,6 +871,7 @@ function cfd_case_study_proposal_edit_form_submit($form, &$form_state) name_title=:name_title, contributor_name=:contributor_name, university=:university, + institute=:institute, city=:city, pincode=:pincode, state=:state, @@ -882,6 +883,7 @@ function cfd_case_study_proposal_edit_form_submit($form, &$form_state) ':name_title' => $v['name_title'], ':contributor_name' => $v['contributor_name'], ':university' => $v['university'], + ":institute" => $v['institute'], ':city' => $v['city'], ':pincode' => $v['pincode'], ':state' => $v['all_state'], -- cgit