From e85ee13ffd8abf2a72a0034ebc1923186a93ee0a Mon Sep 17 00:00:00 2001 From: g0wfv Date: Sun, 16 Dec 2018 12:31:50 +0000 Subject: [PATCH] Logging: Change to single source file --- application/libraries/Frequency.php | 4 +- application/views/qso/index.php | 885 +++++++++++---------- application/views/view_log/partial/log.php | 2 +- css/global.css | 4 +- css/main.css | 2 +- 5 files changed, 467 insertions(+), 430 deletions(-) diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index 2bd4b5e7..e346d7f4 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -49,11 +49,13 @@ class Frequency { '2m'=>array( 'SSB'=>"144300000", 'DATA'=>"144370000", - 'CW'=>"144.050000"), + 'CW'=>"144050000"), + 'FM'=>"144500000"), '70cm'=>array( 'SSB'=>"432200000", 'DATA'=>"432088000", 'CW'=>"432050000"), + 'FM'=>"433500000"), '23cm'=>array( 'SSB'=>"1296000000", 'DATA'=>"1296138000", diff --git a/application/views/qso/index.php b/application/views/qso/index.php index e25f48f4..ebf33e0e 100644 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -1,33 +1,38 @@ - - - - + + + + - + - + if ( ! manual ) { + $(function($) { + var options = { + utc: true, + format: '%H:%M' + } + $('.input_time').jclock(options); + }); + } + }); + +
@@ -45,451 +50,481 @@
-
-
- -

Add QSO

- -
- - +
+
+ +

Add QSO

+ + + + - +
- - - - + + + - - - + + + + - - - + - Band - - + + + + - - - - + + + - - - + Band + + - - - - + + + + - - - - + + + + - - - - -
Date
Date + /> + /> -
Callsign
Mode +
Callsign
RST (S) RST (R)
Mode -
Name
Location
RST (S) RST (R)
Locator
Name
Comment
+ + Location + + + + + Locator + + + + + Comment + + + -
- -
+
+ +
- - -
-
- - - - - - - - - -
Propagation Mode - -
IOTA e.g: EU-005
-
-
- - - - - - - - - -
Radio - -
Frequency
-
-
- - - - - - - - - - -
Sat Name
Sat Mode
-
-
- - - - - - - - - - - - - -
Sent
Method
Via
-
-
+ + +
+
+ + + + + + + + + +
Propagation Mode + +
IOTA e.g: EU-005
+
+
+ + + + + + + + + +
Radio + +
Frequency
+
+
+ + + + + + + + + + +
Sat Name
Sat Mode
+
+
+ + + + + + + + + + + + + +
Sent
Method
Via
+
+
-
- +
+ - -
-
+ +
+
-
-

Last 16 QSOs

+
+

Last 16 QSOs

- - - - - - - - - - +
DateTimeCallModeSentRecvBand
+ + + + + + + + - result() as $row) { ?> - '; ?> - - - - - - - COL_SAT_NAME != null) { ?> - - - - - - + result() as $row) { ?> + '; ?> + + + + + + COL_SAT_NAME != null) { ?> + + + + + + -
Date/TimeCallModeSentRecvBand
COL_TIME_ON); echo date('d/m/y', $timestamp); ?>COL_TIME_ON); echo date('H:i', $timestamp); ?>COL_PRIMARY_KEY; ?>">COL_CALL); ?>COL_MODE; ?>COL_RST_SENT; ?>COL_RST_RCVD; ?>COL_SAT_NAME; ?>COL_BAND; ?>
COL_TIME_ON; ?>COL_PRIMARY_KEY; ?>">COL_CALL); ?>COL_MODE; ?>COL_RST_SENT; ?>COL_RST_RCVD; ?>COL_SAT_NAME; ?>COL_BAND; ?>
+
-
-
+
+
\ No newline at end of file diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index 5141fdad..fe1423a8 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -1,4 +1,4 @@ - +
diff --git a/css/global.css b/css/global.css index ece97d24..7212ded5 100644 --- a/css/global.css +++ b/css/global.css @@ -69,7 +69,7 @@ td.item { padding-bottom: 5px; } .title { padding-top: 5px; padding-bottom: 5px; color: #0073EA; font-weight: bold; } #qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; } .input_date { width: 70px; } -.input_time { width: 54px; } +.input_time { width: 32px; } #locator { width: 55px; text-transform: uppercase; } #country { border: none; } #locator_info { font-size: 13px; } @@ -103,4 +103,4 @@ ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: non .pager a:hover { background-color: azure; } /* Footer */ -#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; } \ No newline at end of file +#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; } diff --git a/css/main.css b/css/main.css index 3904ed6d..f7919a48 100644 --- a/css/main.css +++ b/css/main.css @@ -22,7 +22,7 @@ table .title { font-weight: bold; color: #439BF6; } /* Add QSO CSS */ .rst { width: 50px !important; } .input_date { width: 70px !important; } -.input_time { width: 55px !important; } +.input_time { width: 32px !important; } .band { width: 80px; } .mode { width: 80px; } #callsign { text-transform: uppercase; }
Date Time