diff options
| -rwxr-xr-x | bulk_approval.inc | 12 | ||||
| -rwxr-xr-x | bulk_upload_code.inc | 6 | ||||
| -rwxr-xr-x | code_approval.inc | 6 | ||||
| -rwxr-xr-x | dependency.inc | 6 | ||||
| -rwxr-xr-x | dependency_approval.inc | 4 | ||||
| -rwxr-xr-x | lab_migration.module | 116 | ||||
| -rwxr-xr-x | manage_proposal.inc | 122 | ||||
| -rwxr-xr-x | manage_solution_proposal.inc | 8 | ||||
| -rwxr-xr-x | notes.inc | 4 | ||||
| -rwxr-xr-x | upload_code.inc | 8 | ||||
| -rwxr-xr-x | upload_code_delete.inc | 2 |
11 files changed, 147 insertions, 147 deletions
diff --git a/bulk_approval.inc b/bulk_approval.inc index fb11cd9..69b3c84 100755 --- a/bulk_approval.inc +++ b/bulk_approval.inc @@ -4,7 +4,7 @@ /********************************* BULK APPROVAL ******************************/ /******************************************************************************/ -function bulk_approval_form($form_state) +function lab_migration_bulk_approval_form($form_state) { $form['#redirect'] = FALSE; @@ -269,7 +269,7 @@ function bulk_approval_form($form_state) } -function bulk_approval_form_submit($form, &$form_state) +function lab_migration_bulk_approval_form_submit($form, &$form_state) { global $user; $root_path = lab_migration_path(); @@ -279,7 +279,7 @@ function bulk_approval_form_submit($form, &$form_state) if ($form_state['values']['run']['lab']) del_lab_pdf($form_state['values']['run']['lab']); - if (user_access('bulk manage code')) + if (user_access('lab migration bulk manage code')) { if ($form_state['values']['run']['approve_lab'] == "1") { @@ -312,7 +312,7 @@ function bulk_approval_form_submit($form, &$form_state) } else if ($form_state['values']['run']['disapprove_lab'] == "1") { - if (!user_access('bulk delete code')) + if (!user_access('lab migration bulk delete code')) { drupal_set_message(t('You do not have permission to Bulk Dis-Approved and Deleted Entire Lab.'), 'error'); return; @@ -335,7 +335,7 @@ Reason for dis-approval: } else if ($form_state['values']['run']['delete_lab_including_proposal'] == "1") { - if (!user_access('bulk delete code')) + if (!user_access('lab migration bulk delete code')) { drupal_set_message(t('You do not have permission to Bulk Delete Entire Lab Including Proposal.'), 'error'); return; @@ -403,7 +403,7 @@ Reason for dis-approval: } else if ($form_state['values']['run']['disapprove_experiment'] == "1") { - if (!user_access('bulk delete code')) + if (!user_access('lab migration bulk delete code')) { drupal_set_message(t('You do not have permission to Bulk Dis-Approved and Deleted Entire Experiment.'), 'error'); return; diff --git a/bulk_upload_code.inc b/bulk_upload_code.inc index 9f006f6..bc144e3 100755 --- a/bulk_upload_code.inc +++ b/bulk_upload_code.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function bulk_upload_code_form($form_state) +function lab_migration_bulk_upload_code_form($form_state) { global $user; @@ -206,7 +206,7 @@ function bulk_upload_code_form($form_state) return $form; } -function bulk_upload_code_form_validate($form, &$form_state) +function lab_migration_bulk_upload_code_form_validate($form, &$form_state) { if (!check_code_number($form_state['values']['code_number'])) form_set_error('code_number', t('Invalid Code Number. Code Number can contain only numbers.')); @@ -290,7 +290,7 @@ function bulk_upload_code_form_validate($form, &$form_state) drupal_add_js($dep_selection_js, 'inline', 'header'); } -function bulk_upload_code_form_submit($form, &$form_state) { +function lab_migration_bulk_upload_code_form_submit($form, &$form_state) { global $user; $root_path = lab_migration_path(); diff --git a/code_approval.inc b/code_approval.inc index 115fa5e..3288752 100755 --- a/code_approval.inc +++ b/code_approval.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function code_approval() +function lab_migration_code_approval() { /* get a list of unapproved solutions */ $pending_solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE approval_status = 0"); @@ -46,7 +46,7 @@ function code_approval() return $output; } -function code_approval_form($form_state) +function lab_migration_code_approval_form($form_state) { $solution_id = (int)arg(3); @@ -182,7 +182,7 @@ function code_approval_form($form_state) return $form; } -function code_approval_form_submit($form, &$form_state) +function lab_migration_code_approval_form_submit($form, &$form_state) { global $user; diff --git a/dependency.inc b/dependency.inc index a8aaaf0..749a192 100755 --- a/dependency.inc +++ b/dependency.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function upload_dependency_form($form_state) +function lab_migration_upload_dependency_form($form_state) { global $user; @@ -65,7 +65,7 @@ function upload_dependency_form($form_state) return $form; } -function upload_dependency_form_validate($form, &$form_state) +function lab_migration_upload_dependency_form_validate($form, &$form_state) { global $user; @@ -107,7 +107,7 @@ function upload_dependency_form_validate($form, &$form_state) } } -function upload_dependency_form_submit($form, &$form_state) { +function lab_migration_upload_dependency_form_submit($form, &$form_state) { global $user; $root_path = lab_migration_path(); diff --git a/dependency_approval.inc b/dependency_approval.inc index 447cd8f..243b76a 100755 --- a/dependency_approval.inc +++ b/dependency_approval.inc @@ -4,7 +4,7 @@ /********************************* BULK APPROVAL ******************************/ /******************************************************************************/ -function dependency_approval_form($form_state) +function lab_migration_dependency_approval_form($form_state) { $form['#redirect'] = FALSE; @@ -100,7 +100,7 @@ function dependency_approval_form($form_state) } -function dependency_approval_form_submit($form, &$form_state) +function lab_migration_dependency_approval_form_submit($form, &$form_state) { global $user; $root_path = lab_migration_path(); diff --git a/lab_migration.module b/lab_migration.module index 2117482..977511c 100755 --- a/lab_migration.module +++ b/lab_migration.module @@ -17,24 +17,24 @@ function lab_migration_menu() 'description' => 'Lab Migration Proposal', 'page callback' => 'drupal_get_form', 'page arguments' => array('lab_migration_proposal_form'), - 'access arguments' => array('create proposal'), + 'access arguments' => array('lab migration create proposal'), 'type' => MENU_NORMAL_ITEM, 'file' => 'proposal.inc', ); $items['lab_migration/manage_proposal'] = array( 'title' => 'Manage Lab Migration', 'description' => 'Manage Lab Migration Proposals', - 'page callback' => '_proposal_pending', + 'page callback' => 'lab_migration_proposal_pending', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'file' => 'manage_proposal.inc', ); $items['lab_migration/manage_proposal/pending'] = array( 'title' => 'Pending Proposals', 'description' => 'Pending Lab Migration Proposals Queue', - 'page callback' => '_proposal_pending', + 'page callback' => 'lab_migration_proposal_pending', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 1, 'file' => 'manage_proposal.inc', @@ -42,9 +42,9 @@ function lab_migration_menu() $items['lab_migration/manage_proposal/pending_solution_proposal'] = array( 'title' => 'Pending Solution Proposals', 'description' => 'Pending Lab Migration Solution Proposals Queue', - 'page callback' => 'solution_proposal_pending', + 'page callback' => 'lab_migration_solution_proposal_pending', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, 'file' => 'manage_solution_proposal.inc', @@ -52,9 +52,9 @@ function lab_migration_menu() $items['lab_migration/manage_proposal/pending_solution'] = array( 'title' => 'Pending Solution', 'description' => 'Pending Lab Migration Solution', - 'page callback' => '_proposal_pending_solution', + 'page callback' => 'lab_migration_proposal_pending_solution', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_LOCAL_TASK, 'weight' => 3, 'file' => 'manage_proposal.inc', @@ -62,9 +62,9 @@ function lab_migration_menu() $items['lab_migration/manage_proposal/all'] = array( 'title' => 'All Proposals', 'description' => 'All Proposals', - 'page callback' => '_proposal_all', + 'page callback' => 'lab_migration_proposal_all', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_LOCAL_TASK, 'weight' => 4, 'file' => 'manage_proposal.inc', @@ -72,9 +72,9 @@ function lab_migration_menu() $items['lab_migration/manage_proposal/category'] = array( 'title' => 'Category', 'description' => 'Category', - 'page callback' => '_category_all', + 'page callback' => 'lab_migration_category_all', 'access callback' => 'user_access', - 'access arguments' => array('manage proposal'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_LOCAL_TASK, 'weight' => 5, 'file' => 'manage_proposal.inc', @@ -83,8 +83,8 @@ function lab_migration_menu() 'title' => 'Edit Category', 'description' => 'Edit category', 'page callback' => 'drupal_get_form', - 'page arguments' => array('category_edit_form'), - 'access arguments' => array('edit proposal'), + 'page arguments' => array('lab_migration_category_edit_form'), + 'access arguments' => array('lab migration edit proposal'), 'type' => MENU_CALLBACK, 'file' => 'manage_proposal.inc', ); @@ -92,8 +92,8 @@ function lab_migration_menu() 'title' => 'Approve Proposal', 'description' => 'Approve Proposal', 'page callback' => 'drupal_get_form', - 'page arguments' => array('proposal_approval_form'), - 'access arguments' => array('manage proposal'), + 'page arguments' => array('lab_migration_proposal_approval_form'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_CALLBACK, 'file' => 'manage_proposal.inc', ); @@ -101,8 +101,8 @@ function lab_migration_menu() 'title' => 'Approve Solution Proposal', 'description' => 'Approve Solution Proposal', 'page callback' => 'drupal_get_form', - 'page arguments' => array('solution_proposal_approval_form'), - 'access arguments' => array('manage proposal'), + 'page arguments' => array('lab_migration_solution_proposal_approval_form'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_CALLBACK, 'file' => 'manage_solution_proposal.inc', ); @@ -110,8 +110,8 @@ function lab_migration_menu() 'title' => 'Edit Proposal', 'description' => 'Edit Proposal', 'page callback' => 'drupal_get_form', - 'page arguments' => array('proposal_edit_form'), - 'access arguments' => array('manage proposal'), + 'page arguments' => array('lab_migration_proposal_edit_form'), + 'access arguments' => array('lab migration manage proposal'), 'type' => MENU_CALLBACK, 'file' => 'manage_proposal.inc', ); @@ -119,8 +119,8 @@ function lab_migration_menu() 'title' => 'Proposal Status', 'description' => 'Proposal Status', 'page callback' => 'drupal_get_form', - 'page arguments' => array('proposal_status_form'), - 'access arguments' => array('approve proposal'), + 'page arguments' => array('lab_migration_proposal_status_form'), + 'access arguments' => array('lab migration approve proposal'), 'type' => MENU_CALLBACK, 'file' => 'manage_proposal.inc', ); @@ -130,7 +130,7 @@ function lab_migration_menu() 'title' => 'Lab Migration Solve', 'description' => 'Lab Migration Proposal Open For Solution', 'page callback' => 'lab_migration_proposal_open', - 'access arguments' => array('propose solution'), + 'access arguments' => array('lab migration propose solution'), 'type' => MENU_NORMAL_ITEM, 'file' => 'solution_proposal.inc', ); @@ -138,7 +138,7 @@ function lab_migration_menu() 'title' => 'Lab Migration Solution Proposal', 'page callback' => 'drupal_get_form', 'page arguments' => array('lab_migration_solution_proposal_form'), - 'access arguments' => array('view proposal'), + 'access arguments' => array('lab migration propose solution'), 'type' => MENU_CALLBACK, 'file' => 'solution_proposal.inc', ); @@ -147,8 +147,8 @@ function lab_migration_menu() $items['lab_migration/code_approval'] = array( 'title' => 'Manage Code Approval', 'description' => 'Manage Code Approval', - 'page callback' => 'code_approval', - 'access arguments' => array('approve code'), + 'page callback' => 'lab_migration_code_approval', + 'access arguments' => array('lab migration approve code'), 'type' => MENU_NORMAL_ITEM, 'file' => 'code_approval.inc', ); @@ -156,8 +156,8 @@ function lab_migration_menu() 'title' => 'Code Approval', 'description' => 'Code Approval', 'page callback' => 'drupal_get_form', - 'page arguments' => array('code_approval_form'), - 'access arguments' => array('approve code'), + 'page arguments' => array('lab_migration_code_approval_form'), + 'access arguments' => array('lab migration approve code'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 1, 'file' => 'code_approval.inc', @@ -166,8 +166,8 @@ function lab_migration_menu() 'title' => 'Bulk Manage', 'description' => 'Bulk Mangage', 'page callback' => 'drupal_get_form', - 'page arguments' => array('bulk_approval_form'), - 'access arguments' => array('bulk manage code'), + 'page arguments' => array('lab_migration_bulk_approval_form'), + 'access arguments' => array('lab migration bulk manage code'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, 'file' => 'bulk_approval.inc', @@ -176,8 +176,8 @@ function lab_migration_menu() 'title' => 'Dependency', 'description' => 'Dependency Mangage', 'page callback' => 'drupal_get_form', - 'page arguments' => array('dependency_approval_form'), - 'access arguments' => array('bulk manage code'), + 'page arguments' => array('lab_migration_dependency_approval_form'), + 'access arguments' => array('lab migration bulk manage code'), 'type' => MENU_LOCAL_TASK, 'weight' => 3, 'file' => 'dependency_approval.inc', @@ -186,8 +186,8 @@ function lab_migration_menu() 'title' => 'Upload Code', 'description' => 'Admin Upload', 'page callback' => 'drupal_get_form', - 'page arguments' => array('bulk_upload_code_form'), - 'access arguments' => array('bulk manage code'), + 'page arguments' => array('lab_migration_bulk_upload_code_form'), + 'access arguments' => array('lab migration bulk manage code'), 'type' => MENU_CALLBACK, 'weight' => 4, 'file' => 'bulk_upload_code.inc', @@ -196,8 +196,8 @@ function lab_migration_menu() 'title' => 'Notes for Reviewers', 'description' => 'Notes for Reviewers', 'page callback' => 'drupal_get_form', - 'page arguments' => array('lab_notes_form'), - 'access arguments' => array('bulk manage code'), + 'page arguments' => array('lab_migration_lab_notes_form'), + 'access arguments' => array('lab migration bulk manage code'), 'type' => MENU_CALLBACK, 'weight' => 4, 'file' => 'notes.inc', @@ -207,16 +207,16 @@ function lab_migration_menu() $items['lab_migration/code'] = array( 'title' => 'Code Submission', 'description' => 'Code Submission', - 'page callback' => 'list_experiments', + 'page callback' => 'lab_migration_list_experiments', 'access callback' => 'user_access', - 'access arguments' => array('upload code'), + 'access arguments' => array('lab migration upload code'), 'file' => 'upload_code.inc', ); $items['lab_migration/code/list_experiments'] = array( 'title' => 'List Experiments', 'description' => 'List Experiments', - 'page callback' => 'list_experiments', - 'access arguments' => array('upload code'), + 'page callback' => 'lab_migration_list_experiments', + 'access arguments' => array('lab migration upload code'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'file' => 'upload_code.inc', 'weight' => 1, @@ -225,8 +225,8 @@ function lab_migration_menu() 'title' => 'Code Submission', 'description' => 'Code Submission', 'page callback' => 'drupal_get_form', - 'page arguments' => array('upload_code_form'), - 'access arguments' => array('upload code'), + 'page arguments' => array('lab_migration_upload_code_form'), + 'access arguments' => array('lab migration upload code'), 'type' => MENU_LOCAL_TASK, 'file' => 'upload_code.inc', 'weight' => 2, @@ -235,8 +235,8 @@ function lab_migration_menu() 'title' => 'Upload Dependency', 'description' => 'Upload Dependency Files', 'page callback' => 'drupal_get_form', - 'page arguments' => array('upload_dependency_form'), - 'access arguments' => array('upload code'), + 'page arguments' => array('lab_migration_upload_dependency_form'), + 'access arguments' => array('lab migration upload code'), 'type' => MENU_LOCAL_TASK, 'file' => 'dependency.inc', 'weight' => 3, @@ -244,8 +244,8 @@ function lab_migration_menu() $items['lab_migration/code/delete'] = array( 'title' => 'Delete Solution', 'description' => 'Delete Solution', - 'page callback' => 'upload_code_delete', - 'access arguments' => array('upload code'), + 'page callback' => 'lab_migration_upload_code_delete', + 'access arguments' => array('lab migration upload code'), 'type' => MENU_CALLBACK, 'file' => 'upload_code_delete.inc', ); @@ -255,7 +255,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_solution_file', - 'access arguments' => array('download code'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_CALLBACK, 'file' => 'download.inc', ); @@ -263,7 +263,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_dependency_file', - 'access arguments' => array('download code'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_CALLBACK, 'file' => 'download.inc', ); @@ -271,7 +271,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_solution', - 'access arguments' => array('download code'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_CALLBACK, 'file' => 'download.inc', ); @@ -279,7 +279,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_experiment', - 'access arguments' => array('download code'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_CALLBACK, 'file' => 'download.inc', ); @@ -287,7 +287,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_lab', - 'access arguments' => array('download code'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_CALLBACK, 'file' => 'download.inc', ); @@ -295,7 +295,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_full_experiment', - 'access arguments' => array('approve code'), + 'access arguments' => array('lab migration approve code'), 'type' => MENU_CALLBACK, 'file' => 'full_download.inc', ); @@ -303,7 +303,7 @@ function lab_migration_menu() 'title' => 'Code Download', 'description' => 'Code Download', 'page callback' => 'lab_migration_download_full_lab', - 'access arguments' => array('approve code'), + 'access arguments' => array('lab migration approve code'), 'type' => MENU_CALLBACK, 'file' => 'full_download.inc', ); @@ -313,7 +313,7 @@ function lab_migration_menu() 'title' => 'Download Codes', 'page callback' => 'drupal_get_form', 'page arguments' => array('lab_migration_run_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('lab migration download code'), 'type' => MENU_NORMAL_ITEM, 'file' => 'run.inc', ); @@ -323,7 +323,7 @@ function lab_migration_menu() 'title' => 'Generate Lab', 'description' => 'Generate Lab From Latex Script', 'page callback' => 'lab_migration_download_lab_pdf', - 'access arguments' => array('generate lab'), + 'access arguments' => array('lab migration generate lab'), 'type' => MENU_CALLBACK, 'file' => 'latex.inc', ); @@ -331,7 +331,7 @@ function lab_migration_menu() 'title' => 'Delete Lab PDF', 'description' => 'Delete Lab PDF', 'page callback' => 'lab_migration_delete_lab_pdf', - 'access arguments' => array('approve code'), + 'access arguments' => array('lab migration approve code'), 'type' => MENU_CALLBACK, 'file' => 'latex.inc', ); @@ -354,7 +354,7 @@ function lab_migration_menu() * Implementation of hook_perm(). */ function lab_migration_perm() { - return array('create proposal', 'manage proposal', 'edit proposal', 'approve proposal', 'propose solution', 'view proposal', 'approve code', 'bulk manage code', 'bulk delete code', 'upload code', 'edit uploaded code', 'download code', 'access content', 'administer lab migration', 'generate lab'); + return array('lab migration create proposal', 'lab migration manage proposal', 'lab migration edit proposal', 'lab migration approve proposal', 'lab migration propose solution', 'lab migration approve code', 'lab migration bulk manage code', 'lab migration bulk delete code', 'lab migration upload code', 'edit uploaded code', 'lab migration download code', 'administer lab migration', 'lab migration generate lab'); } /* AJAX CALLS */ diff --git a/manage_proposal.inc b/manage_proposal.inc index 50fa39f..82e74ca 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function _proposal_pending() +function lab_migration_proposal_pending() { /* get pending proposals to be approved */ $pending_rows = array(); @@ -23,7 +23,7 @@ function _proposal_pending() return $output; } -function _proposal_pending_solution() +function lab_migration_proposal_pending_solution() { /* get pending proposals to be approved */ $pending_rows = array(); @@ -45,7 +45,7 @@ function _proposal_pending_solution() return $output; } -function _proposal_all() +function lab_migration_proposal_all() { /* get pending proposals to be approved */ $proposal_rows = array(); @@ -76,7 +76,7 @@ function _proposal_all() return $output; } -function _category_all() +function lab_migration_category_all() { /* get pending proposals to be approved */ $proposal_rows = array(); @@ -113,7 +113,7 @@ function _category_all() /************************** PROPOSAL APPROVAL FORM ****************************/ /******************************************************************************/ -function proposal_approval_form($form_state) +function lab_migration_proposal_approval_form($form_state) { global $user; @@ -230,7 +230,7 @@ function proposal_approval_form($form_state) return $form; } -function proposal_approval_form_submit($form, &$form_state) +function lab_migration_proposal_approval_form_submit($form, &$form_state) { global $user; @@ -297,7 +297,7 @@ function proposal_approval_form_submit($form, &$form_state) /*************************** PROPOSAL STATUS FORM *****************************/ /******************************************************************************/ -function proposal_status_form($form_state) +function lab_migration_proposal_status_form($form_state) { global $user; @@ -373,20 +373,20 @@ function proposal_status_form($form_state) } else { $solution_provider_user_data = user_load($proposal_data->solution_provider_uid); if ($solution_provider_user_data) - $solution_provider = "Solution will be provided by user " . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid); + $solution_provider = "Solution will be provided by user " . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid); else - $solution_provider = "User does not exists"; + $solution_provider = "User does not exists"; } $form['solution_provider_uid'] = array( - '#type' => 'item', - '#title' => t('Who will provide the solution'), - '#value' => $solution_provider, + '#type' => 'item', + '#title' => t('Who will provide the solution'), + '#value' => $solution_provider, ); $form['solution_display'] = array( - '#type' => 'item', - '#title' => t('Display the solution on the www.scilab.in website'), - '#value' => ($proposal_data->solution_display == 1) ? "Yes" : "No", + '#type' => 'item', + '#title' => t('Display the solution on the www.scilab.in website'), + '#value' => ($proposal_data->solution_display == 1) ? "Yes" : "No", ); $proposal_status = ''; @@ -443,7 +443,7 @@ function proposal_status_form($form_state) return $form; } -function proposal_status_form_submit($form, &$form_state) +function lab_migration_proposal_status_form_submit($form, &$form_state) { global $user; @@ -494,7 +494,7 @@ function proposal_status_form_submit($form, &$form_state) /**************************** PROPOSAL EDIT FORM ******************************/ /******************************************************************************/ -function proposal_edit_form($form_state) +function lab_migration_proposal_edit_form($form_state) { global $user; @@ -552,7 +552,7 @@ function proposal_edit_form($form_state) '#title' => t('Department/Branch'), '#options' => array('' => 'Please select...', 'Computer Engineering' => 'Computer Engineering', - 'Electrical Engineering' => 'Electrical Engineering', + 'Electrical Engineering' => 'Electrical Engineering', 'Electronics Engineering' => 'Electronics Engineering', 'Chemical Engineering' => 'Chemical Engineering', 'Instrumentation Engineering' => 'Instrumentation Engineering', @@ -583,11 +583,11 @@ function proposal_edit_form($form_state) /* get experiment details */ $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d ORDER BY id ASC", $proposal_id); - $form['lab_experiment'] = array( - '#type' => 'fieldset', - '#collapsible' => FALSE, - '#tree' => TRUE, - ); + $form['lab_experiment'] = array( + '#type' => 'fieldset', + '#collapsible' => FALSE, + '#tree' => TRUE, + ); for ($counter = 1; $counter <= 15; $counter++) { $experiment_title = ''; $experiment_data = db_fetch_object($experiment_q); @@ -625,22 +625,22 @@ function proposal_edit_form($form_state) $solution_provider_user = $user_data->name; } $form['solution_provider_uid'] = array( - '#type' => 'item', - '#title' => t('Who will provide the solution'), - '#value' => $solution_provider_user, + '#type' => 'item', + '#title' => t('Who will provide the solution'), + '#value' => $solution_provider_user, ); $form['open_solution'] = array( - '#type' => 'checkbox', - '#title' => t('Open the solution for everyone'), + '#type' => 'checkbox', + '#title' => t('Open the solution for everyone'), ); $form['solution_display'] = array( - '#type' => 'radios', - '#title' => t('Do you want to display the solution on the www.scilab.in website'), - '#options' => array('1' => 'Yes', '2' => 'No'), - '#required' => TRUE, - '#default_value' => ($proposal_data->solution_display == 1) ? "1" : "2", + '#type' => 'radios', + '#title' => t('Do you want to display the solution on the www.scilab.in website'), + '#options' => array('1' => 'Yes', '2' => 'No'), + '#required' => TRUE, + '#default_value' => ($proposal_data->solution_display == 1) ? "1" : "2", ); $form['delete_proposal'] = array( @@ -659,24 +659,24 @@ function proposal_edit_form($form_state) return $form; } -function proposal_edit_form_validate($form, &$form_state) +function lab_migration_proposal_edit_form_validate($form, &$form_state) { $proposal_id = (int)arg(3); /* check before delete proposal */ if ($form_state['values']['delete_proposal'] == 1) { - $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id); - while ($experiment_data = db_fetch_object($experiment_q)) { - $solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d", $experiment_data->id); - if (db_fetch_object($solution_q)) { - form_set_error('', t('Cannot delete proposal since there are solutions already uploaded. Use the "Bulk Manage" interface to delete this proposal')); - } - } + $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id); + while ($experiment_data = db_fetch_object($experiment_q)) { + $solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d", $experiment_data->id); + if (db_fetch_object($solution_q)) { + form_set_error('', t('Cannot delete proposal since there are solutions already uploaded. Use the "Bulk Manage" interface to delete this proposal')); + } + } } return; } -function proposal_edit_form_submit($form, &$form_state) +function lab_migration_proposal_edit_form_submit($form, &$form_state) { global $user; @@ -701,15 +701,15 @@ function proposal_edit_form_submit($form, &$form_state) /* delete proposal */ if ($form_state['values']['delete_proposal'] == 1) { - db_query("DELETE FROM {lab_migration_proposal} WHERE id = %d", $proposal_id); - db_query("DELETE FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id); - drupal_set_message(t('Proposal Delete'), 'status'); - drupal_goto('lab_migration/manage_proposal'); - return; + db_query("DELETE FROM {lab_migration_proposal} WHERE id = %d", $proposal_id); + db_query("DELETE FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id); + drupal_set_message(t('Proposal Delete'), 'status'); + drupal_goto('lab_migration/manage_proposal'); + return; } if ($form_state['values']['solution_display'] == 1) { - db_query("UPDATE {lab_migration_proposal} SET solution_provider_uid = %d, solution_status = %d, solution_provider_name_title = '', solution_provider_name = '', solution_provider_contact_ph = '', solution_provider_department = '', solution_provider_university = '' WHERE id = %d", 0, 0, $proposal_id); + db_query("UPDATE {lab_migration_proposal} SET solution_provider_uid = %d, solution_status = %d, solution_provider_name_title = '', solution_provider_name = '', solution_provider_contact_ph = '', solution_provider_department = '', solution_provider_university = '' WHERE id = %d", 0, 0, $proposal_id); } $solution_display = 0; @@ -738,21 +738,21 @@ function proposal_edit_form_submit($form, &$form_state) /* updating existing experiments */ foreach ($form_state['values']['lab_experiment']['update'] as $update_id => $update_value) { - if (strlen(trim($update_value)) >= 1) { - $result = db_query("UPDATE {lab_migration_experiment} SET title = '%s' WHERE id = %d", trim($update_value), $update_id); - if (!$result) - { - drupal_set_message(t('Could not update Title of the Experiment : ') . trim($update_value), 'error'); - } - } else { - db_query("DELETE FROM {lab_migration_experiment} WHERE id = %d LIMIT 1", $update_id); - } - } + if (strlen(trim($update_value)) >= 1) { + $result = db_query("UPDATE {lab_migration_experiment} SET title = '%s' WHERE id = %d", trim($update_value), $update_id); + if (!$result) + { + drupal_set_message(t('Could not update Title of the Experiment : ') . trim($update_value), 'error'); + } + } else { + db_query("DELETE FROM {lab_migration_experiment} WHERE id = %d LIMIT 1", $update_id); + } + } /* inserting new experiments */ $number_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d ORDER BY number DESC LIMIT 1", $proposal_id); if ($number_data = db_fetch_object($number_q)) { - $number = (int)$number_data->number; + $number = (int)$number_data->number; $number++; } else { $number = 1; @@ -778,7 +778,7 @@ function proposal_edit_form_submit($form, &$form_state) /**************************** CATEGORY EDIT FORM ******************************/ /******************************************************************************/ -function category_edit_form($form_state) +function lab_migration_category_edit_form($form_state) { /* get current proposal */ $proposal_id = (int)arg(4); @@ -862,7 +862,7 @@ function category_edit_form($form_state) return $form; } -function category_edit_form_submit($form, &$form_state) +function lab_migration_category_edit_form_submit($form, &$form_state) { /* get current proposal */ $proposal_id = (int)arg(4); diff --git a/manage_solution_proposal.inc b/manage_solution_proposal.inc index 09c23a8..b6338f4 100755 --- a/manage_solution_proposal.inc +++ b/manage_solution_proposal.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function solution_proposal_pending() +function lab_migration_solution_proposal_pending() { /* get list of solution proposal where the solution_provider_uid is set to some userid except 0 and solution_status is also 1 */ $pending_rows = array(); @@ -27,7 +27,7 @@ function solution_proposal_pending() /***************** SOLUTION PROPOSAL APPROVAL FORM ****************************/ /******************************************************************************/ -function solution_proposal_approval_form($form_state) +function lab_migration_solution_proposal_approval_form($form_state) { global $user; @@ -150,7 +150,7 @@ function solution_proposal_approval_form($form_state) return $form; } -function solution_proposal_approval_form_validate($form, &$form_state) +function lab_migration_solution_proposal_approval_form_validate($form, &$form_state) { $proposal_id = (int)arg(3); @@ -164,7 +164,7 @@ function solution_proposal_approval_form_validate($form, &$form_state) } } -function solution_proposal_approval_form_submit($form, &$form_state) +function lab_migration_solution_proposal_approval_form_submit($form, &$form_state) { global $user; @@ -5,7 +5,7 @@ /***************************** BOOK NOTES *************************************/ /******************************************************************************/ -function lab_notes_form($form_state) +function lab_migration_lab_notes_form($form_state) { global $user; @@ -55,7 +55,7 @@ function lab_notes_form($form_state) return $form; } -function lab_notes_form_submit($form, &$form_state) +function lab_migration_lab_notes_form_submit($form, &$form_state) { global $user; diff --git a/upload_code.inc b/upload_code.inc index 6b79fad..982088f 100755 --- a/upload_code.inc +++ b/upload_code.inc @@ -1,7 +1,7 @@ <?php // $Id$ -function list_experiments() +function lab_migration_list_experiments() { global $user; @@ -68,7 +68,7 @@ function list_experiments() return $return_html; } -function upload_code_form($form_state) +function lab_migration_upload_code_form($form_state) { global $user; @@ -270,7 +270,7 @@ function upload_code_form($form_state) return $form; } -function upload_code_form_validate($form, &$form_state) +function lab_migration_upload_code_form_validate($form, &$form_state) { if (!check_code_number($form_state['values']['code_number'])) form_set_error('code_number', t('Invalid Code Number. Code Number can contain only numbers.')); @@ -354,7 +354,7 @@ function upload_code_form_validate($form, &$form_state) drupal_add_js($dep_selection_js, 'inline', 'header'); } -function upload_code_form_submit($form, &$form_state) { +function lab_migration_upload_code_form_submit($form, &$form_state) { global $user; $root_path = lab_migration_path(); diff --git a/upload_code_delete.inc b/upload_code_delete.inc index 2932ae0..ca7b3c2 100755 --- a/upload_code_delete.inc +++ b/upload_code_delete.inc @@ -4,7 +4,7 @@ /***************************** DELETE CODE ************************************/ /******************************************************************************/ -function upload_code_delete() +function lab_migration_upload_code_delete() { global $user; |