|
|
0bf3af329b
|
Merge pull request 'change background color popup input screen 13' (#111) from dev-manhph1-figbug into dev
Reviewed-on: #111
|
2025-09-08 12:29:44 +09:00 |
|
|
|
f263e54e52
|
change background color popup input screen 13
|
2025-09-08 12:28:41 +09:00 |
|
|
|
b81ef3c125
|
Merge pull request 'change style editor link button match desgin' (#110) from dev-manhph1-figbug into dev
Reviewed-on: #110
|
2025-09-05 19:01:13 +09:00 |
|
|
|
fd2a4d0a59
|
change style editor link button match desgin
|
2025-09-05 19:00:30 +09:00 |
|
|
|
70e92dc130
|
Merge pull request 'Update datepicker select' (#109) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #109
|
2025-09-05 18:51:15 +09:00 |
|
|
|
66f73f40f4
|
Update datepicker select
|
2025-09-05 18:50:41 +09:00 |
|
|
|
dd28f5c620
|
Merge pull request 'change style editor link button match desgin' (#108) from dev-manhph1-figbug into dev
Reviewed-on: #108
|
2025-09-05 18:43:26 +09:00 |
|
|
|
f4964feaa5
|
change style editor link button match desgin
|
2025-09-05 17:42:30 +09:00 |
|
|
|
e34ac7de95
|
Merge pull request 'change style editor link button match desgin' (#107) from dev-manhph1-figbug into dev
Reviewed-on: #107
|
2025-09-05 17:18:00 +09:00 |
|
|
|
7fdf63a6cc
|
change style editor link button match desgin
|
2025-09-05 17:17:17 +09:00 |
|
|
|
44bb88dda9
|
Merge pull request 'change style editor link button match desgin' (#106) from dev-manhph1-figbug into dev
Reviewed-on: #106
|
2025-09-05 15:24:55 +09:00 |
|
|
|
63ff503f9c
|
change style editor link button match desgin
|
2025-09-05 15:23:52 +09:00 |
|
|
|
8ff6812a05
|
Merge pull request 'change style editor link button match desgin' (#105) from dev-manhph1-figbug into dev
Reviewed-on: #105
|
2025-09-04 13:46:33 +09:00 |
|
|
|
4f6c86a626
|
change style editor link button match desgin
|
2025-09-04 13:44:36 +09:00 |
|
|
|
3f844a81b4
|
Merge pull request 'fix bug button color dark mode editor' (#104) from dev-manhph1-figbug into dev
Reviewed-on: #104
|
2025-09-04 11:28:59 +09:00 |
|
|
|
e3b5716aaf
|
fix bug button color dark mode editor
|
2025-09-04 11:25:43 +09:00 |
|
|
|
efea4d9d49
|
Merge pull request 'Limit tab to 7 tabs' (#103) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #103
|
2025-09-04 11:22:01 +09:00 |
|
|
|
4cc5ad8e05
|
Limit tab to 7 tabs
|
2025-09-03 18:43:52 +09:00 |
|
|
|
1c9546a99a
|
Merge pull request 'add rowSeq for screen 7' (#102) from dev-manhph1-figbug into dev
Reviewed-on: #102
|
2025-08-28 14:25:24 +09:00 |
|
|
|
4bcf6d6a4c
|
add rowSeq for screen 7
|
2025-08-28 11:31:41 +09:00 |
|
|
|
d5c5d48485
|
Merge pull request 'update' (#101) from dev-luannv24-fix into dev
Reviewed-on: #101
|
2025-08-28 11:17:25 +09:00 |
|
|
|
25d30d7926
|
update
|
2025-08-28 11:14:38 +09:00 |
|
|
|
094d8a03f3
|
Merge pull request 'Update 2708' (#100) from dev-trungvq7-0729 into dev
Reviewed-on: #100
|
2025-08-27 17:58:46 +09:00 |
|
|
|
df64326d0d
|
Merge pull request 'update code' (#99) from dev-luannv24-fixbug into dev
Reviewed-on: #99
|
2025-08-27 17:55:16 +09:00 |
|
|
|
6dcaf56eee
|
Update 2708
|
2025-08-27 17:53:09 +09:00 |
|
|
|
38bbd95ad4
|
update code
|
2025-08-27 16:51:07 +09:00 |
|
|
|
931e2e237e
|
update code
|
2025-08-27 16:08:45 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4a20707c62
|
Merge pull request 'Update 0729' (#92) from dev-trungvq7-0729 into dev
Reviewed-on: #92
|
2025-08-21 18:24:20 +09:00 |
|
|
|
f35924aac8
|
Update 0729
|
2025-08-21 18:18:44 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
85a14633be
|
Merge pull request 'updatecode' (#84) from luannv24-fixbug-input into dev
Reviewed-on: #84
|
2025-08-20 19:21:30 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f5465885d8
|
Update 2008
|
2025-08-20 17:14:37 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5859c5d681
|
Merge pull request 'Add pagination + fix bugs tooltip + fix bugs line chart' (#53) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #53
|
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
Reviewed-on: #52
|
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
Reviewed-on: #51
|
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
Reviewed-on: #50
|
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
Reviewed-on: #49
|
2025-08-07 18:43:05 +09:00 |
|
|
|
6a894df6ec
|
Merge pull request 'add dark mode for editor' (#47) from dev-manhph1-figbug into dev
Reviewed-on: #47
|
2025-08-07 18:15:02 +09:00 |
|
|
|
e194557753
|
Merge pull request 'dev-dungtv-0807' (#48) from dev-dungtv-0807 into dev
Reviewed-on: #48
|
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
Reviewed-on: #46
|
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
Reviewed-on: #45
|
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
Reviewed-on: #44
|
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
Reviewed-on: #41
|
2025-08-07 11:42:33 +09:00 |
|
|
|
e4331ad79f
|
Merge pull request 'fix bug screen 10' (#42) from dev-dungtv-0807 into dev
Reviewed-on: #42
|
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
Reviewed-on: #40
|
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
Reviewed-on: #39
|
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
Reviewed-on: #38
|
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
Reviewed-on: #37
|
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
Reviewed-on: #36
|
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
Reviewed-on: #35
|
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
Reviewed-on: #34
|
2025-08-04 19:01:26 +09:00 |
|
|
|
efee1098ba
|
Merge pull request 'dev-manhph1-figbug' (#33) from dev-manhph1-figbug into dev
Reviewed-on: #33
|
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
Reviewed-on: #32
|
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
Reviewed-on: #31
|
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 |
|
|
|
df678daedf
|
Fix duplicate id not reload page date
|
2025-08-01 16:03:54 +09:00 |
|
|
|
06308055ef
|
Remove mock data popup s11
|
2025-08-01 12:08:43 +09:00 |
|
|
|
1284d5b14f
|
Update s1 s29 - Remove mock data s5 s11
|
2025-08-01 11:41:32 +09:00 |
|
|
|
cd7a6362a5
|
Merge pull request 'dev-luannv24-s32s17s2' (#30) from dev-luannv24-s32s17 into dev
Reviewed-on: #30
|
2025-07-31 18:49:01 +09:00 |
|
|
|
3ae3ff8167
|
refactor code
|
2025-07-31 18:47:42 +09:00 |
|
|
|
39cb5d2883
|
Merge pull request 'dev-dungtv-0731' (#28) from dev-dungtv-0731 into dev
Reviewed-on: #28
|
2025-07-31 18:22:10 +09:00 |
|
|
|
dcdcf772ce
|
fixbug screen 20.4
|
2025-07-31 16:18:44 +07:00 |
|
|
|
881a5ceb2d
|
merge code
|
2025-07-31 17:44:19 +09:00 |
|
|
|
e4074201e4
|
update screen 32 vs 2
|
2025-07-31 17:43:45 +09:00 |
|
|
|
40addfe639
|
fixbug active menu item
|
2025-07-31 15:05:33 +07:00 |
|
|
|
a557130c15
|
Merge pull request 'fixbug ui 20 21' (#29) from dev-manhph1-fixbugui-21-28 into dev
Reviewed-on: #29
|
2025-07-31 16:44:05 +09:00 |
|
|
|
34d5a1eeb7
|
fixbug ui 20 21
|
2025-07-31 16:18:33 +09:00 |
|
|
|
238fdb5fc5
|
remove console
|
2025-07-31 14:18:29 +07:00 |
|
|
|
3c249aa476
|
update code
|
2025-07-31 15:57:07 +09:00 |
|
|
|
bfe206a2bf
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0731
|
2025-07-31 13:52:37 +07:00 |
|
|
|
a6e8e6cf86
|
fixbug screen 20
|
2025-07-31 13:52:28 +07:00 |
|
|
|
f9643f46a0
|
Merge pull request 'Commit 3107' (#27) from dev-trungvq7-0729 into dev
Reviewed-on: #27
|
2025-07-31 15:39:36 +09:00 |
|
|
|
056d1a1e17
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-31 15:03:33 +09:00 |
|
|
|
a58062a7b7
|
Commit 3107
|
2025-07-31 14:54:02 +09:00 |
|
|
|
44077048e6
|
Merge pull request 'dev-trungvq7-0729' (#26) from dev-trungvq7-0729 into dev
Reviewed-on: #26
|
2025-07-31 14:43:43 +09:00 |
|
|
|
e32f03c9ae
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-31 11:33:52 +09:00 |
|
|
|
58bb7f915c
|
Update screen 30, 13, 22
|
2025-07-31 11:31:53 +09:00 |
|
|
|
a85f9f98f6
|
Merge pull request 'fix style grid' (#25) from dev-dungtv44-0730 into dev
Reviewed-on: #25
|
2025-07-31 10:49:24 +09:00 |
|
|
|
791b291c30
|
Merge pull request 'dev-luannv24-s32s17' (#24) from dev-luannv24-s32s17 into dev
Reviewed-on: #24
|
2025-07-30 19:18:37 +09:00 |
|
|
|
e6e1703942
|
update date pickker
|
2025-07-30 19:16:42 +09:00 |
|
|
|
719e7cee69
|
fix style grid
|
2025-07-30 17:09:09 +07:00 |
|
|
|
9b89a5625b
|
update code fix bug and revert screen 2
|
2025-07-30 18:34:46 +09:00 |
|
|
|
e600089f7e
|
fix bug
|
2025-07-30 18:15:08 +09:00 |
|
|
|
adbf220770
|
merge file
|
2025-07-30 18:14:21 +09:00 |
|
|
|
51b59bf4c9
|
Merge pull request 'dev-dungtv44-0730' (#23) from dev-dungtv44-0730 into dev
Reviewed-on: #23
|
2025-07-30 17:41:07 +09:00 |
|
|
|
b2e50837fd
|
update code
|
2025-07-30 16:21:52 +09:00 |
|
|
|
88b59f5f33
|
update code merge
|
2025-07-30 16:19:54 +09:00 |
|
|
|
a2e7e8d74e
|
pull dev
|
2025-07-30 14:07:08 +07:00 |
|
|
|
d37f23512a
|
Merge pull request 'Update s14 s29 + Fix bugs s1 + Update datepicker height' (#22) from dev-nghiantt-s1s29 into dev
Reviewed-on: #22
|
2025-07-30 16:05:38 +09:00 |
|
|
|
1a23077421
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0730
|
2025-07-30 14:04:11 +07:00 |
|
|
|
9603353ab3
|
update screen 33, 44, 20, fix bug Grid
|
2025-07-30 14:03:41 +07:00 |
|
|
|
6077dddb74
|
Remove mockdata screen 5
|
2025-07-30 15:35:41 +09:00 |
|
|
|
2338bbf2ec
|
Remove log + fix click chart top 10
|
2025-07-30 15:01:44 +09:00 |
|
|
|
c2e2c10a8a
|
Update s14 s29 + Fix bugs s1 + Update datepicker height
|
2025-07-30 12:35:12 +09:00 |
|
|
|
d790249743
|
Merge pull request 'fix ui EvtObjPop' (#21) from dev-manhph1-fixbug-18-19-21-28 into dev
Reviewed-on: #21
|
2025-07-30 11:43:21 +09:00 |
|
|
|
205821fc11
|
fix ui EvtObjPop
|
2025-07-30 11:39:45 +09:00 |
|
|
|
fade079b06
|
Merge pull request 'dev-manhph1-fixbug-18-19-21-28' (#18) from dev-manhph1-fixbug-18-19-21-28 into dev
Reviewed-on: #18
|
2025-07-30 11:24:55 +09:00 |
|
|
|
98c26a156e
|
Merge pull request 'update screen 34, fix bug grid - select item' (#20) from dev-dungtv44-0730 into dev
Reviewed-on: #20
|
2025-07-30 11:22:38 +09:00 |
|
|
|
b4f8e41c7e
|
update screen 34, fix bug grid - select item
|
2025-07-30 09:15:11 +07:00 |
|
|
|
e9bdd80f14
|
Merge pull request 'update screen 34, 20' (#19) from dev-dungtv44-0730 into dev
Reviewed-on: #19
|
2025-07-30 10:35:21 +09:00 |
|
|
|
eeadcd254d
|
remove console log
|
2025-07-30 08:32:27 +07:00 |
|
|
|
b56bd12bb7
|
update screen 34, 20
|
2025-07-30 08:23:13 +07:00 |
|
|
|
bea1e0889b
|
dev-manhph1-add-pagination-28
|
2025-07-29 18:30:19 +09:00 |
|
|
|
0f66d84b48
|
Merge pull request 'hotfix grid' (#17) from dev-dungtv-fix-grid into dev
Reviewed-on: #17
|
2025-07-29 17:45:00 +09:00 |
|
|
|
34d03b2546
|
dev-manhph1-fixbug-18-19-21-28
|
2025-07-29 17:18:41 +09:00 |
|
|
|
8f83e1d60c
|
hotfix grid
|
2025-07-29 14:58:37 +07:00 |
|
|
|
1faf49056d
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-29 15:59:34 +09:00 |
|
|
|
e9ab3faa51
|
update
|
2025-07-29 15:59:32 +09:00 |
|
|
|
54220aa4eb
|
Merge pull request 'update screen 12, 20' (#15) from dev-dungtv-0729 into dev
Reviewed-on: #15
|
2025-07-29 15:39:16 +09:00 |
|
|
|
315aafc528
|
update screen 12, 20
|
2025-07-29 13:20:29 +07:00 |
|
|
|
8963a92475
|
update screen15-screen31
|
2025-07-29 12:06:11 +09:00 |
|
|
|
d66a03626b
|
updatenew-code-new
|
2025-07-29 12:04:09 +09:00 |
|
|
|
665a178f82
|
Merge pull request 'update screen 2, 8, 9, 10, 27, 33, 34' (#12) from dev-dungtv-0728 into dev
Reviewed-on: #12
|
2025-07-29 11:52:11 +09:00 |
|
|
|
7e2383efda
|
update-subtitle-screen15
|
2025-07-29 11:39:05 +09:00 |
|
|
|
13cedc7337
|
resolve conflict
|
2025-07-29 09:36:40 +07:00 |
|
|
|
e128375aeb
|
Merge pull request 'Update Screen 16, 22' (#13) from dev-trungvq7-2207 into dev
Reviewed-on: #13
|
2025-07-29 11:30:56 +09:00 |
|
|
|
710714116e
|
Remove inline style
|
2025-07-29 11:30:05 +09:00 |
|
|
|
33dbe93290
|
Merge pull request '- Update screen 14 29 - Remove mock data dashboard' (#11) from dev-nghiantt-s14 into dev
Reviewed-on: #11
|
2025-07-29 11:25:51 +09:00 |
|
|
|
708b648080
|
updatecode
|
2025-07-29 11:20:59 +09:00 |
|
|
|
2845672723
|
Update 16, 22
|
2025-07-29 10:51:49 +09:00 |
|
|
|
bbaf26af86
|
Fix comment
|
2025-07-28 18:34:29 +09:00 |
|
|
|
c3d01c998c
|
update screen 2, 8, 9, 10, 27, 33, 34
|
2025-07-28 16:12:24 +07:00 |
|
|
|
aec9353ab2
|
- Update screen 14 29 - Remove mock data dashboard
|
2025-07-28 17:22:38 +09:00 |
|
|
|
2dd0c6a72c
|
Merge pull request 'dev-trungvq7-2207' (#10) from dev-trungvq7-2207 into dev
Reviewed-on: #10
|
2025-07-28 14:39:36 +09:00 |
|
|
|
631637a8e1
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207
|
2025-07-28 14:31:49 +09:00 |
|
|
|
3ff87852e5
|
Update 2507
|
2025-07-28 14:31:41 +09:00 |
|
|
|
117e0adeb9
|
Merge pull request 'dev-dungtv-0725' (#9) from dev-dungtv-0725 into dev
Reviewed-on: #9
|
2025-07-28 10:59:55 +09:00 |
|
|
|
402b09440f
|
fix code comment
|
2025-07-28 08:59:17 +07:00 |
|
|
|
71f7cf4d30
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0725
|
2025-07-28 08:45:04 +07:00 |
|
|
|
d3984182e8
|
update screen 8, 10
|
2025-07-28 08:44:51 +07:00 |
|
|
|
933d4b751f
|
Merge pull request 'dev-luannv27-2407' (#7) from dev-luannv27-2407 into dev
Reviewed-on: #7
|
2025-07-28 10:35:21 +09:00 |
|
|
|
020432d5ac
|
update code
|
2025-07-25 19:05:38 +09:00 |
|
|
|
3f99958fe3
|
update slected header
|
2025-07-25 19:03:41 +09:00 |
|
|
|
898df6743a
|
Merge pull request 'dev-manhph1-screen18-19-21-28' (#5) from dev-manhph1-screen18-19-21-28 into dev
Reviewed-on: #5
|
2025-07-25 18:50:19 +09:00 |
|
|
|
dd559629ab
|
dev-manhph1-screen18-19-21-28
|
2025-07-25 18:11:31 +09:00 |
|
|
|
d45d141c3c
|
Update 2507
|
2025-07-25 17:59:38 +09:00 |
|
|
|
1453e75f9a
|
Merge pull request 'Update to original menu' (#4) from dev-nghiantt-menu into dev
Reviewed-on: #4
|
2025-07-25 16:04:04 +09:00 |
|
|
|
7227d5d56c
|
Update to original menu
|
2025-07-25 12:36:03 +09:00 |
|
|
|
85fc9a62af
|
update theme header
|
2025-07-25 12:30:27 +09:00 |
|
|
|
a87a8262f4
|
Merge pull request 'Update screen 7, 25' (#3) from dev-trungvq7-2207 into dev
Reviewed-on: #3
|
2025-07-25 12:15:44 +09:00 |
|
|
|
481434a144
|
Update
|
2025-07-25 12:09:27 +09:00 |
|
|
|
524023b3e1
|
update screen 7, 25
|
2025-07-25 11:57:02 +09:00 |
|
|
|
cb2d4e2e91
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207
|
2025-07-24 16:54:54 +09:00 |
|
|
|
dca6673a11
|
commit 2407
|
2025-07-24 16:54:47 +09:00 |
|
|
|
15aa03b1c1
|
Merge pull request 'impoaver sceen 2-notice management page' (#2) from dev-dungtv-screen2 into dev
Reviewed-on: #2
|
2025-07-24 16:49:45 +09:00 |
|
|
|
bbd037dcb4
|
update code
|
2025-07-24 14:45:30 +07:00 |
|
|
|
0ad898769d
|
update32.1vs32.2
|
2025-07-24 11:41:23 +09:00 |
|
|
|
bcf4015cae
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-screen2
|
2025-07-23 15:57:24 +07:00 |
|
|
|
dd9739bf74
|
impoaver sceen 2-notice management page
|
2025-07-23 15:41:44 +07:00 |
|
|
|
ab702c4495
|
Merge pull request 'Update 2207' (#1) from dev-trungvq7-2207 into dev
Reviewed-on: #1
|
2025-07-22 15:16:42 +09:00 |
|
|
|
edab77d0c6
|
Update
|
2025-07-22 14:41:39 +09:00 |
|
|
|
e2f7ab5113
|
merge 2207
|
2025-07-22 12:24:07 +09:00 |
|
|
|
eedbf94d56
|
init dev-push code ui base design
|
2025-07-22 09:58:38 +07:00 |
|
