|
|
8744da1900
|
Merge pull request 'updatecode' (#80) from dev-luannv24-fixbug-s28 into dev
Reviewed-on: #80
|
2025-08-20 11:08:38 +09:00 |
|
|
|
c77ee52c19
|
Merge pull request 'optimize-css' (#76) from dev-dungtv-optimize-css into dev
Reviewed-on: #76
|
2025-08-20 11:08:18 +09:00 |
|
|
|
fe9e12e7ed
|
updatecode
|
2025-08-20 11:05:53 +09:00 |
|
|
|
b7f83002c1
|
Merge pull request 'Update screen 7, 13' (#79) from dev-trungvq7-0729 into dev
Reviewed-on: #79
|
2025-08-20 11:03:51 +09:00 |
|
|
|
f0c47a132b
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-08-20 10:18:13 +09:00 |
|
|
|
7baa87df12
|
Update 1908
|
2025-08-20 10:17:23 +09:00 |
|
|
|
b82589978d
|
Merge pull request 'Update paging disable style + Fix bug line chart + Fix paging function hide grid' (#78) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #78
|
2025-08-19 18:56:30 +09:00 |
|
|
|
c1911f2ebc
|
Rename default s11 card when there're no data
|
2025-08-19 18:09:24 +09:00 |
|
|
|
d405e5bf6d
|
Update paging disable style + Fix bug line chart + Fix paging function hide grid
|
2025-08-19 17:27:35 +09:00 |
|
|
|
99168acab1
|
Merge pull request 'update code' (#77) from dev-luannv24-fixbug-s36 into dev
Reviewed-on: #77
|
2025-08-19 16:45:34 +09:00 |
|
|
|
2fcc719721
|
update
|
2025-08-19 16:44:01 +09:00 |
|
|
|
06f16f82ff
|
update code
|
2025-08-19 16:41:01 +09:00 |
|
|
|
dc43264503
|
fix bugs change theme model
|
2025-08-19 14:26:27 +07:00 |
|
|
|
5abba695b2
|
optimize-css
|
2025-08-19 13:43:44 +07:00 |
|
|
|
a074e0e6e9
|
Merge pull request 'update code' (#75) from dev-luannv24-fixbug-17 into dev
Reviewed-on: #75
|
2025-08-19 12:45:53 +09:00 |
|
|
|
a5c35809fa
|
refactor code
|
2025-08-19 12:45:19 +09:00 |
|
|
|
7e9bd540ed
|
update code
|
2025-08-19 12:32:34 +09:00 |
|
|
|
08637f6321
|
Merge pull request 'Update screen 7, 33, 16' (#74) from dev-trungvq7-0729 into dev
Reviewed-on: #74
|
2025-08-18 17:57:22 +09:00 |
|
|
|
ce2c3c6c0e
|
Merge pull request 'Fix selection grid s14 + Remove border legend dashboard' (#73) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #73
|
2025-08-18 17:56:13 +09:00 |
|
|
|
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 |
|
|
|
d3022582b6
|
Fix selection grid s14 + Remove border legend dashboard
|
2025-08-18 17:41:42 +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 |
|
