Skip to content

Commit

Permalink
2.4.0 Added Signals Listeners Count, Log Delete now heals signal specs
Browse files Browse the repository at this point in the history
  • Loading branch information
@classaxe
classaxe committed Mar 31, 2020
1 parent 42012b0 commit e05f5ce
Show file tree
Hide file tree
Showing 16 changed files with 371 additions and 129 deletions.
1 change: 1 addition & 0 deletions composer.json
View file
Expand Up @@ -6,6 +6,7 @@
"ext-dom": "*",
"ext-gd": "*",
"ext-iconv": "*",
"ext-pdo": "*",
"ext-posix": "*",
"beberlei/doctrineextensions": "^1.2.0",
"doctrine/doctrine-bundle": "^1.9",
Expand Down
2 changes: 1 addition & 1 deletion src/Columns/ListenerLogs.php
View file
Expand Up @@ -197,7 +197,7 @@ public function getColumns()
'admin' => true,
'arg' => '',
'field' => 'delete',
'label' => '<div>Admin</div>',
'label' => 'Admin',
'order' => '',
'sort' => '',
'td_class' => '',
Expand Down
46 changes: 23 additions & 23 deletions src/Columns/Listeners.php
View file
Expand Up @@ -83,7 +83,7 @@ public function getColumns()
'admin' => false,
'arg' => '',
'field' => 'region',
'label' => '<div>Region</div>',
'label' => 'Region',
'order' => 'a',
'sort' => 'l.region',
'td_class' => 'text-uppercase',
Expand All @@ -105,24 +105,13 @@ public function getColumns()
'admin' => false,
'arg' => '',
'field' => 'timezone',
'label' => '<div>Timezone</div>',
'label' => 'Timezone',
'order' => 'a',
'sort' => 'l.timezone',
'td_class' => 'txt_r',
'th_class' => 'txt_vertical',
'tooltip' => 'Timezone (relative to UTC)',
],
'countLogs' => [
'admin' => false,
'arg' => '',
'field' => 'countLogs',
'label' => '<div>Total Logs</div>',
'order' => 'd',
'sort' => 'l.countLogs',
'td_class' => 'txt_r',
'th_class' => 'txt_vertical',
'tooltip' => 'Total number of logs for all signals',
],
'logEarliest' => [
'admin' => false,
'arg' => '',
Expand All @@ -145,11 +134,22 @@ public function getColumns()
'th_class' => '',
'tooltip' => '',
],
'countLogs' => [
'admin' => false,
'arg' => '',
'field' => 'countLogs',
'label' => 'Total Logs',
'order' => 'd',
'sort' => 'l.countLogs',
'td_class' => 'txt_r',
'th_class' => 'txt_vertical',
'tooltip' => 'Total number of logs for all signals',
],
'countDgps' => [
'admin' => false,
'arg' => 'DGPS',
'field' => 'countDgps',
'label' => '<div>DGPS</div>',
'label' => 'DGPS',
'order' => 'd',
'sort' => 'l.countDgps',
'td_class' => 'txt_r type_dgps',
Expand All @@ -160,7 +160,7 @@ public function getColumns()
'admin' => false,
'arg' => 'DSC',
'field' => 'countDsc',
'label' => '<div>DSC</div>',
'label' => 'DSC',
'order' => 'd',
'sort' => 'l.countDsc',
'td_class' => 'txt_r type_dsc',
Expand All @@ -171,7 +171,7 @@ public function getColumns()
'admin' => false,
'arg' => 'HAMBCN',
'field' => 'countHambcn',
'label' => '<div>HAMBCN</div>',
'label' => 'HAMBCN',
'order' => 'd',
'sort' => 'l.countHambcn',
'td_class' => 'txt_r type_hambcn',
Expand All @@ -182,7 +182,7 @@ public function getColumns()
'admin' => false,
'arg' => 'NAVTEX',
'field' => 'countNavtex',
'label' => '<div>NAVTEX</div>',
'label' => 'NAVTEX',
'order' => 'd',
'sort' => 'l.countNavtex',
'td_class' => 'txt_r type_navtex',
Expand All @@ -193,7 +193,7 @@ public function getColumns()
'admin' => false,
'arg' => 'NDB',
'field' => 'countNdb',
'label' => '<div>NDB</div>',
'label' => 'NDB',
'order' => 'd',
'sort' => 'l.countNdb',
'td_class' => 'txt_r type_ndb',
Expand All @@ -204,7 +204,7 @@ public function getColumns()
'admin' => false,
'arg' => 'TIME',
'field' => 'countTime',
'label' => '<div>TIME</div>',
'label' => 'TIME',
'order' => 'd',
'sort' => 'l.countTime',
'td_class' => 'txt_r type_time',
Expand All @@ -215,7 +215,7 @@ public function getColumns()
'admin' => false,
'arg' => 'OTHER',
'field' => 'countOther',
'label' => '<div>OTHER</div>',
'label' => 'OTHER',
'order' => 'd',
'sort' => 'l.countOther',
'td_class' => 'txt_r type_other',
Expand All @@ -226,7 +226,7 @@ public function getColumns()
'admin' => false,
'arg' => '',
'field' => 'countSignals',
'label' => '<div>All Signals</div>',
'label' => 'All Signals',
'order' => 'd',
'sort' => 'l.countSignals',
'td_class' => 'txt_r',
Expand Down Expand Up @@ -282,7 +282,7 @@ public function getColumns()
'admin' => true,
'arg' => '',
'field' => 'formattedMapPos',
'label' => '<div>Map Pos</div>',
'label' => 'Map Pos',
'order' => 'a',
'sort' => 'l.mapX',
'td_class' => '',
Expand All @@ -293,7 +293,7 @@ public function getColumns()
'admin' => true,
'arg' => '',
'field' => 'delete',
'label' => '<div>Admin</div>',
'label' => 'Admin',
'order' => '',
'sort' => '',
'td_class' => '',
Expand Down
2 changes: 1 addition & 1 deletion src/Columns/SignalLogs.php
View file
Expand Up @@ -162,7 +162,7 @@ public function getColumns()
'admin' => true,
'arg' => '',
'field' => 'delete',
'label' => '<div>Admin</div>',
'label' => 'Admin',
'order' => '',
'sort' => '',
'td_class' => '',
Expand Down
19 changes: 16 additions & 3 deletions src/Columns/Signals.php
View file
Expand Up @@ -136,7 +136,7 @@ public function getColumns()
'arg' => '',
'field' => 'region',
'highlight' => false,
'label' => '<div>Region</div>',
'label' => 'Region',
'labelSort' => 'Region',
'order' => 'a',
'sort' => 's.region',
Expand Down Expand Up @@ -196,6 +196,19 @@ public function getColumns()
'th_class' => '',
'tooltip' => 'Places signal has been reported',
],
'listeners' => [
'admin' => false,
'arg' => '',
'field' => 'listeners',
'highlight' => false,
'label' => 'Listeners',
'labelSort' => '',
'order' => 'd',
'sort' => 's.logs',
'td_class' => 'txt_r',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of times logged',
],
'logs' => [
'admin' => false,
'arg' => '',
Expand All @@ -206,7 +219,7 @@ public function getColumns()
'order' => 'd',
'sort' => 's.logs',
'td_class' => 'txt_r',
'th_class' => '',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of times logged',
],
'first_heard' => [
Expand Down Expand Up @@ -279,7 +292,7 @@ public function getColumns()
'arg' => '',
'field' => 'actions',
'highlight' => false,
'label' => '<div>Admin</div>',
'label' => 'Admin',
'order' => '',
'sort' => '',
'td_class' => '',
Expand Down
23 changes: 21 additions & 2 deletions src/Entity/Signal.php
View file
Expand Up @@ -196,6 +196,13 @@ class Signal
*/
private $qth;

/**
* @var int|null
*
* @ORM\Column(name="listeners", type="integer", nullable=true, options={"unsigned"=true})
*/
private $listeners;

/**
* @var int|null
*
Expand Down Expand Up @@ -547,6 +554,18 @@ public function setQth(?string $qth): self
return $this;
}

public function getListeners(): ?int
{
return $this->listeners;
}

public function setListeners(?int $listeners): self
{
$this->listeners = $listeners;

return $this;
}

public function getLogs(): ?int
{
return $this->logs;
Expand Down Expand Up @@ -723,7 +742,7 @@ public function getFormattedLsbAbs(): ?string {
if (!$this->lsb) {
return '';
}
return $this->lsbApprox . ($this->khz - number_format($this->lsb / 1000, 3, '.'));
return $this->lsbApprox . ((float)$this->khz - number_format($this->lsb / 1000, 3, '.'));
}

public function getFormattedLsbRel(): ?string {
Expand All @@ -737,7 +756,7 @@ public function getFormattedUsbAbs(): ?string {
if (!$this->usb) {
return '';
}
return $this->usbApprox . ($this->khz + number_format($this->usb / 1000, 3, '.'));
return $this->usbApprox . ((float)$this->khz + number_format($this->usb / 1000, 3, '.'));
}

public function getFormattedUsbRel(): ?string {
Expand Down

0 comments on commit e05f5ce

Please sign in to comment.