|
|
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 |
|
|
|
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 |
|
|
|
b0ad70d33e
|
fix bugs
|
2025-08-06 16:31:44 +07: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 |
|
|
|
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 |
|
|
|
e96d012d17
|
Merge pull request 'fixbug' (#34) from dev-luannv24-fixbugs32s2 into dev
Reviewed-on: #34
|
2025-08-04 19:01:26 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e6e1703942
|
update date pickker
|
2025-07-30 19:16:42 +09: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
