Merge pull request #39 from nsip/release-17

Corrected the SIF AU 3.4.6 Data Model
nsip · May 27, 2020 · cb44aff · cb44aff
2 parents a023c61 + 897e8c2
commit cb44aff
Show file tree

Hide file tree

Showing 18 changed files with 4,082 additions and 4,283 deletions.
diff --git a/...Demo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs b/...Demo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs
diff --git a/...ameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs b/...ameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs
diff --git a/...f3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs b/...f3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj
@@ -47,14 +47,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ConsumerApp.cs" />
-    <Compile Include="Consumers\FinancialQuestionnaireSubmissionConsumer.cs" />
     <Compile Include="Consumers\StudentPersonalConsumer.cs" />
     <Compile Include="Consumers\StudentPersonalEventConsumer.cs" />
     <Compile Include="Consumers\StudentSchoolEnrollmentConsumer.cs" />
     <Compile Include="EnrollmentConsumerApp.cs" />
     <Compile Include="EventConsumerApp.cs" />
-    <Compile Include="FinancialQuestionnaireSubmissionConsumerApp.cs" />
-    <Compile Include="Models\FinancialQuestionnaireSubmission.cs" />
     <Compile Include="Models\StudentPersonal.cs" />
     <Compile Include="Models\StudentSchoolEnrollment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -77,7 +74,7 @@
       <Version>3.2.1.13</Version>
     </PackageReference>
     <PackageReference Include="Sif.Specification.DataModel.Au">
-      <Version>3.4.6</Version>
+      <Version>3.4.6.1</Version>
     </PackageReference>
     <PackageReference Include="slf4net.log4net">
       <Version>0.1.32.1</Version>

diff --git a/...o/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs b/...o/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Global.asax.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Global.asax.cs
@@ -34,10 +34,6 @@ protected void Application_Start()
 
             // XML Serialisation: For each SIF Data Model Object used by each SIF Provider, the following entries are
             // required to define the root element for each collection object.
-            XmlRootAttribute submissionsXmlRootAttribute = new XmlRootAttribute("FinancialQuestionnaireSubmissions") { Namespace = SettingsManager.ProviderSettings.DataModelNamespace, IsNullable = false };
-            ISerialiser<List<FinancialQuestionnaireSubmission>> submissionsSerialiser = SerialiserFactory.GetXmlSerialiser<List<FinancialQuestionnaireSubmission>>(submissionsXmlRootAttribute);
-            xmlFormatter.SetSerializer<List<FinancialQuestionnaireSubmission>>((XmlSerializer)submissionsSerialiser);
-
             XmlRootAttribute schoolInfosXmlRootAttribute = new XmlRootAttribute("SchoolInfos") { Namespace = SettingsManager.ProviderSettings.DataModelNamespace, IsNullable = false };
             ISerialiser<List<SchoolInfo>> schoolInfosSerialiser = SerialiserFactory.GetXmlSerialiser<List<SchoolInfo>>(schoolInfosXmlRootAttribute);
             xmlFormatter.SetSerializer<List<SchoolInfo>>((XmlSerializer)schoolInfosSerialiser);
@@ -56,7 +52,6 @@ protected void Application_Start()
                 UseXmlSerializer = true
             };
             xmlToJsonFormatter.AddUriPathExtensionMapping("json", "application/json");
-            xmlToJsonFormatter.SetSerializer<List<FinancialQuestionnaireSubmission>>((XmlSerializer)submissionsSerialiser);
             xmlToJsonFormatter.SetSerializer<List<SchoolInfo>>((XmlSerializer)schoolInfosSerialiser);
             xmlToJsonFormatter.SetSerializer<List<StudentPersonal>>((XmlSerializer)studentPersonalsSerialiser);
             xmlToJsonFormatter.SetSerializer<List<StudentSchoolEnrollment>>((XmlSerializer)studentSchoolEnrollmentsSerialiser);

diff --git a/...f3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs b/...f3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs