From 205c03ca3b0c7caaf42ba2e7649edd4ee06ccc44 Mon Sep 17 00:00:00 2001 From: prashant Date: Sat, 30 Jan 2016 12:25:22 +0530 Subject: Done minor changes and added submit all code notification for tbc reviver interface --- README | 2 +- cheque_contact.inc | 378 +- cheque_manage.inc | 44 +- code.inc | 1035 +-- code_approval.inc | 2204 ++++-- css/jquery-ui.css | 1178 ---- css/textbook_companion.css | 120 - dependency.inc | 1414 ++-- dependency_approval.inc | 395 +- download.inc | 421 +- editcode.inc | 1666 ++--- editcodeadmin.inc | 1258 ++-- full_download.inc | 325 +- general.inc | 558 +- js/jquery-1.9.1.js | 9598 ------------------------- js/jquery-ui.js | 15004 ---------------------------------------- js/jquery.js | 6 - js/textbook_companion.js | 210 - latex.inc | 423 +- latex/Initial_body | 112 +- manage_proposal.inc | 3055 ++++---- notes.inc | 257 +- pdf/generate_pdf.inc | 240 +- pdf/images/dwsim_logo.png | Bin 0 -> 6200 bytes pdf/list_all_certificates.inc | 202 +- run.inc | 870 ++- search.inc | 648 +- settings.inc | 158 +- textbook_companion.info | 6 +- textbook_companion.install | 991 +-- textbook_companion.module | 6062 ++++++++++------ 31 files changed, 13108 insertions(+), 35732 deletions(-) delete mode 100755 css/jquery-ui.css delete mode 100755 css/textbook_companion.css delete mode 100755 js/jquery-1.9.1.js delete mode 100755 js/jquery-ui.js delete mode 100755 js/jquery.js delete mode 100755 js/textbook_companion.js create mode 100755 pdf/images/dwsim_logo.png diff --git a/README b/README index 1acdd7b..e90ec6b 100755 --- a/README +++ b/README @@ -1,2 +1,2 @@ -Textbook Companion project for IIT Bombay written in Drupal 6 +Textbook Companion project Module for IIT Bombay written in Drupal 7 diff --git a/cheque_contact.inc b/cheque_contact.inc index 335ee42..65208fd 100755 --- a/cheque_contact.inc +++ b/cheque_contact.inc @@ -6,12 +6,19 @@ function paper_submission_form($form_state, $proposal_id) $proposal_id = arg(2); /* get current proposal */ - $preference4_q = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$proposal_id); + + /*$preference4_q = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$proposal_id);*/ + + $query = db_select('textbook_companion_paper'); + $query->fields('textbook_companion_paper'); + $query->condition('proposal_id', $proposal_id); + $preference4_q = $query->execute(); + $form1=0; $form2=0; $form3=0; $form4=0; - if($data = db_fetch_object($preference4_q)) + if($data = $preference4_q->fetchObject()) { $form1 = $data->internship_form; $form2 = $data->copyright_form; @@ -20,8 +27,11 @@ function paper_submission_form($form_state, $proposal_id) } else { - $query = "insert into {textbook_companion_paper} (proposal_id) values(".$proposal_id.")"; - db_query($query); + $query = "Insert into {textbook_companion_paper} (proposal_id) values (:proposal_id)"; + $args = array( + ":proposal_id"=>$proposal_id, + ); + $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID)); } $form['proposal_id'] =array( '#type' => 'hidden', @@ -65,8 +75,18 @@ function paper_submission_form($form_state, $proposal_id) function paper_submission_form_submit($form, &$form_state) { - $query ="UPDATE {textbook_companion_paper} SET internship_form = ".$form_state['values']['internshipform'].", copyright_form = ".$form_state['values']['copyrighttransferform'].", undertaking_form= ".$form_state['values']['undertakingform'].", reciept_form= ".$form_state['values']['recieptform']." WHERE proposal_id = ".$form_state['values']['proposal_id']; - db_query($query); + /*$query ="UPDATE {textbook_companion_paper} SET internship_form = ".$form_state['values']['internshipform'].", copyright_form = ".$form_state['values']['copyrighttransferform'].", undertaking_form= ".$form_state['values']['undertakingform'].", reciept_form= ".$form_state['values']['recieptform']." WHERE proposal_id = ".$form_state['values']['proposal_id']; + db_query($query);*/ + + $query = db_update('textbook_companion_paper'); + $query->fields(array( + 'internship_form' => $form_state[ values ][ internshipform ], + 'copyright_form' => $form_state[ values ][ copyrighttransferform ], + 'undertaking_form' => $form_state[ values ][ undertakingform ], + 'reciept_form' => $form_state[ values ][ recieptform ], + )); + $query->condition('proposal_id', $form_state['values']['proposal_id']); + $num_updated = $query->execute(); /************************************************ Check For the Internship Form is checked or not @@ -204,8 +224,14 @@ function cheque_contct_form() { global $user; - $preference4_q = db_query("SELECT id FROM {textbook_companion_proposal} WHERE uid=".$user->uid); - $data = db_fetch_object($preference4_q); + /*$preference4_q = db_query("SELECT id FROM {textbook_companion_proposal} WHERE uid=".$user->uid);*/ + + $query = db_select('textbook_companion_proposal'); + $query->fields('id', array('')); + $query->condition('uid', $user->uid); + $result = $query->execute(); + $data = $result->fetchObject(); + $form1 = $data->id; if($user->uid) @@ -234,20 +260,26 @@ function cheque_contct_form() '#attributes' => array('id' => 'perm_report'), ); - $search_q = db_query("SELECT * FROM textbook_companion_proposal p,textbook_companion_cheque c WHERE c.address_con = 'Submitted' AND (p.id = c.proposal_id)"); + /*$search_q = db_query("SELECT * FROM textbook_companion_proposal p,textbook_companion_cheque c WHERE c.address_con = 'Submitted' AND (p.id = c.proposal_id)");*/ + $query = db_select('textbook_companion_proposal', 'p'); + $query->join('textbook_companion_cheque','c','p.id = c.proposal_id'); + $query->fields('p',array('textbook_companion_proposal')); + $query->fields('c',array('textbook_companion_cheque')); + $query->condition('c.address_con','Submitted'); + $result = $query->execute(); - while ($search_data = db_fetch_object($search_q)) + while ($search_data = $result->fetchObject()) { $search_rows[] = array(l($search_data->full_name, 'cheque_contct/status/' . $search_data->proposal_id),$search_data->address_con,$search_data->cheque_no,$search_data->cheque_dispatch_date); } if ($search_rows) { $search_header = array('Name Of The Student', 'Application Form Status', 'Cheque No', 'Cheque Clearance Date'); - $output .= theme_table($search_header, $search_rows); + $output .= theme('table',array('headers'=>$search_header, 'rows'=>$search_rows)); $form['search_results'] = array( '#type' => 'item', '#title' => $_POST['search'] , - '#value' => $output, + '#markup' => $output, ); } else @@ -255,7 +287,7 @@ function cheque_contct_form() $form['search_results'] = array( '#type' => 'item', '#title' => t('Search results for "') . $_POST['search'] . '"', - '#value' => 'No results found', + '#markup' => 'No results found', ); } if ($_POST) @@ -263,19 +295,29 @@ function cheque_contct_form() $output = ''; $search_rows = array(); $search_quert = ''; - $search_q = db_query("SELECT * FROM textbook_companion_proposal p,textbook_companion_cheque c WHERE c.address_con = 'Submitted' AND (p.id = c.proposal_id) AND (p.full_name LIKE '%%%s%%')", $_POST['search']); - while ($search_data = db_fetch_object($search_q)) + + /*$search_q = db_query("SELECT * FROM textbook_companion_proposal p,textbook_companion_cheque c WHERE c.address_con = 'Submitted' AND (p.id = c.proposal_id) AND (p.full_name LIKE '%%%s%%')", $_POST['search']);*/ + $query = db_select('textbook_companion_proposal', 'p'); + $query->join('textbook_companion_cheque','c','p.id = c.proposal_id'); + $query->fields('p',array('textbook_companion_proposal')); + $query->fields('c',array('textbook_companion_cheque')); + $query->condition('c.address_con', 'Submitted'); + $query->condition('p.full_name', '%%'.$_POST['search'].'%%', 'LIKE'); + $result = $query->execute(); + + + while ($search_data = $result->fetchObject()) { $search_rows[] = array(l($search_data->full_name, 'cheque_contct/status/' . $search_data->proposal_id),$search_data->address_con,$search_data->cheque_no,$search_data->cheque_dispatch_date); } if ($search_rows) { $search_header = array('Name Of The Student', 'Application Form Status', 'Cheque No', 'Cheque Clearance Date'); - $output .= theme_table($search_header, $search_rows); + $output .= theme('table',array('headers'=>$search_header,'rows'=>$search_rows)); $form['search_results'] = array( '#type' => 'item', '#title' => t('Search results for "') . $_POST['search'] . '"', - '#value' => $output, + '#markup' => $output, ); } else @@ -283,7 +325,7 @@ function cheque_contct_form() $form['search_results'] = array( '#type' => 'item', '#title' => t('Search results for "') . $_POST['search'] . '"', - '#value' => 'No results found', + '#markup' => 'No results found', ); } } @@ -291,14 +333,28 @@ function cheque_contct_form() } else { - $preference5_q = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$form1); - $data1 = db_fetch_object($preference5_q); + /*$preference5_q = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$form1); + $data1 = db_fetch_object($preference5_q);*/ + $query = db_select('textbook_companion_paper'); + $query->fields('textbook_companion_paper'); + $query->condition('proposal_id', $form1); + $result = $query->execute(); + $data1=$result->fetchObject(); + $form2 = $data1->internship_form; $form3 = $data1->copyright_form; $form4 = $data1->undertaking_form; $form5 = $data1->reciept_form; - $chq_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id=".$form1); - $data_chq = db_fetch_object($chq_q); + + /*$chq_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id=".$form1); + $data_chq = db_fetch_object($chq_q);*/ + + $query = db_select('textbook_companion_proposal'); + $query->fields('textbook_companion_proposal'); + $query->condition('id', $form1); + $result = $query->execute(); + $data_chq=$result->fetchObject(); + $form9 = $data_chq->full_name; $form8 = $data->how_project; $form10 = $data_chq->mobile; @@ -324,7 +380,7 @@ function cheque_contct_form() $form['how_project'] = array( '#type' => 'select', '#title' => t('How did you come to know about this project'), - '#options' => array('Scilab Website' => 'Scilab Website', + '#options' => array('eSim Website' => 'eSim Website', 'Friend' => 'Friend', 'Professor/Teacher' => 'Professor/Teacher', 'Mailing List' => 'Mailing List', @@ -402,10 +458,21 @@ function cheque_status_form($form_state, $proposal_id) /* get current proposal */ $proposal_id = arg(2); - $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id =".$proposal_id); - $proposal_q1 = db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id =".$proposal_id); - $proposal_data1 = db_fetch_object($proposal_q1); - if (!$proposal_data = db_fetch_object($proposal_q)) + /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id =".$proposal_id);*/ + $query = db_select('textbook_companion_proposal'); + $query->fields('textbook_companion_proposal'); + $query->condition('id', $proposal_id); + $proposal_q = $query->execute(); + + /*$proposal_q1 = db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id =".$proposal_id);*/ + $query = db_select('textbook_companion_cheque'); + $query->fields('textbook_companion_cheque'); + $query->condition('proposal_id', $proposal_id); + $proposal_q1 = $query->execute(); + + + $proposal_data1 = $proposal_q1->fetchObject(); + if (!$proposal_data = $proposal_q->fetchObject()) { drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error'); drupal_goto('manage_proposal'); @@ -415,10 +482,22 @@ function cheque_status_form($form_state, $proposal_id) '#type' => 'hidden', '#default_value' => $proposal_id, ); - $empty = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = ".$proposal_id); + + /*$empty = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = ".$proposal_id);*/ + $query = db_select('textbook_companion_proposal'); + $query->fields('textbook_companion_proposal'); + $query->condition('id', $proposal_id); + $empty = $query->execute(); + if(!$empty) { - $prop =db_query("insert into {textbook_companion_cheque} (proposal_id) values(%d)",$proposal_id); + /*$prop =db_query("insert into {textbook_companion_cheque} (proposal_id) values(%d)",$proposal_id);*/ + + $query = "insert into {textbook_companion_cheque} (proposal_id) values (:proposal_id)"; + $args = array( + ":proposal_id"=>$proposal_id, + ); + $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID)); } $form['candidate_detail'] = array( '#type' => 'fieldset', @@ -429,31 +508,44 @@ function cheque_status_form($form_state, $proposal_id) ); $form['candidate_detail']['full_name'] = array( '#type' => 'item', - '#value' => $proposal_data->full_name, + '#markup' => $proposal_data->full_name, '#title' => t('Contributor Name'), ); $form['candidate_detail']['email'] = array( '#type' => 'item', - '#value' => user_load($proposal_data->uid)->mail, + '#markup' => user_load($proposal_data->uid)->mail, '#title' => t('Email'), ); $form['candidate_detail']['mobile'] = array( '#type' => 'item', - '#value' => $proposal_data->mobile, + '#markup' => $proposal_data->mobile, '#title' => t('Mobile'), ); $form['candidate_detail']['alt_mobile'] = array( '#type' => 'item', - '#value' => $proposal_data1->alt_mobno, + '#markup' => $proposal_data1->alt_mobno, '#title' => t('Alternate Mobile No.'), ); - $form_q=db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id =".$proposal_id); - $form_data=db_fetch_object($form_q); + /*$form_q=db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id =".$proposal_id); + $form_data=db_fetch_object($form_q);*/ + + $query = db_select('textbook_companion_paper'); + $query->fields('textbook_companion_paper'); + $query->condition('proposal_id', $proposal_id); + $result = $query->execute(); + $form_data=$result->fetchObject(); /* get book preference */ $preference_html = '', 'error'); $x = $user->uid; - $query2 = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid=".$x); - $data2 = db_fetch_object($query2); + /*$query2 = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid=".$x); + $data2 = db_fetch_object($query2);*/ + + $query = db_select('textbook_companion_proposal'); + $query->fields('textbook_companion_proposal'); + $query->condition('uid', $x); + $result = $query->execute(); + $data2=$result->fetchObject(); + + if(!$data2) { drupal_set_message('Fill Up The Book Proposal Form', 'error'); return ''; } - $query3 = db_query("SELECT * FROM {textbook_companion_preference} WHERE approval_status=1 AND proposal_id=".$data2->id); - $data3 = db_fetch_object($query3); + /*$query3 = db_query("SELECT * FROM {textbook_companion_preference} WHERE approval_status=1 AND proposal_id=".$data2->id); + $data3 = db_fetch_object($query3);*/ + + $query = db_select('textbook_companion_preference'); + $query->fields('textbook_companion_preference'); + $query->condition('approval_status', 1); + $query->condition('proposal_id', $data2->id); + $result = $query->execute(); + $data3=$result->fetchObject(); if(!$data3->approval_status) { @@ -912,12 +1082,26 @@ function contact_details($form_state) } $proposal_id = $data2->id; - $comment_qx = db_query("SELECT * FROM textbook_companion_cheque c WHERE proposal_id =".$proposal_id); - $commentv = db_fetch_object($comment_qx); + + /*$comment_qx = db_query("SELECT * FROM textbook_companion_cheque c WHERE proposal_id =".$proposal_id); + $commentv = db_fetch_object($comment_qx);*/ + + $query = db_select('textbook_companion_cheque', 'c'); + $query->fields('c'); + $query->condition('proposal_id', $proposal_id); + $result = $query->execute(); + $commentv=$result->fetchObject(); + $form16 = $commentv->commentf; $mob_no = $data2->mobile; $full_name = $data2->full_name; - $query1 = db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id=".$proposal_id); + + /*$query1 = db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id=".$proposal_id);*/ + $query = db_select('textbook_companion_cheque'); + $query->fields('textbook_companion_cheque'); + $query->condition('proposal_id', $proposal_id); + $result = $query->execute(); + $form1 = 0; $form2 = 0; $form3 = 0; @@ -934,7 +1118,7 @@ function contact_details($form_state) $form14 = 0; $form15 = 0; - if($data = db_fetch_object($query1)) + if($data = $result->fetchObject()) { $form1 = $data->address; $form8 = $data->alt_mobno; @@ -948,7 +1132,13 @@ function contact_details($form_state) } else { - db_query("insert into {textbook_companion_cheque} (proposal_id) values(%d)",$proposal_id); + /*db_query("insert into {textbook_companion_cheque} (proposal_id) values(%d)",$proposal_id);*/ + + $query = "insert into {textbook_companion_cheque} (proposal_id) values (:proposal_id)"; + $args = array( + ":proposal_id"=>$proposal_id, + ); + $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID)); } $form['candidate_detail'] = array( '#type' => 'fieldset', @@ -986,11 +1176,26 @@ function contact_details($form_state) '#size' => 48, '#default_value' => $form8, ); - $chq_q=db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id=".$proposal_id); - $chq_data=db_fetch_object($chq_q); + + /*$chq_q=db_query("SELECT * FROM {textbook_companion_cheque} WHERE proposal_id=".$proposal_id); + $chq_data=db_fetch_object($chq_q);*/ + + $query = db_select('textbook_companion_cheque'); + $query->fields('textbook_companion_cheque'); + $query->condition('proposal_id', $proposal_id); + $result = $query->execute(); + $chq_data=$result->fetchObject(); - $q_form = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$proposal_id); - $q_data = db_fetch_object($q_form); + + /*$q_form = db_query("SELECT * FROM {textbook_companion_paper} WHERE proposal_id=".$proposal_id); + $q_data = db_fetch_object($q_form);*/ + + $query = db_select('textbook_companion_paper'); + $query->fields('textbook_companion_paper'); + $query->condition('proposal_id', $proposal_id); + $result = $query->execute(); + $q_data=$result->fetchObject(); + $form_html .= '