From 94a8e234373df9808982b1801c10c0e0e4761b31 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Thu, 9 Sep 2021 10:04:03 +0530
Subject: Updating proposal form with country fields
---
chemistry_lab.module | 82 ++++++++++++--------------
manage_proposal.inc | 27 +++------
proposal.inc | 159 +++++----------------------------------------------
3 files changed, 60 insertions(+), 208 deletions(-)
diff --git a/chemistry_lab.module b/chemistry_lab.module
index 638179d..fe10645 100755
--- a/chemistry_lab.module
+++ b/chemistry_lab.module
@@ -714,58 +714,52 @@ function _df_sentence_case($string)
} //array( '-', '\'' ) as $delimiter
return $string;
}
-function _soul_list_of_city_pincode($city=Null, $state=NULL, $district=NULL)
+function _df_list_of_states()
{
- $pincode = array();
- if($city){
- $pincode_list = db_query("SELECT pincode FROM all_india_pincode WHERE city = :city AND state = :state AND district = :district", array(':city' => $city,':state'=> $state, ':district' => $district));
- while ($pincode_list_data = $pincode_list->fetchObject())
- {
- $pincode[$pincode_list_data->pincode] = $pincode_list_data->pincode;
- }
- }
- else{
- $pincode[000000] = '000000';
- }
- return $pincode;
+ $states = array(
+ 0 => '-Select-'
+ );
+ $query = db_select('list_states_of_india');
+ $query->fields('list_states_of_india');
+ //$query->orderBy('', '');
+ $states_list = $query->execute();
+ while ($states_list_data = $states_list->fetchObject())
+ {
+ $states[$states_list_data->state] = $states_list_data->state;
+ } //$states_list_data = $states_list->fetchObject()
+ return $states;
}
-
-function _soul_list_of_cities($state=Null, $district=NULL)
+function _df_list_of_cities()
{
- $city = array(''=> '- Select -');
- if($state){
- $city_list = db_query("SELECT city FROM all_india_pincode WHERE state = :state AND district = :district ORDER BY city ASC", array(':state'=> $state, ':district' =>$district));
- while ($city_list_data = $city_list->fetchObject())
- {
- $city[$city_list_data->city] = $city_list_data->city;
- }
- }
+ $city = array(
+ 0 => '-Select-'
+ );
+ $query = db_select('list_cities_of_india');
+ $query->fields('list_cities_of_india');
+ $query->orderBy('city', 'ASC');
+ $city_list = $query->execute();
+ while ($city_list_data = $city_list->fetchObject())
+ {
+ $city[$city_list_data->city] = $city_list_data->city;
+ } //$city_list_data = $city_list->fetchObject()
return $city;
}
-
-function _soul_list_of_district($state=Null)
-{
- $district = array(''=> '- Select -');
- if($state){
- $district_list = db_query("SELECT district FROM all_india_pincode WHERE state = :state ORDER BY district ASC", array(':state'=> $state));
- while ($district_list_data = $district_list->fetchObject())
- {
- $district[$district_list_data->district] = $district_list_data->district;
- }
- }
- return $district;
-}
-
-function _soul_list_of_states()
+function _df_list_of_pincodes()
{
- $states = array(''=> '- Select -');
- $states_list = db_query("SELECT state FROM all_india_pincode WHERE country = 'India' ORDER BY state ASC");
- while ($states_list_data = $states_list->fetchObject())
+ $pincode = array(
+ 0 => '-Select-'
+ );
+ $query = db_select('list_of_all_india_pincode');
+ $query->fields('list_of_all_india_pincode');
+ $query->orderBy('pincode', 'ASC');
+ $pincode_list = $query->execute();
+ while ($pincode_list_data = $pincode_list->fetchObject())
{
- $states[$states_list_data->state] = $states_list_data->state;
- }
- return $states;
+ $pincode[$pincode_list_data->pincode] = $pincode_list_data->pincode;
+ } //$pincode_list_data = $pincode_list->fetchObject()
+ return $pincode;
}
+
function _df_list_of_departments()
{
$department = array();
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 041d5d7..d496af5 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -200,11 +200,6 @@ function chemistry_lab_proposal_approval_form($form, &$form_state)
'#markup' => $proposal_data->city,
'#title' => t('City')
);
- $form['district'] = array(
- '#type' => 'item',
- '#markup' => $proposal_data->district,
- '#title' => t('District')
- );
$form['pincode'] = array(
'#type' => 'item',
'#markup' => $proposal_data->pincode,
@@ -464,11 +459,6 @@ function chemistry_lab_proposal_status_form($form, &$form_state)
'#markup' => $proposal_data->city,
'#title' => t('City')
);
- $form['District'] = array(
- '#type' => 'item',
- '#markup' => $proposal_data->district,
- '#title' => t('District')
- );
$form['pincode'] = array(
'#type' => 'item',
'#markup' => $proposal_data->pincode,
@@ -714,19 +704,19 @@ function chemistry_lab_proposal_edit_form($form, &$form_state)
'India' => 'India',
'Others' => 'Others'
),
+ '#default_value' => $proposal_data->country,
'#required' => TRUE,
'#tree' => TRUE,
- '#validated' => TRUE,
- '#default_value' => $proposal_data->country
+ '#validated' => TRUE
);
$form['other_country'] = array(
'#type' => 'textfield',
'#title' => t('Other than India'),
'#size' => 100,
+ '#default_value' => $proposal_data->country,
'#attributes' => array(
'placeholder' => t('Enter your country name')
),
- '#default_value' => $proposal_data->country,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -770,9 +760,9 @@ function chemistry_lab_proposal_edit_form($form, &$form_state)
$form['all_state'] = array(
'#type' => 'select',
'#title' => t('State'),
- '#options' => _soul_list_of_states(),
- '#validated' => TRUE,
+ '#options' => _df_list_of_states(),
'#default_value' => $proposal_data->state,
+ '#validated' => TRUE,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -784,7 +774,7 @@ function chemistry_lab_proposal_edit_form($form, &$form_state)
$form['city'] = array(
'#type' => 'select',
'#title' => t('City'),
- '#options' => _soul_list_of_cities(),
+ '#options' => _df_list_of_cities(),
'#default_value' => $proposal_data->city,
'#states' => array(
'visible' => array(
@@ -800,11 +790,10 @@ function chemistry_lab_proposal_edit_form($form, &$form_state)
'#size' => 30,
'#maxlength' => 6,
'#default_value' => $proposal_data->pincode,
- '#required' => False,
'#attributes' => array(
- 'placeholder' => 'Enter pincode....'
+ 'placeholder' => 'Insert pincode of your city/ village....'
)
- );
+ );
$form['project_title'] = array(
'#type' => 'textarea',
'#title' => t('Title of the chemistry lab Project'),
diff --git a/proposal.inc b/proposal.inc
index 32805d7..f27a4a1 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -27,15 +27,6 @@ chemistry_lab_solution : approval_status
function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
{
global $user;
- $form = array();
- $state = _soul_list_of_states();
- $selected_state = isset($form_state['values']['all_state'])?$form_state['values']['all_state']:key($state);
- $district = _soul_list_of_district();
- $selected_district = isset($form_state['values']['district'])?$form_state['values']['district']:key($district);
- $city = _soul_list_of_cities();
- $selected_city = isset($form_state['values']['city'])?$form_state['values']['city']:key($city);
- $pincode = _soul_list_of_city_pincode();
- $selected_pincode = isset($form_state['values']['picode'])?$form_state['values']['pincode']:key($pincode);
/************************ start approve book details ************************/
if ($user->uid == 0)
{
@@ -125,14 +116,8 @@ function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
'#title' => t('Country'),
'#options' => array(
'India' => 'India',
- //'Others' => 'Others'
+ 'Others' => 'Others'
),
- '#default_value' => 'India',
- '#prefix' => '',
- '#suffix' => '
',
- '#ajax' => array(
- 'callback' => 'ajax_get_city_list_callback',
- ),
'#required' => TRUE,
'#tree' => TRUE,
'#validated' => TRUE
@@ -184,17 +169,8 @@ function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
);
$form['all_state'] = array(
'#type' => 'select',
- '#title' => t('State/UT'),
- '#options' => _soul_list_of_states(),
- //'#empty_value' => '0',
- //'#empty_option' => '- Select -',
- '#default_value' => '0',
- '#prefix' => '',
- '#suffix' => '
',
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_district_list_callback',
- ),
+ '#title' => t('State'),
+ '#options' => _df_list_of_states(),
'#validated' => TRUE,
'#states' => array(
'visible' => array(
@@ -204,66 +180,25 @@ function chemistry_lab_proposal_form($form, &$form_state, $no_js_use = FALSE)
)
)
);
- $form['district'] = array(
- '#type' => 'select',
- '#title' => t('District/Area'),
- '#options' => _soul_list_of_district($selected_state),
- '#empty_value' => '0',
- '#empty_option' => '- Select -',
- '#prefix' => '',
- '#suffix' => '
',
- '#validated' => TRUE,
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_city_list_callback',
- ),
- '#states' => array(
- 'invisible' => array(
- ':input[name="all_state"]' => array(
- 'value' => '0'
- )
- )
- )
- );
$form['city'] = array(
'#type' => 'select',
- '#title' => t('City/Area'),
- '#options' => _soul_list_of_cities($selected_state, $selected_district),
- '#default_value' => '0',
- '#empty_value' => '0',
- '#empty_option' => '- Select -',
- '#prefix' => '',
- '#suffix' => '
',
- '#validated' => TRUE,
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_city_pincode_list_callback',
- ),
+ '#title' => t('City'),
+ '#options' => _df_list_of_cities(),
'#states' => array(
- 'invisible' => array(
- ':input[name="district"]' => array(
- 'value' => '0'
+ 'visible' => array(
+ ':input[name="country"]' => array(
+ 'value' => 'India'
)
)
)
);
$form['pincode'] = array(
- '#type' => 'select',
+ '#type' => 'textfield',
'#title' => t('Pincode'),
- '#options' => _soul_list_of_city_pincode($selected_city, $selected_state, $selected_district),
- '#prefix' => '',
- '#suffix' => '
',
- '#empty_value' => '0',
- '#empty_option' => '- Select -',
- '#required' => TRUE,
- '#validated' => TRUE,
- '#states' => array(
- 'invisible' => array(
- ':input[name="city"]' => array(
- 'value' => '0'
- )
- )
- )
+ '#attributes' => array(
+ 'placeholder' => t('Enter Pincode')
+ ),
+ '#size' => 6
);
/***************************************************************************/
$form['hr'] = array(
@@ -591,7 +526,6 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
university,
department,
city,
- district,
state,
country,
pincode,
@@ -620,8 +554,7 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
:contact_no,
:university,
:department,
- :city,
- :district,
+ :city,
:state,
:country,
:pincode,
@@ -651,7 +584,6 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
":university" => _df_sentence_case($v['university']),
":department" => $v['department'],
":city" => $v['city'],
- ":district" => $v['district'],
":pincode" => $v['pincode'],
":state" => $v['all_state'],
":country" => $v['country'],
@@ -742,66 +674,3 @@ function chemistry_lab_proposal_form_submit($form, &$form_state)
drupal_set_message(t('We have received your soul chemistry lab proposal. We will get back to you soon.'), 'status');
drupal_goto('');
}
-
-
-function ajax_get_city_list_callback($form, $form_state)
-{
- $state_default_value = $form_state['values']['all_state'];
- $district_default_value = $form_state['values']['district'];
- if ($district_default_value != '0')
- {
- $form['city']['#options'] = _soul_list_of_cities($state_default_value, $district_default_value);
- $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
- $form['pincode']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
- }else{
- $form['city']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
- }
- return array(
- '#type' => 'ajax',
- '#commands' => $commands
- );
-}
-function ajax_get_district_list_callback($form, $form_state)
-{
- $state_default_value = $form_state['values']['all_state'];
- if ($state_default_value != '0')
- {
- $form['district']['#options'] = _soul_list_of_district($state_default_value);
- $commands[] = ajax_command_replace("#ajax-district-list-replace", drupal_render($form['district']));
- $form['pincode']['#options'] = array('0' =>'- Select -');
- $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
- $form['city']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
- }else{
- $form['district']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-district-list-replace", drupal_render($form['district']));
- $form['pincode']['#options'] = array('0' =>'- Select -');
- $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
- $form['city']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
- }
- return array(
- '#type' => 'ajax',
- '#commands' => $commands
- );
-}
-function ajax_get_city_pincode_list_callback($form, $form_state)
-{
- $city_default_value = $form_state['values']['city'];
- $state_default_value = $form_state['values']['all_state'];
- $district_default_value = $form_state['values']['district'];
- if ($city_default_value != '0')
- {
- $form['pincode']['#options'] = _soul_list_of_city_pincode($city_default_value,$state_default_value,$district_default_value);
- $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
- }else{
- $form['pincode']['#options'] = array('0' => '- Select -');
- $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
- }
- return array(
- '#type' => 'ajax',
- '#commands' => $commands
- );
-}
\ No newline at end of file
--
cgit