migrate
This commit is contained in:
parent
dbce13d107
commit
88af7fcbb0
2 changed files with 47 additions and 24 deletions
|
|
@ -676,7 +676,6 @@ export class ReportController extends Controller {
|
|||
const root = current.root || "";
|
||||
if (!acc[root]) {
|
||||
acc[root] = {
|
||||
// rootId,
|
||||
no: (idx+1),
|
||||
root: root,
|
||||
Bachelor : 0,
|
||||
|
|
@ -739,29 +738,30 @@ export class ReportController extends Controller {
|
|||
data: {
|
||||
year: year ? Extension.ToThaiNumber((year+543).toString()) : "-",
|
||||
data: Array.isArray(_group)
|
||||
? _group.map((x:any, idx:number) => ({
|
||||
// no: Extension.ToThaiNumber((idx+1).toString()),
|
||||
// root: x.root ? x.root : "-",
|
||||
// Bachelor : "-",
|
||||
// BachelorHight: "-",
|
||||
// Master: "-",
|
||||
// Doctor: "-",
|
||||
// DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount) : "๐",
|
||||
// DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount) : "๐",
|
||||
// DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove) : "๐",
|
||||
// NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount) : "๐",
|
||||
// NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount) : "๐",
|
||||
// NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove) : "๐",
|
||||
// AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount) : "๐",
|
||||
// AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount) : "๐",
|
||||
// AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove) : "๐",
|
||||
// ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount) : "๐",
|
||||
// ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount) : "๐",
|
||||
// ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove) : "๐",
|
||||
// TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount) : "๐",
|
||||
// TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount) : "๐",
|
||||
// TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove) : "๐",
|
||||
}))
|
||||
? _group
|
||||
// ? _group.map((x:any) => ({
|
||||
// no: x.no ? Extension.ToThaiNumber(x.no) : "-",
|
||||
// root: x.root ? x.root : "-",
|
||||
// Bachelor : "-",
|
||||
// BachelorHight: "-",
|
||||
// Master: "-",
|
||||
// Doctor: "-",
|
||||
// DomesticeCourseCount: x.DomesticeCourseCount ? Extension.ToThaiNumber(x.DomesticeCourseCount) : "-",
|
||||
// DomesticeProfileCount: x.DomesticeProfileCount ? Extension.ToThaiNumber(x.DomesticeProfileCount) : "-",
|
||||
// DomesticeBudgetApprove: x.DomesticeBudgetApprove ? Extension.ToThaiNumber(x.DomesticeBudgetApprove) : "-",
|
||||
// NoAbroadCourseCount: x.NoAbroadCourseCount ? Extension.ToThaiNumber(x.NoAbroadCourseCount) : "-",
|
||||
// NoAbroadDProfileCount: x.NoAbroadDProfileCount ? Extension.ToThaiNumber(x.NoAbroadDProfileCount) : "-",
|
||||
// NoAbroadBudgetApprove: x.NoAbroadBudgetApprove ? Extension.ToThaiNumber(x.NoAbroadBudgetApprove) : "-",
|
||||
// AbroadCourseCount: x.AbroadCourseCount ? Extension.ToThaiNumber(x.AbroadCourseCount) : "-",
|
||||
// AbroadProfileCount: x.AbroadProfileCount ? Extension.ToThaiNumber(x.AbroadProfileCount) : "-",
|
||||
// AbroadBudgetApprove: x.AbroadBudgetApprove ? Extension.ToThaiNumber(x.AbroadBudgetApprove) : "-",
|
||||
// ExecutiveCourseCount: x.ExecutiveCourseCount ? Extension.ToThaiNumber(x.ExecutiveCourseCount) : "-",
|
||||
// ExecutiveProfileCount: x.ExecutiveProfileCount ? Extension.ToThaiNumber(x.ExecutiveProfileCount) : "-",
|
||||
// ExecutiveBudgetApprove: x.ExecutiveBudgetApprove ? Extension.ToThaiNumber(x.ExecutiveBudgetApprove) : "-",
|
||||
// TotalCourseCount: x.TotalCourseCount ? Extension.ToThaiNumber(x.TotalCourseCount) : "-",
|
||||
// TotalProfileCount: x.TotalProfileCount ? Extension.ToThaiNumber(x.TotalProfileCount) : "-",
|
||||
// TotalBudgetApprove: x.TotalBudgetApprove ? Extension.ToThaiNumber(x.TotalBudgetApprove) : "-",
|
||||
// }))
|
||||
: [{
|
||||
no: "-",
|
||||
root: "-",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue