diff --git a/VNMS_Frontend_Build_21-09-2023.zip b/VNMS_Frontend_Build_21-09-2023.zip deleted file mode 100644 index 89969e0..0000000 Binary files a/VNMS_Frontend_Build_21-09-2023.zip and /dev/null differ diff --git a/src/app/pages/drivery-sheet/drivery-sheet.component.ts b/src/app/pages/drivery-sheet/drivery-sheet.component.ts index 7ae74eb..5239463 100644 --- a/src/app/pages/drivery-sheet/drivery-sheet.component.ts +++ b/src/app/pages/drivery-sheet/drivery-sheet.component.ts @@ -250,9 +250,22 @@ if(order.length>0){ } download(){ var element = document.getElementById('table'); + + // Create a new date object using the selectDate value + const selectedDate = new Date(this.selectDate[0]); + + // Get the year, month, and day components + const year = selectedDate.getFullYear(); + const month = String(selectedDate.getMonth() + 1).padStart(2, '0'); // Add leading zero if needed + const day = String(selectedDate.getDate()).padStart(2, '0'); // Add leading zero if needed + + // Format the components as "yyyy-mm-dd" + const formattedDate = `${day}-${month}-${year}`; + console.log(formattedDate); + var opt = { margin: 1, - filename: 'sheet.pdf', + filename: 'Delivery_Sheet_'+formattedDate+'_'+this.driverName, image: { type: 'jpg', quality: 0.98 }, html2canvas: { scale: 2 }, jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' } diff --git a/src/app/pages/return-sheet/return-sheet.component.ts b/src/app/pages/return-sheet/return-sheet.component.ts index 7190821..44617b7 100644 --- a/src/app/pages/return-sheet/return-sheet.component.ts +++ b/src/app/pages/return-sheet/return-sheet.component.ts @@ -308,14 +308,26 @@ if(order.length>0){ } download(){ + console.log(this.driverName,this.selectDate[0]) + // Create a new date object using the selectDate value + const selectedDate = new Date(this.selectDate[0]); + + // Get the year, month, and day components + const year = selectedDate.getFullYear(); + const month = String(selectedDate.getMonth() + 1).padStart(2, '0'); // Add leading zero if needed + const day = String(selectedDate.getDate()).padStart(2, '0'); // Add leading zero if needed + + // Format the components as "yyyy-mm-dd" + const formattedDate = `${day}-${month}-${year}`; + console.log(formattedDate); var element = document.getElementById('table'); -var opt = { - margin: 1, - filename: 'sheet.pdf', - image: { type: 'jpg', quality: 0.98 }, - html2canvas: { scale: 2 }, - jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' } -}; + var opt = { + margin: 1, + filename: 'Return_Sheet_'+formattedDate+'_'+this.driverName, + image: { type: 'jpg', quality: 0.98 }, + html2canvas: { scale: 2 }, + jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' } + }; // New Promise-based usage: html2pdf().from(element).set(opt).save(); diff --git a/src/app/pages/summary-list/summary-list.component.ts b/src/app/pages/summary-list/summary-list.component.ts index be0e2a0..5d1666b 100644 --- a/src/app/pages/summary-list/summary-list.component.ts +++ b/src/app/pages/summary-list/summary-list.component.ts @@ -282,15 +282,27 @@ console.log(result) } download(){ - var element = document.getElementById('table'); -var opt = { - margin: 1, - filename: 'sheet.pdf', - image: { type: 'jpg', quality: 0.98 }, - html2canvas: { scale: 2 }, - jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' } -}; - + console.log(this.driverName,this.selectDate[0]) + // Create a new date object using the selectDate value + const selectedDate = new Date(this.selectDate[0]); + + // Get the year, month, and day components + const year = selectedDate.getFullYear(); + const month = String(selectedDate.getMonth() + 1).padStart(2, '0'); // Add leading zero if needed + const day = String(selectedDate.getDate()).padStart(2, '0'); // Add leading zero if needed + + // Format the components as "yyyy-mm-dd" + const formattedDate = `${day}-${month}-${year}`; + console.log(formattedDate); + var element = document.getElementById('table'); + var opt = { + margin: 1, + filename: 'Delivery_Summary_'+formattedDate+'_'+this.driverName, + image: { type: 'jpg', quality: 0.98 }, + html2canvas: { scale: 2 }, + jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' } + }; + // New Promise-based usage: html2pdf().from(element).set(opt).save(); }