gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[Draf] compare dev vs main #43

Open
dev wants to merge 214 commits from dev into dev-base
pull from: dev
merge into: gitadmin:dev-base
Conversation 0 Commits 214 Files Changed 246 +40609 -30451
dev commented 2025-08-07 11:06:11 +09:00
Collaborator
Copy Link
No description provided.
dev added 127 commits 2025-08-07 11:06:12 +09:00
init dev-push code ui base design eedbf94d56
merge 2207 e2f7ab5113
Update edab77d0c6
Merge pull request 'Update 2207' (#1) from dev-trungvq7-2207 into dev ab702c4495 
Reviewed-on: #1
impoaver sceen 2-notice management page dd9739bf74
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-screen2 bcf4015cae
update32.1vs32.2 0ad898769d
update code bbd037dcb4
Merge pull request 'impoaver sceen 2-notice management page' (#2) from dev-dungtv-screen2 into dev 15aa03b1c1 
Reviewed-on: #2
commit 2407 dca6673a11
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207 cb2d4e2e91
update screen 7, 25 524023b3e1
Update 481434a144
Merge pull request 'Update screen 7, 25' (#3) from dev-trungvq7-2207 into dev a87a8262f4 
Reviewed-on: #3
update theme header 85fc9a62af
Update to original menu 7227d5d56c
Merge pull request 'Update to original menu' (#4) from dev-nghiantt-menu into dev 1453e75f9a 
Reviewed-on: #4
Update 2507 d45d141c3c
dev-manhph1-screen18-19-21-28 dd559629ab
Merge pull request 'dev-manhph1-screen18-19-21-28' (#5) from dev-manhph1-screen18-19-21-28 into dev 898df6743a 
Reviewed-on: #5
update slected header 3f99958fe3
update code 020432d5ac
Merge pull request 'dev-luannv27-2407' (#7) from dev-luannv27-2407 into dev 933d4b751f 
Reviewed-on: #7
update screen 8, 10 d3984182e8
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0725 71f7cf4d30
fix code comment 402b09440f
Merge pull request 'dev-dungtv-0725' (#9) from dev-dungtv-0725 into dev 117e0adeb9 
Reviewed-on: #9
Update 2507 3ff87852e5
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207 631637a8e1
Merge pull request 'dev-trungvq7-2207' (#10) from dev-trungvq7-2207 into dev 2dd0c6a72c 
Reviewed-on: #10
- Update screen 14 29 - Remove mock data dashboard aec9353ab2
update screen 2, 8, 9, 10, 27, 33, 34 c3d01c998c
Fix comment bbaf26af86
Update 16, 22 2845672723
updatecode 708b648080
Merge pull request '- Update screen 14 29 - Remove mock data dashboard' (#11) from dev-nghiantt-s14 into dev 33dbe93290 
Reviewed-on: #11
Remove inline style 710714116e
Merge pull request 'Update Screen 16, 22' (#13) from dev-trungvq7-2207 into dev e128375aeb 
Reviewed-on: #13
resolve conflict 13cedc7337
update-subtitle-screen15 7e2383efda
Merge pull request 'update screen 2, 8, 9, 10, 27, 33, 34' (#12) from dev-dungtv-0728 into dev 665a178f82 
Reviewed-on: #12
updatenew-code-new d66a03626b
update screen15-screen31 8963a92475
update screen 12, 20 315aafc528
Merge pull request 'update screen 12, 20' (#15) from dev-dungtv-0729 into dev 54220aa4eb 
Reviewed-on: #15
update e9ab3faa51
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 1faf49056d
hotfix grid 8f83e1d60c
dev-manhph1-fixbug-18-19-21-28 34d03b2546
Merge pull request 'hotfix grid' (#17) from dev-dungtv-fix-grid into dev 0f66d84b48 
Reviewed-on: #17
dev-manhph1-add-pagination-28 bea1e0889b
update screen 34, 20 b56bd12bb7
remove console log eeadcd254d
Merge pull request 'update screen 34, 20' (#19) from dev-dungtv44-0730 into dev e9bdd80f14 
Reviewed-on: #19
update screen 34, fix bug grid - select item b4f8e41c7e
Merge pull request 'update screen 34, fix bug grid - select item' (#20) from dev-dungtv44-0730 into dev 98c26a156e 
Reviewed-on: #20
Merge pull request 'dev-manhph1-fixbug-18-19-21-28' (#18) from dev-manhph1-fixbug-18-19-21-28 into dev fade079b06 
Reviewed-on: #18
fix ui EvtObjPop 205821fc11
Merge pull request 'fix ui EvtObjPop' (#21) from dev-manhph1-fixbug-18-19-21-28 into dev d790249743 
Reviewed-on: #21
Update s14 s29 + Fix bugs s1 + Update datepicker height c2e2c10a8a
Remove log + fix click chart top 10 2338bbf2ec
Remove mockdata screen 5 6077dddb74
update screen 33, 44, 20, fix bug Grid 9603353ab3
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0730 1a23077421
Merge pull request 'Update s14 s29 + Fix bugs s1 + Update datepicker height' (#22) from dev-nghiantt-s1s29 into dev d37f23512a 
Reviewed-on: #22
pull dev a2e7e8d74e
update code merge 88b59f5f33
update code b2e50837fd
Merge pull request 'dev-dungtv44-0730' (#23) from dev-dungtv44-0730 into dev 51b59bf4c9 
Reviewed-on: #23
merge file adbf220770
fix bug e600089f7e
update code fix bug and revert screen 2 9b89a5625b
fix style grid 719e7cee69
update date pickker e6e1703942
Merge pull request 'dev-luannv24-s32s17' (#24) from dev-luannv24-s32s17 into dev 791b291c30 
Reviewed-on: #24
Merge pull request 'fix style grid' (#25) from dev-dungtv44-0730 into dev a85f9f98f6 
Reviewed-on: #25
Update screen 30, 13, 22 58bb7f915c
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 e32f03c9ae
Merge pull request 'dev-trungvq7-0729' (#26) from dev-trungvq7-0729 into dev 44077048e6 
Reviewed-on: #26
Commit 3107 a58062a7b7
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 056d1a1e17
Merge pull request 'Commit 3107' (#27) from dev-trungvq7-0729 into dev f9643f46a0 
Reviewed-on: #27
fixbug screen 20 a6e8e6cf86
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0731 bfe206a2bf
update code 3c249aa476
remove console 238fdb5fc5
fixbug ui 20 21 34d5a1eeb7
Merge pull request 'fixbug ui 20 21' (#29) from dev-manhph1-fixbugui-21-28 into dev a557130c15 
Reviewed-on: #29
fixbug active menu item 40addfe639
update screen 32 vs 2 e4074201e4
merge code 881a5ceb2d
fixbug screen 20.4 dcdcf772ce
Merge pull request 'dev-dungtv-0731' (#28) from dev-dungtv-0731 into dev 39cb5d2883 
Reviewed-on: #28
refactor code 3ae3ff8167
Merge pull request 'dev-luannv24-s32s17s2' (#30) from dev-luannv24-s32s17 into dev cd7a6362a5 
Reviewed-on: #30
Update s1 s29 - Remove mock data s5 s11 1284d5b14f
Remove mock data popup s11 06308055ef
Fix duplicate id not reload page date df678daedf
Change style to built in class + Add missing titlte 6dfda50ebd
fix bug screen 8, 10, menu 7bca077859
Merge pull request 'Update s1 s29 - Remove mock data s5 s11' (#31) from dev-nghiantt-s1s29 into dev 195c48ff25 
Reviewed-on: #31
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0804 a7968774c3
Merge pull request 'fix bug screen 8, 10, menu' (#32) from dev-dungtv44-0804 into dev f180f22324 
Reviewed-on: #32
fixbug-scrren-12 28fe49d39f
fixbug-scrren-12 41095098e2
conflic 2253ddef0a
fixbug 5735777bb1
Merge pull request 'dev-manhph1-figbug' (#33) from dev-manhph1-figbug into dev efee1098ba 
Reviewed-on: #33
Merge pull request 'fixbug' (#34) from dev-luannv24-fixbugs32s2 into dev e96d012d17 
Reviewed-on: #34
Update 0408 8f7f5c598d
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 b32aa1d5bb
Merge pull request 'dev-trungvq7-0729' (#35) from dev-trungvq7-0729 into dev 53b8b89e68 
Reviewed-on: #35
Update tooltip s4 + add view button to switch page f929ad2c28
fix bug 18 33 34 8cadade514
fixbugs grid bf6d03df63
Merge pull request 'Update tooltip s4 + add view button to switch page' (#36) from dev-nghiantt-fix-bugs into dev ca27167d3d 
Reviewed-on: #36
resolve confict 4a7077336d
Merge pull request 'fix bug 18 33 34' (#37) from dev-manhph1-figbug into dev 550659475f 
Reviewed-on: #37
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0805 3b6c05c70a
resolve comment a4007d5697
Merge pull request 'fixbugs grid' (#38) from dev-dungtv-0805 into dev 3f89707a01 
Reviewed-on: #38
fix bugs b0ad70d33e
hotfix layout 38585f7b4f
Merge pull request 'fix bugs' (#39) from dev-dungtv-0806 into dev 484d8879aa 
Reviewed-on: #39
commit 0608 9155a2b55e
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 6db0ff96c0
Merge pull request 'dev-trungvq7-0729' (#40) from dev-trungvq7-0729 into dev f715405ad2 
Reviewed-on: #40
dev added 3 commits 2025-08-07 11:37:19 +09:00
fix bug screen 10 f80bfc5c71
resolve commit code 8c7a8d5b29
Merge pull request 'fix bug screen 10' (#42) from dev-dungtv-0807 into dev e4331ad79f 
Reviewed-on: #42
dev added 6 commits 2025-08-07 11:42:38 +09:00
update code fixbug 2cf00c0880
update code 56607d0770
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-luannv24-s2s17s15-fixbug 8bb0d56a80
refactor code b53ce8bd83
update 140f73814f
Merge pull request 'dev-luannv24-s2s17s15-fixbug' (#41) from dev-luannv24-s2s17s15-fixbug into dev 19a634e3a5 
Reviewed-on: #41
dev added 2 commits 2025-08-07 12:23:57 +09:00
fix bug 07/08/25 2533d5bb7a
Merge pull request 'fix bug 07/08/25' (#44) from dev-manhph1-figbug into dev 6f6f19349f 
Reviewed-on: #44
dev added 2 commits 2025-08-07 12:45:30 +09:00
fixbugs screen 10 537a16fbc7
Merge pull request 'fixbugs screen 10' (#45) from dev-dungtv-0807 into dev 93dd46c225 
Reviewed-on: #45
dev added 2 commits 2025-08-07 15:42:42 +09:00
Fix checkboxes in form 439079eee8
Merge pull request 'Fix checkboxes in form' (#46) from dev-nghiantt-fix-bugs into dev 1352223416 
Reviewed-on: #46
dev added 3 commits 2025-08-07 17:46:36 +09:00
fix bugs screen 20.1~20.4 6871d6034d
fix bug screen 8 bug-32 c636db83bd
Merge pull request 'dev-dungtv-0807' (#48) from dev-dungtv-0807 into dev e194557753 
Reviewed-on: #48
dev added 2 commits 2025-08-07 18:15:07 +09:00
add dark mode for editor fa68aa31e6
Merge pull request 'add dark mode for editor' (#47) from dev-manhph1-figbug into dev 6a894df6ec 
Reviewed-on: #47
dev added 3 commits 2025-08-07 18:43:10 +09:00
fix bugs screen 10, 20 ea4910db79
fixbug grid d0572dc07c
Merge pull request 'dev-dungtv-0807' (#49) from dev-dungtv-0807 into dev a06d2e553d 
Reviewed-on: #49
dev added 3 commits 2025-08-08 10:25:24 +09:00
Merge 0729 c9bc9d3186
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 d8c5bd5323
Merge pull request 'dev-trungvq7-0729' (#50) from dev-trungvq7-0729 into dev 9979f32f8c 
Reviewed-on: #50
dev added 3 commits 2025-08-08 11:35:31 +09:00
update code 71394443ac
resovel conflix 335f93e6cf
Merge pull request 'update code' (#51) from dev-luannv24-screen36-32-31-26-17-15 into dev 1ece377457 
Reviewed-on: #51
dev added 2 commits 2025-08-11 11:25:45 +09:00
fixbug ecfbeb3afa
Merge pull request 'fixbug' (#52) from dev-luannv24-fixbug1 into dev d22b09cc47 
Reviewed-on: #52
dev added 2 commits 2025-08-11 13:54:37 +09:00
Add pagination + fix bugs tooltip + fix bugs line chart f666110a1a
Merge pull request 'Add pagination + fix bugs tooltip + fix bugs line chart' (#53) from dev-nghiantt-fix-bugs into dev 5859c5d681 
Reviewed-on: #53
dev added 2 commits 2025-08-11 14:06:28 +09:00
fix bugs 47, 145 d6dd66c4b3
Merge pull request 'fix bugs 47, 145' (#54) from dev-dungtv-0811 into dev 6583d68ea7 
Reviewed-on: #54
dev added 3 commits 2025-08-11 16:55:45 +09:00
fix bug grid not load when change menu tab c40352e37c
add check direction for actionbutton 4fd2eac344
Merge pull request 'fix bug grid not load when change menu tab' (#55) from dev-manhph1-figbug into dev bc96d2ae45 
Reviewed-on: #55
dev added 2 commits 2025-08-11 18:29:59 +09:00
Fix datepicker icon + add dash line in line chart e59078a19c
Merge pull request 'Fix datepicker icon + add dash line in line chart' (#56) from dev-nghiantt-fix-bugs into dev dd24592eca 
Reviewed-on: #56
dev added 3 commits 2025-08-12 15:14:34 +09:00
update code 31413d1e48
refactor code 5c43496282
Merge pull request 'fixbug screen 2 , screen 17 , screen 15' (#57) from dev-luannv24-fixbug-8/12 into dev 541ae86068 
Reviewed-on: #57
dev added 2 commits 2025-08-12 16:42:39 +09:00
fix bug screen17 tab3 245444d5fa
Merge pull request 'fix bug screen17 tab3' (#58) from dev-luannv27-s17 into dev ffdc56b8f1 
Reviewed-on: #58
dev added 2 commits 2025-08-12 18:43:07 +09:00
Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14 84c7e61254
Merge pull request 'Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14' (#59) from dev-nghiantt-fix-bugs into dev 8d444eafcd 
Reviewed-on: #59
dev added 2 commits 2025-08-12 18:47:13 +09:00
fix icon datepicker 7d2bcb9496
Merge pull request 'fix icon datepicker' (#60) from dev-manhph1-figbug into dev 0825663c64 
Reviewed-on: #60
dev added 2 commits 2025-08-12 18:48:00 +09:00
update code s32 s17 71e90064a2
Merge pull request 'update code s32 s17' (#61) from dev-luannv24-s32-s17fixbug into dev 39905e6f80 
Reviewed-on: #61
dev added 2 commits 2025-08-13 13:46:56 +09:00
add pagination for screen 27 move pagination screen 28 2802e93a44
Merge pull request 'add pagination for screen 27 move pagination screen 28' (#62) from dev-manhph1-figbug into dev 0760bde4e1 
Reviewed-on: #62
dev added 6 commits 2025-08-13 16:12:50 +09:00
fix bugs 68f3f0f381
fix bugs css menu de99b30485
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0813 9aa9939a43
fix bugs style button delete 24882a21a5
fix menu item:hover style f6c071bdf0
Merge pull request 'dev-dungtv-0813' (#63) from dev-dungtv-0813 into dev 59ec2eda59 
Reviewed-on: #63
dev added 4 commits 2025-08-13 19:02:09 +09:00
Update 1108 287c68252b
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 d5c59286ad
Update 1308 f41bd1283a
Merge pull request 'Update screen 13, grid color' (#64) from dev-trungvq7-0729 into dev 2cea34dbab 
Reviewed-on: #64
dev added 3 commits 2025-08-14 12:03:43 +09:00
fixbug 6973321137
updatecode 856d0db130
Merge pull request 'fixbug' (#65) from dev-luannv24-fixbug-common-screen17 into dev 1a5ec4c6a3 
Reviewed-on: #65
dev added 2 commits 2025-08-14 15:54:25 +09:00
fix bug grid + buttons c810139554
Merge pull request 'fix bug grid + buttons' (#66) from dev-dungtv-0814 into dev ed9150aae8 
Reviewed-on: #66
lgtm
dev added 3 commits 2025-08-14 16:00:19 +09:00
add paging for page 38 9a42291cf4
add paging for page 38 270279b0c2
Merge pull request 'dev-manhph1-figbug' (#67) from dev-manhph1-figbug into dev 6353ffba57 
Reviewed-on: #67
dev added 2 commits 2025-08-15 10:10:50 +09:00
Add paging and button view detail for S1 dashboard + Fix bugs 156 163 81a20d2851
Merge pull request 'Add paging and button view detail for S1 dashboard + Fix bugs 156 163' (#68) from dev-nghiantt-fix-bugs into dev be1e0426e0 
Reviewed-on: #68
dev added 2 commits 2025-08-18 10:47:04 +09:00
fix desgin screen 38 1250b3d3af
Merge pull request 'fix desgin screen 38' (#69) from dev-manhph1-figbug into dev 8a9dfd9949 
Reviewed-on: #69
dev added 3 commits 2025-08-18 10:50:05 +09:00
Update 1508 68916550e5
Update 1508 3155258656
Merge pull request 'Fix bug Screen 13' (#70) from dev-trungvq7-0729 into dev c815eae2ca 
Reviewed-on: #70
dev added 2 commits 2025-08-18 11:27:31 +09:00
hotfix bug screen 10 50698ac661
Merge pull request 'hotfix bug screen 10' (#71) from dev-dungtv-0818 into dev 5088769914 
Reviewed-on: #71
dev added 2 commits 2025-08-18 16:45:11 +09:00
fix bug grid no scroll y margin right c6eb2b57b2
Merge pull request 'fix bug grid no scroll y margin right' (#72) from dev-manhph1-figbug into dev 3c49bd36e9 
Reviewed-on: #72
dev added 2 commits 2025-08-18 17:56:18 +09:00
Fix selection grid s14 + Remove border legend dashboard d3022582b6
Merge pull request 'Fix selection grid s14 + Remove border legend dashboard' (#73) from dev-nghiantt-fix-bugs into dev ce2c3c6c0e 
Reviewed-on: #73
dev added 3 commits 2025-08-18 17:57:25 +09:00
Update 1808 41370aa4df
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 9d35712f58
Merge pull request 'Update screen 7, 33, 16' (#74) from dev-trungvq7-0729 into dev 08637f6321 
Reviewed-on: #74
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dev:dev
git checkout dev
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
dev etudes gitadmin
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: gitadmin/sk_fems_ui#43
No description provided.
Delete Branch "dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?