diff options
| -rw-r--r-- | abstract_bulk_approval.inc | 3 | ||||
| -rw-r--r-- | download.inc | 3 | ||||
| -rw-r--r-- | email.inc | 26 | ||||
| -rw-r--r-- | manage_proposal.inc | 148 | ||||
| -rw-r--r-- | proposal.inc | 6 | ||||
| -rw-r--r-- | run.inc | 4 | ||||
| -rw-r--r-- | scilab_case_study.module | 5 |
7 files changed, 48 insertions, 147 deletions
diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc index 4952994..1ef13df 100644 --- a/abstract_bulk_approval.inc +++ b/abstract_bulk_approval.inc @@ -125,7 +125,7 @@ function scilab_case_study_abstract_bulk_approval_form_submit($form, &$form_stat ':submitted_abstract_id' => $abstract_data->id )); } //$abstract_data = $abstracts_q->fetchObject() - drupal_set_message(t('Approved case study project.'), 'status'); + drupal_set_message(t('Approved case study project. Use the checkbox below to publish this case study on the completed case studies page.'), 'status'); // email $email_subject = t('[!site_name][case study Project] Your uploaded case study project have been approved', array( '!site_name' => variable_get('site_name', '') @@ -167,6 +167,7 @@ FOSSEE,IIT Bombay', array( { $msg = drupal_set_message('Error sending email message.', 'error'); } //!drupal_mail('scilab_case_study', 'standard', $email_to, language_default(), $params, $from, TRUE) + drupal_goto('case-study-project/manage-proposal/status/' . $form_state['values']['case_study_project']); } //$form_state['values']['case_study_actions'] == 1 elseif ($form_state['values']['case_study_actions'] == 2) { diff --git a/download.inc b/download.inc index 4a4ec2d..bb9d3d3 100644 --- a/download.inc +++ b/download.inc @@ -37,13 +37,14 @@ function scilab_case_study_download_final_report() { $scilab_case_study_project_files = $result->fetchObject(); $query = db_select('case_study_submitted_abstracts_file'); $query->fields('case_study_submitted_abstracts_file'); - $query->condition('proposal_id', $id); + $query->condition('proposal_id', $proposal_id); $query->condition('filetype', 'A'); $project_files = $query->execute(); $final_report_data = $project_files->fetchObject(); $directory_name = $scilab_case_study_project_files->directory_name . '/project_files/'; /*$str = substr($scilab_case_study_project_files->samplefilepath, strrpos($scilab_case_study_project_files->samplefilepath, '/')); $abstract_file = ltrim($str, '/');*/ + //var_dump($final_report_data);die; ob_clean(); header("Pragma: public"); header("Expires: 0"); @@ -24,7 +24,7 @@ function scilab_case_study_mail($key, &$message, $params) )); $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', We have received your Case Study Project proposal with the following details: @@ -43,7 +43,7 @@ Your proposal is under review. You will soon receive an email when same has been Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user->name, ), array( @@ -68,7 +68,7 @@ FOSSEE,IIT Bombay', array( )); $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', We regret to inform you that your Case Study proposal with following details have been disapproved: @@ -90,7 +90,7 @@ You are welcome to submit a new proposal. Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name, ), array( @@ -115,7 +115,7 @@ FOSSEE,IIT Bombay', array( )); $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', Your Case Study Project proposal with the following details has been approved: @@ -134,7 +134,7 @@ You can upload your project files at: ' . $url . ' Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name, ), array( @@ -158,7 +158,7 @@ FOSSEE,IIT Bombay', array( )); $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', Your Case Study and abstract on the following process have been completed successfully. @@ -172,7 +172,7 @@ Project Title: ' . $proposal_data->project_title . ' Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name, ), array( @@ -196,7 +196,7 @@ FOSSEE,IIT Bombay', array( )); $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', Your Case Study Project proposal with the following details has been deleted : @@ -213,7 +213,7 @@ You can propose a new Case Study project. Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name, ), array( @@ -239,7 +239,7 @@ FOSSEE,IIT Bombay', array( $message['headers'] = $params['abstract_uploaded']['headers']; $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', You have uploaded the following Abstract and Project files: @@ -251,7 +251,7 @@ The abstract and project files are under review. You will be notified when it ha Best Wishes, !site_name Team, -FOSSEE,IIT Bombay', array( +FOSSEE, IIT Bombay', array( '!site_name' => variable_get('site_name', ''), '!user_name' => $user->name, ), array( @@ -280,7 +280,7 @@ FOSSEE,IIT Bombay', array( $message['headers'] = $params['abstract_edit_file_uploaded']['headers']; $message['body'] = array( 'body' => t(' -Dear !user_name, +Dear' . $proposal_data->contributor_name . ', You have updated the abstract/ project files for the following case study: diff --git a/manage_proposal.inc b/manage_proposal.inc index 1a9491c..e4f88ae 100644 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -818,12 +818,6 @@ function scilab_case_study_proposal_edit_form($form, &$form_state) '#required' => true, '#default_value' => $proposal_data->institute, ); - $form['how_did_you_know_about_project'] = array( - '#type' => 'textfield', - '#title' => t('How did you come to know about the Case Study Project?'), - '#default_value' => $proposal_data->how_did_you_know_about_project, - '#required' => true, - ); $form['faculty_name'] = array( '#type' => 'textfield', '#title' => t('Name of the Faculty'), @@ -911,7 +905,7 @@ function scilab_case_study_proposal_edit_form($form, &$form_state) $form['all_state'] = array( '#type' => 'select', '#title' => t('State'), - '#options' => _df_list_of_states(), + '#options' => _cs_list_of_states(), '#default_value' => $proposal_data->state, '#validated' => true, '#states' => array( @@ -925,7 +919,7 @@ function scilab_case_study_proposal_edit_form($form, &$form_state) $form['city'] = array( '#type' => 'select', '#title' => t('City'), - '#options' => _df_list_of_cities(), + '#options' => _cs_list_of_cities(), '#default_value' => $proposal_data->city, '#states' => array( 'visible' => array( @@ -953,67 +947,16 @@ function scilab_case_study_proposal_edit_form($form, &$form_state) '#required' => true, '#default_value' => $proposal_data->project_title, ); - $version_options = _cs_list_of_versions(); - $form['version'] = array( - '#type' => 'select', - '#title' => t('Version used'), - '#options' => $version_options, - '#default_value' => $proposal_data->version_id - ); - $simulation_type_options = _cs_list_of_simulation_types(); - $form['simulation_type'] = array( - '#type' => 'select', - '#title' => t('Simulation Type used'), - '#options' => $simulation_type_options, - '#default_value' => $proposal_data->simulation_type_id, - '#ajax' => array( - 'callback' => 'ajax_solver_used_callback', - ), - ); - $simulation_id = isset($form_state['values']['simulation_type']) ? $form_state['values']['simulation_type'] : $proposal_data->simulation_type_id; - - $form['solver_used'] = array( - '#type' => 'select', - '#title' => t('Select the Solver to be used'), - '#options' => _cs_list_of_solvers($simulation_id), - '#prefix' => '<div id="ajax-solver-replace">', - '#suffix' => '</div>', - '#states' => array( - 'invisible' => array( - ':input[name="simulation_type"]' => array( - 'value' => 19 - ) - ) - ), - //'#required' => TRUE - '#default_value' => $proposal_data->solver_used, - ); - - $form['solver_used_text'] = array( + $form['operating_system'] = array( '#type' => 'textfield', - '#title' => t('Enter the Solver to be used'), - '#size' => 100, - '#description' => t('Maximum character limit is 50'), - //'#required' => TRUE, - '#prefix' => '<div id="ajax-solver-text-replace">', - '#suffix' => '</div>', - '#states' => array( - 'visible' => array( - ':input[name="simulation_type"]' => array( - 'value' => 19 - ) - ) - ), - '#default_value' => $proposal_data->solver_used + '#title' => t('Operating System'), + '#default_value' => $proposal_data->operating_system ); - /* $form['solver_used'] = array( + $form['scilab_version'] = array( '#type' => 'textfield', - '#title' => t('Solver to be used'), - '#size' => 50, - '#maxlength' => 50, - '#required' => true, - '#default_value' => $proposal_data->solver_used, - );*/ + '#title' => t('Scilab Version used'), + '#default_value' => $proposal_data->scilab_version + ); $form['date_of_proposal'] = array( '#type' => 'textfield', '#title' => t('Date of Proposal'), @@ -1035,49 +978,8 @@ function scilab_case_study_proposal_edit_form($form, &$form_state) return $form; } -function ajax_solver_used_callback($form, $form_state){ - $simulation_id = isset($form_state['values']['simulation_type']) ? $form_state['values']['simulation_type'] : key($simulation_type_options); - if($simulation_id < 19){ - $form['solver_used']['#options'] = _cs_list_of_solvers($simulation_id); - $form['solver_used']['#required'] = TRUE; - $form['solver_used']['#validated'] = TRUE; - $commands[] = ajax_command_replace('#ajax-solver-replace', drupal_render($form['solver_used'])); - $commands[] = ajax_command_html('#ajax-solver-text-replace', ''); - } - else{ - $commands[] = ajax_command_html('#ajax-solver-replace', ''); - $form['solver_used_text']['#required'] = TRUE; - $form['solver_used_text']['#validated'] = TRUE; - $commands[] = ajax_command_replace('#ajax-solver-text-replace', drupal_render($form['solver_used_text'])); - } - return array( - '#type' => 'ajax', - '#commands' => $commands - ); -} function scilab_case_study_proposal_edit_form_validate($form, $form_state){ - if ($form_state['values']['simulation_type'] < 19) { - if($form_state['values']['solver_used'] == '0'){ - form_set_error('solver_used', t('Please select an option')); - } - } - else if ($form_state['values']['simulation_type'] == 19) { - if ($form_state['values']['solver_used_text'] != '') - { - if (strlen($form_state['values']['solver_used_text']) > 100) - { - form_set_error('solver_used_text', t('Maximum charater limit is 100 charaters only, please check the length of the solver used')); - } //strlen($form_state['values']['project_title']) > 250 - else if (strlen($form_state['values']['solver_used_text']) < 7) - { - form_set_error('solver_used_text', t('Minimum charater limit is 7 charaters, please check the length of the solver used')); - } //strlen($form_state['values']['project_title']) < 10 - } - else - { - form_set_error('solver_used_text', t('Solver used cannot be empty')); - } - } + } function scilab_case_study_proposal_edit_form_submit($form, &$form_state) { @@ -1141,26 +1043,21 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state) $project_title = $v['project_title']; $proposar_name = $v['name_title'] . ' ' . $v['contributor_name']; $university = $v['university']; - $directory_names = _df_dir_name($project_title, $proposar_name); - if (DF_RenameDir($proposal_id, $directory_names)) { + $directory_names = _cs_dir_name($project_title, $proposar_name); + if (CS_RenameDir($proposal_id, $directory_names)) { $directory_name = $directory_names; } //LM_RenameDir($proposal_id, $directory_names) else { return; } - $simulation_id = $v['simulation_type']; - if($simulation_id < 19){ - $solver = $v['solver_used']; - } - else{ - $solver = $v['solver_used_text']; - } + $str = substr($proposal_data->samplefilepath, strrpos($proposal_data->samplefilepath, '/')); + $resource_file = ltrim($str, '/'); + $samplefilepath = $directory_name . '/' . $resource_file; $query = "UPDATE case_study_proposal SET name_title=:name_title, contributor_name=:contributor_name, university=:university, institute=:institute, - how_did_you_know_about_project = :how_did_you_know_about_project, faculty_name = :faculty_name, faculty_department = :faculty_department, faculty_email = :faculty_email, @@ -1168,17 +1065,16 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state) pincode=:pincode, state=:state, project_title=:project_title, - version_id=:version_id, - simulation_type_id=:simulation_type_id, - solver_used=:solver_used, - directory_name=:directory_name + operating_system=:operating_system, + scilab_version=:scilab_version, + directory_name=:directory_name, + samplefilepath = :samplefilepath WHERE id=:proposal_id"; $args = array( ':name_title' => $v['name_title'], ':contributor_name' => $v['contributor_name'], ':university' => $v['university'], ":institute" => $v['institute'], - ":how_did_you_know_about_project" => $v['how_did_you_know_about_project'], ":faculty_name" => $v['faculty_name'], ":faculty_department" => $v['faculty_department'], ":faculty_email" => $v['faculty_email'], @@ -1186,10 +1082,10 @@ function scilab_case_study_proposal_edit_form_submit($form, &$form_state) ':pincode' => $v['pincode'], ':state' => $v['all_state'], ':project_title' => $project_title, - ':version_id' => $v['version'], - ':simulation_type_id' => $simulation_id, - ":solver_used" => $solver, + ':operating_system' => $v['operating_system'], + ':scilab_version' => $v['scilab_version'], ':directory_name' => $directory_name, + ':samplefilepath' => $samplefilepath, ':proposal_id' => $proposal_id, ); $result = db_query($query, $args); diff --git a/proposal.inc b/proposal.inc index 0f180d4..a699a48 100644 --- a/proposal.inc +++ b/proposal.inc @@ -86,7 +86,8 @@ function scilab_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE '#attributes' => array( 'placeholder' => t('Enter your contact number') ), - '#maxlength' => 250 + '#maxlength' => 10, + '#required' => TRUE ); $form['university'] = array( '#type' => 'textfield', @@ -240,7 +241,8 @@ function scilab_case_study_proposal_form($form, &$form_state, $no_js_use = FALSE $form['pincode'] = array( '#type' => 'textfield', '#title' => t('Pincode'), - '#size' => 6 + '#size' => 6, + '#maxlength' => 6 ); /***************************************************************************/ $form['hr'] = array( @@ -44,7 +44,7 @@ function scilab_case_study_run_form($form, &$form_state) ); $form['selected_case_study'] = array( '#type' => 'item', - '#markup' => '<div id="ajax_selected_case_study">' . l('Download Abstract', "case-study-project/download/final-report/" . $case_study_default_value) . '<br>' . l('Download Case Study', 'case-study-project/full-download/project/' . $case_study_default_value) . '</div>' + '#markup' => '<div id="ajax_selected_case_study">' . l('Download Report(PDF)', "case-study-project/download/final-report/" . $case_study_default_value) . '<br>' . l('Download Case Files and Report', 'case-study-project/full-download/project/' . $case_study_default_value) . '</div>' ); } return $form; @@ -58,7 +58,7 @@ function case_study_project_details_callback($form, $form_state) $case_study_details = _case_study_information($case_study_default_value); $provider = user_load($case_study_details->uid); if ($case_study_details->uid > 0) { - $commands[] = ajax_command_html('#ajax_selected_case_study', l('Download Abstract', "case-study-project/download/final-report/" . $case_study_default_value) . '<br>' . l('Download case study', 'case-study-project/full-download/project/' . $case_study_default_value)); + $commands[] = ajax_command_html('#ajax_selected_case_study', l('Download Report(PDF)', "case-study-project/download/final-report/" . $case_study_default_value) . '<br>' . l('Download Case Files and Report', 'case-study-project/full-download/project/' . $case_study_default_value)); } //$case_study_details->uid > 0 else { $commands[] = ajax_command_html('#ajax_selected_case_study', ''); diff --git a/scilab_case_study.module b/scilab_case_study.module index 2e7bf7a..a1ea709 100644 --- a/scilab_case_study.module +++ b/scilab_case_study.module @@ -631,9 +631,9 @@ function _cs_dir_name($project, $proposar_name) } function scilab_case_study_document_path() { - return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'scilab_uploads/case_study_uploads/'; + return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'case_study_uploads/'; } -function DF_RenameDir($proposal_id, $dir_name) +function CS_RenameDir($proposal_id, $dir_name) { $proposal_id = $proposal_id; $dir_name = $dir_name; @@ -641,6 +641,7 @@ function DF_RenameDir($proposal_id, $dir_name) ':proposal_id' => $proposal_id, )); $result = $query->fetchObject(); +// var_dump($dir_name . $result->directory_name); if ($result != null) { $files = scandir(scilab_case_study_path()); $files_id_dir = scilab_case_study_path() . $result->id; |