From 0f6f2da3bd264265455129a47e4c4bd9a6eeffc7 Mon Sep 17 00:00:00 2001 From: Dominic Need Date: Tue, 5 Sep 2023 12:02:07 +0100 Subject: [PATCH 1/3] Legal requirements removed when sponsored --- .../DocumentGenerator/LegalRequirementsGenerator.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/LegalRequirementsGenerator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/LegalRequirementsGenerator.cs index 82cac032d..ec27004a3 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/LegalRequirementsGenerator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/LegalRequirementsGenerator.cs @@ -25,6 +25,12 @@ public static void AddLegalRequirements(IDocumentBuilder builder, HtbTemplate do build.AddParagraph(""); }); } + else + { + builder.ReplacePlaceholderWithContent("LegalRequirements", build => + { + }); + } } } } \ No newline at end of file From 5b9f84eb774e21db331217182b77dd517efc39b9 Mon Sep 17 00:00:00 2001 From: Dominic Need Date: Tue, 5 Sep 2023 15:57:56 +0100 Subject: [PATCH 2/3] Add conversion title to word doc --- .../SchoolAndTrustInformationAndProjectDatesGenerator.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs index c7410b3f7..e5d664e8b 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs @@ -38,7 +38,11 @@ private static void AddLocalAuthorityAndSponsorDetails(IDocumentBuilder builder, } }; - builder.ReplacePlaceholderWithContent("LocalAuthorityAndSponsorDetails", body => body.AddTable(localAuthorityAndSponsorDetails)); + builder.ReplacePlaceholderWithContent("LocalAuthorityAndSponsorDetails", body => + { + body.AddHeading("Conversion details", HeadingLevel.One); + body.AddTable(localAuthorityAndSponsorDetails); + }); } private static void AddAdvisoryBoardDetails(IDocumentBuilder builder, AcademyConversionProject project) { From 996631b6ac515ef705c7d5bd577e4a9ebad3a892 Mon Sep 17 00:00:00 2001 From: Dominic Need Date: Thu, 7 Sep 2023 17:04:10 +0100 Subject: [PATCH 3/3] Updated word document to support sponsored --- .../Resources/htb-template.docx | Bin 25146 -> 25014 bytes .../DocumentGenerator/DocumentGenerator.cs | 2 +- ...rustInformationAndProjectDatesGenerator.cs | 45 +++++++++++++++--- .../SchoolBudgetInformationGenerator.cs | 2 +- .../SchoolPupilForecastGenerator.cs | 8 ++-- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Resources/htb-template.docx b/Dfe.PrepareConversions/Dfe.PrepareConversions/Resources/htb-template.docx index 764fb30d983550fc43607fcdba28f7b1ceab853b..bf96f663508bd99873ffcba218916900366c5088 100644 GIT binary patch delta 7276 zcmZ9RRa6|n5~c?U?mBpo;O_4365Iw0?v`K^2s$`}Yk=VH?iM__yA#}<&AktM&u%^S zL)Gd3p{l#;tJZ#)#y*&8NF=$s)z|ss_{Pb=q|v5>%g1aNU)Vs2RO5rJD5XtO57md z=*i{v+4)@e6$?=&NORc&%XZz=sz=;FJ^j{70F!_|@Ue{s1!>|ksuR_PYG;WVC9b`f zCNVINahrjfU;Nv|K1q)UvU^DoYIbXG2z+HKJL2pf2nJb34L#I{H=I(awgVHM6=2Q; ze=M5l#hb|BUUB#R1|0c4RmWF;&`KVWz}h4f{w}_JG_KyC=9%-Ch_~V$8L2hBRTh^r zj{K4uX9})7dE^NM#yUrV6}@JGXtm!85o#2=yE>A+I?*H>hw}ic7CQ z@&0S8Ej_8^jq+D$Wm@4*WJDb@wy9QYOj_ydC(E8UO!#jM#fn$AzAfa`qS9*%lU%@R z&oA(M;mq+KB9splcz?(#R72DmrZqKmjdk(srtKjKQ8Hg=EdqnYL|hNMyLfvbbpZ}h;g)WKm!?@}=p@5M z#fSb1k8UvY=0m4N)2m!f=(>x|Bg?x6k2a4z+tM8c*piVte@|>(eWv`f?hOv(aq@#K z{a$ArRZ*tP;EqT-Wv?ppVWm7dmH>3-4BnvibP1f^SF%j?2fnh5NwqI|v!6$KPN*5i zP~=mf)rmGgI?OWe79GUs)aC?xWBz zklE4MFtcEm5QxF-d>Fk#^S5)~jv22>o|kNZFQYJ78#8W|oK@Znz)pHfhggIQ>H~z* z>u>A?QFT(7@O`mO-(rdxy?^pjC1VgL!32{)1bCU+mD`XlCewQ1TJyt!SASEfjAR99 z?FprDe8PL_CrlSe#kKLGha1Lw%yF1(qr5_O@K7I)Dfa_Qd{vEwy9lnsG{e=avLtT^ z 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 P=3lfqJHnFTe`Nk2rT(1e delta 7483 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 yztS>;@!ux=Kj+E@Akg2 respon MemoryStream ms = CreateMemoryStream("htb-template"); DocumentBuilder documentBuilder = DocumentBuilder.CreateFromTemplate(ms, document); - AddSchoolAndTrustInfoAndProjectDates(documentBuilder, project); AddSchoolOverview(documentBuilder, document); + AddSchoolAndTrustInfoAndProjectDates(documentBuilder, project); AddOfstedInformation(documentBuilder, document, project); AddRationale(documentBuilder, document, project); AddRisksAndIssues(documentBuilder, document); diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs index e5d664e8b..7679ce49c 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolAndTrustInformationAndProjectDatesGenerator.cs @@ -40,7 +40,6 @@ private static void AddLocalAuthorityAndSponsorDetails(IDocumentBuilder builder, builder.ReplacePlaceholderWithContent("LocalAuthorityAndSponsorDetails", body => { - body.AddHeading("Conversion details", HeadingLevel.One); body.AddTable(localAuthorityAndSponsorDetails); }); } @@ -50,7 +49,7 @@ private static void AddAdvisoryBoardDetails(IDocumentBuilder builder, AcademyCon { new[] { - new TextElement { Value = "Date of Advisory Board", Bold = true }, + new TextElement { Value = "Date of advisory board", Bold = true }, new TextElement { Value = project.HeadTeacherBoardDate.ToDateString()} }, new[] @@ -60,7 +59,7 @@ private static void AddAdvisoryBoardDetails(IDocumentBuilder builder, AcademyCon }, new[] { - new TextElement { Value = "Previous Advisory Board", Bold = true }, + new TextElement { Value = "Previous advisory board", Bold = true }, new TextElement { Value = project.PreviousHeadTeacherBoardDate.ToDateString() } } }; @@ -81,7 +80,11 @@ private static void AddAcademyRouteInfo(IDocumentBuilder builder, AcademyConvers break; } - builder.ReplacePlaceholderWithContent("AcademyRouteInfo", body => body.AddTable(academyRouteInfo)); + builder.ReplacePlaceholderWithContent("AcademyRouteInfo", body => + { + body.AddHeading("Conversion details", HeadingLevel.One); + body.AddTable(academyRouteInfo); + }); } @@ -92,7 +95,17 @@ private static List VoluntaryRouteInfo(AcademyConversionProject p new[] { new TextElement { Value = "Academy type and route", Bold = true }, - new TextElement { Value = $"{project.AcademyTypeAndRoute} {project.ConversionSupportGrantChangeReason} {project.ConversionSupportGrantAmount.ToMoneyString(true)}" } + new TextElement { Value = project.AcademyTypeAndRoute } + }, + new[] + { + new TextElement { Value = "Grant funding amount", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantAmount.ToMoneyString(true) } + }, + new[] + { + new TextElement { Value = "Grant funding reason", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantChangeReason } }, new[] { @@ -115,7 +128,27 @@ private static List SponsoredRouteInfo(AcademyConversionProject p new[] { new TextElement { Value = "Academy type and route", Bold = true }, - new TextElement { Value = $"{project.AcademyTypeAndRoute} {project.ConversionSupportGrantChangeReason} {project.ConversionSupportGrantAmount.ToMoneyString(true)}" } + new TextElement { Value = project.AcademyTypeAndRoute} + }, + new[] + { + new TextElement { Value = "Grant funding type", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantType } + }, + new[] + { + new TextElement { Value = "Grant funding amount", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantAmount.ToMoneyString(true) } + }, + new[] + { + new TextElement { Value = "Grant funding reason", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantChangeReason } + }, + new[] + { + new TextElement { Value = "Is the school applying for an EIG (Environmental Improvement Grant)?", Bold = true }, + new TextElement { Value = project.ConversionSupportGrantEnvironmentalImprovementGrant } }, new[] { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolBudgetInformationGenerator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolBudgetInformationGenerator.cs index ae593665a..f3bf29b4c 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolBudgetInformationGenerator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolBudgetInformationGenerator.cs @@ -11,7 +11,7 @@ public static void AddSchoolBudgetInformation(IDocumentBuilder builder, HtbTempl { builder.ReplacePlaceholderWithContent("SchoolBudgetInformation", build => { - build.AddHeading("School budget information", HeadingLevel.One); + build.AddHeading("Budget information", HeadingLevel.One); build.AddTable(new List { // Current financial year diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolPupilForecastGenerator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolPupilForecastGenerator.cs index 0adb3402a..f20b40d7c 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolPupilForecastGenerator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/DocumentGenerator/SchoolPupilForecastGenerator.cs @@ -11,7 +11,7 @@ public static void AddSchoolPupilForecast(IDocumentBuilder builder, HtbTemplate { builder.ReplacePlaceholderWithContent("SchoolPupilForecast", build => { - build.AddHeading("School pupil forecasts", HeadingLevel.One); + build.AddHeading("Pupil forecasts", HeadingLevel.One); build.AddTable(new List { new[] @@ -30,21 +30,21 @@ public static void AddSchoolPupilForecast(IDocumentBuilder builder, HtbTemplate }, new [] { - new TextElement{ Value = "Projected pupil numbers on roll in the year the academy opens (year 1)", Bold = true}, + new TextElement{ Value = "Projected pupil numbers on roll (year 1)", Bold = true}, new TextElement{ Value = document.YearOneProjectedCapacity}, new TextElement{ Value = document.YearOneProjectedPupilNumbers}, new TextElement{ Value = document.YearOnePercentageSchoolFull}, }, new [] { - new TextElement{ Value = "Projected pupil numbers on roll in the year the academy opens (year 2)", Bold = true}, + new TextElement{ Value = "Projected pupil numbers on roll (year 2)", Bold = true}, new TextElement{ Value = document.YearTwoProjectedCapacity}, new TextElement{ Value = document.YearTwoProjectedPupilNumbers}, new TextElement{ Value = document.YearTwoPercentageSchoolFull}, }, new [] { - new TextElement{ Value = "Projected pupil numbers on roll in the year the academy opens (year 3)", Bold = true}, + new TextElement{ Value = "Projected pupil numbers on roll (year 3)", Bold = true}, new TextElement{ Value = document.YearThreeProjectedCapacity}, new TextElement{ Value = document.YearThreeProjectedPupilNumbers}, new TextElement{ Value = document.YearThreePercentageSchoolFull},