Convert all partial view rendering to partial tag.

tymorrow · tymorrow · commit 8ab0655ab8c9 · 2023-10-29T12:14:49.000-06:00
diff --git a/src/Dsp.Services/Services/MemberService.cs b/src/Dsp.Services/Services/MemberService.cs
@@ -117,6 +117,7 @@ public async Task<IEnumerable<User>> GetRosterForSemesterAsync(Semester semester
                 d.PledgeClass.Semester.DateStart < semester.DateEnd &&
                 d.ExpectedGraduation.DateEnd > semester.DateStart)
             .OrderBy(m => m.LastName)
+            .Include(m => m.PledgeClass)
             .ToListAsync();
         return results;
     }
diff --git a/src/Dsp.WebCore/Areas/House/Views/WorkOrders/Index.cshtml b/src/Dsp.WebCore/Areas/House/Views/WorkOrders/Index.cshtml
@@ -129,7 +129,7 @@
                             </a>
                         }
                     </ul>
-                    <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>
+                    <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel" />
                 </div>
             }
             else
diff --git a/src/Dsp.WebCore/Areas/Members/Views/Account/Index.cshtml b/src/Dsp.WebCore/Areas/Members/Views/Account/Index.cshtml
@@ -40,7 +40,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-4 col-lg-2">
-            @Html.Partial("~/Areas/Members/Views/Shared/_AccountNavPartial.cshtml")
+            <partial name="~/Areas/Members/Views/Shared/_AccountNavPartial.cshtml" />
         </div>
         <div class="col-md-8 col-lg-5">
             <div class="panel panel-default">
diff --git a/src/Dsp.WebCore/Areas/Members/Views/Account/Lockout.cshtml b/src/Dsp.WebCore/Areas/Members/Views/Account/Lockout.cshtml
@@ -4,7 +4,7 @@
 }
 @section Title
 {
-    @Html.Partial("_TitleExternal")
+    <partial name="_TitleExternal.cshtml" />
 }
 
 <div class="container">
diff --git a/src/Dsp.WebCore/Areas/Members/Views/Account/Manage.cshtml b/src/Dsp.WebCore/Areas/Members/Views/Account/Manage.cshtml
@@ -7,7 +7,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-4 col-lg-2">
-            @Html.Partial("~/Areas/Members/Views/Shared/_AccountNavPartial.cshtml")
+            <partial name="~/Areas/Members/Views/Shared/_AccountNavPartial.cshtml" />
         </div>
         <div class="col-md-8 col-lg-5">
             @if (User.Identity.Name == Model.User.UserName)
diff --git a/src/Dsp.WebCore/Areas/Members/Views/Account/Registration.cshtml b/src/Dsp.WebCore/Areas/Members/Views/Account/Registration.cshtml
@@ -6,10 +6,10 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-sm-12 col-md-6">
-            @{Html.RenderPartial("_RegisterPartial", Model.RegisterModel);}
+            <partial name="_RegisterPartial.cshtml" model="Model.RegisterModel" />
         </div>
         <div class="col-sm-12 col-md-6">
-            @{Html.RenderPartial("_UnregisterPartial", Model.UnregisterModel);}
+            <partial name="_UnregisterPartial.cshtml" model="Model.UnregisterModel" />
         </div>
     </div>
 </div>
diff --git a/src/Dsp.WebCore/Areas/Members/Views/Incidents/Index.cshtml b/src/Dsp.WebCore/Areas/Members/Views/Incidents/Index.cshtml
@@ -95,7 +95,7 @@
                         }
                     </ul>
                 </div>
-                    <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>
+                    <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel" />
             }
             else
             {
diff --git a/src/Dsp.WebCore/Areas/Scholarships/Views/Applications/Submit.cshtml b/src/Dsp.WebCore/Areas/Scholarships/Views/Applications/Submit.cshtml
@@ -7,7 +7,7 @@
 }
 @section Title
 {
-    @Html.Partial("_TitleExternal")
+    <partial name="_TitleExternal.cshtml" />
 }
 
 <div class="container">
