Skip to content

Commit e9bc47f

Browse files
garysharpgarysharp
committed
CASES21 v70 Support
1 parent 0082aff commit e9bc47f

37 files changed

Lines changed: 2532 additions & 178 deletions

‎src/EduHub.Data/CASES21 Schema.xml‎

Lines changed: 102 additions & 17 deletions
Large diffs are not rendered by default.

‎src/EduHub.Data/EduHub.Data.csproj‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PlatformTarget>AnyCPU</PlatformTarget>
4141
<LangVersion>7.3</LangVersion>
4242
<ErrorReport>prompt</ErrorReport>
43-
<AssemblyName>EduHub.Data.Scoped</AssemblyName>
43+
<AssemblyName>EduHub.Data.Scoped</AssemblyName>
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="System" />
@@ -89,22 +89,42 @@
8989
<Compile Include="Entities\CRTTDataSet.cs">
9090
<DependentUpon>EntityGenerator.tt</DependentUpon>
9191
</Compile>
92-
<Compile Include="Entities\KEMAIL.cs" />
93-
<Compile Include="Entities\KEMAILDataSet.cs" />
94-
<Compile Include="Entities\KFLO.cs" />
95-
<Compile Include="Entities\KFLODataSet.cs" />
92+
<Compile Include="Entities\KEMAIL.cs">
93+
<DependentUpon>EntityGenerator.tt</DependentUpon>
94+
</Compile>
95+
<Compile Include="Entities\KEMAILDataSet.cs">
96+
<DependentUpon>EntityGenerator.tt</DependentUpon>
97+
</Compile>
98+
<Compile Include="Entities\KFLO.cs">
99+
<DependentUpon>EntityGenerator.tt</DependentUpon>
100+
</Compile>
101+
<Compile Include="Entities\KFLODataSet.cs">
102+
<DependentUpon>EntityGenerator.tt</DependentUpon>
103+
</Compile>
96104
<Compile Include="Entities\KFUND.cs">
97105
<DependentUpon>EntityGenerator.tt</DependentUpon>
98106
</Compile>
99107
<Compile Include="Entities\KFUNDDataSet.cs">
100108
<DependentUpon>EntityGenerator.tt</DependentUpon>
101109
</Compile>
110+
<Compile Include="Entities\KINTNF.cs">
111+
<DependentUpon>EntityGenerator.tt</DependentUpon>
112+
</Compile>
113+
<Compile Include="Entities\KINTNFDataSet.cs">
114+
<DependentUpon>EntityGenerator.tt</DependentUpon>
115+
</Compile>
102116
<Compile Include="Entities\KMSG.cs">
103117
<DependentUpon>EntityGenerator.tt</DependentUpon>
104118
</Compile>
105119
<Compile Include="Entities\KMSGDataSet.cs">
106120
<DependentUpon>EntityGenerator.tt</DependentUpon>
107121
</Compile>
122+
<Compile Include="Entities\KMYLNS.cs">
123+
<DependentUpon>EntityGenerator.tt</DependentUpon>
124+
</Compile>
125+
<Compile Include="Entities\KMYLNSDataSet.cs">
126+
<DependentUpon>EntityGenerator.tt</DependentUpon>
127+
</Compile>
108128
<Compile Include="Entities\KNOTE_CR.cs">
109129
<DependentUpon>EntityGenerator.tt</DependentUpon>
110130
</Compile>
@@ -1670,9 +1690,19 @@
16701690
<Compile Include="Entities\STDataSet.cs">
16711691
<DependentUpon>EntityGenerator.tt</DependentUpon>
16721692
</Compile>
1673-
<Compile Include="Entities\STFLO.cs" />
1674-
<Compile Include="Entities\STFLODataSet.cs" />
1693+
<Compile Include="Entities\STFLO.cs">
1694+
<DependentUpon>EntityGenerator.tt</DependentUpon>
1695+
</Compile>
1696+
<Compile Include="Entities\STFLODataSet.cs">
1697+
<DependentUpon>EntityGenerator.tt</DependentUpon>
1698+
</Compile>
16751699
<Compile Include="Entities\STHelpers.cs" />
1700+
<Compile Include="Entities\STLITNUM.cs">
1701+
<DependentUpon>EntityGenerator.tt</DependentUpon>
1702+
</Compile>
1703+
<Compile Include="Entities\STLITNUMDataSet.cs">
1704+
<DependentUpon>EntityGenerator.tt</DependentUpon>
1705+
</Compile>
16761706
<Compile Include="Entities\STMA.cs">
16771707
<DependentUpon>EntityGenerator.tt</DependentUpon>
16781708
</Compile>
@@ -2096,13 +2126,6 @@
20962126
<ItemGroup>
20972127
<None Include="CASES21 Schema.xml" />
20982128
</ItemGroup>
2099-
<ItemGroup>
2100-
<Content Include="Entities\EntityGenerator.txt">
2101-
<AutoGen>True</AutoGen>
2102-
<DesignTime>True</DesignTime>
2103-
<DependentUpon>EntityGenerator.tt</DependentUpon>
2104-
</Content>
2105-
</ItemGroup>
21062129
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
21072130
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
21082131
Other similar extension points exist, see Microsoft.Common.targets.

