issue #11 Adjust ui font size.

procentric/application/lib/hoteltv.ui_appfull.js

@@ -588,6 +588,16 @@ HotelTV.ui_appfull = (function() {
         }
     }
 
+    const __uifxn_AppFull_getOrderMenuName = function(_objCtgyInfo){
+        let _state = HotelTV.state;
+        for (__jj = 1; __jj <= _objCtgyInfo.length; __jj++) {
+            if ( _objCtgyInfo[__jj].name=="ORDER" ) {
+                return _objCtgyInfo[__jj].title[_state.lang];
+            }
+        }
+        return "ORDER";
+    }
+
     /**
      * HotelTV UI[AppFull] Wrapper Function::> register hotkey for amenity service
      */
@@ -597,12 +607,21 @@ HotelTV.ui_appfull = (function() {
         let _amenity = null;
         let _roomservice = null;
 
+        let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
+        if ( _elAmPupOoderRoot.css('display')!="none" ){
+            _elAmPupOoderRoot.hide();
+        }
+
+        let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
+        if ( _elRsPupOoderRoot.css('display')!="none" ){
+            _elRsPupOoderRoot.hide();
+        }
+
 
         if (!_opening.amenity) {
             return;
         }
         _amenity = _opening.amenity;
-
         // HOTKEY정보를 state에 기록
         if (!(_amenity.button in _state.hotkey.mm)) {
             _state.hotkey.mm[_amenity.button] = {
@@ -621,10 +640,7 @@ HotelTV.ui_appfull = (function() {
             };
         }
 
-        let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
-        if ( _elAmPupOoderRoot.css('display')!="none" ){
-            _elAmPupOoderRoot.hide();
-        }
+
 
 
 
@@ -632,7 +648,6 @@ HotelTV.ui_appfull = (function() {
             return;
         }
         _roomservice = _opening.roomService;
-
         // HOTKEY정보를 state에 기록
         if (!(_roomservice.button in _state.hotkey.mm)) {
             _state.hotkey.mm[_roomservice.button] = {
@@ -651,10 +666,6 @@ HotelTV.ui_appfull = (function() {
             };
         }
 
-        let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
-        if ( _elRsPupOoderRoot.css('display')!="none" ){
-            _elRsPupOoderRoot.hide();
-        }
         return;
     }
 
@@ -1323,15 +1334,6 @@ HotelTV.ui_appfull = (function() {
 
             try {
                 _elAmCtgyBgMenuItemCartWin.fadeOut(200, async function() {
-                    const ____getOrderMenuName = function(){
-                        for (__jj = 1; __jj <= _aminfo_ctgy.length; __jj++) {
-                            if ( _aminfo_ctgy[__jj].name=="ORDER" ) {
-                                return _aminfo_ctgy[__jj].title[_state.lang];
-                            }
-                        }
-                        return "ORDER";
-                    }
-
                     let _str_result_message = null;
                     // Remove All element under winleft&winright div
                     __ifxn_removeAmSelectedItemCartWinElement();
@@ -1345,7 +1347,7 @@ HotelTV.ui_appfull = (function() {
                     } finally {
                         if ( _result !=null ) {
                             console.log(`Success to order Amenity cart::>`);
-                            _str_result_message = _trTbl.ui.amenity.message.orderSuccess[_state.lang].replace('__MENU__', ____getOrderMenuName());
+                            _str_result_message = _trTbl.ui.amenity.message.orderSuccess[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
                             _elAmCtgyBgMenuItemCartWinOrderWin.children('#message').text(_str_result_message);
                             _elAmCtgyBgMenuItemCartWinOrderWin.fadeIn(500, async function() {
                                 try{
@@ -2012,10 +2014,21 @@ HotelTV.ui_appfull = (function() {
                                 _elAmCtgySel.trigger('next.owl', [700]);
                             } else if (event.keyCode == gRmtKey.enter) {
                                 // 카테고리 화면 빌드 및 화면 전환
+                                if ( __status_am_specific.category_sel.cur in Object.keys(_aminfo_ctgy) ){
+                                    if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
+                                    }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on ORDER");
+                                        let __str_notify_msg = _trTbl.ui.amenity.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
+                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                                    }else{
                                         _state.menu.stage.cur = "amenity_ctgy_item_sel";
                                         __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_sel");
                                         __uifxn_AppFull_DrawAmItemSeletion("enter");
+                                    }
+                                }
                             } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawAmOrderList('hide');
                                 // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
                                 if (_hndl_tmrAmenityThumbAni != null) {
                                     clearInterval(_hndl_tmrAmenityThumbAni);
@@ -2052,6 +2065,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2060,6 +2074,51 @@ HotelTV.ui_appfull = (function() {
                                 _elAmCtgySel.trigger('prev.owl', [700]);
                             } else if (event.keyCode == gRmtKey.right) {
                                 _elAmCtgySel.trigger('next.owl', [700]);
+                            } else if (event.keyCode == gRmtKey.enter) {
+                                let __str_notify_msg = _trTbl.ui.amenity.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
+                                HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                            } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawAmOrderList('hide');
+
+                                // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
+                                if (_hndl_tmrAmenityThumbAni != null) {
+                                    clearInterval(_hndl_tmrAmenityThumbAni);
+                                    _hndl_tmrAmenityThumbAni = null;
+                                    console.log("TMR(AMENITY CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
+                                }
+
+                                //카트 비움 및 사용자 가이드 지움.
+                                __ifxn_clrearAmCarts();
+                                __uifxn_AppFull_DrawAmUserGuide("destroy");
+
+                                // 어메니티 -> 메인 메뉴로 귀환
+                                $(document.activeElement).off('keydown');
+                                _elMainMenu.show(function() {
+                                    $('#lst_mmsel').trigger('translate.owl.carousel', [0]);
+                                });
+
+                                _elAmCtgySel.off('refresh.owl.carousel');
+                                _elAmCtgySel.off('change.owl.carousel');
+                                _elAmCtgySel.off('changed.owl.carousel');
+                                _elAmCtgySel.off('translate.owl.carousel');
+
+                                _elAmCtgyBg.owlCarousel('destroy');
+                                _elAmCtgySel.owlCarousel('destroy');
+
+                                _elAmCtgySel.children('div').remove();
+                                _elAmCtgyBg.children('div').remove();
+                                _elAmPupRoot.children('.bg').hide();
+                                _elAmPupRoot.children('.slider').hide();
+
+                                setTimeout(function() {
+                                    $('.main').fadeIn(1000, () => {
+                                        _state.menu.stage.cur = "main";
+                                        $('.main').addClass("depth_mm");
+                                        __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
+                                        __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
+                                    });
+                                }, 500);
                             }
                         } else if (_state.menu.stage.cur == "amenity_ctgy_item_sel") {
                             if (event.keyCode == gRmtKey.left) {
@@ -2080,7 +2139,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "amenity_ctgy_item_cart";
                                     __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.invalidCategory[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") {
@@ -2162,6 +2221,9 @@ HotelTV.ui_appfull = (function() {
                 }else{
                     __uifxn_AppFull_DrawAmOrderList('hide');
                     if ( _state.menu.stage.prev!=null ){
+                        if ( _state.menu.stage.prev=="preparing_amenity" ){
+                            _state.menu.stage.prev="amenity_ctgy_sel";
+                        }
                         _state.menu.stage.cur = _state.menu.stage.prev;
                     }
                 }
@@ -2806,15 +2868,6 @@ HotelTV.ui_appfull = (function() {
 
             try {
                 _elRsCtgyBgMenuItemCartWin.fadeOut(200, async function() {
-                    const ____getOrderMenuName = function(){
-                        for (__jj = 1; __jj <= _rsinfo_ctgy.length; __jj++) {
-                            if ( _rsinfo_ctgy[__jj].name=="ORDER" ) {
-                                return _rsinfo_ctgy[__jj].title[_state.lang];
-                            }
-                        }
-                        return "ORDER";
-                    }
-
                     let _str_result_message = null;
                     // Remove All element under winleft&winright div
                     __ifxn_removeRsSelectedItemCartWinElement();
@@ -2828,7 +2881,7 @@ HotelTV.ui_appfull = (function() {
                     } finally {
                         if ( _result !=null ) {
                             console.log(`Success to order Roomservice cart::>`);
-                            _str_result_message = _trTbl.ui.roomservice.message.orderSuccess[_state.lang].replace('__MENU__', ____getOrderMenuName());
+                            _str_result_message = _trTbl.ui.roomservice.message.orderSuccess[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
                             _elRsCtgyBgMenuItemCartWinOrderWin.children('#message').text(_str_result_message);
                             _elRsCtgyBgMenuItemCartWinOrderWin.fadeIn(500, async function() {
                                 try{
@@ -3496,10 +3549,22 @@ HotelTV.ui_appfull = (function() {
                                 _elRsCtgySel.trigger('next.owl', [700]);
                             } else if (event.keyCode == gRmtKey.enter) {
                                 // 카테고리 화면 빌드 및 화면 전환
+                                if ( __status_rs_specific.category_sel.cur in Object.keys(_rsinfo_ctgy) ){
+                                    if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
+                                    }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on ORDER");
+                                        let __str_notify_msg = _trTbl.ui.roomservice.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
+                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                                    }else{
                                         _state.menu.stage.cur = "roomservice_ctgy_item_sel";
                                         __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_sel");
                                         __uifxn_AppFull_DrawRsItemSeletion("enter");
+                                    }
+                                }
                             } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawRsOrderList('hide');
+
                                 // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
                                 if (_hndl_tmrRoomserviceThumbAni != null) {
                                     clearInterval(_hndl_tmrRoomserviceThumbAni);
@@ -3535,6 +3600,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3543,6 +3609,50 @@ HotelTV.ui_appfull = (function() {
                                 _elRsCtgySel.trigger('prev.owl', [700]);
                             } else if (event.keyCode == gRmtKey.right) {
                                 _elRsCtgySel.trigger('next.owl', [700]);
+                            } else if (event.keyCode == gRmtKey.enter) {
+                                let __str_notify_msg = _trTbl.ui.roomservice.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
+                                HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                            } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawRsOrderList('hide');
+
+                                // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
+                                if (_hndl_tmrRoomserviceThumbAni != null) {
+                                    clearInterval(_hndl_tmrRoomserviceThumbAni);
+                                    _hndl_tmrRoomserviceThumbAni = null;
+                                    console.log("TMR(ROOMSERVICE CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
+                                }
+                                //카트 비움 및 사용자 가이드 지움.
+                                __ifxn_clrearRsCarts();
+                                __uifxn_AppFull_DrawRsUserGuide("destroy");
+
+                                // 룸서비스 -> 메인 메뉴로 귀환
+                                $(document.activeElement).off('keydown');
+                                _elMainMenu.show(function() {
+                                    $('#lst_mmsel').trigger('translate.owl.carousel', [0]);
+                                });
+
+                                _elRsCtgySel.off('refresh.owl.carousel');
+                                _elRsCtgySel.off('change.owl.carousel');
+                                _elRsCtgySel.off('changed.owl.carousel');
+                                _elRsCtgySel.off('translate.owl.carousel');
+
+                                _elRsCtgyBg.owlCarousel('destroy');
+                                _elRsCtgySel.owlCarousel('destroy');
+
+                                _elRsCtgySel.children('div').remove();
+                                _elRsCtgyBg.children('div').remove();
+                                _elRsPupRoot.children('.bg').hide();
+                                _elRsPupRoot.children('.slider').hide();
+
+                                setTimeout(function() {
+                                    $('.main').fadeIn(1000, () => {
+                                        _state.menu.stage.cur = "main";
+                                        $('.main').addClass("depth_mm");
+                                        __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
+                                        __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
+                                    });
+                                }, 500);
                             }
                         } else if (_state.menu.stage.cur == "roomservice_ctgy_item_sel") {
                             if (event.keyCode == gRmtKey.left) {
@@ -3563,7 +3673,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "roomservice_ctgy_item_cart";
                                     __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.invalidCategory[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") {
@@ -3645,6 +3755,9 @@ HotelTV.ui_appfull = (function() {
                 }else{
                     __uifxn_AppFull_DrawRsOrderList('hide');
                     if ( _state.menu.stage.prev!=null ){
+                        if ( _state.menu.stage.prev=="preparing_roomservice" ){
+                            _state.menu.stage.prev="roomservice_ctgy_sel";
+                        }
                         _state.menu.stage.cur = _state.menu.stage.prev;
                     }
                 }
@@ -6615,6 +6728,7 @@ HotelTV.ui_appfull = (function() {
                     }
                 } else if (_evt.keyCode == gRmtKey.yellow) {
                     // YELLOW BUTTON
+                    console.log("YELLOW::>");
                     if ("yellow" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
                             if (_state.hotkey.mm.yellow.type == "brochure") {
@@ -6625,10 +6739,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.yellow.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("YELLOW::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.yellow.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("YELLOW::>ROOMSERVICEC");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -6636,6 +6752,7 @@ HotelTV.ui_appfull = (function() {
                         HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}])
                     }
                 } else if (_evt.keyCode == gRmtKey.blue) {
+                    console.log("BLUE::>");
                     // BLUE BUTTON
                     if ("blue" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
@@ -6647,10 +6764,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.blue.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("BLUE::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.blue.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("BLUE::>ROOMSERVICE");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }

procentric/application/theme/HJS00001/hoteltv.app.full.popup.css

@@ -828,7 +828,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -849,7 +849,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -892,7 +892,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -1109,7 +1109,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1120,7 +1120,7 @@
 
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1128,7 +1128,7 @@
 }
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1290,7 +1290,7 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
+    padding: 0px 20px 0px 48px;
     color: rgb(245,245,245);
     line-height: 32px;
     font-size: 32px;
@@ -1539,7 +1539,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1550,7 +1550,7 @@
 
 
 .popup .amenity .order .winleft>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1558,7 +1558,7 @@
 }
 
 .popup .amenity .order .winleft>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1978,7 +1978,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -1999,7 +1999,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -2042,7 +2042,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -2440,7 +2440,7 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
+    padding: 0px 20px 0px 48px;
     color: rgb(245,245,245);
     line-height: 32px;
     font-size: 32px;