Compare commits

...

2 Commits

Author SHA1 Message Date
2735df5d7b Explain why there are no echoareas/fileareas for the system
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 38s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m44s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
2024-06-07 13:42:05 +10:00
368198bc77 Add link to netmail/echomail when showing packet contents 2024-06-07 13:30:58 +10:00
5 changed files with 65 additions and 47 deletions

View File

@ -258,8 +258,12 @@ use App\Models\Address;
<div id="collapse_echoarea" class="accordion-collapse collapse {{ ($flash=='echoarea') ? 'show' : '' }}" aria-labelledby="echoarea" data-bs-parent="#accordion_homepage"> <div id="collapse_echoarea" class="accordion-collapse collapse {{ ($flash=='echoarea') ? 'show' : '' }}" aria-labelledby="echoarea" data-bs-parent="#accordion_homepage">
<div class="accordion-body"> <div class="accordion-body">
<p>This system can subscribe to the following echoareas:</p> @if ($o->sessions->count())
@include('system.widget.form-echoarea') <p>This system can subscribe to the following echoareas:</p>
@include('system.widget.form-echoarea')
@else
<p>No session details exist for this system, so Echoareas are unavailable.</p>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -272,8 +276,12 @@ use App\Models\Address;
<div id="collapse_filearea" class="accordion-collapse collapse {{ ($flash=='filearea') ? 'show' : '' }}" aria-labelledby="filearea" data-bs-parent="#accordion_homepage"> <div id="collapse_filearea" class="accordion-collapse collapse {{ ($flash=='filearea') ? 'show' : '' }}" aria-labelledby="filearea" data-bs-parent="#accordion_homepage">
<div class="accordion-body"> <div class="accordion-body">
<p>This system can subscribe to the following fileareas:</p> @if ($o->sessions->count())
@include('system.widget.form-filearea') <p>This system can subscribe to the following fileareas:</p>
@include('system.widget.form-filearea')
@else
<p>No session details exist for this system, so Fileareas are unavailable.</p>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -506,8 +514,8 @@ use App\Models\Address;
<tbody> <tbody>
@foreach ($x as $oo) @foreach ($x as $oo)
<tr> <tr>
<td class="packet">{{ $oo->recv_pkt }}</td> <td @class(['packet'=>$oo->recv_pkt])>{{ $oo->recv_pkt ?: '-' }}</td>
<td>{{ $oo->recv_at }}</td> <td>{{ $oo->recv_at ?: '-' }}</td>
<td class="text-end">{{ $oo->count }}</td> <td class="text-end">{{ $oo->count }}</td>
</tr> </tr>
@endforeach @endforeach

View File

@ -1,24 +1,28 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<table class="table monotable" id="echoareas"> @if($echoareas->count())
<thead> <table class="table monotable" id="echoareas">
<tr> <thead>
<th>Subscribed</th>
<th>Echoarea</th>
<th>Description</th>
</tr>
</thead>
<tbody>
@foreach ($echoareas as $oo)
<tr> <tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td> <th>Subscribed</th>
<td>{{ $oo->name }}</td> <th>Echoarea</th>
<td>{{ $oo->description }}</td> <th>Description</th>
</tr> </tr>
@endforeach </thead>
</tbody>
</table> <tbody>
@foreach ($echoareas as $oo)
<tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
<td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td>
</tr>
@endforeach
</tbody>
</table>
@else
<p>No echoareas available for this sytem. Check node security and/or echoarea security.</p>
@endif
</div> </div>
</div> </div>

View File

@ -1,24 +1,28 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<table class="table monotable" id="fileareas"> @if($fileareas->count())
<thead> <table class="table monotable" id="fileareas">
<tr> <thead>
<th>Subscribed</th>
<th>Filearea</th>
<th>Description</th>
</tr>
</thead>
<tbody>
@foreach ($fileareas as $oo)
<tr> <tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td> <th>Subscribed</th>
<td>{{ $oo->name }}</td> <th>Filearea</th>
<td>{{ $oo->description }}</td> <th>Description</th>
</tr> </tr>
@endforeach </thead>
</tbody>
</table> <tbody>
@foreach ($fileareas as $oo)
<tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
<td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td>
</tr>
@endforeach
</tbody>
</table>
@else
<p>No fileareas available for this sytem. Check node security and/or filearea security.</p>
@endif
</div> </div>
</div> </div>

View File

@ -18,11 +18,13 @@
<td>{{ $oo->fftn->ftn }}</td> <td>{{ $oo->fftn->ftn }}</td>
<td>{{ $oo->tftn->ftn }}</td> <td>{{ $oo->tftn->ftn }}</td>
<td> <td>
@if ($oo->msgid) <a href="{{ url('netmail/view',['id'=>$oo->id]) }}">
{{ $oo->msgid }} @if ($oo->msgid)
@else {{ $oo->msgid }}
<small>[{{ $oo->id }}]</small> @else
@endif <small>[{{ $oo->id }}]</small>
@endif
</a>
</td> </td>
<td>{{ $oo->datetime }}</td> <td>{{ $oo->datetime }}</td>
</tr> </tr>
@ -49,7 +51,7 @@
@foreach ($em as $oo) @foreach ($em as $oo)
<tr> <tr>
<td>{{ $oo->fftn->ftn }}</td> <td>{{ $oo->fftn->ftn }}</td>
<td>{{ $oo->msgid }}</td> <td><a href="{{ url('echomail/view',['id'=>$oo->id]) }}">{{ $oo->msgid }}</a></td>
<td>{{ $oo->echoarea->name }}</td> <td>{{ $oo->echoarea->name }}</td>
<td>{{ $oo->datetime }}</td> <td>{{ $oo->datetime }}</td>
</tr> </tr>

View File

@ -131,7 +131,7 @@ Route::middleware(['auth','verified','activeuser'])->group(function () {
Route::match(['get','post'],'link',[UserController::class,'link']); Route::match(['get','post'],'link',[UserController::class,'link']);
Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents']) Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents'])
->where('o','[0-9]+') ->where('o','[0-9]+')
->where('packet','[[:xdigit:]]+'); ->where('packet','[0-9a-zA-Z]+');
Route::match(['get','post'],'user/system/register',[SystemController::class,'register']); Route::match(['get','post'],'user/system/register',[SystemController::class,'register']);
Route::match(['post'],'user/system/link',[SystemController::class,'system_link']); Route::match(['post'],'user/system/link',[SystemController::class,'system_link']);