‎src/EduHub.Data/EduHub.Data.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Provides strongly-typed object model for eduHub Data Sets</description>
1313
<releaseNotes></releaseNotes>
14-
<copyright>Copyright 2021 Gary Sharp</copyright>
14+
<copyright>Copyright 2024 Gary Sharp</copyright>
1515
<tags>eduHub</tags>
1616
</metadata>
1717
</package>

‎src/EduHub.Data/EduHubContext.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ public partial class EduHubContext
142142
private readonly KGTDataSet _KGT;
143143
#if !EduHubScoped
144144
private readonly KGWDataSet _KGW;
145+
private readonly KINTNFDataSet _KINTNF;
145146
private readonly KLOGDataSet _KLOG;
146147
private readonly KMSGDataSet _KMSG;
148+
private readonly KMYLNSDataSet _KMYLNS;
147149
private readonly KNDataSet _KN;
148150
#endif
149151
private readonly KNATTDataSet _KNATT;
@@ -347,6 +349,7 @@ public partial class EduHubContext
347349
private readonly STAR_TFRDataSet _STAR_TFR;
348350
private readonly STBTDataSet _STBT;
349351
private readonly STFLODataSet _STFLO;
352+
private readonly STLITNUMDataSet _STLITNUM;
350353
#endif
351354
private readonly STMADataSet _STMA;
352355
#if !EduHubScoped
@@ -588,8 +591,10 @@ public EduHubContext(string EduHubDirectory, string EduHubSiteIdentifier)
588591
_KGT = new KGTDataSet(this);
589592
#if !EduHubScoped
590593
_KGW = new KGWDataSet(this);
594+
_KINTNF = new KINTNFDataSet(this);
591595
_KLOG = new KLOGDataSet(this);
592596
_KMSG = new KMSGDataSet(this);
597+
_KMYLNS = new KMYLNSDataSet(this);
593598
_KN = new KNDataSet(this);
594599
#endif
595600
_KNATT = new KNATTDataSet(this);
@@ -793,6 +798,7 @@ public EduHubContext(string EduHubDirectory, string EduHubSiteIdentifier)
793798
_STAR_TFR = new STAR_TFRDataSet(this);
794799
_STBT = new STBTDataSet(this);
795800
_STFLO = new STFLODataSet(this);
801+
_STLITNUM = new STLITNUMDataSet(this);
796802
#endif
797803
_STMA = new STMADataSet(this);
798804
#if !EduHubScoped
@@ -1011,8 +1017,10 @@ public IEnumerable<IEduHubDataSet> GetDataSets()
10111017
yield return KGT;
10121018
#if !EduHubScoped
10131019
yield return KGW;
1020+
yield return KINTNF;
10141021
yield return KLOG;
10151022
yield return KMSG;
1023+
yield return KMYLNS;
10161024
yield return KN;
10171025
#endif
10181026
yield return KNATT;
@@ -1216,6 +1224,7 @@ public IEnumerable<IEduHubDataSet> GetDataSets()
12161224
yield return STAR_TFR;
12171225
yield return STBT;
12181226
yield return STFLO;
1227+
yield return STLITNUM;
12191228
#endif
12201229
yield return STMA;
12211230
#if !EduHubScoped
@@ -1794,6 +1803,11 @@ public IEnumerable<IEduHubDataSet> GetDataSets()
17941803
/// </summary>
17951804
public KGWDataSet KGW { get { return _KGW; } }
17961805

1806+
/// <summary>
1807+
/// Expelled International Students
1808+
/// </summary>
1809+
public KINTNFDataSet KINTNF { get { return _KINTNF; } }
1810+
17971811
/// <summary>
17981812
/// Trace log for finance import and export
17991813
/// </summary>
@@ -1804,6 +1818,11 @@ public IEnumerable<IEduHubDataSet> GetDataSets()
18041818
/// </summary>
18051819
public KMSGDataSet KMSG { get { return _KMSG; } }
18061820

1821+
/// <summary>
1822+
/// MYLNS Funding
1823+
/// </summary>
1824+
public KMYLNSDataSet KMYLNS { get { return _KMYLNS; } }
1825+
18071826
/// <summary>
18081827
/// General Ledger Notes
18091828
/// </summary>
@@ -2698,6 +2717,11 @@ public IEnumerable<IEduHubDataSet> GetDataSets()
26982717
/// Student Flexible Learning Options
26992718
/// </summary>
27002719
public STFLODataSet STFLO { get { return _STFLO; } }
2720+
2721+
/// <summary>
2722+
/// Literacy and Numeracy Programs
2723+
/// </summary>
2724+
public STLITNUMDataSet STLITNUM { get { return _STLITNUM; } }
27012725
#endif
27022726

