From ca5d183421dd8cd4d93731320cd6efc02a587154 Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Fri, 17 May 2019 12:06:58 +0530
Subject: Update functions to display the list of cities and states

---
 lab_migration.module | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 manage_proposal.inc  | 44 +-----------------------------------------
 proposal.inc         | 53 +--------------------------------------------------
 3 files changed, 56 insertions(+), 95 deletions(-)

diff --git a/lab_migration.module b/lab_migration.module
index d50b896..dda426f 100755
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -760,5 +760,59 @@ function lm_ucname($string)
     return $string;
   }
  
+ function _lm_list_of_states()
+  {
+    $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;
+      }
+    return $states;
+  }
+
+  
+function _lm_list_of_cities()
+  {
+    $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;
+      }
+    return $city;
+  }
+function _lm_list_of_departments()
+  {
+    $department = array();
+    $query = db_select('list_of_departments');
+    $query->fields('list_of_departments');
+    $query->orderBy('id', 'DESC');
+    $department_list = $query->execute();
+    while ($department_list_data = $department_list->fetchObject())
+      {
+        $department[$department_list_data->department] = $department_list_data->department;
+      }
+    return $department;
+  }
+function _lm_list_of_software_version()
+  {
+    $software_version = array();
+    $query = db_select('r_software_version');
+    $query->fields('r_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->r_version] = $software_version_list_data->r_version;
+      }
+    return $software_version;
+  }
  
  
diff --git a/manage_proposal.inc b/manage_proposal.inc
index f79f3f3..5820e06 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -1390,49 +1390,7 @@ function lab_migration_category_edit_form_submit($form, &$form_state)
     drupal_set_message(t('Proposal Category Updated'), 'status');
     drupal_goto('lab-migration/manage-proposal/category');
   }
-function _lm_list_of_departments()
-  {
-    $department = array(
-        0 => '-Select-'
-    );
-    $query = db_select('list_of_departments');
-    $query->fields('list_of_departments');
-    $query->orderBy('id', 'DESC');
-    $department_list = $query->execute();
-    while ($department_list_data = $department_list->fetchObject())
-      {
-        $department[$department_list_data->department] = $department_list_data->department;
-      }
-    return $department;
-  }
-function _lm_list_of_states()
-  {
-    $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;
-      }
-    return $states;
-  }
-function _lm_list_of_cities()
-  {
-    $city = array();
-    $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;
-      }
-    return $city;
-  }
+
 function CreateReadmeFileLabMigration($proposal_id)
   {
     $result = db_query("
diff --git a/proposal.inc b/proposal.inc
index 1ad6ae8..88eb454 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -522,58 +522,7 @@ function lab_migration_proposal_form_submit($form, &$form_state)
     drupal_set_message(t('We have received you Lab migration proposal. We will get back to you soon.'), 'status');
     drupal_goto('');
   }
-function _lm_list_of_states()
-  {
-    $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;
-      }
-    return $states;
-  }
-function _lm_list_of_cities()
-  {
-    $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;
-      }
-    return $city;
-  }
-function _lm_list_of_departments()
-  {
-    $department = array();
-    $query = db_select('list_of_departments');
-    $query->fields('list_of_departments');
-    $query->orderBy('id', 'DESC');
-    $department_list = $query->execute();
-    while ($department_list_data = $department_list->fetchObject())
-      {
-        $department[$department_list_data->department] = $department_list_data->department;
-      }
-    return $department;
-  }
-function _lm_list_of_software_version()
-  {
-    $software_version = array();
-    $query = db_select('r_software_version');
-    $query->fields('r_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->r_version] = $software_version_list_data->r_version;
-      }
-    return $software_version;
-  }
+
 function _lm_dir_name($lab, $name, $university)
   {
     $lab_title = lm_ucname($lab);
-- 
cgit