Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-05 08:10:21 +01:00
Code Issues Projects Releases Wiki Activity

2021-08-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlibrary(1) that caused misaligned
	columns when generating a Cut Report.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-15 13:55:19 -04:00
parent d9925e0ee8
commit fcb3ad7b27
12 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rdlogmodel.cpp
View File

@@ -381,7 +381,7 @@ int RDLogModel::validate(QString *report,const QDate &date)
rda->shortDateString(now.date())+" - "+
rda->timeString(now.time())+"\n";
*report+=QString("Log: ")+d_log_name+"\n";
*report+=QString("Effective Airdate: ")+date.toString("MM/dd/yyyy")+"\n";
*report+=QString("Effective Airdate: ")+rda->shortDateString(date)+"\n";
*report+="\n";
//
@@ -397,7 +397,7 @@ int RDLogModel::validate(QString *report,const QDate &date)
q=new RDSqlQuery(sql);
if(!q->first()) {
*report+=QString(" ")+
logLine(i)->startTime(RDLogLine::Logged).toString("hh:mm:ss")+
rda->timeString(logLine(i)->startTime(RDLogLine::Logged))+
QString().sprintf(" - missing cart %06d",logLine(i)->cartNumber())+
"\n";
errs++;
@@ -1028,18 +1028,17 @@ QString RDLogModel::StartTimeString(int line) const
if(ll!=NULL) {
switch(ll->timeType()) {
case RDLogLine::Hard:
return QString("T")+ll->startTime(RDLogLine::Logged).
toString("hh:mm:ss.zzz").left(10);
return QString("T")+
rda->tenthsTimeString(ll->startTime(RDLogLine::Logged));
break;
default:
if(d_start_time_style==RDLogModel::Estimated) {
if(ll->startTime(RDLogLine::Predicted).isNull()) {
return blockStartTime(line).toString("hh:mm:ss.zzz").left(10);
return rda->tenthsTimeString(blockStartTime(line));
}
else {
return ll->startTime(RDLogLine::Predicted).
toString("hh:mm:ss.zzz").left(10);
return rda->tenthsTimeString(ll->startTime(RDLogLine::Predicted));
}
}
else { // Scheduled
@@ -1047,8 +1046,7 @@ QString RDLogModel::StartTimeString(int line) const
return QString("");
}
else {
return ll->startTime(RDLogLine::Logged).
toString("hh:mm:ss.zzz").left(10);
return rda->tenthsTimeString(ll->startTime(RDLogLine::Logged));
}
}
break;