Started working on optional fields (members)
This commit is contained in:
parent
cf2c70df0d
commit
8226329b61
5 changed files with 204 additions and 10 deletions
|
|
@ -76,9 +76,23 @@ func MemberShow(c *fiber.Ctx) error {
|
|||
person.FirstName,
|
||||
)
|
||||
|
||||
var fields []models.Field
|
||||
db.Order("name collate nocase asc").Find(
|
||||
&fields, "person_type = ?", "member",
|
||||
)
|
||||
|
||||
var fieldValues []models.FieldValue
|
||||
db.Preload("ListItem").Find(
|
||||
&fieldValues,
|
||||
"person_id = ?",
|
||||
person.ID,
|
||||
)
|
||||
|
||||
return c.Render("person", fiber.Map{
|
||||
"PageTitle": title,
|
||||
"Person": person,
|
||||
"PageTitle": title,
|
||||
"Person": person,
|
||||
"Fields": fields,
|
||||
"FieldValues": fieldValues,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -215,7 +229,7 @@ func MemberEdit(c *fiber.Ctx) error {
|
|||
title := fmt.Sprintf(
|
||||
"%s %s | Modifier membre",
|
||||
person.LastName,
|
||||
person.LastName,
|
||||
person.FirstName,
|
||||
)
|
||||
|
||||
var sections []models.Section
|
||||
|
|
@ -313,11 +327,27 @@ func MemberEdit(c *fiber.Ctx) error {
|
|||
}
|
||||
}
|
||||
|
||||
var fields []models.Field
|
||||
db.Preload("List").Preload("List.ListItems").Order(
|
||||
"name collate nocase asc",
|
||||
).Find(
|
||||
&fields, "person_type = ?", "member",
|
||||
)
|
||||
|
||||
var fieldValues []models.FieldValue
|
||||
db.Preload("ListItem").Find(
|
||||
&fieldValues,
|
||||
"person_id = ?",
|
||||
person.ID,
|
||||
)
|
||||
|
||||
return c.Render("person_form", fiber.Map{
|
||||
"PageTitle": title,
|
||||
"Person": person,
|
||||
"Sections": sections,
|
||||
"Errors": errors,
|
||||
"PageTitle": title,
|
||||
"Person": person,
|
||||
"Sections": sections,
|
||||
"Fields": fields,
|
||||
"FieldValues": fieldValues,
|
||||
"Errors": errors,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue