hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
7230 commits 1 branch 89 tags 71 MiB
Commit graph

7230 commits

This branch
This branch
All branches
Author SHA1 Message Date
waruneeauy
16da0c42b4 Merge branch 'develop' into dev 
* develop:
  fix bug retire year
 2025-10-29 14:53:01 +07:00
waruneeauy
93ea11a84b fix bug retire year 2025-10-29 14:52:49 +07:00
waruneeauy
d8d80a01cb Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m12s
Details 
* develop:
  fix:convertDateToAPI
 2025-10-22 11:01:42 +07:00
Warunee.T
8f53521403
Merge pull request #1488 from Frappet/fix/formatDate 
fix:convertDateToAPI
 2025-10-21 21:22:44 +07:00
waruneeauy
49faca6107 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m24s
Details 
* develop:
  fix(recruiting):comment  router.go(-1);
  fix(placement): delete min-date
  fix: clear row = []
  fix:filter examResult
  style(registry-officer):display  colums training
 2025-10-21 12:03:10 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b178f5ad38 fix(recruiting):comment router.go(-1); 2025-10-17 17:44:14 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1fc7882918 fix:convertDateToAPI 2025-10-17 17:22:40 +07:00
Warunee.T
97aa731d2f
Merge pull request #1487 from Frappet/fix/disable_date 
fix(placement): delete min-date
 2025-10-17 15:56:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0a75b7ef86 fix(placement): delete min-date 2025-10-17 15:17:17 +07:00
Warunee.T
9342f9b4d7
Merge pull request #1485 from Frappet/fix/recruiting 
fix:filter examResult
 2025-10-17 11:38:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
77202be224 fix: clear row = [] 2025-10-17 11:04:59 +07:00
Warunee.T
443f940443
Merge pull request #1483 from Frappet/fix/display 
style(registry-officer):display  columns training
 2025-10-17 10:55:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3210bbf687 fix:filter examResult 2025-10-17 10:02:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
157cce6919 style(registry-officer):display colums training 2025-10-16 09:57:10 +07:00
waruneeauy
ca167937cf Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m4s
Details 
* develop:
  fix(placement):path API CalRetire
 2025-10-15 12:37:48 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3880953988 fix(placement):path API CalRetire 2025-10-15 12:33:35 +07:00
waruneeauy
32c8ae835f Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m7s
Details 
* develop:
 2025-10-14 14:24:05 +07:00
Warunee.T
478a17f6ad
Merge pull request #1477 from Frappet/fix/leave 
Fix/leave
 2025-10-14 14:22:23 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b25725711f Merge branch 'fix/leave' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m11s
Details
2025-10-14 14:01:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8a3c77f744 fix:fetch operate 2025-10-14 13:44:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
bfcede263a Merge branch 'fix/delete_minDate' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m26s
Details
2025-10-14 12:15:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
de2571e02f fix: Change get to post 2025-10-14 12:12:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ee5836541a Merge branch 'fix/delete_minDate' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m18s
Details 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2025-10-14 11:59:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
41e08b7200 fix:DialogCandidates 2025-10-14 11:57:31 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a719b98791 fix(03_recruiting):Display Table 2025-10-14 10:10:33 +07:00
NiceY2T
337c6dbf7b
feat(compete):add DialogCandidates (#1473) 2025-10-12 15:15:34 +07:00
Warunee.T
5ae01d1b2d
Merge pull request #1471 from Frappet/fix/downloadfile 
fix(leave):display FileName
 2025-10-10 10:41:47 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3df8b48530 fix(leave):display FileName 2025-10-10 10:37:07 +07:00
Warunee.T
5840d78dff
Merge pull request #1470 from Frappet/fix/commandYear 
fix(command):queryParams.year :newDate().getFullYear()
 2025-10-09 17:04:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f3bd67c93f fix:label q-input year 2025-10-09 17:02:11 +07:00
Warunee.T
5b22d85601
Merge pull request #1468 from Frappet/SortDiscipline 
Sort discipline
 2025-10-09 16:46:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7ecf76701a fix(command):queryParams.year :newDate().getFullYear() 2025-10-09 16:43:10 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0bec7d1dbc fix(director):sort 2025-10-09 14:50:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
629efe5abf fix(discipline-appealcomplain):sort 2025-10-09 14:10:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
dc3989acae fix(startDateSuspend):sort 2025-10-09 11:53:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ad80eae285 fix(discipline-result):sort 2025-10-09 11:05:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
49dcf013ae fix(disciplinary):sort 2025-10-09 10:38:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b1532ada56 fix(investigatefacts)sort 2025-10-09 10:08:46 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5825f72e26 fix(complaints):sort 2025-10-08 16:59:13 +07:00
Warunee.T
74de61a809
Merge pull request #1465 from Frappet/SortLeave 
SortLeave
 2025-10-08 16:45:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ba09c07dab fix(leaveHistory): params 2025-10-08 16:09:54 +07:00
Warunee.T
433de546a2
Merge pull request #1466 from Frappet/Nice 
fix  width , text-html columns  org
 2025-10-08 15:13:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fd717bbf49 fix(leave-history):edit API search-personal 2025-10-08 15:07:56 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5978f93911 fix(development):fix width columns org 2025-10-08 14:03:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
af7ac9e78b fix(leave-history):sort 2025-10-08 13:42:10 +07:00
waruneeauy
9d71f85a9e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m32s
Details 
* develop:
  แก้ชื่อรายงานลงเวลาและการลาให้ถูกต้อง (แก้ id รายงานเป็น number) และลบไฟล์ที่ไม่ได้ใช้แล้วทิ้ง
  style(registry-temp):display columns isPosition
  style(placement):layout
  style(transfer):responsive
  fix(retire-old):resetFilter
  fix(leave) : max-date บันทึกวันลาย้อนหลัง
  style(registry): gov => position add q-ml-md
  fix(development): path API profile/development
  fix(retire-old): resetfilter year-1
  fix(development):sort
  feat(retirement): add Page retire-old
  fix(KPI):sort
  fix bug registry retire
  fix(rerirement): ปีงบ
  fix(salary):sort
  fix(registry-retire-employee): load list
  fix(leavea): delete readonly
  fix:TestTimes
  fix:add function calculateFiscalYear
 2025-10-08 11:47:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
df7d887309 Merge branch 'Nice' into SortLeave 
# Conflicts:
#	src/modules/09_leave/components/02_WorkList/!DialogReport.vue
 2025-10-08 10:38:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fb3902edce fix(leave):sort 2025-10-08 10:37:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
82051daa2b Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2025-10-07 11:53:59 +07:00
Warunee.T
adbd3cb3da
Merge pull request #1464 from Frappet/issue-1843-(leave-report-name) 
fix issue #1843
 2025-10-07 10:53:48 +07:00