diff --git a/src/Dsp.WebCore/Areas/School/Views/Classes/Create.cshtml b/src/Dsp.WebCore/Areas/School/Views/Classes/Create.cshtml
@@ -44,7 +44,7 @@
             }
         </div>
         <div class="col-md-6">
-            @Html.Partial("~/Areas/School/Views/Classes/_ClassInstructions.cshtml")
+            <partial name="~/Areas/School/Views/Classes/_ClassInstructions.cshtml" />
         </div>
     </div>
 </div>
diff --git a/src/Dsp.WebCore/Areas/School/Views/Classes/Duplicates.cshtml b/src/Dsp.WebCore/Areas/School/Views/Classes/Duplicates.cshtml
@@ -13,9 +13,7 @@
         </div>
         <div class="col-lg-6 text-right">
             <div class="btn-group" role="group" aria-label="...">
-                @{
-                    Html.RenderPartial("~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml");
-                }
+                <partial name="~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml" />
             </div>
         </div>
     </div>
diff --git a/src/Dsp.WebCore/Areas/School/Views/Classes/Edit.cshtml b/src/Dsp.WebCore/Areas/School/Views/Classes/Edit.cshtml
@@ -45,7 +45,7 @@
             }
         </div>
         <div class="col-md-6">
-            @Html.Partial("~/Areas/School/Views/Classes/_ClassInstructions.cshtml")
+            <partial name="~/Areas/School/Views/Classes/_ClassInstructions.cshtml" />
         </div>
     </div>
 </div>
diff --git a/src/Dsp.WebCore/Areas/School/Views/Classes/Index.cshtml b/src/Dsp.WebCore/Areas/School/Views/Classes/Index.cshtml
@@ -205,9 +205,7 @@
                 </div>
                 <div class="col-md-6 text-right">
                     <div class="btn-group" role="group" aria-label="...">
-                        @{
-                            Html.RenderPartial("~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml");
-                        }
+                        <partial name="~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml" />
                     </div>
                 </div>
             </div>
@@ -286,7 +284,7 @@
                             </a>
                         }
                     </ul>
-                    @Html.Partial("~/Views/Shared/_PagerPartial.cshtml", pagerModel)
+                    <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel" />
                 </div>
             }
             else
diff --git a/src/Dsp.WebCore/Areas/School/Views/Classes/Schedule.cshtml b/src/Dsp.WebCore/Areas/School/Views/Classes/Schedule.cshtml
@@ -9,9 +9,7 @@
     <div class="row row-space">
         <div class="col text-right">
             <div class="btn-group" role="group" aria-label="...">
-                @{
-                    Html.RenderPartial("~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml");
-                }
+                <partial name="~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml" />
             </div>
         </div>
     </div>
diff --git a/src/Dsp.WebCore/Areas/School/Views/Departments/Index.cshtml b/src/Dsp.WebCore/Areas/School/Views/Departments/Index.cshtml
@@ -8,9 +8,7 @@
     <div class="row row-space">
         <div class="col text-right">
             <div class="btn-group" role="group" aria-label="...">
-                @{
-                    Html.RenderPartial("~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml");
-                }
+                <partial name="~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml" />
             </div>
         </div>
     </div>
diff --git a/src/Dsp.WebCore/Areas/School/Views/Majors/Index.cshtml b/src/Dsp.WebCore/Areas/School/Views/Majors/Index.cshtml
@@ -8,9 +8,7 @@
     <div class="row row-space">
         <div class="col text-right">
             <div class="btn-group" role="group" aria-label="...">
-                @{
-                    Html.RenderPartial("~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml");
-                }
+                <partial name="~/Areas/School/Views/Shared/_SchoolNavPartial.cshtml" />
             </div>
         </div>
     </div>
diff --git a/src/Dsp.WebCore/Areas/Service/Views/Amendments/Index.cshtml b/src/Dsp.WebCore/Areas/Service/Views/Amendments/Index.cshtml
@@ -7,7 +7,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-lg-2 col-md-3 no-print">
-            @Html.Partial("~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml", Model.NavModel)
+            <partial name="~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml" model="Model.NavModel" />
         </div>
         <div class="col-lg-10 col-md-9">
             <div class="row">
