diff options
| author | Sashi20 | 2019-06-07 15:30:57 +0530 |
|---|---|---|
| committer | GitHub | 2019-06-07 15:30:57 +0530 |
| commit | b8254fea24d7ca19426be6f75241fb60d51e42bb (patch) | |
| tree | a316a59b68aaa4922f396e1407888d0768148c41 | |
| parent | 125b8e6d2637e2e20e4861bee88626e7d79b067d (diff) | |
| parent | ef7fd9a764485f961e1e3799bd50c23d0fb0fbc5 (diff) | |
| download | om_flowsheet-b8254fea24d7ca19426be6f75241fb60d51e42bb.tar.gz om_flowsheet-b8254fea24d7ca19426be6f75241fb60d51e42bb.tar.bz2 om_flowsheet-b8254fea24d7ca19426be6f75241fb60d51e42bb.zip | |
Merge pull request #3 from Sashi20/master
Remove redundant fields displaying the project title in manage proposal
| -rwxr-xr-x | manage_proposal.inc | 12 | ||||
| -rwxr-xr-x | om_flowsheet.module | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc index 368b82f..dd8d004 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -275,11 +275,11 @@ function om_flowsheet_proposal_approval_form($form, &$form_state) '#markup' => $proposal_data->project_title, '#title' => t('Title of the Flowsheet Project') ); - $form['dwsim_flowsheet_name'] = array( + /*$form['dwsim_flowsheet_name'] = array( '#type' => 'item', '#title' => t('Name of the DWSIM flowsheet'), '#markup' => $proposal_data->dwsim_flowsheet_name, - ); + );*/ $headers = array( "User defined compound", "CAS No." @@ -563,11 +563,11 @@ function om_flowsheet_proposal_status_form($form, &$form_state) '#markup' => $proposal_data->project_title, '#title' => t('Title of the Flowsheet Project') ); - $form['dwsim_flowsheet_name'] = array( + /*$form['dwsim_flowsheet_name'] = array( '#type' => 'item', '#title' => t('Name of the DWSIM flowsheet'), '#markup' => $proposal_data->dwsim_flowsheet_name, - ); + );*/ $form['process_development_compound_name'] = array( '#type' => 'item', '#title' => t('Name of compound for which process development is carried out'), @@ -938,12 +938,12 @@ else{ '#required' => TRUE, '#default_value' => $proposal_data->project_title ); - $form['dwsim_flowsheet_name'] = array( + /*$form['dwsim_flowsheet_name'] = array( '#type' => 'textfield', '#title' => t('The name of DWSIM flowsheet along with its serial number.'), '#default_value' => $proposal_data->dwsim_flowsheet_name, '#validated' => TRUE, - ); + );*/ $form['reference'] = array( '#type' => 'textarea', '#title' => t('Reference of the Flowsheet Project'), diff --git a/om_flowsheet.module b/om_flowsheet.module index ecf095a..bce14a0 100755 --- a/om_flowsheet.module +++ b/om_flowsheet.module @@ -880,6 +880,7 @@ function _df_list_of_dwsim_flowsheets() $query = db_select('dwsim_flowsheet_proposal'); $query->fields('dwsim_flowsheet_proposal'); $query->condition('approval_status', 3); + $query->orderBy('project_title', 'ASC'); $dwsim_flowsheets_list = $query->execute(); while ($dwsim_flowsheets_list_data = $dwsim_flowsheets_list->fetchObject()) { |