diff options
| -rwxr-xr-x | om_pssp.module | 57 | ||||
| -rwxr-xr-x | proposal.inc | 8 |
2 files changed, 7 insertions, 58 deletions
diff --git a/om_pssp.module b/om_pssp.module index c9ab287..e827cb1 100755 --- a/om_pssp.module +++ b/om_pssp.module @@ -308,8 +308,8 @@ function om_pssp_menu() );*/ /* ADMIN SETTINGS */ $items['admin/settings/om-pssp'] = array( - 'title' => 'om pssp Settings', - 'description' => 'om pssp Settings', + 'title' => 'OM PSSP Settings', + 'description' => 'OM PSSP Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array( 'om_pssp_settings_form' @@ -552,58 +552,7 @@ function _df_sentence_case($string) } //array( '-', '\'' ) as $delimiter return $string; } -/*function _df_list_of_om_compound() -{ - $om_compound = array(); - $query = db_select('om_pssp_compounds_from_om'); - $query->fields('om_pssp_compounds_from_om'); - $query->orderBy('id', 'ASC'); - $om_compound_list = $query->execute(); - while ($om_compound_list_data = $om_compound_list->fetchObject()) - { - $om_compound[$om_compound_list_data->compound] = $om_compound_list_data->compound; - } //$om_compound_list_data = $om_compound_list->fetchObject() - return $om_compound; -} -function _df_list_of_unit_operations() -{ - $om_unit_operations = array(); - $query = db_select('om_pssp_unit_operations'); - $query->fields('om_pssp_unit_operations'); - $query->orderBy('id', 'ASC'); - $om_unit_operations_list = $query->execute(); - while ($om_unit_operations_list_data = $om_unit_operations_list->fetchObject()) - { - $om_unit_operations[$om_unit_operations_list_data->unit_operations] = $om_unit_operations_list_data->unit_operations; - } //$om_unit_operations_list_data = $om_unit_operations_list->fetchObject() - return $om_unit_operations; -} -function _df_list_of_thermodynamic_packages() -{ - $om_thermodynamic_packages = array(); - $query = db_select('om_pssp_thermodynamic_packages'); - $query->fields('om_pssp_thermodynamic_packages'); - $query->orderBy('thermodynamic_packages', 'ASC'); - $om_thermodynamic_packages_list = $query->execute(); - while ($om_thermodynamic_packages_list_data = $om_thermodynamic_packages_list->fetchObject()) - { - $om_thermodynamic_packages[$om_thermodynamic_packages_list_data->thermodynamic_packages] = $om_thermodynamic_packages_list_data->thermodynamic_packages; - } //$om_thermodynamic_packages_list_data = $om_thermodynamic_packages_list->fetchObject() - return $om_thermodynamic_packages; -} -function _df_list_of_logical_block() -{ - $om_logical_block = array(); - $query = db_select('om_pssp_logical_block'); - $query->fields('om_pssp_logical_block'); - $query->orderBy('id', 'ASC'); - $om_logical_block_list = $query->execute(); - while ($om_logical_block_list_data = $om_logical_block_list->fetchObject()) - { - $om_logical_block[$om_logical_block_list_data->logical_block] = $om_logical_block_list_data->logical_block; - } //$om_logical_block_list_data = $om_logical_block_list->fetchObject() - return $om_logical_block; -}*/ + function _df_list_of_states() { $states = array( diff --git a/proposal.inc b/proposal.inc index 1f14ec9..e4ea2b2 100755 --- a/proposal.inc +++ b/proposal.inc @@ -260,7 +260,7 @@ function om_pssp_proposal_form($form, &$form_state, $no_js_use = FALSE) '#type' => 'textfield', '#title' => t('Reference'), '#size' => 250, - '#required' => FALSE, + '#required' => TRUE, '#description' => t('Example: Plain Text, DOI, IEEE format etc.'), '#attributes' => array( 'placeholder' => 'The links to the documents or websites which are referenced while proposing this project.' @@ -286,7 +286,7 @@ function om_pssp_proposal_form($form, &$form_state, $no_js_use = FALSE) );*/ $form['samplefile'] = array( '#type' => 'fieldset', - '#title' => t('Upload Abstract'), + '#title' => t('Upload Abstract<span style="color:red;">*</span>'), '#collapsible' => FALSE, '#collapsed' => FALSE ); @@ -403,7 +403,7 @@ if (isset($_FILES['files'])) { /* check if atleast one source or result file is uploaded */ if (!($_FILES['files']['name']['samplefilepath'])) - form_set_error('samplefilepath', t('Please upload file with circuit diagram.')); + form_set_error('samplefilepath', t('Please upload the abstract file.')); /* check for valid filename extensions */ foreach ($_FILES['files']['name'] as $file_form_name => $file_name) { @@ -520,7 +520,7 @@ function om_pssp_proposal_form_submit($form, &$form_state) ":project_guide_name" => _df_sentence_case($v['project_guide_name']), ":project_guide_email_id" => trim($v['project_guide_email_id']), ":project_guide_university" => trim($v['project_guide_university']), - ":project_title" => _df_sentence_case($v['project_title']), + ":project_title" => $v['project_title'], ":description" => _df_sentence_case($v['description']), ":directory_name" => $directory_name, ":approval_status" => 0, |