From 6fb5a7f971c56997c73ce5b0d1e3e1116e000586 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Tue, 7 Apr 2026 16:25:14 +0000 Subject: [PATCH] Fix icons on RMO, add phone data to district --- .../rmo/district-compliance-contact.html | 24 ------------------- platform/organization.go | 3 +++ resource/district.go | 14 ++++++----- ts/rmo/content/compliance/Complete.vue | 2 +- ts/rmo/content/compliance/Contact.vue | 2 +- vite/rmo/main.ts | 1 + 6 files changed, 14 insertions(+), 32 deletions(-) diff --git a/html/template/rmo/district-compliance-contact.html b/html/template/rmo/district-compliance-contact.html index 12d40c65..ab4763db 100644 --- a/html/template/rmo/district-compliance-contact.html +++ b/html/template/rmo/district-compliance-contact.html @@ -2,30 +2,6 @@ {{ define "title" }}Contact Information{{ end }} {{ define "extraheader" }} - {{ end }} {{ define "content" }} -
{{ end }} diff --git a/platform/organization.go b/platform/organization.go index 3ed5c8d5..f1128a9b 100644 --- a/platform/organization.go +++ b/platform/organization.go @@ -62,6 +62,9 @@ func (o Organization) MarshalJSON() ([]byte, error) { func (o Organization) Name() string { return o.model.Name } +func (o Organization) PhoneOffice() string { + return o.model.OfficePhone.GetOr("") +} func (o Organization) IsSyncOngoing() bool { return IsSyncOngoing(o.ID) } diff --git a/resource/district.go b/resource/district.go index 8b36e982..22cedb9c 100644 --- a/resource/district.go +++ b/resource/district.go @@ -13,9 +13,10 @@ type districtR struct { } type district struct { - Name string `json:"name"` - Slug string `json:"slug"` - URLLogo string `json:"url_logo"` + Name string `json:"name"` + PhoneOffice string `json:"phone_office"` + Slug string `json:"slug"` + URLLogo string `json:"url_logo"` } func District(r *router) *districtR { @@ -40,9 +41,10 @@ func (res *districtR) List(ctx context.Context, r *http.Request, query QueryPara return nil, nhttp.NewError("logo url: %w", err) } districts = append(districts, &district{ - Name: org.Name(), - Slug: slug, - URLLogo: logo, + Name: org.Name(), + PhoneOffice: org.PhoneOffice(), + Slug: slug, + URLLogo: logo, }) } return districts, nil diff --git a/ts/rmo/content/compliance/Complete.vue b/ts/rmo/content/compliance/Complete.vue index 8a149ee3..d7cea4a6 100644 --- a/ts/rmo/content/compliance/Complete.vue +++ b/ts/rmo/content/compliance/Complete.vue @@ -138,7 +138,7 @@

{{ district.name }}

-
+
{{ district.phone_office }}
diff --git a/ts/rmo/content/compliance/Contact.vue b/ts/rmo/content/compliance/Contact.vue index 6f266e3e..e326e6ef 100644 --- a/ts/rmo/content/compliance/Contact.vue +++ b/ts/rmo/content/compliance/Contact.vue @@ -24,7 +24,7 @@

- Why share your contact information?
+ Why share your contact information?
Providing your contact information helps the District review your response and coordinate with you if a visit is still needed. This diff --git a/vite/rmo/main.ts b/vite/rmo/main.ts index d0f531cd..c1613d6d 100644 --- a/vite/rmo/main.ts +++ b/vite/rmo/main.ts @@ -1,6 +1,7 @@ import { createApp } from "vue"; import { createHead } from "@vueuse/head"; import { createPinia } from "pinia"; +import "bootstrap-icons/font/bootstrap-icons.css"; import "@/gen/custom-icons.scss"; import "@/style/rmo.scss"; import router from "@/rmo/router";