diff --git a/VNMS_Frontend-live-26-02-2025.zip b/VNMS_Frontend-live-26-02-2025.zip new file mode 100644 index 0000000..794986b Binary files /dev/null and b/VNMS_Frontend-live-26-02-2025.zip differ diff --git a/src/app/pages/drivery-sheet/drivery-sheet.component.html b/src/app/pages/drivery-sheet/drivery-sheet.component.html index ccf44d8..9ae0033 100644 --- a/src/app/pages/drivery-sheet/drivery-sheet.component.html +++ b/src/app/pages/drivery-sheet/drivery-sheet.component.html @@ -43,14 +43,45 @@ autocomplete="off" [(ngModel)]="selectedDateRange" name="daterange" placeholder="Fliter Date Wise" (change)="dateWiseFilter()"/> --> - + + + + + + + + + + + {{ user.userName }} + + + + + diff --git a/src/app/pages/drivery-sheet/drivery-sheet.component.ts b/src/app/pages/drivery-sheet/drivery-sheet.component.ts index 5239463..247b338 100644 --- a/src/app/pages/drivery-sheet/drivery-sheet.component.ts +++ b/src/app/pages/drivery-sheet/drivery-sheet.component.ts @@ -20,8 +20,21 @@ export class DriverySheetComponent implements OnInit { // moment().subtract(1, 'month').endOf('month') // ] - };productDeatils:any =[]; DateDisplay:any =[];driverName:any =[]; selectDate:any =[]; driverId:any =[]; - selectedDateRange:any =[];drivers:any =[];summaryaData:any=[];driverval:any=[];returnSummary:any =[]; + }; + productDeatils:any =[]; + DateDisplay:any =[]; + driverName:any =[]; + selectDate:any =[]; + driverId:any =[]; + selectedDateRange:any =[]; + drivers:any =[]; + filteredDrivers: any[] = []; // Search query + searchQuery: string = ''; + + summaryaData:any=[]; + driverval:any=[]; + returnSummary:any =[]; + constructor(public _api:PageapiService, private router:Router) { } ngOnInit(): void { @@ -67,6 +80,18 @@ export class DriverySheetComponent implements OnInit { return acc; }, []); } + + // Filter customers based on search input + filterDrivers() { + if (this.searchQuery.trim() === '') { + this.filteredDrivers = [...this.drivers]; + } else { + this.filteredDrivers = this.drivers.filter(user => + user.userName?.toLowerCase().includes(this.searchQuery.toLowerCase()) + ); + } + } + getDriverlistApi(){ // console.log(this.selectedDateRange) let param ={} @@ -87,6 +112,7 @@ export class DriverySheetComponent implements OnInit { this.drivers = driver + this.filteredDrivers = [...this.drivers]; // console.log(data) } diff --git a/src/app/pages/order/order-form/order-form.component.html b/src/app/pages/order/order-form/order-form.component.html index b97f13c..fbb77c4 100644 --- a/src/app/pages/order/order-form/order-form.component.html +++ b/src/app/pages/order/order-form/order-form.component.html @@ -31,15 +31,41 @@

{{selectCustomer}} - - - - - {{user['CusDetails.cusName'] - }} - - + + + + + + + + + + + {{ user['CusDetails.cusName'] }} + + +
Shipping Information
@@ -87,14 +113,42 @@ - - + + + + + + + + + + {{ user.userName }} + + + +
diff --git a/src/app/pages/return-sheet/return-sheet.component.ts b/src/app/pages/return-sheet/return-sheet.component.ts index 44617b7..15d690d 100644 --- a/src/app/pages/return-sheet/return-sheet.component.ts +++ b/src/app/pages/return-sheet/return-sheet.component.ts @@ -23,7 +23,11 @@ export class ReturnSheetComponent implements OnInit { // ] };productDeatils:any =[]; DateDisplay:any =[];driverName:any =[]; selectDate:any =[]; driverId:any =[]; - selectedDateRange:any =[];drivers:any =[];summaryaData:any=[];driverval:any=[];returnSummary:any =[]; + selectedDateRange:any =[]; + drivers:any =[]; + filteredDrivers: any[] = []; // Search query + searchQuery: string = ''; + summaryaData:any=[];driverval:any=[];returnSummary:any =[]; constructor(public _api:PageapiService, private router:Router) { } ngOnInit(): void { @@ -69,6 +73,19 @@ export class ReturnSheetComponent implements OnInit { return acc; }, []); } + + // Filter customers based on search input + filterDrivers() { + if (this.searchQuery.trim() === '') { + this.filteredDrivers = [...this.drivers]; + } else { + this.filteredDrivers = this.drivers.filter(user => + user.userName?.toLowerCase().includes(this.searchQuery.toLowerCase()) + ); + } + } + + getDriverlistApi(){ // console.log(this.selectedDateRange) let param ={} @@ -89,6 +106,7 @@ export class ReturnSheetComponent implements OnInit { this.drivers = driver + this.filteredDrivers = [...this.drivers]; // console.log(data) } diff --git a/src/app/pages/summary-list/summary-list.component.html b/src/app/pages/summary-list/summary-list.component.html index f1f7c6a..6d9204f 100644 --- a/src/app/pages/summary-list/summary-list.component.html +++ b/src/app/pages/summary-list/summary-list.component.html @@ -44,14 +44,42 @@ autocomplete="off" [(ngModel)]="selectedDateRange" name="daterange" placeholder="Fliter Date Wise" (change)="dateWiseFilter()"/> --> - + + + + + + + + + + {{ user.userName }} + + + + {{user.userName }} - +
-->