diff --git a/application/controllers/app.php b/application/controllers/app.php
index e623049..e24ea8f 100644
--- a/application/controllers/app.php
+++ b/application/controllers/app.php
@@ -247,7 +247,7 @@ public function appassignusers($slug) {
                     //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
                     $logary = array('action' => 'insert', 'description' => 'Assigned application to other user', 'after' => json_encode($appdata), 'app_id' => $app_id,);
                     addlog($logary);
-                    $this->db->insert('users_app', $appdata);
+                    $this->db->insert('users_app', $app_data);
                     $this->session->set_flashdata('validate', array('message' => 'Application Assigned to User successfully', 'type' => 'success'));
                     redirect(base_url() . 'assign-applicatioin-users/' . $app_id);
                 } else {
diff --git a/application/controllers/form.php b/application/controllers/form.php
index 689e42a..4daa84b 100644
--- a/application/controllers/form.php
+++ b/application/controllers/form.php
@@ -2011,7 +2011,10 @@ public function mapview($slug) {
                     $data['selected_date_from'] = "";
                 }
                 if (strtotime($to_date) > strtotime($from_date)) {
-                    $this->session->set_flashdata('validate', array('message' => 'Invalid Date selection. From Date should be greater than To Date.', 'type' => 'warning'));
+                    $this->session->set_flashdata('validate', 
+                    array('message' => 'Invalid Date selection. 
+                    From Date should be greater than To Date.',
+                    'type' => 'warning'));
                     redirect(base_url() . 'application-map/' . $slug);
                 }
 
@@ -2020,10 +2023,13 @@ public function mapview($slug) {
                 $login_district = $session_data['login_district'];
                 $form_list_filter = array();
                 foreach ($form_list_posted as $form_entity) {
-                    $form_list_filter[] = array('form_id' => $form_entity, 'table_name' => 'zform_' . $form_entity);
+                    $form_list_filter[] = array('form_id' => $form_entity,
+                    'table_name' => 'zform_' . $form_entity);
                 }
 
-                $total_result = $this->form_results_model->return_total_record_map_posted($form_list_filter, $to_date, $from_date);
+                $total_result = $this->form_results_model
+                ->return_total_record_map_posted($form_list_filter,
+                $to_date, $from_date);
                 $totalPages = ceil($total_result / $this->perMap);
                 $data['totalPages'] = $totalPages;
                 $filter_date_map = $this->input->post('filter_date_map');
@@ -2044,7 +2050,9 @@ public function mapview($slug) {
                 $record_array_final = array();
                 /** for categry listing * */
                 $record_array_final_filter = array();
-                $results_filer_main = $this->form_results_model->get_form_results_filters($form_list_filter, $login_district);
+                $results_filer_main = $this->form_results_model
+                ->get_form_results_filters($form_list_filter, 
+                $login_district);
                 $app_filters_array = array();
                 $town_array = array();
                 $uc_array = array();
@@ -2101,7 +2109,8 @@ public function mapview($slug) {
                             if (in_array($key, $filter_attribute)) {
                                 $value = trim($value);
                                 $valueforarray = str_replace(' ', '_', $value);
-                                if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') {
+                                if (isset($map_saved_pins[$key][$valueforarray]) 
+                                && $map_saved_pins[$key][$valueforarray] != '') {
                                     $pin_name = $map_saved_pins[$key][$valueforarray];
                                 } else
                                 if (!in_array($valueforarray, $filter_exist_array)) {
@@ -2117,7 +2126,8 @@ public function mapview($slug) {
                                         $exist_alpha[$first_char] = '1';
                                         $pin_name = $first_char . '1.png';
                                     }
-                                    $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name));
+                                    $pin_exist_for_cat = array_merge($pin_exist_for_cat,
+                                    array($valueforarray => $pin_name));
                                 } else {
                                     if (array_key_exists($valueforarray, $pin_exist_for_cat)) {
                                         $pin_name = $pin_exist_for_cat[$valueforarray];
@@ -2159,14 +2169,21 @@ public function mapview($slug) {
                 $data['uc'] = $uc_array;
                 $form_list_filter = array();
                 foreach ($form_list_posted as $form_entity) {
-                    $form_list_filter[] = array('form_id' => $form_entity, 'table_name' => 'zform_' . $form_entity);
+                    $form_list_filter[] = array('form_id' => $form_entity, 
+                    'table_name' => 'zform_' . $form_entity);
                 }
                 $results_comined_posted = array();
                 $record_array_final = array();
                 foreach ($form_list_filter as $form_entity) {
                     $table_name = $form_entity['table_name'];
-                    $results = $this->form_results_model->get_map_data_paginated_posted($table_name, $to_date, $from_date, $town_filter = null, $posted_filters, $search_text, $login_district, $dynamic_filters);
-                    //$results = $this->form_results_model->get_form_results_for_map($forms_list, $to_date, $from_date, $town_filter = null, $posted_filters, $search_text, $login_district);
+                    $results = $this->form_results_model
+                    ->get_map_data_paginated_posted($table_name, $to_date, 
+                    $from_date, $town_filter = null, $posted_filters, 
+                    $search_text, $login_district, $dynamic_filters);
+                    //$results = $this->form_results_model
+                    //->get_form_results_for_map($forms_list, 
+                    //$to_date, $from_date, $town_filter = null, 
+                    //$posted_filters, $search_text, $login_district);
                     $results_comined_posted = array_merge($results_comined_posted, $results);
                 }
                 $filter_exist_array = array();
@@ -2193,7 +2210,8 @@ public function mapview($slug) {
                         if (in_array($key, $filter_attribute)) {
                             $value = trim($value);
                             $valueforarray = str_replace(' ', '_', $value);
-                            if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') {
+                            if (isset($map_saved_pins[$key][$valueforarray]) 
+                            && $map_saved_pins[$key][$valueforarray] != '') {
                                 $pin_name = $map_saved_pins[$key][$valueforarray];
                             } else
                             if (!in_array($valueforarray, $filter_exist_array)) {
@@ -2210,7 +2228,8 @@ public function mapview($slug) {
                                     $exist_alpha[$first_char] = '1';
                                     $pin_name = $first_char . '1.png';
                                 }
-                                $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name));
+                                $pin_exist_for_cat = array_merge($pin_exist_for_cat,
+                                array($valueforarray => $pin_name));
                             } else {
                                 if (array_key_exists($valueforarray, $pin_exist_for_cat)) {
                                     $pin_name = $pin_exist_for_cat[$valueforarray];
@@ -2240,7 +2259,7 @@ public function mapview($slug) {
                 $filter_result = get_map_view_settings($selected_form['app_id']);
                 if (isset($filter_result->filters->$form_id)) {
                     $app_filter_list = $filter_result->filters->$form_id;
-//                    $filter_options .= "<option value=''>Select One</option>";
+//                  $filter_options .= "<option value=''>Select One</option>";
                     if (!empty($app_filter_list)) {
                         foreach ($app_filter_list as $key => $val) {
                             $print_val = str_replace("_", " ", $val);
@@ -2256,7 +2275,8 @@ public function mapview($slug) {
 
                 $data['filter_options'] = $filter_options;
                 $all_visits_hidden = $this->input->post('all_visits_hidden');
-                $data['locations'] = $this->getMapHtmlInfo($record_array_final, $heading_array, $filter_attribute);
+                $data['locations'] = $this->getMapHtmlInfo($record_array_final,
+                $heading_array, $filter_attribute);
                 $data['all_visits_hidden'] = $all_visits_hidden;
                 $data['headings'] = $heading_array;
                 $data['form'] = $record_array_final;
@@ -2266,10 +2286,14 @@ public function mapview($slug) {
                  * its call back function call
                  */
                 foreach ($filter_attribute as $filter_attribute_value) {
-                    uasort($record_array_final_filter, array(new SortAssociativeArray($filter_attribute_value), "call"));
+                    uasort($record_array_final_filter, 
+                    array(new SortAssociativeArray($filter_attribute_value),
+                     "call"));
                 }
 
-                $possible_filters_from_settings = $this->form_model->get_form_column_values($app_filter_list, $selected_form['id']);
+                $possible_filters_from_settings = $this->form_model->
+                get_form_column_values($app_filter_list,
+                $selected_form['id']);
 
                 $data['possible_filters_from_settings'] = $possible_filters_from_settings;
                 $data['dynamic_filters'] = $dynamic_filters;
@@ -2280,13 +2304,27 @@ public function mapview($slug) {
                 $data['app_id'] = $selected_form['app_id'];
                 $selected_app = $this->app_model->get_app($selected_form['app_id']);
                 $app_settings = $this->app_model->get_app_settings($selected_form['app_id']);
-                $data['district_filter'] = (isset($map_view_settings->district_filter)) ? $map_view_settings->district_filter : '';
-                $data['sent_by_filter'] = !empty($map_view_settings->sent_by_filter) ? $map_view_settings->sent_by_filter : '';
-                $data['uc_filter'] = (isset($map_view_settings->uc_filter)) ? $map_view_settings->uc_filter : '';
-                $data['map_type_filter'] = (isset($map_view_settings->map_type_filter)) ? $map_view_settings->map_type_filter : '';
-                $data['zoom_level'] = (isset($map_view_settings->default_zoom_level)) ? $map_view_settings->default_zoom_level : '';
-                $data['latitude'] = (isset($map_view_settings->default_latitude)) ? $map_view_settings->default_latitude : '';
-                $data['longitude'] = (isset($map_view_settings->default_longitude)) ? $map_view_settings->default_longitude : '';
+                $data['district_filter'] = (isset($map_view_settings
+                ->district_filter)) ? $map_view_settings
+                ->district_filter : '';
+                $data['sent_by_filter'] = !empty($map_view_settings
+                ->sent_by_filter) ? $map_view_settings
+                ->sent_by_filter : '';
+                $data['uc_filter'] = (isset($map_view_settings
+                ->uc_filter)) ? $map_view_settings
+                ->uc_filter : '';
+                $data['map_type_filter'] = (isset($map_view_settings
+                ->map_type_filter)) ? $map_view_settings
+                ->map_type_filter : '';
+                $data['zoom_level'] = (isset($map_view_settings
+                ->default_zoom_level)) ? $map_view_settings
+                ->default_zoom_level : '';
+                $data['latitude'] = (isset($map_view_settings
+                ->default_latitude)) ? $map_view_settings
+                ->default_latitude : '';
+                $data['longitude'] = (isset($map_view_settings
+                ->default_longitude)) ? $map_view_settings
+                ->default_longitude : '';
                 $data['app_name'] = $selected_app['name'];
                 $data['form_for_filter'] = $record_array_final_filter;
                 $data['active_tab'] = 'app';
@@ -2300,10 +2338,13 @@ public function mapview($slug) {
             } else {
                 $view_list = array();
                 foreach ($forms_list as $final_view) {
-                    $view_list = array_merge($view_list, array($final_view['form_name'] => $final_view['form_id']));
+                    $view_list = array_merge($view_list, 
+                    array($final_view['form_name'] => $final_view['form_id']));
                 }
                 $form_single_to_query = array();
-                $form_single_to_query[] = array('form_id' => $forms_list[0]['form_id'], 'table_name' => 'zform_' . $forms_list[0]['form_id'], 'form_name' => $forms_list[0]['form_name']);
+                $form_single_to_query[] = array('form_id' => $forms_list[0]['form_id'],
+                'table_name' => 'zform_' . $forms_list[0]['form_id'],
+                'form_name' => $forms_list[0]['form_name']);
                 $view_list = array_flip($view_list);
                 $data['form_lists'] = $view_list;
                 $data['form_list_selected'] = $form_single_to_query;
@@ -2314,7 +2355,8 @@ public function mapview($slug) {
                 $data['form_name'] = $selected_form['name'];
                 $data['app_id'] = $selected_form['app_id'];
                 $app_settings = $this->app_model->get_app_settings($selected_form['app_id']);
-                $app_filter_list = explode(',', (isset($app_settings['map_view_filters'])?$app_settings['map_view_filters']:""));
+                $app_filter_list = explode(',', (isset($app_settings['map_view_filters'])
+                ?$app_settings['map_view_filters']:""));
                 $data['district_selected'] = "";
                 /** Get Multiple form filtesr* */
                 $multiple_filters = $this->form_model->get_form_filters($form_single_to_query);
@@ -2341,7 +2383,9 @@ public function mapview($slug) {
                 $login_district = $session_data['login_district'];
                 /** for categry listing* */
                 $record_array_final_filter = array();
-                $results_filer_main = $this->form_results_model->get_form_results_filters($form_single_to_query, $login_district);
+                $results_filer_main = $this->form_results_model
+                ->get_form_results_filters($form_single_to_query, 
+                $login_district);
                 $app_filters_array = array();
                 $town_array = array();
                 $uc_array = array();
@@ -2400,7 +2444,8 @@ public function mapview($slug) {
                                 $value = trim($value);
                                 $valueforarray = str_replace(' ', '_', $value);
 
-                                if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') {
+                                if (isset($map_saved_pins[$key][$valueforarray]) 
+                                && $map_saved_pins[$key][$valueforarray] != '') {
                                     $pin_name = $map_saved_pins[$key][$valueforarray];
                                 } else
                                 if (!in_array($valueforarray, $filter_exist_array)) {
@@ -2417,7 +2462,8 @@ public function mapview($slug) {
                                         $exist_alpha[$first_char] = '1';
                                         $pin_name = $first_char . '1.png';
                                     }
-                                    $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name));
+                                    $pin_exist_for_cat = array_merge($pin_exist_for_cat, 
+                                    array($valueforarray => $pin_name));
                                 } else {
                                     if (array_key_exists($valueforarray, $pin_exist_for_cat)) {
                                         $pin_name = $pin_exist_for_cat[$valueforarray];
@@ -2441,7 +2487,8 @@ public function mapview($slug) {
                 }
                 $data['app_filters_array'] = $app_filters_array;
                 $data['selected_filters'] = array();
-                $total_result = $this->form_results_model->return_total_record($form_single_to_query);
+                $total_result = $this->form_results_model
+                ->return_total_record($form_single_to_query);
                 $totalPages = ceil($total_result / $this->perMap);
                 $data['totalPages'] = $totalPages;
                 $town_array[] = asort($town_array);
@@ -2460,7 +2507,8 @@ public function mapview($slug) {
                  * its call back function call
                  */
                 foreach ($filter_attribute as $filter_attribute_value) {
-                    uasort($record_array_final_filter, array(new SortAssociativeArray($filter_attribute_value), "call"));
+                    uasort($record_array_final_filter, 
+                    array(new SortAssociativeArray($filter_attribute_value), "call"));
                 }
                 $results_comined = array();
                 $record_array_final = array();
@@ -2494,7 +2542,8 @@ public function mapview($slug) {
                         if (in_array($key, $filter_attribute)) {
                             $value = trim($value);
                             $valueforarray = str_replace(' ', '_', $value);
-                            if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') {
+                            if (isset($map_saved_pins[$key][$valueforarray]) 
+                            && $map_saved_pins[$key][$valueforarray] != '') {
                                 $pin_name = $map_saved_pins[$key][$valueforarray];
                             } else
                             if (!in_array($valueforarray, $filter_exist_array)) {
@@ -2511,7 +2560,8 @@ public function mapview($slug) {
                                     $exist_alpha[$first_char] = '1';
                                     $pin_name = $first_char . '1.png';
                                 }
-                                $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name));
+                                $pin_exist_for_cat = array_merge($pin_exist_for_cat, 
+                                array($valueforarray => $pin_name));
                             } else {
                                 if (array_key_exists($valueforarray, $pin_exist_for_cat)) {
                                     $pin_name = $pin_exist_for_cat[$valueforarray];
@@ -2538,19 +2588,21 @@ public function mapview($slug) {
                     }
                 }
                 $data['selected_form'] = $first_form_id;
-                $data['locations'] = $this->getMapHtmlInfo($record_array_final, $heading_array, $filter_attribute);
+                $data['locations'] = $this->getMapHtmlInfo($record_array_final, 
+                $heading_array, $filter_attribute);
                 $town_lists = $this->app_users_model->get_towns($selected_form['app_id']);
                 $town_list_array = array();
                 foreach ($town_lists as $towns) {
                     if (!in_array($towns['town'], $town_list_array)) {
-                        $town_list_array = array_merge($town_list_array, array($towns['town'] => $towns['town']));
+                        $town_list_array = array_merge($town_list_array, 
+                        array($towns['town'] => $towns['town']));
                     }
                 }
                 $filter_options = '';
                 $filter_result = get_map_view_settings($selected_form['app_id']);
                 if (isset($filter_result->filters->$first_form_id)) {
                     $app_filter_list = $filter_result->filters->$first_form_id;
-//                    $filter_options .= "<option value=''>Select One</option>";
+//                  $filter_options .= "<option value=''>Select One</option>";
                     if (!empty($app_filter_list)) {
                         foreach ($app_filter_list as $key => $val) {
                             if ($default_selected_category == $val) {
@@ -2559,13 +2611,16 @@ public function mapview($slug) {
                                 $default_selected = '';
                             }
                             $print_val = str_replace("_", " ", $val);
-                            $filter_options .= "<option value='$val' $default_selected>$print_val</option>";
+                            $filter_options .= "<option value='$val' 
+                            $default_selected>$print_val</option>";
                         }
                     }
                 }
 
 
-                $possible_filters_from_settings = $this->form_model->get_form_column_values($app_filter_list, $first_form_id);
+                $possible_filters_from_settings = $this->form_model
+                ->get_form_column_values($app_filter_list, 
+                $first_form_id);
 
                 $data['possible_filters_from_settings'] = $possible_filters_from_settings;
 
@@ -2575,14 +2630,28 @@ public function mapview($slug) {
                 $data['app_id'] = $selected_form['app_id'];
                 $selected_app = $this->app_model->get_app($selected_form['app_id']);
                 $map_view_settings = get_map_view_settings($slug);
-                $data['district_filter'] = !empty($map_view_settings->district_filter) ? $map_view_settings->district_filter : '';
-                $data['sent_by_filter'] = !empty($map_view_settings->sent_by_filter) ? $map_view_settings->sent_by_filter : '';
-                $data['uc_filter'] = !empty($map_view_settings->uc_filter) ? $map_view_settings->uc_filter : '';
-                $data['map_type_filter'] = (isset($map_view_settings->map_type_filter)) ? $map_view_settings->map_type_filter : '';
-                $data['view_type'] = !empty($app_settings['map_type']) ? $app_settings['map_type'] : '';
-                $data['zoom_level'] = (isset($map_view_settings->default_zoom_level)) ? $map_view_settings->default_zoom_level : '';
-                $data['latitude'] = (isset($map_view_settings->default_latitude)) ? $map_view_settings->default_latitude : '';
-                $data['longitude'] = (isset($map_view_settings->default_longitude)) ? $map_view_settings->default_longitude : '';
+                $data['district_filter'] = !empty($map_view_settings
+                ->district_filter) ? $map_view_settings
+                ->district_filter : '';
+                $data['sent_by_filter'] = !empty($map_view_settings
+                ->sent_by_filter) ? $map_view_settings
+                ->sent_by_filter : '';
+                $data['uc_filter'] = !empty($map_view_settings
+                ->uc_filter) ? $map_view_settings
+                ->uc_filter : '';
+                $data['map_type_filter'] = (isset($map_view_settings
+                ->map_type_filter)) ? $map_view_settings->map_type_filter : '';
+                $data['view_type'] = !empty($app_settings['map_type']) ? 
+                $app_settings['map_type'] : '';
+                $data['zoom_level'] = (isset($map_view_settings
+                    ->default_zoom_level)) ? $map_view_settings
+                    ->default_zoom_level : '';
+                $data['latitude'] = (isset($map_view_settings
+                    ->default_latitude)) ? $map_view_settings
+                    ->default_latitude : '';
+                $data['longitude'] = (isset($map_view_settings
+                    ->default_longitude)) ? $map_view_settings
+                    ->default_longitude : '';
                 $data['app_name'] = $selected_app['name'];
                 $data['town_filter'] = $town_list_array;
                 $data['headings'] = $heading_array;
diff --git a/application/controllers/graph.php b/application/controllers/graph.php
index ab85b03..ae06832 100644
--- a/application/controllers/graph.php
+++ b/application/controllers/graph.php
@@ -113,7 +113,7 @@ public function dashboard($slug) {
 //                            $final_disb_array[$myrep['District']] = array();
 //                        }
 //
-//                        if (!key_exists($myrep['Tehsil'], $final_disb_array[$myrep['District']])) {
+//                        if (!key_exists($my_rep['Tehsil'], $final_disb_array[$myrep['District']])) {
 //                            $final_disb_array[$myrep['District']][$myrep['Tehsil']] = array();
 //                        }
 //