Fix populating water report from ID, make ContactSimple
ContactSimple is the replacement for ContactReporter, which was the simplified form of a contact from a report. I made the name more generic and use it in the general report structures for consistency.
This commit is contained in:
parent
75d0283453
commit
5e103f46a0
14 changed files with 103 additions and 108 deletions
|
|
@ -70,12 +70,12 @@
|
|||
}}</a>
|
||||
</label>
|
||||
<label
|
||||
v-if="report.reporter.phone.e164 != ''"
|
||||
v-if="report.reporter.phone.number != ''"
|
||||
class="form-label text-muted small mb-0"
|
||||
>
|
||||
<i class="bi bi-phone"></i>
|
||||
<a :href="'tel:+' + report.reporter.phone.e164">{{
|
||||
report.reporter.phone.e164
|
||||
<a :href="'tel:+' + report.reporter.phone.number">{{
|
||||
report.reporter.phone.number
|
||||
}}</a>
|
||||
</label>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
v-if="
|
||||
!(
|
||||
selectedReport?.reporter.email ||
|
||||
selectedReport?.reporter.phone.e164 != ''
|
||||
selectedReport?.reporter.phone.number != ''
|
||||
)
|
||||
"
|
||||
class="mb-3"
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
<div
|
||||
v-if="
|
||||
selectedReport?.reporter.email ||
|
||||
selectedReport?.reporter.phone.e164 != ''
|
||||
selectedReport?.reporter.phone.number != ''
|
||||
"
|
||||
class="mb-3"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -86,14 +86,11 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label
|
||||
v-if="report.owner.emails.length"
|
||||
class="form-label text-muted small mb-0"
|
||||
>
|
||||
<label v-if="report.owner.email" class="form-label text-muted small mb-0">
|
||||
<i class="bi bi-envelope"></i>
|
||||
</label>
|
||||
<label
|
||||
v-if="report.owner.phones.length"
|
||||
v-if="report.owner.phone.number"
|
||||
class="form-label text-muted small mb-0"
|
||||
>
|
||||
<i class="bi bi-phone"></i>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue