Merge branch 'hotfix-v4.3.4'

BellevueCollege · Jun 1, 2020 · e66f41d · e66f41d
2 parents b82e736 + 717ab54
commit e66f41d
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 7 deletions.
diff --git a/ClassSchedule.Web/ClassSchedule.Web.csproj b/ClassSchedule.Web/ClassSchedule.Web.csproj
@@ -340,6 +340,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Views\Shared\CourseDescriptions.cshtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Properties\PublishProfiles\Publish Test.pubxml" />
     <Content Include="Views\Shared\LoggedInUser.cshtml" />
     <Content Include="Views\Shared\breadcrumbNavigation.cshtml" />
@@ -352,6 +353,7 @@
     <Content Include="_configSource\RoleManager.config" />
     <Content Include="_configSource\Smtp.config" />
     <Content Include="_configSource\SamlAuthentication.config" />
+    <Content Include="Views\Shared\Alerts.cshtml" />
     <None Include="_configSource\EXAMPLE-AppSettings.config" />
     <None Include="_configSource\EXAMPLE-Authentication.config" />
     <None Include="_configSource\EXAMPLE-ConnectionStrings.config" />

diff --git a/ClassSchedule.Web/Content/ClassSchedule.css b/ClassSchedule.Web/Content/ClassSchedule.css
@@ -51,6 +51,11 @@
 }
 /* end unset to bootstrap .table styles */
 
+/* Unset Globals 3 table td styles so section notes don't run across page */
+.table-classes>tbody.section-listing>tr>td.section-notes {
+	white-space: normal;
+}
+
 @media (min-width:992px){
     .padding-left-none {
         padding-left: 0;

diff --git a/ClassSchedule.Web/Views/Classes/YearQuarter.cshtml b/ClassSchedule.Web/Views/Classes/YearQuarter.cshtml
@@ -28,6 +28,8 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
     <meta name="robots" content="noindex, follow">
 }
 
+@Html.Partial("Alerts")
+
 @Html.Partial("breadcrumbNavigation")
 
 @Html.Partial("quarterNavigation", new QuarterNavigationModel { CurrentQuarter = ViewBag.CurrentYearQuarter, NavigationQuarters = Model.NavigationQuarters, ViewingQuarter = yrq })

diff --git a/ClassSchedule.Web/Views/Classes/YearQuarterSubject.cshtml b/ClassSchedule.Web/Views/Classes/YearQuarterSubject.cshtml
@@ -26,6 +26,8 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
   ViewBag.PageTitle = String.Format("{0} {1} Credit Classes :: Classes", Model.ViewingQuarter.FriendlyName, Model.SubjectTitle);
 }
 
+@Html.Partial("Alerts")
+
 @Html.Partial("breadcrumbNavigation")
 
 @Html.Partial("quarterNavigation", new QuarterNavigationModel { CurrentQuarter = Model.CurrentQuarter, NavigationQuarters = Model.NavigationQuarters, ViewingQuarter = Model.ViewingQuarter })

diff --git a/ClassSchedule.Web/Views/Shared/Alerts.cshtml b/ClassSchedule.Web/Views/Shared/Alerts.cshtml
@@ -0,0 +1,46 @@
+@using Ctc.Ods.Types
+@{
+    YearQuarter yrq = Model.ViewingQuarter;
+}
+
+<!-- COVID-19 Spring 2020 Alert -->
+@if (yrq.FriendlyName == "Spring 2020")
+{
+    <div class="row">
+        <div class="col-md-12 buffer-top">
+            <div class="content-padding">
+                <div class="alert alert-warning" role="alert">
+                    Bellevue College will start Spring quarter classes April 8th and offer all instruction remotely for the entire quarter. Learn more at the <a href="https://www.bellevuecollege.edu/publicsafety/flu/" alt="Public Safety Flu Page">Public Safety Flu Page</a>.
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+<!-- COVID-19 Summer 2020 Alert -->
+@if (yrq.FriendlyName == "Summer 2020")
+{
+    <div class="row">
+        <div class="col-md-12 buffer-top">
+            <div class="content-padding">
+                <div class="alert alert-danger" role="alert">
+                    Bellevue College will offer all instruction remotely for the entire Summer quarter. See each class section for details. Learn more at the <a href="https://www.bellevuecollege.edu/publicsafety/flu/">COVID-19 Resource Page</a>.
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+<!-- COVID-19 Fall 2020 Alert -->
+@if (yrq.FriendlyName == "Fall 2020")
+{
+    <div class="row">
+        <div class="col-md-12 buffer-top">
+            <div class="content-padding">
+                <div class="alert alert-danger" role="alert">
+                    Bellevue College plans the following classes for Fall. How classes are delivered may change depending on COVID-19 situation over the summer. See each class section for details. Learn more at the <a href="https://www.bellevuecollege.edu/publicsafety/flu/">COVID-19 Resource Page</a>.
+                </div>
+            </div>
+        </div>
+    </div>
+}
diff --git a/ClassSchedule.Web/Views/Shared/Sections.cshtml b/ClassSchedule.Web/Views/Shared/Sections.cshtml
@@ -68,7 +68,7 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
 	</td>
     @using (_profiler.Step("Rendering offered items"))
     {
-        <td>
+    <td>
         @{
             bool firstItem = true;
         }
@@ -86,19 +86,45 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
                     // Meeting times
                     if (Model.Sections[0].IsOnline)
                     {
-                        @:Online
+                        string timeRoom = "";
+                        string startTime = String.Format("{0:t}", item.StartTime).Replace(" ", string.Empty).ToLower();
+                        string endTime = String.Format("{0:t}", item.EndTime).Replace(" ", string.Empty).ToLower();
+                        if (!(string.IsNullOrWhiteSpace(startTime) && string.IsNullOrWhiteSpace(endTime)))
+                        {
+                            timeRoom += ", " + startTime + "-" + endTime;
+                        }
+                        // Comment for now, as for some classes it still shows a Room
+                        @*
+                        if (!string.IsNullOrWhiteSpace(item.Room))
+                        {
+                            timeRoom += " in " + Encoder.HtmlEncode(item.Room);
+                        }
+                        *@
+
+                        // Checks if Days is Arranged so it won't show "Online Arranged" for asynchronous classes,
+                        // and shows "Online <Date>, <Time>" for synchronous classes
+                        <span>Online</span>
+                        if (item.Days != "Arranged")
+                        {
+                            @*
+                            NOTE: Need to explicitly encode timeRoom because Html.Raw() skips encoding
+                            And we need to use Raw() so that the entity doesn't get re-encoded
+                            *@
+                            <abbr title="@Helpers.GetFriendlyDayRange(item.Days)">@item.Days</abbr>@Html.Raw(timeRoom)
+                        }
                     }
                     else
                     {
                         //build start/end time and room string
                         string timeRoom = "";
                         string startTime = String.Format("{0:t}", item.StartTime).Replace(" ", string.Empty).ToLower();
                         string endTime = String.Format("{0:t}", item.EndTime).Replace(" ", string.Empty).ToLower();
-                        if ( !( string.IsNullOrWhiteSpace(startTime) && string.IsNullOrWhiteSpace(endTime) ) )
+                        if (!(string.IsNullOrWhiteSpace(startTime) && string.IsNullOrWhiteSpace(endTime)))
                         {
                             timeRoom += ", " + startTime + "-" + endTime;
                         }
-                        if ( !string.IsNullOrWhiteSpace(item.Room) ) {
+                        if (!string.IsNullOrWhiteSpace(item.Room))
+                        {
                             timeRoom += " in " + Encoder.HtmlEncode(item.Room);
                         }
 
@@ -107,7 +133,7 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
                         And we need to use Raw() so that the entity doesn't get re-encoded
                         *@
                         <abbr title="@Helpers.GetFriendlyDayRange(item.Days)">@item.Days</abbr>@Html.Raw(timeRoom)
-                        
+
                     }
                     firstItem = false;
                 }
@@ -117,7 +143,7 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
             {
             }
         } @*end of iterate section list*@
-        </td>
+    </td>
     }
     @if (Model.Sections[0].Yrq.ID.CompareTo(Model.CurrentQuarter.ID) >= 0)
     {

diff --git a/ClassSchedule.Web/Web.config b/ClassSchedule.Web/Web.config
@@ -55,7 +55,8 @@ along with CtcClassSchedule.  If not, see <http://www.gnu.org/licenses/>.
     <add name="endDate" text="Class ends {ENDDATE}." stringFormat="M/d" />
     <add name="differentStartAndEndDates" text="Class meets {STARTDATE} - {ENDDATE}." stringFormat="M/d" />
     <add name="identicalStartAndEndDates" text="Class meets on {STARTDATE}." stringFormat="M/d" />
-    <add name="hybrid" text="Section HYA is a hybrid class. On campus sessions meet on the days listed. The balance of instruction occurs online as directed by the course syllabus." />
+    <add name="hybrid" text="This section is a hybrid class. On campus sessions meet on the days listed. The balance of instruction occurs online as directed by the course syllabus." />
+    <!-- updated on 4/14/20 <add name="hybrid" text="Section HYA is a hybrid class. On campus sessions meet on the days listed. The balance of instruction occurs online as directed by the course syllabus." /> -->
     <!-- updated on 7/29/14 <add name="hybrid" text="Hybrid class: On campus sessions meet on the days listed. The balance of instruction occurs online as directed by the course syllabus."/>-->
     <add name="telecourse" text="This section is a telecourse." />
   </ctcAutomatedFootnoteSettings>