Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

add fields to calculate claimed points

Browse Source
This commit is contained in:
DB4SCW
2024-09-03 11:43:42 +00:00
parent 7d2aeccefd
commit eaf2bf815d
4 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Reg1test.php
View File

@@ -211,6 +211,7 @@ class Reg1test extends CI_Controller {
$data['antenna'] = $this->input->post('antenna', true);
$data['antennaheight'] = $this->input->post('antennaheight', true);
$data['maxdistanceqso'] = $this->qra->getMaxDistanceQSO($station->station_gridsquare, $data['qsos'], "K");
$data['bandmultiplicator'] = $this->input->post('bandmultiplicator', true);
$data['soapbox'] = $this->input->post('soapbox', true);

54
application/libraries/Reg1testformat.php
View File

@@ -5,7 +5,7 @@ class Reg1testformat {
public function header($contest_id, $from, $to, $callsign, $gridlocator, $contestaddress1, $contestaddress2, $categoryoperator, $band, $club, $name,
$responsible_operator, $address1, $address2, $addresspostalcode, $addresscity, $addresscountry, $operatorphone, $operators,
$soapbox, $qso_count, $sentexchange, $txequipment, $power, $rxequipment, $antenna, $antennaheight, $maxdistanceqso) {
$soapbox, $qso_count, $sentexchange, $txequipment, $power, $rxequipment, $antenna, $antennaheight, $maxdistanceqso, $bandmultiplicator, $claimedpoints) {
//build header
$edi_header = "[REG1TEST;1]" . "\r\n";
@@ -35,8 +35,8 @@ class Reg1testformat {
$edi_header .= "SRXEq=" . $rxequipment . "\r\n"; //RX Equipment description
$edi_header .= "SAnte=" . $antenna . "\r\n"; //Antenna description
$edi_header .= "SAntH=" . $antennaheight . "\r\n"; //Antenna height above ground
$edi_header .= "CQSOs=" . "\r\n"; //Arguments describe the claimed number of valid QSOs and the band multiplier. Leave empty.
$edi_header .= "CQSOP=" . "\r\n"; //Argument describes the claimed total number of QSO-points. Leave empty.
$edi_header .= "CQSOs=" . $qso_count . ';' . $bandmultiplicator . "\r\n"; //Arguments describe the claimed number of valid QSOs and the band multiplier.
$edi_header .= "CQSOP=" . $claimedpoints . "\r\n"; //Argument describes the claimed total number of QSO-points.
$edi_header .= "CWWLs=" . "\r\n"; //Arguments describe the claimed number of WWLs worked, the number of bonus points claimed for each new WWL and the WWL multiplier. Leave empty.
$edi_header .= "CWWLB=" . "\r\n"; //Argument describes the claimed total number of WWL bonus points. Leave empty.
$edi_header .= "CExcs=" . "\r\n"; //Arguments describe the claimed number of Exchanges worked, the number of bonus points claimed for each new Exchange and the Exchange multiplier. Leave empty.
@@ -65,7 +65,7 @@ class Reg1testformat {
return "\r\n";
}
public function qsos($qsodata, $mylocator)
public function qsos($qsodata, $mylocator, $bandmultiplicator)
{
//get codeigniter instance
$CI = &get_instance();
@@ -80,22 +80,27 @@ class Reg1testformat {
$dxccs = [];
$exchanges = [];
//result string
$result = "";
//define result
$result = [];
$result['formatted_result'] = "";
$result['totalpoints'] = 0;
//iterate through every QSO and construct detail format
foreach ($qsodata->result() as $row) {
$result .= date('ymd', strtotime($row->COL_TIME_ON)) . ';'; //Date in YYMMDD format
$result .= date('Hi', strtotime($row->COL_TIME_ON)) . ';'; //Time in HHMM format
$result .= substr($row->COL_CALL, 0, 14) . ';'; //Callsign, maximum 14 characters
$result .= $this->reg1testmodecode($row->COL_MODE) . ';'; //Mode-Code in REG1TEST format
$result .= substr($row->COL_RST_SENT, 0, 3) . ';'; //Sent RST, max 3 characters
$result .= substr(str_pad($row->COL_STX ?? "", 4, '0', STR_PAD_LEFT), 0, 4) . ';';; //Sent Number of QSO with definitely 4 digits with leading zeros
$result .= substr($row->COL_RST_RCVD, 0, 3) . ';'; //Received RST, max 3 characters
$result .= substr(str_pad($row->COL_SRX ?? "", 4, '0', STR_PAD_LEFT), 0, 4) . ';';; //Received Number of QSO with definitely 4 digits with leading zeros
$result .= substr($row->COL_SRX_STRING ?? "", 0, 6) . ';'; //Received Exchange, max 6 characters
$result .= strtoupper(substr($row->COL_GRIDSQUARE ?? "" , 0, 6)) . ';'; //Gridsquare max 6 characters
//result string
$qsorow = "";
$qsorow .= date('ymd', strtotime($row->COL_TIME_ON)) . ';'; //Date in YYMMDD format
$qsorow .= date('Hi', strtotime($row->COL_TIME_ON)) . ';'; //Time in HHMM format
$qsorow .= substr($row->COL_CALL, 0, 14) . ';'; //Callsign, maximum 14 characters
$qsorow .= $this->reg1testmodecode($row->COL_MODE) . ';'; //Mode-Code in REG1TEST format
$qsorow .= substr($row->COL_RST_SENT, 0, 3) . ';'; //Sent RST, max 3 characters
$qsorow .= substr(str_pad($row->COL_STX ?? "", 3, '0', STR_PAD_LEFT), 0, 4) . ';';; //Sent Number of QSO with 3 digits with leading zeros. If number gets greater than 999, 4 characters are used at maximum
$qsorow .= substr($row->COL_RST_RCVD, 0, 3) . ';'; //Received RST, max 3 characters
$qsorow .= substr(str_pad($row->COL_SRX ?? "", 3, '0', STR_PAD_LEFT), 0, 4) . ';';; //Received Number of QSO with 3 digits with leading zeros. If number gets greater than 999, 4 characters are used at maximum
$qsorow .= substr($row->COL_SRX_STRING ?? "", 0, 6) . ';'; //Received Exchange, max 6 characters
$qsorow .= strtoupper(substr($row->COL_GRIDSQUARE ?? "" , 0, 6)) . ';'; //Gridsquare max 6 characters
//calculate or get distance in whole kilometers while determening if this is a new locator or not
if(!array_key_exists($row->COL_GRIDSQUARE, $locators)){
@@ -107,7 +112,11 @@ class Reg1testformat {
$distance = $locators[$row->COL_GRIDSQUARE];
}
$result .= $distance . ";"; //distance in whole kilometers
//determine QSO points and add those to the total
$qsopoints = intval(round($distance * $bandmultiplicator, 0));
$result['totalpoints'] += $qsopoints;
$qsorow .= $qsopoints . ";"; //qso points = distance * bandmultiplicatory
//determine if the exchange is new or not
if(!in_array($row->COL_SRX_STRING, $exchanges)){
@@ -117,8 +126,8 @@ class Reg1testformat {
$newexchange = false;
}
$result .= ($newexchange ? 'N' : '') . ';'; //flag if exchange is new
$result .= ($newlocator ? 'N' : '') . ';'; //flag if locator is new
$qsorow .= ($newexchange ? 'N' : '') . ';'; //flag if exchange is new
$qsorow .= ($newlocator ? 'N' : '') . ';'; //flag if locator is new
//determine if DXCC is new or not
if(!in_array($row->COL_DXCC, $dxccs)){
@@ -128,9 +137,12 @@ class Reg1testformat {
$newdxcc = false;
}
$result .= ($newdxcc ? 'N' : '') . ';'; //flag if DXCC is new
$qsorow .= ($newdxcc ? 'N' : '') . ';'; //flag if DXCC is new
$result .= ";\r\n"; //flag for duplicate QSO. Leave empty as Wavelog does not have this.
$qsorow .= ";\r\n"; //flag for duplicate QSO. Leave empty as Wavelog does not have this.
//add row to overall result
$result['formatted_result'] .= $qsorow;
}

9
application/views/reg1test/export.php
View File

@@ -7,6 +7,9 @@ $CI->load->library('Reg1testformat');
header('Content-Type: text/plain; charset=utf-8');
header('Content-Disposition: attachment; filename="' . $callsign . '-' . $contest_id . '-' . date('Ymd-Hi') . '-' . $CI->reg1testformat->reg1testbandstring($band) . '.edi"');
//calculate qso details
$qsodetails = $CI->reg1testformat->qsos($qsos, $gridlocator, $bandmultiplicator);
//get header
echo $CI->reg1testformat->header(
$contest_id,
@@ -36,11 +39,13 @@ echo $CI->reg1testformat->header(
$rxequipment,
$antenna,
$antennaheight,
$maxdistanceqso
$maxdistanceqso,
$bandmultiplicator,
$qsodetails['totalpoints']
);
//write QSO details
echo $CI->reg1testformat->qsos($qsos, $gridlocator);
echo $qsodetails['formatted_result'];
//get seperate footer if QSO details won't provide one
echo $qso_count < 1 ? $CI->reg1testformat->footer() : '';

5
application/views/reg1test/index.php
View File

@@ -130,6 +130,11 @@
<input class="form-control my-1 me-sm-2 col-md-6 w-25 w-lg-75" maxlength="75" id="antennaheight" type="text" name="antennaheight" aria-label="antennaheight">
<small id="antennaheight_hint" class="form-text text-muted col-md-4"><?= __("Height of the antenna above the ground."); ?></small>
</div>
<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
<div class="col-md-4 control-label" for="bandmultiplicator"><?= __("Band multiplicator") ?> </div>
<input class="form-control my-1 me-sm-2 col-md-6 w-25 w-lg-75" id="bandmultiplicator" type="number" min="1" max="9999" step="0.01" name="bandmultiplicator" aria-label="bandmultiplicator" value="1">
<small id="bandmultiplicator_hint" class="form-text text-muted col-md-4"><?= __("Band multiplicator. This is usually 1. Only change this if necessary according to the contest scoring rules."); ?></small>
</div>
<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
<div class="col-md-4 control-label" for="soapbox"><?= __("Soapbox") ?> </div>
<input class="form-control my-1 me-sm-2 col-md-6 w-25 w-lg-75" id="soapbox" type="text" name="soapbox" aria-label="soapbox">