summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSashi202020-05-13 18:53:26 +0530
committerSashi202020-05-13 18:53:26 +0530
commit9f3b0b9f49fb6c7ae24d34b8823eb74e26d0f74c (patch)
tree53d41eb2f4ab0e553d353c58023637aaf5a96855
parent02ece72482977b113bfab69371efd1d6802a191c (diff)
downloadr_textbook_companion-9f3b0b9f49fb6c7ae24d34b8823eb74e26d0f74c.tar.gz
r_textbook_companion-9f3b0b9f49fb6c7ae24d34b8823eb74e26d0f74c.tar.bz2
r_textbook_companion-9f3b0b9f49fb6c7ae24d34b8823eb74e26d0f74c.zip
Add email templates when codable examples file is approved/disapproved
-rwxr-xr-xcode_approval.inc34
-rwxr-xr-xtextbook_companion.module82
2 files changed, 98 insertions, 18 deletions
diff --git a/code_approval.inc b/code_approval.inc
index f1a52fe..72539f2 100755
--- a/code_approval.inc
+++ b/code_approval.inc
@@ -1741,13 +1741,13 @@ function codable_examples_approval_form_submit($form, &$form_state){
$query->condition('proposal_id', $ex_data['proposal_id']);
$num_updated = $query->execute();
/* sending email */
- /*$email_to = $user_data->mail;
+ $email_to = $user_data->mail;
$from = variable_get('textbook_companion_from_email', '');
$bcc = variable_get('textbook_companion_emails', '');
$cc = variable_get('textbook_companion_cc_emails', '');
- $param['example_approved']['example_id'] = $ex_data['proposal_id'];
- $param['example_approved']['user_id'] = $user_data->uid;
- $param['example_approved']['headers'] = array(
+ $param['codable_example_approved']['proposal_id'] = $ex_data['proposal_id'];
+ $param['codable_example_approved']['user_id'] = $user_data->uid;
+ $param['codable_example_approved']['headers'] = array(
'From' => $from,
'MIME-Version' => '1.0',
'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
@@ -1755,11 +1755,11 @@ function codable_examples_approval_form_submit($form, &$form_state){
'X-Mailer' => 'Drupal',
'Cc' => $cc,
'Bcc' => $bcc
- );*/
+ );
+ if (!drupal_mail('textbook_companion', 'codable_example_approved', $email_to, language_default(), $param, $from, TRUE))
+ drupal_set_message('Error sending email message.', 'error');
drupal_set_message('File approved.', 'status');
drupal_goto('textbook-companion/code-approval/codable-examples');
- /*if (!drupal_mail('textbook_companion', 'codable_example_approved', $email_to, language_default(), $param, $from, TRUE))
- drupal_set_message('Error sending email message.', 'error');*/
} else if ($ex_data['status_of_codable_example'] == "1") {
/* sending email */
@@ -1767,20 +1767,18 @@ function codable_examples_approval_form_submit($form, &$form_state){
$query->fields(array(
'submitted_codable_examples_file' => 0,
'submited_all_examples_code' => 0,
+ 'approved_codable_example_files' => 0,
));
$query->condition('proposal_id', $ex_data['proposal_id']);
$num_updated = $query->execute();
- /*$email_to = $user_data->mail;
+ $email_to = $user_data->mail;
$from = variable_get('textbook_companion_from_email', '');
$bcc = variable_get('textbook_companion_emails', '');
$cc = variable_get('textbook_companion_cc_emails', '');
- $param['example_disapproved']['preference_id'] = $chapter_data->preference_id;
- $param['example_disapproved']['chapter_id'] = $example_data->chapter_id;
- $param['example_disapproved']['example_number'] = $example_data->number;
- $param['example_disapproved']['example_caption'] = $example_data->caption;
- $param['example_disapproved']['user_id'] = $user_data->uid;
- $param['example_disapproved']['message'] = $ex_data['message'];
- $param['example_disapproved']['headers'] = array(
+ $param['codable_example_approved']['proposal_id'] = $ex_data['proposal_id'];
+ $param['codable_example_approved']['user_id'] = $user_data->uid;
+ $param['codable_example_disapproved']['message'] = $ex_data['message'];
+ $param['codable_example_disapproved']['headers'] = array(
'From' => $from,
'MIME-Version' => '1.0',
'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
@@ -1788,9 +1786,9 @@ function codable_examples_approval_form_submit($form, &$form_state){
'X-Mailer' => 'Drupal',
'Cc' => $cc,
'Bcc' => $bcc
- );*/
- /*if (!drupal_mail('textbook_companion', 'example_disapproved', $email_to, language_default(), $param, $from, TRUE))
- drupal_set_message('Error sending email message.', 'error');*/
+ );
+ if (!drupal_mail('textbook_companion', 'codable_example_disapproved', $email_to, language_default(), $param, $from, TRUE))
+ drupal_set_message('Error sending email message.', 'error');
drupal_set_message('File disapproved and user has been notified of the changes.', 'status');
drupal_goto('textbook-companion/code-approval/codable-examples');
}
diff --git a/textbook_companion.module b/textbook_companion.module
index 012c998..d51936f 100755
--- a/textbook_companion.module
+++ b/textbook_companion.module
@@ -2476,6 +2476,88 @@ FOSSEE, IIT Bombay', array(
))
);
break;
+ case 'codable_example_approved':
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['codable_example_approved']['example_id']);
+ $example_data = db_fetch_object($example_q);*/
+ $query = db_select('textbook_companion_codable_example_files');
+ $query->fields('textbook_companion_codable_example_files');
+ $query->condition('proposal_id', $params['codable_example_approved']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $codable_example_data = $result->fetchObject();
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $codable_example_data->proposal_id);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference_data = $result->fetchObject();
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $preference_data->proposal_id);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data = $result->fetchObject();
+ $user_data = user_load($params['codable_example_approved']['user_id']);
+ $message['headers'] = $params['codable_example_approved']['headers'];
+ $message['subject'] = t('[!site_name][Textbook Companion] Your codable solved examples document has been approved', array(
+ '!site_name' => variable_get('site_name', '')
+ ));
+ $message['body'] = array(
+ 'body' => t('
+Dear ' . $proposal_data->full_name . ',
+
+Congratulations! Your codable examples document has been approved. As you have now coded all of the codable solved examples of your proposed textbook, we shall begin with reviewing your TBC codes.
+Best Wishes,
+
+!site_name Team,
+FOSSEE, IIT Bombay', array(
+ '!site_name' => variable_get('site_name', ''),
+ '!user_name' => $user_data->name
+ ))
+ );
+ break;
+ case 'codable_example_disapproved':
+ $user_data = user_load($params['codable_example_disapproved']['user_id']);
+ $query = db_select('textbook_companion_codable_example_files');
+ $query->fields('textbook_companion_codable_example_files');
+ $query->condition('proposal_id', $params['codable_example_approved']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $codable_example_data = $result->fetchObject();
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $codable_example_data->proposal_id);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference_data = $result->fetchObject();
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $preference_data->proposal_id);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data = $result->fetchObject();
+ $message['headers'] = $params['codable_example_disapproved']['headers'];
+ $message['subject'] = t('[!site_name][Textbook Companion] Your codable solved examples document has been disapproved', array(
+ '!site_name' => variable_get('site_name', '')
+ ));
+ $message['body'] = array(
+ 'body' => t('
+Dear ' . $proposal_data->full_name . ',
+
+Unfortunately, it seems like you have not coded all of the codable solved examples from your proposed textbook. Kindly address the below-mentioned comments and reupload the document after making necessary changes.
+
+Reason for dis-approval: ' . $params['codable_example_disapproved']['message'] . '
+
+Best Wishes,
+
+!site_name Team,
+FOSSEE, IIT Bombay', array(
+ '!site_name' => variable_get('site_name', ''),
+ '!user_name' => $user_data->name
+ ))
+ );
+ break;
case 'example_deleted_user':
$user_data = user_load($params['example_deleted_user']['user_id']);