merge : GWM
This commit is contained in:
parent
9f369c2f60
commit
4c57571606
@ -455,12 +455,19 @@ class StockController extends BaseController
|
|||||||
->where('date >=', $data['startDate'])
|
->where('date >=', $data['startDate'])
|
||||||
->where('date <=', $data['endDate'])
|
->where('date <=', $data['endDate'])
|
||||||
->findAll();
|
->findAll();
|
||||||
|
if(!count($data['summaryDetails']))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
$data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
|
$data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
|
||||||
|
|
||||||
$data['machineName'] = array_column($data['machineDetails'], 'machine_name');
|
$data['machineName'] = array_column($data['machineDetails'], 'machine_name');
|
||||||
|
|
||||||
$this->global['pageTitle'] = 'Drier Details';
|
$this->global['pageTitle'] = 'Drier Details';
|
||||||
|
// this is a code that i want to see in $this->global aiyo pakurane ena nu solrathu
|
||||||
|
|
||||||
|
|
||||||
$this->loadViews("factoryDieselMachineDetails", $this->global, $data, NULL);
|
$this->loadViews("factoryDieselMachineDetails", $this->global, $data, NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user