diff options
| -rwxr-xr-x | flowsheet_details.inc | 2 | ||||
| -rwxr-xr-x | manage_proposal.inc | 8 | ||||
| -rwxr-xr-x | run.inc | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/flowsheet_details.inc b/flowsheet_details.inc index 909886d..f7813ab 100755 --- a/flowsheet_details.inc +++ b/flowsheet_details.inc @@ -24,6 +24,7 @@ function dwsim_flowsheet_completed_proposals_all() $preference_rows[] = array( $i, l($row->project_title, "flowsheeting-project/dwsim-flowsheet-run/" . $row->id, array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))), + $row->contributor_name, $row->university, $approval_date ); @@ -32,6 +33,7 @@ function dwsim_flowsheet_completed_proposals_all() $preference_header = array( 'No', 'Flowsheet Project', + 'Contributor Name', 'Institution', 'Year' ); diff --git a/manage_proposal.inc b/manage_proposal.inc index ad13081..e4efd62 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -930,6 +930,14 @@ function dwsim_flowsheet_proposal_edit_form($form, &$form_state) '#required' => TRUE, '#default_value' => $proposal_data->project_title ); + $form['reference'] = array( + '#type' => 'textarea', + '#title' => t('Reference of the Flowsheet Project'), + '#size' => 300, + '#maxlength' => 350, + '#required' => TRUE, + '#default_value' => $proposal_data->reference + ); $form['delete_proposal'] = array( '#type' => 'checkbox', '#title' => t('Delete Proposal') @@ -137,7 +137,7 @@ function _flowsheet_details($flowsheet_default_value) { $flowsheet_details = _flowsheet_information($flowsheet_default_value); if ($flowsheet_default_value != 0) { - $form['flowsheet_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Flowsheet</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $flowsheet_details->name_title . ' ' . $flowsheet_details->contributor_name . '</li>' . '<li><strong>Title of the Flowhseet:</strong> ' . l($flowsheet_details->project_title,'flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))) . '</li>' . '<li><strong>Institution:</strong> ' . $flowsheet_details->university . '</li>' . '<li><strong>Version:</strong> ' . $flowsheet_details->version . '</li>' . '</ul>'; + $form['flowsheet_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Flowsheet</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $flowsheet_details->name_title . ' ' . $flowsheet_details->contributor_name . '</li>' . '<li><strong>Title of the Flowhseet:</strong> ' . l($flowsheet_details->project_title,'flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))) . '</li>' . '<li><strong>Institution:</strong> ' . $flowsheet_details->university . '</li>' . '<li><strong>Version:</strong> ' . $flowsheet_details->version . '</li>' . '<li><strong>Reference:</strong> ' . $flowsheet_details->reference . '</li>' . '</ul>'; $details = $form['flowsheet_details']['#markup']; return $details; } //$flowsheet_default_value != 0 |