Merge pull request #3 from Saketh1499/developmentHEADmain

Adding second software field

3 files changed, 61 insertions, 4 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index a0fb54f..9d09864 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -160,6 +160,14 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 	else{
 		$software_versions = $software_version_data->software_versions;
 	}
+	if ($proposal_data->second_software == "NULL" || $proposal_data->second_software == "")
+	{
+		$second_software = "Not Entered";
+	} //$proposal_data->city == NULL
+	else
+	{
+		$second_software = $proposal_data->second_software;
+	}
 	$form['contributor_name'] = array(
 		'#type' => 'item',
 		'#markup' => l($proposal_data->name_title . ' ' . $proposal_data->contributor_name, 'user/' . $proposal_data->uid),
@@ -240,6 +248,11 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 		'#markup' => $proposal_data->other_software_version_no,
 		'#title' => t('Other Software Version No')
 	);
+	$form['second_software'] = array(
+		'#type' => 'item',
+		'#markup' => $second_software,
+		'#title' => t('Second Software Version')
+	);
 	$form['project_guide_name'] = array(
 		'#type' => 'item',
 		'#title' => t('Project guide'),
@@ -489,6 +502,14 @@ function science_and_concept_map_proposal_status_form($form, &$form_state)
 	{
 		$project_guide_email_id = $proposal_data->project_guide_email_id;
 	}
+	if ($proposal_data->second_software == "NULL" || $proposal_data->second_software == "")
+	{
+		$second_software = "Not Entered";
+	} //$proposal_data->city == NULL
+	else
+	{
+		$second_software = $proposal_data->second_software;
+	}
 	$query = db_select('soul_science_and_concept_map_software_version');
 	$query->fields('soul_science_and_concept_map_software_version');
 	$query->condition('id', $proposal_data->software_version);
@@ -585,6 +606,11 @@ function science_and_concept_map_proposal_status_form($form, &$form_state)
 		'#markup' => $proposal_data->other_software_version_no,
 		'#title' => t('Other Software Version No')
 	);
+	$form['second_software'] = array(
+		'#type' => 'item',
+		'#markup' => $second_software,
+		'#title' => t('Second Software Version')
+	);
 	$form['project_title'] = array(
 		'#type' => 'item',
 		'#markup' => $proposal_data->project_title,
@@ -769,6 +795,14 @@ function science_and_concept_map_proposal_edit_form($form, &$form_state)
 	else{
 		$software_versions = $software_version_data->software_versions;
 	}
+	if ($proposal_data->second_software == "NULL" || $proposal_data->second_software == "")
+	{
+		$second_software = "Not Entered";
+	} //$proposal_data->city == NULL
+	else
+	{
+		$second_software = $proposal_data->second_software;
+	}
 	$user_data = user_load($proposal_data->uid);
 	$form['name_title'] = array(
 		'#type' => 'select',
@@ -940,6 +974,11 @@ function science_and_concept_map_proposal_edit_form($form, &$form_state)
 		'#markup' => $proposal_data->other_software_version_no,
 		'#title' => t('Other Software Version No')
 	);
+	$form['second_software'] = array(
+		'#type' => 'item',
+		'#markup' => $second_software,
+		'#title' => t('Second Software Version')
+	);
 	$form['project_title'] = array(
 		'#type' => 'textarea',
 		'#title' => t('Title of the science and concept map Project'),
diff --git a/proposal.inc b/proposal.inc
index e9a8cc9..738c9b1 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -303,7 +303,11 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 			)
 		)
 	);
-
+	$form['second_software'] = array(
+		'#type' => 'select',
+		'#title' => t('Select Second Software (If applicable)'),
+		'#options' => _soul_list_of_second_software_version()
+	);
 	$form['project_title'] = array(
 		'#type' => 'textarea',
 		'#title' => t('Project Title'),
@@ -591,8 +595,6 @@ function science_and_concept_map_proposal_form_submit($form, &$form_state)
 	{
 		$other_software_version_no = 'None';
 	}
-
-	
 	$result = "INSERT INTO {soul_science_and_concept_map_proposal} 
     (
     uid, 
@@ -617,6 +619,7 @@ function science_and_concept_map_proposal_form_submit($form, &$form_state)
     software_version,
     software_version_no,
     other_software_version_no,
+    second_software,
     directory_name,
     approval_status,
     is_completed, 
@@ -650,6 +653,7 @@ function science_and_concept_map_proposal_form_submit($form, &$form_state)
     :software_version,
     :software_version_no,
     :other_software_version_no,
+    :second_software,
     :directory_name,
     :approval_status,
     :is_completed, 
@@ -683,6 +687,7 @@ function science_and_concept_map_proposal_form_submit($form, &$form_state)
 		":software_version" =>$v['software_version'],		
 		":software_version_no" =>$software_version_no,
 		":other_software_version_no" => $other_software_version_no,
+		":second_software" => $v['second_software'],
 		":directory_name" => $directory_name,
 		":approval_status" => 0,
 		":is_completed" => 0,
diff --git a/science_and_concept_map.module b/science_and_concept_map.module
index 8d2d4e3..71f4ae4 100755
--- a/science_and_concept_map.module
+++ b/science_and_concept_map.module
@@ -773,7 +773,20 @@ function _df_list_of_departments()
 	} //$department_list_data = $department_list->fetchObject()
 	return $department;
 }
-
+function _soul_list_of_second_software_version()
+{
+    $second_software = array(
+		0 => '-Select-'
+	);
+    $query = db_select('soul_science_and_concept_map_second_software');
+    $query->fields('soul_science_and_concept_map_second_software');
+    $second_software_list = $query->execute();
+    while ($second_software_list_data = $second_software_list->fetchObject())
+      {
+        $second_software[$second_software_list_data->second_software] = $second_software_list_data->second_software;
+      }
+    return $second_software;
+}
 function _soul_list_of_category()
   {
     $category = array();