Add option to exclude completed tasks from summary report

#1371
stevencohn · Apr 28, 2024 · 84879ea · 84879ea
1 parent a9c1fba
commit 84879ea
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 30 deletions.
diff --git a/OneMore/Commands/Reminders/ReportRemindersCommand.cs b/OneMore/Commands/Reminders/ReportRemindersCommand.cs
@@ -39,6 +39,7 @@ private sealed class Item
 		private const string HeaderCss = "font-family:'Segoe UI Light';font-size:10.0pt";
 
 		private OneNote.Scope scope;
+		private bool showCompleted;
 		private OneNote one;
 		private Page page;
 		private XNamespace ns;
@@ -75,6 +76,13 @@ public override async Task Execute(params object[] args)
 						scope = OneNote.Scope.Notebooks;
 					}
 
+					if (args.Length < 2 || args[2] is not string completedArg ||
+						!bool.TryParse(completedArg, out showCompleted))
+					{
+						// opposite of default in dialog, but this is backwards-compatible
+						showCompleted = true;
+					}
+
 					if (!await CollectReminders(scope))
 					{
 						return;
@@ -94,6 +102,7 @@ public override async Task Execute(params object[] args)
 					}
 
 					scope = dialog.Scope;
+					showCompleted = dialog.IncludeCompleted;
 
 					if (!await CollectReminders(scope))
 					{
@@ -130,7 +139,7 @@ public override async Task Execute(params object[] args)
 				var now = DateTime.Now.ToShortFriendlyString();
 				container.Add(
 					new Paragraph($"{Resx.ReminderReport_LastUpdated} {now} " +
-						$"(<a href=\"onemore://ReportRemindersCommand/refresh/{scope}\">{Resx.word_Refresh}</a>)"),
+						$"(<a href=\"onemore://ReportRemindersCommand/refresh/{scope}/{showCompleted}\">{Resx.word_Refresh}</a>)"),
 					new Paragraph(string.Empty)
 					);
 
@@ -212,8 +221,14 @@ private async Task<bool> CollectReminders(OneNote.Scope scope)
 						WoYear = calendar.GetWeekOfYear(reminder.Due, weekRule, firstDay)
 					};
 
-					if (reminder.Status == ReminderStatus.Completed ||
-						reminder.Status == ReminderStatus.Deferred)
+					if (reminder.Status == ReminderStatus.Completed)
+					{
+						if (showCompleted)
+						{
+							inactive.Add(item);
+						}
+					}
+					else if (reminder.Status == ReminderStatus.Deferred)
 					{
 						inactive.Add(item);
 					}

diff --git a/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs b/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs
diff --git a/OneMore/Commands/Reminders/ReportRemindersDialog.cs b/OneMore/Commands/Reminders/ReportRemindersDialog.cs
@@ -1,10 +1,10 @@
 //************************************************************************************************
-// Copyright © 2022 Steven M Cohn.  All rights reserved.
+// Copyright © 2022 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
 namespace River.OneMoreAddIn.Commands
 {
-	using Resx = River.OneMoreAddIn.Properties.Resources;
+	using Resx = Properties.Resources;
 
 
 	internal partial class ReportRemindersDialog : UI.MoreForm
@@ -20,7 +20,6 @@ public ReportRemindersDialog()
 				Localize(new string[]
 				{
 					"introLabel",
-					"groupBox=word_Scope",
 					"notebooksRadio=phrase_AllNotebooks",
 					"notebookRadio=phrase_AllSectionInTheCurrentNotebook",
 					"sectionRadio=phrase_TheCurrentSection",
@@ -31,6 +30,9 @@ public ReportRemindersDialog()
 		}
 
 
+		public bool IncludeCompleted => showCompletedBox.Checked;
+
+
 		public OneNote.Scope Scope
 		{
 			get

diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs
diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx
@@ -2452,6 +2452,10 @@ ISO-code then comma then language name</comment>
     <value>توليد تقرير للتذكير في هذا النطاق</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>تضمين التذكيرات المكتملة</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>إنشاء صفحة تقرير جديدة</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
@@ -2449,6 +2449,10 @@ Wähle Nein, um eine leere Zeile zwischen den Absätzen zu halten</value>
     <value>Erstelle Bericht für Erinnerungen in diesem Bereich</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Fügen Sie abgeschlossene Erinnerungen hinzu</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Erstelle eine neue Berichtsseite</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
@@ -2452,6 +2452,10 @@ Seleccione No para mantener una línea vacía entre los párrafos</value>
     <value>Genere un informe para recordatorios en este alcance</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Incluir recordatorios completados</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Crear una nueva página de informe</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
@@ -2451,6 +2451,10 @@ Sélectionnez Non pour conserver une ligne vide entre les paragraphes</value>
     <value>Générer un rapport pour les rappels dans cette portée</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Inclure les rappels terminés</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Créer une nouvelle page de rapport</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx
@@ -2469,6 +2469,10 @@ ISO-code then comma then language name</comment>
     <value>צור דוח לתזכורות בהיקף זה</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>כלול תזכורות שהושלמו</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>צור דף דוח חדש</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
@@ -2453,6 +2453,10 @@ Selecteer NO om één lege regel tussen paragrafen te behouden</value>
     <value>Genereer rapport voor herinneringen in deze scope</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Voeg voltooide herinneringen toe</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Maak een nieuwe rapportpagina</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx
@@ -2465,6 +2465,10 @@ Wybierz Nie, aby zachować jedną pustą linię między akapitami</value>
     <value>Wygeneruj raport dla przypomnień w tym zakresie</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Dołącz ukończone przypomnienia</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Utwórz nową stronę raportu</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
@@ -2453,6 +2453,10 @@ Selecione Não para manter uma linha vazia entre os parágrafos</value>
     <value>Gerar relatório para lembretes neste escopo</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Incluir lembretes concluídos</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Crie uma nova página de relatório</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
@@ -2489,6 +2489,10 @@ Select No to keep one empty line between paragraphs</value>
     <value>Generate report for reminders in this scope</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>Include completed reminders</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>Create a new report page</value>
     <comment>radio</comment>

diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
@@ -2451,6 +2451,10 @@ ISO-code then comma then language name</comment>
     <value>在此范围中生成提醒的报告</value>
     <comment>label</comment>
   </data>
+  <data name="ReportRemindersDialog_showCompletedBox.Text" xml:space="preserve">
+    <value>包括已完成的提醒</value>
+    <comment>checkbox</comment>
+  </data>
   <data name="ReportRemindersReuseDialog_newRadio.Text" xml:space="preserve">
     <value>创建一个新的报告页面</value>
     <comment>radio</comment>