|
|
9d35712f58
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-08-18 17:50:07 +09:00 |
|
|
|
41370aa4df
|
Update 1808
|
2025-08-18 17:50:04 +09:00 |
|
|
|
3c49bd36e9
|
Merge pull request 'fix bug grid no scroll y margin right' (#72) from dev-manhph1-figbug into dev
Reviewed-on: #72
|
2025-08-18 16:45:07 +09:00 |
|
|
|
c6eb2b57b2
|
fix bug grid no scroll y margin right
|
2025-08-18 16:31:29 +09:00 |
|
|
|
5088769914
|
Merge pull request 'hotfix bug screen 10' (#71) from dev-dungtv-0818 into dev
Reviewed-on: #71
|
2025-08-18 11:27:28 +09:00 |
|
|
|
50698ac661
|
hotfix bug screen 10
|
2025-08-18 09:25:41 +07:00 |
|
|
|
c815eae2ca
|
Merge pull request 'Fix bug Screen 13' (#70) from dev-trungvq7-0729 into dev
Reviewed-on: #70
|
2025-08-18 10:50:01 +09:00 |
|
|
|
8a9dfd9949
|
Merge pull request 'fix desgin screen 38' (#69) from dev-manhph1-figbug into dev
Reviewed-on: #69
|
2025-08-18 10:47:00 +09:00 |
|
|
|
3155258656
|
Update 1508
|
2025-08-18 10:44:55 +09:00 |
|
|
|
68916550e5
|
Update 1508
|
2025-08-18 10:40:46 +09:00 |
|
|
|
1250b3d3af
|
fix desgin screen 38
|
2025-08-15 15:52:52 +09:00 |
|
|
|
be1e0426e0
|
Merge pull request 'Add paging and button view detail for S1 dashboard + Fix bugs 156 163' (#68) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #68
|
2025-08-15 10:10:47 +09:00 |
|
|
|
81a20d2851
|
Add paging and button view detail for S1 dashboard + Fix bugs 156 163
|
2025-08-14 17:09:19 +09:00 |
|
|
|
6353ffba57
|
Merge pull request 'dev-manhph1-figbug' (#67) from dev-manhph1-figbug into dev
Reviewed-on: #67
|
2025-08-14 16:00:15 +09:00 |
|
|
|
ed9150aae8
|
Merge pull request 'fix bug grid + buttons' (#66) from dev-dungtv-0814 into dev
Reviewed-on: #66
lgtm
|
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
Reviewed-on: #65
|
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
Reviewed-on: #64
|
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
Reviewed-on: #63
|
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
Reviewed-on: #62
|
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
Reviewed-on: #61
|
2025-08-12 18:47:56 +09:00 |
|
|
|
0825663c64
|
Merge pull request 'fix icon datepicker' (#60) from dev-manhph1-figbug into dev
Reviewed-on: #60
|
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
Reviewed-on: #59
|
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
Reviewed-on: #58
|
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
Reviewed-on: #57
|
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
Reviewed-on: #56
|
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
Reviewed-on: #55
|
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
Reviewed-on: #54
|
2025-08-11 14:06:24 +09:00 |
|
