refactor administration api

5 files changed, 61 insertions, 61 deletions

diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp
index eca6ee3..87c021d 100644
--- a/src/ui/ui_contacts.cpp
+++ b/src/ui/ui_contacts.cpp
@@ -71,7 +71,7 @@ void ui_draw_address_form(address* buffer)
 void ui_setup_contacts()
 {
     current_view_state = view_state::LIST;
-    active_contact = active_contact = administration_create_empty_contact();
+    active_contact = active_contact = administration_contact_create_empty();
     memset(&selected_for_removal, 0, sizeof(contact));
 }
 
@@ -94,7 +94,7 @@ void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_
     ImGui::SetNextItemWidth(widthAvailable*0.5f);
     if (with_autocomplete) {
         contact autocomplete_list[5];
-        int autocomplete_count = administration_get_contact_recommendations(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++)
@@ -167,14 +167,14 @@ static void draw_contact_list()
 {
     const u32 items_per_page = 50;
     static s32 current_page = 0;
-    s32 max_page = (administration_get_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(localize("form.create")))
     {
         current_view_state = view_state::CREATE;
-        active_contact = administration_create_empty_contact();
+        active_contact = administration_contact_create_empty();
     }
 
     if (current_page >= max_page-1) current_page = max_page-1;
@@ -208,7 +208,7 @@ static void draw_contact_list()
         ImGui::TableHeadersRow();
 
         contact contact_list[items_per_page];
-        u32 contact_count = administration_get_contacts(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];
@@ -236,7 +236,7 @@ static void draw_contact_list()
             }
 
             ImGui::SameLine();
-            if (administration_can_contact_be_deleted(c))
+            if (administration_contact_can_be_deleted(c))
             {
                 snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.delete"), i);
                 if (ImGui::Button(btn_name)) {
@@ -252,7 +252,7 @@ static void draw_contact_list()
             ImGui::Separator();
 
             if (ImGui::Button(localize("form.yes"), ImVec2(120, 0))) { 
-                administration_remove_contact(selected_for_removal);
+                administration_contact_remove(selected_for_removal);
                 ImGui::CloseCurrentPopup();
             }
             ImGui::SameLine();
@@ -274,12 +274,12 @@ static void ui_draw_contacts_create()
 
     draw_contact_form(&active_contact);
 
-    bool can_save = administration_is_contact_valid(active_contact);
+    bool can_save = administration_contact_is_valid(active_contact);
     if (!can_save) ImGui::BeginDisabled();
     // Save button
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_create_contact(active_contact);
+        administration_contact_add(active_contact);
         current_view_state = view_state::LIST;
     }
     if (!can_save) ImGui::EndDisabled();
@@ -293,12 +293,12 @@ static void ui_draw_contacts_update()
 
     draw_contact_form(&active_contact);
 
-    bool can_save = administration_is_contact_valid(active_contact);
+    bool can_save = administration_contact_is_valid(active_contact);
     if (!can_save) ImGui::BeginDisabled();
     // Save button
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_update_contact(active_contact);
+        administration_contact_update(active_contact);
         current_view_state = view_state::LIST;
     }
     if (!can_save) ImGui::EndDisabled();
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 5d89479..acf0de7 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -30,12 +30,12 @@ void ui_destroy_invoices()
 void ui_setup_invoices()
 {
     current_view_state = view_state::LIST;
-    active_invoice = administration_create_empty_invoice();
+    active_invoice = administration_invoice_create_empty();
 
-    u32 costcenter_count = administration_get_cost_center_count();
+    u32 costcenter_count = administration_cost_center_count();
     cost_center_list_buffer = (cost_center*) malloc(sizeof(cost_center) * costcenter_count); // @leak
 
-    u32 tax_bracket_count = administration_get_tax_bracket_count();
+    u32 tax_bracket_count = administration_tax_bracket_count();
     tax_bracket_list_buffer = (country_tax_bracket*) malloc(sizeof(country_tax_bracket) * tax_bracket_count); // @leak
 }
 
@@ -46,7 +46,7 @@ void draw_tax_bracket_selector(char* tax_bracket_id)
     country_tax_bracket* selected_tax_bracket = NULL;
 
     country_tax_bracket* buffer = tax_bracket_list_buffer;
-    u32 tax_bracket_count = administration_get_tax_brackets_for_country(buffer, administration_get_company_info().address.country_code);
+    u32 tax_bracket_count = administration_tax_bracket_get_by_country(buffer, administration_company_info_get().address.country_code);
 
     // Select tax bracket by given id.
     if (strlen(tax_bracket_id) > 0)
@@ -151,7 +151,7 @@ void draw_costcenter_selector(char* costcenter_id)
     cost_center* selected_costcenter = NULL;
 
     cost_center* buffer = cost_center_list_buffer;
-    u32 costcenter_count = administration_get_cost_centers(buffer);
+    u32 costcenter_count = administration_cost_center_get_all(buffer);
 
     // Select cost center by given id.
     if (strlen(costcenter_id) > 0)
@@ -188,9 +188,9 @@ void draw_project_selector(char* project_id)
 {
     project* selected_project = NULL;
 
-    u32 project_count = administration_get_project_count();
+    u32 project_count = administration_project_count();
     project* buffer = (project*) malloc(sizeof(project) * project_count);
-    project_count = administration_get_all_projects(buffer);
+    project_count = administration_project_get_all(buffer);
 
     // Select project by given id.
     if (strlen(project_id) > 0)
@@ -227,9 +227,9 @@ void draw_project_selector(char* project_id)
 
 static void draw_invoice_items_form(invoice* invoice)
 {
-    u32 invoice_items = administration_get_billing_items_count(invoice);
+    u32 invoice_items = administration_billing_items_count(invoice);
     billing_item* buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items);
-    administration_get_all_billing_items_for_invoice(invoice, buffer);
+    administration_billing_item_get_all_for_invoice(invoice, buffer);
 
     if (ImGui::BeginTable("TableBillingItems", 9, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
 
@@ -257,7 +257,7 @@ static void draw_invoice_items_form(invoice* invoice)
             ImGui::TableSetColumnIndex(0);
             if (ImGui::Button("X"))
             {
-                administration_remove_billing_item_from_invoice(invoice, item);
+                administration_billing_item_remove_from_invoice(invoice, item);
             }
             
             ImGui::TableSetColumnIndex(1); 
@@ -328,7 +328,7 @@ static void draw_invoice_items_form(invoice* invoice)
 
             ImGui::PopID();
 
-            administration_update_billing_item_of_invoice(invoice, item);
+            administration_billing_item_update_in_invoice(invoice, item);
         }
 
         ImGui::TableNextRow();
@@ -428,8 +428,8 @@ void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     // 11. New billing item button.
     if (ImGui::Button(localize("+ Billing item")))
     {
-        billing_item item = administration_create_empty_billing_item();
-        administration_add_billing_item_to_invoice(buffer, item);
+        billing_item item = administration_billing_item_create_empty();
+        administration_billing_item_add_to_invoice(buffer, item);
     }
 
     // 12. Dropdown for invoice currency.
@@ -451,15 +451,15 @@ void draw_invoices_list()
 {
     const u32 items_per_page = 50;
     static s32 current_page = 0;
-    s32 max_page = (administration_get_invoice_count() + items_per_page - 1) / items_per_page;
+    s32 max_page = (administration_invoice_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(localize("form.create")))
     {
         current_view_state = view_state::CREATE;
-        active_invoice = administration_create_empty_invoice(); // @leak
-        active_invoice.supplier = administration_get_company_info();
+        active_invoice = administration_invoice_create_empty(); // @leak
+        active_invoice.supplier = administration_company_info_get();
         strops_copy(active_invoice.supplier_id, active_invoice.supplier.id, sizeof(active_invoice.supplier_id));
     }
 
@@ -497,7 +497,7 @@ void draw_invoices_list()
         ImGui::TableHeadersRow();
 
         invoice invoice_list[items_per_page];
-        u32 invoice_count = administration_get_invoices(current_page, items_per_page, invoice_list);
+        u32 invoice_count = administration_invoice_get_partial_list(current_page, items_per_page, invoice_list);
 
         for (u32 i = 0; i < invoice_count; i++) {
             invoice c = invoice_list[i];
@@ -513,7 +513,7 @@ 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", localize(administration_get_invoice_status_string(&c)));
+            ImGui::TableSetColumnIndex(5); ImGui::Text("%s", localize(administration_invoice_get_status_string(&c)));
             ImGui::TableSetColumnIndex(6);
             
             char btn_name[20];
@@ -535,7 +535,7 @@ void draw_invoices_list()
             }
 
             // ImGui::SameLine();
-            // if (administration_can_contact_be_deleted(c))
+            // if (administration_contact_can_be_deleted(c))
             // {
             //     snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.delete"), i);
             //     if (ImGui::Button(btn_name)) {
@@ -551,7 +551,7 @@ void draw_invoices_list()
         //     ImGui::Separator();
 
         //     if (ImGui::Button(localize("form.yes"), ImVec2(120, 0))) { 
-        //         administration_remove_contact(selected_for_removal);
+        //         administration_contact_remove(selected_for_removal);
         //         ImGui::CloseCurrentPopup();
         //     }
         //     ImGui::SameLine();
@@ -574,12 +574,12 @@ static void ui_draw_invoice_update()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_is_invoice_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice);
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_update_invoice(&active_invoice);
+        administration_invoice_update(&active_invoice);
         current_view_state = view_state::LIST;
 
         ui_destroy_invoices();
@@ -597,12 +597,12 @@ static void ui_draw_invoice_create()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_is_invoice_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice);
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_add_invoice(&active_invoice);
+        administration_invoice_add(&active_invoice);
         current_view_state = view_state::LIST;
 
         ui_destroy_invoices();
diff --git a/src/ui/ui_main.cpp b/src/ui/ui_main.cpp
index b4617d1..2d79129 100644
--- a/src/ui/ui_main.cpp
+++ b/src/ui/ui_main.cpp
@@ -125,12 +125,12 @@ void ui_draw_main()
                 ImGuiWindowFlags_NoBringToFrontOnFocus |
                 ImGuiWindowFlags_NoCollapse);
     
-    char* path = administration_get_file_path();
+    char* path = administration_file_path_get();
     if (strlen(path) == 0) {
         ImGui::Text("%s: %s", localize("ui.workingOn"), localize("ui.unsavedProject"));
     }
     else {
-        ImGui::Text("%s: %s", localize("ui.workingOn"), administration_get_file_path());
+        ImGui::Text("%s: %s", localize("ui.workingOn"), administration_file_path_get());
     }
 
     ImGui::End();
diff --git a/src/ui/ui_projects.cpp b/src/ui/ui_projects.cpp
index 3c550a2..8753a94 100644
--- a/src/ui/ui_projects.cpp
+++ b/src/ui/ui_projects.cpp
@@ -13,7 +13,7 @@ static project active_project;
 void ui_setup_projects()
 {
     current_view_state = view_state::LIST;
-    active_project = administration_create_empty_project();
+    active_project = administration_project_create_empty();
 }
 
 static void draw_project_form()
@@ -22,7 +22,7 @@ static void draw_project_form()
 
     if (ImGui::Button(localize("form.back"))) {
         current_view_state = view_state::LIST;
-        active_project = administration_create_empty_project();
+        active_project = administration_project_create_empty();
         selected_country = 0;
         return;
     }
@@ -45,21 +45,21 @@ static void draw_project_form()
     if (viewing_only) ImGui::EndDisabled();
 
     if (!viewing_only) {
-        bool can_save = administration_is_project_valid(active_project);
+        bool can_save = administration_project_is_valid(active_project);
 
         if (!can_save) ImGui::BeginDisabled();
         // Save button
         ImGui::Spacing();
         if (ImGui::Button(localize("form.save"))) {
             if (current_view_state == view_state::CREATE)
-                administration_create_project(active_project);
+                administration_project_add(active_project);
 
             else if (current_view_state == view_state::EDIT)
-                administration_update_project(active_project);
+                administration_project_update(active_project);
 
             current_view_state = view_state::LIST;
             selected_country = 0;
-            active_project = administration_create_empty_project();
+            active_project = administration_project_create_empty();
         }
         if (!can_save) ImGui::EndDisabled();
     }
@@ -72,13 +72,13 @@ static void draw_project_list()
 {
     const u32 items_per_page = 50;
     static s32 current_page = 0;
-    s32 max_page = (administration_get_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(localize("form.create")))
     {
         current_view_state = view_state::CREATE;
-        active_project = administration_create_empty_project();
+        active_project = administration_project_create_empty();
     }
 
     if (current_page >= max_page-1) current_page = max_page-1;
@@ -110,7 +110,7 @@ static void draw_project_list()
         ImGui::TableHeadersRow();
 
         project project_list[items_per_page];
-        u32 project_count = administration_get_projects(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];
@@ -152,7 +152,7 @@ static void draw_project_list()
             ImGui::Separator();
 
             if (ImGui::Button(localize("form.yes"), ImVec2(120, 0))) { 
-                administration_cancel_project(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 c222dbb..a7759aa 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -25,15 +25,15 @@ void ui_destroy_settings()
 
 void ui_setup_settings()
 {
-    company_info = administration_get_company_info();
+    company_info = administration_company_info_get();
 
-    tax_bracket_count = administration_get_tax_bracket_count();
+    tax_bracket_count = administration_tax_bracket_count();
     tax_brackets = (country_tax_bracket*)malloc(tax_bracket_count * sizeof(country_tax_bracket));
-    administration_get_tax_brackets(tax_brackets);
+    administration_tax_bracket_get_all(tax_brackets);
 
-    cost_center_count = administration_get_cost_center_count();
+    cost_center_count = administration_cost_center_count();
     cost_centers = (cost_center*)malloc(cost_center_count * sizeof(cost_center));
-    administration_get_cost_centers(cost_centers);
+    administration_cost_center_get_all(cost_centers);
 }
 
 static void ui_draw_vat_rates()
@@ -123,7 +123,7 @@ static void ui_draw_vat_rates()
                     is_editing_item = false;
                     is_adding_item = false;
 
-                    administration_update_tax_bracket(new_tax_bracket);
+                    administration_tax_bracket_update(new_tax_bracket);
 
                     ui_destroy_settings();
                     ui_setup_settings();
@@ -169,7 +169,7 @@ static void ui_draw_vat_rates()
                         is_editing_item = false;
                         is_adding_item = false;
 
-                        administration_add_tax_bracket(new_tax_bracket);
+                        administration_tax_bracket_add(new_tax_bracket);
 
                         ui_destroy_settings();
                         ui_setup_settings();
@@ -214,7 +214,7 @@ static void ui_draw_cost_centers()
             ImGui::TableSetColumnIndex(1);          
             if (is_editing_item && editing_item_index == i)
             {
-                bool is_desc_valid = administration_verify_cost_center_description(new_cost_center.description);
+                bool is_desc_valid = administration_cost_center_verify_description(new_cost_center.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();
@@ -225,7 +225,7 @@ static void ui_draw_cost_centers()
                     is_editing_item = false;
                     is_adding_item = false;
 
-                    administration_update_cost_center(new_cost_center);
+                    administration_cost_center_update(new_cost_center);
                     memset(&new_cost_center, 0, sizeof(new_cost_center));
 
                     ui_destroy_settings();
@@ -260,13 +260,13 @@ static void ui_draw_cost_centers()
         {
             ImGui::TableNextRow();
             
-            bool is_code_valid = administration_verify_cost_center_code(new_cost_center.code);
+            bool is_code_valid = administration_cost_center_verify_code(new_cost_center.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_verify_cost_center_description(new_cost_center.description);
+            bool is_desc_valid = administration_cost_center_verify_description(new_cost_center.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();
@@ -279,7 +279,7 @@ static void ui_draw_cost_centers()
             {
                 is_adding_item = false;
                 is_editing_item = false;
-                administration_add_cost_center(new_cost_center);
+                administration_cost_center_add(new_cost_center);
 
                 ui_destroy_settings();
                 ui_setup_settings();
@@ -315,11 +315,11 @@ void ui_draw_settings()
             draw_contact_form(&company_info);
 
             // Save button.
-            bool can_save = administration_is_contact_valid(company_info);
+            bool can_save = administration_contact_is_valid(company_info);
             if (!can_save) ImGui::BeginDisabled();
             ImGui::Spacing();
             if (ImGui::Button(localize("form.save"))) {
-                administration_set_company_info(company_info);
+                administration_company_info_set(company_info);
             }
             if (!can_save) ImGui::EndDisabled();