-
8cadade514
fix bug 18 33 34
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
2025-08-05 15:00:22 +07:00
-
f929ad2c28
Update tooltip s4 + add view button to switch page
Michael
2025-08-05 15:29:25 +09:00
-
-
53b8b89e68
Merge pull request 'dev-trungvq7-0729' (#35) from dev-trungvq7-0729 into dev
dev
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
dev
2025-08-04 19:40:08 +09:00
-
-
-
-
8f7f5c598d
Update 0408
dev
2025-08-04 19:39:58 +09:00
-
e96d012d17
Merge pull request 'fixbug' (#34) from dev-luannv24-fixbugs32s2 into dev
dev
2025-08-04 19:01:26 +09:00
-
-
efee1098ba
Merge pull request 'dev-manhph1-figbug' (#33) from dev-manhph1-figbug into dev
dev
2025-08-04 18:56:50 +09:00
-
-
-
-
5735777bb1
fixbug
dev-luannv24-fixbugs32s2
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-08-04 18:53:30 +09:00
-
-
-
2253ddef0a
conflic
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
2025-08-04 16:41:29 +07:00
-
-
-
-
41095098e2
fixbug-scrren-12
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
2025-08-04 16:37:00 +07:00
-
28fe49d39f
fixbug-scrren-12
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
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
dev
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
dev-dungtv44-0804
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
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
dev
2025-08-04 17:02:41 +09:00
-
-
-
-
7bca077859
fix bug screen 8, 10, menu
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-08-04 15:00:22 +07:00
-
-
-
6dfda50ebd
Change style to built in class + Add missing titlte
dev-nghiantt-s1s29
Michael
2025-08-04 11:21:29 +09:00
-
df678daedf
Fix duplicate id not reload page date
Michael
2025-08-01 16:03:54 +09:00
-
06308055ef
Remove mock data popup s11
Michael
2025-08-01 12:08:43 +09:00
-
1284d5b14f
Update s1 s29 - Remove mock data s5 s11
Michael
2025-08-01 11:41:32 +09:00
-
-
cd7a6362a5
Merge pull request 'dev-luannv24-s32s17s2' (#30) from dev-luannv24-s32s17 into dev
dev
2025-07-31 18:49:01 +09:00
-
-
3ae3ff8167
refactor code
dev-luannv24-s32s17
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-31 18:47:42 +09:00
-
39cb5d2883
Merge pull request 'dev-dungtv-0731' (#28) from dev-dungtv-0731 into dev
dev
2025-07-31 18:22:10 +09:00
-
-
dcdcf772ce
fixbug screen 20.4
dev-dungtv-0731
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-31 16:18:44 +07:00
-
881a5ceb2d
merge code
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-31 17:44:19 +09:00
-
-
-
-
e4074201e4
update screen 32 vs 2
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-31 17:43:45 +09:00
-
-
40addfe639
fixbug active menu item
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
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
dev
2025-07-31 16:44:05 +09:00
-
-
-
-
34d5a1eeb7
fixbug ui 20 21
dev-manhph1-fixbugui-21-28
Vu Trung Kien/(Vu Trung Kien)/현장대리인/SK
2025-07-31 16:18:33 +09:00
-
-
238fdb5fc5
remove console
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-31 14:18:29 +07:00
-
3c249aa476
update code
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
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
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-31 13:52:37 +07:00
-
-
-
-
a6e8e6cf86
fixbug screen 20
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-31 13:52:28 +07:00
-
f9643f46a0
Merge pull request 'Commit 3107' (#27) from dev-trungvq7-0729 into dev
dev-nghiantt-s3s5
dev
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
dev
2025-07-31 15:03:33 +09:00
-
-
-
-
a58062a7b7
Commit 3107
dev
2025-07-31 14:54:02 +09:00
-
44077048e6
Merge pull request 'dev-trungvq7-0729' (#26) from dev-trungvq7-0729 into dev
dev-trungvq7-3107
dev
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
dev
2025-07-31 11:33:52 +09:00
-
-
-
-
58bb7f915c
Update screen 30, 13, 22
dev
2025-07-31 11:31:53 +09:00
-
a85f9f98f6
Merge pull request 'fix style grid' (#25) from dev-dungtv44-0730 into dev
dev
2025-07-31 10:49:24 +09:00
-
-
791b291c30
Merge pull request 'dev-luannv24-s32s17' (#24) from dev-luannv24-s32s17 into dev
dev
2025-07-30 19:18:37 +09:00
-
-
-
-
e6e1703942
update date pickker
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 19:16:42 +09:00
-
719e7cee69
fix style grid
dev-dungtv44-0730
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 17:09:09 +07:00
-
9b89a5625b
update code fix bug and revert screen 2
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 18:34:46 +09:00
-
e600089f7e
fix bug
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 18:15:08 +09:00
-
adbf220770
merge file
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 18:14:21 +09:00
-
-
-
-
51b59bf4c9
Merge pull request 'dev-dungtv44-0730' (#23) from dev-dungtv44-0730 into dev
dev
2025-07-30 17:41:07 +09:00
-
-
-
-
b2e50837fd
update code
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 16:21:52 +09:00
-
88b59f5f33
update code merge
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-30 16:19:54 +09:00
-
-
-
a2e7e8d74e
pull dev
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
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
dev
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
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 14:04:11 +07:00
-
-
-
-
9603353ab3
update screen 33, 44, 20, fix bug Grid
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 14:03:41 +07:00
-
6077dddb74
Remove mockdata screen 5
Michael
2025-07-30 15:35:41 +09:00
-
2338bbf2ec
Remove log + fix click chart top 10
Michael
2025-07-30 15:01:44 +09:00
-
c2e2c10a8a
Update s14 s29 + Fix bugs s1 + Update datepicker height
Michael
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
dev
2025-07-30 11:43:21 +09:00
-
-
205821fc11
fix ui EvtObjPop
dev-manhph1-fixbug-18-19-21-28
Vu Trung Kien/(Vu Trung Kien)/현장대리인/SK
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
dev
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
dev
2025-07-30 11:22:38 +09:00
-
-
-
-
b4f8e41c7e
update screen 34, fix bug grid - select item
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 09:15:11 +07:00
-
e9bdd80f14
Merge pull request 'update screen 34, 20' (#19) from dev-dungtv44-0730 into dev
dev
2025-07-30 10:35:21 +09:00
-
-
eeadcd254d
remove console log
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 08:32:27 +07:00
-
b56bd12bb7
update screen 34, 20
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 08:23:13 +07:00
-
-
338f0a108a
merge dev
dev-luannv24-s26s36s17
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-29 18:31:07 +09:00
-
-
-
-
00a183b9de
update code
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-29 18:30:25 +09:00
-
bea1e0889b
dev-manhph1-add-pagination-28
Vu Trung Kien/(Vu Trung Kien)/현장대리인/SK
2025-07-29 18:30:19 +09:00
-
0f66d84b48
Merge pull request 'hotfix grid' (#17) from dev-dungtv-fix-grid into dev
dev
2025-07-29 17:45:00 +09:00
-
-
34d03b2546
dev-manhph1-fixbug-18-19-21-28
Vu Trung Kien/(Vu Trung Kien)/현장대리인/SK
2025-07-29 17:18:41 +09:00
-
-
-
8f83e1d60c
hotfix grid
dev-dungtv-fix-grid
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
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
dev
2025-07-29 15:59:34 +09:00
-
-
-
-
e9ab3faa51
update
dev
2025-07-29 15:59:32 +09:00
-
54220aa4eb
Merge pull request 'update screen 12, 20' (#15) from dev-dungtv-0729 into dev
dev
2025-07-29 15:39:16 +09:00
-
-
-
-
315aafc528
update screen 12, 20
dev-dungtv-0729
leonard
2025-07-29 13:20:29 +07:00
-
-
8963a92475
update screen15-screen31
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-29 12:06:11 +09:00
-
-
d66a03626b
updatenew-code-new
dev-luannv24-screen15
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
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
dev
2025-07-29 11:52:11 +09:00
-
-
-
-
7e2383efda
update-subtitle-screen15
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-29 11:39:05 +09:00
-
-
13cedc7337
resolve conflict
dev-dungtv-0728
leonard
2025-07-29 09:36:40 +07:00
-
-
-
-
e128375aeb
Merge pull request 'Update Screen 16, 22' (#13) from dev-trungvq7-2207 into dev
dev
2025-07-29 11:30:56 +09:00
-
-
710714116e
Remove inline style
dev-trungvq7-2207
dev
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
dev
2025-07-29 11:25:51 +09:00
-
-
-
-
708b648080
updatecode
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-29 11:20:59 +09:00
-
2845672723
Update 16, 22
dev
2025-07-29 10:51:49 +09:00
-
-
-
bbaf26af86
Fix comment
dev-nghiantt-s14
Michael
2025-07-28 18:34:29 +09:00
-
c3d01c998c
update screen 2, 8, 9, 10, 27, 33, 34
leonard
2025-07-28 16:12:24 +07:00
-
aec9353ab2
- Update screen 14 29 - Remove mock data dashboard
Michael
2025-07-28 17:22:38 +09:00
-
-
2dd0c6a72c
Merge pull request 'dev-trungvq7-2207' (#10) from dev-trungvq7-2207 into dev
dev
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
dev
2025-07-28 14:31:49 +09:00
-
-
-
-
3ff87852e5
Update 2507
dev
2025-07-28 14:31:41 +09:00
-
117e0adeb9
Merge pull request 'dev-dungtv-0725' (#9) from dev-dungtv-0725 into dev
dev
2025-07-28 10:59:55 +09:00
-
-
-
-
402b09440f
fix code comment
dev-dungtv-0725
leonard
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
leonard
2025-07-28 08:45:04 +07:00
-
-
-
-
d3984182e8
update screen 8, 10
leonard
2025-07-28 08:44:51 +07:00
-
933d4b751f
Merge pull request 'dev-luannv27-2407' (#7) from dev-luannv27-2407 into dev
dev
2025-07-28 10:35:21 +09:00
-
-
020432d5ac
update code
dev-luannv27-2407
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-07-25 19:05:38 +09:00
-
-
-
-
3f99958fe3
update slected header
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
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
dev
2025-07-25 18:50:19 +09:00
-
-
-
-
dd559629ab
dev-manhph1-screen18-19-21-28
dev-manhph1-screen18-19-21-28
Le Quang Cuong/(Le Quang Cuong)/현장대리인/SK
2025-07-25 18:11:31 +09:00
-
-
d45d141c3c
Update 2507
dev
2025-07-25 17:59:38 +09:00
-
-
-
1453e75f9a
Merge pull request 'Update to original menu' (#4) from dev-nghiantt-menu into dev
dev
2025-07-25 16:04:04 +09:00
-