Merge pull request FritzAndFriends#13 from FritzAndFriends/revert-12-…

…feature_ScheduleUI Revert "Initial schedule UI"
marblekirby · Jun 18, 2019 · 720ce65 · 720ce65
2 parents 11c27c5 + 4c8dbef
commit 720ce65
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 133 deletions.
diff --git a/src/Fritz.ResourceManagement.Web/Components/DayPicker.razor b/src/Fritz.ResourceManagement.Web/Components/DayPicker.razor
@@ -1,26 +1,19 @@
-<div class="monthpicker">
-
-	<button id="prevMonth" onclick="@PrevMonth">&lt;</button>
-	<div id="name">@StartDate.ToString("MMMM yyyy")</div>
-	<button id="nextMonth" onclick="@NextMonth">&gt;</button>
-
-	<span class="day">Su</span>
-	<span class="day">M</span>
-	<span class="day">Tu</span>
-	<span class="day">W</span>
-	<span class="day">Th</span>
-	<span class="day">F</span>
-	<span class="day">Sa</span>
-
-	@for (var i=0; i<FirstDayOfMonthDoW; i++)
-	{
-		<span></span>
-	}
-
-	@for (var i=1; i<=LastDayOfMonth; i++)
-	{
-		<span>@i</span>
-	}
+<div style="width: 20em;">
+
+	<div id="navrow">
+		<button onclick="PrevMonth">&lt;</button>
+		<span>@StartDate.ToString("MMMMM")</span>
+		<button onclick="NextMonth">&gt;</button>
+	</div>
+	<div id="dowRow">
+		<span>Su</span>
+		<span>M</span>
+		<span>Tu</span>
+		<span>W</span>
+		<span>Th</span>
+		<span>F</span>
+		<span>Sa</span>
+	</div>
 
 </div>
 
@@ -30,28 +23,16 @@
 	[Parameter]
 	DateTime StartDate { get; set; } = DateTime.Today;
 
-	int FirstDayOfMonthDoW {  get {
-
-			var first = new DateTime(StartDate.Year, StartDate.Month, 1);
-			return (int)first.DayOfWeek;
-
-		} }
-
-	int LastDayOfMonth { get
-		{
-			return new DateTime(StartDate.Year, StartDate.Month, 1).AddMonths(1).AddDays(-1).Day;
-		} }
-
 	void PrevMonth()
 	{
 		StartDate = StartDate.AddMonths(-1);
-		StartDate = new DateTime(StartDate.Year, StartDate.Month, 1);
+		StartDate = StartDate.AddDays(DateTime.DaysInMonth(StartDate.Year, StartDate.Month));
 	}
 
 	void NextMonth()
 	{
 		StartDate = StartDate.AddMonths(1);
-		StartDate = new DateTime(StartDate.Year, StartDate.Month, 1);
+		StartDate = StartDate.AddDays(DateTime.DaysInMonth(StartDate.Year, StartDate.Month));
 	}
 
 }
diff --git a/src/Fritz.ResourceManagement.Web/Components/DayView.razor b/src/Fritz.ResourceManagement.Web/Components/DayView.razor
diff --git a/src/Fritz.ResourceManagement.Web/Pages/Availability.cshtml b/src/Fritz.ResourceManagement.Web/Pages/Availability.cshtml
@@ -1,22 +1,11 @@
 @page
-@using Fritz.ResourceManagement.Web.Components
 @model Fritz.ResourceManagement.Web.Pages.AvailabilityModel
 @{
     ViewData["Title"] = "Availability";
 }
 
 <h1>Availability</h1>
 
-<div id="Availability" style="display: inline-block">
-	@(await Html.RenderComponentAsync<Availability>())
+<div id="Availability">
+	@(await Html.RenderComponentAsync<Fritz.ResourceManagement.Web.Components.Availability>())
 </div>
-
-<div id="MySchedule" style="display: inline-block">
-	<h3>My Schedule</h3>
-	@(await Html.RenderComponentAsync<DayPicker>())
-
-	@(await Html.RenderComponentAsync<DayView>(new { SelectedDate = DateTime.Today}))
-
-</div>
-
-
diff --git a/src/Fritz.ResourceManagement.Web/Pages/Shared/_Layout.cshtml b/src/Fritz.ResourceManagement.Web/Pages/Shared/_Layout.cshtml
@@ -18,7 +18,6 @@
               integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"/>
     </environment>
     <link rel="stylesheet" href="~/css/site.css" />
-	<link rel="stylesheet" href="~/css/Schedule.css" />
 </head>
 <body>
     <header>

diff --git a/src/Fritz.ResourceManagement.Web/wwwroot/css/Schedule.css b/src/Fritz.ResourceManagement.Web/wwwroot/css/Schedule.css