diff --git a/src/Dsp.WebCore/Areas/Service/Views/Events/Index.cshtml b/src/Dsp.WebCore/Areas/Service/Views/Events/Index.cshtml
@@ -7,7 +7,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-lg-2 col-md-3 no-print">
-            @Html.Partial("~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml", Model.NavModel)
+            <partial name="~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml" model="Model.NavModel" />
         </div>
         <div class="col-lg-10 col-md-9">
             <div class="row">
diff --git a/src/Dsp.WebCore/Areas/Service/Views/Hours/Index.cshtml b/src/Dsp.WebCore/Areas/Service/Views/Hours/Index.cshtml
@@ -9,7 +9,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-lg-2 col-md-3 no-print">
-            @Html.Partial("~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml", Model.NavModel)
+            <partial name="~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml" model="Model.NavModel" />
         </div>
         <div class="col-lg-10 col-md-9">
             <div class="row">
diff --git a/src/Dsp.WebCore/Areas/Service/Views/Stats/Index.cshtml b/src/Dsp.WebCore/Areas/Service/Views/Stats/Index.cshtml
@@ -11,7 +11,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-lg-2 col-md-3 no-print">
-            @Html.Partial("~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml", Model.NavModel)
+            <partial name="~/Areas/Service/Views/Shared/_ServiceNavPartial.cshtml" model="Model.NavModel" />
         </div>
         <div class="col-lg-10 col-md-9">
             <div class="row">
diff --git a/src/Dsp.WebCore/Views/Home/Sphinx.cshtml b/src/Dsp.WebCore/Views/Home/Sphinx.cshtml
@@ -170,7 +170,7 @@
                             </div>
                         }
                         <div class="panel panel-default">
