fix(moneymanagerex#4987): formatting for custom fields

whalley · Aug 29, 2022 · 721018c · 721018c
1 parent 7f3ce55
commit 721018c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 13 deletions.
diff --git a/src/mmchecking_list.cpp b/src/mmchecking_list.cpp
@@ -271,9 +271,14 @@ TransactionListCtrl::TransactionListCtrl(
         if (name != udfc_entry)
         {
             const auto& type = Model_CustomField::getUDFCType(ref_type, udfc_entry);
-            m_columns.push_back(PANEL_COLUMN(name, 100
-                ,(type == Model_CustomField::FIELDTYPE::DECIMAL || type == Model_CustomField::FIELDTYPE::INTEGER)
-                    ?  wxLIST_FORMAT_RIGHT : wxLIST_FORMAT_LEFT));
+            int align;
+            if (type == Model_CustomField::FIELDTYPE::DECIMAL || type == Model_CustomField::FIELDTYPE::INTEGER)
+                align = wxLIST_FORMAT_RIGHT;
+            else if (type == Model_CustomField::FIELDTYPE::BOOLEAN)
+                align = wxLIST_FORMAT_CENTER; 
+            else
+                align = wxLIST_FORMAT_LEFT; 
+            m_columns.push_back(PANEL_COLUMN(name, 100, align));
             m_real_columns.push_back(static_cast<EColumn>(i));
         }
         i++;
@@ -1478,6 +1483,24 @@ void TransactionListCtrl::doSearchText(const wxString& value)
     EnsureVisible(selectedItem);
 }
 
+wxString UDFCFormatHelper(Model_CustomField::FIELDTYPE type, wxString data)
+{
+    wxString formattedData = data;
+    if (!data.empty())
+    {
+        switch (type) {
+        case Model_CustomField::FIELDTYPE::DATE:
+            formattedData = mmGetDateForDisplay(data);
+            break;
+        case Model_CustomField::FIELDTYPE::BOOLEAN:
+            bool v = wxString("TRUE|true|1").Contains(data);
+            formattedData = (v) ? "\u2713" : "\u2717";
+            break;
+        }
+    }
+    return formattedData;
+}
+
 const wxString TransactionListCtrl::getItem(long item, long column, bool realenum) const
 {
     if (item < 0 || item >= static_cast<int>(m_trans.size())) return "";
@@ -1508,15 +1531,15 @@ const wxString TransactionListCtrl::getItem(long item, long column, bool realenu
             value.Prepend(mmAttachmentManage::GetAttachmentNoteSign());
         return value;
     case TransactionListCtrl::COL_UDFC01:
-        return tran.UDFC01_Type == Model_CustomField::FIELDTYPE::DATE && !tran.UDFC01.empty() ? mmGetDateForDisplay(tran.UDFC01) : tran.UDFC01;
+        return UDFCFormatHelper(tran.UDFC01_Type, tran.UDFC01);
     case TransactionListCtrl::COL_UDFC02:
-        return tran.UDFC02_Type == Model_CustomField::FIELDTYPE::DATE && !tran.UDFC02.empty() ? mmGetDateForDisplay(tran.UDFC02) : tran.UDFC02;
+        return UDFCFormatHelper(tran.UDFC02_Type, tran.UDFC02);
     case TransactionListCtrl::COL_UDFC03:
-        return tran.UDFC03_Type == Model_CustomField::FIELDTYPE::DATE && !tran.UDFC03.empty() ? mmGetDateForDisplay(tran.UDFC03) : tran.UDFC03;
+        return UDFCFormatHelper(tran.UDFC03_Type, tran.UDFC03);
     case TransactionListCtrl::COL_UDFC04:
-        return tran.UDFC04_Type == Model_CustomField::FIELDTYPE::DATE && !tran.UDFC04.empty() ? mmGetDateForDisplay(tran.UDFC04) : tran.UDFC04;
+        return UDFCFormatHelper(tran.UDFC04_Type, tran.UDFC04);
     case TransactionListCtrl::COL_UDFC05:
-        return tran.UDFC05_Type == Model_CustomField::FIELDTYPE::DATE && !tran.UDFC05.empty() ? mmGetDateForDisplay(tran.UDFC05) : tran.UDFC05;
+        return UDFCFormatHelper(tran.UDFC05_Type, tran.UDFC05);
     }
 
     bool is_transfer = Model_Checking::is_transfer(tran.TRANSCODE)

diff --git a/src/mmcheckingpanel.cpp b/src/mmcheckingpanel.cpp
@@ -217,22 +217,22 @@ void mmCheckingPanel::filterTable()
                 else if (udfc.FIELDID == udfc02_ref_id) {
                     full_tran.UDFC02 = udfc.CONTENT;
                     full_tran.UDFC02_val = cleanseNumberStringToDouble(udfc.CONTENT, UDFC02_Scale);
-                    full_tran.UDFC02_Type = UDFC01_Type;
+                    full_tran.UDFC02_Type = UDFC02_Type;
                 }
                 else if (udfc.FIELDID == udfc03_ref_id) {
                     full_tran.UDFC03 = udfc.CONTENT;
                     full_tran.UDFC03_val = cleanseNumberStringToDouble(udfc.CONTENT, UDFC03_Scale);
-                    full_tran.UDFC03_Type = UDFC01_Type;
+                    full_tran.UDFC03_Type = UDFC03_Type;
                 }
                 else if (udfc.FIELDID == udfc04_ref_id) {
                     full_tran.UDFC04 = udfc.CONTENT;
                     full_tran.UDFC04_val = cleanseNumberStringToDouble(udfc.CONTENT, UDFC04_Scale);
-                    full_tran.UDFC05_Type = UDFC01_Type;
+                    full_tran.UDFC05_Type = UDFC04_Type;
                 }
                 else if (udfc.FIELDID == udfc05_ref_id) {
                     full_tran.UDFC05 = udfc.CONTENT;
                     full_tran.UDFC05_val = cleanseNumberStringToDouble(udfc.CONTENT, UDFC05_Scale);
-                    full_tran.UDFC05_Type = UDFC01_Type;
+                    full_tran.UDFC05_Type = UDFC05_Type;
                 }
             }
         }

diff --git a/src/mmcustomdata.cpp b/src/mmcustomdata.cpp
@@ -155,7 +155,7 @@ bool mmCustomData::FillCustomFields(wxBoxSizer* box_sizer)
         case Model_CustomField::BOOLEAN:
         {
             wxCheckBox* CustomBoolean = new wxCheckBox(scrolled_window, controlID,
-                wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxCHK_2STATE);
+                wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
 
             const auto& data = fieldData->CONTENT;
             if (!data.empty())