Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 07:31:19 +02:00
Code Issues Projects Releases Wiki Activity

2024-04-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlibrary(1) that caused output of the Cart
	Report to not reflect the current filter and sorting state of the
	library list.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2024-04-25 17:22:05 -04:00
parent 8f82adbd7b
commit 43761e9508
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -24722,3 +24722,7 @@
* Fixed a bug in the build system that failed to package
'Appendix I. Library Text Searches' in the HTML version of the
Operations Guide.
2024-04-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlibrary(1) that caused output of the Cart
Report to not reflect the current filter and sorting state of the
library list.

17
lib/rdlibrarymodel.cpp
View File

@@ -2,7 +2,7 @@
//
// Data model for the Rivendell cart library
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2024 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
@@ -556,6 +556,12 @@ int RDLibraryModel::cartLimit() const
}
QString RDLibraryModel::orderBySql() const
{
return d_order_by_sql;
}
void RDLibraryModel::setShowNotes(int state)
{
d_show_notes=state;
@@ -564,19 +570,20 @@ void RDLibraryModel::setShowNotes(int state)
void RDLibraryModel::setFilterSql(const QString &sql,int cart_limit)
{
// printf("FILTER SQL: %s\n",sql.toUtf8().constData());
d_filter_sql=sql;
d_cart_limit=cart_limit;
d_order_by_sql="";
QString fsql=sql;
if(d_sort_column<0) { // Use "natural" sort order
fsql+=" order by `CART`.`NUMBER` asc ";
d_order_by_sql+=" order by `CART`.`NUMBER` asc ";
}
else {
fsql+=" order by "+d_order_columns.at(d_sort_column)+" "+
d_order_by_sql+=" order by "+d_order_columns.at(d_sort_column)+" "+
d_sort_clauses.value(d_sort_order);
}
fsql+=", `CUTS`.`PLAY_ORDER` asc ";
d_order_by_sql+=", `CUTS`.`PLAY_ORDER` asc ";
fsql+=d_order_by_sql;
d_filter_set=true;
updateModel(fsql);

4
lib/rdlibrarymodel.h
View File

@@ -2,7 +2,7 @@
//
// Data model for the Rivendell cart library
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2024 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
@@ -67,6 +67,7 @@ class RDLibraryModel : public QAbstractItemModel
QModelIndex refreshCart(unsigned cartnum);
bool showNotes() const;
int cartLimit() const;
QString orderBySql() const;
signals:
void rowCountChanged(int rows);
@@ -88,6 +89,7 @@ class RDLibraryModel : public QAbstractItemModel
QByteArray DumpIndex(const QModelIndex &index,const QString &caption="") const;
bool d_show_notes;
QString d_filter_sql;
QString d_order_by_sql;
int d_cart_limit;
int d_sort_column;
Qt::SortOrder d_sort_order;

12
rdlibrary/list_reports.cpp
View File

@@ -2,7 +2,7 @@
//
// List RDLibrary Reports
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2024 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
@@ -29,11 +29,13 @@
#include "list_reports.h"
ListReports::ListReports(const QString &filter,const QString &grpname,
const QString &filter_sql,QWidget *parent)
const QString &filter_sql,int cart_limit,
QWidget *parent)
{
list_filter=filter;
list_group=grpname;
list_filter_sql=filter_sql;
list_cart_limit=cart_limit;
setWindowTitle("RDLibrary - "+tr("Select Report"));
@@ -190,11 +192,13 @@ void ListReports::GenerateCartReport(QString *report)
"left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` ";
sql+=list_filter_sql;
unsigned prev_cartnum=0;
int cart_count=list_cart_limit;
q=new RDSqlQuery(sql);
while(q->next()) {
while(q->next()&&(cart_count>0)) {
if(q->value(1).toUInt()!=prev_cartnum) { // So we don't show duplicates
prev_cartnum=q->value(1).toUInt();
cart_count--;
//
// Cart Type
//

6
rdlibrary/list_reports.h
View File

@@ -2,7 +2,7 @@
//
// List and Generate RDLibrary Reports
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2024 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
@@ -32,7 +32,7 @@ class ListReports : public RDDialog
Q_OBJECT
public:
ListReports(const QString &filter,const QString &grpname,
const QString &filter_sql,QWidget *parent);
const QString &filter_sql,int cart_limit,QWidget *parent);
~ListReports();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@@ -54,8 +54,8 @@ class ListReports : public RDDialog
QString list_type_filter;
QString list_group;
QString list_schedcode;
QString list_filter_sql;
int list_cart_limit;
};

6
rdlibrary/rdlibrary.cpp
View File

@@ -2,7 +2,7 @@
//
// The Library Utility for Rivendell.
//
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2024 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
@@ -584,7 +584,9 @@ void MainWidget::reportsData()
ListReports *lr=
new ListReports(lib_cart_filter->filterText(),
lib_cart_filter->selectedGroup(),
lib_cart_filter->filterSql(),this);
lib_cart_filter->filterSql()+" "+
lib_cart_model->orderBySql(),
lib_cart_model->cartLimit(),this);
lr->exec();
delete lr;