27032727
/// <summary>

‎src/EduHub.Data/EduHubContextBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public static string DefaultEduHubDirectory
4646
/// <summary>
4747
/// eduHub Data Set Directory
4848
/// </summary>
49-
public string EduHubDirectory { get; private set; }
49+
public string EduHubDirectory { get; }
5050
/// <summary>
5151
/// Data Set CSV Suffix
5252
/// </summary>
53-
public string EduHubSiteIdentifier { get; private set; }
53+
public string EduHubSiteIdentifier { get; }
5454

5555
/// <summary>
5656
/// Creates an EduHubContext with a dynamically determined site identifier

‎src/EduHub.Data/Entities/DF.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,19 @@ public override DateTime? EntityLastModified
131131
public string BIRTH_COUNTRY_A { get; internal set; }
132132

133133
/// <summary>
134-
/// Parent/guardian A at home during business hours? (Y/N)
134+
/// Parent/guardian A at home during school hours? (Y/N)
135135
/// [Uppercase Alphanumeric (1)]
136136
/// </summary>
137137
public string BH_AT_HOME_A { get; internal set; }
138138

139139
/// <summary>
140-
/// Parent/guardian A telephone contact if not at home during business hours
140+
/// Parent/guardian A telephone contact if not at home during school hours
141141
/// [Alphanumeric (20)]
142142
/// </summary>
143143
public string BH_CONTACT_A { get; internal set; }
144144

145145
/// <summary>
146-
/// Parent/guardian A telephone contact if not at home during business hours
146+
/// Parent/guardian A telephone contact if not at home during school hours
147147
/// [Memo]
148148
/// </summary>
149149
public string BH_CONTACT_A_MEMO { get; internal set; }
@@ -310,19 +310,19 @@ public override DateTime? EntityLastModified
310310
public string BIRTH_COUNTRY_B { get; internal set; }
311311

312312
/// <summary>
313-
/// Parent/guardian B at home during business hours? (Y/N)
313+
/// Parent/guardian B at home during school hours? (Y/N)
314314
/// [Uppercase Alphanumeric (1)]
315315
/// </summary>
316316
public string BH_AT_HOME_B { get; internal set; }
317317

318318
/// <summary>
319-
/// Parent/guardian B telephone contact if not at home during business hours
319+
/// Parent/guardian B telephone contact if not at home during school hours
320320
/// [Alphanumeric (20)]
321321
/// </summary>
322322
public string BH_CONTACT_B { get; internal set; }
323323

324324
/// <summary>
325-
/// Parent/guardian B telephone contact if not at home during business hours
325+
/// Parent/guardian B telephone contact if not at home during school hours
326326
/// [Memo]
327327
/// </summary>
328328
public string BH_CONTACT_B_MEMO { get; internal set; }

‎src/EduHub.Data/Entities/DFF.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,9 @@ public override DateTime? EntityLastModified
236236

237237
/// <summary>
238238
/// Account number
239+
/// [Alphanumeric (15)]
239240
/// </summary>
240-
public int? ACCOUNT_NUMBER { get; internal set; }
241+
public string ACCOUNT_NUMBER { get; internal set; }
241242

242243
/// <summary>
243244
/// Receipt type
@@ -390,6 +391,12 @@ public override DateTime? EntityLastModified
390391
/// </summary>
391392
public string FEE_DESCRIPTION { get; internal set; }
392393

394+
/// <summary>
395+
/// Payment method, option for direct deposit in family (credit) payments
396+
/// [Uppercase Alphanumeric (2)]
397+
/// </summary>
398+
public string PTYPE { get; internal set; }
399+
393400
/// <summary>
394401
/// Last write date
395402
/// </summary>

