Fix user and poster not showing in vouchers

overlord/src/app/issue/issue.component.html

@@ -134,9 +134,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/issue/issue.component.ts

@@ -58,7 +58,7 @@ export interface IssueFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -139,7 +139,7 @@ export class IssueComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? new User(),
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/journal/journal.component.html

@@ -174,8 +174,8 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
-      >. {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
+      >. {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/journal/journal.component.ts

@@ -26,6 +26,7 @@ import { AccountService } from '../core/account.service';
 import { CostCentre } from '../core/cost-centre';
 import { DbFile } from '../core/db-file';
 import { Journal } from '../core/journal';
+import { User } from '../core/user';
 import { Voucher } from '../core/voucher';
 import { VoucherService } from '../core/voucher.service';
 import { AccountingPipe } from '../shared/accounting.pipe';
@@ -64,7 +65,7 @@ export interface JournalFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -194,7 +195,7 @@ export class JournalComponent {
       posted: voucher.posted,
       creationDate: voucher.creationDate,
       lastEditDate: voucher.lastEditDate,
-      userName: voucher.user?.name ?? '',
+      userName: voucher.user ?? new User(),
       poster: voucher.poster,
     }),
   });

overlord/src/app/payment/payment.component.html

@@ -182,9 +182,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/payment/payment.component.ts

@@ -65,7 +65,7 @@ export interface PaymentFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -153,7 +153,7 @@ export class PaymentComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? new User(),
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/purchase-return/purchase-return.component.html

@@ -207,9 +207,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/purchase-return/purchase-return.component.ts

@@ -68,7 +68,7 @@ export interface PurchaseReturnFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -157,7 +157,7 @@ export class PurchaseReturnComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/purchase/purchase.component.html

@@ -227,9 +227,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/purchase/purchase.component.ts

@@ -73,7 +73,7 @@ export interface PurchaseFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -165,7 +165,7 @@ export class PurchaseComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/receipt/receipt.component.html

@@ -177,8 +177,8 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
-      >. {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
+      >. {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/receipt/receipt.component.ts

@@ -65,7 +65,7 @@ export interface ReceiptFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -155,7 +155,7 @@ export class ReceiptComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },