From 9453085878713af8d53794c4fa30b7e5e99d48f3 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Thu, 22 Aug 2024 17:11:26 +0530 Subject: [PATCH] CHANGE_MASTER_LIST_CONVERT_TO_NEW_THEME --- app/Views/assetListing.php | 230 ++++++++++++----------- app/Views/configlisting.php | 221 +++++++++++----------- app/Views/costListing.php | 302 +++++++++++++++--------------- app/Views/departmentListing.php | 310 ++++++++++++++----------------- app/Views/rawmaterialListing.php | 244 ++++++++++++------------ app/Views/supplierListing.php | 226 +++++++++++----------- app/Views/transporterListing.php | 154 +++++++++++++-- app/Views/userListing.php | 236 ++++++++++++----------- 8 files changed, 1005 insertions(+), 918 deletions(-) diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index 10227862..bd3fa81b 100644 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -35,43 +35,49 @@ color: #0056b3; } -
-
-
-
-
-

Asset Details

-
-
-
+
+
+ +
+ +
-
-
- - - - - - - - - -
-
-
-
-
- Add New Asset - Export Asset Details +
+
+

Asset Details

- - -
+
+ Add New Asset + Export Asset Details +
+
-
- +
+
+
+ + + + + + + + + +
+ +
+
+ + + + + + +
+ @@ -122,13 +128,15 @@ ?>
Created Date
- -
+
+
+
-
-
+
+ + + + \ No newline at end of file diff --git a/app/Views/configlisting.php b/app/Views/configlisting.php index eb9978ea..2315dbda 100644 --- a/app/Views/configlisting.php +++ b/app/Views/configlisting.php @@ -35,39 +35,26 @@ color: #0056b3; } -
-
-
-
-
-

Configuration Details

-
-
-
-
-
-
- - - - - - - -
-
-
-
-
- Add New Configuration -
-
-
-
-
- +
+ +
+ +
+
+
+
+

Configuration Details

+
+
+
+ Add New Configuration +
+
+ getFlashdata('error'); if ($error) { @@ -87,26 +74,34 @@
-
-
- listErrors('
', '
'); - ?>
-
-
-
-
- - - +
+
+
+
+ + + + + + + + + +
+ +
+
+ + - - - + + @@ -137,12 +132,17 @@ } } ?> - -
Create Date Configuration ID Configuration Name Description Action
-
-
-
+ + +
+
+
+ + + + + @@ -171,77 +171,78 @@ var dateSplit = date.split('-'); return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1; }; + // Initialize the DataTable - var table = $('#configtable').DataTable({ - "paging": true, - "lengthChange": true, - "searching": true, - "ordering": true, - "columnDefs": [{ - "targets": 0, - "type": "date-eu" - }], - "aaSorting": [ - [0, "desc"] - ], - "info": true, - "autoWidth": true, - "pageLength": 10, - "lengthMenu": [10, 25, 50, 100], - + var table = $('#config_list_table').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options + responsive: true, // Responsive table + order: [[0, 'desc']], // Default ordering (column index 0, descending) + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + } + } }); - // Initialize the datepickers - $("#fromDate").datepicker({ - dateFormat: 'dd-mm-yy', - onSelect: function(selectedDate) { - var minDate = $(this).datepicker("getDate"); - $("#toDate").datepicker("option", "minDate", minDate); - } - }); + // Date range filter function + $.fn.dataTable.ext.search.push( + function(settings, data, dataIndex) { + var fromDate = $('#fromDate').val(); + var toDate = $('#toDate').val(); + + if (!fromDate || !toDate) { + return true; // If no dates selected, don't filter + } + + var dateStr = data[0]; // Assuming the date is in the first column + var dateParts = dateStr.split("-"); + var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object + + var startDate = new Date(fromDate); + var endDate = new Date(toDate); + + // Adjust startDate to include the day before the selected fromDate + startDate.setDate(startDate.getDate() - 1); + + // Ensure endDate includes the entire end date by setting time to the end of the day + endDate.setHours(23, 59, 59, 999); - $("#toDate").datepicker({ - dateFormat: 'dd-mm-yy', - onSelect: function(selectedDate) { - var maxDate = $(this).datepicker("getDate"); - $("#fromDate").datepicker("option", "maxDate", maxDate); - } + // Return true if the date is within the range + return date >= startDate && date <= endDate; + } + ); + + // Handle form submission for the date range filter + $("#DateRangeFilter").submit(function(e) { + e.preventDefault(); + table.draw(); // Redraw the table to apply the filter }); // Reset button functionality $("#resetButton").click(function() { - $("#fromDate").datepicker("setDate", null); - $("#toDate").datepicker("setDate", null); - $("#toDate").datepicker("option", "minDate", null); - $("#fromDate").datepicker("option", "maxDate", null); - table.draw(); + $("#fromDate").val(''); + $("#toDate").val(''); + table.draw(); // Redraw the table to clear the filter }); - // Date range filter - $.fn.dataTable.ext.search.push( + // Automatically focus and open the To Date picker when From Date is selected + document.getElementById('fromDate').addEventListener('change', function() { + var fromDate = this.value; + var toDateInput = document.getElementById('toDate'); + + // Set the min attribute of the To Date input to the selected From Date + toDateInput.min = fromDate; - function(settings, data, dataIndex) { - var fromDate = $("#fromDate").datepicker("getDate"); - var toDate = $("#toDate").datepicker("getDate"); - - var dateStr = data[0]; // Assuming the date is in the first column - - // Convert dateStr to Date object - var dateParts = dateStr.split("-"); - var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object - - if (!fromDate || !toDate) { - return true; // No filter if dates are not selected + // Optionally reset the To Date input if the current value is before the new min date + if (toDateInput.value < fromDate) { + toDateInput.value = fromDate; } - - return date >= fromDate && date <= toDate; - } - ); - - // Handle form submission - $("#DateRangeFilter").submit(function(e) { - e.preventDefault(); - table.draw(); }); - }); +}); \ No newline at end of file diff --git a/app/Views/costListing.php b/app/Views/costListing.php index 565966f0..83679e4b 100644 --- a/app/Views/costListing.php +++ b/app/Views/costListing.php @@ -29,92 +29,9 @@ color: #0056b3; } -
-
-
-
-
-

Cost Details

-
-
-
-
-
-
- - - - - - - - - -
-
-
-
-
- Add New Cost List - Export Cost Details -
-
-
-
- - - - - - - - - - - - - - CreatedDate); - $date = $createdat->format('d-m-Y'); - $time = $createdat->format('h:i A'); - ?> - - - - - - - - - - - - -
Create DateCreate TimeCost Center CodeCost Center NameCreated ByActiveAction
code ?>CostCenterName ?>FirstName ?>IsActive == 1 ? $R = 'ACTIVE' : $R = 'INACTIVE'; - echo $R; - ?> - DeletedBy == '') { - ?> - -     - -
-
-
-
- -
-
- \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php index 33525d93..2a58196a 100644 --- a/app/Views/departmentListing.php +++ b/app/Views/departmentListing.php @@ -41,13 +41,26 @@ color: #0056b3; } -
- - -
-
-
- +
+ +
+ +
+
+
+
+

Department Details

+
+
+
+ Add New department + Export department details +
+
+ getFlashdata('error'); if ($error) { @@ -67,190 +80,153 @@
-
-
- listErrors('
', '
'); - ?>
-
-
-
-
-
-
-

Department Details

-
+
+
+
+
+ + + -
-
- - -
-
- - - - + + - - + + +
+ +
+ + + + + + + + + + + + + + + + CreatedDt)) == "30-11--0001") { + $cdate = '00-00-0000'; + } else { + $cdate = date('d-m-Y', strtotime($record->CreatedDt)); + } ?> + + + + + + + - - -
- - -
-
- Add New department - Export department details + +
+
Create DateDepartment CodeDepartment NameHead DepartmentIsActive
DEPCode; ?>DepartmentName ?>HeadDept ?>IsActive == 1) { + echo "Active"; + } else { + echo "In Active"; + } ?>
+
+
+
+
-
-
-
-
- - - - - - - - - - - - - - - - CreatedDt)) == "30-11--0001") { - $cdate = '00-00-0000'; - } else { - $cdate = date('d-m-Y', strtotime($record->CreatedDt)); - } ?> - - - - - - - + + + - - -
Create DateDepartment CodeDepartment NameHead DepartmentIsActive
DEPCode; ?>DepartmentName ?>HeadDept ?>IsActive == 1) { - echo "Active"; - } else { - echo "In Active"; - } ?>
-
-
-
-
-
- -
- + \ No newline at end of file diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php index c354edc5..fe85699d 100644 --- a/app/Views/rawmaterialListing.php +++ b/app/Views/rawmaterialListing.php @@ -35,65 +35,59 @@ color: #0056b3; } -
-
-
- getFlashdata('error'); - if ($error) { - $type = "error"; - echo show_alert($type, $error); - } - $success = session()->getFlashdata('success'); - if ($success) { - $type = "success"; - echo show_alert($type, $success); - } - ?> -
-
- listErrors('
', '
'); - ?>
-
-
-
-
-
-
-
-

Material Master Details

-
-
-
-
-
-
- - - - - - - -
-
-
-
-
- Add New Material - Export Material Master -
-
-
-
-
- - - +
+
+ +
+ +
+
+
+
+

Material Master Details

+
+
+
+ Add New Material + Export Material Master +
+
+ getFlashdata('error'); + if ($error) { + $type = "error"; + echo show_alert($type, $error); + } + $success = session()->getFlashdata('success'); + if ($success) { + $type = "success"; + echo show_alert($type, $success); + } + ?> +
+
+
+
+ + + + + + + + + +
+ +
+
+ + + @@ -133,14 +127,18 @@ } } ?> - -
Created Date Material Code Material Description
-
-
-
-
-
+ + + +
+ + + + + + + +
+ +
+
+
+
+

Supplier Listing

+
+
+
Add New Supplier Export Supplier Details
-
-
- - + +
+
+
+
+ + + + + + + + + +
+ +
+
+ @@ -131,7 +124,7 @@ @@ -141,13 +134,15 @@ ?>
Created Date Supplier IDIsActive == 0) { echo "Deactived"; } else { ?> -     +    
+
+
+
+
+
+ + + - - - - - - \ No newline at end of file + // Optionally reset the To Date input if the current value is before the new min date + if (toDateInput.value < fromDate) { + toDateInput.value = fromDate; + } + }); +}); + \ No newline at end of file diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index 72d635a9..a27c14ad 100644 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -37,26 +37,85 @@ color: rgb(173, 3, 23); } + +
- -
-
-
-

- Add New Transporter
-
-
-
- - + +
+
+
+
+

Transporter Details

+
+
+
+ Add New Transporter
+
+ +
+
+ + + + + + + + + +
+
- +
@@ -77,8 +136,8 @@ $time = $createdat->format('h:i A'); ?> - - + + @@ -106,9 +165,11 @@ + +
Create Date
id ?> name ?> FirstName ?>
- - - + + +
+ +
+
Created Date
+ + @@ -126,7 +115,7 @@ @@ -135,15 +124,18 @@ } } ?> - -
Created Date User Name EmailDepartmentName ?> role ?> -     +        
- -
+ + + +
+
+
- - + + + \ No newline at end of file