From b5d1d9d590b70e522932a519c4de750f633f52dc Mon Sep 17 00:00:00 2001 From: Cal Date: Tue, 10 Nov 2026 15:03:48 -0800 Subject: [PATCH 1/6] team look up report --- Keas.Mvc/Views/Report/PersonTeamList.cshtml | 99 ++++++++++++++------- 1 file changed, 69 insertions(+), 30 deletions(-) diff --git a/Keas.Mvc/Views/Report/PersonTeamList.cshtml b/Keas.Mvc/Views/Report/PersonTeamList.cshtml index 131260bdb..70e58b5a8 100644 --- a/Keas.Mvc/Views/Report/PersonTeamList.cshtml +++ b/Keas.Mvc/Views/Report/PersonTeamList.cshtml @@ -1,35 +1,74 @@ @model System.Collections.Generic.List +@{ + ViewData["Title"] = "Lookup teams"; +} -

@ViewBag.PersonName

+
+
+
+ @await Html.PartialAsync("_ActiveTeamEyebrow") +

Lookup teams

+

@ViewBag.PersonName

+
+ Reports +
-@foreach (var team in Model) -{ -

Team: @team.Name

-

Admins:

- - - - - - - - - @foreach (var item in team.TeamPermissions.Select(a => a.User).Distinct()) - { - - - - - } - - -
- Name - Email
- @Html.DisplayFor(a => item.Name) - - @Html.DisplayFor(a => item.Email) -
-} + @if (!Model.Any()) + { +

No teams were found for this person.

+ } + @foreach (var team in Model) + { +
+
+

@team.Name

+

Team administrators

+
+
+ + + + + + + + + + @foreach (var contact in team.TeamPermissions.Select(permission => permission.User).Distinct()) + { + + + + + } + +
Administrators for @team.Name
NameEmail
@contact.Name + @if (!string.IsNullOrWhiteSpace(contact.Email)) + { + @contact.Email + } + else + { + — + } +
+
+
+ } +
+@section Styles { + @await Html.PartialAsync("_DataTableStyles") +} + +@section Scripts { + @await Html.PartialAsync("_ImportJS") + +} From e179a88d31dac04d7a4c8d81fc3bda40a14c141f Mon Sep 17 00:00:00 2001 From: Cal Date: Thu, 12 Nov 2026 09:12:50 -0800 Subject: [PATCH 2/6] final touches and cleanup --- .../src/components/Keys/AssociateSpace.tsx | 2 +- .../ClientApp/src/pages/assets/AssetNav.tsx | 14 +- .../src/pages/assets/routes.test.tsx | 23 +- Keas.Mvc/Views/Confirm/MyStuff.cshtml | 2 +- .../Group/CompletedDocumentsReport.cshtml | 2 +- Keas.Mvc/Views/Group/EquipmentReport.cshtml | 2 +- Keas.Mvc/Views/Group/ExpiringItems.cshtml | 2 +- .../Group/IncompleteDocumentsReport.cshtml | 2 +- Keas.Mvc/Views/Group/KeySerialsReport.cshtml | 2 +- .../Group/KeySerialsWithSpacesReport.cshtml | 2 +- .../Group/PeopleLeavingWithAssets.cshtml | 2 +- Keas.Mvc/Views/Group/WorkstationReport.cshtml | 2 +- Keas.Mvc/Views/Home/Index.cshtml | 2 +- .../Views/PersonAdmin/UploadPeople.cshtml | 2 +- Keas.Mvc/Views/Report/AccessReport.cshtml | 2 +- .../Report/EquipmentHistoryReport.cshtml | 2 +- Keas.Mvc/Views/Report/EquipmentReport.cshtml | 2 +- .../Views/Report/EquipmentReportV2.cshtml | 2 +- Keas.Mvc/Views/Report/KeyReport.cshtml | 2 +- .../PersonEquipmentHistoryReport.cshtml | 2 +- .../Views/Report/WorkstationReport.cshtml | 2 +- .../Views/TeamAdmin/UploadEquipment.cshtml | 2 +- Keas.Mvc/Views/TeamAdmin/UploadKeys.cshtml | 2 +- Keas.Mvc/wwwroot/images/banner1.svg | 1 - Keas.Mvc/wwwroot/images/banner2.svg | 1 - Keas.Mvc/wwwroot/images/banner3.svg | 1 - Keas.Mvc/wwwroot/images/banner4.svg | 1 - Keas.Mvc/wwwroot/images/error-cat.jpg | Bin 652497 -> 0 bytes Keas.Mvc/wwwroot/images/logo.svg | 39 - Keas.Mvc/wwwroot/images/thumbnail.jpg | Bin 0 -> 96439 bytes Keas.Mvc/wwwroot/lib/bootstrap/.bower.json | 45 - Keas.Mvc/wwwroot/lib/bootstrap/LICENSE | 21 - .../bootstrap/dist/css/bootstrap-theme.css | 587 -- .../dist/css/bootstrap-theme.css.map | 1 - .../dist/css/bootstrap-theme.min.css | 6 - .../dist/css/bootstrap-theme.min.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.css | 6757 ----------------- .../lib/bootstrap/dist/css/bootstrap.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.min.css | 6 - .../bootstrap/dist/css/bootstrap.min.css.map | 1 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../lib/bootstrap/dist/js/bootstrap.js | 2377 ------ .../lib/bootstrap/dist/js/bootstrap.min.js | 7 - Keas.Mvc/wwwroot/lib/bootstrap/dist/js/npm.js | 13 - docs/FRONTEND.md | 28 +- 49 files changed, 66 insertions(+), 10195 deletions(-) delete mode 100644 Keas.Mvc/wwwroot/images/banner1.svg delete mode 100644 Keas.Mvc/wwwroot/images/banner2.svg delete mode 100644 Keas.Mvc/wwwroot/images/banner3.svg delete mode 100644 Keas.Mvc/wwwroot/images/banner4.svg delete mode 100644 Keas.Mvc/wwwroot/images/error-cat.jpg delete mode 100644 Keas.Mvc/wwwroot/images/logo.svg create mode 100644 Keas.Mvc/wwwroot/images/thumbnail.jpg delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/.bower.json delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/LICENSE delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap.css delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/js/bootstrap.js delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js delete mode 100644 Keas.Mvc/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/Keas.Mvc/ClientApp/src/components/Keys/AssociateSpace.tsx b/Keas.Mvc/ClientApp/src/components/Keys/AssociateSpace.tsx index 8aabfd8e2..037153f52 100644 --- a/Keas.Mvc/ClientApp/src/components/Keys/AssociateSpace.tsx +++ b/Keas.Mvc/ClientApp/src/components/Keys/AssociateSpace.tsx @@ -168,7 +168,7 @@ const AssociateSpace = (props: IProps) => { {renderCreateKey()} - {error} + {error} - - - - - - - - - -

Asset color examples

-
- - - - - - - - - - - - - - - - - - -
- - diff --git a/Keas.Mvc/Views/Shared/_Layout.cshtml b/Keas.Mvc/Views/Shared/_Layout.cshtml index aff3c576a..77d89d61b 100644 --- a/Keas.Mvc/Views/Shared/_Layout.cshtml +++ b/Keas.Mvc/Views/Shared/_Layout.cshtml @@ -10,6 +10,11 @@ @{ var currentController = this.ViewContext.RouteData.Values["controller"].ToString(); var activeMenu = string.Empty; + var pageTitle = $"{ViewData["Title"]} - PEAKS"; + var siteDescription = "Manage people, equipment, access, keys, and spaces with PEAKS at UC Davis."; + var siteOrigin = $"{Context.Request.Scheme}://{Context.Request.Host}"; + var pageUrl = $"{siteOrigin}{Context.Request.PathBase}{Context.Request.Path}"; + var previewImageUrl = $"{siteOrigin}{Url.Content("~/images/thumbnail.jpg")}"; switch (currentController.ToLower()) { case "asset": @@ -49,7 +54,23 @@ - @ViewData["Title"] - PEAKS + @pageTitle + + + + + + + + + + + + + + + + @@ -313,7 +334,7 @@
-

Copyright © The Regents of the University of California, Davis campus. +

Copyright © @DateTime.Now.Year The Regents of the University of California, Davis campus. All rights reserved.

Date: Thu, 12 Nov 2026 14:48:18 -0800 Subject: [PATCH 4/6] peaks 2.0 alert --- Keas.Mvc/Views/Home/Index.cshtml | 11 +++++++++++ docs/FRONTEND.md | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Keas.Mvc/Views/Home/Index.cshtml b/Keas.Mvc/Views/Home/Index.cshtml index 530d72cc1..275fb99cb 100644 --- a/Keas.Mvc/Views/Home/Index.cshtml +++ b/Keas.Mvc/Views/Home/Index.cshtml @@ -17,6 +17,17 @@

View your assignments and manage your team's assets.

+
+ @if (Model.PendingItems) {
diff --git a/docs/FRONTEND.md b/docs/FRONTEND.md index 3b3f73e09..051278f0a 100644 --- a/docs/FRONTEND.md +++ b/docs/FRONTEND.md @@ -84,9 +84,13 @@ with a collapsible stacked menu below `lg` and horizontal navigation above it. closing other open dropdowns. The asset navigation uses Tailwind classes too. Reactstrap remains in use for dialogs and other React controls. Its modal compatibility block in `main.css` is required to keep those dialogs visible. -The shared `SearchCombobox` replaces react-bootstrap-typeahead. Some server-rendered -report and bulk-edit dates still use Gijgo; keep its shared report includes and -the `.gj-datepicker-bootstrap` positioning rules until those fields are migrated. +The shared `SearchCombobox` replaces react-bootstrap-typeahead. Server-rendered +report and bulk-edit dates use the same `AssignDate` picker as the React screens. +`renderDateFields.tsx` replaces MVC inputs inside `[data-date-field]` containers, +preserving field names, required validation and `yyyy-MM-dd` submission values. +These fields cover Person Actions, Actions by Admins, Bulk Edit People, and the +team/group Completed Documents and Expiring Items reports. Gijgo's scripts, +stylesheets, initializers and positioning rules have been removed. `src/index.tsx` delegates mounting to `renderApp.tsx`, which uses `createRoot`. Its imports load component styles before site styles. Razor emits all CSS From a012eb4870d00b941c39e86803c7319c7e58bdec Mon Sep 17 00:00:00 2001 From: Cal Date: Thu, 12 Nov 2026 14:57:02 -0800 Subject: [PATCH 5/6] save --- Keas.Mvc/ClientApp/src/components/Access/AssignAccess.tsx | 2 +- .../ClientApp/src/components/Equipment/AssignEquipment.tsx | 2 +- .../src/components/Equipment/DuplicateEquipment.tsx | 2 +- .../src/components/Equipment/EquipmentContainer.test.tsx | 6 +++--- Keas.Mvc/ClientApp/src/components/Keys/AssignKeySerial.tsx | 2 +- Keas.Mvc/ClientApp/src/components/Keys/CreateKey.tsx | 2 +- .../src/components/Keys/KeySerialContainer.test.tsx | 2 +- Keas.Mvc/ClientApp/src/components/People/CreatePerson.tsx | 2 +- .../src/components/Workstations/AssignWorkstation.tsx | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Keas.Mvc/ClientApp/src/components/Access/AssignAccess.tsx b/Keas.Mvc/ClientApp/src/components/Access/AssignAccess.tsx index 0fc8898c7..f38e9a1d0 100644 --- a/Keas.Mvc/ClientApp/src/components/Access/AssignAccess.tsx +++ b/Keas.Mvc/ClientApp/src/components/Access/AssignAccess.tsx @@ -218,7 +218,7 @@ const AssignAccess = (props: IProps) => { onClick={assignSelected} disabled={!validState || submitting} > - Assign {submitting && } + {access?.id ? 'Assign' : 'Save'} {submitting && } {' '} diff --git a/Keas.Mvc/ClientApp/src/components/Equipment/AssignEquipment.tsx b/Keas.Mvc/ClientApp/src/components/Equipment/AssignEquipment.tsx index 959acf2bf..16b8abc8d 100644 --- a/Keas.Mvc/ClientApp/src/components/Equipment/AssignEquipment.tsx +++ b/Keas.Mvc/ClientApp/src/components/Equipment/AssignEquipment.tsx @@ -253,7 +253,7 @@ const AssignEquipment = (props: IProps) => { onClick={assignSelected} disabled={!validState || submitting} > - {equipment?.assignment ? 'Save changes' : 'Assign'} {submitting && } + {!equipment?.id ? 'Save' : equipment.assignment ? 'Save changes' : 'Assign'} {submitting && } {' '} diff --git a/Keas.Mvc/ClientApp/src/components/Equipment/DuplicateEquipment.tsx b/Keas.Mvc/ClientApp/src/components/Equipment/DuplicateEquipment.tsx index add3390c7..aab379e3c 100644 --- a/Keas.Mvc/ClientApp/src/components/Equipment/DuplicateEquipment.tsx +++ b/Keas.Mvc/ClientApp/src/components/Equipment/DuplicateEquipment.tsx @@ -231,7 +231,7 @@ const DuplicateEquipment = (props: IProps) => { {submitting ?