diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 60d3b955..be3ec051 100755 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -1589,7 +1589,7 @@ class MasterController extends AdminController public function VehicleMasterList() { - $data['page_name'] = 'Vehicle Master List'; + $data['page_name'] = 'Vehicle Master'; $data['vehicle_type'] = [ 'two_wheeler' => 'Two Wheeler', 'four_wheeler' => 'Four Wheeler', diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php index ce37847e..b8ca31be 100644 --- a/app/Views/bds_multi_report.php +++ b/app/Views/bds_multi_report.php @@ -22,7 +22,6 @@ -
@@ -82,7 +81,6 @@
-
\ No newline at end of file diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php index c6baa89e..497a9eda 100644 --- a/app/Views/business_team_list.php +++ b/app/Views/business_team_list.php @@ -44,16 +44,22 @@ table.dataTable tbody td { } -
-
+
+

Business Team

+
+ +
-
-
+ + +
+ +
@@ -135,16 +141,16 @@ table.dataTable tbody td { +
- - + +
+ @@ -80,7 +81,7 @@ table.dataTable thead th { - + $row){ ?> @@ -90,7 +91,7 @@ table.dataTable thead th { - + - +
S.No. Client NameAction
by
by
@@ -213,35 +214,75 @@ table.dataTable thead th { $(document).ready(function() { $('#scroll-horizontal-datatable').DataTable({ - scrollX: true, - dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + - "<'row'<'col-sm-12'tr>>" + - "<'row'<'col-sm-5'i><'col-sm-7'p>>", - buttons: [ - { - extend: 'csv', - text: 'CSV', - title: 'CD-Master-List', - className: 'my_class', - exportOptions: { - columns: ':not(:last-child)' - }, - }, - { - text: 'Add', - className: 'buttons-html5 ', - action: function (e, dt, node, config) { + scrollX: true, + dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + "<'row'<'col-sm-12'tr>>" + + "<'row'<'col-sm-5'i><'col-sm-7'p>>", + buttons: [ + { + text: ' Add ', + className: 'btn app-btn-primary mr-2', + action: function (e, dt, node, config) { showCdMasterAddModal(); - } - } - ], - language: { - search: "_INPUT_", - searchPlaceholder: "Search..." - }, - paging: true, + } + }, + { + extend: 'collection', + text: ' Export ', + className: 'btn app-btn-secondary ', + buttons: [ + { + extend: 'csv', + title: 'CD-Master-List', + className: 'my_class', + text: ' CSV ', + className: 'app-btn-primary my_class', + exportOptions: { + columns: ':not(:last-child)' + }, + }, + { + extend: 'excel', + text: ' EXCEL ', + exportOptions: { + orthogonal: 'sort' + }, + className: 'app-btn-primary ', + } + ] + } + ], + paging: true, + pageLength: 25, + order: [[0, 'desc']] + // scrollX: true, + // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + + // "<'row'<'col-sm-12'tr>>" + + // "<'row'<'col-sm-5'i><'col-sm-7'p>>", + // buttons: [ + // { + // extend: 'csv', + // text: 'CSV', + // title: 'CD-Master-List', + // className: 'my_class', + // exportOptions: { + // columns: ':not(:last-child)' + // }, + // }, + // { + // text: 'Add', + // className: 'buttons-html5 ', + // action: function (e, dt, node, config) { + // showCdMasterAddModal(); + // } + // } + // ], + // language: { + // search: "_INPUT_", + // searchPlaceholder: "Search..." + // }, + // paging: true, }); - }) $(document).ready(function(){ diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php index 58fd2da3..a5076e9d 100644 --- a/app/Views/dms_search.php +++ b/app/Views/dms_search.php @@ -34,51 +34,57 @@
-
+
" id='dms_search_form'> -
+
-
- - - - - - -
+
+ + + + + + +
-
- - - - -
-
- OR -
-
- - - - - - -
+
+ + + + +
+
+ +
+ OR +
+
-
- - - - -
-
+
+ + + + + + +
-
- - -
- +
+ + + + +
+ +
+ + + +
+ +
+
@@ -94,7 +100,8 @@
-

File search result

+

Files

+
@@ -159,13 +166,35 @@ var ticketsTable = $('#scroll-horizontal-datatable'); if (ticketsTable.length) { ticketsTable.DataTable({ - scrollX: true, - language: { - search: "_INPUT_", - searchPlaceholder: "Search..." - }, - paging: true, // Enable pagination - pageLength: 25, // Set default number of rows per page (optional) + scrollX: true, + dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + "<'row'<'col-sm-12'tr>>" + + "<'row'<'col-sm-5'i><'col-sm-7'p>>", + buttons: [ + { + extend: 'collection', + text: ' Export ', + className: 'btn app-btn-secondary ', + buttons: [ + { + extend: 'csv', + text: ' CSV ', + className: 'app-btn-primary ', + }, + { + extend: 'excel', + text: ' EXCEL ', + exportOptions: { + orthogonal: 'sort' + }, + className: 'app-btn-primary ', + } + ] + } + ], + paging: true, + pageLength: 25, + order: [[0, 'desc']] }); } else { console.error("Table not found."); @@ -220,6 +249,11 @@ function fetchFileList(event) var cus_doc_name = document.getElementById('cus_doc_name').value; var policy_doc_name = document.getElementById('policy_doc_name').value; + if(policy == '' && customer == '') + { + alert('choose customer or policy');return false; + } + if(customer == '' && cus_doc_name != '') { alert('choose customer');return false; @@ -230,10 +264,7 @@ function fetchFileList(event) alert('choose policy');return false; } - if(policy == '' && customer == '') - { - alert('choose customer or policy');return false; - } + console.log('called'); let customEvent = new CustomEvent('fetchFileListCustomEvent'); $('#dms_search_form').submit(); diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php index ffb991ea..12c592eb 100644 --- a/app/Views/finance_team_list.php +++ b/app/Views/finance_team_list.php @@ -44,16 +44,20 @@ table.dataTable tbody td { } -
-
+
+

Finance Team

+
+ +
-
-
+
+ +
@@ -135,16 +139,15 @@ table.dataTable tbody td { + -
+
-
+
@@ -168,7 +200,7 @@ table.dataTable tbody td {
- +
@@ -221,7 +253,7 @@ table.dataTable tbody td {
'.$row['first_name'] ?> by '.$row['first_name'] ?>
@@ -263,50 +295,59 @@ table.dataTable tbody td {
- -
- - -
-
- - +
+
+ Download sample file +
- -
- - +
+
+ + +
+
+ + +
- -
- Download sample file - +
+
+ + +
+
+ +
+ + +
+
- + +
@@ -365,6 +406,7 @@ table.dataTable tbody td {
-->
+
@@ -422,10 +464,7 @@ table.dataTable tbody td {