Index: ActiviteitenOpvolging/ActiviteitenOpvolging/configs/ConfigsLoader.vb =================================================================== diff -u -r1671 -r1672 --- ActiviteitenOpvolging/ActiviteitenOpvolging/configs/ConfigsLoader.vb (.../ConfigsLoader.vb) (revision 1671) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/configs/ConfigsLoader.vb (.../ConfigsLoader.vb) (revision 1672) @@ -80,6 +80,12 @@ Return New List(Of String)(_gridLabelNames) End Get End Property + Private ReadOnly _numbersOfActivities As New List(Of Integer) + Public ReadOnly Property NumbersOfActivities As List(Of Integer) + Get + Return New List(Of Integer)(_numbersOfActivities) + End Get + End Property Private ReadOnly _sqlQueries As New List(Of String) Public ReadOnly Property SqlQueries As List(Of String) Get @@ -109,6 +115,8 @@ _NumberOfGrids = value ElseIf identifier.Contains("GridLabel") Then _gridLabelNames.Add(value) + ElseIf identifier.Contains("NumberOfActivitiesGrid") Then + _numbersOfActivities.Add(value) ElseIf identifier.Contains("SQL") Then _sqlQueries.Add(value) ElseIf identifier.Equals("NumberOfUsers") Then @@ -146,6 +154,12 @@ ElseIf GridLabelNames.Count <> NumberOfGrids Then Throw New ConfigurationException("The amount of 'grid labels' is not equal to the 'number of grids'.") End If + 'Numbers of activities. + If _numbersOfActivities.Count = 0 Then + Throw New ConfigurationException("There are no numbers of activities defined.") + ElseIf _numbersOfActivities.Count <> NumberOfGrids Then + Throw New ConfigurationException("The amount of 'activity numbers' is not equal to the 'number of grids'.") + End If 'SQL queries. If SqlQueries.Count = 0 Then Throw New ConfigurationException("There are no SQL queries defined.") @@ -259,7 +273,7 @@ End If 'If successful, extract the state name. - dim stateName = m.Groups(1).Value + Dim stateName = m.Groups(1).Value 'Convert string value to enum value. Dim enumValue = DueOutStateEnumMapper.GetEnumValueFromString(stateName) @@ -281,15 +295,15 @@ Try 'Extract the state name. 'Invoke the Match method, all text after AgColorDueOut. - Dim m As Match = Regex.Match(identifier, If(isReadOnly,"AgColorActivityReadOnly(.*)", "AgColorActivity(.*)")) + Dim m As Match = Regex.Match(identifier, If(isReadOnly, "AgColorActivityReadOnly(.*)", "AgColorActivity(.*)")) If Not m.Success Then 'No results. Throw New ConfigurationException($"Could not get the state for assigning a color for DueOut. Identifier is '{identifier}'.") End If 'If successful, extract the state name. - dim stateName = m.Groups(1).Value + Dim stateName = m.Groups(1).Value 'Convert string value to enum value. Dim enumValue = ActivityStateEnumMapper.GetEnumValueFromString(stateName)