diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 973a5d3c..70abe646 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -497,11 +497,13 @@ class EmployeeRestController extends AdminController try { $file = $this->request->getFile('file'); $client_id = $this->request->getPost('client_id'); - // $client_id = $this->request->getJSON('client_id'); $policy_id = $this->request->getPost('policy_id'); - $employee_id = $this->request->getPost('employee_id'); - // $policy_id = $this->request->getJSON('policy_id'); + $token = $this->request->headers()['Auth']->getValue(); + $decodedPayload = json_decode(base64_decode(explode('.', $token)[1]), true); + + // get the employee id from token + $employee_id = $decodedPayload['id']; $client_policy = $this->clientPolicyModel->where('id', $policy_id)->where('client_id', $client_id)->first(); @@ -586,18 +588,18 @@ class EmployeeRestController extends AdminController } $dataToInsert = []; $basic_cover_si= []; - if ($extra[9]) { - $new_array = []; - for ($i=0; $i < count($extra[9]); $i++) { - if ($sum_insured_amount_for_check_employee_2 != $extra[9][$i] || $sum_insured_amount_for_check_employee_1 != $extra[9][$i]) { - $new_array[] = $i+1; - } - } - if (count($new_array) > 0) { - $count =count($new_array); - return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "$count Employee Sum Insured is Not Match.. " , 'data' => $new_array], 200); - } - } + // if ($extra[9]) { + // $new_array = []; + // for ($i=0; $i < count($extra[9]); $i++) { + // if ($sum_insured_amount_for_check_employee_2 != $extra[9][$i] || $sum_insured_amount_for_check_employee_1 != $extra[9][$i]) { + // $new_array[] = $i+1; + // } + // } + // if (count($new_array) > 0) { + // $count =count($new_array); + // return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "$count Employee Sum Insured is Not Match.. " , 'data' => $new_array], 200); + // } + // } foreach ($extra['0'] as $index => $id) { $relation =''; if ($extra['5'][$index] === 'Mother' || $extra['5'][$index] === 'Father') { diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index ed5c0a4b..92bad796 100644 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -17,6 +17,7 @@ use App\Models\FileModel; use App\Models\EmpEndorsementModel; use App\Controllers\Jobs ; +use App\Controllers\JobWorker ; use PhpOffice\PhpSpreadsheet\Spreadsheet; use Kint\Kint; @@ -266,8 +267,9 @@ class EmployeeServiceController extends AdminController { //proceed next data level validation in JOB queue $job_details = new Jobs(); - $r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]); + $jobWorker = new JobWorker(); + JobWorker::processJob($r); } return $result; @@ -438,6 +440,8 @@ class EmployeeServiceController extends AdminController $job_details = new Jobs(); $r = Jobs::addJob(['job_name' => 'employeesOnboardPreprocess','payload' => ['file_id' => $file_id]]); + $jobWorker = new JobWorker(); + JobWorker::processJob($r); } return $result; diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php index 964d365a..4499d36b 100644 --- a/app/Controllers/JobWorker.php +++ b/app/Controllers/JobWorker.php @@ -27,6 +27,14 @@ class JobWorker extends AdminController // } } + public static function streamOutput($data) + { + ob_implicit_flush(true); + // try { ob_end_flush(); } catch(Exception $e) { echo $e->getMessage(); } + echo $data; + flush(); + } + public static function processJobs(array $jobdata = []) { // echo 'listen';//die(); @@ -49,6 +57,7 @@ class JobWorker extends AdminController //sleep(1); SELF::processjob(['id' => $job->id,'uuid' => $job->uuid]); + usleep( 500000 ); } } } @@ -86,8 +95,15 @@ class JobWorker extends AdminController { $job = $job[0]; - echo "\nProcessing job id - " . $job->id . "\n"; - echo "Job name - " . $job->name . "\n"; + + + // echo "\nProcessing job id - " . $job->id . "\n"; + SELF::streamOutput("\nProcessing job id - " . $job->id . "\n"); + // sleep(5); + // echo "Job name - " . $job->name . "\n"; + SELF::streamOutput("Job name - " . $job->name . "\n"); + // sleep(5); + // print_r(SELF::$event_class_mapping); // echo array_key_exists($job->name,SELF::$event_class_mapping) ? 'mapped' : 'notmapped'; // die(); @@ -173,7 +189,8 @@ class JobWorker extends AdminController ]); // echo "Job $job->id $job_status. Response - $response \n"; - echo "Job $job->id $job_status \n"; + // echo "Job $job->id $job_status \n"; + SELF::streamOutput("Job $job->id $job_status \n"); return true; } else diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php index 2ebafcc9..01bc2a2c 100644 --- a/app/Models/ClientPolicyModel.php +++ b/app/Models/ClientPolicyModel.php @@ -61,12 +61,14 @@ class ClientPolicyModel extends Model } public function getClientPolicyByClientId($client_id){ + return $this->db->table('client_policy') ->select('client_policy.*') ->select('insurers.name as insurer_name, insurers.short_name as insurer_short') ->select('tpa.name as tpa_name, tpa.short_name as tpa_short') - ->select('policies.name as policy_name') + ->select('policies.name as policy_name, policies.policy_type_id') + ->select('policy_type.policy_type as policy_type_name') ->select('insurer_branch.branch_name as insurer_branch_name, insurer_branch.branch_code as insurer_branch_code') ->select('tpa_branch.branch_name as tpa_branch_name, tpa_branch.branch_code as tpa_branch_code') ->join('insurers', 'insurers.id = client_policy.insurer_id') @@ -74,10 +76,13 @@ class ClientPolicyModel extends Model ->join('tpa', 'tpa.id = client_policy.tpa_id') ->join('tpa_branch', 'client_policy.tpa_branch_id = tpa_branch.id') ->join('policies', 'policies.id = client_policy.policy_id') + ->join('policy_type', 'policy_type.id = policies.policy_type_id') ->where('client_policy.client_id', $client_id) ->get() ->getResult(); + + } public function getPolicyPremium($policy_id){ diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php index 9d562f2b..3f08c20a 100644 --- a/app/Views/client_basic_info.php +++ b/app/Views/client_basic_info.php @@ -105,13 +105,11 @@ input:checked + .slider:before {
- +
- +
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index 9018586c..a4e893ab 100644 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -194,12 +194,15 @@ if (policy_PrimaryKey !== '') { var policyTable = ''; var data = ; - data.forEach(function(item) { + // console.log("----------------------------"); + + // console.log(item); + policyTable += ` ${item.insurer_short} - ${item.insurer_branch_name} - ${item.policy_name} + ${item.policy_name} (${item.policy_type_name}) ${item.tpa_short} - ${item.tpa_branch_code} ${rearrangeDateFormat(item.policy_start_date)} - ${rearrangeDateFormat(item.policy_end_date)} ${checkDateStatus(item.policy_end_date, 1)} diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php index db60f466..db203bcd 100644 --- a/app/Views/employee_list.php +++ b/app/Views/employee_list.php @@ -75,7 +75,7 @@ table.dataTable tbody td { Name/code Policy name - Insurar name + Insurer name TPA ID UHID ID Policy status diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index e905c2b3..321823d4 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -3,17 +3,17 @@ # This template allows you to validate your PHP application. # The workflow allows running tests and code linting on the default branch. -image: composer:2.0 +image: php:8.2-cli pipelines: default: - - parallel: - - step: - name: Test - script: - - apt-get update - - apt-get -qq install git-ftp - - git ftp push -u $FTP_USERNAME -p $FTP_PASSWORD $FTP_URL - caches: - - composer \ No newline at end of file + - step: + name: Initialize and Deploy using Git FTP + script: + - apt-get update + - apt-get -qq install git-ftp + - git ftp init -u $FTP_USERNAME -p $FTP_PASSWORD $FTP_URL + - git ftp push -u $FTP_USERNAME -p $FTP_PASSWORD $FTP_URL + caches: + - composer diff --git a/public/assets/api.yaml b/public/assets/api.yaml index 4d3e8f7e..d8159bab 100644 --- a/public/assets/api.yaml +++ b/public/assets/api.yaml @@ -175,9 +175,6 @@ paths: policy_id: type: integer description: policy_id - employee_id: - type: integer - description: employee_id file: type: string format: binary