2020-02-25 Fred Gleason <fredg@paravelsystems.com>

* Reverted the leading '0' fix to the 'CounterPoint Traffic
	Reconciliation' report generator.
	* Added a 'CounterPoint Traffic Reconciliation v2' report.
This commit is contained in:
Fred Gleason
2020-02-25 13:35:12 -05:00
parent 82c00c2f2a
commit a29dd16eb8
11 changed files with 68 additions and 10 deletions

View File

@@ -30,8 +30,20 @@
bool RDReport::ExportRadioTraffic(const QString &filename,
const QDate &startdate,const QDate &enddate,
const QString &mixtable)
const QString &mixtable,int version)
{
//
// Maintainer's Note:
// This method implements the 'CounterPoint' reconciliation format as
// documented in 'docs/misc/scheduler_formats.ods'.
//
// The 'version' field is for maintaining bug-for-bug backwards
// compatibility. Recognized values are:
// 0 - The original implementation. This is missing a leading '0'
// column 3 ['Scheduled event length'].
//
// 1 - Fixes the 'missing leading zero' error in column 3.
//
QString sql;
RDSqlQuery *q;
QString air_fmt;
@@ -75,7 +87,10 @@ bool RDReport::ExportRadioTraffic(const QString &filename,
*strm << q->value(4).toTime().toString("hh:mm:ss")+" ";
*strm << q->value(2).toDateTime().toString("hh:mm:ss")+" ";
if(q->value(5).toInt()>0) {
*strm << QString("0")+RDGetTimeLength(q->value(5).toInt(),true,false)+" ";
if(version>0) {
*strm << QString("0");
}
*strm << RDGetTimeLength(q->value(5).toInt(),true,false)+" ";
}
else {
*strm << "00:00:00 ";