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 display for imported contest data on adif import

Browse Source
This commit is contained in:
DB4SCW
2025-01-08 11:58:16 +00:00
parent c1beac7f7d
commit 25e87868d7
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/Adif.php
View File

@@ -240,7 +240,6 @@ class adif extends CI_Controller {
if ($contest != '') {
$record['contest_id'] = $contest;
}
<<<<<<< HEAD
//check if contest_id exists in record and extract all found contest_ids
if(array_key_exists('contest_id', $record)){
@@ -254,11 +253,6 @@ class adif extends CI_Controller {
}
}
=======
if ($club_operator != '') {
$record['operator']=strtoupper($club_operator);
}
>>>>>>> dev
if(count($record) == 0) {
break;
};

15
application/views/adif/import_success.php
View File

@@ -20,6 +20,21 @@
echo " ".__("Dupes were skipped.");
} ?>
</p>
<!-- Display imported information for contest data fixing if contest data was imported -->
<?php if(count($imported_contests) > 0)?>
<p style="color:red;"><?= __("You imported at least 1 QSO containing a contest ID.")?></p>
<p><?= __("Sometimes, depending on your contest logging software, your exchanges will not be imported properly from that softwares ADIF. If you like to correct that, switch to the CBR Import Tab of the ADIF Import page.")?></p>
<p><?= __("We found the following numbers of QSOs for the following contest IDs:")?></p>
<!-- List imported contest data -->
<ul>
<?php foreach ($imported_contests as $contestid => $qsocount) { ?>
<li><?php echo $contestid . ' (' . $qsocount . ' '. ($qsocount == 1 ? 'QSO' : 'QSOs') .')'; ?></li>
<?php } ?>
</ul>
<!-- Display errors for ADIF import -->
<?php if($adif_errors) { ?>
<h3><?= __("Import details / possible problems")?></h3>
<p><?= __("You might have ADIF errors, the QSOs have still been added. Please check the following information:")?></p>