BP 642: Added columns for organisationDistance and privateDistance
diff --git a/src/app/reporting/components/dashboard/dashboard.component.html b/src/app/reporting/components/dashboard/dashboard.component.html
index cd137b3..a404b1e 100644
--- a/src/app/reporting/components/dashboard/dashboard.component.html
+++ b/src/app/reporting/components/dashboard/dashboard.component.html
@@ -104,6 +104,8 @@
<th>Mobil Privat</th>
<th>Mobil Geschäftl.</th>
<th>Funk Geschäftl.</th>
+ <th>Strecke Privat</th>
+ <th>Strecke Geschäftl.</th>
<th>von</th>
<th>bis</th>
</tr>
@@ -123,6 +125,8 @@
<td scope="row">{{row.user?.privateContactData?.cellphone}}</td>
<td scope="row">{{row.user?.businessContactData?.cellphone}}</td>
<td scope="row">{{row.user?.businessContactData?.radiocomm}}</td>
+ <td scope="row">{{row.privateDistance}}</td>
+ <td scope="row">{{row.organisationDistance}}</td>
<td scope="row">{{(row.validFrom | date:'HH:mm')}} Uhr</td>
<td scope="row">{{(row.validTo | date:'HH:mm')}} Uhr</td>
</tr>
@@ -130,7 +134,7 @@
<td></td>
<td scope="row">{{groupUser.standbyGroup?.title}}</td>
<td scope="row">{{groupUser.user?.organisation?.orgaName}}</td>
- <td scope="row">{{row.user?.firstname}}</td>
+ <td scope="row">{{groupUser.user?.firstname}}</td>
<td scope="row">{{groupUser.user?.lastname}}</td>
<td scope="row">{{groupUser.user?.privateAddress?.community}}</td>
<td scope="row">{{groupUser.user?.privateAddress?.street}}</td>
@@ -138,6 +142,8 @@
<td scope="row">{{groupUser.user?.privateContactData?.cellphone}}</td>
<td scope="row">{{groupUser.user?.businessContactData?.cellphone}}</td>
<td scope="row">{{groupUser.user?.businessContactData?.radiocomm}}</td>
+ <td scope="row">{{row.privateDistance}}</td>
+ <td scope="row">{{row.organisationDistance}}</td>
<td scope="row">{{(groupUser.user?.validFrom | date:'dd.MM.yy')}}</td>
<td scope="row">{{(groupUser.user?.validTo | date:'dd.MM.yy')}}</td>
</tr>
