Merge pull request #19 from UKGovernmentBEIS/MEESALPHA-211-deploy-fix…

…es-7 MEESALPHA-211 deploy fixes 7
UKGovernmentBEIS · Sep 26, 2024 · ff7872a · ff7872a
2 parents ae0c97d + c0285cb
commit ff7872a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 39 deletions.
diff --git a/src/data-tool/Data/Repositories/EpcSummaryRepository.cs b/src/data-tool/Data/Repositories/EpcSummaryRepository.cs
@@ -56,5 +56,6 @@ left join public.""ch-company"" ch
 left join public.""voa-business-rates"" voa
     on voa.uarn = os23.""CROSS_REFERENCE""
 where epc.""asset-rating-band"" in ('F', 'G')
-    and hmlr_ccod.""Tenure"" != 'Freehold'";
+    and hmlr_ccod.""Tenure"" != 'Freehold'
+order by epc.postcode asc";
 }
diff --git a/src/data-tool/Web/Views/Home/Index.cshtml b/src/data-tool/Web/Views/Home/Index.cshtml
@@ -3,46 +3,47 @@
 }
 @model Desnz.Mees.DataTool.Web.Models.EpcSummariesViewModel
 
-    <p class="govuk-body-l">@DateTime.Now.ToShortDateString() - @DateTime.Now.ToLongTimeString()</p>
-    <ul class="govuk-list govuk-list--spaced">
-    @foreach (var summary in Model.EpcNonDomestics)
-    {
-        <li>
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-full">
-                    Companies House Name: @summary.CompanyName
-                </div>
+<p class="govuk-body-l">@DateTime.Now.ToString("U")</p>
+
+<ul class="govuk-list govuk-list--spaced">
+@foreach (var summary in Model.EpcNonDomestics)
+{
+    <li>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
+                Companies House Name: @summary.CompanyName
             </div>
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-one-half">
-                    @summary.Address<br/>@summary.Posttown<br/>@summary.Postcode    
-                </div>
-                <div class="govuk-grid-column-one-quarter">
-                    Rating: @summary.AssetRating<br/>
-                    Floor area: @summary.FloorArea<br/>
-                    VOA Rateable value: £@summary.RateableValue
-                </div>
-                <div class="govuk-grid-column-one-quarter govuk-!-text-align-right">
-                    <p class="govuk-body govuk-!-text-align-right">
-                        <strong class="govuk-tag">
-                            @summary.AssetRatingBand
-                        </strong>
-                    </p>
-                </div>
+        </div>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-one-half">
+                @summary.Address<br/>@summary.Posttown<br/>@summary.Postcode    
             </div>
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-full">
-                    HMLR Proprietor Name: @summary.ProprietorName1
-                </div>
+            <div class="govuk-grid-column-one-quarter">
+                Rating: @summary.AssetRating<br/>
+                Floor area: @summary.FloorArea<br/>
+                VOA Rateable value: £@summary.RateableValue
             </div>
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-full">HMLR Proprietor Address:<br/>@summary.Proprietor1Address1</div>
+            <div class="govuk-grid-column-one-quarter govuk-!-text-align-right">
+                <p class="govuk-body govuk-!-text-align-right">
+                    <strong class="govuk-tag">
+                        @summary.AssetRatingBand
+                    </strong>
+                </p>
             </div>
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-one-half">Tenure: @summary.Tenure</div>
-                <div class="govuk-grid-column-one-half">Date Added: @summary.DateProprietorAdded</div>
+        </div>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
+                HMLR Proprietor Name: @summary.ProprietorName1
             </div>
-            <hr/>
-        </li>
-    }
-    </ul>
+        </div>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">HMLR Proprietor Address:<br/>@summary.Proprietor1Address1</div>
+        </div>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-one-half">Tenure: @summary.Tenure</div>
+            <div class="govuk-grid-column-one-half">Date Added: @summary.DateProprietorAdded</div>
+        </div>
+        <hr/>
+    </li>
+}
+</ul>