-                            @Html.Partial("~/Areas/Sobers/Views/Schedule/_SoberSchedulePartial.cshtml", Model.SoberSignups)
+                            <partial name="~/Areas/Sobers/Views/Schedule/_SoberSchedulePartial.cshtml" model="Model.SoberSignups" />
                         </div>
                         @if (isUndergrad || isAdmin)
                         {
diff --git a/src/Dsp.WebCore/Views/Shared/ExternalLayout.cshtml b/src/Dsp.WebCore/Views/Shared/ExternalLayout.cshtml
@@ -31,12 +31,12 @@
 </head>
 <body class="d-flex flex-column h-100">
     <main class="flex-shrink-0">
-        <partial name="_ExternalNavPartial.cshtml"></partial>
-        <partial name="_ExternalTitlePartial.cshtml"></partial>
+        <partial name="_ExternalNavPartial.cshtml" />
+        <partial name="_ExternalTitlePartial.cshtml" />
         @RenderBody()
     </main>
 
-    <partial name="Footer.cshtml"></partial>
+    <partial name="Footer.cshtml" />
 
     <environment include="Development">
         <script src="~/lib/bootstrap/js/bootstrap.js"></script>
diff --git a/src/Dsp.WebCore/Views/Shared/Footer.cshtml b/src/Dsp.WebCore/Views/Shared/Footer.cshtml
@@ -9,7 +9,7 @@
         </a>
 
         <ul class="nav col-md-4 justify-content-end">
-            <partial name="_ExternalNavTopLeftLinksPartial.cshtml"></partial>
+            <partial name="_ExternalNavTopLeftLinksPartial.cshtml" />
             <li class="nav-item">
                 <a href="https://github.com/deltasig/sphinx"
                    class="nav-link">
diff --git a/src/Dsp.WebCore/Views/Shared/InternalLayout.cshtml b/src/Dsp.WebCore/Views/Shared/InternalLayout.cshtml
@@ -38,19 +38,19 @@
 </head>
 <body class="d-flex flex-column h-100">
     <main class="flex-shrink-0">
-        <partial name="_InternalNavPartial.cshtml" model="internalNavModel"></partial>
+        <partial name="_InternalNavPartial.cshtml" model="internalNavModel" />
         <div class="container-fluid">
             <div class="row">
                 <div class="col-lg-2 col-lg-1 col-md-2 d-md-none d-lg-block">
                     <div class="card text-bg-light my-3 mx-2">
                         <div class="card-header">Navigation</div>
                         <div class="card-body px-1 py-1">
-                            <partial name="_InternalNavSideLinksPartial.cshtml" model="internalNavModel"></partial>
+                            <partial name="_InternalNavSideLinksPartial.cshtml" model="internalNavModel" />
                         </div>
                     </div>
                 </div>
                 <div class="col">
-                    <partial name="_InternalTitlePartial.cshtml"></partial>
+                    <partial name="_InternalTitlePartial.cshtml" />
                     @RenderBody()
                 </div>
             </div>
diff --git a/src/Dsp.WebCore/Views/Shared/_ExternalNavPartial.cshtml b/src/Dsp.WebCore/Views/Shared/_ExternalNavPartial.cshtml
@@ -11,9 +11,9 @@
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <partial name="_ExternalNavTopLeftLinksPartial.cshtml"></partial>
+                <partial name="_ExternalNavTopLeftLinksPartial.cshtml" />
             </ul>
-            <partial name="_NavTopRightPartial.cshtml"></partial>
+            <partial name="_NavTopRightPartial.cshtml" />
         </div>
     </div>
 </nav>
diff --git a/src/Dsp.WebCore/Views/Shared/_InternalNavPartial.cshtml b/src/Dsp.WebCore/Views/Shared/_InternalNavPartial.cshtml
@@ -16,9 +16,9 @@
 
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                    <partial name="_InternalNavTopLeftLinksPartial.cshtml" model="Model"></partial>
+                    <partial name="_InternalNavTopLeftLinksPartial.cshtml" model="Model" />
                 </ul>
-                <partial name="_NavTopRightPartial.cshtml"></partial>
+                <partial name="_NavTopRightPartial.cshtml" />
             </div>
         </div>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ public async Task<IEnumerable<User>> GetRosterForSemesterAsync(Semester semester`
`117`	`117`	`d.PledgeClass.Semester.DateStart < semester.DateEnd &&`
`118`	`118`	`d.ExpectedGraduation.DateEnd > semester.DateStart)`
`119`	`119`	`.OrderBy(m => m.LastName)`
	`120`	`+ .Include(m => m.PledgeClass)`
`120`	`121`	`.ToListAsync();`
`121`	`122`	`return results;`
`122`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@`
`129`	`129`	`</a>`
`130`	`130`	`}`
`131`	`131`	`</ul>`
`132`		`- <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>`
	`132`	`+ <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel" />`
`133`	`133`	`</div>`
`134`	`134`	`}`
`135`	`135`	`else`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`}`
`5`	`5`	`@section Title`
`6`	`6`	`{`
`7`		`- @Html.Partial("_TitleExternal")`
	`7`	`+ <partial name="_TitleExternal.cshtml" />`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`<div class="container">`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`}`
`96`	`96`	`</ul>`
`97`	`97`	`</div>`
`98`		`- <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>`
	`98`	`+ <partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel" />`
`99`	`99`	`}`
`100`	`100`	`else`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`}`
`8`	`8`	`@section Title`
`9`	`9`	`{`
`10`		`- @Html.Partial("_TitleExternal")`
	`10`	`+ <partial name="_TitleExternal.cshtml" />`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`<div class="container">`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`}`
`45`	`45`	`</div>`
`46`	`46`	`<div class="col-md-6">`
`47`		`- @Html.Partial("~/Areas/School/Views/Classes/_ClassInstructions.cshtml")`
	`47`	`+ <partial name="~/Areas/School/Views/Classes/_ClassInstructions.cshtml" />`
`48`	`48`	`</div>`
`49`	`49`	`</div>`
`50`	`50`	`</div>`