bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Now correctly showing packet receive time, and sending Notifications based on the packet address, not the node address

Browse Source
This commit is contained in:
Deon George
2023-08-05 21:32:45 +10:00
parent c8a2affbfa
commit 74a56d1e17
9 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/system/addedit.blade.php
View File

@@ -521,11 +521,11 @@
<div class="col-4">
The last Netmails received (you sent):
@if(($x=\App\Models\Netmail::select(['recv_pkt','created_at',DB::raw('count(*) AS count')])
@if(($x=\App\Models\Netmail::select(['recv_pkt','recv_at',DB::raw('count(*) AS count')])
->join('netmail_path',['netmail_path.netmail_id'=>'netmails.id'])
->whereIn('address_id',$o->addresses->pluck('id'))
->groupBy(['recv_pkt','created_at'])
->orderBy('created_at','DESC')
->groupBy(['recv_pkt','recv_at'])
->orderBy('recv_at','DESC')
->limit(10)
->get())->count())
<table class="table monotable">
@@ -541,7 +541,7 @@
@foreach ($x as $oo)
<tr>
<td class="packet">{{ $oo->recv_pkt }}</td>
<td>{{ $oo->created_at }}</td>
<td>{{ $oo->recv_at }}</td>
<td class="text-end">{{ $oo->count }}</td>
</tr>
@endforeach
@@ -555,12 +555,12 @@
<div class="col-4">
The last Echomails received (you sent):
@if(($x=\App\Models\Echomail::select(['recv_pkt','created_at',DB::raw('count(*) AS count')])
@if(($x=\App\Models\Echomail::select(['recv_pkt','recv_at',DB::raw('count(*) AS count')])
->join('echomail_path',['echomail_path.echomail_id'=>'echomails.id'])
->whereNotNull('recv_pkt')
->whereIn('address_id',$o->addresses->pluck('id'))
->groupBy(['recv_pkt','created_at'])
->orderBy('created_at','DESC')
->groupBy(['recv_pkt','recv_at'])
->orderBy('recv_at','DESC')
->limit(10)
->get())->count())
<table class="table monotable">
@@ -576,7 +576,7 @@
@foreach ($x as $oo)
<tr>
<td class="packet">{{ $oo->recv_pkt }}</td>
<td>{{ $oo->created_at }}</td>
<td>{{ $oo->recv_at }}</td>
<td class="text-end">{{ $oo->count }}</td>
</tr>
@endforeach