Changes to phone, add Active/Archive to echomail list for nets

This commit is contained in:
Deon George 2023-07-06 09:35:15 +10:00
parent 0f7a42c503
commit d6aafa4322
4 changed files with 18 additions and 10 deletions

View File

@ -1,7 +1,7 @@
APP_NAME="Clearing Houz" APP_NAME="Clearing Houz"
APP_ENV=production APP_ENV=production
APP_KEY= APP_KEY=
APP_DEBUG=true APP_DEBUG=false
APP_URL=http://localhost APP_URL=http://localhost
LOG_CHANNEL=stack LOG_CHANNEL=stack

View File

@ -215,10 +215,12 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
); );
// System Details // System Details
$makedata .= sprintf('{IDENT}{[%s][%s][%s][-Unpublished-][38400][%s]}', $makedata .= sprintf('{IDENT}{[%s][%s][%s][%s][%d][%s]}',
$this->setup->system->name, $this->setup->system->name,
$this->setup->system->location, $this->setup->system->location,
$this->setup->system->sysop, $this->setup->system->sysop,
$this->setup->system->phone ?: '-Unpublished-',
self::TCP_SPEED,
'XA' // Nodelist Flags 'XA' // Nodelist Flags
); );

View File

@ -127,11 +127,6 @@ class System extends Model
} }
} }
public function getPhoneAttribute(string $val): string
{
return $val ?: '-Unpublished-';
}
/* METHODS */ /* METHODS */
public function echoareas() public function echoareas()

View File

@ -32,13 +32,14 @@
<table class="table monotable w-100" id="echoarea"> <table class="table monotable w-100" id="echoarea">
<thead> <thead>
<tr> <tr>
<th class="w-75" colspan="3"></th> <th class="w-75" colspan="4"></th>
<th colspan="3" class="text-center">Messages</th> <th colspan="3" class="text-center">Messages</th>
</tr> </tr>
<tr> <tr>
<th>Echoarea</th> <th>Echoarea</th>
<th>Description</th> <th>Description</th>
<th>Last Message</th> <th>Last Message</th>
<th>Area Active</th>
<th class="text-end">Day</th> <th class="text-end">Day</th>
<th class="text-end">Week</th> <th class="text-end">Week</th>
<th class="text-end">Month</th> <th class="text-end">Month</th>
@ -51,6 +52,7 @@
<td style="width: 15%;"><a href="{{ url('ftn/echoarea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td> <td style="width: 15%;"><a href="{{ url('ftn/echoarea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
<td style="width: 15%;">{{ $oo->last_message ? $oo->last_message->format('Y-m-d H:i') : '-' }}</td> <td style="width: 15%;">{{ $oo->last_message ? $oo->last_message->format('Y-m-d H:i') : '-' }}</td>
<td>{{ $oo->active ? 'Active' : 'Archive' }}</td>
<td class="text-end">{{ number_format($oo->messages_count(1)) }}</td> <td class="text-end">{{ number_format($oo->messages_count(1)) }}</td>
<td class="text-end">{{ number_format($oo->messages_count(7)) }}</td> <td class="text-end">{{ number_format($oo->messages_count(7)) }}</td>
<td class="text-end">{{ number_format($oo->messages_count(30)) }}</td> <td class="text-end">{{ number_format($oo->messages_count(30)) }}</td>
@ -191,11 +193,20 @@
pageLength: 25, pageLength: 25,
searching: true, searching: true,
ordering: true, ordering: true,
order: [1,'asc'], order: [[3,'asc'],[1,'asc']],
conditionalPaging: { conditionalPaging: {
style: 'fade', style: 'fade',
speed: 500 // optional speed: 500 // optional
} },
rowGroup: {
dataSrc: [3],
},
columnDefs: [
{
targets: [3],
visible: false,
},
],
}); });
$('#filearea').DataTable({ $('#filearea').DataTable({