diff --git a/app/Console/Commands/ImportNodelist.php b/app/Console/Commands/NodelistImport.php similarity index 88% rename from app/Console/Commands/ImportNodelist.php rename to app/Console/Commands/NodelistImport.php index ef67b17..a58e233 100644 --- a/app/Console/Commands/ImportNodelist.php +++ b/app/Console/Commands/NodelistImport.php @@ -6,16 +6,16 @@ use Carbon\Carbon; use Illuminate\Console\Command; use App\Models\{Domain,Nodelist}; -use App\Jobs\ImportNodelist as Job; +use App\Jobs\NodelistImport as Job; -class ImportNodelist extends Command +class NodelistImport extends Command { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'import:nodelist' + protected $signature = 'nodelist:import' .' {domain : Domain Name}' .' {file : Nodelist File}' .' {--D|delete : Delete old data for the date}'; diff --git a/app/Jobs/ImportNodelist.php b/app/Jobs/NodelistImport.php similarity index 98% rename from app/Jobs/ImportNodelist.php rename to app/Jobs/NodelistImport.php index daf1a79..49a6d2c 100644 --- a/app/Jobs/ImportNodelist.php +++ b/app/Jobs/NodelistImport.php @@ -14,7 +14,7 @@ use App\Http\Controllers\DomainController; use App\Models\{Address,Domain,Nodelist,System,Zone}; use App\Traits\Import as ImportTrait; -class ImportNodelist implements ShouldQueue +class NodelistImport implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use ImportTrait; @@ -238,10 +238,8 @@ class ImportNodelist implements ShouldQueue $ao->zone_id = $zo->id; - if ($ao->getDirty()) { - dd($ao); + if ($ao->getDirty()) $p++; - } try { $so->addresses()->save($ao); diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php index f81502b..f838cfc 100644 --- a/resources/views/domain/view.blade.php +++ b/resources/views/domain/view.blade.php @@ -80,7 +80,7 @@ @foreach ($oz->addresses()->active()->FTNorder()->whereNull('hub_id')->with(['system','zone.domain'])->get() as $ao) @if ($ao->role == 'Host') - {{ sprintf('NC-%s-%05d',$oz->domain->name,$ao->host_id) }} [{{ $ao->id }}] + {{ sprintf('NC-%s-%05d',$oz->domain->name,$ao->host_id) }} @auth[{{ $ao->id }}]@endauth {{ $ao->system->sysop }} {{ $ao->system->location }} {{ $oz->zone_id }}:{{ $ao->host_id }}/0.0@{{ $oz->domain->name }} @@ -89,7 +89,7 @@ @endif - {{ $ao->system->full_name($ao) }} [{{ $ao->id }}] + {{ $ao->system->full_name($ao) }} @auth[{{ $ao->id }}]@endauth {{ $ao->system->sysop }} {{ $ao->system->location }} {{ $ao->ftn }} @@ -100,7 +100,7 @@ @if ($ao->role == 'Hub') @foreach ($oz->addresses()->active()->FTNorder()->where('hub_id',$ao->id)->with(['system','zone.domain'])->get() as $aoo) - {{ $aoo->system->full_name($aoo) }} [{{ $aoo->id }}] + {{ $aoo->system->full_name($aoo) }} @auth[{{ $aoo->id }}]@endauth {{ $aoo->system->sysop }} {{ $aoo->system->location }} {{ $aoo->role }}