Merge pull request #86 from codemonkey85/dev

codemonkey85 · web-flow · commit c3d25e393edd · 2025-09-16T13:17:27.000-04:00
Update workflow, fix job date / time
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -28,7 +28,7 @@ jobs:
 
       # sets up .NET SDK
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.3.1
+        uses: actions/setup-dotnet@v5.0.0
         with:
           global-json-file: ./global.json
 
diff --git a/.github/workflows/main_aboutcodemonkey85.yml b/.github/workflows/main_aboutcodemonkey85.yml
@@ -25,7 +25,7 @@ jobs:
 
       # sets up .NET SDK
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.3.1
+        uses: actions/setup-dotnet@v5.0.0
         with:
           global-json-file: ./global.json
 
diff --git a/AboutMe/Wasm/Pages/Resume.razor b/AboutMe/Wasm/Pages/Resume.razor
@@ -91,7 +91,7 @@
                             </MudText>
                         }
                         <MudText Typo="@Typo.body2">
-                            @job.TimeAtJobString
+                            @job.DatesString
                         </MudText>
                     </MudStack>
                 </MudCardHeader>
diff --git a/AboutMe/Wasm/Pages/Resume.razor.cs b/AboutMe/Wasm/Pages/Resume.razor.cs
@@ -470,6 +470,9 @@ private readonly record struct Job
 
         public string TimeAtJobString =>
             TimeAtJob.Humanize(precision: 2, maxUnit: TimeUnit.Year, minUnit: TimeUnit.Month);
+
+        public string DatesString =>
+            $"{StartDate:MMM yyyy} - {(EndDate is null ? "Present" : $"{EndDate:MMM yyyy}")} ({TimeAtJobString})";
     }
 
     private readonly record struct Duty

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`</MudText>`
`92`	`92`	`}`
`93`	`93`	`<MudText Typo="@Typo.body2">`
`94`		`- @job.TimeAtJobString`
	`94`	`+ @job.DatesString`
`95`	`95`	`</MudText>`
`96`	`96`	`</MudStack>`
`97`	`97`	`</MudCardHeader>`
Original file line number	Diff line number	Diff line change
`@@ -470,6 +470,9 @@ private readonly record struct Job`
`470`	`470`
`471`	`471`	`public string TimeAtJobString =>`
`472`	`472`	`TimeAtJob.Humanize(precision: 2, maxUnit: TimeUnit.Year, minUnit: TimeUnit.Month);`
	`473`	`+`
	`474`	`+ public string DatesString =>`
	`475`	`+ $"{StartDate:MMM yyyy} - {(EndDate is null ? "Present" : $"{EndDate:MMM yyyy}")} ({TimeAtJobString})";`
`473`	`476`	`}`
`474`	`477`
`475`	`478`	`private readonly record struct Duty`