|
@@ -1017,6 +1017,11 @@ class Lampcontrol extends Base_Controller {
|
|
|
// $data['fascal_year_phase'] = $fascal_year_phase.'-'.date('Y',strtotime($fascal_year_phase.' +1 year'));
|
|
|
}
|
|
|
$data['fascal_year_phase'] = $fascal_year_phase;
|
|
|
+ $date = $this->input->post('date',true);
|
|
|
+ if (empty($date)) {
|
|
|
+ $date = '';
|
|
|
+ }
|
|
|
+ $data['date'] = $date;
|
|
|
$lamp = $this->Lamp_model->get_one(array('address'=>$data['address']),'projectid,number');
|
|
|
if (!empty($lamp)) {
|
|
|
$projectid = $lamp['projectid'];
|
|
@@ -1053,6 +1058,9 @@ class Lampcontrol extends Base_Controller {
|
|
|
$fascal_year = $this->input->post('fascal_year',true);
|
|
|
if (!empty($fascal_year)) $data['fascal_year'] = $fascal_year;
|
|
|
|
|
|
+ $date = $this->input->post('date',true);
|
|
|
+ if (!empty($date)) $data['date'] = $date;
|
|
|
+
|
|
|
$fascal_year_phase = $this->input->post('fascal_year_phase',true);
|
|
|
if (!empty($fascal_year_phase)) $data['fascal_year_phase'] = $fascal_year_phase;
|
|
|
|
|
@@ -1338,7 +1346,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
}
|
|
|
if ($datatype == 'lampinfo') {
|
|
|
|
|
|
- $fields = "number,projectid,address,longitude,latitude,section,boardpower,lamptype,boardtype,batteryah,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name";
|
|
|
+ $fields = "number,projectid,address,longitude,latitude,section,boardpower,lamptype,boardtype,batteryah,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name,date";
|
|
|
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
if (empty($res)) {
|
|
@@ -1438,6 +1446,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
'street_light_SN' => $res['street_light_SN'],
|
|
|
'customer_ID' => $res['customer_ID'],
|
|
|
'customer_name' => $res['customer_name'],
|
|
|
+ 'date' => $res['date'],
|
|
|
'supplier_name' => $supplier_name,
|
|
|
'model_name' => $model_name,
|
|
|
);
|