2021-02-11 Fred Gleason <fredg@paravelsystems.com>

* Added 'RDSchedRulesModel'.
	* Added a pseudo-schema change to force checking of schedule code
	rules.
	* Incremented the database version to 348.
	* Added a check for scheduler code rules to rddbmgr(8).
	* Refactored the 'Scheduler Rules' dialog in rdlogmanager(1) to
	use the model based API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-11 15:28:48 -05:00
parent 57922f947b
commit f1703ba647
34 changed files with 1181 additions and 419 deletions

View File

@@ -3,7 +3,7 @@
// Change rules for scheduler codes dialog
//
// (C) Stefan Gabriel <stg@st-gabriel.de>
// (C) 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) 2002-2021 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
@@ -19,129 +19,99 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <rdescape_string.h>
#include "edit_schedcoderules.h"
EditSchedCodeRules::EditSchedCodeRules(Q3ListViewItem *item,
RDSchedRulesList *sched_rules_list,
QWidget* parent)
EditSchedCodeRules::EditSchedCodeRules(QWidget* parent)
: RDDialog(parent)
{
edit_edit_item=item;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
setWindowTitle("RDLogManager - "+tr("Edit Rules for Code"));
edit_ok_button=new QPushButton(this);
edit_ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
edit_ok_button->setText(tr("&OK"));
edit_ok_button->setDefault(true);
edit_ok_button->setFont(buttonFont());
connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
edit_cancel_button=new QPushButton(this);
edit_cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
edit_cancel_button->setText(tr("&Cancel"));
edit_cancel_button->setFont(buttonFont());
connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
edit_code_name_label=new QLabel(this);
edit_code_name_label->setGeometry(QRect(40,10,150,20));
edit_code_name_label->setText(tr("Code:"));
edit_code_name_label->setFont(labelFont());
edit_code_name_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_code_label=new QLabel(this);
edit_code_label->setFont(bigLabelFont());
edit_code_label->setAlignment(Qt::AlignCenter);
edit_max_row_label=new QLabel(this);
edit_max_row_label->setGeometry(QRect(30,80,160,20));
edit_max_row_label->setText(tr("Max. in a row:"));
edit_max_row_label->setFont(labelFont());
edit_max_row_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_min_wait_label=new QLabel(this);
edit_min_wait_label->setGeometry(QRect(30,110,160,20));
edit_min_wait_label->setText(tr("Min. wait:"));
edit_min_wait_label->setFont(labelFont());
edit_min_wait_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_not_after_label=new QLabel(this);
edit_not_after_label->setGeometry(QRect(30,140,160,20));
edit_not_after_label->setText(tr("Do not schedule after:"));
edit_not_after_label->setFont(labelFont());
edit_not_after_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_or_after_label=new QLabel(this);
edit_or_after_label->setGeometry(QRect(30,180,160,20));
edit_or_after_label->setText(tr("Or after:"));
edit_or_after_label->setFont(labelFont());
edit_or_after_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_or_after_label_II=new QLabel(this);
edit_or_after_label_II->setGeometry(QRect(30,220,160,20));
edit_or_after_label_II->setText(tr("Or after:"));
edit_or_after_label_II->setFont(labelFont());
edit_or_after_label_II->setAlignment(int(Qt::AlignVCenter | Qt::AlignRight));
edit_max_row_spin=new QSpinBox(this);
edit_max_row_spin->setGeometry(QRect(200,80,70,20));
edit_max_row_spin->setMaxValue(999);
edit_max_row_spin->setLineStep(1);
edit_max_row_spin->setValue(item->text(1).toInt());
edit_min_wait_spin=new QSpinBox(this);
edit_min_wait_spin->setGeometry(QRect(200,110,70,20));
edit_min_wait_spin->setMaxValue(999);
edit_max_row_spin->setLineStep(1);
edit_min_wait_spin->setValue(item->text(2).toInt());
edit_code_label=new QLabel(this);
edit_code_label->setGeometry(QRect(200,10,90,20));
edit_code_label->setAlignment(int(Qt::AlignVCenter | Qt::AlignLeft));
edit_code_label->setText(item->text(0));
edit_not_after_box=new QComboBox(FALSE,this);
edit_not_after_box->setGeometry(QRect(200,140,180,30));
edit_not_after_box->setDuplicatesEnabled(FALSE);
edit_schedcodes_model=new RDSchedCodeListModel(true,this);
edit_notafter_boxes[0]=new QComboBox(FALSE,this);
edit_notafter_boxes[0]->setDuplicatesEnabled(FALSE);
edit_notafter_boxes[0]->setModel(edit_schedcodes_model);
edit_or_after_box=new QComboBox(FALSE,this);
edit_or_after_box->setGeometry(QRect(200,180,180,30));
edit_or_after_box->setDuplicatesEnabled(FALSE);
edit_notafter_boxes[1]=new QComboBox(FALSE,this);
edit_notafter_boxes[1]->setDuplicatesEnabled(FALSE);
edit_notafter_boxes[1]->setModel(edit_schedcodes_model);
edit_or_after_box_II=new QComboBox(FALSE,this);
edit_or_after_box_II->setGeometry(QRect(200,220,180,30));
edit_or_after_box_II->setDuplicatesEnabled(FALSE);
edit_notafter_boxes[2]=new QComboBox(FALSE,this);
edit_notafter_boxes[2]->setDuplicatesEnabled(FALSE);
edit_notafter_boxes[2]->setModel(edit_schedcodes_model);
edit_not_after_box->insertItem("");
edit_or_after_box->insertItem("");
edit_or_after_box_II->insertItem("");
for (int i=0; i<sched_rules_list->getNumberOfItems(); i++) {
edit_not_after_box->insertItem(sched_rules_list->getItemSchedCode(i));
edit_or_after_box->insertItem(sched_rules_list->getItemSchedCode(i));
edit_or_after_box_II->insertItem(sched_rules_list->getItemSchedCode(i));
}
edit_not_after_box->setCurrentText(item->text(3));
edit_or_after_box->setCurrentText(item->text(4));
edit_or_after_box_II->setCurrentText(item->text(5));
//
// OK Button
//
edit_ok_button=new QPushButton(this);
edit_ok_button->setText(tr("&OK"));
edit_ok_button->setDefault(true);
edit_ok_button->setFont(buttonFont());
connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
//
// Cancel Button
//
edit_cancel_button=new QPushButton(this);
edit_cancel_button->setText(tr("&Cancel"));
edit_cancel_button->setFont(buttonFont());
connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
edit_description_label=new QLabel(this);
edit_description_label->setGeometry(QRect(200,40,300,40));
edit_description_label->setAlignment(int(Qt::AlignTop | Qt::AlignLeft));
edit_description_label->setText(item->text(6));
}
EditSchedCodeRules::~EditSchedCodeRules()
{
delete edit_schedcodes_model;
}
QSize EditSchedCodeRules::sizeHint() const
{
return QSize(500,350);
return QSize(500,300);
}
@@ -151,21 +121,85 @@ QSizePolicy EditSchedCodeRules::sizePolicy() const
}
int EditSchedCodeRules::exec(unsigned rule_id)
{
edit_rule_id=rule_id;
QString sql=QString("select ")+
"RULE_LINES.CODE,"+ // 00
"SCHED_CODES.DESCRIPTION,"+ // 01
"RULE_LINES.MAX_ROW,"+ // 01
"RULE_LINES.MIN_WAIT,"+ // 02
"RULE_LINES.NOT_AFTER,"+ // 03
"RULE_LINES.OR_AFTER,"+ // 04
"RULE_LINES.OR_AFTER_II "+ // 05
"from RULE_LINES left join SCHED_CODES "+
"on RULE_LINES.CODE=SCHED_CODES.CODE "+
QString().sprintf("where RULE_LINES.ID=%u",rule_id);
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
if(q->value(1).toString().isEmpty()) {
edit_code_label->setText(q->value(0).toString());
}
else {
edit_code_label->
setText(q->value(0).toString()+": "+q->value(1).toString());
}
edit_max_row_spin->setValue(q->value(2).toUInt());
edit_min_wait_spin->setValue(q->value(3).toUInt());
for(int i=0;i<3;i++) {
if(q->value(4+i).toString().isEmpty()) {
edit_notafter_boxes[i]->setCurrentText(tr("[none]"));
}
else {
edit_notafter_boxes[i]->setCurrentText(q->value(4+i).toString());
}
}
}
delete q;
return QDialog::exec();
}
void EditSchedCodeRules::okData()
{
edit_edit_item->setText(1,edit_max_row_spin->text());
edit_edit_item->setText(2,edit_min_wait_spin->text());
edit_edit_item->setText(3,edit_not_after_box->currentText());
edit_edit_item->setText(4,edit_or_after_box->currentText());
edit_edit_item->setText(5,edit_or_after_box_II->currentText());
done(0);
QStringList codes;
QStringList fields;
fields.push_back("NOT_AFTER");
fields.push_back("OR_AFTER");
fields.push_back("OR_AFTER_II");
QString sql=QString("update RULE_LINES set ")+
QString().sprintf("MAX_ROW=%u,",edit_max_row_spin->value())+
QString().sprintf("MIN_WAIT=%u,",edit_min_wait_spin->value());
for(int i=0;i<3;i++) {
if(edit_notafter_boxes[i]->currentText()!=tr("[none]")&&
(!codes.contains(edit_notafter_boxes[i]->currentText()))) {
codes.push_back(edit_notafter_boxes[i]->currentText());
}
}
int count=0;
for(int i=0;i<3;i++) {
if(count<codes.size()) {
sql+=fields.at(i)+"=\""+RDEscapeString(codes.at(count))+"\",";
count++;
}
else {
sql+=fields.at(i)+"=null,";
}
}
sql=sql.left(sql.length()-1);
sql+=QString().sprintf(" where ID=%u",edit_rule_id);
RDSqlQuery::apply(sql);
done(true);
}
void EditSchedCodeRules::cancelData()
{
done(-1);
done(false);
}
@@ -173,3 +207,29 @@ void EditSchedCodeRules::closeEvent(QCloseEvent *e)
{
cancelData();
}
void EditSchedCodeRules::resizeEvent(QResizeEvent *e)
{
edit_code_label->setGeometry(10,2,size().width()-20,20);
edit_max_row_label->setGeometry(30,30,160,20);
edit_max_row_spin->setGeometry(200,30,70,20);
edit_min_wait_label->setGeometry(30,60,160,20);
edit_min_wait_spin->setGeometry(200,60,70,20);
edit_not_after_label->setGeometry(30,90,160,20);
edit_notafter_boxes[0]->setGeometry(200,90,180,30);
edit_or_after_label->setGeometry(30,130,160,20);
edit_notafter_boxes[1]->setGeometry(200,130,180,30);
edit_or_after_label_II->setGeometry(30,170,160,20);
edit_notafter_boxes[2]->setGeometry(200,170,180,30);
edit_ok_button->
setGeometry(size().width()-180,size().height()-60,80,50);
edit_cancel_button->
setGeometry(size().width()-90,size().height()-60,80,50);
}