Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r32971 -r32978 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32971) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32978) @@ -816,8 +816,13 @@ success : function(response, options) { var result = Ext.decode(response.responseText); if(result.success){ - document.getElementById('msgLabel').innerHTML = result.message; - document.getElementById('msgLabel').style.display = 'block'; + if(window.screen.width < 1366){ + document.getElementById('msgLabel2').innerHTML = result.message; + document.getElementById('msgLabel2').style.display = 'block'; + }else { + document.getElementById('msgLabel').innerHTML = result.message; + document.getElementById('msgLabel').style.display = 'block'; + } } }, failure : function(response, options) {} @@ -892,11 +897,13 @@ } html += ''; } - html += ''; - html += ''; if(window.screen.width < 1366){ + html += ''; + html += ''; document.getElementById('progressBars_2').innerHTML = html; }else { + html += ''; + html += ''; document.getElementById('progressBars_1').innerHTML = html; } } @@ -1930,12 +1937,14 @@ minWidth : 30, handleMouseEvents : false },{ - id:'progressBars_1' + id:'progressBars_1', + text : '' }]; var progressBarTbar = new Ext.Toolbar({ items:[{ - id:'progressBars_2' + id:'progressBars_2', + text : '' }] }) @@ -1977,15 +1986,6 @@ } getprogressStatus(arr,titleArr); - }else if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule){ - var html = '
'; - html += ''; - html += '
'; - if(window.screen.width < 1366){ - document.getElementById('progressBars_2').innerHTML = html; - }else { - document.getElementById('progressBars_1').innerHTML = html; - } } } } @@ -2021,8 +2021,13 @@ success : function(response, options) { var result = Ext.decode(response.responseText); if(result.success){ - document.getElementById('msgLabel').innerHTML = result.message; - document.getElementById('msgLabel').style.display = 'block'; + if(window.screen.width < 1366){ + document.getElementById('msgLabel2').innerHTML = result.message; + document.getElementById('msgLabel2').style.display = 'block'; + }else { + document.getElementById('msgLabel').innerHTML = result.message; + document.getElementById('msgLabel').style.display = 'block'; + } } }, failure : function(response, options) {}