From 1e37f455305e6f807406f1a9900bdf34de58a554 Mon Sep 17 00:00:00 2001 From: Sebring Date: Wed, 29 Jul 2015 20:08:09 +0200 Subject: [PATCH] Display time delay on total row in tooltip --- script/room.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/script/room.js b/script/room.js index aefb418..a7b3f90 100644 --- a/script/room.js +++ b/script/room.js @@ -901,18 +901,19 @@ var Room = { .addClass('row_val') .text(Engine.getIncomeMsg(income.stores[store], income.delay)) .appendTo(tt); - totalIncome[store] = Number(totalIncome[store]) || 0; - totalIncome[store] += Number(income.stores[store]); + if (totalIncome[store] === undefined || totalIncome[store]['income'] === undefined) { + totalIncome[store] = {}; + totalIncome[store]['income'] = 0; + } + totalIncome[store]['income'] += Number(income.stores[store]); + totalIncome[store]['delay'] = income.delay; } } } if(tt.children().length > 0) { - var total = totalIncome[storeName]; - if (total > 0) { - total = '+'+total; - } + var total = totalIncome[storeName]['income']; $('
').addClass('total row_key').text(_('total')).appendTo(tt); - $('
').addClass('total row_val').text(''+total).appendTo(tt); + $('
').addClass('total row_val').text(Engine.getIncomeMsg(total, totalIncome[storeName]['delay'])).appendTo(tt); tt.appendTo(el); } });