Commit graph

254 commits

Author SHA1 Message Date
Bright
2e273262de no message 2024-03-25 16:29:35 +07:00
Bright
b17a55da72 isNext 2024-03-25 16:28:48 +07:00
Bright
e05e6c625e emp1-09 2024-03-25 15:57:38 +07:00
Kittapath
9d6992e4e1 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-03-22 18:04:20 +07:00
Kittapath
8c0589fedd set api เงินเดือนลูกจ่างรอบตุลา 2024-03-22 18:02:51 +07:00
Bright
db910ec9f9 gov1-03 & gov2-03 ปรับ Group1,2 2024-03-22 17:44:56 +07:00
Bright
4ee6991bbe แก้ข้อความ error 2024-03-22 15:48:19 +07:00
Kittapath
6fad0f10a3 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-22 12:32:33 +07:00
Kittapath
bacac6c931 แก้report ลูกจ้างเลื่อนขั้นเงินเดือนพิเศษ 2024-03-22 12:32:17 +07:00
Bright
511970f61a ปรับ gov1-03 2024-03-22 12:04:57 +07:00
Kittapath
f4c6831c0b เก็บเงินพิเศษลูกจ้าง 2024-03-22 11:31:56 +07:00
Kittapath
9449a1f989 เลื่อนเงินเดือนลูกจ้าง 2024-03-21 22:59:53 +07:00
Bright
d3dd7012a1 gov2-03 2024-03-21 18:18:50 +07:00
Kittapath
af8ee9f6b6 migrate db 2024-03-21 16:57:18 +07:00
Kittapath
1fd8586c74 emp1 4 5 6 7 12 13 15 16 2024-03-21 16:34:30 +07:00
Kittapath
3c00aa7ac2 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-21 15:29:56 +07:00
Kittapath
727119a9b0 emp 01-03 2024-03-21 15:29:39 +07:00
Bright
376da1aa75 gov1-03 2024-03-21 14:17:21 +07:00
Bright
e49c4a9a55 ปรับ paging 2024-03-21 10:33:18 +07:00
Kittapath
aef3fbba79 report 05 2024-03-21 10:25:48 +07:00
Kittapath
342f95302d report 04 2024-03-21 09:51:42 +07:00
8d3fa8f7a7 Merge branch 'develop' into adiDev 2024-03-20 20:35:14 +07:00
31faf3b62b fix gov1-04 2024-03-20 20:34:23 +07:00
Kittapath
90c2da588d Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 19:30:33 +07:00
Kittapath
1a354baf68 report gov2 02 2024-03-20 19:30:13 +07:00
1b2e4239f5 fix gov1-04 2024-03-20 19:12:43 +07:00
Kittapath
dc8b7f815a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 18:06:14 +07:00
Kittapath
78801a8c6c report 2 2024-03-20 18:05:57 +07:00
Bright
0dcc5c0ac0 เลื่อนเงินเดือนปีก่อนหน้า 2024-03-20 17:16:59 +07:00
Kittapath
3d6ceb2229 report gov01-07 2024-03-20 13:54:34 +07:00
5bbda41b2f Merge branch 'develop' into adiDev 2024-03-20 11:51:52 +07:00
2fc8c3d459 fix report gov1-04 2024-03-20 11:50:19 +07:00
Kittapath
c8f8d98e18 test เปลี่ยนชื่อ build 2024-03-20 11:33:41 +07:00
Bright
a14ca23c0a ปีพศ. 2024-03-20 11:14:07 +07:00
Kittapath
9404c61b5e Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 11:04:55 +07:00
Kittapath
ab2eb826d3 report gov2 2024-03-20 11:04:39 +07:00
Bright
a9eb07af38 Merge branch 'develop-Bright' into develop 2024-03-20 10:56:20 +07:00
Bright
8d43780135 ปรับ report gov1-03 2024-03-20 10:56:15 +07:00
Kittapath
d5f40373a8 แก้report gov01 2024-03-19 22:34:09 +07:00
Kittapath
7fb7b467a2 แก้ path upload file 2024-03-19 15:49:46 +07:00
Kittapath
7ce46ab066 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-19 15:39:14 +07:00
Kittapath
074bbe2d2f ค้นหาผังลูกจ้าง 2024-03-19 15:36:46 +07:00
Methapon2001
0e1c6a09a5
feat: add sub file 2024-03-19 15:24:07 +07:00
Kittapath
2a49275e55 แก้ path upload 2024-03-19 13:51:04 +07:00
Kittapath
16c9395f89 ลบส่วน comment ที่ไม่ใช้ 2024-03-19 12:25:09 +07:00
Kittapath
a82fbcd17e บันทึกเลื่อนขั้นเงินเดือนลูกจ้าง 2024-03-19 11:31:21 +07:00
Kittapath
dba2e15403 แก้รอบเงินเดือนเดือนลูกจ้าง 2024-03-19 09:46:52 +07:00
Methapon2001
a2d109ab6a
Merge branch 'feat/dynamic-file-controller' into develop 2024-03-18 20:13:36 +07:00
Methapon2001
0b1c1295dd
feat: hidden file under folder start with "."
All file under hidden folder cannot be found with search operation by any means.
Still be able to list file or folders through API.
2024-03-18 20:11:14 +07:00
Kittapath
6d41280fe6 report ผังเงินเดือนลูกจ้าง 2024-03-18 17:30:54 +07:00