Skip to content

Commit

Permalink
2.43.8 Added Remote Log Sessions for listeners, Log Sessions now perm…
Browse files Browse the repository at this point in the history
…it a short comment (e.g. CLE-NNN)
  • Loading branch information
classaxe committed Jul 19, 2022
1 parent 00f81be commit 196304d
Show file tree
Hide file tree
Showing 24 changed files with 729 additions and 72 deletions.
20 changes: 16 additions & 4 deletions public/css/style.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Project: RXX - NDB Logging Database
* Homepage: https://rxx.classaxe.com
* Version: 2.43.6
* Date: 2022-07-18
* Version: 2.43.8
* Date: 2022-07-19
* Licence: LGPL
* Copyright: 2022 Martin Francis
*/
Expand Down Expand Up @@ -2412,6 +2412,7 @@ fieldset#form_range_units div label {
margin: 0 0 0 0.5em;
float: right;
}
.logUpload #form #commentField legend,
.logUpload #form #dateFields legend,
.logUpload #form #operatorField legend {
width: 30%;
Expand All @@ -2420,28 +2421,39 @@ fieldset#form_range_units div label {
float: left;
margin: 0 1em 0 0;
}
.logUpload #form #commentField div,
.logUpload #form #dateFields div,
.logUpload #form #operatorField div {
clear: none;
float: left;
display: inline;
}
.logUpload #form #commentField div label,
.logUpload #form #dateFields div label,
.logUpload #form #operatorField div label {
width: 6em;
text-align: right;
margin: 0 0.25em 0 0.5em;
}
.logUpload #form #dateFields div input,
.logUpload #form #operatorField div input {
.logUpload #form #commentField div input#form_comment,
.logUpload #form #dateFields div input#form_comment,
.logUpload #form #operatorField div input#form_comment {
width: 12em;
}
.logUpload #form #commentField div input#form_YYYY,
.logUpload #form #dateFields div input#form_YYYY,
.logUpload #form #operatorField div input#form_YYYY {
width: 4em;
}
.logUpload #form #commentField div input#form_MM,
.logUpload #form #dateFields div input#form_MM,
.logUpload #form #operatorField div input#form_MM,
.logUpload #form #commentField div input#form_DD,
.logUpload #form #dateFields div input#form_DD,
.logUpload #form #operatorField div input#form_DD {
width: 2.5em;
}
.logUpload #form #commentField div select,
.logUpload #form #dateFields div select,
.logUpload #form #operatorField div select {
width: 75%;
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.min.css

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions public/js/functions.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Project: RXX - NDB Logging Database
* Homepage: https://rxx.classaxe.com
* Version: 2.43.3
* Date: 2022-07-17
* Version: 2.43.8
* Date: 2022-07-19
* Licence: LGPL
* Copyright: 2022 Martin Francis
*/
Expand All @@ -26,15 +26,16 @@ var popWinSpecs = {
'countries_na' : 'width=640,height=220,resizable=1',
'countries_oc' : 'width=680,height=500,resizable=1',
'countries_sa' : 'width=320,height=600,resizable=1',
'listeners_[id]' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_logs' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_logsessions' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_upload' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_signals' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_map' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_locatormap' : 'width=1000,height=800,status=1,scrollbars=1,resizable=1',
'listeners_[id]_remotelogs' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'[id]_signals_map' : 'width=1000,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_logs' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_logsessions' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_upload' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_signals' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_map' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_locatormap' : 'width=1100,height=800,status=1,scrollbars=1,resizable=1',
'listeners_[id]_remotelogs' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_remotelogsessions' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'[id]_signals_map' : 'width=1100,height=760,status=1,scrollbars=1,resizable=1',
'listeners_[id]_ndbweblog' : 'status=1,scrollbars=1,resizable=1',
'logs_[id]' : 'width=640,height=540,status=1,scrollbars=1,resizable=1',
'maps_af' : 'width=646,height=652,resizable=1',
Expand Down
6 changes: 3 additions & 3 deletions public/js/functions.min.js

Large diffs are not rendered by default.

46 changes: 34 additions & 12 deletions src/Columns/ListenerLogsessions.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ class ListenerLogsessions
public function getColumns()
{
return [
'timestamp' => [
'id' => [
'admin' => false,
'arg' => '',
'field' => 'timestamp',
'label' => 'Uploaded Date',
'field' => 'id',
'label' => 'Session ID',
'order' => 'a',
'sort' => 'ls.id',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'firstLog' => [
'admin' => false,
'arg' => '',
'field' => 'firstLog',
'label' => 'First Log date',
'order' => 'd',
'sort' => 'ls.timestamp',
'sort' => 'ls.firstLog',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
Expand All @@ -35,6 +46,17 @@ public function getColumns()
'th_class' => '',
'tooltip' => '',
],
'comment' => [
'admin' => false,
'arg' => '',
'field' => 'comment',
'label' => 'Comment',
'order' => 'a',
'sort' => 'comment',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'operator' => [
'admin' => false,
'arg' => '',
Expand Down Expand Up @@ -134,24 +156,24 @@ public function getColumns()
'th_class' => 'txt_vertical',
'tooltip' => 'Number of other station logs processed',
],
'firstLog' => [
'lastLog' => [
'admin' => false,
'arg' => '',
'field' => 'firstLog',
'label' => 'First Log date',
'field' => 'lastLog',
'label' => 'Last Log Date',
'order' => 'd',
'sort' => 'ls.firstLog',
'sort' => 'ls.lastLog',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'lastLog' => [
'timestamp' => [
'admin' => false,
'arg' => '',
'field' => 'lastLog',
'label' => 'Last Log Date',
'field' => 'timestamp',
'label' => 'Uploaded Date',
'order' => 'd',
'sort' => 'ls.lastLog',
'sort' => 'ls.timestamp',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
Expand Down
205 changes: 205 additions & 0 deletions src/Columns/ListenerRemoteLogsessions.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?php
/**
* Created by PhpStorm.
* User: mfrancis
* Date: 2018-09-03
* Time: 04:44
*/

namespace App\Columns;

class ListenerRemoteLogsessions
{
public function getColumns()
{
return [
'id' => [
'admin' => false,
'arg' => '',
'field' => 'id',
'label' => 'Session ID',
'order' => 'a',
'sort' => 'ls.id',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'timestamp' => [
'admin' => false,
'arg' => '',
'field' => 'timestamp',
'label' => 'Uploaded Date',
'order' => 'd',
'sort' => 'ls.timestamp',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'uploader' => [
'admin' => false,
'arg' => '',
'field' => 'uploader',
'label' => 'Uploaded By',
'order' => 'a',
'sort' => 'u.name',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'comment' => [
'admin' => false,
'arg' => '',
'field' => 'comment',
'label' => 'Comment',
'order' => 'a',
'sort' => 'comment',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'operator' => [
'admin' => false,
'arg' => '',
'field' => 'operator',
'label' => 'Operator',
'order' => 'a',
'sort' => 'op.name',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'receiver' => [
'admin' => false,
'arg' => '',
'field' => 'listener',
'label' => 'Receiver',
'order' => 'a',
'sort' => 'listener',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'logs' => [
'admin' => false,
'arg' => '',
'field' => 'logs',
'label' => 'Logs',
'order' => 'd',
'sort' => 'ls.logs',
'td_class' => 'txt_r',
'th_class' => 'txt_vertical',
'tooltip' => 'Total number of logs for all signals',
],
'logsDgps' => [
'admin' => false,
'arg' => '',
'field' => 'logsDgps',
'label' => 'DGPS',
'order' => 'd',
'sort' => 'ls.logsDgps',
'td_class' => 'txt_r type_dgps',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of DGPS logs processed',
],
'logsDsc' => [
'admin' => false,
'arg' => '',
'field' => 'logsDsc',
'label' => 'DSC',
'order' => 'd',
'sort' => 'ls.logsDsc',
'td_class' => 'txt_r type_dsc',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of DSC logs processed',
],
'logsHambcn' => [
'admin' => false,
'arg' => '',
'field' => 'logsHambcn',
'label' => 'HAMBCN',
'order' => 'd',
'sort' => 'ls.logsHambcn',
'td_class' => 'txt_r type_hambcn',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of Ham Beacon logs processed',
],
'logsNavtex' => [
'admin' => false,
'arg' => '',
'field' => 'logsNavtex',
'label' => 'Navtex',
'order' => 'd',
'sort' => 'ls.logsNavtex',
'td_class' => 'txt_r type_navtex',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of NAVTEX station logs processed',
],
'logsNdb' => [
'admin' => false,
'arg' => '',
'field' => 'logsNdb',
'label' => 'NDB',
'order' => 'd',
'sort' => 'ls.logsNdb',
'td_class' => 'txt_r type_ndb',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of NDB logs processed',
],
'logsTime' => [
'admin' => false,
'arg' => '',
'field' => 'logsTime',
'label' => 'Time',
'order' => 'd',
'sort' => 'ls.logsTime',
'td_class' => 'txt_r type_time',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of Time station logs processed',
],
'logsOther' => [
'admin' => false,
'arg' => '',
'field' => 'logsOther',
'label' => 'Other',
'order' => 'd',
'sort' => 'ls.logsOther',
'td_class' => 'txt_r type_other',
'th_class' => 'txt_vertical',
'tooltip' => 'Number of other station logs processed',
],
'firstLog' => [
'admin' => false,
'arg' => '',
'field' => 'firstLog',
'label' => 'First Log date',
'order' => 'd',
'sort' => 'ls.firstLog',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'lastLog' => [
'admin' => false,
'arg' => '',
'field' => 'lastLog',
'label' => 'Last Log Date',
'order' => 'd',
'sort' => 'ls.lastLog',
'td_class' => '',
'th_class' => '',
'tooltip' => '',
],
'delete' => [
'admin' => true,
'arg' => '',
'field' => 'delete',
'label' => 'Delete',
'order' => '',
'sort' => '',
'td_class' => '',
'th_class' => 'txt_vertical',
'tooltip' => '',
],
];
}
}
Loading

0 comments on commit 196304d

Please sign in to comment.