display textbook details in approval form

2 files changed, 100 insertions, 19 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index c6a6b26..7d2e601 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -111,6 +111,11 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 	global $user;
 	/* get current proposal */
 	$proposal_id = (int) arg(3);
+	$query = db_select('soul_science_and_concept_map_textbook_details');
+	$query ->fields('soul_science_and_concept_map_textbook_details');
+	$query-> condition('proposal_id', $proposal_id);
+	$book_q = $query->execute();
+	$book_data = $book_q->fetchObject();
 	$query = db_select('soul_science_and_concept_map_proposal');
 	$query->fields('soul_science_and_concept_map_proposal');
 	$query->condition('id', $proposal_id);
@@ -150,6 +155,22 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 	{
 		$project_guide_email_id = $proposal_data->project_guide_email_id;
 	}
+	if ($proposal_data->project_guide_department == "NULL" || $proposal_data->project_guide_department == "")
+	{
+		$project_guide_department = "Not Entered";
+	} //$proposal_data->project_guide_email_id == NULL
+	else
+	{
+		$project_guide_department = $proposal_data->project_guide_department;
+	}
+	if ($proposal_data->project_guide_university == "NULL" || $proposal_data->project_guide_university == "")
+	{
+		$project_guide_university = "Not Entered";
+	} //$proposal_data->project_guide_email_id == NULL
+	else
+	{
+		$project_guide_university = $proposal_data->project_guide_university;
+	}
 	$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);
@@ -238,22 +259,22 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 	$form['project_guide_name'] = array(
 		'#type' => 'item',
 		'#title' => t('Name of the faculty member of your Institution, if any, who helped you with this project '),
-		'#markup' => $proposal_data->project_guide_name
+		'#markup' => $project_guide_name
 	);
 	$form['project_guide_department'] = array(
 		'#type' => 'item',
 		'#title' => t('Department of the faculty member of your Institution, if any, who helped you with this project '),
-		'#markup' => $proposal_data->project_guide_department
+		'#markup' => $project_guide_department
 	);
 	$form['project_guide_email_id'] = array(
 		'#type' => 'item',
 		'#title' => t('Email id of the faculty member of your Institution, if any, who helped you with this project'),
-		'#markup' =>$proposal_data->project_guide_email_id
+		'#markup' =>$project_guide_email_id
 	);
 	$form['project_guide_university'] = array(
 		'#type' => 'item',
 		'#title' => t('University name of the faculty member of your Institution, if any, who helped you with this project'),
-		'#markup' =>$proposal_data->project_guide_university
+		'#markup' =>$project_guide_university
 	);
 	$form['options'] = array(
 		'#type' => 'item',
@@ -290,20 +311,42 @@ function science_and_concept_map_proposal_approval_form($form, &$form_state)
 		'#markup' => $second_software,
 		'#title' => t('Second Software Version')
 	);
-	$form['project_guide_name'] = array(
-		'#type' => 'item',
-		'#title' => t('Project guide'),
-		'#markup' => $project_guide_name
-	);
-	$form['project_guide_email_id'] = array(
-		'#type' => 'item',
-		'#title' => t('Project guide email'),
-		'#markup' => $project_guide_email_id
-	);
-	$form['project_guide_university'] = array(
+	if($proposal_data->is_ncert_book == 'Yes'){
+		$form['book_name'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->book,
+			'#title' => t('Book name')
+		);
+		$form['author_name'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->author,
+			'#title' => t('Author name')
+		);
+		$form['isbn_no'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->isbn,
+			'#title' => t('ISBN no.')
+		);
+		$form['publisher'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->publisher,
+			'#title' => t('Publisher and place')
+		);
+		$form['edition'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->edition,
+			'#title' => t('Edition of a book')
+		);
+		$form['book_year'] = array(
+			'#type' => 'item',
+			'#markup' => $book_data->book_year,
+			'#title' => t('Year of publication')
+		);
+	}
+	$form['year_of_study'] = array(
 		'#type' => 'item',
-		'#title' => t('Project guide university'),
-		'#markup' => $project_guide_university
+		'#markup' => $book_data->year_of_study,
+		'#title' => t('The project is suitable for class (school education)/year of study(college education)')
 	);
 	$form['project_title'] = array(
 		'#type' => 'item',
diff --git a/proposal.inc b/proposal.inc
index 0933a7b..11915c7 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -346,7 +346,8 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#title' => t('Title of the book'),
 		'#size' => 30,
 		'#maxlength' => 100,
-		// '#required' => TRUE
+		'#required' => TRUE,
+		'#validated' => TRUE
 	);
 	$form['preference1']['author1'] = array(
 		'#type' => 'textfield',
@@ -362,6 +363,8 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#title' => t('ISBN No'),
 		'#size' => 30,
 		'#maxlength' => 25,
+		'#required' => TRUE,
+		'#validated' => TRUE
 		// '#required' => TRUE
 		// '#value' => $row1->isbn,
 		// '#disabled' => ($row1->isbn?TRUE:FALSE),
@@ -371,6 +374,8 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#title' => t('Publisher & Place'),
 		'#size' => 30,
 		'#maxlength' => 50,
+		'#required' => TRUE,
+		'#validated' => TRUE
 		// '#required' => TRUE
 		//'#value' => $row1->publisher,
 	);
@@ -379,6 +384,8 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#title' => t('Edition'),
 		'#size' => 4,
 		'#maxlength' => 2,
+		'#required' => TRUE,
+		'#validated' => TRUE
 		// '#required' => TRUE
 		//'#value' => $row1->edition,
 	);
@@ -387,6 +394,8 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#title' => t('Year of publication'),
 		'#size' => 4,
 		'#maxlength' => 4,
+		'#required' => TRUE,
+		'#validated' => TRUE
 		// '#required' => TRUE
 		//'#value' => $row1->year,
 	);
@@ -397,7 +406,7 @@ function science_and_concept_map_proposal_form($form, &$form_state, $no_js_use =
 		'#options' =>_df_list_of_classes(),
 		'#default_value' => '-select-',
 		'#tree' => TRUE,
-		// '#required' => TRUE
+		'#required' => TRUE
 	);
 	/*************************************** */
 	$form['project_title'] = array(
@@ -649,6 +658,35 @@ if (isset($_FILES['files']))
 			} //$file_name
 		} //$_FILES['files']['name'] as $file_form_name => $file_name
 	} 
+	//     
+	if ($form_state['values']['is_ncert_book'] == 'Yes') {
+		$preference1 = $form_state['values'];
+		if ($preference1['book1'] == '') {
+
+			form_set_error('book1', t('Title of the book is required.'));
+
+		}
+		if ($preference1['isbn1'] == '') {
+
+			form_set_error('isbn1', t('ISBN No is required.'));
+
+		}
+		if ($preference1['publisher1'] == '') {
+
+			form_set_error('publisher1', t('Publisher & Place is required.'));
+
+		}
+		if ($preference1['edition1'] == '') {
+
+			form_set_error('edition1', t('Edition is required.'));
+
+		}
+		if ($preference1['book_year'] == '') {
+
+			form_set_error('book_year', t('Year of publication is required.'));
+
+		}
+	}
 	return $form_state;
 }
 function science_and_concept_map_proposal_form_submit($form, &$form_state)