Modiy link to proposal terms, add link to download abstract in Download codes

5 files changed, 11 insertions, 10 deletions

diff --git a/custom_model_details.inc b/custom_model_details.inc
index 19cb3a0..893e0d7 100755
--- a/custom_model_details.inc
+++ b/custom_model_details.inc
@@ -23,13 +23,13 @@ function custom_model_completed_proposals_all()
 		while ($row = $result->fetchObject())
 		{
 			$proposal_id = $row->id;
-			$approval_date = date("Y", $row->approval_date);
+			$completion_date = date("Y", $row->actual_completion_date);
 			$preference_rows[] = array(
 				$i,
 				l($row->project_title, "custom-model/custom-model-run/" . $row->id),
 				$row->contributor_name,
 				$row->university,
-				$approval_date
+				$completion_date
 			);
 			$i++;
 		} //$row = $result->fetchObject()
@@ -37,8 +37,8 @@ function custom_model_completed_proposals_all()
 			'No',
 			'Custom Model Project',
 			'Contributor Name',
-			'Institute',
-			'Year'
+			'University / Institute',
+			'Year of Completion'
 		);
 		$output .= theme('table', array(
 			'header' => $preference_header,
@@ -79,9 +79,9 @@ function custom_model_progress_all()
 		} //$row = $result->fetchObject()
 		$preference_header = array(
 			'No',
-			'custom model Project',
+			'Custom Model Project',
 			'Contributor Name',
-			'Institute',
+			'University / Institute',
 			'Year'
 		);
 		$page_content .= theme('table', array(
diff --git a/download.inc b/download.inc
index e81d822..ab19921 100755
--- a/download.inc
+++ b/download.inc
@@ -35,6 +35,7 @@ function custom_model_project_files() {
 	$query = db_select('custom_model_submitted_abstracts_file');
 	$query->fields('custom_model_submitted_abstracts_file');
 	$query->condition('proposal_id', $proposal_id);
+	$query->condition('filetype', A);
 	$result = $query->execute();
 	$custom_model_project_files = $result->fetchObject();
 	//var_dump($custom_model_project_files);die;
diff --git a/idea_proposal.inc b/idea_proposal.inc
index 1b0649e..5d37731 100644
--- a/idea_proposal.inc
+++ b/idea_proposal.inc
@@ -202,7 +202,7 @@ function custom_model_idea_proposal_form($form, &$form_state, $no_js_use = FALSE
 		'#type' => 'checkboxes',
 		'#title' => t('Terms And Conditions'),
 		'#options' => array(
-			'status' => t('<a href="/term-and-conditions" target="_blank">I agree to the Terms and Conditions</a>')
+			'status' => t('<a href="https://dwsim.fossee.in/custom-model/idea/term-and-conditions" target="_blank">I agree to the Terms and Conditions</a>')
 		),
 		'#required' => TRUE
 	);
diff --git a/proposal.inc b/proposal.inc
index 3dcfa5b..94d58e4 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -253,7 +253,7 @@ function custom_model_proposal_form($form, &$form_state, $no_js_use = FALSE)
 		'#type' => 'checkboxes',
 		'#title' => t('Terms And Conditions'),
 		'#options' => array(
-			'status' => t('<a href="/term-and-conditions" target="_blank">I agree to the Terms and Conditions</a>')
+			'status' => t('<a href="https://dwsim.fossee.in/custom-model/term-and-conditions" target="_blank">I agree to the Terms and Conditions</a>')
 		),
 		'#required' => TRUE
 	);
diff --git a/run.inc b/run.inc
index 1e0aa7f..0a35749 100755
--- a/run.inc
+++ b/run.inc
@@ -44,7 +44,7 @@ function custom_model_run_form($form, &$form_state)
 		);
 		$form['selected_custom_model'] = array(
 			'#type' => 'item',
-			'#markup' => '<div id="ajax_selected_custom_model">' . l('Download Custom Model', 'custom-model/full-download/project/' . $custom_model_default_value) . '</div>'
+			'#markup' => '<div id="ajax_selected_custom_model">' . l('Download Abstract', 'custom-model/download/project-file/' . $custom_model_default_value) . '<br>' . l('Download Custom Model', 'custom-model/full-download/project/' . $custom_model_default_value) . '</div>'
 		);
 	}
 	return $form;
@@ -58,7 +58,7 @@ function custom_model_project_details_callback($form, $form_state)
 		$custom_model_details = _custom_model_information($custom_model_default_value);
 		$provider = user_load($custom_model_details->uid);
 		if ($custom_model_details->uid > 0) {
-			$commands[] = ajax_command_html('#ajax_selected_custom_model', l('Download Custom Model', 'custom-model/full-download/project/' . $custom_model_default_value));
+			$commands[] = ajax_command_html('#ajax_selected_custom_model',l('Download Abstract', 'custom-model/download/project-file/' . $custom_model_default_value) . '<br>' . l('Download Custom Model', 'custom-model/full-download/project/' . $custom_model_default_value));
 		} //$custom_model_details->uid > 0
 		else {
 			$commands[] = ajax_command_html('#ajax_selected_custom_model', '');