From 5265fea2ceab964d8f03f9011a063c27ce510e64 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:46:41 +0530 Subject: [PATCH] suseendhiran --- .../modules/Asset/controllers/Asset.php | 170 ++++++- .../modules/Asset/models/Asset_model.php | 24 + .../modules/Asset/views/asset_list.php | 3 +- .../Asset/views/asset_sub_value_list.php | 7 +- .../modules/Asset/views/asset_usage_form.php | 11 +- .../Asset/views/catogary_master_form.php | 36 ++ .../modules/Asset/views/edit_asset.php | 19 +- .../Asset/views/location_master_form.php | 36 ++ .../modules/Asset/views/master_list.php | 455 ++++++++++++++++++ .../Asset/views/third_party_master_form.php | 86 ++++ .../modules/Audit/controllers/Audit.php | 52 +- .../modules/Business/controllers/Business.php | 4 +- .../Layout/views/includes/default_header.php | 6 +- application/modules/User/controllers/User.php | 6 +- application/modules/User/views/add_user.php | 72 ++- .../modules/User/views/view_history.php | 14 +- assets/uploads/laptop.jpeg | Bin 0 -> 124475 bytes assets/uploads/laptop1.jpeg | Bin 0 -> 124475 bytes assets/uploads/laptop2.jpeg | Bin 0 -> 124475 bytes assets/uploads/logo/company-logo2.png | Bin 0 -> 1698 bytes assets/uploads/logo/company-logo3.png | Bin 0 -> 1698 bytes assets/uploads/logo/company-logo4.png | Bin 0 -> 1698 bytes assets/uploads/logo/company-logo5.png | Bin 0 -> 1698 bytes assets/uploads/logo/logo.jpg | Bin 0 -> 59105 bytes assets/uploads/logo/logo1.jpg | Bin 0 -> 59105 bytes assets/uploads/logo/logo2.jpg | Bin 0 -> 59105 bytes assets/uploads/printer.jpeg | Bin 0 -> 6357 bytes assets/uploads/printer1.jpeg | Bin 0 -> 6357 bytes 28 files changed, 925 insertions(+), 76 deletions(-) create mode 100644 application/modules/Asset/views/catogary_master_form.php create mode 100644 application/modules/Asset/views/location_master_form.php create mode 100644 application/modules/Asset/views/master_list.php create mode 100644 application/modules/Asset/views/third_party_master_form.php create mode 100644 assets/uploads/laptop.jpeg create mode 100644 assets/uploads/laptop1.jpeg create mode 100644 assets/uploads/laptop2.jpeg create mode 100644 assets/uploads/logo/company-logo2.png create mode 100644 assets/uploads/logo/company-logo3.png create mode 100644 assets/uploads/logo/company-logo4.png create mode 100644 assets/uploads/logo/company-logo5.png create mode 100644 assets/uploads/logo/logo.jpg create mode 100644 assets/uploads/logo/logo1.jpg create mode 100644 assets/uploads/logo/logo2.jpg create mode 100644 assets/uploads/printer.jpeg create mode 100644 assets/uploads/printer1.jpeg diff --git a/application/modules/Asset/controllers/Asset.php b/application/modules/Asset/controllers/Asset.php index 6a47db0..2f53f45 100644 --- a/application/modules/Asset/controllers/Asset.php +++ b/application/modules/Asset/controllers/Asset.php @@ -67,6 +67,7 @@ public function addAsset($id='empty') public function assetList() { + $assets_list = $this->Asset_model->get_assets(user()->business_id); $this->layout->set('tableData', $assets_list); $this->layout->buffer('main_content', 'Asset/asset_list'); @@ -84,7 +85,7 @@ public function createAssets() //file upload confic $asset_image['upload_path'] = APPPATH. '../assets/uploads/'; - $asset_image['allowed_types'] = 'gif|jpg|png'; + $asset_image['allowed_types'] = 'gif|jpg|png|jpeg'; $asset_image['max_size'] = 80000; //upload $this->load->library('upload', $asset_image); @@ -147,7 +148,7 @@ public function editAsset($id) $this->layout->buffer('main_content', 'Asset/edit_asset'); $this->layout->render('default_layout'); - } + } public function editAssets() { @@ -162,7 +163,7 @@ public function editAssets() $id = $this->input->post('id'); //file upload confic $asset_image['upload_path'] = APPPATH. '../assets/uploads/'; - $asset_image['allowed_types'] = 'gif|jpg|png'; + $asset_image['allowed_types'] = 'gif|jpg|png|jpeg'; $asset_image['max_size'] = 80000; //upload $this->load->library('upload', $asset_image); @@ -178,7 +179,7 @@ public function editAssets() } - + // print_r( $action);die(); //set id $ table name for audit history $this->audit->set('id',$this->input->post('id')); $this->audit->set('table','asset'); @@ -258,7 +259,7 @@ public function view_asset_details($id) $asset_insurance = $this->Asset_model->get_insurance_with_join($id,user()->business_id); $asset_images = $this->Asset_model->get_by_asset_id($id,'asset_images',user()->business_id); $asset_history = $this->Audit_model->get_history($id,'asset',user()->business_id); - $data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage , 'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images,'asset_history'=>$asset_history,'tab'=>$tab); + $data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage ,'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images,'asset_history'=>$asset_history,'tab'=>$tab); $sub_asset_value_htmlPage = $this->load->view('asset_sub_value_list.php',$data,true); $this->layout->set('sub_asset_value_htmlPage', $sub_asset_value_htmlPage); $this->layout->set('editData', $assetData); @@ -365,8 +366,32 @@ public function getAssetUsageForm($id) if(count($split) > 1) { - $data = array('asset_id'=> $split[0], 'heading'=>'Add Asset Usage' , 'submit_button_title'=>'Submit'); - }else{ + //month year for dropdown + $date_output = array(); + $start = new DateTime; + $start->setDate($start->format('Y'), $start->format('n'), 1); // Normalize the day to 1 + $start->setTime(0, 0, 0); // Normalize time to midnight + $start->sub(new DateInterval('P12M')); + $interval = new DateInterval('P1M'); + $recurrences = 12; + $i = 1; + foreach (new DatePeriod($start, $interval, $recurrences, true) as $key => $date) { + if ($key == 0 || $key == 3 || $key == 6 || $key == 9 ) { + $data1['first'] = $date->format('M Y'); + $data1['value'] = "Q$i"; + array_push($date_output,$data1); + $i++; + } + if ($key == 2 || $key == 5 || $key == 8 || $key == 11 ) { + $data2['second'] = $date->format('M Y'); + array_push($date_output,$data2); + } + // echo $date->format('M Y'), "
"; // attempting to make it more clear to read here + } + // echo json_encode($date_output); + $data = array('asset_id'=> $split[0], 'heading'=>'Add Asset Usage' , 'submit_button_title'=>'Submit' , 'date' => $date_output); + } + else{ $asset_usage_data = $this->MY_Model->get_by_md5_id($id,'asset_usage'); $data = array('assetUsageData'=>$asset_usage_data ,'heading'=>'Edit Asset Usage' , 'submit_button_title'=>'Update'); } @@ -592,7 +617,7 @@ public function add_asset_image() //file upload confic $asset_image['upload_path'] = APPPATH. '../assets/uploads/'; - $asset_image['allowed_types'] = 'gif|jpg|png'; + $asset_image['allowed_types'] = 'gif|jpg|png|jpeg'; $asset_image['max_size'] = 80000; //upload $this->load->library('upload', $asset_image); @@ -681,4 +706,133 @@ public function insurance_report() } + + + + public function masterDataList() + { + $this->layout->set('manufacturerData', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,1)); + $this->layout->set('supplierData', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,2)); + $this->layout->set('service_privoder', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,3)); + $this->layout->set('insurence', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,4)); + $this->layout->set('locationsData', $this->MY_Model->select_by_business_id('locations',user()->business_id)); + $this->layout->set('categoriesData', $this->MY_Model->select_by_business_id('categories',user()->business_id)); + $this->layout->buffer('main_content', 'Asset/master_list'); + $this->layout->render('default_layout'); + + } + + + public function getThirdPartyForm($id) + { + if ($id == "manufacture") { + $table = 'third_parties'; + $data = array('heading'=> "Manufacturer Details", 'type' => 1 , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('third_party_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else if ($id == "supplier") { + $table = 'third_parties'; + $data = array('heading'=> "supplier Details", 'type' => 2 , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('third_party_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else if ($id == "service_privoder") { + $table = 'third_parties'; + $data = array('heading'=> "Service Privoder Details", 'type' => 3 , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('third_party_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else if ($id == "insurence") { + $table = 'third_parties'; + $data = array('heading'=> "Insurence Details", 'type' => 4 , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('third_party_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else { + $table = 'third_parties'; + $user_data = $this->MY_Model->get_by_md5_id($id, $table); + $data = array('heading'=> "Edit Details" , 'third_party_data'=> $user_data , 'submit_button_title'=>'Update' ); + $htmlPage = $this->load->view('third_party_master_form.php',$data,true); + echo json_encode($htmlPage); + } + + + } + + public function getLocationForm($id) + { + if ($id == "location") { + $table = 'locations'; + $data = array('heading'=> "Location Details", 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('location_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else { + $table = 'locations'; + $location_data = $this->MY_Model->get_by_md5_id($id, $table); + $data = array('heading'=> "Location Details", 'location_data'=> $location_data , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('location_master_form.php',$data,true); + echo json_encode($htmlPage); + } + } + + public function editLocationForm() + { + + $table = 'locations'; + $action = $this->input->post(); + $id = $this->input->post('id'); + if ($id) { + $userData = $this->MY_Model->edit_option($action, $id, $table); + redirect('asset/masterDataList'); + } else { + $userData = $this->MY_Model->insert($action, $table); + redirect('asset/masterDataList'); + } + + } + + + public function getCatogaryForm($id) + { + if ($id == "catogary") { + $table = 'categories'; + $data = array('heading'=> "Catogary Details", 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('catogary_master_form.php',$data,true); + echo json_encode($htmlPage); + } + else { + $table = 'categories'; + $location_data = $this->MY_Model->get_by_md5_id($id, $table); + $data = array('heading'=> "Catogary Details", 'catogary_data'=> $location_data , 'submit_button_title'=>'Add' ); + $htmlPage = $this->load->view('catogary_master_form.php',$data,true); + echo json_encode($htmlPage); + } + } + + + public function editThirdPartyForm() + { + + $table = 'third_parties'; + $action = $this->input->post(); + $id = $this->input->post('id'); + if ($id) { + $userData = $this->MY_Model->edit_option($action, $id, $table); + redirect('asset/masterDataList'); + } else { + $userData = $this->MY_Model->insert($action, $table); + redirect('asset/masterDataList'); + } + + } + + public function deleteThirdPartyData($id) + { + $Data = $this->Asset_model->delete_user_by_md5_id($id,user()->business_id); + redirect('asset/masterDataList'); + } + + } diff --git a/application/modules/Asset/models/Asset_model.php b/application/modules/Asset/models/Asset_model.php index a5b4134..02c2064 100644 --- a/application/modules/Asset/models/Asset_model.php +++ b/application/modules/Asset/models/Asset_model.php @@ -171,4 +171,28 @@ public function depreciation_report($business_id) } + public function get_third_party_value_by_md5_id($business_id , $type) + { + $this->db->select('B.* , state.name as state '); + $this->db->from('third_parties B'); + $this->db->join('state', 'state.id = B.state', 'left'); + $this->db->where('B.type', $type); + $this->db->where('business_id', $business_id); + $query = $this->db->get(); + $query = $query->result(); + return $query; + } + + public function delete_user_by_md5_id($id,$business_id) + { + $this->db->where('md5(id)', $id); + if ($business_id != NULL) { + $this->db->where('business_id', $business_id); + } + $this->db->set('is_active',0); + $this->db->update('users'); + return; + } + + } \ No newline at end of file diff --git a/application/modules/Asset/views/asset_list.php b/application/modules/Asset/views/asset_list.php index da91a48..bd482c6 100644 --- a/application/modules/Asset/views/asset_list.php +++ b/application/modules/Asset/views/asset_list.php @@ -6,7 +6,7 @@

Assets Details

- +
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/application/modules/Asset/views/third_party_master_form.php b/application/modules/Asset/views/third_party_master_form.php new file mode 100644 index 0000000..4d29045 --- /dev/null +++ b/application/modules/Asset/views/third_party_master_form.php @@ -0,0 +1,86 @@ + + + + diff --git a/application/modules/Audit/controllers/Audit.php b/application/modules/Audit/controllers/Audit.php index 21a13eb..94faa5c 100644 --- a/application/modules/Audit/controllers/Audit.php +++ b/application/modules/Audit/controllers/Audit.php @@ -92,24 +92,40 @@ public function create_history() return $Output; }else if($args[0] == 'insert') { $Output = array(); - foreach($this->new_data as $postDatakey=>$postDatavalue) - { - if($postDatakey != 'id' && $postDatakey != 'created_by ' && $postDatakey != 'is_active' && $postDatakey != 'created_at') - { - $data['table_name'] = $this->table; - $data['column_name'] = $postDatakey; - $data['new_value'] = $postDatavalue; - $data['created_by'] = user()->id; - if(is_superadmin()){ $data['business_id'] = NULL; } else { $data['business_id'] = user()->business_id; } - $data['primary_id'] = $this->id; - $data['created_at'] = date("Y-m-d h:i:s"); - array_push($Output,$data); - $this->MY_Model->insert($data,'history'); - } - } - return $Output; - - } + // foreach($this->new_data as $postDatakey=>$postDatavalue) + // { + // if($postDatakey != 'id' && $postDatakey != 'created_by ' && $postDatakey != 'is_active' && $postDatakey != 'created_at') + // { + // $data['table_name'] = $this->table; + // $data['column_name'] = $postDatakey; + // $data['new_value'] = $postDatavalue; + // $data['created_by'] = user()->id; + // if(is_superadmin()){ $data['business_id'] = NULL; } else { $data['business_id'] = user()->business_id; } + // $data['primary_id'] = $this->id; + // $data['created_at'] = date("Y-m-d h:i:s"); + // array_push($Output,$data); + // $this->MY_Model->insert($data,'history'); + // } + // } + // return $Output; + if ($this->table == 'users' || $this->table == 'business' || $this->table == 'asset') { + + $data['table_name']= $this->table; + if ( $this->table == 'business') { + $data['new_value'] = $this->new_data->business_name; + } else { + $data['new_value'] = $this->new_data->name; + } + $data['column_name'] = 'name'; + $data['created_by'] = user()->id; + if(is_superadmin()){ $data['business_id'] = NULL; } else { $data['business_id'] = user()->business_id; } + $data['primary_id'] = $this->id; + $data['created_at'] = date("Y-m-d h:i:s"); + $this->MY_Model->insert($data,'history'); + return $data; + } + + } } diff --git a/application/modules/Business/controllers/Business.php b/application/modules/Business/controllers/Business.php index 0a50e1c..613ffea 100644 --- a/application/modules/Business/controllers/Business.php +++ b/application/modules/Business/controllers/Business.php @@ -66,7 +66,7 @@ public function create_business() $data['created_by'] = user()->id; //file upload confic $logo_file['upload_path'] = APPPATH. '../assets/uploads/logo'; - $logo_file['allowed_types'] = 'gif|jpg|png'; + $logo_file['allowed_types'] = 'gif|jpg|png|jpeg'; $logo_file['max_size'] = 80000; //upload $this->load->library('upload', $logo_file); @@ -132,7 +132,7 @@ public function edit_business() //file upload confic $logo_file['upload_path'] = APPPATH. '../assets/uploads/logo'; - $logo_file['allowed_types'] = 'gif|jpg|png'; + $logo_file['allowed_types'] = 'gif|jpg|png|jpeg'; $logo_file['max_size'] = 80000; //upload $this->load->library('upload', $logo_file); diff --git a/application/modules/Layout/views/includes/default_header.php b/application/modules/Layout/views/includes/default_header.php index b3562da..63492fa 100644 --- a/application/modules/Layout/views/includes/default_header.php +++ b/application/modules/Layout/views/includes/default_header.php @@ -102,10 +102,8 @@ - - 50% - Settings - + Masters + Settings Log Out diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php index 145abea..d9e9528 100644 --- a/application/modules/User/controllers/User.php +++ b/application/modules/User/controllers/User.php @@ -166,7 +166,7 @@ public function editprofiles() $id = $this->input->post('id'); //file upload confic $user_image['upload_path'] = APPPATH. '../assets/uploads/profile_picture'; - $user_image['allowed_types'] = 'jpg|png'; + $user_image['allowed_types'] = 'jpg|png|jpeg'; $user_image['max_size'] = 80000; //upload $this->load->library('upload', $user_image); @@ -229,7 +229,7 @@ public function view_user_history($id) { $table = 'users'; $user_history = $this->audit_model->get_history( $id , $table , user()->business_id); - $data = array('title'=> "User History" , 'user_history'=> $user_history ); + $data = array('title'=> "User History" , 'name' => 'User' , 'user_history'=> $user_history ); $htmlPage = $this->load->view('view_history.php',$data,true); echo json_encode($htmlPage); } @@ -239,7 +239,7 @@ public function view_business_history($id) { $table = 'business'; $user_history = $this->audit_model->get_history( $id , $table , user()->business_id); - $data = array('title'=> "Business History" , 'user_history'=> $user_history ); + $data = array('title'=> "Business History" , 'name' => 'Business' ,'user_history'=> $user_history ); $htmlPage = $this->load->view('view_history.php',$data,true); echo json_encode($htmlPage); } diff --git a/application/modules/User/views/add_user.php b/application/modules/User/views/add_user.php index 351abc1..8f918a0 100644 --- a/application/modules/User/views/add_user.php +++ b/application/modules/User/views/add_user.php @@ -32,40 +32,23 @@ - + + + + +
+ + +
+
+ + +
+ +
+ +
+ +action_permit != 'view') { ?> + + + + + +
diff --git a/application/modules/User/views/view_history.php b/application/modules/User/views/view_history.php index bd62bf9..0fe2f60 100644 --- a/application/modules/User/views/view_history.php +++ b/application/modules/User/views/view_history.php @@ -10,16 +10,22 @@