Adding in pronouns

Author: COMTOP1

templates/user.tmpl

@@ -90,6 +90,14 @@
                                 {{.Lastname}}
                             </td>
                         </tr>
+                        <tr style="border: none; padding-bottom: 5px;">
+                            <td style="border: none; padding-right: 20px;">
+                                Pronouns
+                            </td>
+                            <td style="border: none;">
+                                {{.Pronouns}}
+                            </td>
+                        </tr>
                         <tr style="border: none; padding-bottom: 5px;">
                             <td style="border: none; padding-right: 20px;">
                                 Username
@@ -323,6 +331,19 @@
                                         />
                                     </div>
                                 </div>
+                                <div class="field">
+                                    <label class="label" for="pronouns">Pronouns (can be left blank)</label>
+                                    <div class="control">
+                                        <input
+                                                id="pronouns"
+                                                class="input"
+                                                type="text"
+                                                name="pronouns"
+                                                placeholder="Pronouns"
+                                                value="{{.User.Pronouns}}"
+                                        />
+                                    </div>
+                                </div>
                                 <div class="field">
                                     <label class="label" for="username">Username</label>
                                     <div class="control">

templates/users.tmpl

@@ -232,6 +232,18 @@
                                         />
                                     </div>
                                 </div>
+                                <div class="field">
+                                    <label class="label" for="pronouns">Pronouns (can be left blank)</label>
+                                    <div class="control">
+                                        <input
+                                                id="pronouns"
+                                                class="input"
+                                                type="text"
+                                                name="pronouns"
+                                                placeholder="Pronouns"
+                                        />
+                                    </div>
+                                </div>
                                 <div class="field">
                                     <label class="label" for="universityusername">University username</label>
                                     <div class="control">
@@ -333,6 +345,7 @@
                     $("#error").html(data.error);
                     document.getElementById("firstname").value = "";
                     document.getElementById("lastname").value = "";
+                    document.getElementById("pronouns").value = "";
                     document.getElementById("universityusername").value = "";
                     document.getElementById("username").value = "";
                     document.getElementById("email").value = "";

user/db.go

@@ -46,9 +46,9 @@ func (s *Store) countUsersAll(ctx context.Context) (CountUsers, error) {
 // addUser will add a user
 func (s *Store) addUser(ctx context.Context, u User) (User, error) {
 	builder := utils.PSQL().Insert("people.users").
-		Columns("username", "university_username", "email", "first_name", "last_name", "nickname",
+		Columns("username", "university_username", "pronouns", "email", "first_name", "last_name", "nickname",
 			"login_type", "password", "salt", "reset_pw", "enabled", "created_at", "created_by").
-		Values(u.Username, u.UniversityUsername, u.Email, u.Firstname, u.Lastname, u.Nickname, u.LoginType, u.Password,
+		Values(u.Username, u.UniversityUsername, u.Pronouns, u.Email, u.Firstname, u.Lastname, u.Nickname, u.LoginType, u.Password,
 			u.Salt, u.ResetPw, u.Enabled, u.CreatedAt, u.CreatedBy).
 		Suffix("RETURNING user_id")
 
@@ -79,6 +79,7 @@ func (s *Store) editUser(ctx context.Context, u User) error {
 			"password":            u.Password,
 			"salt":                u.Salt,
 			"email":               u.Email,
+			"pronouns":            u.Pronouns,
 			"last_login":          u.LastLogin,
 			"reset_pw":            u.ResetPw,
 			"avatar":              u.Avatar,

views/user.go

@@ -445,10 +445,13 @@ func (v *Views) _userAddPost(c echo.Context) error {
 		return fmt.Errorf("error generating salt: %w", err)
 	}
 
+	pronouns := c.FormValue("pronouns")
+
 	u := user.User{
 		UserID:             0,
 		Username:           username,
 		UniversityUsername: universityUsername,
+		Pronouns:           null.NewString(pronouns, len(pronouns) > 0),
 		LoginType:          "internal",
 		Firstname:          firstName,
 		Nickname:           firstName,