diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php index 8a61a1cc..070b01ab 100644 --- a/app/Controllers/ThzController.php +++ b/app/Controllers/ThzController.php @@ -137,8 +137,6 @@ class ThzController extends BaseController public function ticketList() { - $data['tab_name'] = "Tickets"; - $data['page_name'] = "Tickets"; try { $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); @@ -166,7 +164,8 @@ class ThzController extends BaseController // 3,4 remain person varannum. $data['client_list'] = $this->clientModel->getCreatedByUserName(); $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll(); - + $data['tab_name'] = "Tickets"; + $data['page_name'] = "Tickets"; return $this->loadLayout('thz_list', $data); } @@ -361,6 +360,9 @@ class ThzController extends BaseController $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : ''; $result['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll(); + + $result['tab_name'] = "Tickets"; + $result['page_name'] = "Tickets"; return $this->loadLayout('thz_notes', $result); } diff --git a/app/Views/UserList.php b/app/Views/UserList.php index 749747ae..716db9a3 100755 --- a/app/Views/UserList.php +++ b/app/Views/UserList.php @@ -886,7 +886,7 @@ table.dataTable tbody td { } ], paging: true, - pageLength: 25, + pageLength: 10, language: { search: `
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php index 4581ea1a..8173ee3c 100644 --- a/app/Views/bds_tat_wise_report.php +++ b/app/Views/bds_tat_wise_report.php @@ -109,7 +109,7 @@ // ], buttons: [ { - text: ' Create New Ticket ', + text: ' Add ', className: 'btn app-btn-primary mr-2', action: function(e, dt, node, config) { openTicket(); diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php index f12150f2..481268cb 100644 --- a/app/Views/business_team_list.php +++ b/app/Views/business_team_list.php @@ -393,7 +393,7 @@ searchPlaceholder: "Search" }, paging: true, - pageLength: 25, + pageLength: 10, ordering: false }); } else { diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php index 11773d72..f9ebba28 100755 --- a/app/Views/cd_master_list.php +++ b/app/Views/cd_master_list.php @@ -260,7 +260,7 @@ table.dataTable thead th { searchPlaceholder: "Search" }, paging: true, - pageLength: 25, + pageLength: 10, order: [[0, 'desc']] // scrollX: true, // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 419f9848..8cacb6bc 100755 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -311,8 +311,8 @@ $(document).ready(function() } }, { - text: '+ Create New Client', - className: 'btn-filter app-btn-primary buttons-html5', // custom class + text: ' Add ', + className: 'btn app-btn-primary mr-2', action: function(e, dt, node, config) { addClient(); } diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php index a7e4b1a6..6bdd968a 100644 --- a/app/Views/dms_search.php +++ b/app/Views/dms_search.php @@ -196,7 +196,7 @@ ] }], paging: true, - pageLength: 25, + pageLength: 10, order: [ [0, 'desc'] ] diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php index 1587afa1..db20f6d4 100644 --- a/app/Views/drive_file_upload.php +++ b/app/Views/drive_file_upload.php @@ -36,7 +36,8 @@
-
+
+
@@ -45,7 +46,7 @@
- +
@@ -62,6 +63,7 @@ + diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php index de7d908b..cacfab96 100755 --- a/app/Views/endorsement_list.php +++ b/app/Views/endorsement_list.php @@ -598,7 +598,7 @@ "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [{ - text: ' Create New Ticket ', + text: ' Add ', className: 'btn app-btn-primary mr-2', action: function(e, dt, node, config) { openTicket(); diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php index 2c978329..0ec2aed9 100644 --- a/app/Views/finance_team_list.php +++ b/app/Views/finance_team_list.php @@ -393,7 +393,7 @@ $(document).ready(function () { searchPlaceholder: "Search" }, paging: true, - pageLength: 25, + pageLength: 10, ordering: false }); } else { diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php index 260f0a41..8f52d592 100644 --- a/app/Views/hr_activity_history.php +++ b/app/Views/hr_activity_history.php @@ -106,7 +106,7 @@ $(document).ready(function () { searchPlaceholder: "Search..." }, paging: true, - pageLength: 25, + pageLength: 10, ordering: false, buttons: [ { diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php index 76bbdc73..dd0c7b33 100644 --- a/app/Views/hr_file_upload.php +++ b/app/Views/hr_file_upload.php @@ -356,11 +356,7 @@ // for datatable $(document).ready(function() { $('#hr_tickets_table').DataTable({ -<<<<<<< HEAD dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + -======= - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + ->>>>>>> 3e7d3426 (FIX_XL button and Search) "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [{ diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php index 9bb6624b..59727f76 100755 --- a/app/Views/insurer_list.php +++ b/app/Views/insurer_list.php @@ -217,23 +217,8 @@ `, searchPlaceholder: "Search" ->>>>>>> 3e7d3426 (FIX_XL button and Search) }, - { - text: 'ADD', - className: 'btn btn-color', - action: function() { - window.location.href = ""; - } - } - ], - - - language: { - search: "_INPUT_", - searchPlaceholder: "Search..." - }, - paging: true, + paging: true, }); }) diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 34a3eb29..9e2269cb 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -140,10 +140,6 @@ min-height: 100vh !important; } - body[data-sidebar-size=condensed] .left-side-menu #sidebar-menu>ul>li>a i{ - margin :0 px !important; - } - body .content-page { margin-top: 90px !important; } @@ -271,7 +267,7 @@ padding: 0 !important; height: 90% !important; display: flex; - flex-flow: column nowrap; + flex-flow: column wrap; } /* every
  • inside should be allowed to shrink */ @@ -291,6 +287,7 @@ min-height: 43px !important; } + .li-seperate { margin: 10px 0px; } @@ -303,15 +300,7 @@ padding: 8px !important; min-height: 43px !important; } - - .li-seperate a img - { - margin-left:4px !important; - } - - - @@ -828,7 +806,7 @@ border-radius: 13px !important; border: none !important; } - + /* Previous / Next buttons */ .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link, .dataTables_wrapper .dataTables_paginate .page-item.next .page-link { @@ -1343,7 +1321,8 @@
    @@ -184,15 +200,18 @@
    -
    +
    -
    -

    Client Details - - - -

    -
    + +
    +
    +
    @@ -281,9 +300,10 @@
    +
    -
    +
    @@ -297,16 +317,18 @@
    -
    +
    -
    -

    Pre Sales - - - -

    -
    - + +
    +
    +
    +
    -
    +
    • S.No 
    +
    @@ -821,22 +854,18 @@
    Premium Details
    -
    +
    +
    -
    - - - - - - - - - + + + + + -
    +
    @@ -4086,8 +4115,10 @@ // Update header $('#insurerTable thead tr').append(` + Insurer ${insurerCount} ${insurerCount > 1 ? `` : ''} + `); diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php index caee48f0..ef7ff681 100644 --- a/app/Views/policy_transaction_inception_list.php +++ b/app/Views/policy_transaction_inception_list.php @@ -1,192 +1,200 @@ -
    -
    +
    +

    - Filter - - - -

    + Filter + + + +
    -
    +
    - $value) { - echo ""; + if (isset($client) && count($client)) { + foreach ($client as $key => $value) { + echo ""; + } } - } ?>
    -
    +
    - - +
    -
    +
    - $value) { - echo ""; + if (isset($policy_types) && count($policy_types)) { + foreach ($policy_types as $key => $value) { + echo ""; + } } - } ?>
    @@ -196,56 +204,68 @@
    --> -
    +
    - $value) { - echo ""; + if (isset($policy_status) && count($policy_status)) { + foreach ($policy_status as $key => $value) { + echo ""; + } } - } ?> -
    +
    -
    +
    + +
    + + + +
    - @@ -253,111 +273,76 @@
    -
    +
    +
    +
    +
    +
    +
    +

    Policy List

    +
    - -
    -
    -
    -
    -
    -

    Policy List

    +
    + +
    -
    +
    - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - $row) { ?> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + +
    -
    S.No 
    -     		-
    Issuer 
    -     		-
    Business Type 
    -     		-
    Client Type 
    -     		-
    Client / Branch 
    -     		-
    Insurer 
    -     		-
    Policy 
    -     		-
    Policy No 
    -     		-
    Policy Issue Date 
    -     		-
    D.O.C 
    -     		-
    D.O.E 
    -     		-
    No of Insured 
    -     		-
    No of Dependents 
    -     		-
    Status 
    -     		-
    User 
    -     		-
    Action
    -
    S.No.
    Issuer
    Business Type
    Client Type
    Client / Branch
    Insurer
    Policy
    Policy No
    Policy Issue Date
    D.O.C
    D.O.E
    No of Insured
    No of Dependents
    Status
    User
    Action
    - - - - -
    - -
    - - Edit - - - Delete - -
    + $row){ ?> +
    +
    + +
    + + Edit + + + Delete +
    -
    @@ -365,868 +350,645 @@
    +
    + - + + +