|
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 |
|
|
4a7077336d
|
resolve confict
|
2025-08-06 09:26:53 +07: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 |
|
|
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 |
|
|
5735777bb1
|
fixbug
|
2025-08-04 18:53:30 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
a58062a7b7
|
Commit 3107
|
2025-07-31 14:54:02 +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 |
|
|
719e7cee69
|
fix style grid
|
2025-07-30 17:09:09 +07:00 |
|
|
adbf220770
|
merge file
|
2025-07-30 18:14:21 +09:00 |
|
|
b2e50837fd
|
update code
|
2025-07-30 16:21:52 +09:00 |
|
|
a2e7e8d74e
|
pull dev
|
2025-07-30 14:07:08 +07: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 |
|
|
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 |
|
|
b4f8e41c7e
|
update screen 34, fix bug grid - select item
|
2025-07-30 09:15:11 +07: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 |
|
|
34d03b2546
|
dev-manhph1-fixbug-18-19-21-28
|
2025-07-29 17:18:41 +09:00 |
|
|
315aafc528
|
update screen 12, 20
|
2025-07-29 13:20:29 +07:00 |
|
|
d66a03626b
|
updatenew-code-new
|
2025-07-29 12:04:09 +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 |
|
|
708b648080
|
updatecode
|
2025-07-29 11:20:59 +09:00 |
|
|
2845672723
|
Update 16, 22
|
2025-07-29 10:51:49 +09:00 |
|