From a2518906fbc1c7e1b3530e76edbbf3975c67d890 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 29 Sep 2019 19:03:14 +0530 Subject: removed unused file --- r_tbc.module | 778 ----------------------------------------------------------- 1 file changed, 778 deletions(-) delete mode 100644 r_tbc.module diff --git a/r_tbc.module b/r_tbc.module deleted file mode 100644 index 3a601d6..0000000 --- a/r_tbc.module +++ /dev/null @@ -1,778 +0,0 @@ - "Edit TBC captions", - "page callback" => "R_fixer_caption_all", - "access arguments" => array( - "fix R_code_caption" - ), - "type" => MENU_NORMAL_ITEM - ); - $items["r_tbc_fixer/aicte"] = array( - "title" => "Add AICTE books", - "page callback" => "R_fixer_aicte_all", - "access arguments" => array( - "fix R" - ), - "weight" => 30, - "type" => MENU_NORMAL_ITEM - ); - $items["r_tbc_fixer/aicte/new"] = array( - "title" => "Add AICTE books", - "page callback" => "R_fixer_aicte_all", - "access arguments" => array( - "fix R" - ), - "weight" => 1, - "type" => MENU_DEFAULT_LOCAL_TASK - ); - $items["r_tbc_fixer/aicte/edit"] = array( - "title" => "Edit AICTE books", - "page callback" => "R_fixer_aicte_edit_all", - "access arguments" => array( - "fix R" - ), - "weight" => 2, - "type" => MENU_LOCAL_TASK - ); - $items["r_tbc_fixer/aicte/in"] = array( - "title" => "Mark Indian edition books", - "page callback" => "R_fixer_aicte_in_all", - "access arguments" => array( - "fix R" - ), - "type" => MENU_CALLBACK - ); - $items["r_tbc_fixer/code"] = array( - "title" => "Edit TBC code", - "page callback" => "R_fixer_code_all", - "access arguments" => array( - "fix R" - ), - "type" => MENU_NORMAL_ITEM - ); - $items["r_tbc_fixer/ajax"] = array( - "page callback" => "R_fixer_ajax", - "access callback" => TRUE, - "type" => MENU_CALLBACK - ); - $items["r_tbc_fixer/aicte/book/ajax"] = array( - "page callback" => "R_fixer_aicte_ajax", - "access callback" => TRUE, - "type" => MENU_CALLBACK - ); - $items["r_tbc_fixer/ajax/edit-book-category"] = array( - "page callback" => "r_tbc_fixer_edit_book_category_ajax", - "access callback" => TRUE, - "type" => MENU_CALLBACK, - "file" => "r_tbc_fixer_edit_book_category.inc" - ); - /* for admin */ - $items['admin/settings/r_tbc_fixer_settings'] = array( - 'title' => 'textbook companion fixer Settings', - 'description' => 'Textbook Companion Fixer Settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array( - 'r_tbc_fixer_settings_form' - ), - 'access arguments' => array( - 'administer textbook companion fixer settings' - ), - 'type' => MENU_NORMAL_ITEM, - 'file' => 'r_tbc_fixer_settings.inc' - ); - // edit book categoery - $items["r_tbc_fixer/edit_book_category"] = array( - "title" => "Edit Completed Books Category", - "page callback" => "r_tbc_fixer_edit_book_proposal_all", - "access arguments" => array( - "fix R_textbook_category" - ), - "type" => MENU_NORMAL_ITEM, - 'file' => 'r_tbc_fixer_edit_book_category.inc' - ); - $items['r_tbc_fixer/category_edit'] = array( - 'title' => 'Categorize', - 'description' => 'Edit Completed Books Category', - 'page callback' => 'drupal_get_form', - 'page arguments' => array( - 'r_tbc_fixer_category_edit_form' - ), - 'access arguments' => array( - 'fix R_textbook_category' - ), - 'type' => MENU_NORMAL_ITEM, - 'file' => 'r_tbc_fixer_edit_book_category.inc' - ); - return $items; -} -function r_tbc_fixer_permission() -{ - return array( - "fix R" => array( - "title" => t("fix R code"), - 'restrict access' => TRUE - ), - "fix R_code_caption" => array( - "title" => t("fix R code caption"), - 'restrict access' => TRUE - ), - "administer textbook companion fixer settings" => array( - "title" => t("administer textbook companion fixer settings"), - 'restrict access' => TRUE - ), - "fix R_textbook_category" => array( - "title" => t("fix R textbook category"), - 'restrict access' => TRUE - ) - ); -} -function R_fixer_caption_form($form, &$form_state) -{ - $form = array(); - $form["wrapper"] = array( - "#type" => "fieldset", - "#title" => "Caption change form", - "#prefix" => "
", - "#suffix" => "
" - ); - $form["wrapper"]["category"] = array( - "#type" => "select", - "#title" => t("Please select the category"), - '#options' => _tbc_fixer_list_of_category() - ); - $form["wrapper"]["book"] = array( - "#type" => "select", - "#title" => t("Please select the book."), - "#options" => array( - 0 => "Please select a book" - ), - "#prefix" => "
", - "#suffix" => "
" - ); - $form["wrapper"]["chapter"] = array( - "#type" => "select", - "#title" => t("Please select the chapter"), - "#options" => array( - 0 => "Please select a chapter" - ), - "#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" - ), - "#prefix" => "
", - "#suffix" => "
" - ); - $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", - "#prefix" => "
", - "#suffix" => "
" - ); - $form["wrapper"]["code_wrapper"] = array( - "#type" => "fieldset", - "#description" => t("No code to display"), - "#attributes" => array( - "onclick" => "return check();" - ), - "#prefix" => "
",
-		"#suffix" => "
" - ); - return $form; -} -function R_fixer_caption_all() -{ - $page_content = ""; - $page_content .= "
"; - $page_content .= "
Updating...
"; - $page_content .= "Done."; - $R_fixer_caption_form = drupal_get_form("R_fixer_caption_form"); - $page_content .= drupal_render($R_fixer_caption_form); - $page_content .= "
"; - $page_content .= "* Selecting text from above code-area with mouse will add it to the caption textbox."; - return $page_content; -} - -function R_fixer_ajax($item, $key) -{ - $data = ""; - 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 - WHERE pro.proposal_status = 3 AND pre.approval_status = 1 AND pre.category = %d - ORDER BY pre.book ASC - "; - $result = db_query($query, $key);*/ - $query = db_select('textbook_companion_preference', 'pre'); - $query->fields('pre', array( - 'id', - 'book', - 'author' - )); - $query->leftJoin('textbook_companion_proposal', 'pro', 'pro.id = pre.proposal_id'); - $query->condition('pro.proposal_status', 3); - $query->condition('pre.approval_status', 1); - $query->condition('pre.category', $key); - $query->orderBy('pre.book', 'ASC'); - $result = $query->execute(); - $data .= ""; - while ($row = $result->fetchObject()) { - $data .= ""; - } //$row = $result->fetchObject() - } //$item == "category" && $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'); - $query->fields('textbook_companion_chapter'); - $query->condition('preference_id', $key); - $query->orderBy('number', 'ASC'); - $result = $query->execute(); - $data .= ""; - while ($row = $result->fetchObject()) { - $data .= ""; - } //$row = $result->fetchObject() - } //$item == "book" && $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'); - $query->fields('textbook_companion_example'); - $query->condition('chapter_id', $key); - $query->orderBy('number', 'ASC'); - $result = $query->execute(); - $data .= ""; - while ($row = $result->fetchObject()) { - $data .= ""; - } //$row = $result->fetchObject() - } //$item == "chapter" && $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 - WHERE example_id = %d - "; - $result = db_query($query, $key);*/ - $query = db_select('textbook_companion_example_files', 'fil'); - $query->fields('fil'); - $query->leftJoin('textbook_companion_example', 'exa', 'exa.id = fil.example_id'); - $query->condition('example_id', $key); - $query->condition('filetype', 'S'); - $query->orderBy('number', 'ASC'); - $result = $query->execute(); - $row = $result->fetchObject(); - /* fetching example file data */ - $uploads_dir = $_SERVER['DOCUMENT_ROOT'] . base_path() . "uploads/"; - $example_path = $uploads_dir . $row->filepath; - $example = file_get_contents($example_path); - $data .= "
{$row->caption}
"; - $data .= "
{$example}
"; - } //$item == "example" && $key - else if ($item == "update-example") { - $example_id = $_POST["example_id"]; - $caption = $_POST["caption"]; - /*$query = " - UPDATE textbook_companion_example - SET caption = '%s' - WHERE id = %d - "; - $result = db_query($query, $caption, $example_id);*/ - $query = db_update('textbook_companion_example'); - $query->fields(array( - 'caption' => $caption - )); - $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('r_tbc_fixer_bcc_emails', ''); - $cc = variable_get('r_tbc_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('r_tbc_fixer', 'example_updated', $email_to, language_default(), $params, $from, TRUE)) { - $data .= 'Error sending email message.'; - } //!drupal_mail('r_tbc_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('r_tbc_fixer_bcc_emails', ''); - $cc = variable_get('r_tbc_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('r_tbc_fixer', 'chapter_updated', $email_to, language_default(), $params, $from, TRUE)) { - $data .= 'Error sending email message.'; - } //!drupal_mail('r_tbc_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('r_tbc_fixer_bcc_emails', ''); - $cc = variable_get('r_tbc_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('r_tbc_fixer', 'chapter_example_updated', $email_to, language_default(), $params, $from, TRUE)) { - $data .= 'Error sending email message.'; - } //!drupal_mail('r_tbc_fixer', 'chapter_example_updated', $email_to, language_default(), $params, $from, TRUE) - } //$item == "update" - else if ($item == "code" && $key) { - $code = $_POST["code"]; - /*$query = " - SELECT * FROM textbook_companion_example_files - WHERE example_id = %d AND filetype = 'S' - "; - $result = db_query($query, $key);*/ - $query = db_select('textbook_companion_example_files'); - $query->fields('textbook_companion_example_files'); - $query->condition('example_id', $key); - $query->condition('filetype', 'S'); - $result = $query->execute(); - $row = $result->fetchObject(); - $uploads_dir = $_SERVER['DOCUMENT_ROOT'] . base_path() . "uploads/"; - $example_path = $uploads_dir . $row->filepath; - file_put_contents($example_path, $code); - $data .= "updated"; - } //$item == "code" && $key - else if ($item == "ind-ed" && $key) { - $query = " - UPDATE textbook_companion_aicte - SET ind = !ind - WHERE id = :id - "; - $args = array( - ":id" => $key - ); - db_query($query, $args); - $data .= "updated"; - } //$item == "ind-ed" && $key - else { - $data = ""; - } - echo $data; - exit(); -} -function R_fixer_aicte_ajax($item = "", $key = "") -{ - $data = ""; - if ($item == "selected") { - $query = " - UPDATE textbook_companion_aicte - SET selected = !selected - WHERE id = :id - "; - $args = array( - ":id" => $key - ); - db_query($query, $args); - $data = "updated"; - } //$item == "selected" - echo $data; - exit(); -} -function R_fixer_aicte_form($form, $form_state, $aicte_id = '') -{ - /*$query = " - SELECT * FROM textbook_companion_aicte - WHERE id = {$aicte_id} - "; - $result = db_query($query);*/ - $query = db_select('textbook_companion_aicte'); - $query->fields('textbook_companion_aicte'); - $query->condition('id', $aicte_id); - $result = $query->execute(); - $row = $result->fetchObject(); - $form = array(); - $form["book"] = array( - "#type" => "textfield", - "#title" => "Book Name", - "#default_value" => $row->book, - "#required" => TRUE - ); - $form["author"] = array( - "#type" => "textfield", - "#title" => "Author", - "#default_value" => $row->author, - "#required" => TRUE - ); - $form["category"] = array( - "#type" => "select", - "#title" => "Book Category", - '#options' => _tbc_fixer_list_of_category(), - "#default_value" => $row->category, - "#required" => TRUE - ); - $form["isbn"] = array( - "#type" => "textfield", - "#title" => "ISBN", - "#default_value" => $row->isbn, - "#required" => FALSE - ); - $form["publisher"] = array( - "#type" => "textfield", - "#title" => "Publisher", - "#default_value" => $row->publisher, - "#required" => TRUE - ); - $form["edition"] = array( - "#type" => "textfield", - "#title" => "Edition", - "#default_value" => $row->edition, - "#required" => TRUE - ); - $form["year"] = array( - "#type" => "textfield", - "#title" => "Year of publication", - "#default_value" => $row->year, - "#required" => TRUE - ); - $form["aicte_id"] = array( - "#type" => "hidden", - "#value" => $row->id - ); - $form["submit"] = array( - "#type" => "submit", - "#value" => "Submit" - ); - return $form; -} -function R_fixer_aicte_form_validate($form, &$form_state) -{ - if (!$form_state["values"]["category"]) { - form_set_error("category", "Please select a category."); - } //!$form_state["values"]["category"] - 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) { - form_set_error("year", "Please enter a valid year. eg: 2011."); - } //!is_numeric($form_state["values"]["year"]) && strlen($form["values"]["year"]) != 4 -} -function R_fixer_aicte_form_submit($form, &$form_state) -{ - $v = $form_state["values"]; - if ($v["aicte_id"]) { - /*$query = " - UPDATE textbook_companion_aicte - SET book = '%s', author = '%s', category = %d, - isbn = '%s', publisher = '%s', edition = %d, - year = %d - WHERE id = %d - "; - $result = db_query($query, - $v["book"], $v["author"], $v["category"], $v["isbn"], - $v["publisher"], $v["edition"], $v["year"], $v["aicte_id"] - );*/ - $query = db_update('textbook_companion_aicte'); - $query->fields(array( - 'book' => $v["book"], - 'author' => $v["author"], - 'category' => $v["category"], - 'isbn' => $v["isbn"], - 'publisher' => $v["publisher"], - 'edition' => $v["edition"], - 'year' => $v["year"] - )); - $query->condition('id', $v["aicte_id"]); - $num_updated = $query->execute(); - drupal_set_message(t('Book updated successfully'), 'status'); - } //$v["aicte_id"] - else { - $query = " - INSERT INTO {textbook_companion_aicte} - (book, author, category, isbn, publisher, edition, year) - VALUES - (:book, :author, :category, :isbn, :publisher, :edition, :year) - "; - $args = array( - ':book' => $v["book"], - ':author' => $v["author"], - ':category' => $v["category"], - ':isbn' => $v["isbn"], - ':publisher' => $v["publisher"], - ':edition' => $v["edition"], - ':year' => $v["year"] - ); - $result = db_query($query, $args); - drupal_set_message(t('Book added successfully'),'status'); - } -} -function R_fixer_aicte_all() -{ - $page_content = ""; - $R_fixer_aicte_form = drupal_get_form("R_fixer_aicte_form"); - $page_content .= drupal_render($R_fixer_aicte_form); - return $page_content; -} -function R_fixer_aicte_edit_all($aicte_id = 0) -{ - $page_content = ""; - if ($aicte_id) { - $R_fixer_aicte_form = drupal_get_form("R_fixer_aicte_form", $aicte_id); - $page_content .= drupal_render($R_fixer_aicte_form); - } //$aicte_id - else { - /*$query = " - SELECT * FROM textbook_companion_aicte - ORDER BY time DESC - "; - $result = db_query($query);*/ - $query = db_select('textbook_companion_aicte'); - $query->fields('textbook_companion_aicte'); - $query->orderBy('time', 'DESC'); - $result = $query->execute(); - $headers = array( - "Book", - "Author", - "Edition", - "Action" - ); - $rows = array(); - while ($row = $result->fetchObject()) { - $item = array( - "{$row->book}", - "{$row->author}", - "{$row->edition}", - l(t("Edit"), "r_tbc_fixer/aicte/edit/{$row->id}") - ); - if ($row->selected) { - $check = ""; - } //$row->selected - else { - $check = ""; - } - array_push($item, $check); - array_push($rows, $item); - } //$row = $result->fetchObject() - //$page_content .= theme("table", $headers, $rows); - $page_content .= theme("table", array( - 'header' => $headers, - 'rows' => $rows - )); - } - return $page_content; -} -function R_fixer_aicte_in_all() -{ - $page_content = ""; - /*$query = " - SELECT * FROM textbook_companion_aicte - "; - $result = db_query($query);*/ - $query = db_select('textbook_companion_aicte'); - $query->fields('textbook_companion_aicte'); - $result = $query->execute(); - $headers = array( - "Book", - "Publisher", - "Action" - ); - $rows = array(); - while ($row = $result->fetchObject()) { - $item = array( - "data" => array( - "{$row->book}
by{$row->author}", - $row->publisher - ) - ); - $ind_options = array( - /* # linking in drupal l() */ - "fragment" => " ", - "external" => TRUE, - "attributes" => array( - "class" => "ind-ed", - "data-aicte" => "{$row->id}" - ) - ); - /* ind-ed link */ - if ($row->ind) { - array_push($item["data"], l("Unmark", "", $ind_options)); - } //$row->ind - else { - array_push($item["data"], l("Mark", "", $ind_options)); - } - if ($row->ind) { - $item["class"] .= " orange"; - } //$row->ind - array_push($rows, $item); - } //$row = $result->fetchObject() - $page_content .= theme('table', array( - 'header' => $headers, - 'rows' => $rows - )); - return $page_content; -} -function R_fixer_code_form($form, &$form_state) -{ - $form = array(); - $form["code_edit"] = array( - "#type" => "fieldset", - "#title" => "Code edit form", - "#prefix" => "
", - "#suffix" => "
" - ); - $form["code_edit"]["category"] = array( - "#type" => "select", - "#title" => t("Please select the category"), - '#options' => _tbc_fixer_list_of_category() - ); - $form["code_edit"]["book"] = array( - "#type" => "select", - "#title" => t("Please select the book."), - "#options" => array( - 0 => "Please select a book" - ), - "#prefix" => "
", - "#suffix" => "
" - ); - $form["code_edit"]["chapter"] = array( - "#type" => "select", - "#title" => t("Please select the chapter"), - "#options" => array( - 0 => "Please select a chapter" - ), - "#prefix" => "
", - "#suffix" => "
" - ); - $form["code_edit"]["example"] = array( - "#type" => "select", - "#title" => t("Please select the example"), - "#options" => array( - 0 => "Please select a example" - ), - "#prefix" => "
", - "#suffix" => "
" - ); - $form["code_edit"]["code"] = array( - "#type" => "textarea", - "#title" => t("Code Editor"), - '#resizable' => FALSE, - "#prefix" => "
", - "#suffix" => "
" - ); - $form["code_edit"]["submit"] = array( - "#type" => "submit", - "#value" => "Update", - "#prefix" => "
", - "#suffix" => "
" - ); - return $form; -} -function R_fixer_code_all() -{ - $page_content = ""; - $page_content .= "
"; - $page_content .= "
Updating...
"; - $page_content .= "Done."; - $R_fixer_code_form = drupal_get_form("R_fixer_code_form"); - $page_content .= drupal_render($R_fixer_code_form); - $page_content .= "
"; - return $page_content; -} - -function r_tbc_fixer_init() -{ - drupal_add_css(drupal_get_path("module", "r_tbc_fixer") . "/css/r_tbc_fixer.css"); - drupal_add_js(drupal_get_path("module", "r_tbc_fixer") . "/js/r_tbc_fixer.js"); - drupal_add_js(drupal_get_path("module", "r_tbc_fixer") . "/js/r_tbc_fixer_edit_category.js"); - //drupal_add_js(drupal_get_path("module", "R_fixer") . "/js/jquery-noconfilct.js"); - drupal_add_js(drupal_get_path("module", "r_tbc_fixer") . "/js/selection.js"); -} -- cgit From 729236392ac31e22be78a53905aab6b3d4082613 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 29 Sep 2019 23:08:10 +0530 Subject: fixed category issue --- r_tbc_fixer_edit_book_category.inc | 43 +++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/r_tbc_fixer_edit_book_category.inc b/r_tbc_fixer_edit_book_category.inc index 1b87af7..a3f3619 100755 --- a/r_tbc_fixer_edit_book_category.inc +++ b/r_tbc_fixer_edit_book_category.inc @@ -2,20 +2,21 @@ function r_tbc_fixer_edit_book_proposal_all() { //get the book count - $result = db_query("SELECT COUNT( pe.book ) AS book_count FROM {textbook_companion_preference} pe LEFT JOIN {textbook_companion_proposal} po ON pe.proposal_id = po.id WHERE pe.approval_status =1 "); + $result = db_query("SELECT COUNT( pe.book ) AS book_count FROM {textbook_companion_preference} pe INNER JOIN {textbook_companion_proposal} po ON pe.proposal_id = po.id"); $row = $result->fetchObject(); $book_count = $row->book_count; $i = 1; /* get preference */ $preference_q = db_query("SELECT pe.id as pref_id, pe.book as book, pe.author as author, pe.publisher as publisher, pe.year as year, pe.id as pe_id, po.approval_date as approval_date, po.proposal_status - FROM {textbook_companion_preference} pe LEFT JOIN {textbook_companion_proposal} po ON pe.proposal_id = po.id - WHERE pe.approval_status = 1 ORDER BY po.proposal_status ASC"); + FROM {textbook_companion_preference} pe INNER JOIN {textbook_companion_proposal} po ON pe.proposal_id = po.id + ORDER BY po.proposal_status ASC"); while ($preference_data = $preference_q->fetchObject()) { $proposal_rows[] = array( $i, "{$preference_data->book}
by {$preference_data->author}", - get_proposal_status($preference_data->proposal_status), + get_proposal_status($preference_data->proposal_status), + _user_proposal_selected_category($preference_data->pref_id), _tbc_fixer_list_of_new_category($preference_data->pref_id), l('Edit', 'r_tbc_fixer/category_edit/' . $preference_data->pref_id) ); @@ -32,6 +33,7 @@ function r_tbc_fixer_edit_book_proposal_all() 'No.', 'Title of the Book', 'Proposal Status', + 'User selected category', 'Current Category', 'Action' ); @@ -285,11 +287,11 @@ function _r_tbc_fixer_list_of_category($category_id) $category .= ""; $query = db_select('list_of_category'); $query->fields('list_of_category'); - $query->condition('id', $category_id); + $query->condition('category_id', $category_id); $category_list = $query->execute(); while ($category_list_data = $category_list->fetchObject()) { - $category = $category_list_data->category_name; + $category = $category_list_data->maincategory; } //$category_list_data = $category_list->fetchObject() return $category; } @@ -299,8 +301,8 @@ function _tbc_fixer_list_of_new_category($pref_id) $main_category_query = " SELECT distinct(maincategory) FROM {list_of_category} loc - LEFT JOIN {textbook_companion_book_main_subcategories} tcbms ON loc.category_id = tcbms.main_category - LEFT JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category + INNER JOIN {textbook_companion_book_main_subcategories} tcbms ON loc.category_id = tcbms.main_category + INNER JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category WHERE tcbms.pref_id = :pref_id ORDER BY loc.category_id "; $args = array( @@ -314,9 +316,9 @@ function _tbc_fixer_list_of_new_category($pref_id) $sub_category_query = " SELECT DISTINCT (los.subcategory) FROM {list_of_category} loc - LEFT JOIN {textbook_companion_book_main_subcategories} tcbms ON loc.category_id = tcbms.main_category - LEFT JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category - WHERE tcbms.pref_id = :pref_id and maincategory = :maincategoryvalue + INNER JOIN {textbook_companion_book_main_subcategories} tcbms ON loc.category_id = tcbms.main_category + INNER JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category + WHERE tcbms.pref_id = :pref_id AND maincategory = :maincategoryvalue "; $sub_args = array( ':pref_id' => $pref_id, @@ -339,7 +341,7 @@ function _tbc_fixer_list_of_ext_new_category($pref_id, $category_id) FROM {list_of_category} loc LEFT JOIN {textbook_companion_book_main_subcategories} tcbms ON loc.category_id = tcbms.main_category - LEFT JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category + LEFT JOIN {list_of_subcategory} los ON los.subcategory_id = tcbms.sub_category WHERE tcbms.pref_id = :pref_id AND loc.category_id = :category_id "; $args = array( @@ -434,3 +436,20 @@ function _tbc_fixer_list_of_ext_new_subcategory($pref_id, $category_id) } //$category_list_data = $category_list->fetchObject() return $subcategory; } +function _user_proposal_selected_category($pref_id) +{ + $query = " + SELECT loc.maincategory + FROM list_of_category loc + JOIN textbook_companion_preference tcp + ON loc.category_id = tcp.category + WHERE tcp.id = :pref_id + "; + $args = array( + ':pref_id' => $pref_id, + ); + $category_list = db_query($query, $args); + $category_list_data = $category_list->fetchObject(); + $category = $category_list_data->maincategory; + return $category; +} \ No newline at end of file -- cgit