Skip to content

Commit

Permalink
Merge pull request #5538 from vomikan/master
Browse files Browse the repository at this point in the history
fix(#5530): def time
  • Loading branch information
vomikan committed Jan 13, 2023
2 parents ef9a87f + 09419a5 commit 000cdd0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/model/Model_Report.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@ Model_Report& Model_Report::instance(wxSQLite3Database* db)
const std::vector<Model_Report::Values> Model_Report::SqlPlaceHolders()
{
const wxString def_date = wxDateTime::Today().FormatISODate();
const wxString def_time = wxDateTime::Now().FormatISOTime();

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:")},
{"&single_time", "wxTimePickerCtrl", def_date, mmReportsPanel::RepPanel::ID_CHOICE_TIME, _("Time:")},
{"&single_time", "wxTimePickerCtrl", def_time, mmReportsPanel::RepPanel::ID_CHOICE_TIME, _("Time:")},
{"&only_years", "wxChoice", def_date, mmReportsPanel::RepPanel::ID_CHOICE_YEAR, _("Year:")},
};
return v;
Expand Down

0 comments on commit 000cdd0

Please sign in to comment.