Sum timespans

#1696
stevencohn · Dec 14, 2024 · a607acd · a607acd
1 parent cd7f97c
commit a607acd
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 25 deletions.
diff --git a/OneMore/Commands/Tables/FormulaDialog.Designer.cs b/OneMore/Commands/Tables/FormulaDialog.Designer.cs
diff --git a/OneMore/Commands/Tables/FormulaDialog.cs b/OneMore/Commands/Tables/FormulaDialog.cs
@@ -114,7 +114,11 @@ private void ChangedFormula(object sender, EventArgs e)
 					var result = calculator.Compute(formula);
 					validStatusLabel.ForeColor = manager.GetColor("ControlText");
 
-					validStatusLabel.Text = $"{Resx.word_OK} ({result})";
+					var text = Format == FormulaFormat.Time
+						? TimeSpan.FromMilliseconds(result).ToString()
+						: $"{result}";
+
+					validStatusLabel.Text = $"{Resx.word_OK} ({text})";
 					tooltip.SetToolTip(validStatusLabel, string.Empty);
 
 					okButton.Enabled = true;
@@ -152,6 +156,11 @@ private void GetCellValue(object sender, GetCellValueEventArgs e)
 				.Replace(AddIn.Culture.NumberFormat.CurrencySymbol, string.Empty)
 				.Replace(AddIn.Culture.NumberFormat.PercentSymbol, string.Empty);
 
+			if (TimeSpan.TryParse(e.Value, AddIn.Culture, out var tvalue))
+			{
+				e.Value = tvalue.TotalMilliseconds.ToString();
+			}
+
 			logger.Verbose($"FormulaDialog.GetCellValue({e.Name}) = [{e.Value}]");
 		}
 

diff --git a/OneMore/Commands/Tables/FormulaDialog.resx b/OneMore/Commands/Tables/FormulaDialog.resx
@@ -128,10 +128,10 @@ Cell reference: A1, A2, ... ZZZ999
 Cell range: A1:A22
 Relative ranges: A1:cell(0,-1)</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
-  </data>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABABIAICAAAAEACACoCAAAJgEAABAQAAABAAgAaAUAAM4JAABAQAAAAQAIACgWAAA2DwAAMDAAAAEA

diff --git a/OneMore/Commands/Tables/Formulas/FormulaEnums.cs b/OneMore/Commands/Tables/Formulas/FormulaEnums.cs
@@ -1,5 +1,5 @@
 //************************************************************************************************
-// Copyright © 2020 Steven M Cohn.  All rights reserved.
+// Copyright © 2020 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
 namespace River.OneMoreAddIn.Commands.Tables.Formulas
@@ -9,7 +9,8 @@ internal enum FormulaFormat
 	{
 		Number,
 		Currency,
-		Percentage
+		Percentage,
+		Time
 	}
 
 

diff --git a/OneMore/Commands/Tables/Formulas/Processor.cs b/OneMore/Commands/Tables/Formulas/Processor.cs
@@ -79,6 +79,14 @@ private void GetCellValue(object sender, GetCellValueEventArgs e)
 				return;
 			}
 
+			if (TimeSpan.TryParse(text, AddIn.Culture, out var tvalue))
+			{
+				// timespans are returned as milliseconds, to be converted
+				// back to formatted strings by the Report() method
+				e.Value = tvalue.TotalMilliseconds.ToString();
+				return;
+			}
+
 			// has a todo checkbox? If so then the comparison is limited to the checkbox
 			// and WILL NOT fall thru to a string comparison!
 			var tagx = cell.Root.Descendants().FirstOrDefault(d => d.Name.LocalName == "Tag");
@@ -146,6 +154,11 @@ private void Report(TableCell cell, Formula formula, double result)
 				case FormulaFormat.Percentage:
 					text = (result / 100).ToString($"P{dplaces}", AddIn.Culture);
 					break;
+
+				case FormulaFormat.Time:
+					var span = TimeSpan.FromMilliseconds(result);
+					text = span.ToString();
+					break;
 			}
 
 			cell.SetContent(text);

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
@@ -1210,7 +1210,8 @@
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>رقم
 عملة
-النسبة المئوية</value>
+نسبة مئوية
+وقت</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
@@ -1208,7 +1208,10 @@ OneNote-Datei (*.one)</value>
     <comment>label</comment>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
-    <value>Nummer\n</value>
+    <value>Nummer
+Währung
+Prozentsatz
+Zeit</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
@@ -1209,8 +1209,9 @@ Archivo de OneNote (* .one)</value>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>Número
-Moneda
-Porcentaje</value>
+Divisa
+Porcentaje
+Tiempo</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
@@ -1210,7 +1210,8 @@ Fichier OneNote (*.one)</value>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>Nombre
 Devise
-Pourcentage</value>
+Pourcentage
+Temps</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx
@@ -1209,9 +1209,10 @@ Total Row Font
     <comment>label</comment>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
-    <value>מספר
+    <value>מִספָּר
 מַטְבֵּעַ
-אֲחוּזִים</value>
+אֲחוּזִים
+זְמַן</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.ja-JP.resx b/OneMore/Properties/Resources.ja-JP.resx
@@ -1211,9 +1211,10 @@ OneNoteファイル (*.one)</value>
     <comment>label</comment>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
-    <value>数値
+    <value>番号
 通貨
-パーセンテージ</value>
+パーセンテージ
+時間</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
@@ -1209,9 +1209,10 @@ OneNote-bestand (*.one)</value>
     <comment>label</comment>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
-    <value>Aantal
-Valuta
-Percentage</value>
+    <value>Nummer
+Munteenheid
+Percentage
+Tijd</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx
@@ -1211,7 +1211,8 @@ Plik OneNote (* .o)</value>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>Numer
 Waluta
-Odsetek</value>
+Procent
+Czas</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
@@ -1211,7 +1211,8 @@ Arquivo OneNote (* .one)</value>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>Número
 Moeda
-Percentagem</value>
+Percentagem
+Tempo</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
@@ -1211,7 +1211,8 @@ OneNote File (*.one)</value>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
     <value>Number
 Currency
-Percentage</value>
+Percentage
+Time</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">

diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
@@ -1207,9 +1207,10 @@ OneNote 文件 (*.one)</value>
     <comment>label</comment>
   </data>
   <data name="FormulaDialog_formatBox.Items" xml:space="preserve">
-    <value>数
+    <value>数字
 货币
-百分比</value>
+百分比
+时间</value>
     <comment>formats, one per line</comment>
   </data>
   <data name="FormulaDialog_formatLabel.Text" xml:space="preserve">