Merge pull request #12 from Saketh1499/development

Adding Operating System field in proposal form

3 files changed, 50 insertions, 5 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index ebc3ebe..634af0b 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -253,6 +253,16 @@ function lab_migration_proposal_approval_form($form, $form_state)
         '#markup' => $proposal_data->pincode,
         '#title' => t('Pincode/Postal code')
     );
+    $form['operating_system'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->operating_system,
+        '#title' => t('Operating System')
+    );
+    $form['version'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->r_version,
+        '#title' => t('R Version')
+    );
     $form['lab_title'] = array(
         '#type' => 'item',
         '#markup' => $proposal_data->lab_title,
@@ -526,6 +536,16 @@ function lab_migration_proposal_status_form($form, $form_state)
         '#markup' => $proposal_data->pincode,
         '#title' => t('Pincode/Postal code')
     );
+    $form['operating_system'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->operating_system,
+        '#title' => t('Operating System')
+    );
+    $form['version'] = array(
+        '#type' => 'item',
+        '#markup' => $proposal_data->r_version,
+        '#title' => t('R Version')
+    );
     $form['lab_title'] = array(
         '#type' => 'item',
         '#markup' => $proposal_data->lab_title,
@@ -939,6 +959,17 @@ function lab_migration_proposal_edit_form($form, $form_state)
             'placeholder' => 'Insert pincode of your city/ village....'
         )
     );
+    $form['operating_system'] = array(
+        '#type' => 'textfield',
+        '#default_value' => $proposal_data->operating_system,
+        '#title' => t('Operating System')
+    );
+    $form['version'] = array(
+        '#type' => 'select',
+        '#title' => t('R Version'),
+        '#options' => _lm_list_of_software_version(),
+        '#markup' => $proposal_data->r_version
+    );
 
     $form['lab_title'] = array(
         '#type' => 'textfield',
@@ -1214,6 +1245,8 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
         'city' => $v['city'],
         'pincode' => $v['pincode'],
         'state' => $v['all_state'],
+        ":operating_system" => $v['operating_system'],
+        ":r_version" => $form_state['values']['version'],
         'lab_title' => $v['lab_title'],
         'solution_display' => $solution_display,
         'directory_name' => $directory_name
diff --git a/proposal.inc b/proposal.inc
index 932e598..381b40e 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -206,9 +206,16 @@ function lab_migration_proposal_form($form, &$form_state)
         '#type' => 'item',
         '#markup' => '<hr>'
     );
+    $form['operating_system'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Operating System'),
+        '#size' => 30,
+        '#maxlength' => 100,
+        '#required' => TRUE
+    );
     $form['version'] = array(
         '#type' => 'select',
-        '#title' => t('Version'),
+        '#title' => t('R Version'),
         '#options' => _lm_list_of_software_version(),
         '#required' => TRUE
     );
@@ -226,7 +233,6 @@ function lab_migration_proposal_form($form, &$form_state)
             )
         )
     );
-
     $form['syllabus_copy'] = array(
         '#type' => 'fieldset',
         '#title' => t('<span class="form-required form-item" title="This field is required.">Syllabus copy (PDF) Files *</span>'),
@@ -329,6 +335,11 @@ function lab_migration_proposal_form($form, &$form_state)
         '#description' => 'If yes, solutions will be made available to everyone for downloading.',
         '#disabled' => FALSE
     );
+    $form['sample_syllabus_file'] = array(
+        '#type' => 'item',
+        '#title' => t('<h5>Ideal Sample Lab Migration Submission</h5>'),
+        '#markup' => t('Kindly refer to the ') . t('<a href= "https://r.fossee.in/lab-migration/lab-migration-run/12" target="_blank">Sample Lab Migration (Statistical Quality Control using R)</a> and <a href= "https://r.fossee.in/lab-migration/lab-migration-run/6" target="_blank">Sample Lab Migration (Analysis using R)</a>') . '' . t(' to know the ideal submission.')
+    );
     $form['submit'] = array(
         '#type' => 'submit',
         '#value' => t('Submit')
@@ -494,8 +505,8 @@ function lab_migration_proposal_form_submit($form, &$form_state)
     $university = $v['university'];    
     $directory_name = _lm_dir_name($lab_title, $proposar_name, $university);
     $result = "INSERT INTO {lab_migration_proposal} 
-    (uid, approver_uid, name_title, name, contact_ph, department, university, city, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name,syllabus_copy_file_path) VALUES
-    (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :pincode, :state, :country,
+    (uid, approver_uid, name_title, name, contact_ph, department, university, city, pincode, state, country, operating_system, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name,syllabus_copy_file_path) VALUES
+    (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :pincode, :state, :country, :operating_system, 
      :r_version, :lab_title, :approval_status, :solution_status, :solution_provider_uid, :solution_display, :creation_date, 
      :approval_date, :solution_date, :solution_provider_name_title, :solution_provider_name,
       :solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name,:syllabus_copy_file_path)";
@@ -511,6 +522,7 @@ function lab_migration_proposal_form_submit($form, &$form_state)
         ":pincode" => $v['pincode'],
         ":state" => $v['all_state'],
         ":country" => $v['country'],
+        ":operating_system" => $v['operating_system'],
         ":r_version" => $form_state['values']['version'],
         ":lab_title" => $v['lab_title'],
         ":approval_status" => 0,
diff --git a/run.inc b/run.inc
index 67ab8ea..44ae20f 100755
--- a/run.inc
+++ b/run.inc
@@ -513,7 +513,7 @@ function _lab_details($lab_default_value)
           drupal_goto('lab-migration/lab-migration-run');
           
       }
-    $form['lab_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Lab</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $lab_details->name_title . ' ' . $lab_details->name . '</li>' . '<li><strong>Title of the Lab:</strong> ' . $lab_details->lab_title . '</li>' . '<li><strong>Department:</strong> ' . $lab_details->department . '</li>' . '<li><strong>University:</strong> ' . $lab_details->university . '</li>' . '<li><strong>Category:</strong> ' . $lab_details->category . '</li>' . '</ul>' . $solution_provider;
+    $form['lab_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Lab</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $lab_details->name_title . ' ' . $lab_details->name . '</li>' . '<li><strong>Title of the Lab:</strong> ' . $lab_details->lab_title . '</li>' . '<li><strong>Department:</strong> ' . $lab_details->department . '</li>' . '<li><strong>University:</strong> ' . $lab_details->university . '</li>' . '<li><strong>R Version:</strong> ' . $lab_details->r_version . '</li>' . '<li><strong>Operating System:</strong> ' . $lab_details->operating_system . '</li>' . '</ul>' . $solution_provider;
     $details = $form['lab_details']['#markup'];
     return $details;
     }