diff --git a/system1-factory/web/css/tbm-mobile.css b/system1-factory/web/css/tbm-mobile.css index 4d83f25..935c9ab 100644 --- a/system1-factory/web/css/tbm-mobile.css +++ b/system1-factory/web/css/tbm-mobile.css @@ -15,7 +15,7 @@ button, .m-tbm-row, .m-tab, .m-new-btn, .m-detail-btn, .m-load-more, touch-action: manipulation; } @media (min-width: 480px) { - body { max-width: 480px; margin: 0 auto; min-height: 100vh; } + body { max-width: 768px; margin: 0 auto; min-height: 100vh; } } /* Header */ @@ -306,7 +306,7 @@ button, .m-tbm-row, .m-tab, .m-new-btn, .m-detail-btn, .m-load-more, justify-content: space-around; } @media (min-width: 480px) { - .m-bottom-nav { max-width: 480px; margin: 0 auto; } + .m-bottom-nav { max-width: 768px; margin: 0 auto; } } .m-nav-item { display: flex; diff --git a/system1-factory/web/js/tbm-mobile.js b/system1-factory/web/js/tbm-mobile.js index 8a279df..64ae1bf 100644 --- a/system1-factory/web/js/tbm-mobile.js +++ b/system1-factory/web/js/tbm-mobile.js @@ -123,11 +123,12 @@ }; function isMySession(s) { + var role = (currentUser.role || '').toLowerCase(); + if (role === 'admin' || role === 'system' || role === 'support_team') return true; var userId = currentUser.user_id; - var workerId = currentUser.user_id; var userName = currentUser.name; - return (userId && String(s.created_by) === String(userId)) || - (workerId && String(s.leader_user_id) === String(workerId)) || + return (userId && (String(s.created_by) === String(userId) || + String(s.leader_user_id) === String(userId))) || (userName && s.created_by_name === userName); } diff --git a/system1-factory/web/pages/work/tbm-mobile.html b/system1-factory/web/pages/work/tbm-mobile.html index 639c3c1..4e2d819 100644 --- a/system1-factory/web/pages/work/tbm-mobile.html +++ b/system1-factory/web/pages/work/tbm-mobile.html @@ -95,20 +95,15 @@ 작업보고 - + - - - + + + + + - 현황 - - - - - - - 출근 + 연차관리