From 7ffbbd33b5a2c280431655933bd0e7bb6cafda00 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 3 Jun 2015 22:32:48 -0400 Subject: [PATCH] Review: Bug fixes - Fixed bug where the wrong number of reviewed tasks was listed. - Improved spacing around prompt. --- src/review.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/review.cpp b/src/review.cpp index 4851ced..71b7097 100644 --- a/src/review.cpp +++ b/src/review.cpp @@ -172,12 +172,13 @@ static const std::string banner ( static const std::string menu () { Color text ("color15 on gray6"); - return text.colorize (" (Enter) Skip, (e)dit, (c)ompleted, (d)eleted, Mark as (r)eviewed, (q)uit "); + return text.colorize (" (Enter) Skip, (e)dit, (c)ompleted, (d)eleted, Mark as (r)eviewed, (q)uit ") + " "; } //////////////////////////////////////////////////////////////////////////////// static void reviewLoop (const std::vector & uuids) { + unsigned int reviewed = 0; auto total = uuids.size (); auto width = getWidth (); @@ -211,12 +212,12 @@ static void reviewLoop (const std::vector & uuids) // Display prompt, get input. auto response = getResponse (menu ()); - if (response == "e") { editTask (uuid); ++current; } - else if (response == "r") { reviewTask (uuid); ++current; } - else if (response == "c") { completeTask (uuid); ++current; } - else if (response == "d") { deleteTask (uuid); ++current; } - else if (response == "q") { break; } - else if (response == "") { std::cout << "Skipped\n\n"; ++current; } + if (response == "e") { editTask (uuid); ++current; ++reviewed; } + else if (response == "r") { reviewTask (uuid); ++current; ++reviewed; } + else if (response == "c") { completeTask (uuid); ++current; ++reviewed; } + else if (response == "d") { deleteTask (uuid); ++current; ++reviewed; } + else if (response == "q") { break; } + else if (response == "") { std::cout << "Skipped\n\n"; ++current; } else { std::cout << format (STRING_REVIEW_UNRECOGNIZED, response) << "\n"; @@ -227,7 +228,7 @@ static void reviewLoop (const std::vector & uuids) } std::cout << "\n" - << format (STRING_REVIEW_END, current, total) + << format (STRING_REVIEW_END, reviewed, total) << "\n\n"; }