Commit Graph

273 Commits

Author SHA1 Message Date
931e2e237e update code 2025-08-27 16:08:45 +09:00
dev
42a2555671 Merge pull request 'updatecode' (#98) from dev-luannv24-fixbug into dev
Reviewed-on: #98
2025-08-27 15:22:49 +09:00
abc6709a31 updatecode 2025-08-27 12:16:53 +09:00
dev
2ef474fda4 Merge pull request 'Apply same style for button favorite' (#97) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #97
2025-08-27 10:39:27 +09:00
9eaad1a2e4 Apply same style for button favorite 2025-08-27 10:38:41 +09:00
dev
7ece26bdfb Merge pull request 'update code' (#96) from dev-luannv24-fixbug into dev
Reviewed-on: #96
2025-08-27 10:33:34 +09:00
3702c59f20 reconfict 2025-08-26 18:23:59 +09:00
b2a0f1cde2 update code 2025-08-26 17:28:37 +09:00
dev
d4c39c577f Merge pull request 'Update default item per page by 10' (#95) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #95
2025-08-26 16:00:38 +09:00
ac5bb1eb6e Update default item per page by 10 2025-08-26 15:59:28 +09:00
dev
70aa21c78d Merge pull request 'fix bug ui scrren 12 28' (#94) from dev-manhph1-figbug into dev
Reviewed-on: #94
2025-08-25 18:40:11 +09:00
39502ae8fb fix bug ui scrren 12 28 2025-08-25 13:23:49 +09:00
dev
bcea171273 Merge pull request 'Update default pagination' (#93) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #93
2025-08-25 12:42:33 +09:00
08d2918a6d Update color of pagination ellipsis 2025-08-25 12:22:31 +09:00
2dde396442 Update default pagination 2025-08-25 11:59:01 +09:00
dev
4a20707c62 Merge pull request 'Update 0729' (#92) from dev-trungvq7-0729 into dev
Reviewed-on: #92
2025-08-21 18:24:20 +09:00
dev
f35924aac8 Update 0729 2025-08-21 18:18:44 +09:00
dev
8d613e14d3 Merge pull request 'fix bug screen 8' (#91) from dev-dungtv-0821 into dev
Reviewed-on: #91
2025-08-21 17:49:11 +09:00
9212c636cf fix bug screen 8 2025-08-21 15:47:41 +07:00
dev
50fee505fe Merge pull request 'add effect loading when change theme mode' (#90) from dev-dungtv-0821 into dev
Reviewed-on: #90
2025-08-21 16:38:13 +09:00
dev
9459291a8e Merge pull request 'Add not hide grid when paging' (#89) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #89
2025-08-21 16:37:14 +09:00
dev
f633eb413a Merge pull request 'fix bug' (#88) from dev-manhph1-figbug into dev
Reviewed-on: #88
2025-08-21 16:36:03 +09:00
9000afc00d add effect loading when change theme mode 2025-08-21 14:33:38 +07:00
ee1bd87817 Add not hide grid when paging 2025-08-21 15:49:38 +09:00
8bfcebdd10 fix bug 2025-08-21 15:48:01 +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