Commit Graph

53 Commits

Author SHA1 Message Date
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
dev
41370aa4df Update 1808 2025-08-18 17:50:04 +09:00
dev
68916550e5 Update 1508 2025-08-18 10:40:46 +09:00
81a20d2851 Add paging and button view detail for S1 dashboard + Fix bugs 156 163 2025-08-14 17:09:19 +09:00
24882a21a5 fix bugs style button delete 2025-08-13 13:20:58 +07:00
84c7e61254 Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14 2025-08-12 17:07:52 +09:00
31413d1e48 update code 2025-08-12 12:58:41 +09:00
e59078a19c Fix datepicker icon + add dash line in line chart 2025-08-11 17:58:25 +09:00
dev
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
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
ea4910db79 fix bugs screen 10, 20 2025-08-07 15:18:06 +07:00
537a16fbc7 fixbugs screen 10 2025-08-07 10:40:23 +07:00
dev
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
dev
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
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
f80bfc5c71 fix bug screen 10 2025-08-07 08:37:59 +07:00
dev
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
dev
9155a2b55e commit 0608 2025-08-06 19:00:29 +09: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
bf6d03df63 fixbugs grid 2025-08-05 17:28:12 +07:00
f929ad2c28 Update tooltip s4 + add view button to switch page 2025-08-05 15:29:25 +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
1284d5b14f Update s1 s29 - Remove mock data s5 s11 2025-08-01 11:41:32 +09:00
dev
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
e4074201e4 update screen 32 vs 2 2025-07-31 17:43:45 +09:00
238fdb5fc5 remove console 2025-07-31 14:18:29 +07:00
dev
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
dev
58bb7f915c Update screen 30, 13, 22 2025-07-31 11:31:53 +09:00
9b89a5625b update code fix bug and revert screen 2 2025-07-30 18:34:46 +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
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
c2e2c10a8a Update s14 s29 + Fix bugs s1 + Update datepicker height 2025-07-30 12:35:12 +09:00
315aafc528 update screen 12, 20 2025-07-29 13:20:29 +07:00
13cedc7337 resolve conflict 2025-07-29 09:36:40 +07: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
d3984182e8 update screen 8, 10 2025-07-28 08:44:51 +07:00
dev
481434a144 Update 2025-07-25 12:09:27 +09:00
dev
524023b3e1 update screen 7, 25 2025-07-25 11:57:02 +09:00