From 0e59456fa0d5d98b329356ac1416a1140c14aa62 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Wed, 20 Dec 2023 15:51:32 +0530 Subject: Extend the submission interface --- cfd_hackathon_submissions.module | 8 ++++---- my_submissions.inc | 2 +- proposal.inc | 44 ++++++++++++++++++++++++---------------- upload_code.inc | 2 +- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/cfd_hackathon_submissions.module b/cfd_hackathon_submissions.module index 6464944..1e79543 100644 --- a/cfd_hackathon_submissions.module +++ b/cfd_hackathon_submissions.module @@ -647,10 +647,10 @@ function _cfd_hackathon_list_of_case_studies($selected_version = NULL) //var_dump(_expected_date_of_completion("Study of flow around a re-entry space capsule and a parachute using Openfoam", "12 Nov 2023"));die; function _expected_date_of_completion($project_title, $proposal_creation_date){ - $result = db_query("SELECT no_of_days from available_hackathon_project_titles WHERE project_title =:project_title", array(':project_title' => $project_title)); - $days = $result->fetchObject()->no_of_days; - $no_of_days = $days; - $expected_date_of_completion = date('Y-m-d H:i:s', strtotime('+' . $no_of_days . ' days')); + //$result = db_query("SELECT no_of_days from available_hackathon_project_titles WHERE project_title =:project_title", array(':project_title' => $project_title)); + //$days = $result->fetchObject()->no_of_days; + //$no_of_days = $days; + $expected_date_of_completion = date('Y-m-d H:i:s', strtotime('+ 21 days')); return $expected_date_of_completion; } diff --git a/my_submissions.inc b/my_submissions.inc index b75ca8a..98442f4 100644 --- a/my_submissions.inc +++ b/my_submissions.inc @@ -30,7 +30,7 @@ function cfd_hackathon_display_my_submissions() $abstracts_q = $query->execute()->fetchObject(); $today = date("Y-m-d H:i:s"); if($final_submission_data->approval_status == 1){ - $action = l('Upload/edit project files', 'cfd-hackathon/resubmit-project-files/' . $final_submission_data->id) . ' | ' . l('Release', 'cfd-hackathon/release/' . $final_submission_data->id) . ' | ' . l('Mark as Completed', 'cfd-hackathon/mark-completed/' . $final_submission_data->id); + $action = l('Upload/edit project files', 'cfd-hackathon/upload-project-files/' . $final_submission_data->id) . ' | ' . l('Release', 'cfd-hackathon/release/' . $final_submission_data->id) . ' | ' . l('Mark as Completed', 'cfd-hackathon/mark-completed/' . $final_submission_data->id); } elseif ($final_submission_data->approval_status == 0) { $action = t('This title has been discontinued'); diff --git a/proposal.inc b/proposal.inc index d546e63..44b62d9 100644 --- a/proposal.inc +++ b/proposal.inc @@ -49,6 +49,7 @@ function cfd_hackathon_submissions_proposal(){ function cfd_hackathon_submissions_proposal_form($form, &$form_state, $no_js_use = FALSE) { global $user; + $last_date = variable_get('cfd_hackathon_last_date', ''); /************************ start approve book details ************************/ if ($user->uid == 0) { @@ -303,14 +304,6 @@ else{ ), '#required' => TRUE ); - $form['date_of_proposal'] = array( - '#type' => 'date_popup', - '#title' => t('Date of Proposal'), - '#default_value' => date("Y-m-d", time()), - '#date_format' => 'd-m-Y', - '#disabled' => TRUE, - '#date_label_position' => '', - ); $list_case_study = _cfd_hackathon_list_of_case_studies(); #var_dump($list_case_study);die; $selected_version = isset($form_state['values']['version'])?$form_state['values']['version']:key($list_case_study); @@ -321,11 +314,11 @@ else{ '#prefix' => '', '#options' => _cfd_hackathon_list_of_case_studies($selected_version), - '#ajax' => array( + /*'#ajax' => array( //'event'=>'replace', 'callback' =>'expected_date_of_completion_callback', //'wrapper' => 'expected-completion-date', - ), + ),*/ '#required' => TRUE, '#states' => array( 'invisible' => array( @@ -335,20 +328,35 @@ else{ ) ) ); - if (isset($form_state['values']['expected_date_of_completion'])) { + /*if (isset($form_state['values']['expected_date_of_completion'])) { $expected_completion_date = $form_state['values']['expected_date_of_completion']; } else { $expected_completion_date = ""; - } - //var_dump($form_state['values']['project_title']);die; + }*/ + $form['date_of_proposal'] = array( + '#type' => 'date_popup', + '#title' => t('Date of Proposal'), + '#default_value' => date("Y-m-d", time()), + '#date_format' => 'd-m-Y', + '#disabled' => TRUE, + '#date_label_position' => '', + ); $form['expected_date_of_completion'] = array( + '#type' => 'date_popup', + '#title' => t('Expected date of completion'), + '#default_value' => date("Y-m-d", strtotime($last_date)), + '#date_format' => 'd-m-Y', + '#disabled' => TRUE, + '#date_label_position' => '', + ); + /*$form['expected_date_of_completion'] = array( '#type' => 'textfield', '#title' => t('Expected Date of Completion'), '#size' =>20, '#value' => $expected_completion_date, '#maxlength' => 20, - '#prefix' => '
', + /*'#prefix' => '
', '#suffix' => '
', '#required' => TRUE, '#disabled' => TRUE, @@ -358,8 +366,8 @@ else{ 'value' => '' ) ) - )*/ - ); + ) + );*/ /*$form['term_condition'] = array( '#type' => 'checkboxes', '#title' => t('Terms And Conditions'), @@ -410,11 +418,11 @@ function cfd_hackathon_submissions_proposal_form_submit($form, &$form_state) } /* inserting the user proposal */ $v = $form_state["values"]; - +$last_date = variable_get('cfd_hackathon_last_date', ''); //var_dump($v['expected_date_of_completion']);die; $project_title = trim($v['project_title']); $creation_date = $v['date_of_proposal']; - $expected_completion_date = strtotime(_expected_date_of_completion($project_title, $creation_date)); + $expected_completion_date = strtotime($last_date); //$expected_completion_date = strtotime("+1day", strtotime($completion_date)); $proposar_name = $v['name_title'] . ' ' . $v['contributor_name']; $university = $v['university']; diff --git a/upload_code.inc b/upload_code.inc index b0de4a9..2bcd13d 100644 --- a/upload_code.inc +++ b/upload_code.inc @@ -75,7 +75,7 @@ function cfd_hackathon_submissions_upload_abstract_code_form($form, &$form_state } //!$existing_uploaded_S_file $form['upload_abstract'] = array( '#type' => 'file', - '#title' => t('Upload the Case Directory'), + '#title' => t('Upload the Report'), //'#required' => TRUE, '#description' => t('Current File : ' . $existing_uploaded_A_file->filename . '
Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '
' . t('Allowed file extensions : ') . variable_get('hackathon_submissions_abstract_upload_extensions', '') . '', ); -- cgit