Update email templates

5 files changed, 237 insertions, 112 deletions

diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc
index 1ef13df..1ee7dec 100644
--- a/abstract_bulk_approval.inc
+++ b/abstract_bulk_approval.inc
@@ -7,7 +7,7 @@ function scilab_case_study_abstract_bulk_approval_form($form, &$form_state)
 	$form = array();
 	$form['case_study_project'] = array(
 		'#type' => 'select',
-		'#title' => t('Title of the case study project'),
+		'#title' => t('Title of the Case Study Project'),
 		'#options' => _bulk_list_of_case_study_project(),
 		'#default_value' => $selected,
 		'#ajax' => array(
@@ -18,7 +18,7 @@ function scilab_case_study_abstract_bulk_approval_form($form, &$form_state)
 	);
 	$form['case_study_actions'] = array(
 		'#type' => 'select',
-		'#title' => t('Please select action for case study project'),
+		'#title' => t('Please select action for Case Study Project'),
 		'#options' => _bulk_list_case_study_actions(),
 		'#default_value' => 0,
 		'#prefix' => '<div id="ajax_selected_case_study_action" style="color:red;">',
@@ -125,48 +125,7 @@ function scilab_case_study_abstract_bulk_approval_form_submit($form, &$form_stat
 							':submitted_abstract_id' => $abstract_data->id
 						));
 					} //$abstract_data = $abstracts_q->fetchObject()
-					drupal_set_message(t('Approved case study project. Use the checkbox below to publish this case study on the completed case studies page.'), 'status');
-					// email 
-					$email_subject = t('[!site_name][case study Project] Your uploaded case study project have been approved', array(
-						'!site_name' => variable_get('site_name', '')
-					));
-					$email_body = array(
-						0 => t('
-
-Dear !user_name,
-
-Your uploaded abstract for the case study project has been approved:
-
-Title of case study project  : ' . $user_info->project_title . '
-
-Best Wishes,
-
-!site_name Team,
-FOSSEE,IIT Bombay', array(
-							'!site_name' => variable_get('site_name', ''),
-							'!user_name' => $user_data->name
-						))
-					);
-					/** sending email when everything done **/
-					$email_to = $user_data->mail;
-					$from = variable_get('case_study_from_email', '');
-					$bcc = variable_get('case_study_emails', '');
-					$cc = variable_get('case_study_cc_emails', '');
-					$params['standard']['subject'] = $email_subject;
-					$params['standard']['body'] = $email_body;
-					$params['standard']['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('scilab_case_study', 'standard', $email_to, language_default(), $params, $from, TRUE))
-					{
-						$msg = drupal_set_message('Error sending email message.', 'error');
-					} //!drupal_mail('scilab_case_study', 'standard', $email_to, language_default(), $params, $from, TRUE)
+					drupal_set_message(t('Approved Case Study Project. Use the checkbox below to publish this case study on the completed case studies page.'), 'status');
 					drupal_goto('case-study-project/manage-proposal/status/' . $form_state['values']['case_study_project']);
 				} //$form_state['values']['case_study_actions'] == 1
 				elseif ($form_state['values']['case_study_actions'] == 2)
@@ -194,13 +153,13 @@ FOSSEE,IIT Bombay', array(
 					} //$abstract_data = $abstracts_q->fetchObject()
 					drupal_set_message(t('Resubmit the project files'), 'status');
 					// email 
