Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 23:30:20 +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

31
lib/rdcart_search_text.cpp
View File

@@ -103,20 +103,29 @@ QString RDBaseSearchText(QString filter,bool incl_cuts)
return ret;
}
QString RDSchedSearchText(const QString &schedcode)
{
QString ret="";
if(!schedcode.isEmpty()) {
ret+=QString(" inner join CART_SCHED_CODES on CART.NUMBER=CART_SCHED_CODES.CART_NUMBER and CART_SCHED_CODES.SCHED_CODE=\"")+RDEscapeString(schedcode)+"\" ";
}
return ret;
}
QString RDCartSearchText(QString filter,const QString &group,
const QString &schedcode,bool incl_cuts)
{
QString ret=QString(" ")+RDBaseSearchText(filter,incl_cuts);
QString ret="";
ret+=RDSchedSearchText(schedcode);
ret+=QString(" where ")+RDBaseSearchText(filter,incl_cuts);
if(!group.isEmpty()) {
ret+=QString("&&(CART.GROUP_NAME=\"")+RDEscapeString(group)+"\")";
}
if(!schedcode.isEmpty()) {
QString code=schedcode+" ";
code=code.left(11);
ret+=QString("&&(SCHED_CODES like \"%")+RDEscapeString(code)+"%\")";
}
return ret;
}
@@ -126,8 +135,10 @@ QString RDAllCartSearchText(const QString &filter,const QString &schedcode,
{
QString sql;
RDSqlQuery *q;
QString search="(";
QString search="";
search+=RDSchedSearchText(schedcode);
search+=" where (";
sql=QString("select GROUP_NAME from USER_PERMS where ")+
"USER_NAME=\""+RDEscapeString(user)+"\"";
q=new RDSqlQuery(sql);
@@ -139,11 +150,5 @@ QString RDAllCartSearchText(const QString &filter,const QString &schedcode,
search=search.left(search.length()-2)+QString(")");
search+=QString("&&")+RDBaseSearchText(filter,incl_cuts);
if(!schedcode.isEmpty()) {
QString code=schedcode+" ";
code=code.left(11);
search+=QString("&&(SCHED_CODES like \"%%")+RDEscapeString(code)+"%%\")";
}
return search;
}