Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8856 Fixes date crash from TreeProxy table #8861

Merged
merged 2 commits into from Apr 30, 2024
Merged

8856 Fixes date crash from TreeProxy table #8861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c979255
Fixes date crash from TreeProxy table
par456 Apr 24, 2024
98b3f17
Rollback change that effected docs
par456 Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 27 additions & 2 deletions APSIM.Shared/Utilities/DataTableUtilities.cs
View file
Open in desktop
Expand Up @@ -396,6 +396,30 @@ static public string[] GetColumnAsStrings(DataView view, string columnName)
return values;
}

/// <summary>
/// Get a column as dates.
/// </summary>
/// <param name="table">The data table that contains the data required</param>
/// <param name="columnName">The name of the Date Column</param>
/// <param name="numValues"></param>
/// <param name="startRow"></param>
/// <returns>An array of dates</returns>
static public DateTime[] GetColumnAsDates(DataTable table, string columnName, int numValues, int startRow)
{
DateTime[] values = new DateTime[numValues];
int index = 0;
for (int row = startRow; row < table.Rows.Count && index < numValues; row++)
{
string date = DateUtilities.ValidateDateString(table.Rows[row][columnName].ToString());
if (date == null)
values[index] = DateTime.MinValue;
else
values[index] = DateUtilities.GetDate(date);
index++;
}
return values;
}

/// <summary>
/// Get a column as dates.
/// </summary>
Expand All @@ -407,10 +431,11 @@ static public DateTime[] GetColumnAsDates(DataTable table, string columnName)
DateTime[] values = new DateTime[table.Rows.Count];
for (int row = 0; row != table.Rows.Count; row++)
{
if (Convert.IsDBNull(table.Rows[row][columnName]))
string date = DateUtilities.ValidateDateString(table.Rows[row][columnName].ToString());
if (date == null)
values[row] = DateTime.MinValue;
else
values[row] = Convert.ToDateTime(table.Rows[row][columnName], CultureInfo.InvariantCulture);
values[row] = DateUtilities.GetDate(date);
}
return values;
}
Expand Down
4 changes: 2 additions & 2 deletions Models/Utilities/GridTableColumn.cs
View file
Open in desktop
Expand Up @@ -202,10 +202,10 @@ public void Set(DataTable data, bool hasUnits)
string[] modifiedMetadata = SoilUtilities.DetermineMetadata(original, originalMetadata, modified, null);
metadata.Value = modifiedMetadata;
}
property.Value = modified;
property.Value = modified;
}
else if (property.DataType == typeof(DateTime[]))
property.Value = DataTableUtilities.GetColumnAsDates(data, Name); //todo: add numRows/startRow option for dates
property.Value = DataTableUtilities.GetColumnAsDates(data, Name, numRows-startRow, startRow);
}
}
}
Expand Down