-					$email_subject = t('[!site_name][case study Project] Your uploaded case study project have been marked as pending', array(
+					$email_subject = t('[!site_name][Case Study Project] Your uploaded Case Study Project have been marked as pending', array(
 						'!site_name' => variable_get('site_name', '')
 					));
 					$email_body = array(
 						0 => t('
 
-Dear !user_name,
+Dear ' . $user_info->contributor_name . ',
 
 Kindly resubmit the project files for the project : ' . $user_info->project_title . '.
 
@@ -236,7 +195,7 @@ FOSSEE,IIT Bombay', array(
 						drupal_set_message('Error sending email message.', 'error');
 					} //!drupal_mail('scilab_case_study', 'standard', $email_to, language_default(), $params, $from, TRUE)
 				} //$form_state['values']['case_study_actions'] == 2
-				elseif ($form_state['values']['case_study_actions'] == 3) //disapprove and delete entire case study project
+				elseif ($form_state['values']['case_study_actions'] == 3) //disapprove and delete entire Case Study Project
 				{
 					if (strlen(trim($form_state['values']['message'])) <= 30)
 					{
@@ -251,15 +210,15 @@ FOSSEE,IIT Bombay', array(
 					} //!user_access('case_study bulk delete code')
 					if (scilab_case_study_abstract_delete_project($form_state['values']['case_study_project'])) //////
 					{
-						drupal_set_message(t('Dis-Approved and Deleted Entire case study project.'), 'status');
-						$email_subject = t('[!site_name][case study Project] Your uploaded case study project have been marked as dis-approved', array(
+						drupal_set_message(t('Dis-Approved and Deleted Entire Case Study Project.'), 'status');
+						$email_subject = t('[!site_name][Case Study Project] Your uploaded Case Study Project have been marked as dis-approved', array(
 						'!site_name' => variable_get('site_name', '')
 					));
 					$email_body = array(
 						0 => t('
-Dear !user_name,
+Dear ' . $user_info->contributor_name . ',
 
-Your uploaded case study project files for the case study project Title : ' . $user_info->project_title . ' have been marked as dis-approved.
+Your uploaded Case Study Project files for the Case Study Project Title : ' . $user_info->project_title . ' have been marked as dis-approved.
 
 Reason for dis-approval: ' . $form_state['values']['message'] . '
 
@@ -293,7 +252,7 @@ FOSSEE,IIT Bombay', array(
 					} //case_study_abstract_delete_project($form_state['values']['case_study_project'])
 					else
 					{
-						drupal_set_message(t('Error Dis-Approving and Deleting Entire case study project.'), 'error');
+						drupal_set_message(t('Error Dis-Approving and Deleting Entire Case Study Project.'), 'error');
 					}
 					// email 
 					
@@ -326,10 +285,10 @@ function _bulk_list_case_study_actions()
 	$case_study_actions = array(
 		0 => 'Please select...'
 	);
-	$case_study_actions[1] = 'Approve Entire case study Project';
+	$case_study_actions[1] = 'Approve Entire Case Study Project';
 	$case_study_actions[2] = 'Resubmit Project files';
-	$case_study_actions[3] = 'Dis-Approve Entire case study Project (This will delete case study Project)';
-	//$case_study_actions[4] = 'Delete Entire case study Project Including Proposal';
+	$case_study_actions[3] = 'Dis-Approve Entire Case Study Project (This will delete Case Study Project)';
+	//$case_study_actions[4] = 'Delete Entire Case Study Project Including Proposal';
 	return $case_study_actions;
 }
 function _case_study_details($case_study_proposal_id)
@@ -394,9 +353,9 @@ function _case_study_details($case_study_proposal_id)
 		$url = l('Upload abstract', 'case-study-project/abstract-code/upload');
 		$abstracts_query_process_filename = "File not uploaded";
 	}
-	$download_case_study = l('Download case study project','case-study-project/full-download/project/'.$case_study_proposal_id);
+	$download_case_study = l('Download Case Study Project','case-study-project/full-download/project/'.$case_study_proposal_id);
 	$return_html .= '<strong>Proposer Name:</strong><br />' . $abstracts_pro->name_title . ' ' . $abstracts_pro->contributor_name . '<br /><br />';
-	$return_html .= '<strong>Title of the case study Project:</strong><br />' . $abstracts_pro->project_title . '<br /><br />';
+	$return_html .= '<strong>Title of the Case Study Project:</strong><br />' . $abstracts_pro->project_title . '<br /><br />';
 	$return_html .= '<strong>Uploaded an abstract (brief outline) of the project:</strong><br />' . $abstract_filename . '<br /><br />';
 	$return_html .= '<strong>Uploaded Case Directory Folder:</strong><br />' . $abstracts_query_process_filename . '<br /><br />';
 	$return_html .= $download_case_study;
diff --git a/email.inc b/email.inc
index f33c885..ba2a75e 100644
--- a/email.inc
+++ b/email.inc
@@ -17,16 +17,16 @@ function scilab_case_study_mail($key, &$message, $params)
             $proposal_data = $query->execute()->fetchObject();
             $user = user_load($params['case_study_proposal_received']['user_id']);
             $message['headers'] = $params['case_study_proposal_received']['headers'];
-            $message['subject'] = t('[!site_name][Case Study Project] Your  Case Study Project proposal has been received', array(
+            $message['subject'] = t('[!site_name][Case Study Project] Your Case Study Project proposal has been received', array(
                 '!site_name' => variable_get('site_name', ''),
             ), array(
                 'language' => $language->language,
             ));
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
-We have received your  Case Study Project proposal with the following details:
+We have received your Case Study Project proposal with the following details:
 
 Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '
 Email: ' . $user->mail . '
@@ -41,7 +41,6 @@ Expected Date of Completion: ' . date('d/m/Y', $proposal_data->expected_date_of_
 Your proposal is under review. You will soon receive an email when same has been approved/disapproved.
 
 Best Wishes,
-
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
@@ -61,16 +60,16 @@ FOSSEE, IIT Bombay', array(
             $user_data = user_load($params['case_study_proposal_disapproved']['user_id']);
             //$user = user_load($params['case_study_proposal']['name']);
             $message['headers'] = $params['case_study_proposal_disapproved']['headers'];
-            $message['subject'] = t('[!site_name][Case Study Project] Your  Case Study Project proposal has been disapproved', array(
+            $message['subject'] = t('[!site_name][Case Study Project] Your Case Study Project proposal has been disapproved', array(
                 '!site_name' => variable_get('site_name', ''),
             ), array(
                 'language' => $language->language,
             ));
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
-We regret to inform you that your  Case Study proposal with following details have been disapproved:
+We regret to inform you that your Case Study proposal with following details have been disapproved:
 
 Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '
 Email: ' . $user_data->mail . '
@@ -88,7 +87,6 @@ Reason for rejection: ' . $proposal_data->dissapproval_reason . '
 You are welcome to submit a new proposal.
 
 Best Wishes,
-
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
@@ -100,7 +98,7 @@ FOSSEE, IIT Bombay', array(
             break;
         case 'case_study_proposal_approved':
             /* initializing data */
-            $url = 'http://scilab.in/case-study-project/abstract-code';
+            $url = 'https://scilab.in/case-study-project/abstract-code';
             $query = db_select('case_study_proposal');
             $query->fields('case_study_proposal');
             $query->condition('id', $params['case_study_proposal_approved']['proposal_id']);
@@ -108,16 +106,16 @@ FOSSEE, IIT Bombay', array(
             $proposal_data = $query->execute()->fetchObject();
             $user_data = user_load($params['case_study_proposal_approved']['user_id']);
             $message['headers'] = $params['case_study_proposal_approved']['headers'];
-            $message['subject'] = t('[!site_name][Case Study Project] Your  Case Study Project proposal has been approved', array(
+            $message['subject'] = t('[!site_name][Case Study Project] Your Case Study Project proposal has been approved', array(
                 '!site_name' => variable_get('site_name', ''),
             ), array(
                 'language' => $language->language,
             ));
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
-Your  Case Study Project proposal with the following details has been approved:
+Your Case Study Project proposal with the following details has been approved:
 
 Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '
 Email: ' . $user_data->mail . '
@@ -131,8 +129,8 @@ Expected Date of Completion: ' . date('d/m/Y', $proposal_data->expected_date_of_
 
 
 You can upload your project files at: ' . $url . '
-Best Wishes,
 
+Best Wishes,
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
@@ -144,6 +142,7 @@ FOSSEE, IIT Bombay', array(
             break;
         case 'case_study_proposal_completed':
             /* initializing data */
+            $url = 'https://scilab.in/case-study-project/completed-case-studies';
             $query = db_select('case_study_proposal');
             $query->fields('case_study_proposal');
             $query->condition('id', $params['case_study_proposal_completed']['proposal_id']);
@@ -151,16 +150,16 @@ FOSSEE, IIT Bombay', array(
             $proposal_data = $query->execute()->fetchObject();
             $user_data = user_load($params['case_study_proposal_completed']['user_id']);
             $message['headers'] = $params['case_study_proposal_completed']['headers'];
-            $message['subject'] = t('[!site_name][Case Study Project] Your  Case Study Project proposal has been completed', array(
+            $message['subject'] = t('[!site_name][Case Study Project] Your case study project has been approved and marked as completed', array(
                 '!site_name' => variable_get('site_name', ''),
             ), array(
                 'language' => $language->language,
             ));
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
-Your  Case Study and abstract on the following process have been completed successfully.
+We are glad to inform that your files are approved and the Case Study Project with the following details is marked Completed. The case study is published at ' . $url . '
 
 Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '
 Email: ' . $user_data->mail . '
@@ -169,6 +168,39 @@ City: ' . $proposal_data->city . '
 State: ' . $proposal_data->state . '
 Country: ' . $proposal_data->country . '
 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 'case_study_proposal_send_reminder_mail':
+            /* initializing data */
+            $query = db_select('case_study_proposal');
+            $query->fields('case_study_proposal');
+            $query->condition('id', $params['case_study_proposal_send_reminder_mail']['proposal_id']);
+            $query->range(0, 1);
+            $proposal_data = $query->execute()->fetchObject();
+            $user_data = user_load($params['case_study_proposal_send_reminder_mail']['user_id']);
+            $message['headers'] = $params['case_study_proposal_send_reminder_mail']['headers'];
+            $message['subject'] = t('[!site_name][Case Study Project] Completion date of your proposed Case Study is approaching', array(
+                '!site_name' => variable_get('site_name', ''),
+            ), array(
+                'language' => $language->language,
+            ));
+            $message['body'] = array(
+                'body' => t('
+Dear ' . $proposal_data->contributor_name . ',
+
+This is a gentle reminder regarding the proposed case study project. The submission deadline is approaching, and we kindly request you to complete your submission before the deadline.
+
+Please note that once the deadline passes, the interface will no longer accept submissions. Ensure you submit your work on time to avoid any inconvenience.
+
 Best Wishes,
 
 !site_name Team,
@@ -189,16 +221,16 @@ FOSSEE, IIT Bombay', array(
             $proposal_data = $query->execute()->fetchObject();
             $user_data = user_load($params['case_study_proposal_deleted']['user_id']);
             $message['headers'] = $params['case_study_proposal_deleted']['headers'];
-            $message['subject'] = t('[!site_name][Case Study Project] Your  Case Study Project proposal has been deleted', array(
+            $message['subject'] = t('[!site_name][Case Study Project] Your Case Study Project proposal has been deleted', array(
                 '!site_name' => variable_get('site_name', ''),
             ), array(
                 'language' => $language->language,
             ));
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
-Your  Case Study Project proposal with the following details has been deleted :
+We regret to inform that your Case Study Project proposal with the following details has been deleted:
 
 Full Name: ' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '
 Email: ' . $user_data->mail . '
@@ -211,7 +243,6 @@ Project Title: ' . $proposal_data->project_title . '
 You can propose a new Case Study project.
 
 Best Wishes,
-
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
@@ -239,7 +270,7 @@ FOSSEE, IIT Bombay', array(
             $message['headers'] = $params['abstract_uploaded']['headers'];
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
 You have uploaded the following Abstract and Project files:
 
@@ -249,7 +280,6 @@ Project Title: ' . $proposal_data->project_title . '
 The abstract and project files are under review. You will be notified when it has been approved.
 
 Best Wishes,
-
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
@@ -280,14 +310,13 @@ FOSSEE, IIT Bombay', array(
             $message['headers'] = $params['abstract_edit_file_uploaded']['headers'];
             $message['body'] = array(
                 'body' => t('
-Dear' . $proposal_data->contributor_name . ',
+Dear ' . $proposal_data->contributor_name . ',
 
 You have updated the abstract/ project files for the following case study:
 
 Project Title: ' . $proposal_data->project_title . '
 
 Best Wishes,
-
 !site_name Team,
 FOSSEE, IIT Bombay', array(
                     '!site_name' => variable_get('site_name', ''),
diff --git a/manage_proposal.inc b/manage_proposal.inc
index e4f88ae..2fe10d3 100644
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -84,7 +84,7 @@ function scilab_case_study_proposal_all()
             $approval_date,
             $actual_completion_date,
             $approval_status,
-            l('Status', 'case-study-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'case-study-project/manage-proposal/edit/' . $proposal_data->id),
+            l('Status', 'case-study-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'case-study-project/manage-proposal/edit/' . $proposal_data->id) . ' | ' . l('Send Reminder Mail', 'case-study-project/manage-proposal/send-reminder-mail/' . $proposal_data->id),
         );
     } //$proposal_data = $proposal_q->fetchObject()
     /* check if there are any pending proposals */
@@ -201,13 +201,13 @@ function scilab_case_study_proposal_approval_form($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }
     if ($proposal_data->faculty_name == '') {
@@ -337,7 +337,7 @@ function scilab_case_study_proposal_approval_form($form, &$form_state)
     }
     $form['approval'] = array(
         '#type' => 'radios',
-        '#title' => t('CFD Case Study proposal'),
+        '#title' => t('Select an action for the case study'),
         '#options' => array(
             '1' => 'Approve',
             '2' => 'Disapprove',
@@ -366,7 +366,7 @@ function scilab_case_study_proposal_approval_form($form, &$form_state)
     );
     $form['cancel'] = array(
         '#type' => 'item',
-        '#markup' => l(t('Cancel'), 'case-study-project/manage-proposal'),
+        '#markup' => l(t('Cancel'), 'case-study-project/manage-proposal/all'),
     );
     return $form;
 }
@@ -393,13 +393,13 @@ function scilab_case_study_proposal_approval_form_submit($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }
     if ($form_state['values']['approval'] == 1) {
@@ -432,7 +432,7 @@ function scilab_case_study_proposal_approval_form_submit($form, &$form_state)
         }
 
         drupal_set_message('Case Study with the proposal No. ' . $proposal_id . ' has been approved and the user is notified of the approval via email.', 'status');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     } //$form_state['values']['approval'] == 1
     else if ($form_state['values']['approval'] == 2) {
@@ -466,7 +466,7 @@ function scilab_case_study_proposal_approval_form_submit($form, &$form_state)
         }
 
         drupal_set_message('Case Study with the proposal No. ' . $proposal_id . ' is dis-approved and the useris notified of the dis-approval via email.', 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     } //$form_state['values']['approval'] == 2
 }
@@ -493,13 +493,13 @@ function scilab_case_study_proposal_status_form($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }
     if ($proposal_data->faculty_name == '') {
@@ -697,13 +697,13 @@ function scilab_case_study_proposal_status_form_submit($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }
     /* set the book status to completed */
@@ -741,9 +741,9 @@ function scilab_case_study_proposal_status_form_submit($form, &$form_state)
             drupal_set_message('Error sending email message.', 'error');
         }
 
-        drupal_set_message('Congratulations! CFD Case Study proposal has been marked as completed. User has been notified of the completion.', 'status');
+        drupal_set_message('Scilab Case Study proposal has been marked as completed. User has been notified of the completion.', 'status');
     }
-    drupal_goto('case-study-project/manage-proposal');
+    drupal_goto('case-study-project/manage-proposal/all');
     return;
 
 }
@@ -767,13 +767,13 @@ function scilab_case_study_proposal_edit_form($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }*/
     $user_data = user_load($proposal_data->uid);
@@ -973,7 +973,7 @@ function scilab_case_study_proposal_edit_form($form, &$form_state)
     );
     $form['cancel'] = array(
         '#type' => 'item',
-        '#markup' => l(t('Cancel'), 'case-study-project/manage-proposal'),
+        '#markup' => l(t('Cancel'), 'case-study-project/manage-proposal/all'),
     );
     return $form;
 }
@@ -996,13 +996,13 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state)
         } //$proposal_data = $proposal_q->fetchObject()
         else {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         }
     } //$proposal_q
     else {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-        drupal_goto('case-study-project/manage-proposal');
+        drupal_goto('case-study-project/manage-proposal/all');
         return;
     }
     /* delete proposal */
@@ -1034,7 +1034,7 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state)
             $query->condition('id', $proposal_id);
             $num_deleted = $query->execute();
             drupal_set_message(t('Proposal Deleted'), 'status');
-            drupal_goto('case-study-project/manage-proposal');
+            drupal_goto('case-study-project/manage-proposal/all');
             return;
         } //rrmdir_project($proposal_id) == TRUE
     } //$form_state['values']['delete_proposal'] == 1
@@ -1091,3 +1091,121 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state)
     $result = db_query($query, $args);
     drupal_set_message(t('Proposal Updated'), 'status');
 }
+
+
+/******************************************************************************/
+/*************************** Reminder mail about the proposal *****************************/
+/******************************************************************************/
+function scilab_case_study_proposal_send_reminder_mail_form($form, &$form_state)
+{
+    global $user;
+    /* get current proposal */
+    $proposal_id = (int) arg(3);
+    $query = db_select('case_study_proposal');
+    $query->fields('case_study_proposal');
+    $query->condition('id', $proposal_id);
+    $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/manage-proposal/all');
+            return;
+        }
+    } //$proposal_q
+    else {
+        drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
+        drupal_goto('case-study-project/manage-proposal/all');
+        return;
+    }
+    $form['contributor_name'] = array(
+        '#type' => 'item',
+        '#markup' => l($proposal_data->name_title . ' ' . $proposal_data->contributor_name, 'user/' . $proposal_data->uid),
+        '#title' => t('Student name'),
+    );
+    $form['student_email_id'] = array(
+        '#title' => t('Contributor Email'),
+        '#type' => 'item',
+        '#markup' => user_load($proposal_data->uid)->mail,
+        '#title' => t('Email'),
+    );
+    $form['contact_no'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->contact_no,
+        '#title' => t('Contact no'),
+    );
+    $form['project_title'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->project_title,
+        '#title' => t('Title of the Case Study Project'),
+    );
+    $form['expected_completion_date'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Expected Date of Completion'),
+        '#default_value' => date('d/m/Y', $proposal_data->expected_date_of_completion),
+        '#disabled' => true,
+    );
+    $form['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Click to send mail to the contributor'),
+    );
+    $form['cancel'] = array(
+        '#type' => 'item',
+        '#markup' => l(t('Cancel'), 'case-study-project/manage-proposal/all'),
+    );
+    return $form;
+}
+function scilab_case_study_proposal_send_reminder_mail_form_submit($form, &$form_state)
+{
+    global $user;
+    /* get current proposal */
+    $proposal_id = (int) arg(3);
+    //$proposal_q = db_query("SELECT * FROM {case_study_proposal} WHERE id = %d", $proposal_id);
+    $query = db_select('case_study_proposal');
+    $query->fields('case_study_proposal');
+    $query->condition('id', $proposal_id);
+    $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/manage-proposal/all');
+            return;
+        }
+    } //$proposal_q
+    else {
+        drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
+        drupal_goto('case-study-project/manage-proposal/all');
+        return;
+    }
+    /* set the book status to completed */
+        /* sending email */
+        $user_data = user_load($proposal_data->uid);
+        $email_to = $user_data->mail;
+        $from = variable_get('case_study_from_email', '');
+        $bcc = $user->mail . ', ' . variable_get('case_study_emails', '');
+        $cc = variable_get('case_study_cc_emails', '');
+        $params['case_study_proposal_send_reminder_mail']['proposal_id'] = $proposal_id;
+        $params['case_study_proposal_send_reminder_mail']['user_id'] = $proposal_data->uid;
+        $params['case_study_proposal_send_reminder_mail']['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('scilab_case_study', 'case_study_proposal_send_reminder_mail', $email_to, language_default(), $params, $from, true)) {
+            drupal_set_message('Error sending email message.', 'error');
+        }
+
+        drupal_set_message('The user has been notified about the last date of submission.', 'status');
+        drupal_goto('case-study-project/manage-proposal/all');
+    return;
+
+}
\ No newline at end of file
diff --git a/scilab_case_study.module b/scilab_case_study.module
index a1ea709..003831f 100644
--- a/scilab_case_study.module
+++ b/scilab_case_study.module
@@ -110,6 +110,19 @@ function scilab_case_study_menu()
         'type' => MENU_CALLBACK,
         'file' => 'manage_proposal.inc',
     );
