From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 08:19:43 +0000 (+0000)
Subject: people: Show better message when no calls are available to show
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89e4729963f166e15bbf00210a6d455a6507874b;p=ipfire.org.git

people: Show better message when no calls are available to show

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/people/modules/cdr.html b/src/templates/people/modules/cdr.html
index a2ad0a2b..456f8f2f 100644
--- a/src/templates/people/modules/cdr.html
+++ b/src/templates/people/modules/cdr.html
@@ -1,52 +1,58 @@
-<table class="table table-sm mb-0">
-	<thead>
-		<tr>
-			<th></th>
-			<th class="text-right">{{ _("Duration") }}</th>
-		</tr>
-	</thead>
-
-	<tbody>
-		{% for c in cdr %}
+{% if cdr %}
+	<table class="table table-sm mb-0">
+		<thead>
 			<tr>
-				<td>
-					{% if c.direction == "inbound" %}
-						<span class="fas fa-arrow-right text-danger"></span>
+				<th></th>
+				<th class="text-right">{{ _("Duration") }}</th>
+			</tr>
+		</thead>
 
-						<a href="/users/{{ account.uid }}/calls/{{ c.uuid }}">
-							{% if c.callee %}
-								{{ c.callee }}
-							{% else %}
-								{{ format_phone_number(c.callee_number) }}
-							{% end %}
-						</a>
-					{% elif c.direction == "outbound" %}
-						<span class="fas fa-arrow-left text-success"></span>
+		<tbody>
+			{% for c in cdr %}
+				<tr>
+					<td>
+						{% if c.direction == "inbound" %}
+							<span class="fas fa-arrow-right text-danger"></span>
 
-						<a href="/users/{{ account.uid }}/calls/{{ c.uuid }}">
-							{% if c.caller %}
-								{{ c.caller }}
-							{% else %}
-								{{ format_phone_number(c.caller_number) }}
-							{% end %}
-						</a>
-					{% end %}
+							<a href="/users/{{ account.uid }}/calls/{{ c.uuid }}">
+								{% if c.callee %}
+									{{ c.callee }}
+								{% else %}
+									{{ format_phone_number(c.callee_number) }}
+								{% end %}
+							</a>
+						{% elif c.direction == "outbound" %}
+							<span class="fas fa-arrow-left text-success"></span>
 
-					<br>
+							<a href="/users/{{ account.uid }}/calls/{{ c.uuid }}">
+								{% if c.caller %}
+									{{ c.caller }}
+								{% else %}
+									{{ format_phone_number(c.caller_number) }}
+								{% end %}
+							</a>
+						{% end %}
 
-					{% module MOS(c) %}
-				</td>
+						<br>
 
-				<td class="text-right">
-					{{ locale.format_date(c.time_start, relative=False) }} <br>
+						{% module MOS(c) %}
+					</td>
 
-					{% if c.time_answered %}
-						<span class="text-muted">{{ format_time(c.duration) }}</span>
-					{% else %}
-						<span class="text-danger">{{ _("Not Answered") }}</span>
-					{% end %}
-				</td>
-			</tr>
-		{% end %}
-	</tbody>
-</table>
+					<td class="text-right">
+						{{ locale.format_date(c.time_start, relative=False) }} <br>
+
+						{% if c.time_answered %}
+							<span class="text-muted">{{ format_time(c.duration) }}</span>
+						{% else %}
+							<span class="text-danger">{{ _("Not Answered") }}</span>
+						{% end %}
+					</td>
+				</tr>
+			{% end %}
+		</tbody>
+	</table>
+{% else %}
+	<p class="text-muted text-center my-5">
+		{{ _("There are no calls") }}
+	</p>
+{% end %}
diff --git a/src/web/people.py b/src/web/people.py
index 7eb2d062..c5f18f5b 100644
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -356,7 +356,8 @@ class CDRModule(ui_modules.UIModule):
 	def render(self, account, date=None, limit=None):
 		cdr = account.get_cdr(date=date, limit=limit)
 
-		return self.render_string("people/modules/cdr.html", account=account, cdr=cdr)
+		return self.render_string("people/modules/cdr.html",
+			account=account, cdr=list(cdr))
 
 
 class ChannelsModule(ui_modules.UIModule):