From 8ac0cea68d430134adb0714bd05d2f3b4ab75e0b Mon Sep 17 00:00:00 2001 From: rafidzal Date: Wed, 27 May 2020 18:28:19 +0800 Subject: [PATCH] Updated the AU demo projects with the correct version SIF AU 3.4.6 Data Model. --- ...inancialQuestionnaireSubmissionConsumer.cs | 34 ---- ...ncialQuestionnaireSubmissionConsumerApp.cs | 109 ------------ .../FinancialQuestionnaireSubmission.cs | 28 --- .../Sif.Framework.Demo.Au.Consumer.csproj | 5 +- ...nancialQuestionnaireSubmissionsProvider.cs | 43 ----- .../Global.asax.cs | 5 - .../FinancialQuestionnaireSubmission.cs | 28 --- ...FinancialQuestionnaireSubmissionService.cs | 168 ------------------ .../Sif.Framework.Demo.Au.Provider.csproj | 7 +- .../packages.config | 2 +- .../Sif.Framework.Demo.Broker.csproj | 4 +- .../Sif.Framework.Demo.Broker/packages.config | 2 +- .../Sif3DemoConsumer/EnvironmentResponse.xml | 6 - Data/Databases/SQLite/SifFrameworkDatabase.db | Bin 205824 -> 205824 bytes 14 files changed, 7 insertions(+), 434 deletions(-) delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs delete mode 100644 Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Services/FinancialQuestionnaireSubmissionService.cs diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs deleted file mode 100644 index 8d8e78f5..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Consumers/FinancialQuestionnaireSubmissionConsumer.cs +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Consumers; -using Sif.Framework.Demo.Au.Consumer.Models; -using Sif.Framework.Model.Infrastructure; - -namespace Sif.Framework.Demo.Au.Consumer.Consumers -{ - internal class FinancialQuestionnaireSubmissionConsumer : BasicConsumer - { - public FinancialQuestionnaireSubmissionConsumer(Environment environment) : base(environment) - { - } - - public FinancialQuestionnaireSubmissionConsumer(string applicationKey, string instanceId = null, string userToken = null, string solutionId = null) - : base(applicationKey, instanceId, userToken, solutionId) - { - } - } -} \ No newline at end of file diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs deleted file mode 100644 index 5d539768..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/FinancialQuestionnaireSubmissionConsumerApp.cs +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Demo.Au.Consumer.Consumers; -using Sif.Framework.Demo.Au.Consumer.Models; -using Sif.Framework.Utils; -using Sif.Specification.DataModel.Au; -using System; -using System.Collections.Generic; - -namespace Sif.Framework.Demo.Au.Consumer -{ - internal class FinancialQuestionnaireSubmissionConsumerApp - { - private static readonly slf4net.ILogger log = slf4net.LoggerFactory.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - - private FinancialQuestionnaireSubmission CreateSubmission() - { - FinancialQuestionnaireSubmission submission = new FinancialQuestionnaireSubmission - { - FQYear = "2018", - ReportingAuthority = "Ballarat Diocese", - ReportingAuthoritySystem = "Vic Catholic", - ReportingAuthorityCommonwealthId = "012345", - SystemSubmission = AUCodeSetsYesOrNoCategoryType.N - }; - - return submission; - } - - private void RunConsumer() - { - FinancialQuestionnaireSubmissionConsumer consumer = new FinancialQuestionnaireSubmissionConsumer( - SettingsManager.ConsumerSettings.ApplicationKey, - SettingsManager.ConsumerSettings.InstanceId, - SettingsManager.ConsumerSettings.UserToken, - SettingsManager.ConsumerSettings.SolutionId); - consumer.Register(); - if (log.IsInfoEnabled) log.Info("Registered the Consumer."); - - try - { - // Create a new submission. - try - { - if (log.IsInfoEnabled) log.Info("*** Create a new submission."); - FinancialQuestionnaireSubmission createdObject = consumer.Create(CreateSubmission()); - if (log.IsInfoEnabled) log.Info($"Created new submission with ID of {createdObject.RefId}."); - } - catch (UnauthorizedAccessException) - { - if (log.IsInfoEnabled) log.Info("Access to create a new submission is rejected."); - } - - // Retrieve all submissions. - if (log.IsInfoEnabled) log.Info("*** Retrieve all submissions."); - IEnumerable retrievedObjects = consumer.Query(0, 10); - - foreach (FinancialQuestionnaireSubmission retrievedObject in retrievedObjects) - { - if (log.IsInfoEnabled) log.Info($"Submission {retrievedObject.RefId} is for {retrievedObject.ReportingAuthority}."); - } - } - catch (UnauthorizedAccessException) - { - if (log.IsInfoEnabled) log.Info($"Access to query submissions is rejected."); - } - catch (Exception e) - { - if (log.IsErrorEnabled) log.Error("Error running the Consumer.\n" + ExceptionUtils.InferErrorResponseMessage(e), e); - } - finally - { - consumer.Unregister(); - if (log.IsInfoEnabled) log.Info("Unregistered the Consumer."); - } - } - - private static void Main(string[] args) - { - FinancialQuestionnaireSubmissionConsumerApp app = new FinancialQuestionnaireSubmissionConsumerApp(); - - try - { - app.RunConsumer(); - } - catch (Exception e) - { - if (log.IsErrorEnabled) log.Error("Error running the Consumer.\n" + ExceptionUtils.InferErrorResponseMessage(e), e); - } - - Console.WriteLine("Press any key to continue ..."); - Console.ReadKey(); - } - } -} \ No newline at end of file diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs deleted file mode 100644 index c52e14c9..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/FinancialQuestionnaireSubmission.cs +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Model.DataModels; -using Sif.Specification.DataModel.Au; -using System.Xml.Serialization; - -namespace Sif.Framework.Demo.Au.Consumer.Models -{ - [XmlRoot("FinancialQuestionnaireSubmission", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)] - [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")] - public class FinancialQuestionnaireSubmission : FinancialQuestionnaireSubmissionType, IDataModel - { - } -} \ No newline at end of file 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 index 4debe445..464b0948 100644 --- 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 @@ - - - @@ -77,7 +74,7 @@ 3.2.1.13 - 3.4.6 + 3.4.6.1 0.1.32.1 diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs deleted file mode 100644 index d43b2b31..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Controllers/FinancialQuestionnaireSubmissionsProvider.cs +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Demo.Au.Provider.Models; -using Sif.Framework.Demo.Au.Provider.Services; -using Sif.Framework.Providers; -using Sif.Framework.WebApi.ModelBinders; -using System.Web.Http; - -namespace Sif.Framework.Demo.Au.Provider.Controllers -{ - public class FinancialQuestionnaireSubmissionsProvider : BasicProvider - { - public FinancialQuestionnaireSubmissionsProvider() : base(new FinancialQuestionnaireSubmissionService()) - { - } - - [NonAction] - public override IHttpActionResult BroadcastEvents(string zoneId = null, string contextId = null) - { - return base.BroadcastEvents(zoneId, contextId); - } - - [Route("~/api/FinancialQuestionnaireSubmissions/FinancialQuestionnaireSubmission")] - public override IHttpActionResult Post(FinancialQuestionnaireSubmission obj, [MatrixParameter] string[] zoneId = null, [MatrixParameter] string[] contextId = null) - { - return base.Post(obj, zoneId, contextId); - } - } -} \ No newline at end of file diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Global.asax.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Global.asax.cs index aa3c8b09..90f54f47 100644 --- 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> submissionsSerialiser = SerialiserFactory.GetXmlSerialiser>(submissionsXmlRootAttribute); - xmlFormatter.SetSerializer>((XmlSerializer)submissionsSerialiser); - XmlRootAttribute schoolInfosXmlRootAttribute = new XmlRootAttribute("SchoolInfos") { Namespace = SettingsManager.ProviderSettings.DataModelNamespace, IsNullable = false }; ISerialiser> schoolInfosSerialiser = SerialiserFactory.GetXmlSerialiser>(schoolInfosXmlRootAttribute); xmlFormatter.SetSerializer>((XmlSerializer)schoolInfosSerialiser); @@ -56,7 +52,6 @@ protected void Application_Start() UseXmlSerializer = true }; xmlToJsonFormatter.AddUriPathExtensionMapping("json", "application/json"); - xmlToJsonFormatter.SetSerializer>((XmlSerializer)submissionsSerialiser); xmlToJsonFormatter.SetSerializer>((XmlSerializer)schoolInfosSerialiser); xmlToJsonFormatter.SetSerializer>((XmlSerializer)studentPersonalsSerialiser); xmlToJsonFormatter.SetSerializer>((XmlSerializer)studentSchoolEnrollmentsSerialiser); diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs deleted file mode 100644 index d8ec9ce0..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/FinancialQuestionnaireSubmission.cs +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Model.DataModels; -using Sif.Specification.DataModel.Au; -using System.Xml.Serialization; - -namespace Sif.Framework.Demo.Au.Provider.Models -{ - [XmlRoot("FinancialQuestionnaireSubmission", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)] - [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")] - public class FinancialQuestionnaireSubmission : FinancialQuestionnaireSubmissionType, IDataModel - { - } -} \ No newline at end of file diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Services/FinancialQuestionnaireSubmissionService.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Services/FinancialQuestionnaireSubmissionService.cs deleted file mode 100644 index 1293c8f3..00000000 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Services/FinancialQuestionnaireSubmissionService.cs +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2019 Systemic Pty Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Sif.Framework.Demo.Au.Provider.Models; -using Sif.Framework.Model.Parameters; -using Sif.Framework.Model.Query; -using Sif.Framework.Service.Providers; -using System; -using System.Collections.Generic; - -namespace Sif.Framework.Demo.Au.Provider.Services -{ - public class FinancialQuestionnaireSubmissionService : IBasicProviderService - { - private static readonly Random random = new Random(); - - private static IDictionary cache = new Dictionary(); - - private static FinancialQuestionnaireSubmission CreateObject() - { - FinancialQuestionnaireSubmission obj = new FinancialQuestionnaireSubmission - { - RefId = Guid.NewGuid().ToString(), - FQYear = random.Next(2016, 2020).ToString(), - ReportingAuthority = "Ballarat Diocese", - ReportingAuthorityCommonwealthId = $"0{random.Next(12000, 12999)}" - }; - - return obj; - } - - private static IDictionary CreateObjects(int count) - { - IDictionary objs = new Dictionary(); - - for (int i = 1; i <= count; i++) - { - FinancialQuestionnaireSubmission obj = CreateObject(); - objs.Add(obj.RefId, obj); - } - - return objs; - } - - static FinancialQuestionnaireSubmissionService() - { - cache = CreateObjects(5); - } - - public FinancialQuestionnaireSubmission Create( - FinancialQuestionnaireSubmission obj, - bool? mustUseAdvisory = null, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - if (!mustUseAdvisory.HasValue || !mustUseAdvisory.Value) - { - string refId = Guid.NewGuid().ToString(); - obj.RefId = refId; - } - - cache.Add(obj.RefId, obj); - - return obj; - } - - public void Delete( - string refId, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - throw new NotImplementedException(); - } - - public FinancialQuestionnaireSubmission Retrieve( - string refId, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - if (!cache.TryGetValue(refId, out FinancialQuestionnaireSubmission obj)) - { - obj = null; - } - - return obj; - } - - public List Retrieve( - uint? pageIndex = null, - uint? pageSize = null, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - List objs = new List(); - - if (pageIndex.HasValue && pageSize.HasValue) - { - uint index = pageIndex.Value * pageSize.Value; - uint count = pageSize.Value; - - if (cache.Values.Count < (index + count)) - { - count = (uint)cache.Values.Count - index; - } - - if (index <= cache.Values.Count) - { - objs.AddRange(cache.Values); - objs = objs.GetRange((int)index, (int)count); - } - } - else - { - objs.AddRange(cache.Values); - } - - return objs; - } - - public List Retrieve( - FinancialQuestionnaireSubmission obj, - uint? pageIndex = null, - uint? pageSize = null, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - throw new NotImplementedException(); - } - - public List Retrieve( - IEnumerable conditions, - uint? pageIndex = null, - uint? pageSize = null, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - throw new NotImplementedException(); - } - - public void Update( - FinancialQuestionnaireSubmission obj, - string zoneId = null, - string contextId = null, - params RequestParameter[] requestParameters) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj index e0679261..b045b193 100644 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj +++ b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj @@ -76,8 +76,8 @@ ..\packages\Sif.Framework.3.2.1.13\lib\net461\Sif.Framework.dll - - ..\packages\Sif.Specification.DataModel.Au.3.4.6\lib\netstandard2.0\Sif.Specification.DataModel.Au.dll + + ..\packages\Sif.Specification.DataModel.Au.3.4.6.1\lib\netstandard2.0\Sif.Specification.DataModel.Au.dll ..\packages\Sif.Specification.Infrastructure.3.2.1\lib\netstandard2.0\Sif.Specification.Infrastructure.dll @@ -137,19 +137,16 @@ - Global.asax - - diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config index 87aa0fc0..098fbc29 100644 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config +++ b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config @@ -13,7 +13,7 @@ - + diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/Sif.Framework.Demo.Broker.csproj b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/Sif.Framework.Demo.Broker.csproj index 43d8f6fd..06e0f22a 100644 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/Sif.Framework.Demo.Broker.csproj +++ b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/Sif.Framework.Demo.Broker.csproj @@ -77,8 +77,8 @@ ..\packages\Sif.Framework.3.2.1.13\lib\net461\Sif.Framework.dll - - ..\packages\Sif.Specification.DataModel.Au.3.4.6\lib\netstandard2.0\Sif.Specification.DataModel.Au.dll + + ..\packages\Sif.Specification.DataModel.Au.3.4.6.1\lib\netstandard2.0\Sif.Specification.DataModel.Au.dll ..\packages\Sif.Specification.Infrastructure.3.2.1\lib\netstandard2.0\Sif.Specification.Infrastructure.dll diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/packages.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/packages.config index 1c2bb942..7862ef59 100644 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/packages.config +++ b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Broker/packages.config @@ -15,7 +15,7 @@ - + diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/Sif3DemoConsumer/EnvironmentResponse.xml b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/Sif3DemoConsumer/EnvironmentResponse.xml index 1728d018..2a0af416 100644 --- a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/Sif3DemoConsumer/EnvironmentResponse.xml +++ b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/Sif3DemoConsumer/EnvironmentResponse.xml @@ -58,12 +58,6 @@ REJECTED - - - APPROVED - APPROVED - - diff --git a/Data/Databases/SQLite/SifFrameworkDatabase.db b/Data/Databases/SQLite/SifFrameworkDatabase.db index d72439650c8f09a335b32fe69883caf6bfd2fd33..d0589569798b680ac75e688da0b456cce3da60f9 100644 GIT binary patch delta 6492 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 KzzZW}j`g4I8MiY4 delta 5332 zcmdT{dvKK16~E`+@5?6per3OG7gz{ZRESCv!XtqYvYQ7asX(oGiniADJ@lc?z!JCl4Qo|jQ_YZ zchC1b_nzPH+?j-M{r3Wk!Odc$6gJk*-p4@pHGN9Az|^Oh zDHr+Lyu8a6;A?V4xnG-?o5?$y_M?$sTS_M;ZEYLqFNyRG4zC{`>MJgk6Pq(}O#0(h zFN%_h-pc~{EN$MLNs8%zG!;yP!)g1D^Ls^5bR;crU#E$Uq9g5@77~6vC;+TMy#P&K zfo@2X9C$ZWo9olP2rORRBaKIQOXJpEXmVV-6OHcF9nv^-yEJy)CXG$EqS35+9vYE+ z{@ukWyEJKe4`ribDas0wyuM5Cv<8C~4Ww*=vWB5-AfRl1zOsHl*<7EGti|h9*5gsu z?IxS!a*@@O_r4#_)2voPBKg$&bpf&hlT)uQ8JU`eZHyl4sA&fc)ee z|6Bt8rR;+h9-m62#ev^{EHMrc__bEFEdRMO$@i{fek#F*-ul#m%ivYw9CW`y#CrMXZZV zk%ibBv@SG7$_SO2A`1{1)&(SzzT)4fxzThG)2yrH_|L`b_|I00kHqUq_kTCV*Fhh< z0G04{FrWb}P|S|AH}MAd3w8#}bDG^FhubvlwG(4CUE3(@6)p|JV9O?5<c~?arPPs^-u~$*FSKbm$(7{slJ+3tdNqPVOCAGln!OV1Ej|(NiNA^$lkW4e zujG~(zhXMP$)Pu8nF;;zURZ}^uY_W_0tz4(H~1MW|7rFt`z3oAw*r+P7vtqj`DqPp zW*sNipH|GKD*1(b;qvmU4Ru)^C)S_Xt*Vq?xEC%fzuHfqucx^ca_C%^j*rZOqx>o> zPP7;X7{87e;$zYR7vOz(4PJ(4;3PZ*$KePhUTv4KgEB>ALQTRhk2au z;=OzwujA#g0UDtS=F^he*+up-dyD;%J;TQFMBT@ZpbCQ@r+UiZPjSl0LHViuXP&Yz zcbT(?Y~m{8@mu(1FEgd?Q9GoY$UWIJ+(+~EPz|?W4dWs3m>G&Pon_xl1Kq^lNjt=Cl5bLBihQF2=Kfo+f{49~dR&UVo!DJj_O&$7MeMD_ z?lRfes4&Iep@2%gO~nxTI_hvL@N8-=$ zH2f6qh1*~!Y=n9!gFNhQi5A97M>UjQFZ=&2F1TIy6e z_&}siRf8XR>ZOwqFgyv+m@%C)tZJ6YMI*ihOP>AE4{;)Zn<>8hpd3e2ZjG*tR<}nZ zo&%FYz56v5oURrlLl?M-r1CvCP8#mpCx!C&${@88nIP|;)JP}y%^91lx_goeOjil>)&dK6E$ z;)xMY>W&lO&G&Ro4&6+lflV3?97XZ1Oh&rG-^^sBsrYa7P)d%3ko^I6YeteI4hPsRpOXX`5?~2a zk|7KQ*dbHW9+xk%fw&U1-%RLck{iER0=gDo#tt)aR=ke&`HlFwcvyU292JMeu;>;Y zqE;*xbHy}aOZa?Iz$FMG*FlW;GnU&=Kcn{*Br^giOCe&?;#0bSqku8V}&lV-pC4sw3iEKs?c5l8UvI!j__oj@< zMub84MpI)0p$$qSZeLGuy(!X($Z&Tmk#!Qd)+v#-2*R$lmqgZ}Bjj3>5$Qk}baj{_ z?S$IRiL?>IZ$SE9Y(-?aT1g{rYmvy=qC}bzgq_WoM4HeMayDf|RwE2LSDPY@gc?ne z20{&{$SOpJbCsINN(me*l}0^+u%ljS#N}6M9eP5Jx{OFI!l0wp6saLpV~RuxMNN?i zBEu0;BGnSus})!wfo+9StU?gBRb86Za&&}j%TdrRzk}s{nu`-mJTFe*{r6tM3xo1A ze?dvX|MQtY+O$HxIy}A{w0$Qu{2$kzfKP|Vp#o;`D;LBT%`YzNnP1f3T~=09+S?l| ziWQe#U(~mtY<_oXaZgEqUrEvI409VEw@(wVz^2vm8e5~; znoV4fw#95sXjfsAW8}R>#ze6-U|Wez#>==`Y&F1;7fYBKR)N=P2<0tAxicC0RgG$NB{r;