diff --git a/app/Config/Routes.php b/app/Config/Routes.php index c12db26c..f8d085da 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -314,6 +314,9 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->get("checkInvoiceStatus/(:any)", "PolicyTransactionController::checkInvoiceStatus/$1"); $routes->get("base_policy_for_policy_inception/(:any)", "PolicyTransactionController::getBasePolicy/$1"); $routes->get("sentTestMail/(:any)", "NotificationController::sentTestMail/$1"); + $routes->get("send_manual_reminder/(:any)", "DashboardController::sendManualReminder/$1"); + $routes->get("get_client_policy_list_for_remainder/(:any)", "EmployeeController::get_client_policy_list_for_remainder/$1"); + }); diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 079e4d35..38b727a2 100755 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -467,7 +467,7 @@ class DashboardController extends AdminController } - public function sendManualRemainder($client_id, $client_branch_id) + public function sendManualReminder($client_id, $client_branch_id) { $this->myLogger->logme('error', "sendManualRemainder called with client_id: {$client_id}, client_branch_id: {$client_branch_id}"); diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php index 5ad5ea73..7f1ae499 100755 --- a/app/Views/employee_upload.php +++ b/app/Views/employee_upload.php @@ -103,7 +103,7 @@ option:disabled {
Featch + data-target="#full-width-modal" title="Download Sample Excel">Fetch Enrolled Data
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php index 4052ecb5..8459974c 100755 --- a/app/Views/enrollment_list.php +++ b/app/Views/enrollment_list.php @@ -714,12 +714,12 @@ } $.ajax({ - url: '' + client_id + '/' + client_branch_id, + url: '' + client_id + '/' + client_branch_id, type: "GET", dataType: 'json', success: function(res) { - console.log('send_manual_remainder', res) + console.log('send_manual_reminder', res) $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php index 80351506..46f33c80 100755 --- a/app/Views/policy_grid.php +++ b/app/Views/policy_grid.php @@ -14,7 +14,7 @@ } .radio-group .form-check { - margin-right: -110px; + margin-right: -335px; } .radioalign{ @@ -2882,186 +2882,214 @@ function createCheckboxes(obj, additional_relationship = [], unique_id = null, p } $relationshipElement.empty(); + let html = ` -
-
- `; + +
+ + + `; + if (obj['self'] > 0) { let selfValue = additional_relationship['self'] || '1'; console.log('selfValue', selfValue); html += ` -
- -
- - -
-
- - -
-
- - -
-
- - -
-
`; + + + + `; } if (obj['spouse'] > 0) { let spouseValue = additional_relationship['spouse'] || 'any'; html += ` -
- -
- - -
-
- - -
-
- - -
-
- - -
-
`; + + + + `; } if (obj['childrens'] > 0) { - let childrensValue = additional_relationship['childrens'] || 'any'; html += ` -
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
`; + + + + `; } if (obj['parents'] > 0) { let parentsValue = additional_relationship['parents'] || 'any'; html += ` -
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
`; + + + + `; } if (obj['parents-in-law'] > 0) { let parentsInLawValue = additional_relationship['parents-in-law'] || 'any'; html += ` -
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
`; + + + + `; } html += ` + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
-
`; + + `; - $relationshipElement.append(html); + console.log(html); - if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { - $('.radio-group .form-check').css('margin-right', '-60px'); - } else if (obj['self'] == 0 && obj['spouse'] > 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { - $('.radio-group .form-check').css('margin-right', '-110px'); - } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] == 0) { - $('.radio-group .form-check').css('margin-right', '-60px'); - } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] == 0 && obj['parents-in-law'] > 0) { - $('.radio-group .form-check').css('margin-right', '-60px'); - } else if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { - $('.radio-group .form-check').css('margin-right', '-110px'); - } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { - $('.radio-group .form-check').css('margin-right', '-110px'); - } else if (obj['self'] > 0 && obj['spouse'] > 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] > 0){ - $('.radio-group .form-check').css('margin-right', '-60px'); - } else if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] > 0){ - $('.radio-group .form-check').css('margin-right', '-60px'); - } else { - $('.radio-group .form-check').css('margin-right', '-60px'); - } + $relationshipElement.append(html); - if(policy_type == 1 || policy_type == 6 || policy_type == 7){ - $('.radio-group .form-check').css('margin-right', '-50px'); - } + // if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } else if (obj['self'] == 0 && obj['spouse'] > 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { + // $('.radio-group .form-check').css('margin-right', '-110px'); + // } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] == 0) { + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] == 0 && obj['parents-in-law'] > 0) { + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } else if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { + // $('.radio-group .form-check').css('margin-right', '-110px'); + // } else if (obj['self'] == 0 && obj['spouse'] == 0 && obj['childrens'] > 0 && obj['parents'] == 0 && obj['parents-in-law'] == 0) { + // $('.radio-group .form-check').css('margin-right', '-110px'); + // } else if (obj['self'] > 0 && obj['spouse'] > 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] > 0){ + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } else if (obj['self'] > 0 && obj['spouse'] == 0 && obj['childrens'] == 0 && obj['parents'] > 0 && obj['parents-in-law'] > 0){ + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } else { + // $('.radio-group .form-check').css('margin-right', '-60px'); + // } + + // if(policy_type == 1 || policy_type == 6 || policy_type == 7){ + // $('.radio-group .form-check').css('margin-right', '-50px'); + // } }