Schaffenburg/abrechenbarkeit
3
0
Fork 0
mirror of https://codeberg.org/metamuffin/abrechenbarkeit.git synced 2025-01-01 09:14:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

seems to work like before now

Browse source
This commit is contained in:
metamuffin 2024-11-05 01:36:00 +01:00
parent 83275a5131
commit 8e573eb73b
No known key found for this signature in database
GPG key ID: 718F9749DCDBD654
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
abrechenbarkeit.lua
View file

@ -22,6 +22,7 @@
local matchers = { local matchers = {
time = "(%d+)", time = "(%d+)",
user = "([%w_@ -]+)", user = "([%w_@ -]+)",
user_opt = "([%w_@ -]*)",
amount = "(-?%d+)", amount = "(-?%d+)",
amount_opt = "(-?%d*)", amount_opt = "(-?%d*)",
comment = "([%w_ -]+)", comment = "([%w_ -]+)",
@ -50,7 +51,7 @@ end
local function urlencode(s) local function urlencode(s)
if s == nil then return nil end if s == nil then return nil end
return s:gsub("[^%w]", return s:gsub("[^%w]",
function(cap) return string.format("%02x", string.byte(cap, 1)) end) function(cap) return string.format("%%%02x", string.byte(cap, 1)) end)
end end
local function parse_query(q) local function parse_query(q)
@ -255,7 +256,7 @@ local function read_products()
if l == "" or l == nil then if l == "" or l == nil then
return nil return nil
end end
local barcode, price, user, name = string.match(l, format("^{barcode},{amount},{user}?,{name}$", matchers)) local barcode, price, user, name = string.match(l, format("^{barcode},{amount},{user_opt},{name}$", matchers))
return barcode, tonumber(price), user, name return barcode, tonumber(price), user, name
end end
end end
@ -326,7 +327,7 @@ local function r_transaction_post()
if p_barcode == pcode then if p_barcode == pcode then
pcount = (tonumber(data.pcount) or 1) * (data.negate_pcount ~= nil and -1 or 1) pcount = (tonumber(data.pcount) or 1) * (data.negate_pcount ~= nil and -1 or 1)
amount = amount or pcount * p_amount amount = amount or pcount * p_amount
user_dst = user_dst or p_user user_src = user_src or p_user
comment = comment or comment = comment or
string.format("%s %d %s", pcount < 0 and "Buy" or "Restock", math.abs(pcount or 0), p_name) string.format("%s %d %s", pcount < 0 and "Buy" or "Restock", math.abs(pcount or 0), p_name)
exists = true exists = true
@ -469,7 +470,7 @@ local function r_log(filter)
print(format([[ print(format([[
<tr> <tr>
<td>{time} ({time_delta})</td> <td>{time} ({time_delta})</td>
<td>{user_src} → {user_dst}</td> <td><a href="/{user_src_url}">{user_src}</a> → <a href="/{user_dst_url}">{user_dst}</a></td>
{amount} {amount}
<td>{pcode}</td> <td>{pcode}</td>
<td>{pcount}</td> <td>{pcount}</td>
@ -491,6 +492,8 @@ local function r_log(filter)
time_delta = format_duration(os.time() - time), time_delta = format_duration(os.time() - time),
user_src = escape(user_src), user_src = escape(user_src),
user_dst = escape(user_dst), user_dst = escape(user_dst),
user_src_url = urlencode(user_src),
user_dst_url = urlencode(user_dst),
amount = format_amount(amount, "td"), amount = format_amount(amount, "td"),
pcode = escape(pcode), pcode = escape(pcode),
pcount = (pcount and (pcount < 0 and "buy " or "stock ") or "") .. pcount = (pcount and (pcount < 0 and "buy " or "stock ") or "") ..
@ -519,7 +522,7 @@ local function r_index()
print([[<div class="userlist"></div>]]) -- for printing print([[<div class="userlist"></div>]]) -- for printing
print([[<ul class="userlist">]]) print([[<ul class="userlist">]])
for _, user in ipairs(get_active_users()) do for _, user in ipairs(get_active_users()) do
if user.name.sub(1, 1) ~= "@" then if user.name:sub(1, 1) ~= "@" then
print(format([[<li> print(format([[<li>
<a href="/{username_url}"> <a href="/{username_url}">
<span class="name">{!username}</span> <span class="name">{!username}</span>
@ -636,7 +639,7 @@ local function r_products()
name = name, name = name,
price = format_amount(-price, "td"), price = format_amount(-price, "td"),
barcode = barcode, barcode = barcode,
count = pbals[barcode] or "0", count = tostring(pbals[barcode] or 0),
user = user, user = user,
})) }))
end end