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

Move 'CART.SCHED_CODES' field to 'CART_SCHED_CODES' table.

Browse Source
This commit is contained in:
Patrick Linstruth
2018-11-13 13:16:26 -08:00
parent 8af01a466d
commit 3ed7a7ca6f
15 changed files with 140 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rdlibrary/list_reports.cpp
View File

@@ -215,13 +215,11 @@ 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,rda->user()->name(),true)+" && "+
sql+=RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by NUMBER";
}
else {
sql+=QString(" where ")+
RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by NUMBER";
}
q=new RDSqlQuery(sql);
@@ -376,13 +374,11 @@ void ListReports::GenerateCutReport(QString *report)
"from CART join CUTS "+
"on CART.NUMBER=CUTS.CART_NUMBER ";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
sql+=RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CART.NUMBER";
}
else {
sql+=QString(" where ")+
RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by CART.NUMBER";
}
q=new RDSqlQuery(sql);
@@ -587,13 +583,11 @@ void ListReports::GenerateCartDumpFixed(QString *report,bool prepend_names)
"from CART join CUTS "+
"on CART.NUMBER=CUTS.CART_NUMBER ";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
sql+=RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME";
}
else {
sql+=QString(" where ")+
RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME";
}
q=new RDSqlQuery(sql);
@@ -755,13 +749,11 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
"from CART left join CUTS "+
"on CART.NUMBER=CUTS.CART_NUMBER ";
if(list_group==QString("ALL")) {
sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
sql+=RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CART.NUMBER,CUTS.CUT_NAME";
}
else {
sql+=QString(" where ")+
RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by CART.NUMBER,CUTS.CUT_NAME";
}
q=new RDSqlQuery(sql);

6
rdlibrary/rdlibrary.cpp
View File

@@ -1411,14 +1411,12 @@ QString MainWidget::WhereClause() const
schedcode=lib_codes_box->currentText();
}
if(lib_group_box->currentText()==QString(tr("ALL"))) {
sql+=QString(" where ")+
RDAllCartSearchText(lib_filter_edit->text(),schedcode,
sql+=RDAllCartSearchText(lib_filter_edit->text(),schedcode,
rda->user()->name(),true)+" && "+type_filter;
}
else {
sql+=QString(" where ")+
RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(),
sql+=RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(),
schedcode,true)+" && "+type_filter;
}