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

2018-01-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDApplication'class.
	* Converted rdlibrary(1) to use RDApplication.
This commit is contained in:
Fred Gleason
2018-01-30 03:57:04 -05:00
parent 4d061877fd
commit f692a3ac0d
42 changed files with 633 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rdlibrary/list_reports.cpp
View File

@@ -23,13 +23,14 @@
#include <qstringlist.h>
#include <rddb.h>
#include <rdapplication.h>
#include <rdconf.h>
#include <rdtextfile.h>
#include <rdcart_search_text.h>
#include <rdcart.h>
#include <globals.h>
#include <list_reports.h>
#include "globals.h"
#include "list_reports.h"
ListReports::ListReports(const QString &filter,const QString &type_filter,
const QString &group,const QString &schedcode,
@@ -206,7 +207,7 @@ void ListReports::GenerateCartReport(QString *report)
"from CART left join CUTS on CART.NUMBER=CUTS.CART_NUMBER";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by NUMBER";
}
else {
@@ -362,7 +363,7 @@ void ListReports::GenerateCutReport(QString *report)
on CART.NUMBER=CUTS.CART_NUMBER";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CART.NUMBER";
}
else {
@@ -567,7 +568,7 @@ void ListReports::GenerateCartDumpFixed(QString *report,bool prepend_names)
join CUTS on CART.NUMBER=CUTS.CART_NUMBER";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME";
}
else {
@@ -713,7 +714,7 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
"left join CUTS on CART.NUMBER=CUTS.CART_NUMBER";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CART.NUMBER,CUTS.CUT_NAME";
}
else {