‎src/EduHub.Data/Entities/DFFDataSet.cs‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ internal override Action<DFF, string>[] BuildMapper(IReadOnlyList<string> Header
150150
mapper[i] = (e, v) => e.BRANCH = v;
151151
break;
152152
case "ACCOUNT_NUMBER":
153-
mapper[i] = (e, v) => e.ACCOUNT_NUMBER = v == null ? (int?)null : int.Parse(v);
153+
mapper[i] = (e, v) => e.ACCOUNT_NUMBER = v;
154154
break;
155155
case "RTYPE":
156156
mapper[i] = (e, v) => e.RTYPE = v;
@@ -230,6 +230,9 @@ internal override Action<DFF, string>[] BuildMapper(IReadOnlyList<string> Header
230230
case "FEE_DESCRIPTION":
231231
mapper[i] = (e, v) => e.FEE_DESCRIPTION = v;
232232
break;
233+
case "PTYPE":
234+
mapper[i] = (e, v) => e.PTYPE = v;
235+
break;
233236
case "LW_DATE":
234237
mapper[i] = (e, v) => e.LW_DATE = v == null ? (DateTime?)null : DateTime.ParseExact(v, "d/MM/yyyy h:mm:ss tt", CultureInfo.InvariantCulture);
235238
break;
@@ -789,7 +792,7 @@ [DRAWER] varchar(30) NULL,
789792
[BSB] varchar(6) NULL,
790793
[BANK] varchar(20) NULL,
791794
[BRANCH] varchar(20) NULL,
792-
[ACCOUNT_NUMBER] int NULL,
795+
[ACCOUNT_NUMBER] varchar(15) NULL,
793796
[RTYPE] varchar(2) NULL,
794797
[SPLIT_ITEM] varchar(10) NULL,
795798
[FEE_CODE] varchar(10) NULL,
@@ -816,6 +819,7 @@ [STATEMENT_PRINT] varchar(1) NULL,
816819
[ST_SURNAME] varchar(30) NULL,
817820
[ST_FIRSTNAME] varchar(20) NULL,
818821
[FEE_DESCRIPTION] varchar(30) NULL,
822+
[PTYPE] varchar(2) NULL,
819823
[LW_DATE] datetime NULL,
820824
[LW_TIME] smallint NULL,
821825
[LW_USER] varchar(128) NULL,
@@ -993,7 +997,7 @@ public DFFDataReader(IEduHubDataSetReader<DFF> Reader)
993997
{
994998
}
995999

996-
public override int FieldCount { get { return 64; } }
1000+
public override int FieldCount { get { return 65; } }
9971001

9981002
public override object GetValue(int i)
9991003
{
@@ -1121,11 +1125,13 @@ public override object GetValue(int i)
11211125
return Current.ST_FIRSTNAME;
11221126
case 60: // FEE_DESCRIPTION
11231127
return Current.FEE_DESCRIPTION;
1124-
case 61: // LW_DATE
1128+
case 61: // PTYPE
1129+
return Current.PTYPE;
1130+
case 62: // LW_DATE
11251131
return Current.LW_DATE;
1126-
case 62: // LW_TIME
1132+
case 63: // LW_TIME
11271133
return Current.LW_TIME;
1128-
case 63: // LW_USER
1134+
case 64: // LW_USER
11291135
return Current.LW_USER;
11301136
default:
11311137
throw new ArgumentOutOfRangeException(nameof(i));
@@ -1254,11 +1260,13 @@ public override bool IsDBNull(int i)
12541260
return Current.ST_FIRSTNAME == null;
12551261
case 60: // FEE_DESCRIPTION
12561262
return Current.FEE_DESCRIPTION == null;
1257-
case 61: // LW_DATE
1263+
case 61: // PTYPE
1264+
return Current.PTYPE == null;
1265+
case 62: // LW_DATE
12581266
return Current.LW_DATE == null;
1259-
case 62: // LW_TIME
1267+
case 63: // LW_TIME
12601268
return Current.LW_TIME == null;
1261-
case 63: // LW_USER
1269+
case 64: // LW_USER
12621270
return Current.LW_USER == null;
12631271
default:
12641272
return false;
@@ -1391,11 +1399,13 @@ public override string GetName(int ordinal)
13911399
return "ST_FIRSTNAME";
13921400
case 60: // FEE_DESCRIPTION
13931401
return "FEE_DESCRIPTION";
1394-
case 61: // LW_DATE
1402+
case 61: // PTYPE
1403+
return "PTYPE";
1404+
case 62: // LW_DATE
13951405
return "LW_DATE";
1396-
case 62: // LW_TIME
1406+
case 63: // LW_TIME
13971407
return "LW_TIME";
1398-
case 63: // LW_USER
1408+
case 64: // LW_USER
13991409
return "LW_USER";
14001410
default:
14011411
throw new ArgumentOutOfRangeException(nameof(ordinal));
@@ -1528,12 +1538,14 @@ public override int GetOrdinal(string name)
15281538
return 59;
15291539
case "FEE_DESCRIPTION":
15301540
return 60;
1531-
case "LW_DATE":
1541+
case "PTYPE":
15321542
return 61;
1533-
case "LW_TIME":
1543+
case "LW_DATE":
15341544
return 62;
1535-
case "LW_USER":
1545+
case "LW_TIME":
15361546
return 63;
1547+
case "LW_USER":
1548+
return 64;
15371549
default:
15381550
throw new ArgumentOutOfRangeException(nameof(name));
15391551
}

0 commit comments

Comments
 (0)