+    $items['case-study-project/manage-proposal/send-reminder-mail'] = array(
+        'title' => 'Send Reminder to Contriubutor about Proposal Completion Date',
+        'description' => 'Send Reminder to Contriubutor about Proposal Completion Date',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array(
+            'scilab_case_study_proposal_send_reminder_mail_form',
+        ),
+        'access arguments' => array(
+            'Case Study manage proposal',
+        ),
+        'type' => MENU_CALLBACK,
+        'file' => 'manage_proposal.inc',
+    );
     $items['case-study-project/manage-proposal/status'] = array(
         'title' => 'Proposal Status',
         'description' => 'Proposal Status',
diff --git a/upload_code.inc b/upload_code.inc
index 49c2786..b79307a 100644
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -166,11 +166,17 @@ function scilab_case_study_upload_abstract_code_form_validate($form, &$form_stat
     //var_dump($form);die;
     if (isset($_FILES['files'])) {
         /* check if atleast one source or result file is uploaded */
+        $existing_uploaded_A_file = default_value_for_uploaded_files("A", $form_state['values']['prop_id']);
+        $existing_uploaded_S_file = default_value_for_uploaded_files("S", $form_state['values']['prop_id']);
+        if(!$existing_uploaded_A_file){
+            if (!($_FILES['files']['name']['upload_case_study_final_report'])) {
+            form_set_error('upload_case_study_final_report', t('Please upload the final report'));
+        }
+        }
+        if(!$existing_uploaded_S_file){
         if (!($_FILES['files']['name']['upload_case_study_developed_process'])) {
             form_set_error('upload_case_study_developed_process', t('Please upload the case files'));
         }
-        if (!($_FILES['files']['name']['upload_case_study_final_report'])) {
-            form_set_error('upload_case_study_final_report', t('Please upload the final report'));
         }
 
         /* check for valid filename extensions */
@@ -294,10 +300,10 @@ function scilab_case_study_upload_abstract_code_form_submit($form, &$form_state)
                 case 'S':
                     if (file_exists($root_path . $dest_path . $_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(
+                        move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]);
+                        drupal_set_message(t("File !filename already exists, hence overwritten the exisitng file ", array(
                             '!filename' => $_FILES['files']['name'][$file_form_name]
-                        )), 'error');
+                        )), 'status');
                     } //file_exists($root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
                     /* uploading file */
                     else if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
@@ -335,7 +341,7 @@ function scilab_case_study_upload_abstract_code_form_submit($form, &$form_state)
                             $query = "UPDATE {case_study_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],
+                                ":filepath" => $_FILES['files']['name'][$file_form_name],
                                 ":filemime" => mime_content_type($root_path . $dest_path . $_FILES['files']['name'][$file_form_name]),
                                 ":filesize" => $_FILES['files']['size'][$file_form_name],
                                 ":timestamp" => time(),
@@ -354,10 +360,10 @@ function scilab_case_study_upload_abstract_code_form_submit($form, &$form_state)
                 case 'A':
                     if (file_exists($root_path . $dest_path . $_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(
+                        move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]);
+                        drupal_set_message(t("File !filename already exists, hence overwritten the exisitng file ", array(
                             '!filename' => $_FILES['files']['name'][$file_form_name]
-                        )), 'error');
+                        )), 'status');
                     } //file_exists($root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
                     /* uploading file */
                     else if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
@@ -395,7 +401,7 @@ function scilab_case_study_upload_abstract_code_form_submit($form, &$form_state)
                             $query = "UPDATE {case_study_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],
+                                ":filepath" => $_FILES['files']['name'][$file_form_name],
                                 ":filemime" => mime_content_type($root_path . $dest_path . $_FILES['files']['name'][$file_form_name]),
                                 ":filesize" => $_FILES['files']['size'][$file_form_name],
                                 ":timestamp" => time(),