Merge pull request #5531 from vomikan/master

fix(#5530): time picker for grm
moneymanagerex · Jan 12, 2023 · e9384e6 · e9384e6
2 parents 0e25db9 + 6466cca
commit e9384e6
Show file tree

Hide file tree

Showing 38 changed files with 4,368 additions and 4,276 deletions.
diff --git a/po/ar_SA.po b/po/ar_SA.po
diff --git a/po/be_BY.po b/po/be_BY.po
diff --git a/po/bg_BG.po b/po/bg_BG.po
diff --git a/po/ca_ES.po b/po/ca_ES.po
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
diff --git a/po/de_DE.po b/po/de_DE.po
diff --git a/po/el_GR.po b/po/el_GR.po
diff --git a/po/en_GB.po b/po/en_GB.po
diff --git a/po/es_ES.po b/po/es_ES.po
diff --git a/po/fr_FR.po b/po/fr_FR.po
diff --git a/po/he_IL.po b/po/he_IL.po
diff --git a/po/hr_HR.po b/po/hr_HR.po
diff --git a/po/hu_HU.po b/po/hu_HU.po
diff --git a/po/id_ID.po b/po/id_ID.po
diff --git a/po/it_IT.po b/po/it_IT.po
diff --git a/po/ja_JP.po b/po/ja_JP.po
diff --git a/po/lt_LT.po b/po/lt_LT.po
diff --git a/po/mmex.pot b/po/mmex.pot
diff --git a/po/nl_NL.po b/po/nl_NL.po
diff --git a/po/pl_PL.po b/po/pl_PL.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
diff --git a/po/ro_RO.po b/po/ro_RO.po
diff --git a/po/ru_RU.po b/po/ru_RU.po
diff --git a/po/sk_SK.po b/po/sk_SK.po
diff --git a/po/sq_AL.po b/po/sq_AL.po
diff --git a/po/sr.po b/po/sr.po
diff --git a/po/sv_SE.po b/po/sv_SE.po
diff --git a/po/ta_IN.po b/po/ta_IN.po
diff --git a/po/tr_TR.po b/po/tr_TR.po
diff --git a/po/uk_UA.po b/po/uk_UA.po
diff --git a/po/vi_VN.po b/po/vi_VN.po
diff --git a/po/zh_CN.po b/po/zh_CN.po
diff --git a/po/zh_TW.po b/po/zh_TW.po
diff --git a/src/mmreportspanel.cpp b/src/mmreportspanel.cpp
@@ -39,6 +39,7 @@ EVT_CHOICE(ID_CHOICE_YEAR, mmReportsPanel::OnYearChanged)
 EVT_CHOICE(ID_CHOICE_BUDGET, mmReportsPanel::OnBudgetChanged)
 EVT_CHOICE(ID_CHOICE_ACCOUNTS, mmReportsPanel::OnAccountChanged)
 EVT_DATE_CHANGED(wxID_ANY, mmReportsPanel::OnStartEndDateChanged)
+EVT_TIME_CHANGED(wxID_ANY, mmReportsPanel::OnStartEndDateChanged)
 EVT_CHOICE(ID_CHOICE_CHART, mmReportsPanel::OnChartChanged)
 EVT_SPINCTRL(ID_CHOICE_FORWARD_MONTHS, mmReportsPanel::OnForwardMonthsChangedSpin)
 EVT_TEXT_ENTER(ID_CHOICE_FORWARD_MONTHS, mmReportsPanel::OnForwardMonthsChangedText)
@@ -55,6 +56,7 @@ mmReportsPanel::mmReportsPanel(
     , m_date_ranges(nullptr)
     , m_start_date(nullptr)
     , m_end_date(nullptr)
+    , m_time(nullptr)
     , m_accounts(nullptr)
     , m_chart(nullptr)
     , cleanup_(cleanupReport)
@@ -254,7 +256,7 @@ void mmReportsPanel::CreateControls()
         else if (rp & rb_->RepParams::SINGLE_DATE)
         {
             wxStaticText* itemStaticTextH1 = new wxStaticText(itemPanel3
-                , wxID_ANY, _("Date"));
+                , wxID_ANY, _("Date:"));
             mmSetOwnFont(itemStaticTextH1, GetFont().Larger());
             itemBoxSizerHeader->Add(itemStaticTextH1, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
             itemBoxSizerHeader->AddSpacer(5);
@@ -264,15 +266,13 @@ void mmReportsPanel::CreateControls()
             m_start_date->SetValue(wxDateTime::Today());
             m_start_date->Enable(true);
 
-            m_end_date = nullptr;
-
             itemBoxSizerHeader->Add(m_start_date, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
             itemBoxSizerHeader->AddSpacer(30);
         }
         else if (rp & rb_->RepParams::MONTHES)
         {
             wxStaticText* itemStaticTextH1 = new wxStaticText(itemPanel3
-                , wxID_ANY, _("Date"));
+                , wxID_ANY, _("Date:"));
             mmSetOwnFont(itemStaticTextH1, GetFont().Larger());
             itemBoxSizerHeader->Add(itemStaticTextH1, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
             itemBoxSizerHeader->AddSpacer(5);
@@ -285,6 +285,20 @@ void mmReportsPanel::CreateControls()
             itemBoxSizerHeader->AddSpacer(30);
         }
 
+        if (rp & rb_->RepParams::TIME)
+        {
+            wxStaticText* itemStaticTextH1 = new wxStaticText(itemPanel3
+                , wxID_ANY, _("Time:"));
+            mmSetOwnFont(itemStaticTextH1, GetFont().Larger());
+            itemBoxSizerHeader->Add(itemStaticTextH1, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
+            itemBoxSizerHeader->AddSpacer(5);
+
+            m_time = new wxTimePickerCtrl(itemPanel3, ID_CHOICE_TIME);
+
+            itemBoxSizerHeader->Add(m_time, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
+            itemBoxSizerHeader->AddSpacer(30);
+        }
+
         if (rp & rb_->RepParams::ONLY_YEARS)
         {
             cleanupmem_ = true;
@@ -346,8 +360,8 @@ void mmReportsPanel::CreateControls()
             itemBoxSizerHeader->Add(itemStaticTextH1, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
             itemBoxSizerHeader->AddSpacer(5);
             m_accounts = new wxChoice(itemPanel3, ID_CHOICE_ACCOUNTS);
-            m_accounts->Append(_("All Accounts"));
-            m_accounts->Append(_("Specific Accounts"));
+            m_accounts->Append(_("All Accounts:"));
+            m_accounts->Append(_("Specific Accounts:"));
             for (const auto& e : Model_Account::instance().TYPE_CHOICES)
             {
                 if (e.first != Model_Account::INVESTMENT) {

diff --git a/src/mmreportspanel.h b/src/mmreportspanel.h
@@ -24,6 +24,7 @@
 #include "mmSimpleDialogs.h"
 #include "reports/reportbase.h"
 #include <wx/spinctrl.h>
+#include <wx/timectrl.h>
 
 class mmGUIFrame;
 class mmDateRange;
@@ -64,6 +65,7 @@ class mmReportsPanel : public mmPanelBase
         ID_CHOICE_ACCOUNTS,
         ID_CHOICE_START_DATE,
         ID_CHOICE_END_DATE,
+        ID_CHOICE_TIME,
         ID_CHOICE_YEAR,
         ID_CHOICE_BUDGET,
         ID_CHOICE_CHART,
@@ -75,6 +77,7 @@ class mmReportsPanel : public mmPanelBase
     std::vector<wxSharedPtr<mmDateRange>> m_all_date_ranges;
     wxChoice* m_date_ranges = nullptr;
     mmDatePickerCtrl *m_start_date = nullptr, *m_end_date = nullptr;
+    wxTimePickerCtrl *m_time = nullptr;
     wxWebView * browser_ = nullptr;
     mmPrintableBase* rb_ = nullptr;
     wxChoice* m_accounts = nullptr;

diff --git a/src/model/Model_Report.cpp b/src/model/Model_Report.cpp
@@ -82,10 +82,11 @@ const std::vector<Model_Report::Values> Model_Report::SqlPlaceHolders()
     const wxString def_date = wxDateTime::Today().FormatISODate();
 
     const std::vector<Model_Report::Values> v = {
-    {"&begin_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_START_DATE, _("Begin date: ")},
-    {"&single_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_START_DATE, _("Date: ")},
-    {"&end_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_END_DATE, _("End date: ")},
-    {"&only_years", "wxChoice", def_date, mmReportsPanel::RepPanel::ID_CHOICE_YEAR, _("Year: ")},
+    {"&begin_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_START_DATE, _("Begin date:")},
+    {"&single_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_START_DATE, _("Date:")},
+    {"&end_date", "mmDatePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_END_DATE, _("End date:")},
+    {"&single_time", "wxTimePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_TIME, _("Time:")},
+    {"&only_years", "wxChoice", def_date, mmReportsPanel::RepPanel::ID_CHOICE_YEAR, _("Year:")},
     };
     return v;
 };
@@ -206,6 +207,11 @@ bool Model_Report::PrepareSQL(wxString& sql, std::map <wxString, wxString>& rep_
                 mmDatePickerCtrl* date = static_cast<mmDatePickerCtrl*>(w);
                 value = date->GetValue().FormatISODate();
             }
+            if (w && entry.type == "wxTimePickerCtrl")
+            {
+                wxTimePickerCtrl* time = static_cast<wxTimePickerCtrl*>(w);
+                value = time->GetValue().ToUTC().FormatISOTime();
+            }
             if (w && entry.type == "wxChoice")
             {
                 wxChoice* year = static_cast<wxChoice*>(w);

diff --git a/src/reports/reportbase.cpp b/src/reports/reportbase.cpp
@@ -44,7 +44,6 @@ mmPrintableBase::mmPrintableBase(const wxString& title)
 
 mmPrintableBase::~mmPrintableBase()
 {
-
 }
 
 void mmPrintableBase::setReportParameters(int id)
@@ -349,6 +348,9 @@ int mmGeneralReport::report_parameters()
     else if (content.Contains("&only_years"))
         params |= ONLY_YEARS;
 
+    if (content.Contains("&single_time"))
+        params |= TIME;
+
     return params;
 }
 

diff --git a/src/reports/reportbase.h b/src/reports/reportbase.h
@@ -65,12 +65,13 @@ class mmPrintableBase
         NONE = 0
         , SINGLE_DATE = 1
         , DATE_RANGE = 2
-        , MONTHES = 4
-        , BUDGET_DATES = 8
-        , ONLY_YEARS = 16
-        , ACCOUNTS_LIST = 32
-        , CHART = 64
-        , FORWARD_MONTHS = 128
+        , TIME = 4
+        , MONTHES = 8
+        , BUDGET_DATES = 16
+        , ONLY_YEARS = 32
+        , ACCOUNTS_LIST = 64
+        , CHART = 128
+        , FORWARD_MONTHS = 256
     };
 
     enum Reports {