got Find Users to work

This commit is contained in:
2025-10-21 22:31:00 -06:00
parent fe6d53a965
commit d887bd6cab
4 changed files with 184 additions and 2 deletions
+28
View File
@@ -18,6 +18,7 @@ import (
"reflect"
"regexp"
"strconv"
"strings"
"time"
"git.erbosoft.com/amy/amsterdam/config"
@@ -137,6 +138,32 @@ func displayMemberCount(a jet.Arguments) reflect.Value {
return reflect.ValueOf(count)
}
func displayFullName(a jet.Arguments) reflect.Value {
ci := a.Get(0).Convert(reflect.TypeFor[*database.ContactInfo]()).Interface().(*database.ContactInfo)
var rc strings.Builder
if ci.Prefix != nil && *ci.Prefix != "" {
rc.WriteString(*ci.Prefix)
rc.WriteString(" ")
}
if ci.GivenName != nil && *ci.GivenName != "" {
rc.WriteString(*ci.GivenName)
}
if ci.MiddleInit != nil && *ci.MiddleInit != "" {
rc.WriteString(" ")
rc.WriteString(*ci.MiddleInit)
rc.WriteString(".")
}
if ci.FamilyName != nil && *ci.FamilyName != "" {
rc.WriteString(" ")
rc.WriteString(*ci.FamilyName)
}
if ci.Suffix != nil && *ci.Suffix != "" {
rc.WriteString(" ")
rc.WriteString(*ci.Suffix)
}
return reflect.ValueOf(rc.String())
}
// SetupTemplates is called to set up the template renderer after the configuration is loaded.
func SetupTemplates() {
views = jet.NewSet(
@@ -154,6 +181,7 @@ func SetupTemplates() {
views.AddGlobalFunc("ExtractCommunityLogo", extractCommunityLogo)
views.AddGlobalFunc("DisplayActivity", displayActivity)
views.AddGlobalFunc("DisplayMemberCount", displayMemberCount)
views.AddGlobalFunc("DisplayFullName", displayFullName)
views.AddGlobalFunc("GetCountryList", func(jet.Arguments) reflect.Value {
return reflect.ValueOf(util.AmCountryList())
+16 -1
View File
@@ -235,7 +235,22 @@
</div>
</div>
{{ else if mode == "USR" }}
TODO: I don't know USR yet
<!-- User Result -->
<div class="flex items-start gap-3">
<span class="text-sm pt-0.5 flex-shrink-0">🟣</span>
<div class="flex-1">
<div class="mb-2">
<a href="/user/{{ rx.Username }}"
class="text-blue-700 hover:text-blue-900 font-bold text-base">{{ rx.Username }}</a>
</div>
<div class="text-sm text-gray-700 space-y-1">
<div>
{{ ci := rx.ContactInfoQ() }}
{{ DisplayFullName(ci) }}, from {{ ci.Locality }}, {{ ci.Region }} {{ ci.Country }}
</div>
</div>
</div>
</div>
{{ else if mode == "CAT" }}
TODO: I don't know CAT yet
{{ else if mode == "PST" }}