Adding message when no data
This commit is contained in:
parent
d9c2c6f5f6
commit
f1e1cbfdd9
6 changed files with 62 additions and 43 deletions
|
|
@ -133,7 +133,7 @@ class ApiController extends Controller
|
|||
// Getting the notifications sent
|
||||
$notifications = $task
|
||||
->notifications()
|
||||
->with('contact')
|
||||
->with(['contact', 'task_history'])
|
||||
->where('notifications.created_at', '>', $first_day->toDateString())
|
||||
->orderBy('notifications.created_at', 'desc')
|
||||
->get()
|
||||
|
|
|
|||
|
|
@ -111,6 +111,13 @@ html body table td.right {
|
|||
html body table#tasks_tbl, html body table#contacts_tbl {
|
||||
width: 100%;
|
||||
}
|
||||
html body .no-data {
|
||||
text-align: center;
|
||||
font-style: italic;
|
||||
margin-bottom: 1.3rem;
|
||||
font-size: 0.9rem;
|
||||
color: #727272;
|
||||
}
|
||||
html body .quick-view .new-group {
|
||||
margin: 0.2rem;
|
||||
display: inline-block;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -111,41 +111,48 @@ html {
|
|||
}
|
||||
|
||||
table {
|
||||
border: 1px solid #ABC;
|
||||
font-size: 14px;
|
||||
border-spacing : 0;
|
||||
border-collapse : collapse;
|
||||
border: 1px solid #ABC;
|
||||
font-size: 14px;
|
||||
border-spacing : 0;
|
||||
border-collapse : collapse;
|
||||
|
||||
th {
|
||||
background-color: #e6EEEE;
|
||||
border: 1px solid #9ccece;
|
||||
padding: 0.3rem;
|
||||
th {
|
||||
background-color: #e6EEEE;
|
||||
border: 1px solid #9ccece;
|
||||
padding: 0.3rem;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
color: #3D3D3D;
|
||||
padding: 0.3rem;
|
||||
background-color: #FFF;
|
||||
border: 1px solid #9ccece;
|
||||
text-align: center;
|
||||
td {
|
||||
color: #3D3D3D;
|
||||
padding: 0.3rem;
|
||||
background-color: #FFF;
|
||||
border: 1px solid #9ccece;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
|
||||
img {
|
||||
vertical-align: middle;
|
||||
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
&.right {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
&#tasks_tbl, &#contacts_tbl {
|
||||
width: 100%;
|
||||
&.right {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
&#tasks_tbl, &#contacts_tbl {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
.no-data {
|
||||
text-align: center;
|
||||
font-style: italic;
|
||||
margin-bottom: 1.3rem;
|
||||
font-size: .9rem;
|
||||
color: #727272;
|
||||
}
|
||||
|
||||
.quick-view {
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</h3>
|
||||
<div class="block-content">
|
||||
<div
|
||||
v-if="1 == 1"
|
||||
v-if="tasks && Object.keys(tasks).length > 0"
|
||||
>
|
||||
<div
|
||||
v-for="group in tasks"
|
||||
|
|
@ -28,9 +28,10 @@
|
|||
<p class="spacer"> </p>
|
||||
</div>
|
||||
<div
|
||||
class="no-data"
|
||||
v-else
|
||||
>
|
||||
<center>Sorry, there is no task here.</center>
|
||||
Sorry, there is no task here.
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<h3>Last {{ days }} days uptime</h3>
|
||||
<div class="block-content">
|
||||
<apexchart class="graph" v-if="charts.uptime.render" type="bar" height="350" :options="charts.uptime.options" :series="charts.uptime.series"></apexchart>
|
||||
<p class="no-data" v-else>No chart to display here</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -31,6 +32,7 @@
|
|||
<h3>Last {{ days }} days response time</h3>
|
||||
<div class="block-content">
|
||||
<apexchart class="graph" v-if="charts.response.render" type="line" height="350" :options="charts.response.options" :series="charts.response.series"></apexchart>
|
||||
<p class="no-data" v-else>No chart to display here</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -39,7 +41,7 @@
|
|||
<!-- History backlog -->
|
||||
<div class="round">
|
||||
<h3>Last {{ days }} days history log</h3>
|
||||
<div class="block-content" v-if="history">
|
||||
<div class="block-content" v-if="history && Object.keys(history).length > 0">
|
||||
<p><i>Showing only records where status has changed</i></p>
|
||||
<table id="tasks_tbl">
|
||||
<thead>
|
||||
|
|
@ -77,21 +79,22 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p v-else><center>No history to display here</center></p>
|
||||
<p class="no-data" v-else>No history to display here</p>
|
||||
</div>
|
||||
|
||||
<!-- Notifications block -->
|
||||
<div class="round">
|
||||
<h3>Last {{ days }} days notifications log</h3>
|
||||
<div class="block-content" v-if="notifications">
|
||||
<div class="block-content" v-if="notifications && Object.keys(notifications).length > 0">
|
||||
<table id="tasks_tbl">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="20%">Date</th>
|
||||
<th width="20%">Time</th>
|
||||
<th width="*">Firstname</th>
|
||||
<th width="10%">Lastname</th>
|
||||
<th width="10%">Email</th>
|
||||
<th width="10%">Date</th>
|
||||
<th width="10%">Time</th>
|
||||
<th width="15">Firstname</th>
|
||||
<th width="15%">Lastname</th>
|
||||
<th width="30%">Email</th>
|
||||
<th width="10%">Type</th>
|
||||
<th width="10%">Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -105,12 +108,13 @@
|
|||
<td>{{ n.contact.firstname }}</td>
|
||||
<td>{{ n.contact.surname }}</td>
|
||||
<td>{{ n.contact.email }}</td>
|
||||
<td>{{ n.status }}</td>
|
||||
<td>{{ n.task_history.status == 1 ? 'UP' : 'DOWN' }}</td>
|
||||
<td>{{ n.status.toUpperCase() }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p v-else><center>No notification to display here</center></p>
|
||||
<p class="no-data" v-else>No notification to display here</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue