From d59d58dcd0ecf89f247cf3e8344d914652c4976a Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Tue, 5 Dec 2023 18:15:45 +0530
Subject: Allow report submission for completed projects
---
cfd_hackathon_submissions.module | 12 ++
email.inc | 36 +++++
manage_proposal.inc | 49 +++++-
my_submissions.inc | 12 +-
reupload_code.inc | 311 +++++++++++++++++++++++++++++++++++++++
settings.inc | 10 ++
6 files changed, 422 insertions(+), 8 deletions(-)
create mode 100644 reupload_code.inc
diff --git a/cfd_hackathon_submissions.module b/cfd_hackathon_submissions.module
index 1f55e46..6464944 100644
--- a/cfd_hackathon_submissions.module
+++ b/cfd_hackathon_submissions.module
@@ -88,6 +88,18 @@ function cfd_hackathon_submissions_menu()
),
'type' => MENU_CALLBACK,
'file' => 'upload_code.inc',
+ );
+ $items['cfd-hackathon/resubmit-project-files'] = array(
+ 'title' => 'CFD hackathon Project Directory Re-Submission',
+ 'description' => 'Abstract Re-Submission',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('cfd_hackathon_submissions_reupload_abstract_code_form'),
+ 'access callback' => 'user_access',
+ 'access arguments' => array(
+ 'cfd hackathon upload abstract',
+ ),
+ 'type' => MENU_CALLBACK,
+ 'file' => 'reupload_code.inc',
);
$items["cfd-hackathon/my-submissions"] = array(
"title" => "List of my submissions",
diff --git a/email.inc b/email.inc
index dc18bde..b96c3bf 100644
--- a/email.inc
+++ b/email.inc
@@ -298,6 +298,42 @@ FOSSEE,IIT Bombay', array(
)),
);
break;
+ case 'cfd_hackathon_submissions_proposal_resubmit':
+ /* initializing data */
+ $query = db_select('cfd_hackathon_proposal');
+ $query->fields('cfd_hackathon_proposal');
+ $query->condition('id', $params['cfd_hackathon_submissions_proposal_resubmit']['proposal_id']);
+ $query->range(0, 1);
+ $proposal_data = $query->execute()->fetchObject();
+ $query = db_select('cfd_hackathon_user_profile');
+ $query->fields('cfd_hackathon_user_profile');
+ $query->condition('uid', $user->uid);
+ $user_q = $query->execute();
+ $proposal_user_data = $user_q->fetchObject();
+ $user_data = user_load($params['cfd_hackathon_submissions_proposal_resubmit']['user_id']);
+ $message['headers'] = $params['cfd_hackathon_submissions_proposal_resubmit']['headers'];
+ $message['subject'] = t('[!site_name][OpenFOAM hackathon] Your uploaded files have been marked for resubmission', array(
+ '!site_name' => variable_get('site_name', ''),
+ ), array(
+ 'language' => $language->language,
+ ));
+ $message['body'] = array(
+ 'body' => t('
+Dear ' . $proposal_user_data->contributor_name . ',
+
+Kindly resubmit the abstract file for the project title: ' . $proposal_data->project_title . '
+
+Best Wishes,
+
+!site_name Team,
+FOSSEE,IIT Bombay', array(
+ '!site_name' => variable_get('site_name', ''),
+ '!user_name' => $user_data->name,
+ ), array(
+ 'language' => $language->language,
+ )),
+ );
+ break;
/**************************************************************/
case 'abstract_edit_file_uploaded':
// $solution_q = db_query("SELECT * FROM {cfd_hackathon_submissions_solution} WHERE id = %d LIMIT 1", $params['abstract_uploaded']['solution_id']);
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 3a6d0bf..1d52784 100644
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -12,6 +12,10 @@ function cfd_hackathon_view_submission_form($form, $form_state){
$query->condition('uid', $proposal_data->uid);
$user_q = $query->execute();
$user_data = $user_q->fetchObject();
+ $query = db_select('cfd_hackathon_submitted_abstracts');
+ $query->fields('cfd_hackathon_submitted_abstracts');
+ $query->condition('proposal_id', $proposal_id);
+ $abstracts_q = $query->execute()->fetchObject();
$form['#attributes'] = array(
'enctype' => "multipart/form-data"
);
@@ -87,23 +91,56 @@ function cfd_hackathon_view_submission_form($form, $form_state){
'#type' => 'checkbox',
'#title' => t('Release the project title'),
);*/
+ if($abstracts_q->is_submitted == 1){
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Resubmit the Abstract'),
+ );
+}
$form['back'] = array(
- '#type' => 'markup',
+ '#type' => 'item',
'#markup' => l(t('Go back'), 'cfd-hackathon/all-submissions'),
);
return $form;
}
-/*function cfd_hackathon_view_submission_form_submit($form, $form_state){
+function cfd_hackathon_view_submission_form_submit($form, $form_state){
global $user;
$proposal_id = (int) arg(2);
$v = $form_state['values'];
- $query = "UPDATE cfd_hackathon_proposal SET approval_status = :release_status WHERE id = :proposal_id";
+ $query = "UPDATE cfd_hackathon_submitted_abstracts SET is_submitted = :submission_status WHERE proposal_id = :proposal_id";
$args = array(
- ":release_status" => 0,
+ ":submission_status" => 0,
":proposal_id" => $proposal_id
);
$result = db_query($query, $args);
- drupal_set_message(t('Project title has been released successfully, you may propose a new title'), 'status');
+ $query = db_select('cfd_hackathon_proposal');
+ $query->fields('cfd_hackathon_proposal');
+ $query->condition('id', $proposal_id);
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
+ $query = db_select('cfd_hackathon_user_profile');
+ $query->fields('cfd_hackathon_user_profile');
+ $query->condition('uid', $proposal_data->uid);
+ $user_q = $query->execute();
+ $user_data = $user_q->fetchObject();
+ $email_to = $user_data->mail;
+ $form = variable_get('hackathon_submissions_from_email', '');
+ $bcc = variable_get('hackathon_submissions_emails', '');
+ $cc = variable_get('hackathon_submissions_cc_emails', '');
+ $params['cfd_hackathon_submissions_proposal_resubmit']['proposal_id'] = $proposal_id;
+ $params['cfd_hackathon_submissions_proposal_resubmit']['user_id'] = $user_data->uid;
+ $params['cfd_hackathon_submissions_proposal_resubmit']['headers'] = array(
+ 'From' => $form,
+ 'MIME-Version' => '1.0',
+ 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+ 'Content-Transfer-Encoding' => '8Bit',
+ 'X-Mailer' => 'Drupal',
+ 'Cc' => $cc,
+ 'Bcc' => $bcc
+ );
+ if (!drupal_mail('cfd_hackathon_submissions', 'cfd_hackathon_submissions_proposal_resubmit', $email_to, user_preferred_language($user), $params, $form, TRUE))
+ drupal_set_message('Error sending email message.', 'error');
+ drupal_set_message(t('Marked for resubmission and user has been notified'), 'status');
drupal_goto('cfd-hackathon/all-submissions');
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/my_submissions.inc b/my_submissions.inc
index 575abaf..b75ca8a 100644
--- a/my_submissions.inc
+++ b/my_submissions.inc
@@ -24,16 +24,24 @@ function cfd_hackathon_display_my_submissions()
drupal_set_message('We have not received your submission', 'error');
drupal_goto('');
}
+ $query = db_select('cfd_hackathon_submitted_abstracts');
+ $query->fields('cfd_hackathon_submitted_abstracts');
+ $query->condition('proposal_id', $final_submission_data->id);
+ $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/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);
+ $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);
}
elseif ($final_submission_data->approval_status == 0) {
$action = t('This title has been discontinued');
}
-elseif ($final_submission_data->approval_status == 3) {
+elseif ($final_submission_data->approval_status == 3 && $abstracts_q->is_submitted == 1) {
$action = t('This title has been completed');
}
+elseif ($final_submission_data->approval_status == 3 && $abstracts_q->is_submitted == 0){
+ $action = l('Resubmit project files', 'cfd-hackathon/resubmit-project-files/' . $final_submission_data->id);
+}
+
$creation_date = date('d-m-Y', $final_submission_data->creation_date);
$expected_date_of_completion = date('d-m-Y h:i A', $final_submission_data->expected_date_of_completion);
$final_submission_rows[$final_submission_data->id] = array(
diff --git a/reupload_code.inc b/reupload_code.inc
new file mode 100644
index 0000000..6fa8354
--- /dev/null
+++ b/reupload_code.inc
@@ -0,0 +1,311 @@
+ "multipart/form-data",
+ );
+ /* get current proposal */
+ //$proposal_id = (int) arg(3);
+ $uid = $user->uid;
+ $query = db_select('cfd_hackathon_proposal');
+ $query->fields('cfd_hackathon_proposal');
+ $query->condition('id', $proposal_id);
+ //$query->condition('approval_status', '1');
+ $proposal_q = $query->execute();
+ if ($proposal_q) {
+ if ($proposal_data = $proposal_q->fetchObject()) {
+ /* everything ok */
+ } //$proposal_data = $proposal_q->fetchObject()
+ else {
+ drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
+ drupal_goto('case-study-project/abstract-code');
+ return;
+ }
+ } //$proposal_q
+ else {
+ drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
+ drupal_goto('case-study-project/abstract-code');
+ return;
+ }
+ $query_user = db_select('cfd_hackathon_user_profile');
+ $query_user->fields('cfd_hackathon_user_profile');
+ $query_user->condition('uid', $uid);
+ //$query_user->condition('approval_status', '1');
+ $user_q = $query_user->execute();
+ $user_data = $user_q->fetchObject();
+ $query = db_select('cfd_hackathon_submitted_abstracts');
+ $query->fields('cfd_hackathon_submitted_abstracts');
+ $query->condition('proposal_id', $proposal_id);
+ $abstracts_q = $query->execute()->fetchObject();
+ /*if ($abstracts_q) {
+ if ($abstracts_q->is_submitted == 1) {
+ drupal_set_message(t('You have already submited your Case Directory, hence you can not reupload any more, for any query please write to us.'), 'error', $repeat = false);
+ drupal_goto('cfd-hackathon/my-submissions');
+ //return;
+ } //$abstracts_q->is_submitted == 1
+ }*/ //$abstracts_q->is_submitted == 1
+ $today = time();
+
+ $form['project_title'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->project_title,
+ '#title' => t('Title of the Case Study Project'),
+ );
+ $form['contributor_name'] = array(
+ '#type' => 'item',
+ '#markup' => $user_data->contributor_name,
+ '#title' => t('Contributor Name'),
+ );
+ $existing_reuploaded_A_file = _hackathon_default_value_for_reuploaded_files("A", $proposal_data->id);
+ if (!$existing_reuploaded_A_file) {
+ $existing_reuploaded_A_file = new stdClass();
+ $existing_reuploaded_A_file->filename = "No file reuploaded";
+ } //!$existing_reuploaded_S_file
+ $form['reupload_abstract'] = array(
+ '#type' => 'file',
+ '#title' => t('Upload the Report'),
+ //'#required' => TRUE,
+ '#description' => t('Current File : ' . $existing_reuploaded_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', '') . '',
+ );
+ $form['prop_id'] = array(
+ '#type' => 'hidden',
+ '#value' => $proposal_data->id,
+ );
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Submit'),
+ );
+ $form['cancel'] = array(
+ '#type' => 'item',
+ '#markup' => l(t('Cancel'), 'cfd-hackathon/my-submissions'),
+ );
+ return $form;
+}
+
+///////////////////////////////////////////////////////////////
+function cfd_hackathon_submissions_reupload_abstract_code_form_validate($form, &$form_state)
+{
+ //var_dump($form);die;
+ if (isset($_FILES['files'])) {
+ /* check if atleast one source or result file is reuploaded */
+ /*if (!($_FILES['files']['name']['reupload_case_study_developed_process'])) {
+ form_set_error('reupload_case_study_developed_process', t('Please reupload the project files'));
+ }
+ if (!($_FILES['files']['name']['reupload_abstract'])) {
+ form_set_error('reupload_abstract', t('Please reupload the abstract file'));
+ }*/
+
+ /* check for valid filename extensions */
+ foreach ($_FILES['files']['name'] as $file_form_name => $file_name) {
+ if ($file_name) {
+ /* checking file type */
+ if (strstr($file_form_name, 'reupload_case_study_developed_process'))
+ $file_type = 'S';
+ else if (strstr($file_form_name, 'reupload_abstract'))
+ $file_type = 'A';
+ $allowed_extensions_str = '';
+ switch ($file_type)
+ {
+ case 'S':
+ $allowed_extensions_str = variable_get('hackathon_submissions_project_files_extensions', '');
+ break;
+ case 'A':
+ $allowed_extensions_str = variable_get('hackathon_submissions_abstract_upload_extensions', '');
+ break;
+ }
+ $allowed_extensions = explode(',', $allowed_extensions_str);
+ $fnames = explode('.', strtolower($_FILES['files']['name'][$file_form_name]));
+ $temp_extension = end($fnames);
+ if (!in_array($temp_extension, $allowed_extensions)) {
+ form_set_error($file_form_name, t('Only file with ' . $allowed_extensions_str . ' extensions can be reuploaded.'));
+ }
+
+ if ($_FILES['files']['size'][$file_form_name] <= 0) {
+ form_set_error($file_form_name, t('File size cannot be zero.'));
+ }
+
+ /* check if valid file name */
+ if (!cfd_hackathon_submissions_check_valid_filename($_FILES['files']['name'][$file_form_name])) {
+ form_set_error($file_form_name, t('Invalid file name specified. Only alphabets and numbers are allowed as a valid filename.'));
+ }
+
+ } //$file_name
+ } //$_FILES['files']['name'] as $file_form_name => $file_name
+ }
+ return $form_state;
+}
+function cfd_hackathon_submissions_reupload_abstract_code_form_submit($form, &$form_state)
+{
+ global $user;
+ $proposal_id = (int) arg(2);
+ $v = $form_state['values'];
+ $root_path = cfd_hackathon_submissions_path();
+ //$proposal_data = cfd_hackathon_submissions_get_proposal();
+ $query = db_select('cfd_hackathon_proposal');
+ $query->fields('cfd_hackathon_proposal');
+ $query->condition('id', $proposal_id);
+ //$query->condition('approval_status', '1');
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
+ if (!$proposal_data) {
+ drupal_goto('');
+ return;
+ } //!$proposal_data
+ $proposal_id = $proposal_data->id;
+ $proposal_directory = $proposal_data->directory_name;
+ /* create proposal folder if not present */
+ //$dest_path = $proposal_directory . '/';
+ $dest_path_project_files = $proposal_directory . '/';
+ $proposal_id = $proposal_data->id;
+ $query_s = "SELECT * FROM {cfd_hackathon_submitted_abstracts} WHERE proposal_id = :proposal_id";
+ $args_s = array(
+ ":proposal_id" => $proposal_id,
+ );
+ $query_s_result = db_query($query_s, $args_s)->fetchObject();
+ $resubmission_last_date = variable_get('cfd_hackathon_report_resubmission_date', '');
+ $today = date("Y-m-d H:i:s");
+
+ $query = "UPDATE cfd_hackathon_submitted_abstracts SET
+ abstract_upload_date =:abstract_reupload_date,
+ is_submitted= :is_submitted
+ WHERE proposal_id = :proposal_id";
+ if($today < $resubmission_last_date){
+ $args = array(
+
+ ":abstract_reupload_date" => time(),
+ ":is_submitted" => 0,
+ ":proposal_id" => $proposal_id,
+ );
+ }
+ else{
+ {
+ $args = array(
+
+ ":abstract_reupload_date" => time(),
+ ":is_submitted" => 1,
+ ":proposal_id" => $proposal_id,
+ );
+ }
+ }
+ $submitted_abstract_id = db_query($query, $args, array(
+ 'return' => Database::RETURN_INSERT_ID,
+ ));
+ drupal_set_message('Abstract updated successfully.', 'status');
+ foreach ($_FILES['files']['name'] as $file_form_name => $file_name) {
+ if ($file_name) {
+ /* checking file type */
+ if (strstr($file_form_name, 'reupload_case_study_developed_process')) {
+ $file_type = 'S';
+ } //strstr($file_form_name, 'reupload_case_study_developed_process')
+ if (strstr($file_form_name, 'reupload_abstract')) {
+ $file_type = 'A';
+ } //strstr($file_form_name, 'reupload_case_study_developed_process')
+ switch ($file_type) {
+ case 'A':
+
+ if (file_exists($root_path . $dest_path_project_files . $_FILES['files']['name'][$file_form_name])) {
+ //unlink($root_path . $dest_path . $_FILES['files']['name'][$file_form_name]);
+ drupal_set_message(t("File !filename already exists hence overwirtten the exisitng file ", array(
+ '!filename' => $_FILES['files']['name'][$file_form_name],
+ )), 'error');
+ } //file_exists($root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
+ /* reuploading file */
+ else if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path_project_files . $_FILES['files']['name'][$file_form_name])) {
+ /* for reuploaded files making an entry in the database */
+ $query_abstracts = "SELECT * FROM cfd_hackathon_submitted_abstracts WHERE proposal_id = :proposal_id";
+ $query_abstracts_args = array(
+ ":proposal_id" => $proposal_id,
+ );
+ $query_abstracts_result = db_query($query_abstracts, $query_abstracts_args)->fetchObject();
+ $submitted_abstract_id = $query_abstracts_result->id;
+ $query_ab_f = "SELECT * FROM cfd_hackathon_submitted_abstracts_file WHERE proposal_id = :proposal_id AND filetype =
+ :filetype";
+ $args_ab_f = array(
+ ":proposal_id" => $proposal_id,
+ ":filetype" => $file_type,
+ );
+ $query_ab_f_result = db_query($query_ab_f, $args_ab_f)->fetchObject();
+ if (!$query_ab_f_result) {
+ $query = "INSERT INTO {cfd_hackathon_submitted_abstracts_file} (submitted_abstract_id, proposal_id, uid, approvar_uid, filename, filepath, filemime, filesize, filetype, timestamp)
+ VALUES (:submitted_abstract_id, :proposal_id, :uid, :approvar_uid, :filename, :filepath, :filemime, :filesize, :filetype, :timestamp)";
+ $args = array(
+ ":submitted_abstract_id" => $submitted_abstract_id,
+ ":proposal_id" => $proposal_id,
+ ":uid" => $user->uid,
+ ":approvar_uid" => 0,
+ ":filename" => $_FILES['files']['name'][$file_form_name],
+ ":filepath" => $_FILES['files']['name'][$file_form_name],
+ ":filemime" => mime_content_type($root_path . $dest_path_project_files . $_FILES['files']['name'][$file_form_name]),
+ ":filesize" => $_FILES['files']['size'][$file_form_name],
+ ":filetype" => $file_type,
+ ":timestamp" => time(),
+ );
+ db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+ drupal_set_message($file_name . ' reuploaded successfully.', 'status');
+ } //!$query_ab_f_result
+ else {
+ unlink($root_path . $dest_path_project_files . $query_ab_f_result->filename);
+ $query = "UPDATE {cfd_hackathon_submitted_abstracts_file} SET filename = :filename, filepath=:filepath, filemime=:filemime, filesize=:filesize, timestamp=:timestamp WHERE proposal_id = :proposal_id AND filetype = :filetype";
+ $args = array(
+ ":filename" => $_FILES['files']['name'][$file_form_name],
+ ":filepath" => $file_path . $_FILES['files']['name'][$file_form_name],
+ ":filemime" => mime_content_type($root_path . $dest_path_project_files . $_FILES['files']['name'][$file_form_name]),
+ ":filesize" => $_FILES['files']['size'][$file_form_name],
+ ":timestamp" => time(),
+ ":proposal_id" => $proposal_id,
+ ":filetype" => $file_type,
+ );
+ db_query($query, $args, array('return' => Database::RETURN_INSERT_ID,
+ ));
+
+ drupal_set_message($file_name . ' file updated successfully.', 'status');
+ }
+ } //move_reuploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
+ else {
+ drupal_set_message('Error reuploading file : ' . $dest_path_project_files . $file_name, 'error');
+ }
+ break;
+ } //$file_type
+ } //$file_name
+ } //$_FILES['files']['name'] as $file_form_name => $file_name
+ /* sending email */
+ $email_to = $user->mail;
+ $from = variable_get('cfd_hackathon_from_email', '');
+ $bcc = variable_get('cfd_hackathon_emails', '');
+ $cc = variable_get('cfd_hackathon_cc_emails', '');
+ $params['abstract_reuploaded']['proposal_id'] = $proposal_id;
+ $params['abstract_reuploaded']['submitted_abstract_id'] = $submitted_abstract_id;
+ $params['abstract_reuploaded']['user_id'] = $user->uid;
+ $params['abstract_reuploaded']['headers'] = array(
+ 'From' => $from,
+ 'MIME-Version' => '1.0',
+ 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+ 'Content-Transfer-Encoding' => '8Bit',
+ 'X-Mailer' => 'Drupal',
+ 'Cc' => $cc,
+ 'Bcc' => $bcc,
+ );
+ if (!drupal_mail('cfd_hackathon_submissions', 'abstract_uploaded', $email_to, language_default(), $params, $from, true)) {
+ drupal_set_message('Error sending email message.', 'error');
+ }
+
+ drupal_goto('cfd-hackathon/my-submissions');
+}
+function _hackathon_default_value_for_reuploaded_files($filetype, $proposal_id)
+{
+ $query = db_select('cfd_hackathon_submitted_abstracts_file');
+ $query->fields('cfd_hackathon_submitted_abstracts_file');
+ $query->condition('proposal_id', $proposal_id);
+ $selected_files_array = "";
+ if ($filetype == "S") {
+ $query->condition('filetype', $filetype);
+ $filetype_q = $query->execute()->fetchObject();
+ return $filetype_q;
+ } elseif ($filetype == "A") {
+ $query->condition('filetype', $filetype);
+ $filetype_q = $query->execute()->fetchObject();
+ return $filetype_q;
+ }
+ return;
+}
\ No newline at end of file
diff --git a/settings.inc b/settings.inc
index c30a607..108062b 100644
--- a/settings.inc
+++ b/settings.inc
@@ -82,6 +82,15 @@ function cfd_hackathon_submissions_settings_form($form, $form_state)
'#maxlength' => 255,
'#required' => TRUE,
'#default_value' => variable_get('cfd_hackathon_last_date', '')
+ );
+ $form['extensions']['cfd_hackathon_report_resubmission_date'] = array(
+ '#type' => 'textfield',
+ '#title' => t('CFD Hackathon Report Resubmission date'),
+ '#description' => t('For eg: 2022-02-28 23:59:59.0, enter in this format'),
+ '#size' => 50,
+ '#maxlength' => 255,
+ '#required' => TRUE,
+ '#default_value' => variable_get('cfd_hackathon_report_resubmission_date', '')
);
$form['submit'] = array(
'#type' => 'submit',
@@ -104,5 +113,6 @@ function cfd_hackathon_submissions_settings_form_submit($form, &$form_state)
variable_set('list_of_available_projects_file', $form_state['values']['list_of_available_projects_file']);
variable_set('cfd_hackathon_start_date', $form_state['values']['cfd_hackathon_start_date']);
variable_set('cfd_hackathon_last_date', $form_state['values']['cfd_hackathon_last_date']);
+ variable_set('cfd_hackathon_report_resubmission_date', $form_state['values']['cfd_hackathon_report_resubmission_date']);
drupal_set_message(t('Settings updated'), 'status');
}
--
cgit
From b0d80e9ae7e177d5103b45047b6bdcd6983aea6f Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Tue, 5 Dec 2023 18:20:55 +0530
Subject: Update email template
---
email.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/email.inc b/email.inc
index b96c3bf..8613780 100644
--- a/email.inc
+++ b/email.inc
@@ -312,7 +312,7 @@ FOSSEE,IIT Bombay', array(
$proposal_user_data = $user_q->fetchObject();
$user_data = user_load($params['cfd_hackathon_submissions_proposal_resubmit']['user_id']);
$message['headers'] = $params['cfd_hackathon_submissions_proposal_resubmit']['headers'];
- $message['subject'] = t('[!site_name][OpenFOAM hackathon] Your uploaded files have been marked for resubmission', array(
+ $message['subject'] = t('[!site_name][OpenFOAM hackathon] Upload your report', array(
'!site_name' => variable_get('site_name', ''),
), array(
'language' => $language->language,
@@ -321,7 +321,7 @@ FOSSEE,IIT Bombay', array(
'body' => t('
Dear ' . $proposal_user_data->contributor_name . ',
-Kindly resubmit the abstract file for the project title: ' . $proposal_data->project_title . '
+This is to inform you that the submission interface will be open till 09/12/2023 midnight. Please submit a report with the methodology and results in the submission portal for the evaluation.
Best Wishes,
--
cgit
From c8acf84a47cd5be86dc35fdc94da5f5391bd5cc9 Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Tue, 5 Dec 2023 18:34:31 +0530
Subject: Update last date and report template in email content
---
email.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/email.inc b/email.inc
index 8613780..26773ef 100644
--- a/email.inc
+++ b/email.inc
@@ -321,12 +321,14 @@ FOSSEE,IIT Bombay', array(
'body' => t('
Dear ' . $proposal_user_data->contributor_name . ',
-This is to inform you that the submission interface will be open till 09/12/2023 midnight. Please submit a report with the methodology and results in the submission portal for the evaluation.
+This is to inform you that the submission interface will be open till 10/12/2023(Sunday) midnight. Please submit a report with the methodology and results in the submission portal for the evaluation.
+
+Please refer to the report template' . l('here','https://hackathon.fossee.in/cfd/static/cms/uploads/pdf/report_template.pdf') . '
Best Wishes,
!site_name Team,
-FOSSEE,IIT Bombay', array(
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name,
), array(
--
cgit
From 9acc5d5158de695ddc6d026384e1754619811fbe Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Tue, 5 Dec 2023 18:57:55 +0530
Subject: Update Url to report template
---
email.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/email.inc b/email.inc
index 26773ef..f4e3b53 100644
--- a/email.inc
+++ b/email.inc
@@ -323,7 +323,7 @@ Dear ' . $proposal_user_data->contributor_name . ',
This is to inform you that the submission interface will be open till 10/12/2023(Sunday) midnight. Please submit a report with the methodology and results in the submission portal for the evaluation.
-Please refer to the report template' . l('here','https://hackathon.fossee.in/cfd/static/cms/uploads/pdf/report_template.pdf') . '
+Please refer to the report template ' . l('here','https://hackathon.fossee.in/cfd/static/cms/uploads/pdf/report_template.pdf') . '
Best Wishes,
--
cgit