Add properties, method and template tag for showing the right name

src/backoffice/templates/approve_public_credit_names.html

@@ -19,17 +19,15 @@ <h2>Approve Public Credit Names</h2>
     <table class="table table-hover datatable">
       <thead>
         <tr>
-          <th>Username</th>
-          <th>Email</th>
-          <th>Public Credit Name</th>
+          <th>Private name</th>
+          <th>Public credit name</th>
           <th>Actions</th>
         </tr>
       </thead>
       <tbody>
         {% for profile in profiles %}
           <tr>
-            <td>{{ profile.user.username }}</td>
-            <td>{{ profile.user.email }}</td>
+            <td>{{ profile.private_name }}</td>
             <td>{{ profile.public_credit_name }}</td>
             <td>
               <a href="/admin/profiles/profile/{{ profile.pk }}/change/" class="btn btn-success">Open In Admin</a>

src/backoffice/templates/facilityfeedback_backoffice.html

@@ -16,36 +16,38 @@ <h3 class="card-title">Facility Feedback for {{ team.name }} Team ({{ feedback_l
         <form method="post">
           {{ formset.management_form }}
           {% csrf_token %}
-          {% for form, feedback in formset|zip:feedback_list %}
+          {% for form in formset %}
             <div class="card">
               <div class="card-header">
-                <h4 class="card-title">Feedback for {{ feedback.facility.name }} by {{ feedback.user.profile.public_credit_name|default:"Anonymous User" }}</h4>
+                <h4 class="card-title">
+                  Feedback for {{ form.instance.facility.name }} by {{ form.instance.user.profile.public_name|default:'Anonymous user' }}
+                </h4>
               </div>
               <div class="card-body">
                 <table class="table">
                   <tr>
-                    <th>Username</th>
-                    <td>{{ feedback.user }}</td>
+                    <th>User</th>
+                    <td>{{ form.instance.user.profile.private_name|default:'Anonymous user' }}</td>
                   </tr>
                   <tr>
                     <th>Created</th>
-                    <td>{{ feedback.created }}</td>
+                    <td>{{ form.instance.created }}</td>
                   </tr>
                   <tr>
                     <th>Facility</th>
-                    <td>{{ feedback.facility }}</td>
+                    <td>{{ form.instance.facility }}</td>
                   </tr>
                   <tr>
                     <th>Quick Feedback</th>
-                    <td><i class="{{ feedback.quick_feedback.icon }} fa-2x"></i> {{ feedback.quick_feedback }}</td>
+                    <td><i class="{{ form.instance.quick_feedback.icon }} fa-2x"></i> {{ form.instance.quick_feedback }}</td>
                   </tr>
                   <tr>
                     <th>Comment</th>
-                    <td>{{ feedback.comment|default:"N/A" }}</td>
+                    <td>{{ form.instance.comment|default:"N/A" }}</td>
                   </tr>
                   <tr>
                     <th>Urgent</th>
-                    <td class="{% if feedback.urgent %}text-bg-danger{% endif %}">{{ feedback.urgent|yesno }}</td>
+                    <td class="{% if form.instance.urgent %}text-bg-danger{% endif %}">{{ form.instance.urgent|yesno }}</td>
                   </tr>
                   <tr>
                     <th>Handled</th>

src/backoffice/templates/feedback_detail.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Event Feedback Detail | Orga | BackOffice | {{ block.super }}
@@ -16,7 +17,7 @@ <h3 class="card-title">Event Feedback detail</h3>
             <p>{{ feedback.feedback }}</p>
           </blockquote>
           <figcaption class="blockquote-footer">
-            <cite title="Source Title">{{ feedback.user.profile.public_credit_name }}</cite>
+            <cite title="Source Title">{% display_name feedback.user.profile %}</cite>
           </figcaption>
         </figure>
       </div>

src/backoffice/templates/feedback_list.html

@@ -20,8 +20,8 @@ <h2>Event Feedback List</h2>
     <table class="table table-hover datatable">
       <thead>
         <tr>
-          <th>Username</th>
-          <th>Public Credit Name</th>
+          <th>Private name</th>
+          <th>Public credit name</th>
           <th>Feedback</th>
           <th>Processed at</th>
           <th>Processed by</th>
@@ -31,8 +31,8 @@ <h2>Event Feedback List</h2>
       <tbody>
         {% for feedback in object_list %}
           <tr>
-            <td>{{ feedback.user.username }}</td>
-            <td>{{ feedback.user.profile.public_credit_name }}</td>
+            <td>{{ feedback.user.profile.private_name }}</td>
+            <td>{{ feedback.user.profile.public_name }}</td>
             <td>{{ feedback.feedback|truncatewords:12 }}</td>
             <td>{{ feedback.processed_at|default_if_none:"" }}</td>
             <td>{{ feedback.processed_by|default_if_none:"" }}</td>

src/backoffice/templates/feedback_list_processed_confirm.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Confirm Event Feedback Processed | {{ block.super }}
@@ -16,7 +17,7 @@ <h3 class="card-title">Mark event feedback as processed</h3>
             <p>{{ feedback.feedback }}</p>
           </blockquote>
           <figcaption class="blockquote-footer">
-            <cite title="Source Title">{{ feedback.user.profile.public_credit_name }}</cite>
+            <cite title="Source Title">{% display_name feedback.user.profile %}</cite>
           </figcaption>
         </figure>
       </div>

src/backoffice/templates/includes/invoice_list_panel.html

@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if invoice_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -16,7 +18,7 @@
       {% for invoice in invoice_list %}
         <tr>
           <td>{{ invoice.id }}</td>
-          <td>{% if invoice.order %}{{ invoice.order.user.username }} &lt;{{ invoice.order.user.email }}&gt;{% else %}{{ invoice.customorder.customer }}{% endif %}</td>
+          <td>{% if invoice.order %}{% display_name invoice.order.user.profile %} &lt;{{ invoice.order.user.email }}&gt;{% else %}{{ invoice.customorder.customer }}{% endif %}</td>
           <td data-order="{{ invoice.created|sortable }}">{{ invoice.created|date }}</td>
           <td data-order="{% if invoice.order %}{{ invoice.order.total }}{% else %}{{ invoice.customorder.amount }}{% endif %}">{% if invoice.order %}{{ invoice.order.total }}{% else %}{{ invoice.customorder.amount }}{% endif %}&nbsp;DKK</td>
           <td>{{ invoice.get_order }}</td>

src/backoffice/templates/includes/posreport_list_table.html

@@ -19,10 +19,10 @@
       <tr>
         <td data-order="{{ pr.period.lower|sortable }}"><a href="{% url 'backoffice:posreport_detail' camp_slug=camp.slug pos_slug=pos.slug posreport_uuid=pr.uuid %}">{{ pr.period.lower }} - {{ pr.period.upper }}</a></td>
         <td>
-            Bank&nbsp;Start:&nbsp;{{ pr.bank_responsible_start.profile.get_name|default:"N/A" }}<br>
-            Bank&nbsp;End:&nbsp;{{ pr.bank_responsible_end.profile.get_name|default:"N/A" }}<br>
-            Pos&nbsp;Start:&nbsp;{{ pr.pos_responsible_start.profile.get_name|default:"N/A" }}<br>
-            Pos&nbsp;End:&nbsp;{{ pr.pos_responsible_end.profile.get_name|default:"N/A" }}
+            Bank&nbsp;Start:&nbsp;{{ pr.bank_responsible_start.profile.private_name|default:"N/A" }}<br>
+            Bank&nbsp;End:&nbsp;{{ pr.bank_responsible_end.profile.private_name|default:"N/A" }}<br>
+            Pos&nbsp;Start:&nbsp;{{ pr.pos_responsible_start.profile.private_name|default:"N/A" }}<br>
+            Pos&nbsp;End:&nbsp;{{ pr.pos_responsible_end.profile.private_name|default:"N/A" }}
         </td>
         <td data-order="{{ pr.dkk_sales_izettle }}">{{ pr.dkk_sales_izettle }}&nbsp;DKK</td>
         <td data-order="{{ pr.dkk_balance }}" class="text-right">

src/backoffice/templates/includes/refund_list_panel.html

@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 <table class="table table-hover datatable">
   <thead>
     <tr>
@@ -19,7 +21,7 @@
     {% for refund in refund_list %}
       <tr>
         <td>{{ refund.id }}</td>
-        <td>{{ refund.order.user.username }} &lt;{{ refund.order.user.email }}&gt;</td>
+        <td>{% display_name refund.order.user.profile %} &lt;{{ refund.order.user.email }}&gt;</td>
         <td data-order="{{ refund.amount }}">{{ refund.amount }} DKK</td>
         <td data-order="{{ refund.created|sortable }}">{{ refund.created }}</td>
         <td data-order="{{ refund.updated|sortable }}">{{ refund.updated }}</td>

src/backoffice/templates/permissions_by_permission.html

@@ -27,13 +27,17 @@
                 <td>{{ perm.name }}</td>
                 <td>
                   <table class="table">
-                    <thead><tr><th>Username</th><th>Name</th><th>Public Credit Name</th></tr></thead>
+                    <thead>
+                      <tr>
+                        <th>Private name</th>
+                        <th>Public credit name</th>
+                      </tr>
+                    </thead>
                     <tbody>
                       {% for user in users %}
                         <tr>
-                          <td>{{ user.username }}</td>
-                          <td>{{ user.profile.name }}</td>
-                          <td>{{ user.profile.public_credit_name }}</td>
+                          <td>{{ user.profile.private_name }}</td>
+                          <td>{{ user.profile.public_name }}</td>
                         </tr>
                       {% endfor %}
                     </table>

src/backoffice/templates/permissions_by_user.html

@@ -14,9 +14,8 @@
       <table class="table table-striped table-hover datatable">
         <thead>
           <tr>
-            <th>Username</th>
-            <th>Name</th>
-            <th>Public Credit Name</th>
+            <th>Private name</th>
+            <th>Public credit name</th>
             <th class="text-center">Staff</th>
             <th class="text-center">Superuser</th>
             <th>User Permissions</th>
@@ -26,9 +25,8 @@
         <tbody>
           {% for user in user_list %}
             <tr>
-              <td>{{ user.username }}</td>
-              <td>{{ user.profile.name }}</td>
-              <td>{{ user.profile.public_credit_name }}</td>
+              <td>{{ user.profile.private_name }}</td>
+              <td>{{ user.profile.public_name }}</td>
               <td class="text-center">{{ user.is_staff|truefalseicon }}</td>
               <td class="text-center">{{ user.is_superuser|truefalseicon }}</td>
               <td>{% if user.is_superuser %}ALL{% else %}{% for perm in user.get_user_permissions %}{% if perm|slice:"0:6" == "camps." %}{{ perm }}<br>{% endif %}{% endfor %}{% endif %}</td>

src/backoffice/templates/posreport_detail.html

@@ -41,19 +41,19 @@ <h3 class="card-title">PosReport {{ posreport.date }} {{ posreport.pos.name }} |
           </tr>
           <tr>
             <th>Bank Responsible Start</th>
-            <td>{{ posreport.bank_responsible_start.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.bank_responsible_start.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Bank Responsible End</th>
-            <td>{{ posreport.bank_responsible_end.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.bank_responsible_end.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Pos Responsible Start</th>
-            <td>{{ posreport.pos_responsible_start.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.pos_responsible_start.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Pos Responsible End</th>
-            <td>{{ posreport.pos_responsible_end.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.pos_responsible_end.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>All OK?</th>

src/backoffice/templates/shop_ticket_overview.html

@@ -3,6 +3,7 @@
 {% load commonmark %}
 {% load static %}
 {% load imageutils %}
+{% load profile_display %}
 
 {% block title %}
   Shop Tickets | {{ block.super }}
@@ -37,7 +38,7 @@ <h2>Shop Tickets</h2>
           <td>{{ ticket.product.name }}</td>
           <td class="text-center">{{ ticket.opr.quantity }}</td>
           <td>{{ ticket.order.customer_comment|default:"None" }}</td>
-          <td>{{ ticket.order.user.profile.name }}
+          <td>{% display_name ticket.order.user.profile %}
             / {{ ticket.order.user.email }}</td>
           <td data-order="{{ ticket.used_at|sortable }}">{{ ticket.used_at|default:"N/A" }}</td>
           <td>{{ ticket.order.payment_method }}</td>

src/backoffice/templates/team_permissions_manage.html

@@ -13,8 +13,7 @@ <h3 class="card-header">Manage {{ team.name }} Team Permissions</h3>
         <table class="table table-striped datatable">
           <thead>
             <tr>
-              <th>Username</th>
-              <th>Name</th>
+              <th>Private Name</th>
               <th>Public Credit Name</th>
               <th class="text-center">Superuser</th>
               {% for perm in perms %}
@@ -25,9 +24,8 @@ <h3 class="card-header">Manage {{ team.name }} Team Permissions</h3>
           <tbody>
             {% for member in team.approved_members.all %}
               <tr>
-                <td>{{ member.username }}</td>
-                <td>{{ member.profile.name }}</td>
-                <td>{{ member.profile.public_credit_name }}</td>
+                <td>{{ member.profile.private_name }}</td>
+                <td>{{ member.profile.public_name }}</td>
                 <td class="text-center">{{ member.is_superuser|truefalseicon }}</td>
                 {% for perm in perms %}
                   {% for field in form.visible_fields %}

src/backoffice/templates/token_detail.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Token Details | Pos | BackOffice | {{ block.super }}
@@ -51,16 +52,14 @@ <h3>Token Finds</h3>
       <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
         <thead>
           <tr>
-              <th>Public credit name</th>
-              <th>Username</th>
+            <th>User</th>
             <th>Timestamp</th>
           </tr>
         </thead>
         <tbody>
           {% for tf in token.tokenfind_set.all %}
             <tr>
-              <td>{{ tf.user.profile.public_credit_name }}</td>
-              <td>{{ tf.user.username }}</td>
+              <td>{% display_name tf.user.profile %}</td>
               <td>{{ tf.created }}</td>
             </tr>
           {% endfor %}

src/backoffice/templates/token_stats.html

@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load bornhack %}
+{% load profile_display %}
 
 {% block title %}
   Token Stats | Backoffice | {{ block.super }}
@@ -15,17 +16,15 @@
         <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
           <thead>
             <tr>
-              <th>Public credit name</th>
-              <th>Username</th>
+              <th>User</th>
               <th>Finds</th>
               <th>Last token found</th>
             </tr>
           </thead>
           <tbody>
             {% for user in user_list %}
               <tr>
-                <td>{{ user.profile.public_credit_name }}</td>
-                <td>{{ user.username }}</td>
+                <td>{% display_name user.profile %}</td>
                 <td>{{ user.token_find_count }}</td>
                 <td>{{ user.last_token_find }}</td>
               </tr>

src/economy/templates/includes/expense_detail_panel.html

@@ -1,11 +1,13 @@
+{% load profile_display %}
+
 <div class="card">
   <div class="card-header">Expense Details for {{ expense.pk }}</div>
   <div class="card-body">
     <table class="table">
       {% if request.resolver_match.app_name == "backoffice" %}
         <tr>
           <th>Created By</th>
-          <td>{{ expense.user.profile.get_name }}</td>
+          <td>{% display_name expense.user.profile %}</td>
         </tr>
       {% endif %}
       <tr>

src/economy/templates/includes/expense_list_panel.html

@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if expense_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -31,7 +33,7 @@
           {% endif %}
 
           <td data-order="{{ expense.invoice_date|sortable }}">{{ expense.invoice_date }}</td>
-          <td>{{ expense.user.profile.get_name }}</td>
+          <td>{% display_name expense.user.profile %}</td>
           <td>{{ expense.get_payment_status_display }}</td>
           <td>{{ expense.creditor.name }}</td>
           <td data-order="{{ expense.amount }}">{{ expense.amount }} DKK</td>

src/economy/templates/includes/reimbursement_detail_panel.html

@@ -1,4 +1,5 @@
 {% load bornhack %}
+{% load profile_display %}
 <div class="card">
   <div class="card-header">Reimbursement {{ reimbursement.pk }} Details</div>
   <div class="card-body">
@@ -9,7 +10,7 @@
       </tr>
       <tr>
         <th>Reimbursement User</th>
-        <td>{{ reimbursement.reimbursement_user.profile.get_name }}</td>
+        <td>{% display_name reimbursement.reimbursement_user.profile %}</td>
       </tr>
       <tr>
         <th>Total Amount</th>

src/economy/templates/includes/reimbursement_list_panel.html

@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if reimbursement_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -25,8 +27,8 @@
           {% else %}
             <td>{{ reim.camp }}</td>
           {% endif %}
-          <td>{{ reim.user.profile.get_name }}</td>
-          <td>{{ reim.reimbursement_user.profile.get_name }}</td>
+          <td>{% display_name reim.user.profile %}</td>
+          <td>{% display_name reim.reimbursement_user.profile %}</td>
           <td>{{ reim.bank_account|default:"N/A" }}</td>
           <td>{{ reim.notes|default:"N/A" }}</td>
           <td data-order="{{ reim.amount }}">{{ reim.amount }} DKK</td>