Commit Graph

249 Commits

Author SHA1 Message Date
ee1bd87817 Add not hide grid when paging 2025-08-21 15:49:38 +09:00
dev
af3a7c78f2 Merge pull request 'fix bugs grid on popup' (#86) from dev-dungtv-0821 into dev
Reviewed-on: #86
2025-08-21 12:47:10 +09:00
dev
60b7cfa7e9 Merge pull request 'update code' (#87) from dev-luannv24-fixbugs17 into dev
Reviewed-on: #87
2025-08-21 12:46:45 +09:00
4074f0cfca update code 2025-08-21 12:44:21 +09:00
cd1abec719 resolve comment 2025-08-21 10:43:44 +07:00
20211168e9 fix bugs grid on popup 2025-08-21 10:37:17 +07:00
dev
b20bf33b28 Merge pull request 'update code' (#85) from dev-luannv24-fixheader into dev
Reviewed-on: #85
2025-08-21 12:24:35 +09:00
3b16421518 update code 2025-08-21 11:32:37 +09:00
dev
85a14633be Merge pull request 'updatecode' (#84) from luannv24-fixbug-input into dev
Reviewed-on: #84
2025-08-20 19:21:30 +09:00
dev
ce4dd0c2a4 Merge pull request 'Fix bugs screen 13, 17, 7' (#83) from dev-trungvq7-0729 into dev
Reviewed-on: #83
2025-08-20 19:20:53 +09:00
dev
bbf332019f Merge pull request 'Update loading + Combine 2 api call in paging + Add dynamic font size for gauge chart' (#82) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #82
2025-08-20 19:19:39 +09:00
c67f9f56bd updatecode 2025-08-20 18:42:36 +09:00
dev
6350c31c50 Update 2008 2025-08-20 17:28:15 +09:00
50aefda2a0 Update loading + Combine 2 api call in paging + Add dynamic font size for gauge chart 2025-08-20 17:19:39 +09:00
dev
f5465885d8 Update 2008 2025-08-20 17:14:37 +09:00
dev
89ad4c11f6 Merge pull request 'add paging for screen 2 12' (#81) from dev-manhph1-figbug into dev
Reviewed-on: #81
2025-08-20 15:27:43 +09:00
1d6c49f944 add paging for screen 2 12 2025-08-20 12:38:22 +09:00
dev
8744da1900 Merge pull request 'updatecode' (#80) from dev-luannv24-fixbug-s28 into dev
Reviewed-on: #80
2025-08-20 11:08:38 +09:00
dev
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
dev
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
dev
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
dev
7baa87df12 Update 1908 2025-08-20 10:17:23 +09:00
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
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
dev
3155258656 Update 1508 2025-08-18 10:44:55 +09:00
dev
68916550e5 Update 1508 2025-08-18 10:40:46 +09:00
1250b3d3af fix desgin screen 38 2025-08-15 15:52:52 +09:00
dev
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