Skip to content

M
myhr-portal
Commit be9e4148 by Nattana Chaiyamat
Options

แก้ไข รายงาน Excel แก้ตัวส่งวันที่ yyyy-mm-dd

parent 07b87fd0
Showing with 12 additions and 4 deletions
src/app/apps/excel-list/excel-list.component.ts
...@@ -579,8 +579,10 @@ export class ExcelListComponent implements OnInit { ...@@ -579,8 +579,10 @@ export class ExcelListComponent implements OnInit {
const data = this.variableSheet.map((item: any) => { const data = this.variableSheet.map((item: any) => {
if (item.type == 'help') { if (item.type == 'help') {
return "__" + item.key + "=" + item.value.id return "__" + item.key + "=" + item.value.id
} else if (item.type == 'calendar' || item.type == 'list' || item.type == 'radio' || item.type == 'text') { } else if (item.type == 'list' || item.type == 'radio' || item.type == 'text') {
return "__" + item.key + "=" + item.value return "__" + item.key + "=" + item.value
} else if (item.type == 'calendar') {
return "__" + item.key + "=" + item.value.split('-').reverse().join('-')
} }
return "" return ""
}).join('|') }).join('|')
...@@ -702,8 +704,10 @@ export class ExcelListComponent implements OnInit { ...@@ -702,8 +704,10 @@ export class ExcelListComponent implements OnInit {
body[`key${i}`] = item.key; body[`key${i}`] = item.key;
if (item.type == 'help') { if (item.type == 'help') {
body[`val${i}`] = item.value.id body[`val${i}`] = item.value.id
} else if (item.type == 'calendar' || item.type == 'list' || item.type == 'radio' || item.type == 'text') { } else if (item.type == 'list' || item.type == 'radio' || item.type == 'text') {
body[`val${i}`] = item.value body[`val${i}`] = item.value
} else if (item.type == 'calendar') {
body[`val${i}`] = item.value.split('-').reverse().join('-')
} }
}); });
forkJoin({ forkJoin({
......
src/app/apps/excel-report-toggle/excel-report-toggle.component.ts
...@@ -288,8 +288,10 @@ export class ExcelReportToggleComponent implements OnInit { ...@@ -288,8 +288,10 @@ export class ExcelReportToggleComponent implements OnInit {
const data = this.variableSheet.map((item: any) => { const data = this.variableSheet.map((item: any) => {
if (item.type == 'help') { if (item.type == 'help') {
return "__" + item.key + "=" + item.value.id return "__" + item.key + "=" + item.value.id
} else if (item.type == 'calendar' || item.type == 'list' || item.type == 'radio' || item.type == 'text') { } else if (item.type == 'list' || item.type == 'radio' || item.type == 'text') {
return "__" + item.key + "=" + item.value return "__" + item.key + "=" + item.value
} else if (item.type == 'calendar') {
return "__" + item.key + "=" + item.value.split('-').reverse().join('-')
} }
return "" return ""
}).join('|') }).join('|')
...@@ -382,8 +384,10 @@ export class ExcelReportToggleComponent implements OnInit { ...@@ -382,8 +384,10 @@ export class ExcelReportToggleComponent implements OnInit {
body[`key${i}`] = item.key; body[`key${i}`] = item.key;
if (item.type == 'help') { if (item.type == 'help') {
body[`val${i}`] = item.value.id body[`val${i}`] = item.value.id
} else if (item.type == 'calendar' || item.type == 'list' || item.type == 'radio' || item.type == 'text') { } else if (item.type == 'list' || item.type == 'radio' || item.type == 'text') {
body[`val${i}`] = item.value body[`val${i}`] = item.value
} else if (item.type == 'calendar') {
body[`val${i}`] = item.value.split('-').reverse().join('-')
} }
}); });
forkJoin({ forkJoin({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment