|
|
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 |
|
