Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mySkill-x
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
angular
mySkill-x
Commits
779e05b7
Commit
779e05b7
authored
Apr 16, 2025
by
Natthaphat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ตาราง ทะเบียนกำหนดชื่อ > ประเภทสมรรถนะ
parent
63c6a8ac
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
87 additions
and
71 deletions
+87
-71
competency-topic.component.ts
...gistration/competency-topic/competency-topic.component.ts
+27
-3
type-registration.component.html
...ration/type-registration/type-registration.component.html
+0
-0
type-registration.component.ts
...stration/type-registration/type-registration.component.ts
+60
-68
No files found.
src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.ts
View file @
779e05b7
import
{
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
ColumnModel
}
from
'@syncfusion/ej2-grids'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
MyCompetencytopicModel
}
from
'src/app/shared/model/competencytopic.model'
;
import
{
MyCompetencytopicModel
}
from
'src/app/shared/model/competencytopic.model'
;
import
{
MyCompetencytypeModel
}
from
'src/app/shared/model/competencytype.model'
;
import
{
MyCompetencytypeModel
}
from
'src/app/shared/model/competencytype.model'
;
...
@@ -30,7 +31,6 @@ export interface DataModel2 {
...
@@ -30,7 +31,6 @@ export interface DataModel2 {
export
class
CompetencyTopic
{
export
class
CompetencyTopic
{
currentPage
=
1
currentPage
=
1
page
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
page
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
search
=
""
currentPageModal
=
1
currentPageModal
=
1
pageModal
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
pageModal
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
...
@@ -39,7 +39,7 @@ export class CompetencyTopic {
...
@@ -39,7 +39,7 @@ export class CompetencyTopic {
isChecked
:
boolean
=
false
;
// ใช้สำหรับตรวจสอบสถานะของ checkbox
isChecked
:
boolean
=
false
;
// ใช้สำหรับตรวจสอบสถานะของ checkbox
currentModal
=
""
;
currentModal
=
""
;
dataLoading
=
false
dataLoading
=
false
dataSelectList
:
DataModel
[]
=
[];
topicList
:
CompetencytopicService
[]
=
[];
dataSelect
:
DataModel
=
{
id
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
definition
:
""
,
file
:
""
,
type
:
{
id
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
level
:
""
},
checked
:
false
}
dataSelect
:
DataModel
=
{
id
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
definition
:
""
,
file
:
""
,
type
:
{
id
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
level
:
""
},
checked
:
false
}
competencytypeListLoading
=
false
competencytypeListLoading
=
false
competencytypeList
:
DataModel2
[]
=
[]
competencytypeList
:
DataModel2
[]
=
[]
...
@@ -49,12 +49,36 @@ export class CompetencyTopic {
...
@@ -49,12 +49,36 @@ export class CompetencyTopic {
selectedFileName
:
string
=
'กรุณาเลือกไฟล์'
;
selectedFileName
:
string
=
'กรุณาเลือกไฟล์'
;
examFile
:
File
|
null
=
null
;
examFile
:
File
|
null
=
null
;
examFileName
:
string
=
'กรุณาเลือกไฟล์'
;
examFileName
:
string
=
'กรุณาเลือกไฟล์'
;
selectedItems
:
string
[]
=
[];
numDataListChecked
=
0
numDataListChecked
=
0
isDataListChecked
=
false
isDataListChecked
=
false
isDataListCheckedAll
=
false
isDataListCheckedAll
=
false
columns
:
ColumnModel
[]
=
[{
field
:
"competencyTypeId"
,
headerText
:
"รหัส"
,
type
:
"string"
,
isPrimaryKey
:
true
,
},
{
field
:
"tdesc"
,
headerText
:
"ชื่อประเภท"
,
type
:
"string"
},
{
field
:
"shortName"
,
headerText
:
"ชื่อย่อ"
,
type
:
"string"
}]
searchSettings
=
{
fields
:
[
'competencyTypeId'
,
'tdesc'
,
'shortName'
],
operator
:
'contains'
,
ignoreCase
:
false
};
search
=
''
selectedItems
:
{
key
:
string
,
count
:
number
,
data
:
Map
<
string
,
boolean
>
}
=
{
key
:
''
,
count
:
0
,
data
:
new
Map
<
string
,
boolean
>
()
};
constructor
(
private
toastr
:
ToastrService
,
constructor
(
private
toastr
:
ToastrService
,
private
cdr
:
ChangeDetectorRef
,
private
cdr
:
ChangeDetectorRef
,
private
fileService
:
FileService
,
private
fileService
:
FileService
,
...
...
src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
View file @
779e05b7
This diff is collapsed.
Click to expand it.
src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.ts
View file @
779e05b7
import
{
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
ColumnModel
}
from
'@syncfusion/ej2-grids'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
CompetencytypeModel
,
MyCompetencytypeModel
}
from
'src/app/shared/model/competencytype.model'
;
import
{
CompetencytypeModel
,
MyCompetencytypeModel
}
from
'src/app/shared/model/competencytype.model'
;
import
{
CompetencytypeService
}
from
'src/app/shared/services/competencytype.service'
;
import
{
CompetencytypeService
}
from
'src/app/shared/services/competencytype.service'
;
import
{
FileService
}
from
'src/app/shared/services/file.service'
;
import
{
FileService
}
from
'src/app/shared/services/file.service'
;
export
interface
DataModel
{
id
:
string
companyId
:
string
edesc
:
string
name
:
string
code
:
string
level
:
string
weight
:
number
checked
:
boolean
}
@
Component
({
@
Component
({
selector
:
'app-type-registration'
,
selector
:
'app-type-registration'
,
templateUrl
:
'./type-registration.component.html'
,
templateUrl
:
'./type-registration.component.html'
,
styleUrls
:
[
'./type-registration.component.scss'
]
styleUrls
:
[
'./type-registration.component.scss'
]
})
})
export
class
TypeRegistration
{
export
class
TypeRegistration
{
isChecked
:
boolean
=
false
;
currentPage
=
1
selectedItems
:
string
[]
=
[];
page
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
numDataListChecked
=
0
isDataListChecked
=
false
isDataListCheckedAll
=
false
dataSelectList
:
Data
Model
[]
=
[];
typeList
:
Competencytype
Model
[]
=
[];
dataLoading
=
false
dataLoading
=
false
dataSelect
:
DataModel
=
{
id
:
""
,
companyId
:
""
,
edesc
:
""
,
name
:
""
,
code
:
""
,
level
:
""
,
weight
:
0.00
,
checked
:
false
}
competoncy_typeList
:
{
check
:
boolean
;
data
:
DataModel
&
{
checked
?:
boolean
}
}[]
=
[]
competoncy_type
:
CompetencytypeModel
=
new
MyCompetencytypeModel
({})
competoncy_type
:
CompetencytypeModel
=
new
MyCompetencytypeModel
({})
modalStatus
:
'add'
|
'edit'
|
'delete'
|
'deleteGroup'
=
'add'
currentModal
:
'add'
|
'edit'
|
'delete'
=
'add'
search
=
""
selectedFile
:
File
|
null
=
null
;
selectedFile
:
File
|
null
=
null
;
selectedFileName
:
string
=
'กรุณาเลือกไฟล์'
;
selectedFileName
:
string
=
'กรุณาเลือกไฟล์'
;
columns
:
ColumnModel
[]
=
[{
field
:
"competencyTypeId"
,
headerText
:
"รหัส"
,
type
:
"string"
,
isPrimaryKey
:
true
,
},
{
field
:
"tdesc"
,
headerText
:
"ชื่อประเภท"
,
type
:
"string"
},
{
field
:
"shortName"
,
headerText
:
"ชื่อย่อ"
,
type
:
"string"
}]
searchSettings
=
{
fields
:
[
'competencyTypeId'
,
'tdesc'
,
'shortName'
],
operator
:
'contains'
,
ignoreCase
:
false
};
search
=
''
selectedItems
:
{
key
:
string
,
count
:
number
,
data
:
Map
<
string
,
boolean
>
}
=
{
key
:
''
,
count
:
0
,
data
:
new
Map
<
string
,
boolean
>
()
};
constructor
(
private
competencytypeService
:
CompetencytypeService
,
constructor
(
private
competencytypeService
:
CompetencytypeService
,
private
toastr
:
ToastrService
,
private
toastr
:
ToastrService
,
private
cdr
:
ChangeDetectorRef
,
private
cdr
:
ChangeDetectorRef
,
...
@@ -100,13 +106,16 @@ export class TypeRegistration {
...
@@ -100,13 +106,16 @@ export class TypeRegistration {
getCompetencytypeList
()
{
getCompetencytypeList
()
{
this
.
dataLoading
=
true
this
.
dataLoading
=
true
this
.
selectedItems
.
data
.
clear
()
this
.
competencytypeService
.
getList
().
subscribe
({
this
.
competencytypeService
.
getList
().
subscribe
({
next
:
response
=>
{
next
:
response
=>
{
this
.
competoncy_typeList
=
response
.
map
(
x
=>
({
check
:
false
,
data
:
{
id
:
x
.
competencyTypeId
,
companyId
:
x
.
companyId
,
edesc
:
x
.
edesc
,
name
:
x
.
tdesc
,
code
:
x
.
shortName
,
weight
:
x
.
weight
,
level
:
x
.
expectationLevel
,
checked
:
false
}
}))
this
.
typeList
=
response
.
map
(
x
=>
{
this
.
selectedItems
.
data
.
set
(
x
.
competencyTypeId
,
false
)
return
new
MyCompetencytypeModel
(
x
)
})
this
.
selectedItems
.
key
=
'competencyTypeId'
this
.
selectedItems
.
count
=
0
this
.
dataLoading
=
false
this
.
dataLoading
=
false
this
.
isDataListCheckedAll
=
false
this
.
dataListCheckAll
()
this
.
searchChange
()
this
.
cdr
.
detectChanges
()
this
.
cdr
.
detectChanges
()
},
error
:
error
=>
{
},
error
:
error
=>
{
this
.
dataLoading
=
false
this
.
dataLoading
=
false
...
@@ -114,24 +123,16 @@ export class TypeRegistration {
...
@@ -114,24 +123,16 @@ export class TypeRegistration {
}
}
})
})
}
}
searchChange
()
{
this
.
currentPage
=
1
edit
(
item
?:
CompetencytypeModel
)
{
this
.
page
=
Array
.
from
({
length
:
Math
.
ceil
(
this
.
dataListFilter
().
length
/
10
)
},
(
_
,
i
)
=>
i
+
1
);
this
.
competoncy_type
=
new
MyCompetencytypeModel
(
item
||
{})
this
.
dataListCheck
()
}
dataListFilter
()
{
return
this
.
competoncy_typeList
.
filter
(
x
=>
{
const
data
=
x
.
data
const
match
=
data
.
id
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
name
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
code
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
());
return
match
;
});
}
setData
(
data
?:
DataModel
)
{
this
.
dataSelect
=
JSON
.
parse
(
JSON
.
stringify
(
data
||
{
id
:
""
,
companyId
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
level
:
""
,
checked
:
false
}));
}
}
// ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
// ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
addType_registration
()
{
addType_registration
()
{
const
body
=
new
MyCompetencytypeModel
(
{
competencyTypeId
:
this
.
dataSelect
.
id
,
tdesc
:
this
.
dataSelect
.
name
,
edesc
:
this
.
dataSelect
.
edesc
,
shortName
:
this
.
dataSelect
.
code
,
weight
:
+
(
this
.
dataSelect
.
weight
),
expectationLevel
:
this
.
dataSelect
.
level
}
)
const
body
=
new
MyCompetencytypeModel
(
this
.
competoncy_type
)
this
.
dataLoading
=
true
this
.
dataLoading
=
true
this
.
competencytypeService
.
post
(
body
).
subscribe
({
this
.
competencytypeService
.
post
(
body
).
subscribe
({
next
:
response
=>
{
next
:
response
=>
{
...
@@ -151,14 +152,10 @@ export class TypeRegistration {
...
@@ -151,14 +152,10 @@ export class TypeRegistration {
})
})
}
}
deleteType_registration
()
{
deleteType_registration
()
{
let
body
:
CompetencytypeModel
|
CompetencytypeModel
[]
=
[];
if
(
this
.
dataSelect
.
id
)
{
body
=
new
MyCompetencytypeModel
({
competencyTypeId
:
this
.
dataSelect
.
id
,
tdesc
:
this
.
dataSelect
.
name
,
edesc
:
this
.
dataSelect
.
edesc
,
shortName
:
this
.
dataSelect
.
code
,
weight
:
+
(
this
.
dataSelect
.
weight
),
expectationLevel
:
this
.
dataSelect
.
level
});
}
else
{
body
=
this
.
competoncy_typeList
.
filter
(
x
=>
x
.
check
).
map
(
x
=>
new
MyCompetencytypeModel
({
competencyTypeId
:
x
.
data
.
id
,
tdesc
:
x
.
data
.
name
,
edesc
:
x
.
data
.
edesc
,
shortName
:
x
.
data
.
code
,
weight
:
+
(
this
.
dataSelect
.
weight
),
expectationLevel
:
x
.
data
.
level
}));
}
this
.
dataLoading
=
true
this
.
dataLoading
=
true
const
selectedKeys
=
Array
.
from
(
this
.
selectedItems
.
data
.
keys
());
const
body
=
this
.
typeList
.
filter
(
x
=>
selectedKeys
.
includes
(
x
.
competencyTypeId
)
&&
this
.
selectedItems
.
data
.
get
(
x
.
competencyTypeId
)).
map
(
x
=>
new
MyCompetencytypeModel
(
x
))
this
.
competencytypeService
.
delete
(
body
).
subscribe
({
this
.
competencytypeService
.
delete
(
body
).
subscribe
({
next
:
response
=>
{
next
:
response
=>
{
if
(
response
.
success
)
{
if
(
response
.
success
)
{
...
@@ -185,32 +182,27 @@ export class TypeRegistration {
...
@@ -185,32 +182,27 @@ export class TypeRegistration {
}
}
dataListCheckAll
()
{
const
selectAll
=
this
.
isDataListCheckedAll
;
this
.
competoncy_typeList
.
filter
(
x
=>
{
const
data
=
x
.
data
const
match
=
data
.
id
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
name
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
code
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
());
return
match
;
}).
forEach
(
x
=>
x
.
check
=
selectAll
);
this
.
dataListCheck
();
}
dataListCheck
()
{
clearData
(
currentModal
:
string
)
{
const
dataCheck
=
this
.
dataListFilter
();
if
(
currentModal
==
'add'
)
{
this
.
isDataListCheckedAll
=
dataCheck
.
length
?
dataCheck
.
every
(
x
=>
x
.
check
)
:
false
;
this
.
competoncy_type
=
new
MyCompetencytypeModel
({})
this
.
numDataListChecked
=
this
.
competoncy_typeList
.
filter
(
x
=>
x
.
check
).
length
;
}
else
if
(
currentModal
==
'edit'
)
{
this
.
isDataListChecked
=
Boolean
(
this
.
numDataListChecked
)
this
.
competoncy_type
=
new
MyCompetencytypeModel
({
...
this
.
competoncy_type
,
competencyTypeId
:
this
.
competoncy_type
.
competencyTypeId
})
}
clearData
(
modalStatus
:
string
)
{
if
(
modalStatus
==
'add'
)
{
this
.
setData
()
}
else
if
(
modalStatus
==
'edit'
)
{
this
.
setData
({
id
:
this
.
dataSelect
.
id
,
companyId
:
""
,
name
:
""
,
edesc
:
""
,
code
:
""
,
level
:
""
,
weight
:
0.00
,
checked
:
this
.
dataSelect
.
checked
})
}
}
}
}
checkPrimary
()
{
checkPrimary
()
{
return
this
.
competoncy_typeList
.
find
(
x
=>
x
.
data
.
id
==
this
.
dataSelect
.
id
)
return
this
.
typeList
.
find
(
x
=>
x
.
competencyTypeId
==
this
.
competoncy_type
.
competencyTypeId
)
}
numSelectItem
()
{
const
selectedKeys
=
Array
.
from
(
this
.
selectedItems
.
data
.
keys
());
const
num
=
this
.
typeList
.
filter
(
x
=>
selectedKeys
.
includes
(
x
.
competencyTypeId
)
&&
this
.
selectedItems
.
data
.
get
(
x
.
competencyTypeId
)).
length
return
num
}
onSelectItemChange
(
arg
:
any
)
{
this
.
selectedItems
=
arg
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment