Merge pull request #9414 from Vitalis95/date

Improvements to Make Date dialog
IDEMSInternational · Feb 4, 2025 · 7126eea · 7126eea
2 parents 04a18e2 + ada8396
commit 7126eea
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb
@@ -36,6 +36,7 @@ Public Class dlgMakeDate
     Private clsGregorianDefault, clsJulianDateDefault, clsAsCharacterFunction, clsDummyFunction As New RFunction
     Private clsDefaultFunction As New RFunction
     Private clsConcFunction As New RFunction
+    Private clsNumericFunction As New RFunction
     Private clsDivisionOperator, clsMultiplicationOperator As New ROperator
 
     Private Sub dlgMakeDate_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -324,6 +325,7 @@ Public Class dlgMakeDate
         clsDivisionOperator = New ROperator
         clsMultiplicationOperator = New ROperator
         clsDummyFunction = New RFunction
+        clsNumericFunction = New RFunction
 
         clsDefaultFunction = New RFunction
         clsConcFunction = New RFunction
@@ -351,9 +353,10 @@ Public Class dlgMakeDate
         clsMakeYearMonthDay.AddParameter("month_format", Chr(34) & "%m" & Chr(34))
 
         clsDateFunction.SetRCommand("as.Date")
-        clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
         clsDateFunction.AddParameter("origin", clsRFunctionParameter:=clsDefaultDate, iPosition:=1)
 
+        clsNumericFunction.SetRCommand("as.numeric")
+
         clsDivisionOperator.SetOperation("/")
         clsDivisionOperator.bAllBrackets = True
 
@@ -524,22 +527,26 @@ Public Class dlgMakeDate
     Private Sub ucrPnlFormat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlFormat.ControlValueChanged, ucrInputFormat.ControlValueChanged, ucrInputOrigin.ControlValueChanged
         ucrReceiverForDate.RemoveIncludedMetadataProperty("class")
         clsDateFunction.RemoveParameterByName("yearmoda")
-        clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
+        clsNumericFunction.RemoveParameterByName("number")
         If rdoDefaultFormat.Checked Then
             cmdHelp.Visible = False
-            ucrReceiverForDate.SetExcludedDataTypes({"numeric"})
             clsDateFunction.RemoveParameterByName("format")
             clsDateFunction.RemoveParameterByName("origin")
+            clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
         ElseIf rdoOrigin.Checked Then
             cmdHelp.Visible = False
-            ucrReceiverForDate.SetIncludedDataTypes({"numeric", "date"})
             If ucrInputOrigin.GetText = "Excel (1899/12/30)" Then
+                clsNumericFunction.AddParameter("number", clsROperatorParameter:=clsDivisionOperator, iPosition:=0, bIncludeArgumentName:=False)
+                clsDateFunction.AddParameter("x", clsRFunctionParameter:=clsNumericFunction, iPosition:=0)
                 clsDateFunction.AddParameter("origin", clsRFunctionParameter:=clsDefaultDate)
             ElseIf ucrInputOrigin.GetText = "Gregorian (1600/03/01)" Then
+                clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
                 clsDateFunction.AddParameter("origin", clsRFunctionParameter:=clsGregorianDefault)
             ElseIf ucrInputOrigin.GetText = "Julian Day Number (-4713/11/24)" Then
+                clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
                 clsDateFunction.AddParameter("origin", clsRFunctionParameter:=clsJulianDateDefault)
             ElseIf ucrInputOrigin.GetText = "R (1970/01/01)" Then
+                clsDateFunction.AddParameter("x", clsROperatorParameter:=clsDivisionOperator, iPosition:=0)
                 clsDateFunction.AddParameter("origin", clsRFunctionParameter:=clsRDefaultDate)
             End If
         ElseIf rdoSpecifyFormat.Checked Then