This website requires JavaScript.
6353ffba57
Merge pull request 'dev-manhph1-figbug' (#67 ) from dev-manhph1-figbug into dev
dev
2025-08-14 16:00:15 +09:00
ed9150aae8
Merge pull request 'fix bug grid + buttons' (#66 ) from dev-dungtv-0814 into dev
dev
2025-08-14 15:54:22 +09:00
270279b0c2
add paging for page 38
2025-08-14 15:51:06 +09:00
9a42291cf4
add paging for page 38
2025-08-14 15:50:01 +09:00
c810139554
fix bug grid + buttons
2025-08-14 12:30:55 +07:00
1a5ec4c6a3
Merge pull request 'fixbug' (#65 ) from dev-luannv24-fixbug-common-screen17 into dev
dev
2025-08-14 12:03:40 +09:00
856d0db130
updatecode
2025-08-14 12:01:07 +09:00
6973321137
fixbug
2025-08-14 11:34:02 +09:00
2cea34dbab
Merge pull request 'Update screen 13, grid color' (#64 ) from dev-trungvq7-0729 into dev
dev
2025-08-13 19:02:06 +09:00
f41bd1283a
Update 1308
2025-08-13 18:20:59 +09:00
d5c59286ad
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
2025-08-13 17:14:44 +09:00
287c68252b
Update 1108
2025-08-13 17:14:39 +09:00
59ec2eda59
Merge pull request 'dev-dungtv-0813' (#63 ) from dev-dungtv-0813 into dev
dev
2025-08-13 16:12:46 +09:00
f6c071bdf0
fix menu item:hover style
2025-08-13 13:37:51 +07:00
24882a21a5
fix bugs style button delete
2025-08-13 13:20:58 +07:00
9aa9939a43
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0813
2025-08-13 11:47:03 +07:00
0760bde4e1
Merge pull request 'add pagination for screen 27 move pagination screen 28' (#62 ) from dev-manhph1-figbug into dev
dev
2025-08-13 13:46:53 +09:00
de99b30485
fix bugs css menu
2025-08-13 11:43:43 +07:00
2802e93a44
add pagination for screen 27 move pagination screen 28
2025-08-13 13:38:12 +09:00
68f3f0f381
fix bugs
2025-08-13 08:18:27 +07:00
39905e6f80
Merge pull request 'update code s32 s17' (#61 ) from dev-luannv24-s32-s17fixbug into dev
dev
2025-08-12 18:47:56 +09:00
0825663c64
Merge pull request 'fix icon datepicker' (#60 ) from dev-manhph1-figbug into dev
dev
2025-08-12 18:47:08 +09:00
8d444eafcd
Merge pull request 'Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14' (#59 ) from dev-nghiantt-fix-bugs into dev
dev
2025-08-12 18:43:04 +09:00
71e90064a2
update code s32 s17
2025-08-12 18:37:21 +09:00
7d2bcb9496
fix icon datepicker
2025-08-12 18:00:01 +09:00
84c7e61254
Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14
2025-08-12 17:07:52 +09:00
ffdc56b8f1
Merge pull request 'fix bug screen17 tab3' (#58 ) from dev-luannv27-s17 into dev
dev
2025-08-12 16:42:35 +09:00
245444d5fa
fix bug screen17 tab3
2025-08-12 16:38:22 +09:00
541ae86068
Merge pull request 'fixbug screen 2 , screen 17 , screen 15' (#57 ) from dev-luannv24-fixbug-8/12 into dev
dev
2025-08-12 15:14:30 +09:00
5c43496282
refactor code
2025-08-12 15:12:06 +09:00
31413d1e48
update code
2025-08-12 12:58:41 +09:00
dd24592eca
Merge pull request 'Fix datepicker icon + add dash line in line chart' (#56 ) from dev-nghiantt-fix-bugs into dev
dev
2025-08-11 18:29:55 +09:00
e59078a19c
Fix datepicker icon + add dash line in line chart
2025-08-11 17:58:25 +09:00
bc96d2ae45
Merge pull request 'fix bug grid not load when change menu tab' (#55 ) from dev-manhph1-figbug into dev
dev
2025-08-11 16:55:41 +09:00
4fd2eac344
add check direction for actionbutton
2025-08-11 16:12:19 +09:00
c40352e37c
fix bug grid not load when change menu tab
2025-08-11 15:12:01 +09:00
6583d68ea7
Merge pull request 'fix bugs 47, 145' (#54 ) from dev-dungtv-0811 into dev
dev
2025-08-11 14:06:24 +09:00
5859c5d681
Merge pull request 'Add pagination + fix bugs tooltip + fix bugs line chart' (#53 ) from dev-nghiantt-fix-bugs into dev
dev
2025-08-11 13:54:33 +09:00
d6dd66c4b3
fix bugs 47, 145
2025-08-11 11:51:28 +07:00
f666110a1a
Add pagination + fix bugs tooltip + fix bugs line chart
2025-08-11 11:55:32 +09:00
d22b09cc47
Merge pull request 'fixbug' (#52 ) from dev-luannv24-fixbug1 into dev
dev
2025-08-11 11:25:42 +09:00
ecfbeb3afa
fixbug
2025-08-08 19:22:33 +09:00
1ece377457
Merge pull request 'update code' (#51 ) from dev-luannv24-screen36-32-31-26-17-15 into dev
dev
2025-08-08 11:35:28 +09:00
335f93e6cf
resovel conflix
2025-08-08 11:30:10 +09:00
9979f32f8c
Merge pull request 'dev-trungvq7-0729' (#50 ) from dev-trungvq7-0729 into dev
dev
2025-08-08 10:25:21 +09:00
71394443ac
update code
2025-08-07 19:04:13 +09:00
d8c5bd5323
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
2025-08-07 18:54:21 +09:00
c9bc9d3186
Merge 0729
2025-08-07 18:54:14 +09:00
a06d2e553d
Merge pull request 'dev-dungtv-0807' (#49 ) from dev-dungtv-0807 into dev
dev
2025-08-07 18:43:05 +09:00
6a894df6ec
Merge pull request 'add dark mode for editor' (#47 ) from dev-manhph1-figbug into dev
dev
2025-08-07 18:15:02 +09:00
e194557753
Merge pull request 'dev-dungtv-0807' (#48 ) from dev-dungtv-0807 into dev
dev
2025-08-07 17:46:32 +09:00
d0572dc07c
fixbug grid
2025-08-07 15:26:53 +07:00
ea4910db79
fix bugs screen 10, 20
2025-08-07 15:18:06 +07:00
c636db83bd
fix bug screen 8 bug-32
2025-08-07 13:57:24 +07:00
6871d6034d
fix bugs screen 20.1~20.4
2025-08-07 13:50:37 +07:00
1352223416
Merge pull request 'Fix checkboxes in form' (#46 ) from dev-nghiantt-fix-bugs into dev
dev
2025-08-07 15:42:38 +09:00
fa68aa31e6
add dark mode for editor
2025-08-07 13:33:35 +07:00
439079eee8
Fix checkboxes in form
2025-08-07 12:49:14 +09:00
93dd46c225
Merge pull request 'fixbugs screen 10' (#45 ) from dev-dungtv-0807 into dev
dev
2025-08-07 12:45:25 +09:00
537a16fbc7
fixbugs screen 10
2025-08-07 10:40:23 +07:00
6f6f19349f
Merge pull request 'fix bug 07/08/25' (#44 ) from dev-manhph1-figbug into dev
dev
2025-08-07 12:23:53 +09:00
2533d5bb7a
fix bug 07/08/25
2025-08-07 09:58:49 +07:00
19a634e3a5
Merge pull request 'dev-luannv24-s2s17s15-fixbug' (#41 ) from dev-luannv24-s2s17s15-fixbug into dev
dev
2025-08-07 11:42:33 +09:00
e4331ad79f
Merge pull request 'fix bug screen 10' (#42 ) from dev-dungtv-0807 into dev
dev
2025-08-07 11:37:15 +09:00
8c7a8d5b29
resolve commit code
2025-08-07 09:36:18 +07:00
140f73814f
update
2025-08-07 11:29:24 +09:00
b53ce8bd83
refactor code
2025-08-07 11:27:51 +09:00
8bb0d56a80
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-luannv24-s2s17s15-fixbug
2025-08-07 11:23:58 +09:00
f715405ad2
Merge pull request 'dev-trungvq7-0729' (#40 ) from dev-trungvq7-0729 into dev
dev
2025-08-07 10:58:23 +09:00
f80bfc5c71
fix bug screen 10
2025-08-07 08:37:59 +07:00
56607d0770
update code
2025-08-06 19:08:06 +09:00
6db0ff96c0
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
2025-08-06 19:03:14 +09:00
2cf00c0880
update code fixbug
2025-08-06 19:02:19 +09:00
9155a2b55e
commit 0608
2025-08-06 19:00:29 +09:00
484d8879aa
Merge pull request 'fix bugs' (#39 ) from dev-dungtv-0806 into dev
dev
2025-08-06 18:50:46 +09:00
38585f7b4f
hotfix layout
2025-08-06 16:43:12 +07:00
b0ad70d33e
fix bugs
2025-08-06 16:31:44 +07:00
3f89707a01
Merge pull request 'fixbugs grid' (#38 ) from dev-dungtv-0805 into dev
dev
2025-08-06 12:13:45 +09:00
a4007d5697
resolve comment
2025-08-06 10:12:34 +07:00
3b6c05c70a
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0805
2025-08-06 09:27:47 +07:00
550659475f
Merge pull request 'fix bug 18 33 34' (#37 ) from dev-manhph1-figbug into dev
dev
2025-08-06 11:27:22 +09:00
4a7077336d
resolve confict
2025-08-06 09:26:53 +07:00
ca27167d3d
Merge pull request 'Update tooltip s4 + add view button to switch page' (#36 ) from dev-nghiantt-fix-bugs into dev
dev
2025-08-06 10:32:48 +09:00
bf6d03df63
fixbugs grid
2025-08-05 17:28:12 +07:00
8cadade514
fix bug 18 33 34
2025-08-05 15:00:22 +07:00
f929ad2c28
Update tooltip s4 + add view button to switch page
2025-08-05 15:29:25 +09:00
53b8b89e68
Merge pull request 'dev-trungvq7-0729' (#35 ) from dev-trungvq7-0729 into dev
dev
2025-08-05 11:15:47 +09:00
b32aa1d5bb
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
2025-08-04 19:40:08 +09:00
8f7f5c598d
Update 0408
2025-08-04 19:39:58 +09:00
e96d012d17
Merge pull request 'fixbug' (#34 ) from dev-luannv24-fixbugs32s2 into dev
dev
2025-08-04 19:01:26 +09:00
efee1098ba
Merge pull request 'dev-manhph1-figbug' (#33 ) from dev-manhph1-figbug into dev
dev
2025-08-04 18:56:50 +09:00
5735777bb1
fixbug
2025-08-04 18:53:30 +09:00
2253ddef0a
conflic
2025-08-04 16:41:29 +07:00
41095098e2
fixbug-scrren-12
2025-08-04 16:37:00 +07:00
28fe49d39f
fixbug-scrren-12
2025-08-04 16:35:12 +07:00
f180f22324
Merge pull request 'fix bug screen 8, 10, menu' (#32 ) from dev-dungtv44-0804 into dev
dev
2025-08-04 18:06:52 +09:00
a7968774c3
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0804
2025-08-04 15:03:03 +07:00
195c48ff25
Merge pull request 'Update s1 s29 - Remove mock data s5 s11' (#31 ) from dev-nghiantt-s1s29 into dev
dev
2025-08-04 17:02:41 +09:00
7bca077859
fix bug screen 8, 10, menu
2025-08-04 15:00:22 +07:00
6dfda50ebd
Change style to built in class + Add missing titlte
2025-08-04 11:21:29 +09:00
dev
Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK