fixed success and error messages

application/controllers/Hrdlog.php

@@ -70,19 +70,21 @@ class Hrdlog extends CI_Controller {
                 if (($result['status'] == 'OK') || (($result['status'] == 'error') || ($result['status'] == 'duplicate'))) {
                     $this->markqso($qso->COL_PRIMARY_KEY);
                     $i++;
+                    $result['status'] = 'OK';
                 } elseif ((substr($result['status'], 0, 11)  == 'auth_error')) {
                     log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
                     log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
                     log_message('error', 'hrdlog upload stopped for Station_ID: ' . $station_id);
                     $errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
+                    $result['status'] = 'Error';
                     break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
                 } else {
                     log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
                     log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
+                    $result['status'] = 'Error';
                     $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
                 }
             }
-            $result['status'] = 'OK';
             $result['count'] = $i;
             $result['errormessages'] = $errormessages;
             return $result;

application/controllers/Qrz.php

@@ -74,19 +74,21 @@ class Qrz extends CI_Controller {
 				if ( ($result['status'] == 'OK') || ( ($result['status'] == 'error') && ($result['message'] == 'STATUS=FAIL&REASON=Unable to add QSO to database: duplicate&EXTENDED=')) ){
 					$this->markqso($qso->COL_PRIMARY_KEY);
 					$i++;
+					$result['status'] = 'OK';
 				} elseif ( ($result['status']=='error') && (substr($result['message'],0,11)  == 'STATUS=AUTH')) {
 					log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
 					log_message('error', 'QRZ upload failed with the following message: ' .$result['message']);
 					log_message('error', 'QRZ upload stopped for Station_ID: ' .$station_id);
 					$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
+					$result['status'] = 'Error';
 					break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
 				} else {
 					log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
 					log_message('error', 'QRZ upload failed with the following message: ' .$result['message']);
 					$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
+					$result['status'] = 'Error';
 				}
 			}
-			$result['status'] = 'OK';
 			$result['count'] = $i;
 			$result['errormessages'] = $errormessages;
 			return $result;

application/views/adif/import.php

@@ -1,4 +1,4 @@
-<div class="container adif">
+<div class="container adif" id="adif_import">
 
     <h2><?php echo $page_title; ?></h2>
     <?php

application/views/hrdlog/export.php

@@ -1,5 +1,5 @@
 
-<div class="container adif">
+<div class="container adif" id="hrdlog_export">
 
     <h2><?php echo $page_title; ?></h2>
 

application/views/qrz/export.php

@@ -1,5 +1,5 @@
 
-<div class="container adif">
+<div class="container adif" id="qrz_export">
 
     <h2><?php echo $page_title; ?></h2>
 

assets/js/sections/hrdlog.js

@@ -21,27 +21,30 @@ function ExportHrd(station_id) {
 					$('#notcount'+value.station_id).html(value.notcount);
 					$('#totcount'+value.station_id).html(value.totcount);
 				});
-				$(".card-body").append('<div class="alert alert-success" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.infomessage + '</div>');
+				$(".card-body").append('<div class="alert alert-success" role="alert">' + data.infomessage + '</div>');
 			}
 			else {
-				$(".card-body").append('<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.info + '</div>');
+				$(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
 			}
 
 			if (data.errormessages.length > 0) {
-				$(".card-body").append('' +
+				$("#hrdlog_export").append(
-					'<div class="errormessages"><p>\n' +
+					'<div class="errormessages">\n' +
-					'                            <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' +
+					'    <div class="card mt-2">\n' +
-					'                                Show error messages\n' +
+					'        <div class="card-header bg-danger">\n' +
-					'                            </button>\n' +
+					'            Error Message\n' +
-					'                            </p>\n' +
-					'                            <div class="collapse" id="collapseExample">\n' +
-					'                                <div class="card card-body"><div class="errors"></div>\n' +
 					'        </div>\n' +
-					'                            </div></div>');
+					'        <div class="card-body">\n' +
+					'            <div class="errors"></div>\n' +
+					'        </div>\n' +
+					'    </div>\n' +
+					'</div>'
+				);
 				$.each(data.errormessages, function (index, value) {
 					$(".errors").append('<li>' + value);
 				});
 			}
+			
 		}
 	});
 }

assets/js/sections/qrzlogbook.js

@@ -21,23 +21,25 @@ function ExportQrz(station_id) {
 					$('#notcount'+value.station_id).html(value.notcount);
 					$('#totcount'+value.station_id).html(value.totcount);
 				});
-				$(".card-body").append('<div class="alert alert-success" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.infomessage + '</div>');
+				$(".card-body").append('<div class="alert alert-success" role="alert">' + data.infomessage + '</div>');
 			}
 			else {
-				$(".card-body").append('<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.info + '</div>');
+				$(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
 			}
 
 			if (data.errormessages.length > 0) {
-				$(".card-body").append('' +
+				$("#qrz_export").append(
-					'<div class="errormessages"><p>\n' +
+					'<div class="errormessages">\n' +
-					'                            <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' +
+					'    <div class="card mt-2">\n' +
-					'                                Show error messages\n' +
+					'        <div class="card-header bg-danger">\n' +
-					'                            </button>\n' +
+					'            Error Message\n' +
-					'                            </p>\n' +
-					'                            <div class="collapse" id="collapseExample">\n' +
-					'                                <div class="card card-body"><div class="errors"></div>\n' +
 					'        </div>\n' +
-					'                            </div></div>');
+					'        <div class="card-body">\n' +
+					'            <div class="errors"></div>\n' +
+					'        </div>\n' +
+					'    </div>\n' +
+					'</div>'
+				);
 				$.each(data.errormessages, function (index, value) {
 					$(".errors").append('<li>' + value);
 				});

assets/js/sections/webadif.js

@@ -35,20 +35,22 @@ function ExportWebADIF(station_id) {
 				$(".card-body").append('<div class="alert alert-success" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.infomessage + '</div>');
 			}
 			else {
-				$(".card-body").append('<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.info + '</div>');
+				$(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
 			}
 
 			if (data.errormessages.length > 0) {
-				$(".card-body").append('' +
+				$("#adif_import").append(
-					'<div class="errormessages"><p>\n' +
+					'<div class="errormessages">\n' +
-					'                            <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' +
+					'    <div class="card mt-2">\n' +
-					'                                Show error messages\n' +
+					'        <div class="card-header bg-danger">\n' +
-					'                            </button>\n' +
+					'            Error Message\n' +
-					'                            </p>\n' +
-					'                            <div class="collapse" id="collapseExample">\n' +
-					'                                <div class="card card-body"><div class="errors"></div>\n' +
 					'        </div>\n' +
-					'                            </div></div>');
+					'        <div class="card-body">\n' +
+					'            <div class="errors"></div>\n' +
+					'        </div>\n' +
+					'    </div>\n' +
+					'</div>'
+				);
 				$.each(data.errormessages, function (index, value) {
 					$(".errors").append('<li>' + value);
 				});