diff --git a/application/modules/Asset/controllers/Asset.php b/application/modules/Asset/controllers/Asset.php index cbafdb0..6a47db0 100644 --- a/application/modules/Asset/controllers/Asset.php +++ b/application/modules/Asset/controllers/Asset.php @@ -72,15 +72,6 @@ public function assetList() $this->layout->buffer('main_content', 'Asset/asset_list'); $this->layout->render('default_layout'); - } - - public function view_qrcode($id) - { - $assetData = $this->Asset_model->get_asset_id($id, 'asset' , user()->business_id); - $this->layout->set('img', $assetData->qrcode_img); - $this->layout->buffer('main_content', 'Asset/view_qr'); - $this->layout->render('default_layout'); - } public function createAssets() @@ -211,6 +202,33 @@ public function deleteAsset($id) $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,'asset'); redirect('asset/assetList'); } + + + public function deleteMultipleAsset() + { + $delete_data_id = $this->input->post('data'); + foreach ($delete_data_id as $id) { + $this->Asset_model->delete_by_md5_id(md5($id),user()->business_id,'asset'); + } + $data['csrf_hash'] = $this->security->get_csrf_hash(); + echo json_encode($data); + } + + + public function view_qrcode() + { + $view_qr_data_id = $this->input->post('data'); + $output = array(); + foreach ($view_qr_data_id as $id) { + $qr = $this->Asset_model->get_asset_id(md5($id), 'asset' , user()->business_id); + array_push($output , $qr); + } + $data['data'] = $output; + $data['htmlPage'] = $this->load->view('view_qr.php',$data,true); + $data['csrf_hash'] = $this->security->get_csrf_hash(); + echo json_encode($data); + + } diff --git a/application/modules/Asset/views/amc_reports_list.php b/application/modules/Asset/views/amc_reports_list.php index 2c510ee..963f110 100644 --- a/application/modules/Asset/views/amc_reports_list.php +++ b/application/modules/Asset/views/amc_reports_list.php @@ -13,7 +13,7 @@
- + @@ -32,7 +32,7 @@ - + $value) { ?> diff --git a/application/modules/Asset/views/asset_list.php b/application/modules/Asset/views/asset_list.php index 1c847e5..86ac87a 100644 --- a/application/modules/Asset/views/asset_list.php +++ b/application/modules/Asset/views/asset_list.php @@ -1,13 +1,18 @@ + + +

Assets Details

@@ -16,69 +21,63 @@
-
- + + - - - + + - + - + - - - + + --> + - - - - - $value) { ?> - - - - + + + $value) { ?> + + + - + - - - - - - - - -
Asset Name Asset Name Manufacturer Tag Tag Serial Model Category Category Status Action Cost Location Action
name; ?>
name; ?> manufacturer_name; ?> tag; ?>tag; ?> serial; ?> model; ?>category_name; ?>status_display_name; ?> - -   - -   - -   - -   - -
+ cost; ?> + location_name; ?> --> + + +   + +   + +   + +   + + + + + + + -
- + @@ -87,7 +86,87 @@
+ + + + + \ No newline at end of file diff --git a/application/modules/Asset/views/depreciation_list.php b/application/modules/Asset/views/depreciation_list.php index 8a4db50..bc07f73 100644 --- a/application/modules/Asset/views/depreciation_list.php +++ b/application/modules/Asset/views/depreciation_list.php @@ -12,8 +12,8 @@
- - + + @@ -29,7 +29,7 @@ - + $value) { ?> diff --git a/application/modules/Asset/views/insurance_reports_list.php b/application/modules/Asset/views/insurance_reports_list.php index 20b3977..382a143 100644 --- a/application/modules/Asset/views/insurance_reports_list.php +++ b/application/modules/Asset/views/insurance_reports_list.php @@ -13,7 +13,7 @@
Category
- + @@ -31,7 +31,7 @@ - + $value) { ?> diff --git a/application/modules/Asset/views/view_qr.php b/application/modules/Asset/views/view_qr.php index 8ea74ac..2133fdd 100644 --- a/application/modules/Asset/views/view_qr.php +++ b/application/modules/Asset/views/view_qr.php @@ -1,2 +1,56 @@ -QR Code \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/assets/default/customize/ajax.js b/assets/default/customize/ajax.js index 461fe98..a886de1 100644 --- a/assets/default/customize/ajax.js +++ b/assets/default/customize/ajax.js @@ -268,6 +268,9 @@ $("#file_profile").change(function(){ + + +