Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2017-03-10 21:41:16 +01:00
parent fa40875faa
commit b8b4698c3f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/auction_listing.lua
+9 -10
View File
@@ -674,16 +674,16 @@ local methods = {
local prevRecord = records[i - 1] local prevRecord = records[i - 1]
if prevRecord and record.search_signature == prevRecord.search_signature then if prevRecord and record.search_signature == prevRecord.search_signature then
-- it's an identical auction to the previous row so increment the number of auctions -- it's an identical auction to the previous row so increment the number of auctions
self.rowInfo[getn(self.rowInfo)].children[getn(self.rowInfo[getn(self.rowInfo)].children)].numAuctions = self.rowInfo[getn(self.rowInfo)].children[getn(self.rowInfo[getn(self.rowInfo)].children)].numAuctions + 1 self.rowInfo[getn(self.rowInfo)].children[getn(self.rowInfo[getn(self.rowInfo)].children)].count = self.rowInfo[getn(self.rowInfo)].children[getn(self.rowInfo[getn(self.rowInfo)].children)].count + 1
elseif not single_item and prevRecord and record.item_key == prevRecord.item_key then elseif not single_item and prevRecord and record.item_key == prevRecord.item_key then
-- it's the same base item as the previous row so insert a new auction -- it's the same base item as the previous row so insert a new auction
tinsert(self.rowInfo[getn(self.rowInfo)].children, O('numAuctions', 1, 'record', record)) tinsert(self.rowInfo[getn(self.rowInfo)].children, O('count', 1, 'record', record))
if self.expanded[self.rowInfo[getn(self.rowInfo)].expandKey] then if self.expanded[self.rowInfo[getn(self.rowInfo)].expandKey] then
self.rowInfo.numDisplayRows = self.rowInfo.numDisplayRows + 1 self.rowInfo.numDisplayRows = self.rowInfo.numDisplayRows + 1
end end
else else
-- it's a different base item from the previous row -- it's a different base item from the previous row
tinsert(self.rowInfo, O('item_key', record.item_key, 'expandKey', record.item_key, 'children', A(O('numAuctions', 1, 'record', record)))) tinsert(self.rowInfo, O('item_key', record.item_key, 'expandKey', record.item_key, 'children', A(O('count', 1, 'record', record))))
self.rowInfo.numDisplayRows = self.rowInfo.numDisplayRows + 1 self.rowInfo.numDisplayRows = self.rowInfo.numDisplayRows + 1
end end
end end
@@ -692,9 +692,9 @@ local methods = {
local info = self.rowInfo[i] local info = self.rowInfo[i]
local totalAuctions, totalPlayerAuctions = 0, 0 local totalAuctions, totalPlayerAuctions = 0, 0
for _, childInfo in info.children do for _, childInfo in info.children do
totalAuctions = totalAuctions + childInfo.numAuctions totalAuctions = totalAuctions + childInfo.count
if is_player(childInfo.record.owner) then if is_player(childInfo.record.owner) then
totalPlayerAuctions = totalPlayerAuctions + childInfo.numAuctions totalPlayerAuctions = totalPlayerAuctions + childInfo.count
end end
end end
info.totalAuctions = totalAuctions info.totalAuctions = totalAuctions
@@ -772,17 +772,17 @@ local methods = {
if self.expanded[info.expandKey] then if self.expanded[info.expandKey] then
for j = 1, getn(info.children) do for j = 1, getn(info.children) do
local childInfo = info.children[j] local childInfo = info.children[j]
self:SetRowInfo(rowIndex, childInfo.record, childInfo.numAuctions, 0, j > 1, false, info.expandKey, childInfo.numAuctions) self:SetRowInfo(rowIndex, childInfo.record, childInfo.count, 0, j > 1, false, info.expandKey)
rowIndex = rowIndex + 1 rowIndex = rowIndex + 1
end end
else else
self:SetRowInfo(rowIndex, info.children[1].record, info.totalAuctions, getn(info.children) > 1 and info.totalPlayerAuctions or 0, false, getn(info.children) > 1, info.expandKey, info.children[1].numAuctions) self:SetRowInfo(rowIndex, info.children[1].record, info.totalAuctions, getn(info.children) > 1 and info.totalPlayerAuctions or 0, false, getn(info.children) > 1, info.expandKey)
rowIndex = rowIndex + 1 rowIndex = rowIndex + 1
end end
end end
end, end,
SetRowInfo = function(self, rowIndex, record, displayNumAuctions, numPlayerAuctions, indented, expandable, expandKey, numAuctions) SetRowInfo = function(self, rowIndex, record, totalAuctions, totalPlayerAuctions, indented, expandable, expandKey)
if rowIndex <= 0 or rowIndex > getn(self.rows) then return end if rowIndex <= 0 or rowIndex > getn(self.rows) then return end
local row = self.rows[rowIndex] local row = self.rows[rowIndex]
row:Show() row:Show()
@@ -795,11 +795,10 @@ local methods = {
row.record = record row.record = record
row.expandable = expandable row.expandable = expandable
row.indented = indented row.indented = indented
row.numAuctions = numAuctions
row.expandKey = expandKey row.expandKey = expandKey
for i, column in self.columns do for i, column in self.columns do
column.fill(row.cells[i], record, displayNumAuctions, numPlayerAuctions, expandable, indented) column.fill(row.cells[i], record, totalAuctions, totalPlayerAuctions, expandable, indented)
end end
end, end,