diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/imgui_extensions.cpp | 14 | ||||
| -rw-r--r-- | src/ui/ui_contacts.cpp | 22 | ||||
| -rw-r--r-- | src/ui/ui_earnings.cpp | 4 | ||||
| -rw-r--r-- | src/ui/ui_expenses.cpp | 38 | ||||
| -rw-r--r-- | src/ui/ui_invoices.cpp | 54 | ||||
| -rw-r--r-- | src/ui/ui_main.cpp | 2 | ||||
| -rw-r--r-- | src/ui/ui_projects.cpp | 24 | ||||
| -rw-r--r-- | src/ui/ui_settings.cpp | 36 |
8 files changed, 97 insertions, 97 deletions
diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp index a283ad4..5a00648 100644 --- a/src/ui/imgui_extensions.cpp +++ b/src/ui/imgui_extensions.cpp @@ -221,7 +221,7 @@ namespace ImGui ImGui::SetNextItemWidth(widthAvailable*0.5f); contact autocomplete_list[5]; - int autocomplete_count = administration_contact_get_autocompletions(autocomplete_list, 5, buffer->name); + int autocomplete_count = administration::contact_get_autocompletions(autocomplete_list, 5, buffer->name); char* autocomplete_strings[5]; for (int i = 0; i < autocomplete_count; i++) @@ -246,11 +246,11 @@ namespace ImGui void FormCostCenterCombo(char* costcenter_id) { - u32 costcenter_count = administration_cost_center_count(); + u32 costcenter_count = administration::cost_center_count(); cost_center* buffer = (cost_center*) malloc(sizeof(cost_center) * costcenter_count); cost_center* selected_costcenter = NULL; - costcenter_count = administration_cost_center_get_all(buffer); + costcenter_count = administration::cost_center_get_all(buffer); // Select cost center by given id. if (strlen(costcenter_id) > 0) @@ -287,11 +287,11 @@ namespace ImGui void FormProjectCombo(char* project_id) { - u32 project_count = administration_project_count(); + u32 project_count = administration::project_count(); project* buffer = (project*) malloc(sizeof(project) * project_count); project* selected_project = NULL; - project_count = administration_project_get_all(buffer); + project_count = administration::project_get_all(buffer); // Select project by given id. if (strlen(project_id) > 0) @@ -328,12 +328,12 @@ namespace ImGui void FormTaxRateCombo(char* tax_rate_id, char* orig_country, char* dest_country, bool has_error) { - u32 tax_rate_count = administration_tax_rate_count(); + u32 tax_rate_count = administration::tax_rate_count(); tax_rate* buffer = (tax_rate*) malloc(sizeof(tax_rate) * tax_rate_count); tax_rate* selected_tax_rate = NULL; char* tax_country_codes[2] = {orig_country, dest_country}; - tax_rate_count = administration_tax_rate_get_by_country(buffer, strcmp(orig_country, dest_country) == 0 ? 1 : 2, tax_country_codes); + tax_rate_count = administration::tax_rate_get_by_country(buffer, strcmp(orig_country, dest_country) == 0 ? 1 : 2, tax_country_codes); // Select tax rate by given id. if (strlen(tax_rate_id) > 0) diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp index c205c87..03fcee0 100644 --- a/src/ui/ui_contacts.cpp +++ b/src/ui/ui_contacts.cpp @@ -44,13 +44,13 @@ void draw_address_form(address* buffer, a_err last_err) void ui::setup_contacts() { current_view_state = ui::view_state::LIST_ALL; - active_contact = active_contact = administration_contact_create_empty(); + active_contact = active_contact = administration::contact_create_empty(); memset(&selected_for_removal, 0, sizeof(contact)); } void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false) { - a_err last_err = administration_addressee_is_valid(*buffer); + a_err last_err = administration::addressee_is_valid(*buffer); ImGui::PushID(buffer); @@ -69,7 +69,7 @@ void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false) void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false) { - a_err last_err = administration_contact_is_valid(*buffer); + a_err last_err = administration::contact_is_valid(*buffer); ImGui::PushID(buffer); @@ -109,14 +109,14 @@ static void draw_contact_list() { const u32 items_per_page = 50; static s32 current_page = 0; - s32 max_page = (administration_contact_count() + items_per_page - 1) / items_per_page; + s32 max_page = (administration::contact_count() + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; // Table header controls: create button and pagination. if (ImGui::Button(locale::get("form.create"))) { current_view_state = ui::view_state::CREATE; - active_contact = administration_contact_create_empty(); + active_contact = administration::contact_create_empty(); } if (current_page >= max_page-1) current_page = max_page-1; @@ -150,7 +150,7 @@ static void draw_contact_list() ImGui::TableHeadersRow(); contact contact_list[items_per_page]; - u32 contact_count = administration_contact_get_partial_list(current_page, items_per_page, contact_list); + u32 contact_count = administration::contact_get_partial_list(current_page, items_per_page, contact_list); for (u32 i = 0; i < contact_count; i++) { contact c = contact_list[i]; @@ -191,7 +191,7 @@ static void draw_contact_list() ImGui::Separator(); if (ImGui::Button(locale::get("form.yes"), ImVec2(120, 0))) { - administration_contact_remove(selected_for_removal); + administration::contact_remove(selected_for_removal); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); @@ -213,13 +213,13 @@ static void draw_contacts_create() draw_contact_form(&active_contact); - a_err contact_validation_err = administration_contact_is_valid(active_contact); + a_err contact_validation_err = administration::contact_is_valid(active_contact); bool can_save = contact_validation_err == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); // Save button ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_contact_add(active_contact); + administration::contact_add(active_contact); current_view_state = ui::view_state::LIST_ALL; } if (!can_save) ImGui::EndDisabled(); @@ -233,13 +233,13 @@ static void draw_contacts_update() draw_contact_form(&active_contact); - a_err contact_validation_err = administration_contact_is_valid(active_contact); + a_err contact_validation_err = administration::contact_is_valid(active_contact); bool can_save = contact_validation_err == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); // Save button ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_contact_update(active_contact); + administration::contact_update(active_contact); current_view_state = ui::view_state::LIST_ALL; } if (!can_save) ImGui::EndDisabled(); diff --git a/src/ui/ui_earnings.cpp b/src/ui/ui_earnings.cpp index 07c01ef..5e04a61 100644 --- a/src/ui/ui_earnings.cpp +++ b/src/ui/ui_earnings.cpp @@ -27,7 +27,7 @@ income_statement* statement = 0; void ui::setup_earnings() { statement = (income_statement*)malloc(sizeof(income_statement)); - administration_create_income_statement(statement); + administration::create_income_statement(statement); } void ui::destroy_earnings() @@ -59,7 +59,7 @@ void ui::draw_earnings() ImGui::Spacing(); - char* currency_symbol = administration_get_currency_symbol_for_currency(administration_get_default_currency()); + char* currency_symbol = administration::get_currency_symbol_for_currency(administration::get_default_currency()); if (ImGui::BeginTable("QuarterlyResultsTable", 5, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Hideable)) { diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp index a63cd50..e4441ef 100644 --- a/src/ui/ui_expenses.cpp +++ b/src/ui/ui_expenses.cpp @@ -55,7 +55,7 @@ void ui::setup_expenses() current_view_state = ui::view_state::LIST_ALL; } - active_invoice = administration_invoice_create_empty(); + active_invoice = administration::invoice_create_empty(); u32 invoice_items_count = MAX_BILLING_ITEMS; invoice_items_buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items_count); @@ -120,12 +120,12 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false) ImGui::Spacing(); ImGui::Spacing(); - bool max_items_reached = administration_billing_item_count(buffer) >= MAX_BILLING_ITEMS; + bool max_items_reached = administration::billing_item_count(buffer) >= MAX_BILLING_ITEMS; if (max_items_reached) ImGui::BeginDisabled(); if (ImGui::Button(locale::get(locale::get("invoice.form.add")))) { - billing_item item = administration_billing_item_create_empty(); - administration_billing_item_add_to_invoice(buffer, item); + billing_item item = administration::billing_item_create_empty(); + administration::billing_item_add_to_invoice(buffer, item); } if (max_items_reached) ImGui::EndDisabled(); @@ -134,7 +134,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false) ImGui::SameLine(); if (ImGui::FormCurrencyCombo(buffer->currency)) { - administration_invoice_set_currency(buffer, buffer->currency); + administration::invoice_set_currency(buffer, buffer->currency); } draw_invoice_items_form(buffer); @@ -144,7 +144,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false) static void draw_expenses_list() { - if (!administration_can_create_invoices()) { + if (!administration::can_create_invoices()) { ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 102, 204, 255)); // blue ImGui::Text(locale::get("ui.invoiceRequirementP1")); ImGui::PopStyleColor(); @@ -165,8 +165,8 @@ static void draw_expenses_list() static s32 current_page = 0; invoice invoice_list[items_per_page]; - u32 invoice_count = administration_invoice_get_partial_list_incomming(current_page, items_per_page, invoice_list); - u32 total_invoice_count = administration_invoice_get_incomming_count(); + u32 invoice_count = administration::invoice_get_partial_list_incomming(current_page, items_per_page, invoice_list); + u32 total_invoice_count = administration::invoice_get_incomming_count(); s32 max_page = (total_invoice_count + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; @@ -175,8 +175,8 @@ static void draw_expenses_list() if (ImGui::Button(locale::get("form.create"))) { current_view_state = ui::view_state::CREATE; - active_invoice = administration_invoice_create_empty(); // @leak - active_invoice.customer = administration_company_info_get(); + active_invoice = administration::invoice_create_empty(); // @leak + active_invoice.customer = administration::company_info_get(); active_invoice.is_outgoing = 0; active_invoice.status = invoice_status::INVOICE_RECEIVED; } @@ -185,8 +185,8 @@ static void draw_expenses_list() ImGui::SameLine(); if (ImGui::FormInvoiceFileSelector("+ Import", import_file_path)) { // @locale::get current_view_state = ui::view_state::VIEW_IMPORT_REQUEST; - active_invoice = administration_invoice_create_empty(); // @leak - active_invoice.customer = administration_company_info_get(); + active_invoice = administration::invoice_create_empty(); // @leak + active_invoice.customer = administration::company_info_get(); active_invoice.is_outgoing = 0; active_invoice.status = invoice_status::INVOICE_RECEIVED; @@ -240,7 +240,7 @@ static void draw_expenses_list() ImGui::TableSetColumnIndex(3); ImGui::Text(buf); ImGui::TableSetColumnIndex(4); ImGui::Text("%.2f %s", c.total, c.currency); - ImGui::TableSetColumnIndex(5); ImGui::Text("%s", locale::get(administration_invoice_get_status_string(&c))); + ImGui::TableSetColumnIndex(5); ImGui::Text("%s", locale::get(administration::invoice_get_status_string(&c))); ImGui::TableSetColumnIndex(6); char btn_name[20]; @@ -254,7 +254,7 @@ static void draw_expenses_list() snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.change"), i); if (ImGui::Button(btn_name)) { - active_invoice = administration_invoice_create_copy(&c); // We create a copy because of billing item list pointers. + active_invoice = administration::invoice_create_copy(&c); // We create a copy because of billing item list pointers. current_view_state = ui::view_state::EDIT_EXISTING; } @@ -272,7 +272,7 @@ static void draw_expenses_list() ImGui::Separator(); if (ImGui::Button(locale::get("form.yes"), ImVec2(120, 0))) { - administration_invoice_remove(&selected_for_removal); + administration::invoice_remove(&selected_for_removal); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); @@ -295,12 +295,12 @@ static void draw_expense_update() draw_expense_form(&active_invoice); - bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; + bool can_save = administration::invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_invoice_update(&active_invoice); + administration::invoice_update(&active_invoice); current_view_state = ui::view_state::LIST_ALL; @@ -319,12 +319,12 @@ static void draw_expense_create() draw_expense_form(&active_invoice); - bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; + bool can_save = administration::invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_invoice_add(&active_invoice); + administration::invoice_add(&active_invoice); current_view_state = ui::view_state::LIST_ALL; diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp index 1a039b9..191cd7d 100644 --- a/src/ui/ui_invoices.cpp +++ b/src/ui/ui_invoices.cpp @@ -46,7 +46,7 @@ void ui::destroy_invoices() void ui::setup_invoices() { current_view_state = ui::view_state::LIST_ALL; - active_invoice = administration_invoice_create_empty(); + active_invoice = administration::invoice_create_empty(); u32 invoice_items_count = MAX_BILLING_ITEMS; invoice_items_buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items_count); @@ -55,7 +55,7 @@ void ui::setup_invoices() void draw_invoice_items_form(invoice* invoice) { billing_item* buffer = invoice_items_buffer; - u32 invoice_items = administration_billing_item_get_all_for_invoice(invoice, buffer); + u32 invoice_items = administration::billing_item_get_all_for_invoice(invoice, buffer); if (ImGui::BeginTable("TableBillingItems", 9, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) { @@ -74,7 +74,7 @@ void draw_invoice_items_form(invoice* invoice) for (u32 i = 0; i < invoice_items; i++) { billing_item item = buffer[i]; - a_err valid = administration_billing_item_is_valid(item); + a_err valid = administration::billing_item_is_valid(item); ImGui::TableNextRow(); @@ -83,7 +83,7 @@ void draw_invoice_items_form(invoice* invoice) ImGui::TableSetColumnIndex(0); if (ImGui::Button("X")) { - administration_billing_item_remove_from_invoice(invoice, item); + administration::billing_item_remove_from_invoice(invoice, item); } ImGui::TableSetColumnIndex(1); @@ -125,7 +125,7 @@ void draw_invoice_items_form(invoice* invoice) ImGui::PopID(); - administration_billing_item_update_in_invoice(invoice, item); + administration::billing_item_update_in_invoice(invoice, item); } ImGui::TableNextRow(); @@ -140,32 +140,32 @@ void draw_invoice_items_form(invoice* invoice) ImGui::TableSetColumnIndex(8); ImGui::Text("%.2f %s", invoice->orig_total, invoice->currency); - if (strcmp(invoice->currency, administration_get_default_currency()) != 0) { + if (strcmp(invoice->currency, administration::get_default_currency()) != 0) { ImGui::TableNextRow(); ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, IM_COL32(50, 50, 50, 255)); ImGui::TableSetColumnIndex(2); - ImGui::Text("%s %s", locale::get("invoice.form.finalSettlement"), administration_get_default_currency()); + ImGui::Text("%s %s", locale::get("invoice.form.finalSettlement"), administration::get_default_currency()); ImGui::TableSetColumnIndex(4); ImGui::InputFloat("##final_allowance", &invoice->allowance, 0.0f, 0.0f, "%.2f"); ImGui::SameLine(); - ImGui::Text("%s", administration_get_default_currency()); + ImGui::Text("%s", administration::get_default_currency()); ImGui::TableSetColumnIndex(5); ImGui::InputFloat("##final_net", &invoice->net, 0.0f, 0.0f, "%.2f"); ImGui::SameLine(); - ImGui::Text("%s", administration_get_default_currency()); + ImGui::Text("%s", administration::get_default_currency()); ImGui::TableSetColumnIndex(7); ImGui::InputFloat("##final_tax", &invoice->tax, 0.0f, 0.0f, "%.2f"); ImGui::SameLine(); - ImGui::Text("%s", administration_get_default_currency()); + ImGui::Text("%s", administration::get_default_currency()); ImGui::TableSetColumnIndex(8); ImGui::InputFloat("##final_total", &invoice->total, 0.0f, 0.0f, "%.2f"); ImGui::SameLine(); - ImGui::Text("%s", administration_get_default_currency()); + ImGui::Text("%s", administration::get_default_currency()); } ImGui::EndTable(); @@ -229,12 +229,12 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false) ImGui::Spacing(); ImGui::Spacing(); - bool max_items_reached = administration_billing_item_count(buffer) >= MAX_BILLING_ITEMS; + bool max_items_reached = administration::billing_item_count(buffer) >= MAX_BILLING_ITEMS; if (max_items_reached) ImGui::BeginDisabled(); if (ImGui::Button(locale::get(locale::get("invoice.form.add")))) { - billing_item item = administration_billing_item_create_empty(); - administration_billing_item_add_to_invoice(buffer, item); + billing_item item = administration::billing_item_create_empty(); + administration::billing_item_add_to_invoice(buffer, item); } if (max_items_reached) ImGui::EndDisabled(); @@ -243,7 +243,7 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false) ImGui::SameLine(); if (ImGui::FormCurrencyCombo(buffer->currency)) { - administration_invoice_set_currency(buffer, buffer->currency); + administration::invoice_set_currency(buffer, buffer->currency); } draw_invoice_items_form(buffer); @@ -253,7 +253,7 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false) static void draw_invoices_list() { - if (!administration_can_create_invoices()) { + if (!administration::can_create_invoices()) { ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 102, 204, 255)); // blue ImGui::Text(locale::get("ui.invoiceRequirementP1")); ImGui::PopStyleColor(); @@ -274,8 +274,8 @@ static void draw_invoices_list() static s32 current_page = 0; invoice invoice_list[items_per_page]; - u32 invoice_count = administration_invoice_get_partial_list_outgoing(current_page, items_per_page, invoice_list); - u32 total_invoice_count = administration_invoice_get_outgoing_count(); + u32 invoice_count = administration::invoice_get_partial_list_outgoing(current_page, items_per_page, invoice_list); + u32 total_invoice_count = administration::invoice_get_outgoing_count(); s32 max_page = (total_invoice_count + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; @@ -284,8 +284,8 @@ static void draw_invoices_list() if (ImGui::Button(locale::get("form.create"))) { current_view_state = ui::view_state::CREATE; - active_invoice = administration_invoice_create_empty(); // @leak - active_invoice.supplier = administration_company_info_get(); + active_invoice = administration::invoice_create_empty(); // @leak + active_invoice.supplier = administration::company_info_get(); active_invoice.is_outgoing = 1; active_invoice.status = invoice_status::INVOICE_CONCEPT; } @@ -337,7 +337,7 @@ static void draw_invoices_list() ImGui::TableSetColumnIndex(3); ImGui::Text(buf); ImGui::TableSetColumnIndex(4); ImGui::Text("%.2f %s", c.total, c.currency); - ImGui::TableSetColumnIndex(5); ImGui::Text("%s", locale::get(administration_invoice_get_status_string(&c))); + ImGui::TableSetColumnIndex(5); ImGui::Text("%s", locale::get(administration::invoice_get_status_string(&c))); ImGui::TableSetColumnIndex(6); char btn_name[20]; @@ -353,7 +353,7 @@ static void draw_invoices_list() { snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.change"), i); if (ImGui::Button(btn_name)) { - active_invoice = administration_invoice_create_copy(&c); // We create a copy because of billing item list pointers. + active_invoice = administration::invoice_create_copy(&c); // We create a copy because of billing item list pointers. current_view_state = ui::view_state::EDIT_EXISTING; } @@ -372,7 +372,7 @@ static void draw_invoices_list() ImGui::Separator(); if (ImGui::Button(locale::get("form.yes"), ImVec2(120, 0))) { - administration_invoice_remove(&selected_for_removal); + administration::invoice_remove(&selected_for_removal); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); @@ -395,12 +395,12 @@ static void draw_invoice_update() draw_invoice_form(&active_invoice); - bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; + bool can_save = administration::invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_invoice_update(&active_invoice); + administration::invoice_update(&active_invoice); current_view_state = ui::view_state::LIST_ALL; @@ -419,12 +419,12 @@ static void draw_invoice_create() draw_invoice_form(&active_invoice); - bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; + bool can_save = administration::invoice_is_valid(&active_invoice) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_invoice_add(&active_invoice); + administration::invoice_add(&active_invoice); current_view_state = ui::view_state::LIST_ALL; diff --git a/src/ui/ui_main.cpp b/src/ui/ui_main.cpp index b54ca62..9e6aeb8 100644 --- a/src/ui/ui_main.cpp +++ b/src/ui/ui_main.cpp @@ -152,7 +152,7 @@ void ui::draw_main() ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoCollapse); - char* path = administration_get_file_path(); + char* path = administration::get_file_path(); if (path == NULL) { ImGui::Text("%s: %s", locale::get("ui.workingOn"), locale::get("ui.unsavedProject")); } diff --git a/src/ui/ui_projects.cpp b/src/ui/ui_projects.cpp index be0cc2a..f9f494d 100644 --- a/src/ui/ui_projects.cpp +++ b/src/ui/ui_projects.cpp @@ -30,7 +30,7 @@ static project active_project; void ui::setup_projects() { current_view_state = ui::view_state::LIST_ALL; - active_project = administration_project_create_empty(); + active_project = administration::project_create_empty(); } static void draw_project_form() @@ -41,14 +41,14 @@ static void draw_project_form() if (ImGui::Button(locale::get("form.back"))) { current_view_state = ui::view_state::LIST_ALL; - active_project = administration_project_create_empty(); + active_project = administration::project_create_empty(); selected_country = 0; return; } ImGui::Spacing(); ImGui::BeginDisabled(); - a_err last_err = administration_project_is_valid(active_project); + a_err last_err = administration::project_is_valid(active_project); ImGui::SetNextItemWidth(widthAvailable*0.2f); ImGui::InputText(locale::get("project.form.identifier"), active_project.id, IM_ARRAYSIZE(active_project.id)); @@ -59,23 +59,23 @@ static void draw_project_form() if (viewing_only) ImGui::EndDisabled(); if (!viewing_only) { - bool can_save = administration_project_is_valid(active_project) == A_ERR_SUCCESS; + bool can_save = administration::project_is_valid(active_project) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); // Save button ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { if (current_view_state == ui::view_state::CREATE) { - administration_project_add(active_project); + administration::project_add(active_project); } else if (current_view_state == ui::view_state::EDIT_EXISTING) { - administration_project_update(active_project); + administration::project_update(active_project); } current_view_state = ui::view_state::LIST_ALL; selected_country = 0; - active_project = administration_project_create_empty(); + active_project = administration::project_create_empty(); } if (!can_save) ImGui::EndDisabled(); } @@ -88,13 +88,13 @@ static void draw_project_list() { const u32 items_per_page = 50; static s32 current_page = 0; - s32 max_page = (administration_project_count() + items_per_page - 1) / items_per_page; + s32 max_page = (administration::project_count() + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; if (ImGui::Button(locale::get("form.create"))) { current_view_state = ui::view_state::CREATE; - active_project = administration_project_create_empty(); + active_project = administration::project_create_empty(); } if (current_page >= max_page-1) current_page = max_page-1; @@ -126,14 +126,14 @@ static void draw_project_list() ImGui::TableHeadersRow(); project project_list[items_per_page]; - u32 project_count = administration_project_get_partial_list(current_page, items_per_page, project_list); + u32 project_count = administration::project_get_partial_list(current_page, items_per_page, project_list); for (u32 i = 0; i < project_count; i++) { project c = project_list[i]; ImGui::TableNextRow(); ImGui::TableSetColumnIndex(0); ImGui::Text(c.id); - ImGui::TableSetColumnIndex(1); ImGui::Text(locale::get(administration_project_get_status_string(c))); + ImGui::TableSetColumnIndex(1); ImGui::Text(locale::get(administration::project_get_status_string(c))); ImGui::TableSetColumnIndex(2); ImGui::Text(c.description); ImGui::TableSetColumnIndex(3); @@ -168,7 +168,7 @@ static void draw_project_list() ImGui::Separator(); if (ImGui::Button(locale::get("form.yes"), ImVec2(120, 0))) { - administration_project_cancel(selected_for_cancellation); + administration::project_cancel(selected_for_cancellation); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp index a6ce57a..cb6cdf5 100644 --- a/src/ui/ui_settings.cpp +++ b/src/ui/ui_settings.cpp @@ -46,17 +46,17 @@ void ui::destroy_settings() void ui::setup_settings() { select_company_tab = 1; - company_info = administration_company_info_get(); + company_info = administration::company_info_get(); - tax_rate_count = administration_tax_rate_count(); + tax_rate_count = administration::tax_rate_count(); tax_rates = (tax_rate*)malloc(tax_rate_count * sizeof(tax_rate)); - administration_tax_rate_get_all(tax_rates); + administration::tax_rate_get_all(tax_rates); - cost_center_count = administration_cost_center_count(); + cost_center_count = administration::cost_center_count(); cost_centers = (cost_center*)malloc(cost_center_count * sizeof(cost_center)); - administration_cost_center_get_all(cost_centers); + administration::cost_center_get_all(cost_centers); - new_service = administration_get_ai_service(); + new_service = administration::get_ai_service(); } static void draw_vat_rates() @@ -117,7 +117,7 @@ static void draw_vat_rates() if (ImGui::Button(btn_name, ImVec2(20,20))) { is_adding_item = true; is_editing_item = false; - new_tax_rate = administration_tax_rate_create_empty(); + new_tax_rate = administration::tax_rate_create_empty(); strops::copy(new_tax_rate.country_code, c.country_code, 3); } ImGui::PopStyleVar(); @@ -149,7 +149,7 @@ static void draw_vat_rates() is_editing_item = false; is_adding_item = false; - administration_tax_rate_update(new_tax_rate); + administration::tax_rate_update(new_tax_rate); ui::destroy_settings(); ui::setup_settings(); @@ -195,7 +195,7 @@ static void draw_vat_rates() is_editing_item = false; is_adding_item = false; - administration_tax_rate_add(new_tax_rate); + administration::tax_rate_add(new_tax_rate); ui::destroy_settings(); ui::setup_settings(); @@ -240,7 +240,7 @@ static void draw_cost_centers() ImGui::TableSetColumnIndex(1); if (is_editing_item && editing_item_index == i) { - bool is_desc_valid = !(administration_cost_center_is_valid(new_cost_center) & A_ERR_MISSING_DESCRIPTION); + bool is_desc_valid = !(administration::cost_center_is_valid(new_cost_center) & A_ERR_MISSING_DESCRIPTION); if (!is_desc_valid) ImGui::PushStyleColor(ImGuiCol_FrameBg, IM_COL32(105, 43, 43, 255)); ImGui::InputText("##Description", new_cost_center.description, IM_ARRAYSIZE(new_cost_center.description)); if (!is_desc_valid) ImGui::PopStyleColor(); @@ -251,7 +251,7 @@ static void draw_cost_centers() is_editing_item = false; is_adding_item = false; - administration_cost_center_update(new_cost_center); + administration::cost_center_update(new_cost_center); memset(&new_cost_center, 0, sizeof(new_cost_center)); @@ -287,13 +287,13 @@ static void draw_cost_centers() { ImGui::TableNextRow(); - bool is_code_valid = !(administration_cost_center_is_valid(new_cost_center) & (A_ERR_CODE_EXISTS|A_ERR_MISSING_CODE)); + bool is_code_valid = !(administration::cost_center_is_valid(new_cost_center) & (A_ERR_CODE_EXISTS|A_ERR_MISSING_CODE)); if (!is_code_valid) ImGui::PushStyleColor(ImGuiCol_FrameBg, IM_COL32(105, 43, 43, 255)); ImGui::TableSetColumnIndex(0); ImGui::InputText("##Code", new_cost_center.code, IM_ARRAYSIZE(new_cost_center.code), ImGuiInputTextFlags_CharsUppercase|ImGuiInputTextFlags_CharsNoBlank); if (!is_code_valid) ImGui::PopStyleColor(); - bool is_desc_valid = !(administration_cost_center_is_valid(new_cost_center) & A_ERR_MISSING_DESCRIPTION); + bool is_desc_valid = !(administration::cost_center_is_valid(new_cost_center) & A_ERR_MISSING_DESCRIPTION); if (!is_desc_valid) ImGui::PushStyleColor(ImGuiCol_FrameBg, IM_COL32(105, 43, 43, 255)); ImGui::TableSetColumnIndex(1); ImGui::InputText("##Description", new_cost_center.description, IM_ARRAYSIZE(new_cost_center.description)); if (!is_desc_valid) ImGui::PopStyleColor(); @@ -306,7 +306,7 @@ static void draw_cost_centers() { is_adding_item = false; is_editing_item = false; - administration_cost_center_add(new_cost_center); + administration::cost_center_add(new_cost_center); ui::destroy_settings(); ui::setup_settings(); @@ -327,7 +327,7 @@ static void draw_cost_centers() // If not adding a new item already, show create button at bottom of list. if (!is_adding_item && ImGui::Button(locale::get("form.create"))) { - new_cost_center = administration_cost_center_create_empty(); + new_cost_center = administration::cost_center_create_empty(); is_adding_item = true; is_editing_item = false; } @@ -360,7 +360,7 @@ static void draw_services() new_service.api_key_public, sizeof(new_service.api_key_public)); if (ImGui::Button(locale::get("form.save"))) { - administration_set_ai_service(new_service); + administration::set_ai_service(new_service); } } } @@ -375,11 +375,11 @@ void ui::draw_settings() draw_contact_form(&company_info); // Save button. - bool can_save = administration_contact_is_valid(company_info) == A_ERR_SUCCESS; + bool can_save = administration::contact_is_valid(company_info) == A_ERR_SUCCESS; if (!can_save) ImGui::BeginDisabled(); ImGui::Spacing(); if (ImGui::Button(locale::get("form.save"))) { - administration_company_info_set(company_info); + administration::company_info_set(company_info); } if (!can_save) ImGui::EndDisabled(); |
