unstableKitsune/aiolauncher_scripts
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Evgeny
2021-08-24 22:07:33 +03:00
parent 1670598c5a
commit b7682ce258
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
community/currency-widget-ru.lua
View File

@@ -2,9 +2,9 @@
-- description = "Виджет курса валюты. Нажмите на виджет, чтобы изменить валюту. Базовая валюта и дата меняются в контекстном меню." -- description = "Виджет курса валюты. Нажмите на виджет, чтобы изменить валюту. Базовая валюта и дата меняются в контекстном меню."
-- data_source = "https://exchangerate.host/" -- data_source = "https://exchangerate.host/"
-- type = "widget" -- type = "widget"
-- language = "ru"
-- author = "Andrey Gavrilov" -- author = "Andrey Gavrilov"
-- version = "2.0" -- version = "2.0"
-- language = "ru"
local json = require "json" local json = require "json"
local color = require "md_colors" local color = require "md_colors"
@@ -41,15 +41,15 @@ end
function on_network_result(result) function on_network_result(result)
t = json.decode(result) t = json.decode(result)
if t.rates[string.upper(base_curs[base_cur_idx])].end_rate == nil then if t.rates[string.upper(base_cur)].end_rate == nil then
date = prev_date(date) date = prev_date(date)
get_rates(date) get_rates(date)
return return
end end
rate = round(t.rates[string.upper(base_curs[base_cur_idx])].end_rate,4) rate = round(t.rates[string.upper(base_cur)].end_rate,4)
local change = round(-t.rates[string.upper(base_curs[base_cur_idx])].change_pct*100,2) local change = round(-t.rates[string.upper(base_cur)].change_pct*100,2)
line = amount.." "..string.upper(cur).." "..equals.." "..divide_number(rate," ").." "..string.upper(base_curs[base_cur_idx])..get_formatted_change_text(change) line = amount.." "..string.upper(cur).." "..equals.." "..divide_number(rate," ").." "..string.upper(base_cur)..get_formatted_change_text(change)
tab = {{"ᐊ", amount, string.upper(cur), equals, divide_number(rate," "), string.upper(base_curs[base_cur_idx]), get_formatted_change_text(change), "ᐅ"}} tab = {{"ᐊ", amount, string.upper(cur), equals, divide_number(rate," "), string.upper(base_cur), get_formatted_change_text(change), "ᐅ"}}
ui:show_table(tab, 7) ui:show_table(tab, 7)
ui:set_title(ui:get_default_title().." ("..date:gsub("(%d+)-(%d+)-(%d+)", "%3.%2.%1")..")") ui:set_title(ui:get_default_title().." ("..date:gsub("(%d+)-(%d+)-(%d+)", "%3.%2.%1")..")")
end end
@@ -102,17 +102,13 @@ function on_dialog_action(data)
if data == base_cur_idx and base_cur == base_curs[data] then if data == base_cur_idx and base_cur == base_curs[data] then
return return
end end
base_cur_idx = data
if base_curs[data] == "other_b" then if base_curs[data] == "other_b" then
dialog_id = "other_b" dialog_id = "other_b"
ui:show_edit_dialog("Введите базовую валюту", "", string.lower(cur)) ui:show_edit_dialog("Введите базовую валюту", "", string.lower(base_cur))
return return
end end
base_cur = string.upper(base_curs[idx]) base_cur = string.upper(base_curs[data])
elseif dialog_id == "base_cur" then
if data == base_cur_idx and base_cur == base_curs[dats] then
return
end
base_cur_idx = data
elseif dialog_id == "other" then elseif dialog_id == "other" then
if data == cur then if data == cur then
return return
@@ -122,12 +118,15 @@ function on_dialog_action(data)
if data == base_cur then if data == base_cur then
return return
end end
cur = string.upper(data) base_cur = string.upper(data)
elseif dialog_id == "amount" then elseif dialog_id == "amount" then
if amount == data:gsub(",",".") then if amount == data:gsub(",",".") then
return return
end end
amount = data:gsub(",","."):gsub("-","") amount = data:gsub(",","."):gsub("-","")
if amount == "" then
amount = "1"
end
end end
get_rates(date) get_rates(date)
end end