GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 19:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CmdHistory: repeat unit if a larger unit changes

Browse source 
In history and ghistory commands, repeat the smaller units when a larger unit
changes.  For example, if January 2019 is displayed immediately after January
2018, re-show the "January" label instead of only showing the year change.
This commit is contained in:
Janik Rabe 2019-02-01 10:42:16 +02:00 • committed by Paul Beckingham
parent 16d55ed102
commit a8acff9f7f
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/commands/CmdHistory.cpp
View file

@ -539,10 +539,13 @@ public:
int last_m, last_d, last_y;
last_dt.toYMD (last_y, last_m, last_d);
if ((y != last_y) || (lastTime == 0))
bool y_changed = (y != last_y) || (lastTime == 0);
bool m_changed = (m != last_m) || (lastTime == 0);
if (y_changed)
view.set (row, 0, y);
if ((m != last_m) || (lastTime == 0))
if (y_changed || m_changed)
view.set (row, 1, Datetime::monthName (m));
view.set (row, 2, d);
@ -586,10 +589,13 @@ public:
int last_m, last_d, last_y;
last_dt.toYMD (last_y, last_m, last_d);
if ((y != last_y) || (lastTime == 0))
bool y_changed = (y != last_y) || (lastTime == 0);
bool m_changed = (m != last_m) || (lastTime == 0);
if (y_changed)
view.set (row, 0, y);
if ((m != last_m) || (lastTime == 0))
if (y_changed || m_changed)
view.set (row, 1, Datetime::monthName (m));
view.set (row, 2, d);
@ -633,10 +639,13 @@ public:
int last_m, last_d, last_y;
last_dt.toYMD (last_y, last_m, last_d);
if ((y != last_y) || (lastTime == 0))
bool y_changed = (y != last_y) || (lastTime == 0);
bool m_changed = (m != last_m) || (lastTime == 0);
if (y_changed)
view.set (row, 0, y);
if ((m != last_m) || (lastTime == 0))
if (y_changed || m_changed)
view.set (row, 1, Datetime::monthName (m));
view.set (row, 2, d);
@ -680,10 +689,13 @@ public:
int last_m, last_d, last_y;
last_dt.toYMD (last_y, last_m, last_d);
if ((y != last_y) || (lastTime == 0))
bool y_changed = (y != last_y) || (lastTime == 0);
bool m_changed = (m != last_m) || (lastTime == 0);
if (y_changed)
view.set (row, 0, y);
if ((m != last_m) || (lastTime == 0))
if (y_changed || m_changed)
view.set (row, 1, Datetime::monthName (m));
view.set (row, 2, d);