diff options
| -rwxr-xr-x | abstract_bulk_approval.inc | 17 | ||||
| -rwxr-xr-x | email.inc | 98 | ||||
| -rwxr-xr-x | full_download.inc | 5 |
3 files changed, 47 insertions, 73 deletions
diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc index f9c3242..dc6d62f 100755 --- a/abstract_bulk_approval.inc +++ b/abstract_bulk_approval.inc @@ -134,9 +134,17 @@ function dwsim_flowsheet_abstract_bulk_approval_form_submit($form, &$form_state) Dear !user_name, -Your uploaded abstract for the flowsheeting project has been approved: +Congratulations! +Your DWSIM flowsheet and abstract with the following details have been approved. + +Full Name: ' . $user_info->name_title . ' ' . $user_info->contributor_name . ' +Project Title: ' . $user_info->project_title . ' +Name of compound for which process development is carried out : ' . $user_info->process_development_compound_name . ' + +Kindly send us the internship forms as early as possible for processing your honorarium on time. In case you have already sent these forms, please share the the consignment number or tracking id with us. + +Note: It will take upto 30 days from the time we receive your forms, to process your honorarium. -Title of flowsheeting project : ' . $user_info->project_title . ' Best Wishes, @@ -259,8 +267,11 @@ FOSSEE,IIT Bombay', array( Dear !user_name, -Your all the uploaded flowsheet for the whole flowsheeting project Title : ' . $user_info->project_title . ' have been marked as dis-approved. +We regret to inform you that your DWSIM flowsheet and abstract with the following details have been disapproved: +Full Name: ' . $user_info->name_title . ' ' . $user_info->contributor_name . ' +Project Title: ' . $user_info->project_title . ' +Name of compound for which process development is carried out : ' . $user_info->process_development_compound_name . ' Reason for dis-approval: ' . $form_state['values']['message'] . ' Best Wishes, @@ -16,6 +16,7 @@ function dwsim_flowsheet_mail($key, &$message, $params) $query->condition('id', $params['dwsim_flowsheet_proposal_received']['proposal_id']); $query->range(0, 1); $proposal_data = $query->execute()->fetchObject(); + $phpdate = time( $proposal_data->creation_date ); $user_data = user_load($params['dwsim_flowsheet_proposal_received']['user_id']); if ($proposal_data->project_guide_name == "NULL" || $proposal_data->project_guide_name == "") { @@ -44,27 +45,17 @@ function dwsim_flowsheet_mail($key, &$message, $params) 'body' => t(' Dear !user_name, -We have received your DWSIM Flowsheeting Project proposal with the following details: +Thank you for submitting proposal for the DWSIM Flowsheeting Project. The details of your proposal are as below. -Full Name : ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' -Email : ' . $user_data->mail . ' -Month and Year of Award of Degree : ' . $proposal_data->month_year_of_degree . ' -University/Institute : ' . $proposal_data->university . ' -City : ' . $proposal_data->city . ' -State : ' . $proposal_data->state . ' -Country : ' . $proposal_data->country . ' - -Project Guide : ' . $project_guide_name . ' -Project Guide Email : ' . $project_guide_email_id . ' - -DWSIM Version : ' . $proposal_data->version . ' - -Project Title : ' . $proposal_data->project_title . ' - -Name of compound for which process development is carried out : ' . $proposal_data->process_development_compound_name . ' +Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' +Email: ' . $user_data->mail . ' +University/Institute: ' . $proposal_data->university . ' +City: ' . $proposal_data->city . ' +Project Title: ' . $proposal_data->project_title . ' +Name of compound for which process development is carried out: ' . $proposal_data->process_development_compound_name . ' +Your proposal is under review. You will be notified via email about the approval/disapproval within ten working days. -Your proposal is under review. You will soon receive an email when same has been approved/disapproved. Best Wishes, @@ -84,6 +75,7 @@ FOSSEE,IIT Bombay', array( $query->condition('id', $params['dwsim_flowsheet_proposal_disapproved']['proposal_id']); $query->range(0, 1); $proposal_data = $query->execute()->fetchObject(); + $phpdate = time( $proposal_data->creation_date ); $user_data = user_load($params['dwsim_flowsheet_proposal_disapproved']['user_id']); if ($proposal_data->project_guide_name == "NULL" || $proposal_data->project_guide_name == "") { @@ -111,30 +103,17 @@ FOSSEE,IIT Bombay', array( 'body' => t(' Dear !user_name, -We regret to inform you that your DWSIM Flowsheeting Project proposal with following details have been disapproved: - -Full Name : ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' -Email : ' . $user_data->mail . ' -Month and Year of Award of Degree : ' . $proposal_data->month_year_of_degree . ' -University/Institute : ' . $proposal_data->university . ' -City : ' . $proposal_data->city . ' -State : ' . $proposal_data->state . ' -Country : ' . $proposal_data->country . ' - -Project Guide : ' . $project_guide_name . ' -Project Guide Email : ' . $project_guide_email_id . ' - -DWSIM Version : ' . $proposal_data->version . ' - -Project Title : ' . $proposal_data->project_title . ' - -Name of compound for which process development is carried out : ' . $proposal_data->process_development_compound_name . ' +We regret to inform you that your DWSIM Flowsheeting Project proposal with following details have been disapproved. +Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' +Project Title: ' . $proposal_data->project_title . ' +Name of compound for which process development is carried out: ' . $proposal_data->process_development_compound_name . ' +Reason(s) / Feedback: ' . $proposal_data->dissapproval_reason . ' -Reason for rejection: : ' . $proposal_data->dissapproval_reason . ' +Please note that any files that were uploaded along with the proposal form will be deleted from all our database(s). +Thank you for participating in the DWSIM Flowsheeting Project. You are welcome to submit a new proposal. -You are welcome to submit a new proposal. Best Wishes, @@ -155,6 +134,7 @@ FOSSEE,IIT Bombay', array( $query->range(0, 1); $proposal_data = $query->execute()->fetchObject(); $user_data = user_load($params['dwsim_flowsheet_proposal_approved']['user_id']); + $url = 'http://dwsim.fossee.in/flowsheeting-project/coding-guidelines-flowsheeting'; if ($proposal_data->project_guide_name == "NULL" || $proposal_data->project_guide_name == "") { $project_guide_name = "Not Entered"; @@ -181,25 +161,13 @@ FOSSEE,IIT Bombay', array( 'body' => t(' Dear !user_name, -Your DWSIM Flowsheeting Project proposal with the following details has been approved: +Congratulations! Your proposal for DWSIM Flowsheeting Project with the following details is approved. Full Name : ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' -Email : ' . $user_data->mail . ' -Month and Year of Award of Degree : ' . $proposal_data->month_year_of_degree . ' -University/Institute : ' . $proposal_data->university . ' -City : ' . $proposal_data->city . ' -State : ' . $proposal_data->state . ' -Country : ' . $proposal_data->country . ' - -Project Guide : ' . $project_guide_name . ' -Project Guide Email : ' . $project_guide_email_id . ' - -DWSIM Version : ' . $proposal_data->version . ' - Project Title : ' . $proposal_data->project_title . ' - Name of compound for which process development is carried out : ' . $proposal_data->process_development_compound_name . ' +Please ensure that ALL the guidelines for coding at http://dwsim.fossee.in/flowsheeting-project/coding-guidelines-flowsheeting are strictly followed. Refer http://dwsim.fossee.in/flowsheeting-project/flowsheeting-internship for the further procedure for submission of the project. Kindly ensure that the flowsheet and abstract are submitted within 1 month. You can upload your abstract using abstract submission interface. @@ -248,24 +216,19 @@ FOSSEE,IIT Bombay', array( 'body' => t(' Dear !user_name, -Your DWSIM flowsheet and abstract on the following process have been completed successfully. +Your DWSIM flowsheet and abstract on the following process have been published successfully. Full Name : ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' -Email : ' . $user_data->mail . ' -Month and Year of Award of Degree : ' . $proposal_data->month_year_of_degree . ' -University/Institute : ' . $proposal_data->university . ' -City : ' . $proposal_data->city . ' -State : ' . $proposal_data->state . ' -Country : ' . $proposal_data->country . ' +Project Title : ' . $proposal_data->project_title . ' -Project Guide : ' . $project_guide_name . ' -Project Guide Email : ' . $project_guide_email_id . ' +Kindly access this link to download the same. +http://dwsim.fossee.in/flowsheeting-project/completed-flowsheet -DWSIM Version : ' . $proposal_data->version . ' +You can now download your e-certificate after logging into the DWSIM website: dwsim.fossee.in. On the left-hand side panel, go to User Dashboard > Flowsheet Certificates > Download. In case of any difficulties, kindly let us know. + +Thank you for participating in the DWSIM Flowsheeting Project. You are welcome to propose a new flowsheet. -Project Title : ' . $proposal_data->project_title . ' -Name of compound for which process development is carried out : ' . $proposal_data->process_development_compound_name . ' Best Wishes, !site_name Team, @@ -366,12 +329,13 @@ FOSSEE,IIT Bombay', array( 'body' => t(' Dear !user_name, -You have uploaded the following Abstract: +You have successfully uploaded your DWSIM flowsheet and abstract with the following details. +Full Name : ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . ' Project Title : ' . $proposal_data->project_title . ' +Name of compound for which process development is carried out : ' . $proposal_data->process_development_compound_name . ' - -The abstract is under review. You will be notified when it has been approved. +You shall be notified via email after the flowsheet and abstract are reviewed and approved / disapproved. This may take upto 30 working days. Best Wishes, diff --git a/full_download.inc b/full_download.inc index 15be090..491da4b 100755 --- a/full_download.inc +++ b/full_download.inc @@ -31,7 +31,6 @@ function dwsim_flowsheet_download_full_project() $query->condition('proposal_id', $flowsheet_id); $flowsheet_f_q = $query->execute(); while ($flowsheet_f_row = $flowsheet_f_q->fetchObject()) { - $zip->addFile($root_path . $FLOWSHEET_PATH . '/' . $flowsheet_f_row->filepath, $FLOWSHEET_PATH . str_replace(' ', '_', basename($flowsheet_f_row->filename))); } //$flowsheet_f_row = $flowsheet_f_q->fetchObject() $zip_file_count = $zip->numFiles; @@ -63,7 +62,7 @@ function dwsim_flowsheet_download_full_project() } } //$zip_file_count > 0 else { - drupal_set_message("There are flowsheet project in this proposal to download", 'error'); + drupal_set_message("There are no flowsheet project in this proposal to download", 'error'); drupal_goto('flowsheeting-project/full-download/project'); } } @@ -129,7 +128,7 @@ function dwsim_flowsheet_download_completed_project() } } //$zip_file_count > 0 else { - drupal_set_message("There are flowsheet project in this proposal to download", 'error'); + drupal_set_message("There are no flowsheet project in this proposal to download", 'error'); drupal_goto('flowsheeting-project/dwsim-flowsheet-run'); } } |