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
65385195
Commit
65385195
authored
Feb 20, 2025
by
Nakarin Luankla
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'DEV' of
https://mygit.myhr.co.th/angular/myAppraisal
into DEV
parents
9bd6ff5d
2383320b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
3 deletions
+3
-3
company-registration-page.component.ts
...-registration-page/company-registration-page.component.ts
+1
-1
sub-employee-registration.component.ts
...loyee-registration/sub-employee-registration.component.ts
+2
-2
IMPORT_COMPETENCY_TOPIC.xlsx
src/assets/template/IMPORT_COMPETENCY_TOPIC.xlsx
+0
-0
IMPORT_MEMPLOYEE.xlsx
src/assets/template/IMPORT_MEMPLOYEE.xlsx
+0
-0
No files found.
src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.ts
View file @
65385195
...
@@ -130,7 +130,7 @@ export class CompanyRegistrationPageComponent {
...
@@ -130,7 +130,7 @@ export class CompanyRegistrationPageComponent {
const
data
=
x
.
data
const
data
=
x
.
data
const
match
=
data
.
code
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
tdesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
edesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
());
const
match
=
data
.
code
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
tdesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
data
.
edesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
());
return
match
;
return
match
;
}).
forEach
(
x
=>
x
.
check
=
selectAll
);
}).
forEach
(
x
=>
(
x
.
check
=
x
.
data
.
code
!=
'100'
?
selectAll
:
false
)
);
this
.
dataListCheck
();
this
.
dataListCheck
();
}
}
dataListCheck
()
{
dataListCheck
()
{
...
...
src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts
View file @
65385195
...
@@ -98,7 +98,7 @@ export class SubEmployeeRegistrationComponent {
...
@@ -98,7 +98,7 @@ export class SubEmployeeRegistrationComponent {
const
formData
=
new
FormData
();
const
formData
=
new
FormData
();
formData
.
append
(
'file'
,
this
.
selectedFile
);
formData
.
append
(
'file'
,
this
.
selectedFile
);
this
.
employee
.
loading
=
true
this
.
employee
.
loading
=
true
this
.
fileService
.
uploadExcel
(
formData
,
''
).
subscribe
({
this
.
fileService
.
uploadExcel
(
formData
,
'
memployee
'
).
subscribe
({
next
:
response
=>
{
next
:
response
=>
{
if
(
response
.
success
)
{
if
(
response
.
success
)
{
this
.
showAlert
(
response
.
message
,
'success'
)
this
.
showAlert
(
response
.
message
,
'success'
)
...
@@ -116,7 +116,7 @@ export class SubEmployeeRegistrationComponent {
...
@@ -116,7 +116,7 @@ export class SubEmployeeRegistrationComponent {
})
})
}
}
downloadFile
()
{
downloadFile
()
{
const
fileName
=
'.xlsx'
const
fileName
=
'
IMPORT_MEMPLOYEE
.xlsx'
this
.
fileService
.
downloadTemplate
(
fileName
).
subscribe
({
this
.
fileService
.
downloadTemplate
(
fileName
).
subscribe
({
next
:
response
=>
{
next
:
response
=>
{
const
url
=
window
.
URL
.
createObjectURL
(
response
);
const
url
=
window
.
URL
.
createObjectURL
(
response
);
...
...
src/assets/template/IMPORT_COMPETENCY_TOPIC.xlsx
View file @
65385195
No preview for this file type
src/assets/template/IMPORT_MEMPLOYEE.xlsx
0 → 100644
View file @
65385195
File added
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