diff options
| -rwxr-xr-x | manage_proposal.inc | 13 | ||||
| -rwxr-xr-x | run.inc | 15 | ||||
| -rwxr-xr-x | textbook_companion.module | 70 |
3 files changed, 39 insertions, 59 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc index 5c76446..9ef15b4 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -599,7 +599,7 @@ function proposal_edit_form($form_state) '#type' => 'textfield', '#title' => t('Scilab Version'), '#size' => 10, - '#maxlength' => 10, + '#maxlength' => 20, '#default_value' => $proposal_data->scilab_version, ); $form['operating_system'] = array( @@ -849,7 +849,14 @@ function proposal_edit_form_submit($form, &$form_state) $proposal_id = $form_state['values']['hidden_proposal_id']; - db_query("UPDATE {textbook_companion_proposal} SET full_name = '%s', mobile = '%s', how_project = '%s', course = '%s', branch = '%s', university = '%s', faculty = '%s', reviewer = '%s', completion_date = %d, operating_system= '%s', scilab_version= '%s' WHERE id = %d", + + $query = "UPDATE {textbook_companion_proposal} SET full_name = '".$form_state['values']['full_name']."', mobile = '".$form_state['values']['mobile']."', how_project = '".$form_state['values']['how_project']."', course = '".$form_state['values']['course']."', branch = '".$form_state['values']['branch']."', university = '".$form_state['values']['university']."', faculty = '".$form_state['values']['faculty']."', reviewer = '".$form_state['values']['reviewer']."', completion_date = $completion_date_timestamp, operating_system= '".$form_state['values']['operating_system']."', scilab_version= '".$form_state['values']['scilab_version']."' WHERE id =".$proposal_id; + + + db_query($query); + + +/*db_query("UPDATE {textbook_companion_proposal} SET full_name = '%s', mobile = '%s', how_project = '%s', course = '%s', branch = '%s', university = '%s', faculty = '%s', reviewer = '%s', completion_date = %d, operating_system= '%s', scilab_version= '%s' WHERE id = %d", $form_state['values']['full_name'], $form_state['values']['mobile'], $form_state['values']['how_project'], @@ -861,7 +868,7 @@ function proposal_edit_form_submit($form, &$form_state) $completion_date_timestamp, $form_state['values']['operating_system'], $form_state['values']['scilab_version'], - $proposal_id); + $proposal_id); */ $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $proposal_id, 1); $preference1_data = db_fetch_object($preference1_q); @@ -1,14 +1,23 @@ <?php // $Id$ -function textbook_companion_run_form($form_state) +function textbook_companion_run_form($form_state, $pref_id = NULL) { + $form['#redirect'] = FALSE; + $book_default_value = 0; ahah_helper_register($form, $form_state); if (!isset($form_state['storage']['run']['category'])) { - $category_default_value = 0; + $category_default_value = 0; + if($pref_id){ + $query = "select category from textbook_companion_preference where id=".$pref_id; + $result = db_query($query); + $row = db_fetch_object($result); + $category_default_value = $row->category; + $book_default_value = $pref_id; + } } else { $category_default_value = $form_state['storage']['run']['category']; } @@ -25,8 +34,6 @@ function textbook_companion_run_form($form_state) $('#edit-run-book').change(); });"; drupal_add_js($chapter_name_js, 'inline', 'footer'); - } else { - $book_default_value = 0; } } else { $book_default_value = $form_state['storage']['run']['book']; diff --git a/textbook_companion.module b/textbook_companion.module index 7bead45..bc39d2e 100755 --- a/textbook_companion.module +++ b/textbook_companion.module @@ -607,8 +607,8 @@ function book_proposal_form($form_state) $form['version'] = array( '#type' => 'select', '#title' => t('Version'), - '#options' => array('scilab541' => 'Scilab 5.4.1', - 'scilab533' => 'Scilab 5.3.3', + '#options' => array('scilab 5.4.1' => 'Scilab 5.4.1', + 'scilab 5.3.3' => 'Scilab 5.3.3', 'olderversion' => 'Older Version'), '#required' => TRUE, ); @@ -849,7 +849,9 @@ function book_proposal_form_validate($form, &$form_state) form_set_error('isbn3', t('Invalid ISBN for Book Preference 3')); if($form_state['values']['version'] == 'olderversion'){ - form_set_error('older', t('Please provide valid version')); + if($form_state['values']['older'] == ''){ + form_set_error('older', t('Please provide valid version')); + } } return; } @@ -866,56 +868,20 @@ function book_proposal_form_submit($form, &$form_state) /* completion date to timestamp */ list($d, $m, $y) = explode('-', $form_state['values']['completion_date']); $completion_date_timestamp = mktime(0, 0, 0, $m, $d, $y); -if($form_state['values']['version']=='olderversion') - { - $result = db_query("INSERT INTO {textbook_companion_proposal} - (uid, approver_uid, full_name, mobile, how_project, course, branch, university, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_versions, operating_system, teacher_email) VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s')", - $user->uid, - 0, - ucwords(strtolower($form_state['values']['full_name'])), - $form_state['values']['mobile'], - $form_state['values']['how_project'], - $form_state['values']['course'], - $form_state['values']['branch'], - $form_state['values']['university'], - ucwords(strtolower($form_state['values']['faculty'])), - ucwords(strtolower($form_state['values']['reviewer'])), - $completion_date_timestamp, - time(), - 0, - 0, - $form_state['values']['older'], - $form_state['values']['operating'], - $form_state['values']['faculty_email'] - ); + + + $scilab_version = $form_state['values']['version']; + + if($form_state['values']['version'] == 'olderversion'){ + $scilab_version = $form_state['values']['older']; } - else - { - /* inserting the user proposal */ - $result = db_query("INSERT INTO {textbook_companion_proposal} - (uid, approver_uid, full_name, mobile, how_project, course, branch, university, faculty, reviewer, completion_date, operating_system, scilab_version, creation_date, approval_date, proposal_status ,scilab_versions, operating_system, teacher_email) VALUES - (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d , '%s', '%s', '%s')", - $user->uid, - 0, - ucwords(strtolower($form_state['values']['full_name'])), - $form_state['values']['mobile'], - $form_state['values']['how_project'], - $form_state['values']['course'], - $form_state['values']['branch'], - $form_state['values']['university'], - ucwords(strtolower($form_state['values']['faculty'])), - ucwords(strtolower($form_state['values']['reviewer'])), - $completion_date_timestamp, - $form_state['values']['operating_system'], - $form_state['values']['scilab_version'], - time(), - 0, - 0, - $form_state['values']['version'], - $form_state['values']['operating'], - $form_state['values']['faculty_email'] - ); - } + + //var_dump($form_state['values']); + + $query = "INSERT INTO {textbook_companion_proposal} + (uid, approver_uid, full_name, mobile, how_project, course, branch, university, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email) VALUES (".$user->uid.", 0, '".ucwords(strtolower($form_state['values']['full_name']))."', '".$form_state['values']['mobile']."', '".$form_state['values']['how_project']."', '".$form_state['values']['course']."', '".$form_state['values']['branch']."', '".$form_state['values']['university']."', '".ucwords(strtolower($form_state['values']['faculty']))."', '".ucwords(strtolower($form_state['values']['reviewer']))."', '".$completion_date_timestamp."', NOW(), 0, 0, '".$scilab_version."', '".$form_state['values']['operating_system']."', '".$form_state['values']['faculty_email']."')"; + + $result = db_query($query); if (!$result) { drupal_set_message(t('Error receiving your proposal. Please try again.'), 'error'); |