From 3fba4bb9b289f37c246588683413b6eb9e5b5d15 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 20 Jan 2017 15:28:14 +0530 Subject: added the chapter name edit option and traker mail for every edit --- js/selection.js | 9 ++ js/textbook_companion_fixer.js | 134 +++++++++++++++---- textbook_companion_fixer.module | 238 ++++++++++++++++++++++++---------- textbook_companion_fixer_email.inc | 154 ++++++++++++++++++++++ textbook_companion_fixer_settings.inc | 58 +++++++++ 5 files changed, 501 insertions(+), 92 deletions(-) create mode 100644 textbook_companion_fixer_email.inc create mode 100644 textbook_companion_fixer_settings.inc diff --git a/js/selection.js b/js/selection.js index 639afe5..6488c73 100755 --- a/js/selection.js +++ b/js/selection.js @@ -14,6 +14,8 @@ function getSelectionText(divID) { } return selectedText; } + + (function($) { $(document).ready(function() { $(".fix-caption-code").mousedown(function() { @@ -23,5 +25,12 @@ function getSelectionText(divID) { quotedText = getSelectionText("#fix-caption-code"); $("#edit-caption").val(quotedText); }); + $("#edit-example").mousedown(function() { + $("#edit-caption").val(""); + }); + $("#edit-example").mouseup(function() { + quotedText = $('option:selected', this).attr("data-exampleid"); + $("#edit-caption").val(quotedText); + }); }); })(jQuery); diff --git a/js/textbook_companion_fixer.js b/js/textbook_companion_fixer.js index 0ad82ad..d7b617e 100755 --- a/js/textbook_companion_fixer.js +++ b/js/textbook_companion_fixer.js @@ -35,6 +35,8 @@ } $(".select-book").hide(); $(".select-chapter").hide(); + $(".enter-chapter-name").hide(); + $(".chapter-example-chk").hide(); $(".select-example").hide(); $(".enter-caption").hide(); $(".example-code-edit").hide(); @@ -46,14 +48,18 @@ if (category_id < 1) { $(".select-book").hide(); $(".select-chapter").hide(); + $(".enter-chapter-name").hide(); $(".select-example").hide(); $(".enter-caption").hide(); + $(".chapter-example-chk").hide(); $(".example-code-edit").hide(); (".well").hide(); $(".update-button").hide(); } else { $(".select-book").show(); $(".select-chapter").hide(); + $(".enter-chapter-name").hide(); + $(".chapter-example-chk").hide(); $(".select-example").hide(); $(".enter-caption").hide(); $(".example-code-edit").hide(); @@ -76,12 +82,16 @@ $(".select-chapter").hide(); $(".select-example").hide(); $(".enter-caption").hide(); + $(".enter-chapter-name").hide(); + $(".chapter-example-chk").hide(); $(".example-code-edit").hide(); $(".well").hide(); $(".update-button").hide(); } else { $(".select-chapter").show(); $(".select-example").hide(); + $(".enter-chapter-name").hide(); + $(".chapter-example-chk").hide(); $(".enter-caption").hide(); $(".example-code-edit").hide(); $(".well").hide(); @@ -98,18 +108,24 @@ }); $chapter.change(function() { reset("example", "caption"); + var chapter_name = $('option:selected', this).attr("data-chaptername"); var chapter_id = $(this).val(); if (chapter_id < 1) { $(".select-example").hide(); $(".enter-caption").hide(); + $(".enter-chapter-name").hide(); + $(".chapter-example-chk").hide(); $(".example-code-edit").hide(); $(".well").hide(); $(".update-button").hide(); } else { $(".select-example").show(); + $(".enter-chapter-name").show(); + $(".chapter-example-chk").show(); + $("#edit-chapter-name").val(chapter_name); $(".enter-caption").hide(); $(".example-code-edit").hide(); - $(".update-button").hide(); + $(".update-button").show(); } $.ajax({ url: modPath + "ajax/chapter/" + chapter_id, @@ -121,9 +137,10 @@ }); }); $example.change(function() { + reset("caption"); var example_id = $(this).val(); + var example_name = $('option:selected', this).attr("data-exampleid"); var example_caption = $(this).text(); - reset("caption"); if (example_id < 1) { $(".enter-caption").hide(); // $("#edit-caption").val(""); @@ -132,7 +149,7 @@ $(".update-button").hide(); } else { $(".enter-caption").show(); - // $("#edit-caption").val(example_caption); + $("#edit-caption").val(example_name); $(".example-code-edit").show(); $(".well").show(); $(".update-button").show(); @@ -158,33 +175,100 @@ } }); }); + //edit caption form submit $caption_form.submit(function(e) { var example_id = $example.val(); - if (example_id != "0") { - var caption = $caption.val(); - caption = caption.trim(); - if (caption == '') { - alert('Please enter new caption '); - return false; + var chapter_id = $('option:selected', $chapter).attr("data-chapterid"); + if ($('.chapter-caption-chk').prop('checked') == true && $( + '.example-caption-chk').prop('checked') == true) { + if (example_id != "0" && chapter_id != "0") { + var caption = $caption.val(); + caption = caption.trim(); + var chapter_caption = $("#edit-chapter-name").val(); + chapter_caption = chapter_caption.trim(); + if (caption == '' || chapter_caption =='') { + alert('Please enter new caption '); + return false; + } + $updating.show(); + $.ajax({ + url: modPath + "ajax/update-both/", + type: "POST", + data: { + example_id: example_id, + caption: caption, + chapter_id: chapter_id, + chapter_caption: chapter_caption + }, + dataType: "html", + success: function(data) { + $chapter.trigger("change"); + $book.trigger("change"); + $updating.hide(); + $done.show(); + $done.fadeOut("slow"); + } + }); + } else { + alert("No entry is selected.") } - $updating.show(); - $.ajax({ - url: modPath + "ajax/update/", - type: "POST", - data: { - example_id: example_id, - caption: caption - }, - dataType: "html", - success: function(data) { - $chapter.trigger("change"); - $updating.hide(); - $done.show(); - $done.fadeOut("slow"); + } else if ($('.example-caption-chk').prop('checked') == true) { + if (example_id != "0") { + var caption = $caption.val(); + caption = caption.trim(); + if (caption == '') { + alert('Please enter new caption '); + return false; } - }); + $updating.show(); + $.ajax({ + url: modPath + "ajax/update-example/", + type: "POST", + data: { + example_id: example_id, + caption: caption + }, + dataType: "html", + success: function(data) { + $chapter.trigger("change"); + $updating.hide(); + $done.show(); + $done.fadeOut("slow"); + } + }); + } else { + alert("No example selected.") + } + } else if ($('.chapter-caption-chk').prop('checked') == true) { + if (chapter_id != "0") { + var chapter_caption = $("#edit-chapter-name").val(); + chapter_caption = chapter_caption.trim(); + if (chapter_caption == '') { + alert('Please enter new caption '); + return false; + } + $updating.show(); + $.ajax({ + url: modPath + "ajax/update-chapter/", + type: "POST", + data: { + chapter_id: chapter_id, + chapter_caption: chapter_caption + }, + dataType: "html", + success: function(data) { + $chapter.trigger("change"); + $book.trigger("change"); + $updating.hide(); + $done.show(); + $done.fadeOut("slow"); + } + }); + } else { + alert("No example selected.") + } } else { - alert("No example selected.") + alert("Please select the checkbox option") } e.preventDefault(); }); diff --git a/textbook_companion_fixer.module b/textbook_companion_fixer.module index cfecdd5..1686c61 100755 --- a/textbook_companion_fixer.module +++ b/textbook_companion_fixer.module @@ -1,4 +1,5 @@ TRUE, "type" => MENU_CALLBACK ); + /* for admin */ + $items['admin/settings/textbook_companion_fixer_settings'] = array( + 'title' => 'textbook companion fixer Settings', + 'description' => 'Textbook Companion Fixer Settings', + 'page callback' => 'drupal_get_form', + 'page arguments' => array( + 'textbook_companion_fixer_settings_form' + ), + 'access arguments' => array( + 'administer textbook companion fixer settings' + ), + 'type' => MENU_NORMAL_ITEM, + 'file' => 'textbook_companion_fixer_settings.inc' + ); return $items; } function textbook_companion_fixer_permission() @@ -73,10 +88,13 @@ function textbook_companion_fixer_permission() 'restrict access' => TRUE ), "fix scilab_code_caption" => array( - "title" => t("fix scilab code caption"), - 'restrict access' => TRUE - ) - + "title" => t("fix scilab code caption"), + 'restrict access' => TRUE + ), + "administer textbook companion fixer settings" => array( + "title" => t("administer textbook companion fixer settings"), + 'restrict access' => TRUE + ) ); } function scilab_fixer_caption_form($form, &$form_state) @@ -91,7 +109,7 @@ function scilab_fixer_caption_form($form, &$form_state) $form["wrapper"]["category"] = array( "#type" => "select", "#title" => t("Please select the category"), - '#options' => _tbc_fixer_list_of_category(), + '#options' => _tbc_fixer_list_of_category() ); $form["wrapper"]["book"] = array( "#type" => "select", @@ -111,9 +129,21 @@ function scilab_fixer_caption_form($form, &$form_state) "#prefix" => "
", "#suffix" => "
" ); + $form["wrapper"]["chapter_name"] = array( + "#type" => "textfield", + "#title" => t("Enter new chapter name"), + "#size" => 255, + "#maxlength" => 255, + "#attributes" => array( + "Style" => "width:100%" + ), + "#prefix" => "
", + "#suffix" => "
" + ); $form["wrapper"]["example"] = array( "#type" => "select", "#title" => t("Please select the example"), + "#description" => t("*Double click on example caption you want to edit"), "#options" => array( 0 => "Please select a example" ), @@ -123,9 +153,22 @@ function scilab_fixer_caption_form($form, &$form_state) $form["wrapper"]["caption"] = array( "#type" => "textfield", "#title" => t("Enter new caption"), + "#attributes" => array( + "Style" => "width:100%" + ), + "#size" => 255, + "#maxlength" => 255, "#prefix" => "
", "#suffix" => "
" ); + $form["wrapper"]["chapter_example"] = array( + "#markup" => " + Update Chapter caption
+ + Update Example caption", + "#prefix" => "
", + "#suffix" => "
" + ); $form["wrapper"]["submit"] = array( "#type" => "submit", "#value" => "Update", @@ -135,7 +178,9 @@ function scilab_fixer_caption_form($form, &$form_state) $form["wrapper"]["code_wrapper"] = array( "#type" => "fieldset", "#description" => t("No code to display"), - "#attributes" =>array("onclick" => "return check();"), + "#attributes" => array( + "onclick" => "return check();" + ), "#prefix" => "
",
 		"#suffix" => "
" ); @@ -156,8 +201,8 @@ function scilab_fixer_caption_all() function scilab_fixer_ajax($item, $key) { $data = ""; - if ($item == "category" && $key) - { + global $user; + if ($item == "category" && $key) { /* $query = " SELECT pre.id AS id, pre.book, pre.author FROM textbook_companion_preference pre LEFT JOIN textbook_companion_proposal pro ON pro.id = pre.proposal_id @@ -178,13 +223,11 @@ function scilab_fixer_ajax($item, $key) $query->orderBy('pre.book', 'ASC'); $result = $query->execute(); $data .= ""; - while ($row = $result->fetchObject()) - { + while ($row = $result->fetchObject()) { $data .= ""; } //$row = $result->fetchObject() } //$item == "category" && $key - else if ($item == "book" && $key) - { + else if ($item == "book" && $key) { /*$query = "SELECT * FROM {textbook_companion_chapter} WHERE preference_id = %d ORDER BY number"; $result = db_query($query, $key);*/ $query = db_select('textbook_companion_chapter'); @@ -193,13 +236,11 @@ function scilab_fixer_ajax($item, $key) $query->orderBy('number', 'ASC'); $result = $query->execute(); $data .= ""; - while ($row = $result->fetchObject()) - { - $data .= ""; + while ($row = $result->fetchObject()) { + $data .= ""; } //$row = $result->fetchObject() } //$item == "book" && $key - else if ($item == "chapter" && $key) - { + else if ($item == "chapter" && $key) { /*$query = "SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d ORDER BY number"; $result = db_query($query, $key);*/ $query = db_select('textbook_companion_example'); @@ -208,13 +249,11 @@ function scilab_fixer_ajax($item, $key) $query->orderBy('number', 'ASC'); $result = $query->execute(); $data .= ""; - while ($row = $result->fetchObject()) - { - $data .= ""; + while ($row = $result->fetchObject()) { + $data .= ""; } //$row = $result->fetchObject() } //$item == "chapter" && $key - else if ($item == "example" && $key) - { + else if ($item == "example" && $key) { /*$query = " SELECT * FROM textbook_companion_example_files fil LEFT JOIN textbook_companion_example exa ON exa.id = fil.example_id @@ -234,8 +273,7 @@ function scilab_fixer_ajax($item, $key) $data .= "
{$row->caption}
"; $data .= "
{$example}
"; } //$item == "example" && $key - else if ($item == "update") - { + else if ($item == "update-example") { $example_id = $_POST["example_id"]; $caption = $_POST["caption"]; /*$query = " @@ -251,9 +289,95 @@ function scilab_fixer_ajax($item, $key) $query->condition('id', $example_id); $result = $query->execute(); $data .= "Updated"; + /* sending email */ + $email_to = $user->mail; + $from = variable_get('textbook_companion_from_email', ''); + $bcc = variable_get('textbook_companion_fixer_bcc_emails', ''); + $cc = variable_get('textbook_companion_fixer_cc_emails', ''); + $params['example_updated']['example_id'] = $example_id; + $params['example_updated']['user_id'] = $user->uid; + $params['example_updated']['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('textbook_companion_fixer', 'example_updated', $email_to, language_default(), $params, $from, TRUE)) { + $data .= 'Error sending email message.'; + } //!drupal_mail('textbook_companion_fixer', 'example_updated', $email_to, language_default(), $params, $from, TRUE) + } //$item == "update-example" + else if ($item == "update-chapter") { + $chapter_id = $_POST["chapter_id"]; + $chapter_caption = $_POST["chapter_caption"]; + $query_chapter = db_update('textbook_companion_chapter'); + $query_chapter->fields(array( + 'name' => $chapter_caption + )); + $query_chapter->condition('id', $chapter_id); + $result_chapter = $query_chapter->execute(); + $data .= "Updated"; + /* sending email */ + $email_to = $user->mail; + $from = variable_get('textbook_companion_from_email', ''); + $bcc = variable_get('textbook_companion_fixer_bcc_emails', ''); + $cc = variable_get('textbook_companion_fixer_cc_emails', ''); + $params['chapter_updated']['chapter_id'] = $chapter_id; + $params['chapter_updated']['user_id'] = $user->uid; + $params['chapter_updated']['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('textbook_companion_fixer', 'chapter_updated', $email_to, language_default(), $params, $from, TRUE)) { + $data .= 'Error sending email message.'; + } //!drupal_mail('textbook_companion_fixer', 'chapter_updated', $email_to, language_default(), $params, $from, TRUE) + } //$item == "update-chapter" + else if ($item == "update-both") { + $example_id = $_POST["example_id"]; + $caption = $_POST["caption"]; + $chapter_id = $_POST["chapter_id"]; + $chapter_caption = $_POST["chapter_caption"]; + $query_exmaple = db_update('textbook_companion_example'); + $query_exmaple->fields(array( + 'caption' => $caption + )); + $query_exmaple->condition('id', $example_id); + $result_example = $query_exmaple->execute(); + $query_chapter = db_update('textbook_companion_chapter'); + $query_chapter->fields(array( + 'name' => $chapter_caption + )); + $query_chapter->condition('id', $chapter_id); + $result_chapter = $query_chapter->execute(); + $data .= "Updated"; + /* sending email */ + $email_to = $user->mail; + $from = variable_get('textbook_companion_from_email', ''); + $bcc = variable_get('textbook_companion_fixer_bcc_emails', ''); + $cc = variable_get('textbook_companion_fixer_cc_emails', ''); + $params['example_updated']['example_id'] = $example_id; + $params['example_updated']['user_id'] = $user->uid; + $params['example_updated']['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('textbook_companion_fixer', 'chapter_example_updated', $email_to, language_default(), $params, $from, TRUE)) { + $data .= 'Error sending email message.'; + } //!drupal_mail('textbook_companion_fixer', 'chapter_example_updated', $email_to, language_default(), $params, $from, TRUE) } //$item == "update" - else if ($item == "code" && $key) - { + else if ($item == "code" && $key) { $code = $_POST["code"]; /*$query = " SELECT * FROM textbook_companion_example_files @@ -271,8 +395,7 @@ function scilab_fixer_ajax($item, $key) file_put_contents($example_path, $code); $data .= "updated"; } //$item == "code" && $key - else if ($item == "ind-ed" && $key) - { + else if ($item == "ind-ed" && $key) { $query = " UPDATE textbook_companion_aicte SET ind = !ind @@ -284,8 +407,7 @@ function scilab_fixer_ajax($item, $key) db_query($query, $args); $data .= "updated"; } //$item == "ind-ed" && $key - else - { + else { $data = ""; } echo $data; @@ -294,8 +416,7 @@ function scilab_fixer_ajax($item, $key) function scilab_fixer_aicte_ajax($item = "", $key = "") { $data = ""; - if ($item == "selected") - { + if ($item == "selected") { $query = " UPDATE textbook_companion_aicte SET selected = !selected @@ -378,24 +499,20 @@ function scilab_fixer_aicte_form($form, $form_state, $aicte_id = '') } function scilab_fixer_aicte_form_validate($form, &$form_state) { - if (!$form_state["values"]["category"]) - { + if (!$form_state["values"]["category"]) { form_set_error("category", "Please select a category."); } //!$form_state["values"]["category"] - if (!is_numeric($form_state["values"]["edition"])) - { + if (!is_numeric($form_state["values"]["edition"])) { form_set_error("edition", "Only digits are allowed."); } //!is_numeric($form_state["values"]["edition"]) - if (!is_numeric($form_state["values"]["year"]) && strlen($form["values"]["year"]) != 4) - { + if (!is_numeric($form_state["values"]["year"]) && strlen($form["values"]["year"]) != 4) { form_set_error("year", "Please enter a valid year. eg: 2011."); } //!is_numeric($form_state["values"]["year"]) && strlen($form["values"]["year"]) != 4 } function scilab_fixer_aicte_form_submit($form, &$form_state) { $v = $form_state["values"]; - if ($v["aicte_id"]) - { + if ($v["aicte_id"]) { /*$query = " UPDATE textbook_companion_aicte SET book = '%s', author = '%s', category = %d, @@ -421,8 +538,7 @@ function scilab_fixer_aicte_form_submit($form, &$form_state) $num_updated = $query->execute(); drupal_set_message("Book updated successfully", "status"); } //$v["aicte_id"] - else - { + else { $query = " INSERT INTO textbook_companion_aicte (book, author, category, isbn, publisher, edition, year) @@ -452,13 +568,11 @@ function scilab_fixer_aicte_all() function scilab_fixer_aicte_edit_all($aicte_id = 0) { $page_content = ""; - if ($aicte_id) - { + if ($aicte_id) { $scilab_fixer_aicte_form = drupal_get_form("scilab_fixer_aicte_form", $aicte_id); $page_content .= drupal_render($scilab_fixer_aicte_form); } //$aicte_id - else - { + else { /*$query = " SELECT * FROM textbook_companion_aicte ORDER BY time DESC @@ -475,20 +589,17 @@ function scilab_fixer_aicte_edit_all($aicte_id = 0) "Action" ); $rows = array(); - while ($row = $result->fetchObject()) - { + while ($row = $result->fetchObject()) { $item = array( "{$row->book}", "{$row->author}", "{$row->edition}", l(t("Edit"), "fix/aicte/edit/{$row->id}") ); - if ($row->selected) - { + if ($row->selected) { $check = ""; } //$row->selected - else - { + else { $check = ""; } array_push($item, $check); @@ -518,8 +629,7 @@ function scilab_fixer_aicte_in_all() "Action" ); $rows = array(); - while ($row = $result->fetchObject()) - { + while ($row = $result->fetchObject()) { $item = array( "data" => array( "{$row->book}
by{$row->author}", @@ -536,16 +646,13 @@ function scilab_fixer_aicte_in_all() ) ); /* ind-ed link */ - if ($row->ind) - { + if ($row->ind) { array_push($item["data"], l("Unmark", "", $ind_options)); } //$row->ind - else - { + else { array_push($item["data"], l("Mark", "", $ind_options)); } - if ($row->ind) - { + if ($row->ind) { $item["class"] .= " orange"; } //$row->ind array_push($rows, $item); @@ -568,7 +675,7 @@ function scilab_fixer_code_form($form, &$form_state) $form["code_edit"]["category"] = array( "#type" => "select", "#title" => t("Please select the category"), - '#options' => _tbc_fixer_list_of_category(), + '#options' => _tbc_fixer_list_of_category() ); $form["code_edit"]["book"] = array( "#type" => "select", @@ -626,23 +733,20 @@ function scilab_fixer_code_all() function _tbc_fixer_list_of_category($category_id = NULL) { $category[0] = "Please select"; - if ($category_id == NULL) - { + if ($category_id == NULL) { $query = db_select('list_of_category'); $query->fields('list_of_category'); $query->orderBy('id', 'ASC'); $category_list = $query->execute(); } //$category_id == NULL - else - { + else { $query = db_select('list_of_category'); $query->fields('list_of_category'); $query->condition('category_id', $category_id); $query->orderBy('id', 'ASC'); $category_list = $query->execute(); } - while ($category_list_data = $category_list->fetchObject()) - { + while ($category_list_data = $category_list->fetchObject()) { $category[$category_list_data->category_id] = $category_list_data->category_name; } //$category_list_data = $category_list->fetchObject() return $category; diff --git a/textbook_companion_fixer_email.inc b/textbook_companion_fixer_email.inc new file mode 100644 index 0000000..38df00b --- /dev/null +++ b/textbook_companion_fixer_email.inc @@ -0,0 +1,154 @@ +fields('textbook_companion_example'); + $query->condition('id', $params['chapter_example_updated']['example_id']); + $query->range(0, 1); + $result = $query->execute(); + $example_data = $result->fetchObject(); + $query = db_select('textbook_companion_chapter'); + $query->fields('textbook_companion_chapter'); + $query->condition('id', $example_data->chapter_id); + $query->range(0, 1); + $result = $query->execute(); + $chapter_data = $result->fetchObject(); + $query = db_select('textbook_companion_preference'); + $query->fields('textbook_companion_preference'); + $query->condition('id', $chapter_data->preference_id); + $query->range(0, 1); + $result = $query->execute(); + $preference_data = $result->fetchObject(); + $user_data = user_load($params['chapter_example_updated']['user_id']); + $message['headers'] = $params['chapter_example_updated']['headers']; + $message['subject'] = t('[!site_name][Textbook companion] You have updated chapter, example caption for textbook ' . $preference_data->book, array( + '!site_name' => variable_get('site_name', '') + ), array( + 'language' => $language->language + )); + $message['body'] = array( + 'body' => t(' +Dear !user_name, + +You have updated the following example: + +Title of the book : ' . $preference_data->book . ' +Title of the chapter : ' . $chapter_data->name . ' +Example number : ' . $example_data->number . ' +Caption : ' . $example_data->caption . ' + + +Best Wishes, + +Scilab TBC Team, +FOSSEE, IIT Bombay', array( + '!site_name' => variable_get('site_name', ''), + '!user_name' => $user_data->name + ), array( + 'language' => $language->language + )) + ); + break; + case 'chapter_updated': + + $query = db_select('textbook_companion_chapter'); + $query->fields('textbook_companion_chapter'); + $query->condition('id', $params['chapter_updated']['chapter_id']);; + $query->range(0, 1); + $result = $query->execute(); + $chapter_data = $result->fetchObject(); + $query = db_select('textbook_companion_preference'); + $query->fields('textbook_companion_preference'); + $query->condition('id', $chapter_data->preference_id); + $query->range(0, 1); + $result = $query->execute(); + $preference_data = $result->fetchObject(); + $user_data = user_load($params['chapter_updated']['user_id']); + $message['headers'] = $params['chapter_updated']['headers']; + $message['subject'] = t('[!site_name][Textbook companion] You have updated chapter name for textbook ' . $preference_data->book, array( + '!site_name' => variable_get('site_name', '') + ), array( + 'language' => $language->language + )); + $message['body'] = array( + 'body' => t(' +Dear !user_name, + +You have updated the following example: + +Title of the book : ' . $preference_data->book . ' +Title of the chapter : ' . $chapter_data->name . ' + +Best Wishes, + +Scilab TBC Team, +FOSSEE, IIT Bombay', array( + '!site_name' => variable_get('site_name', ''), + '!user_name' => $user_data->name + ), array( + 'language' => $language->language + )) + ); + break; + case 'example_updated': + $query = db_select('textbook_companion_example'); + $query->fields('textbook_companion_example'); + $query->condition('id', $params['example_updated']['example_id']); + $query->range(0, 1); + $result = $query->execute(); + $example_data = $result->fetchObject(); + $query = db_select('textbook_companion_chapter'); + $query->fields('textbook_companion_chapter'); + $query->condition('id', $example_data->chapter_id); + $query->range(0, 1); + $result = $query->execute(); + $chapter_data = $result->fetchObject(); + $query = db_select('textbook_companion_preference'); + $query->fields('textbook_companion_preference'); + $query->condition('id', $chapter_data->preference_id); + $query->range(0, 1); + $result = $query->execute(); + $preference_data = $result->fetchObject(); + $user_data = user_load($params['example_updated']['user_id']); + $message['headers'] = $params['example_updated']['headers']; + $message['subject'] = t('[!site_name][Textbook companion] You have updated example caption for textbook ' . $preference_data->book, array( + '!site_name' => variable_get('site_name', '') + ), array( + 'language' => $language->language + )); + $message['body'] = array( + 'body' => t(' +Dear !user_name, + +You have updated the following example: + +Title of the book : ' . $preference_data->book . ' +Title of the chapter : ' . $chapter_data->name . ' +Example number : ' . $example_data->number . ' +Caption : ' . $example_data->caption . ' + + +Best Wishes, + +Scilab TBC Team, +FOSSEE, IIT Bombay', array( + '!site_name' => variable_get('site_name', ''), + '!user_name' => $user_data->name + ), array( + 'language' => $language->language + )) + ); + break; + } //$key +} diff --git a/textbook_companion_fixer_settings.inc b/textbook_companion_fixer_settings.inc new file mode 100644 index 0000000..25af64c --- /dev/null +++ b/textbook_companion_fixer_settings.inc @@ -0,0 +1,58 @@ + 'textfield', + '#title' => t('(To) Notification emails'), + '#description' => t('A comma separated list of email addresses to receive notifications emails'), + '#size' => 50, + '#maxlength' => 255, + '#required' => TRUE, + '#default_value' => variable_get('textbook_companion_fixer_to_emails', '') + ); + $form['bcc_emails'] = array( + '#type' => 'textfield', + '#title' => t('(BCc) Notification emails'), + '#description' => t('Specify emails id for BCC option of mail system with comma separated'), + '#size' => 50, + '#maxlength' => 255, + '#required' => TRUE, + '#default_value' => variable_get('textbook_companion_fixer_bcc_emails', '') + ); + $form['cc_emails'] = array( + '#type' => 'textfield', + '#title' => t('(Cc) Notification emails'), + '#description' => t('Specify emails id for CC option of mail system with comma separated'), + '#size' => 50, + '#maxlength' => 255, + '#required' => TRUE, + '#default_value' => variable_get('textbook_companion_fixer_cc_emails', '') + ); + $form['from_email'] = array( + '#type' => 'textfield', + '#title' => t('(From) Outgoing from email address'), + '#description' => t('Email address to be display in the from field of all outgoing messages'), + '#size' => 50, + '#maxlength' => 255, + '#required' => TRUE, + '#default_value' => variable_get('textbook_companion_fixer_from_email', '') + ); + + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit') + ); + return $form; +} +function textbook_companion_fixer_settings_form_validate($form, &$form_state) +{ + return; +} +function textbook_companion_fixer_settings_form_submit($form, &$form_state) +{ + variable_set('textbook_companion_fixer_to_emails', $form_state['values']['to_emails']); + variable_set('textbook_companion_fixer_bcc_emails', $form_state['values']['bcc_emails']); + variable_set('textbook_companion_fixer_cc_emails', $form_state['values']['cc_emails']); + variable_set('textbook_companion_fixer_from_email', $form_state['values']['from_email']); +} -- cgit From ccad5925edd8bf1821e53411f0644a00abd2331a Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Tue, 24 Jan 2017 11:07:47 +0530 Subject: aaded new validation for captions --- js/textbook_companion_fixer.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/js/textbook_companion_fixer.js b/js/textbook_companion_fixer.js index d7b617e..b655b05 100755 --- a/js/textbook_companion_fixer.js +++ b/js/textbook_companion_fixer.js @@ -184,8 +184,18 @@ if (example_id != "0" && chapter_id != "0") { var caption = $caption.val(); caption = caption.trim(); + caption = caption.replace(/\s\s+/g, ' '); + if(validateCaption(caption) == true) { + alert('Enter valid text for example caption'); + return false; + } var chapter_caption = $("#edit-chapter-name").val(); - chapter_caption = chapter_caption.trim(); + chapter_caption = chapter_caption.trim(); + chapter_caption = caption.replace(/\s\s+/g, ' '); + if(validateCaption(chapter_caption) == true) { + alert('Enter valid text for chapter caption'); + return false; + } if (caption == '' || chapter_caption =='') { alert('Please enter new caption '); return false; @@ -216,6 +226,11 @@ if (example_id != "0") { var caption = $caption.val(); caption = caption.trim(); + caption = caption.replace(/\s\s+/g, ' '); + if(validateCaption(caption) == true) { + alert('Enter valid text'); + return false; + } if (caption == '') { alert('Please enter new caption '); return false; @@ -242,7 +257,12 @@ } else if ($('.chapter-caption-chk').prop('checked') == true) { if (chapter_id != "0") { var chapter_caption = $("#edit-chapter-name").val(); - chapter_caption = chapter_caption.trim(); + chapter_caption = chapter_caption.trim(); + chapter_caption = caption.replace(/\s\s+/g, ' '); + if(validateCaption(chapter_caption) == true) { + alert('Enter valid text for chapter caption'); + return false; + } if (chapter_caption == '') { alert('Please enter new caption '); return false; @@ -313,6 +333,10 @@ } }); }); + function validateCaption(text){ + var re = /([a-zA-Z|*|_|.|+|-|\\|?|/|!|~|!|@|#|$|%|^|&|(|)|<|>|{|}|;|:|\"|\'|,])\1{2,}/; + return re.test(text); + } /* toggle in edition */ $ind_ed = $(".ind-ed"); $ind_ed.click(function(e) { -- cgit