Index: app/trunk/application/controllers/Activities.php =================================================================== diff -u -r194 -r214 --- app/trunk/application/controllers/Activities.php (.../Activities.php) (revision 194) +++ app/trunk/application/controllers/Activities.php (.../Activities.php) (revision 214) @@ -401,6 +401,9 @@ $this->data['regionId'] = $this->data['salesmanId'] = $filter = ''; + $salesMan = $this->dealer_info_model->salesman_search("dealerCode/{$this->session->userdata('dealerCode')}"); + $this->data['salesman'] = $salesMan[0]; + if($this->data['canFilter']) { $this->data['regions'] = $this->dealer_info_model->regions(); @@ -415,6 +418,15 @@ $this->data['salesmen'] = !empty($this->data['regionId']) ? $this->dealer_info_model->salesmen($this->data['regionId']) : ''; $this->data['salesmanId'] = $this->input->get('salesmanId') ? $this->input->get('salesmanId') : ''; } + else + { + if(empty($this->data['salesmanId'])) { + $this->data['salesmanId'] = $this->data['salesman']? $this->data['salesman']->salesmanId : ''; + } + if(empty($this->data['regionId'])) { + $this->data['regionId'] = $this->data['salesman']? $this->data['salesman']->regionId : ''; + } + } $this->data['dealerCode'] = $this->input->get('dealerCode') ? $this->input->get('dealerCode') : ''; $this->data['certified'] = $this->input->get('certifiedStatus') !== null ? $this->input->get('certifiedStatus') : 'n'; Index: app/trunk/application/controllers/Reports.php =================================================================== diff -u -r194 -r214 --- app/trunk/application/controllers/Reports.php (.../Reports.php) (revision 194) +++ app/trunk/application/controllers/Reports.php (.../Reports.php) (revision 214) @@ -25,6 +25,9 @@ $this->data['regionId'] = ''; $this->data['salesmanId'] = ''; + $salesMan = $this->dealer_info_model->salesman_search("dealerCode/{$this->session->userdata('dealerCode')}"); + $this->data['salesman'] = $salesMan[0]; + if($this->data['canFilter']) { $this->data['regions'] = $this->dealer_info_model->regions(); Index: app/trunk/application/views/reports/reports.php =================================================================== diff -u -r194 -r214 --- app/trunk/application/views/reports/reports.php (.../reports.php) (revision 194) +++ app/trunk/application/views/reports/reports.php (.../reports.php) (revision 214) @@ -40,15 +40,12 @@ - - -