app/Http/Controllers/DomainController.php

@@ -115,7 +115,7 @@ class DomainController extends Controller
 		if (! $o->public && ! Gate::check('admin',$o))
 			abort(404);
 
-		$o->load(['zones.system','zones.domain','zones.addresses.nodes_hub','zones.addresses']);
+		$o->load(['zones.system','zones.domain','zones.addresses.nodes_hub','zones.addresses.echomail_from']);
 
 		return view('domain.view')
 			->with('o',$o);

app/Models/Domain.php

@@ -124,25 +124,6 @@ class Domain extends Model
 		});
 	}
 
-	public function filearea_stats()
-	{
-		$dt = Carbon::now()->startOfday();
-		$case = CaseBuilder::whenRaw("datetime >= '?'",$dt->subDays(7)->format('Y-m-d'))->thenRaw("'week'")
-			->whenRaw("datetime >= '?'",$dt->subMonth()->format('Y-m-d'))->thenRaw("'month'")
-			->elseRaw("'all'");
-
-		return Filearea::select(['fileareas.id','fileareas.name','description','active',DB::raw('count(files.id) AS count'),DB::raw('min(datetime) as first_file'),DB::raw('max(datetime) as last_file')])
-			->selectRaw($case->toRaw().' AS stats')
-			->join('files',['files.filearea_id'=>'fileareas.id'],NULL,NULL,'left outer')
-			->where('domain_id',$this->id)
-			->groupBy('fileareas.id')
-			->groupBy('fileareas.name')
-			->groupBy('stats')
-			->orderBy('fileareas.name')
-			->orderBy('last_file','DESC')
-			->get();
-	}
-
 	/**
 	 * Determine if this zone is managed by this host
 	 *

app/Models/Filearea.php

@@ -11,11 +11,6 @@ class Filearea extends Model
 {
 	use SoftDeletes,ScopeActive,AreaSecurity;
 
-	protected $casts = [
-		'first_file' => 'datetime:Y-m-d H:i:s',
-		'last_file' => 'datetime:Y-m-d H:i:s',
-	];
-
 	protected $fillable = [
 		'name',
 	];

resources/views/domain/view.blade.php

@@ -58,10 +58,10 @@
 									<tbody>
 									@foreach ($o->echoarea_stats()->groupBy('id') as $oo)
 										<tr>
-											<td style="width: 10%;"><a href="{{ url('echoarea/addedit',[($x=$oo->first())->id]) }}">{{ $x->name }}</a></td>
+											<td style="width: 15%;"><a href="{{ url('echoarea/addedit',[($x=$oo->first())->id]) }}">{{ $x->name }}</a></td>
 											<td>{{ $x->description }}</td>
-											<td>{{ ($xx=$oo->min('first_message')) ? $xx->format('Y-m-d H:i') : '-' }}</td>
+											<td style="width: 15%;">{{ ($xx=$oo->min('first_message')) ? $xx->format('Y-m-d H:i') : '-' }}</td>
-											<td>{{ $x->last_message ? $x->last_message->format('Y-m-d H:i') : '-' }}</td>
+											<td style="width: 15%;">{{ $x->last_message ? $x->last_message->format('Y-m-d H:i') : '-' }}</td>
 											<td>{{ $x->active ? 'Active' : 'Archive' }}</td>
 											<td class="text-end">{{ number_format($oo->where('stats','day')->pop()?->count) }}</td>
 											<td class="text-end">{{ number_format($oo->where('stats','week')->pop()?->count) }}</td>
@@ -88,35 +88,21 @@
 						<div class="accordion-body">
 							@if($o->fileareas->count())
 								<p>This network provides the following File areas:</p>
-								<table class="table monotable w-100" id="filearea">
+								<table class="table monotable" id="filearea">
 									<thead>
-									<tr>
-										<th class="w-75" colspan="4"></th>
-										<th colspan="4" class="text-center">Files</th>
-									</tr>
 									<tr>
 										<th>Filearea</th>
 										<th>Description</th>
-										<th>First File</th>
+										<th>Last File Sent</th>
-										<th>Last File</th>
-										<th>Area Active</th>
-										<th class="text-end">Week</th>
-										<th class="text-end">Month</th>
-										<th class="text-end">Total</th>
 									</tr>
 									</thead>
 
 									<tbody>
-									@foreach ($o->filearea_stats()->groupBy('id') as $oo)
+									@foreach ($o->fileareas->sortBy('name') as $oo)
 										<tr>
-											<td style="width: 10%;"><a href="{{ url('echoarea/addedit',[($x=$oo->first())->id]) }}">{{ $x->name }}</a></td>
+											<td style="width: 15%;"><a href="{{ url('filearea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td>
-											<td>{{ $x->description }}</td>
+											<td>{{ $oo->description }}</td>
-											<td>{{ ($xx=$oo->min('first_file')) ? $xx->format('Y-m-d H:i') : '-' }}</td>
+											<td style="width: 15%;">-</td>
-											<td>{{ $x->last_file ? $x->last_file->format('Y-m-d H:i') : '-' }}</td>
-											<td>{{ $x->active ? 'Active' : 'Archive' }}</td>
-											<td class="text-end">{{ number_format($oo->where('stats','week')->pop()?->count) }}</td>
-											<td class="text-end">{{ number_format($oo->where('stats','month')->pop()?->count) }}</td>
-											<td class="text-end">{{ number_format($oo->sum('count')) }}</td>
 										</tr>
 									@endforeach
 									</tbody>
@@ -261,16 +247,7 @@
 				conditionalPaging: {
 					style: 'fade',
 					speed: 500 // optional
-				},
+				}
-				rowGroup: {
-					dataSrc: [4],
-				},
-				columnDefs: [
-					{
-						targets: [4],
-						visible: false,
-					},
-				],
 			});
 
 			$('#system').DataTable({