Merge pull request #4 from Saketh1499/developmentHEADmain

Adding freeplane option in software version in proposal form

4 files changed, 53 insertions, 13 deletions

diff --git a/chemistry_lab.install b/chemistry_lab.install
index 2c0d6b0..da2f930 100644
--- a/chemistry_lab.install
+++ b/chemistry_lab.install
@@ -284,7 +284,7 @@ function chemistry_lab_schema()
                 'length' => '50',
                 'not null' => TRUE
             ),
-            'soul_version' => array(
+            'software_version' => array(
                 'description' => t('TODO: please describe this field!'),
                 'type' => 'varchar',
                 'length' => '20',
diff --git a/chemistry_lab.module b/chemistry_lab.module
index fe10645..1fe8487 100755
--- a/chemistry_lab.module
+++ b/chemistry_lab.module
@@ -773,6 +773,22 @@ function _df_list_of_departments()
 	} //$department_list_data = $department_list->fetchObject()
 	return $department;
 }
+
+function _soul_list_of_software_version()
+  {
+    $software_version = array();
+    $query = db_select('soul_software_version');
+    $query->fields('soul_software_version');
+    //$query->orderBy('id', 'DESC');
+    $software_version_list = $query->execute();
+    while ($software_version_list_data = $software_version_list->fetchObject())
+      {
+        $software_version[$software_version_list_data->software_version] = $software_version_list_data->software_version;
+      }
+    return $software_version;
+  }
+
+
 function _df_dir_name($project, $proposar_name)
 {
 	$project_title = ucname($project);
diff --git a/manage_proposal.inc b/manage_proposal.inc
index d496af5..4da54d3 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -825,6 +825,34 @@ function chemistry_lab_proposal_edit_form($form, &$form_state)
 	);
 	return $form;
 }
+
+function chemistry_lab_proposal_edit_form_validate($form, &$form_state)
+{
+	//Validation for project title
+	$form_state['values']['project_title'] = trim($form_state['values']['project_title']);
+	if ($form_state['values']['project_title'] != '')
+	{
+		if (strlen($form_state['values']['project_title']) > 250)
+		{
+			form_set_error('project_title', t('Maximum charater limit is 250 charaters only, please check the length of the project title'));
+		} //strlen($form_state['values']['project_title']) > 250
+		else if (strlen($form_state['values']['project_title']) < 10)
+		{
+			form_set_error('project_title', t('Minimum charater limit is 10 charaters, please check the length of the project title'));
+		} //strlen($form_state['values']['project_title']) < 10
+	} //$form_state['values']['project_title'] != ''
+	else
+	{
+		form_set_error('project_title', t('Project title shoud not be empty'));
+	}
+	if(preg_match('/[\^£$%&*()}{@#~?><>.:;`|=+¬]/', $form_state['values']['project_title']))
+	{
+		form_set_error('project_title', t('Special characters are not allowed for Project Title'));
+	} 
+		return $form_state;
+}
+
+
 function chemistry_lab_proposal_edit_form_submit($form, &$form_state)
 {
 	global $user;
diff --git a/proposal.inc b/proposal.inc
index 32ccdf9..011d7d4 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -32,7 +32,7 @@ function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
 	{
 		$msg = drupal_set_message(t('It is mandatory to ' . l('login', 'user') . ' on this website to access the chemistry lab proposal form. If you are new user please create a new account first.'), 'error');
 		//drupal_goto('soul-chemistry-lab-project');
-		drupal_goto('user');
+		drupal_goto('user/login', array('query' => drupal_get_destination()));
 		return $msg;
 	} //$user->uid == 0
 	$query = db_select('soul_chemistry_lab_proposal');
@@ -283,12 +283,8 @@ function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
 	$form['software_version'] = array(
 		'#type' => 'select',
 		'#title' => t('Software Version'),
-		'#options' => array(
-			'vlab 2.1.0' => 'vlab 2.1.0'
-		),
-		'#required' => TRUE,
-		'#tree' => TRUE,
-		//'#validated' => TRUE
+		'#options' => _soul_list_of_software_version(),
+        '#required' => TRUE
 	);
 	$form['samplefile'] = array(
 		'#type' => 'fieldset',
@@ -440,6 +436,10 @@ function chemistry_lab_proposal_form_validate($form, &$form_state)
 	{
 		form_set_error('project_title', t('Project title shoud not be empty'));
 	}
+	if(preg_match('/[\^£$%&*()}{@#~?><>.:;`|=+¬]/', $form_state['values']['project_title']))
+	{
+		form_set_error('project_title', t('Special characters are not allowed for Project Title'));
+	} 
 	$form_state['values']['description'] = trim($form_state['values']['description']);
 	if ($form_state['values']['description'] != '')
 	{
@@ -503,10 +503,6 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
 		drupal_set_message('It is mandatory to login on this website to access the proposal form', 'error');
 		return;
 	} //!$user->uid
-	if ($form_state['values']['version'] == 'Old version')
-	{
-		$form_state['values']['version'] = trim($form_state['values']['older']);
-	} //$form_state['values']['version'] == 'Old version'
 	/* inserting the user proposal */
 	$v = $form_state["values"];
 	$project_title = trim($v['project_title']);
@@ -593,7 +589,7 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
 		":options" =>$v['options'],
 		":project_title" => _df_sentence_case($v['project_title']),
 		":description" => _df_sentence_case($v['description']),
-		":software_version" =>$v['software_version'],
+		":software_version" =>$form_state['values']['software_version'],
 		":directory_name" => $directory_name,
 		":approval_status" => 0,
 		":is_completed" => 0,