Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-22 07:39:35 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'RadioTraffic.com Traffic Reconciliation' to
	'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)'
	in rdadmin(1).
	* Added a new 'RadioTraffic.com Traffic Reconciliation' report.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-06 13:30:19 -04:00
parent 231ee06057
commit 2f8f6c91ea
11 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -21410,3 +21410,8 @@
* Fixed a bug in rdlogmanager(1) that could cause SQL errors to
be thrown when processing ELR records containing null values
in the 'EXT_START_TIME' column.
2021-04-06 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'RadioTraffic.com Traffic Reconciliation' to
'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)'
in rdadmin(1).
* Added a new 'RadioTraffic.com Traffic Reconciliation' report.

7
lib/export_radiotraffic.cpp
View File

@ -84,7 +84,12 @@ bool RDReport::ExportRadioTraffic(const QString &filename,
// Write Data Rows
//
while(q->next()) {
*strm << q->value(4).toTime().toString("hh:mm:ss")+" ";
if(q->value(4).isNull()) {
*strm << "00:00:00 ";
}
else {
*strm << q->value(4).toTime().toString("hh:mm:ss")+" ";
}
*strm << q->value(2).toDateTime().toString("hh:mm:ss")+" ";
if(q->value(5).toInt()>0) {
if(version>0) {

4
lib/librd_cs.ts
View File

@ -981,6 +981,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_de.ts
View File

@ -977,6 +977,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_es.ts
View File

@ -977,6 +977,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_fr.ts
View File

@ -943,6 +943,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_nb.ts
View File

@ -977,6 +977,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_nn.ts
View File

@ -977,6 +977,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_pt_BR.ts
View File

@ -978,6 +978,10 @@
<source>Hook End</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

14
lib/rdreport.cpp
View File

@ -20,8 +20,7 @@
#include <stdlib.h>
#include <qfile.h>
#include <qobject.h>
#include <QFile>
#include "rdapplication.h"
#include "rdconf.h"
@ -614,9 +613,9 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
ret=ExportRadioTraffic(filename,startdate,enddate,mixname,0);
break;
// case RDReport::RadioTraffic2:
// ret=ExportRadioTraffic(filename,startdate,enddate,mixname,1);
// break;
case RDReport::RadioTraffic2:
ret=ExportRadioTraffic(filename,startdate,enddate,mixname,1);
break;
case RDReport::VisualTraffic:
ret=ExportDeltaflex(filename,startdate,enddate,mixname);
@ -705,6 +704,9 @@ QString RDReport::filterText(RDReport::ExportFilter filter)
return QObject::tr("NPR/DS SoundExchange Report");
case RDReport::RadioTraffic:
return QObject::tr("Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)");
case RDReport::RadioTraffic2:
return QObject::tr("RadioTraffic.com Traffic Reconciliation");
case RDReport::VisualTraffic:
@ -779,6 +781,7 @@ bool RDReport::multipleDaysAllowed(RDReport::ExportFilter filter)
case RDReport::CbsiDeltaFlex:
case RDReport::TextLog:
case RDReport::RadioTraffic:
case RDReport::RadioTraffic2:
case RDReport::VisualTraffic:
case RDReport::CounterPoint:
case RDReport::CounterPoint2:
@ -812,6 +815,7 @@ bool RDReport::multipleMonthsAllowed(RDReport::ExportFilter filter)
case RDReport::TextLog:
case RDReport::BmiEmr:
case RDReport::RadioTraffic:
case RDReport::RadioTraffic2:
case RDReport::VisualTraffic:
case RDReport::CounterPoint:
case RDReport::CounterPoint2:

8
lib/rdreport.h
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Report Descriptor
//
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,8 +21,7 @@
#ifndef RDREPORT_H
#define RDREPORT_H
#include <qobject.h>
#include <qsqldatabase.h>
#include <QObject>
#include <rdconfig.h>
#include <rdlog_line.h>
@ -37,7 +36,8 @@ class RDReport
CounterPoint=7,Music1=8,MusicSummary=9,WideOrbit=10,
NprSoundExchange=11,MusicPlayout=12,NaturalLog=13,
MusicClassical=14,MrMaster=15,SpinCount=16,CutLog=17,
CounterPoint2=18,ResultsReport=19,LastFilter=20};
CounterPoint2=18,ResultsReport=19,RadioTraffic2=20,
LastFilter=21};
enum ExportOs {Linux=0,Windows=1};
enum ExportType {Generic=0,Traffic=1,Music=2};
enum StationType {TypeOther=0,TypeAm=1,TypeFm=2,TypeLast=3};