validation tests for tax rates, cost centers, contacts

5 files changed, 11 insertions, 11 deletions

diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp
index e7afd7a..cfeb08d 100644
--- a/src/ui/ui_contacts.cpp
+++ b/src/ui/ui_contacts.cpp
@@ -297,7 +297,7 @@ static void ui_draw_contacts_create()
 
     draw_contact_form(&active_contact);
 
-    bool can_save = administration_contact_is_valid(active_contact);
+    bool can_save = administration_contact_is_valid(active_contact) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     // Save button
     ImGui::Spacing();
@@ -316,7 +316,7 @@ static void ui_draw_contacts_update()
 
     draw_contact_form(&active_contact);
 
-    bool can_save = administration_contact_is_valid(active_contact);
+    bool can_save = administration_contact_is_valid(active_contact) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     // Save button
     ImGui::Spacing();
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index cd5e186..96489d3 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -478,7 +478,7 @@ static void ui_draw_expense_update()
     
     draw_expense_form(&active_invoice);
 
-    bool can_save = administration_invoice_is_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
@@ -502,7 +502,7 @@ static void ui_draw_expense_create()
     
     draw_expense_form(&active_invoice);
 
-    bool can_save = administration_invoice_is_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 99fac37..f022509 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -511,7 +511,7 @@ static void ui_draw_invoice_update()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_invoice_is_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
@@ -535,7 +535,7 @@ static void ui_draw_invoice_create()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_invoice_is_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice) == A_ERR_SUCCESS;
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
diff --git a/src/ui/ui_projects.cpp b/src/ui/ui_projects.cpp
index 065e828..16d04b1 100644
--- a/src/ui/ui_projects.cpp
+++ b/src/ui/ui_projects.cpp
@@ -46,7 +46,7 @@ static void draw_project_form()
     if (viewing_only) ImGui::EndDisabled();
 
     if (!viewing_only) {
-        bool can_save = administration_project_is_valid(active_project);
+        bool can_save = administration_project_is_valid(active_project) == A_ERR_SUCCESS;
 
         if (!can_save) ImGui::BeginDisabled();
         // Save button
diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index 06cefe6..4812502 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -221,7 +221,7 @@ static void ui_draw_cost_centers()
             ImGui::TableSetColumnIndex(1);          
             if (is_editing_item && editing_item_index == i)
             {
-                bool is_desc_valid = administration_cost_center_verify_description(new_cost_center.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();
@@ -268,13 +268,13 @@ static void ui_draw_cost_centers()
         {
             ImGui::TableNextRow();
             
-            bool is_code_valid = administration_cost_center_verify_code(new_cost_center.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_verify_description(new_cost_center.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();
@@ -324,7 +324,7 @@ void ui_draw_settings()
             draw_contact_form(&company_info);
 
             // Save button.
-            bool can_save = administration_contact_is_valid(company_info);
+            bool can_save = administration_contact_is_valid(company_info) == A_ERR_SUCCESS;
             if (!can_save) ImGui::BeginDisabled();
             ImGui::Spacing();
             if (ImGui::Button(localize("form.save"))) {