1 files changed, 8 insertions, 34 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index cb94a7e..284db02 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -248,11 +248,6 @@ function lab_migration_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,
@@ -526,11 +521,6 @@ function lab_migration_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,
@@ -804,19 +794,19 @@ function lab_migration_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(
@@ -860,22 +850,9 @@ function lab_migration_proposal_edit_form($form, $form_state)
     $form['all_state'] = array(
         '#type' => 'select',
         '#title' => t('State'),
-        '#options' => _lab_migration_list_of_states(),
-        '#validated' => TRUE,
+        '#options' => _lm_list_of_states(),
         '#default_value' => $proposal_data->state,
-        '#states' => array(
-            'visible' => array(
-                ':input[name="country"]' => array(
-                    'value' => 'India'
-                )
-            )
-        )
-    );
-    $form['district'] = array(
-        '#type' => 'select',
-        '#title' => t('District'),
-        '#options' => _lab_migration_list_of_district(),
-        '#default_value' => $proposal_data->district,
+        '#validated' => TRUE,
         '#states' => array(
             'visible' => array(
                 ':input[name="country"]' => array(
@@ -887,7 +864,7 @@ function lab_migration_proposal_edit_form($form, $form_state)
     $form['city'] = array(
         '#type' => 'select',
         '#title' => t('City'),
-        '#options' => _lab_migration_list_of_cities(),
+        '#options' => _lm_list_of_cities(),
         '#default_value' => $proposal_data->city,
         '#states' => array(
             'visible' => array(
@@ -897,18 +874,16 @@ function lab_migration_proposal_edit_form($form, $form_state)
             )
         )
     );
-    
     $form['pincode'] = array(
         '#type' => 'textfield',
         '#title' => t('Pincode'),
         '#size' => 30,
         '#maxlength' => 6,
         '#default_value' => $proposal_data->pincode,
-        '#required' => False,
         '#attributes' => array(
-            'placeholder' => 'Enter pincode....'
+            'placeholder' => 'Insert pincode of your city/ village....'
         )
-    );  
+    );
 
     $form['lab_title'] = array(
         '#type' => 'textfield',
@@ -1182,7 +1157,6 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
         'department' => $v['department'],
         'university' => $v['university'],
         'city' => $v['city'],
-        'district' => $v['district'],
         'pincode' => $v['pincode'],
         'state' => $v['all_state'],
         'lab_title' => $v['lab_title'],