From 5c5f58defc336b9bfce5b4936da9dc2eaa05525e Mon Sep 17 00:00:00 2001 From: Paul Kim Date: Tue, 26 Mar 2024 18:52:12 +0900 Subject: [PATCH] issue #1 Fix amenity&room service item list scroll issue. change user guide text color. --- procentric/application/lib/hoteltv.js | 2 - .../application/lib/hoteltv.ui_appfull.js | 39 ++++++++++++------- .../theme/HJS00001/hoteltv.app.full.popup.css | 10 +++-- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/procentric/application/lib/hoteltv.js b/procentric/application/lib/hoteltv.js index 66d2310..43f4bf6 100755 --- a/procentric/application/lib/hoteltv.js +++ b/procentric/application/lib/hoteltv.js @@ -493,7 +493,6 @@ HotelTV.LoadWelCome = async function() { HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo")); HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo")); HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo")); - //HotelTV.state = await JSON.parse(sessionStorage.getItem("state")); //STEP#03:API Module INIT await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number); HotelTV.settings = await JSON.parse(sessionStorage.getItem("settings")); @@ -628,7 +627,6 @@ HotelTV.LoadAppFull = async function() { HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo")); HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo")); HotelTV.services = await JSON.parse(sessionStorage.getItem("services")); - //HotelTV.state = await JSON.parse(sessionStorage.getItem("state")); //STEP#02: Init HotelTV API await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number); diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js index 2a5e369..4534dde 100755 --- a/procentric/application/lib/hoteltv.ui_appfull.js +++ b/procentric/application/lib/hoteltv.ui_appfull.js @@ -1631,6 +1631,8 @@ HotelTV.ui_appfull = (function() { case "enter": { _elAmCtgyBgMenuItemWin.find('.amctgyItem').first().addClass("focus"); __amctgyItemStatus.idx = 0; + __amctgyItemStatus.scroll_TOfset = 0; + _elAmCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200); __ifxn_updateAmItemDesc(__amctgyItemStatus.idx); } break; @@ -1654,10 +1656,12 @@ HotelTV.ui_appfull = (function() { // 테이블 ROW인덱스와 스크롤 OFFSET계산 __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex'); - __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight'); - //스크롤 에니메이션 수행 - _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); + if ( _elTbl_AmItem.children('#record').find('tr').first().position().top<0 ){ + __amctgyItemStatus.scroll_TOfset -= _elTblTr_AmItemNext.prop('scrollHeight'); + //스크롤 에니메이션 수행 + _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); + } __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() { if ( _isNeedSoldOutMask==true ){ @@ -1684,10 +1688,11 @@ HotelTV.ui_appfull = (function() { // 테이블 ROW인덱스와 스크롤 OFFSET계산 __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex'); - __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight'); - - //스크롤 에니메이션 수행 - _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); + if ( __amctgyItemStatus.idx>=12 ){ + __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight'); + //스크롤 에니메이션 수행 + _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); + } __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() { if ( _isNeedSoldOutMask==true ){ @@ -3165,7 +3170,10 @@ HotelTV.ui_appfull = (function() { { case "enter": { _elRsCtgyBgMenuItemWin.find('.rsctgyItem').first().addClass("focus"); + //인덱스 및 스크롤 초기화 __rsctgyItemStatus.idx = 0; + __rsctgyItemStatus.scroll_TOfset = 0; + _elRsCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200); __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx); } break; @@ -3189,10 +3197,12 @@ HotelTV.ui_appfull = (function() { // 테이블 ROW인덱스와 스크롤 OFFSET계산 __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex'); - __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight'); - //스크롤 에니메이션 수행 - _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); + if ( _elTbl_RsItem.children('#record').find('tr').first().position().top<0 ){ + __rsctgyItemStatus.scroll_TOfset -= _elTblTr_RsItemNext.prop('scrollHeight'); + //스크롤 에니메이션 수행 + _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); + } __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() { if ( _isNeedSoldOutMask==true ){ @@ -3219,10 +3229,11 @@ HotelTV.ui_appfull = (function() { // 테이블 ROW인덱스와 스크롤 OFFSET계산 __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex'); - __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight'); - - //스크롤 에니메이션 수행 - _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); + if ( __rsctgyItemStatus.idx>=12 ){ + __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight'); + //스크롤 에니메이션 수행 + _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); + } __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() { if ( _isNeedSoldOutMask==true ){ diff --git a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css index 8b8b803..b37ea7e 100755 --- a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css +++ b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css @@ -564,7 +564,7 @@ } .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody { - /* height: 285px; */ + height: 670px; overflow-y: auto; display: block; } @@ -1291,7 +1291,8 @@ height: 132px; margin: 0; padding: 0px 20px 0px 48px; - color: rgb(245,245,245); + /* color: rgb(245,245,245); */ + color: rgb(181, 218, 16); line-height: 32px; font-size: 32px; z-index: 1; @@ -1714,7 +1715,7 @@ } .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody { - /* height: 285px; */ + height: 670px; overflow-y: auto; display: block; } @@ -2441,7 +2442,8 @@ height: 132px; margin: 0; padding: 0px 20px 0px 48px; - color: rgb(245,245,245); + /* color: rgb(245,245,245); */ + color: rgb(181, 218, 16); line-height: 32px; font-size: 32px; z-index: 1;