From 82af83a6b9f4d0363e4141917bb524a7aca1bc32 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2024 11:02:07 +0530 Subject: Update the field titles in proposal form --- proposal.inc | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/proposal.inc b/proposal.inc index ec8b384..54ccec5 100755 --- a/proposal.inc +++ b/proposal.inc @@ -298,21 +298,32 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) '#type' => 'textarea', '#title' => t('Case Study Title'), '#size' => 250, - '#maxlength' => 500, + '#maxlength' => 100, '#description' => t('Maximum character limit is 500'), '#required' => TRUE, ); $form['description'] = array( '#type' => 'textarea', - '#title' => t('Objective'), + '#title' => t('Objective and Necessity of the Case Study'), '#size' => 250, '#maxlength' => 1200, '#description' => t('Maximum character limit is 1200'), '#required' => TRUE, ); + $form['raw_data_file'] = array( + '#type' => 'fieldset', + '#title' => t('Submit the data directory files (Upload raw data (in .csv)/Data Description File (in .pdf)/ Data Source Link (in .txt))*'), + '#collapsible' => FALSE, + '#collapsed' => FALSE + ); + $form['raw_data_file']['raw_data_file_path'] = array( + '#type' => 'file', + '#size' => 48, + '#description' => t('Upload filenames with allowed extensions only. No spaces or any special characters allowed in filename.') . '
' . t('Allowed file extensions: ') . variable_get('proposal_raw_data_upload_extensions', '') . '' + ); $form['sample_references_file'] = array( '#type' => 'item', - '#title' => t('
Literature Survey File Submission
'), + '#title' => t('
Literature Survey Submission
'), '#markup' => t('Please download the template of the Literature Survey using the following link: ') . t('Click Here') . '
' . t('Kindly fill it and submit it in the section below. Make sure to add at least 10 items in the survey list.') ); @@ -327,22 +338,14 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) '#size' => 48, '#description' => t('Upload filenames with allowed extensions only. No spaces or any special characters allowed in filename.') . '
' . t('Allowed file extensions: ') . variable_get('proposal_literature_survey_upload_extensions', '') . '' ); - // $form['references'] = array( - // '#type' => 'textfield', - // '#title' => t("Literature Survey"), - // '#size' => 255, - // '#maxlength' => 2500, - // '#description' => t('Maximum character limit is 2500'), - // '#required' => TRUE - // ); $form['sample_abstract_file'] = array( '#type' => 'item', - '#title' => t('
Abstract File Submission
'), + '#title' => t('
Methodology Details
'), '#markup' => t('Kindly refer to the following link to know the ideal abstract file format:') . t(' Click Here') ); $form['abstract_file'] = array( '#type' => 'fieldset', - '#title' => t('Submit an Abstract*'), + '#title' => t('Methodology Details*'), '#collapsible' => FALSE, '#collapsed' => FALSE ); @@ -351,17 +354,7 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) '#size' => 48, '#description' => t('Upload filenames with allowed extensions only. No spaces or any special characters allowed in filename.') . '
' . t('Allowed file extensions: ') . variable_get('proposal_abstract_upload_extensions', '') . '' ); - $form['raw_data_file'] = array( - '#type' => 'fieldset', - '#title' => t('Submit raw data file/s*'), - '#collapsible' => FALSE, - '#collapsed' => FALSE - ); - $form['raw_data_file']['raw_data_file_path'] = array( - '#type' => 'file', - '#size' => 48, - '#description' => t('Upload filenames with allowed extensions only. No spaces or any special characters allowed in filename.') . '
' . t('Allowed file extensions: ') . variable_get('proposal_raw_data_upload_extensions', '') . '' - ); + $form['date_of_proposal'] = array( '#type' => 'date_popup', '#title' => t('Date of Proposal'), @@ -457,11 +450,7 @@ function r_case_study_proposal_form_validate($form, &$form_state) $form_state['values']['case_study_title'] = trim($form_state['values']['case_study_title']); if ($form_state['values']['case_study_title'] != '') { - if (strlen($form_state['values']['case_study_title']) > 250) - { - form_set_error('case_study_title', t('Maximum charater limit is 250 charaters only, please check the length of the project title')); - } //strlen($form_state['values']['project_title']) > 250 - else if (strlen($form_state['values']['case_study_title']) < 10) + if (strlen($form_state['values']['case_study_title']) < 10) { form_set_error('case_study_title', t('Minimum charater limit is 10 charaters, please check the length of the project title')); } -- cgit From a9791a1d671b8eb49e18defdcd0f4b0d78753cf5 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2024 11:04:50 +0530 Subject: Update field names in manage proposal forms --- manage_proposal.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manage_proposal.inc b/manage_proposal.inc index 4c90af0..7b83ef2 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -309,7 +309,7 @@ function r_case_study_proposal_approval_form($form, &$form_state) $form['description'] = array( '#type' => 'item', '#markup' => $proposal_data->description, - '#title' => t('Objective') + '#title' => t('Objective and Necessity of the Case Study') ); $form['literature_survey_file'] = array( '#type' => 'item', @@ -318,7 +318,7 @@ function r_case_study_proposal_approval_form($form, &$form_state) ); $form['abstract_file'] = array( '#type' => 'item', - '#markup' => l('View abstract', 'case-study-project/download/proposal-abstract-files/' . $proposal_data->id), + '#markup' => l('View Methodology details', 'case-study-project/download/proposal-abstract-files/' . $proposal_data->id), '#title' => t('Abstract File') ); $form['rawdata_file'] = array( @@ -599,7 +599,7 @@ function r_case_study_proposal_status_form($form, &$form_state) $form['description'] = array( '#type' => 'item', '#markup' => $proposal_data->description, - '#title' => t('Objective') + '#title' => t('Objective and Necessity of the Case Study') ); /*$url = '~(?:(https?)://([^\s<]+)|(www\.[^\s<]+?\.[^\s<]+))(?$0', $re);*/ @@ -991,13 +991,13 @@ function r_case_study_proposal_edit_form($form, &$form_state) '#type' => 'textfield', '#title' => t('Title of the Case Study Project'), '#size' => 300, - '#maxlength' => 500, + '#maxlength' => 100, '#required' => true, '#default_value' => $proposal_data->project_title, ); $form['description'] = array( '#type' => 'textarea', - '#title' => t('Objective'), + '#title' => t('Objective and Necessity of the Case Study'), '#size' => 300, '#maxlength' => 1200, '#required' => true, -- cgit From e2f0424ad12adcc402fcb880123c3877ecc2afa3 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2024 11:24:43 +0530 Subject: Update raw data field title --- proposal.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/proposal.inc b/proposal.inc index 54ccec5..2430754 100755 --- a/proposal.inc +++ b/proposal.inc @@ -299,7 +299,7 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) '#title' => t('Case Study Title'), '#size' => 250, '#maxlength' => 100, - '#description' => t('Maximum character limit is 500'), + '#description' => t('Maximum character limit is 100'), '#required' => TRUE, ); $form['description'] = array( @@ -310,9 +310,13 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) '#description' => t('Maximum character limit is 1200'), '#required' => TRUE, ); + $form['raw_data_title'] = array( + '#type' => 'item', + '#title' => t('
Data Submission
'), + ); $form['raw_data_file'] = array( '#type' => 'fieldset', - '#title' => t('Submit the data directory files (Upload raw data (in .csv)/Data Description File (in .pdf)/ Data Source Link (in .txt))*'), + '#title' => t('Upload raw data (in .csv)/Data Description File (in .pdf)/ Data Source Link (in .txt)*'), '#collapsible' => FALSE, '#collapsed' => FALSE ); -- cgit From c69826f8ba5b88c1e13eb021e8974cec425f9fa0 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2024 11:35:48 +0530 Subject: Update methodology details title and description in proposal form --- proposal.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proposal.inc b/proposal.inc index 2430754..9fcba56 100755 --- a/proposal.inc +++ b/proposal.inc @@ -313,10 +313,11 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) $form['raw_data_title'] = array( '#type' => 'item', '#title' => t('
Data Submission
'), + '#markup' => t('Upload a zip file containing raw data (in .csv)/Data Description File (in .pdf)/ Data Source Link (in .txt)') ); $form['raw_data_file'] = array( '#type' => 'fieldset', - '#title' => t('Upload raw data (in .csv)/Data Description File (in .pdf)/ Data Source Link (in .txt)*'), + '#title' => t('Upload data directory submission *'), '#collapsible' => FALSE, '#collapsed' => FALSE ); @@ -328,7 +329,7 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) $form['sample_references_file'] = array( '#type' => 'item', '#title' => t('
Literature Survey Submission
'), - '#markup' => t('Please download the template of the Literature Survey using the following link: ') . t('Click Here') . '
' . t('Kindly fill it and submit it in the section below. Make sure to add at least 10 items in the survey list.') + '#markup' => t('Please download the template of the Literature Survey using the following link: ') . t('Click Here') . '
' . t('Kindly fill it and submit it in the section below.') ); $form['literature_survey_file'] = array( @@ -345,7 +346,7 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) $form['sample_abstract_file'] = array( '#type' => 'item', '#title' => t('
Methodology Details
'), - '#markup' => t('Kindly refer to the following link to know the ideal abstract file format:') . t(' Click Here') + '#markup' => t('Kindly refer to Point no. 4 in the Submission Guidlines to know the requirements of the document.') ); $form['abstract_file'] = array( '#type' => 'fieldset', -- cgit From bcbf6213885daecc335e75d3b9f76a68d5b16136 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Thu, 28 Mar 2024 11:37:53 +0530 Subject: Modify description text for methodology details --- proposal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposal.inc b/proposal.inc index 9fcba56..1d21d91 100755 --- a/proposal.inc +++ b/proposal.inc @@ -346,7 +346,7 @@ function r_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE) $form['sample_abstract_file'] = array( '#type' => 'item', '#title' => t('
Methodology Details
'), - '#markup' => t('Kindly refer to Point no. 4 in the Submission Guidlines to know the requirements of the document.') + '#markup' => t('Kindly refer to Point no. 4 of the Proposal Documents in the Submission Guidlines to know the requirements of the document.') ); $form['abstract_file'] = array( '#type' => 'fieldset', -- cgit