Fixes to the Calendar Dialog. QA
This commit is contained in:
parent
bc7d61fa38
commit
eb5de02be2
6 changed files with 453 additions and 7 deletions
|
|
@ -9,7 +9,7 @@ void CalendarManager::setCalendar(std::string html)
|
|||
{
|
||||
caliSchedPtr->setPage(html);
|
||||
}
|
||||
void CalendarManager::exportCalendarCSV()
|
||||
void CalendarManager::exportCalendarCSV(CalendarDialog *calDialog)
|
||||
{
|
||||
if(CSV_Exporter::exportCalendar(this->caliSchedPtr))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public:
|
|||
{
|
||||
delete caliSchedPtr;
|
||||
}
|
||||
void exportCalendarCSV();
|
||||
void exportCalendarCSV(CalendarDialog*);
|
||||
void setCalendar(std::string html);
|
||||
void resetTable() { if (caliSchedPtr != NULL) caliSchedPtr->clearTableItems(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -343,7 +343,10 @@ void MainScreen::on_exportToCVSBtn_clicked()
|
|||
if(buttonClicked == 0)
|
||||
return;
|
||||
//calDialog.getStartDate(),calDialog.getEndDate()
|
||||
this->calendar->exportCalendarCSV();
|
||||
if(calDialog.ok())
|
||||
this->calendar->exportCalendarCSV(&calDialog);
|
||||
else
|
||||
showMSG("Somthig was not right with the dates you chose... try again");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
394
main/mainscreen.cpp.autosave
Normal file
394
main/mainscreen.cpp.autosave
Normal file
|
|
@ -0,0 +1,394 @@
|
|||
#include "mainscreen.h"
|
||||
#include "ui_mainscreen.h"
|
||||
|
||||
|
||||
MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScreen)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
//this->setFixedSize(this->size()); //main not resizeable
|
||||
|
||||
|
||||
//Login Tab
|
||||
ui->pswdLineEdit->setEchoMode((QLineEdit::Password));
|
||||
|
||||
//Status Bar
|
||||
ui->actionEnglish->setChecked(true);
|
||||
ui->statusBar->setStyleSheet("QStatusBar::item { border: 0px solid black };");
|
||||
ButtomStatusLabel = new QLabel(this);
|
||||
statusLabel = new QLabel(this);
|
||||
ui->statusBar->setMaximumSize(this->geometry().width(),StatusIconHeight);
|
||||
ui->statusBar->addPermanentWidget(ButtomStatusLabel,0);
|
||||
ui->statusBar->addPermanentWidget(statusLabel,1);
|
||||
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
|
||||
|
||||
//Course, Setting, Calendar Tab
|
||||
calendarSchedule * calendarSchedulePtr = new calendarSchedule();
|
||||
ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr);
|
||||
ui->CoursesTab->setDisabled(true);
|
||||
ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue));
|
||||
|
||||
|
||||
|
||||
//Pointer allocating
|
||||
|
||||
this->userLoginSetting = new user("","");
|
||||
this->courseTableMgr = new coursesTableManager(ui->coursesTable,userLoginSetting);
|
||||
this->loginHandel = new loginHandler(userLoginSetting);
|
||||
this->calendar = new CalendarManager(calendarSchedulePtr);
|
||||
this->data = new SaveData();
|
||||
|
||||
//check login File
|
||||
//SaveData::init(); --> No need. constructor dose everything.
|
||||
if (data->isSaved())
|
||||
{
|
||||
ui->usrnmLineEdit->setText(data->getUsername());
|
||||
ui->pswdLineEdit->setText(data->getPassword());
|
||||
ui->keepLogin->setChecked(true);
|
||||
}
|
||||
|
||||
//Local Check and ui setting.
|
||||
if(data->getLocal() == "en")
|
||||
{
|
||||
ui->actionHebrew->setChecked(false);
|
||||
ui->actionOS_Default->setChecked(false);
|
||||
ui->actionEnglish->setChecked(true);
|
||||
}else if(data->getLocal() == "he"){
|
||||
ui->actionHebrew->setChecked(true);
|
||||
ui->actionOS_Default->setChecked(false);
|
||||
ui->actionEnglish->setChecked(false);
|
||||
}else{
|
||||
ui->actionHebrew->setChecked(false);
|
||||
ui->actionOS_Default->setChecked(true);
|
||||
ui->actionEnglish->setChecked(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
MainScreen::~MainScreen()
|
||||
{
|
||||
delete userLoginSetting;
|
||||
delete loginHandel;
|
||||
delete ui;
|
||||
|
||||
//Delete save data
|
||||
delete data;
|
||||
}
|
||||
void MainScreen::on_loginButton_clicked()
|
||||
{
|
||||
if (loginHandel->isLoggedInFlag())
|
||||
uiSetDisconnectMode();
|
||||
|
||||
else
|
||||
uiSetConnectMode();
|
||||
|
||||
}
|
||||
void MainScreen::on_getCalendarBtn_clicked()
|
||||
{
|
||||
int status = 0;
|
||||
if (loginHandel->isLoggedInFlag())
|
||||
{
|
||||
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
|
||||
{
|
||||
//Use it for debug. add plain text and change the object name to 'plainTextEdit' so you will get the html request
|
||||
//ui->plainTextEdit->setPlainText(loginHandel->getCurrentPageContect());
|
||||
calendar->resetTable();
|
||||
calendar->setCalendar(loginHandel->getCurrentPageContect().toStdString());
|
||||
}
|
||||
|
||||
else if (status == jceLogin::JCE_NOT_CONNECTED)
|
||||
{
|
||||
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainScreen::on_ratesButton_clicked()
|
||||
{
|
||||
std::string pageString;
|
||||
int status = 0;
|
||||
if (loginHandel->isLoggedInFlag())
|
||||
{
|
||||
if ((status = loginHandel->makeGradeRequest(ui->spinBoxCoursesFromYear->value(),ui->spinBoxCoursesToYear->value(),ui->spinBoxCoursesFromSemester->value(),ui->spinBoxCoursesToSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
|
||||
{
|
||||
pageString = loginHandel->getCurrentPageContect().toStdString();
|
||||
courseTableMgr->setCoursesList(pageString);
|
||||
courseTableMgr->insertJceCoursesIntoTable();
|
||||
}
|
||||
else if (status == jceLogin::JCE_NOT_CONNECTED)
|
||||
{
|
||||
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
void MainScreen::on_checkBoxCoursesInfluence_toggled(bool checked)
|
||||
{
|
||||
this->userLoginSetting->setInfluenceCourseOnly(checked);
|
||||
this->courseTableMgr->influnceCourseChanged(checked);
|
||||
}
|
||||
void MainScreen::on_spinBoxCoursesFromYear_editingFinished()
|
||||
{
|
||||
if (ui->spinBoxCoursesFromYear->value() > ui->spinBoxCoursesToYear->value())
|
||||
{
|
||||
ui->spinBoxCoursesFromYear->setValue(ui->spinBoxCoursesToYear->value());
|
||||
ui->spinBoxCoursesFromYear->setFocus();
|
||||
}
|
||||
|
||||
}
|
||||
void MainScreen::on_spinBoxCoursesToYear_editingFinished()
|
||||
{
|
||||
if (ui->spinBoxCoursesFromYear->value() > ui->spinBoxCoursesToYear->value())
|
||||
{
|
||||
ui->spinBoxCoursesToYear->setValue(ui->spinBoxCoursesFromYear->value());
|
||||
ui->spinBoxCoursesToYear->setFocus();
|
||||
|
||||
}
|
||||
}
|
||||
void MainScreen::on_spinBoxCoursesFromSemester_editingFinished()
|
||||
{
|
||||
if (ui->spinBoxCoursesFromYear->value() == ui->spinBoxCoursesToYear->value())
|
||||
{
|
||||
if (ui->spinBoxCoursesFromSemester->value() > ui->spinBoxCoursesToSemester->value())
|
||||
{
|
||||
ui->spinBoxCoursesFromSemester->setValue(ui->spinBoxCoursesToSemester->value());
|
||||
ui->spinBoxCoursesFromSemester->setFocus();
|
||||
}
|
||||
}
|
||||
}
|
||||
void MainScreen::on_spinBoxCoursesToSemester_editingFinished()
|
||||
{
|
||||
if (ui->spinBoxCoursesFromYear->value() == ui->spinBoxCoursesToYear->value())
|
||||
{
|
||||
if (ui->spinBoxCoursesFromSemester->value() > ui->spinBoxCoursesToSemester->value())
|
||||
{
|
||||
ui->spinBoxCoursesToSemester->setValue(ui->spinBoxCoursesFromSemester->value());
|
||||
ui->spinBoxCoursesToSemester->setFocus();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
|
||||
{
|
||||
if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
|
||||
ui->avgLCD->display(courseTableMgr->getAvg());
|
||||
else
|
||||
QMessageBox::critical(this,"Error","Missmatching data");
|
||||
}
|
||||
|
||||
void MainScreen::on_usrnmLineEdit_editingFinished()
|
||||
{
|
||||
ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
|
||||
}
|
||||
void MainScreen::uiSetDisconnectMode()
|
||||
{
|
||||
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
|
||||
ui->usrnmLineEdit->setText("");
|
||||
ui->pswdLineEdit->setText("");
|
||||
ui->usrnmLineEdit->setEnabled(true);
|
||||
ui->pswdLineEdit->setEnabled(true);
|
||||
|
||||
loginHandel->makeDisconnectionRequest();
|
||||
ui->loginButton->setText("&Login");
|
||||
ui->getCalendarBtn->setDisabled(true);
|
||||
ui->exportToCVSBtn->setDisabled(true);
|
||||
ui->ratesButton->setDisabled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
void MainScreen::uiSetConnectMode() //fix before distrbute
|
||||
{
|
||||
string username;
|
||||
string password;
|
||||
if ((ui->usrnmLineEdit->text().isEmpty()) || (ui->pswdLineEdit->text().isEmpty()))
|
||||
{
|
||||
//add icon near to username and password to mark it
|
||||
return;
|
||||
}
|
||||
setLabelConnectionStatus(jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS);
|
||||
|
||||
username = ui->usrnmLineEdit->text().toStdString();
|
||||
password = ui->pswdLineEdit->text().toStdString();
|
||||
|
||||
ui->usrnmLineEdit->setDisabled(true);
|
||||
ui->pswdLineEdit->setDisabled(true);
|
||||
|
||||
userLoginSetting->setUsername(username);
|
||||
userLoginSetting->setPassword(password);
|
||||
|
||||
this->loginHandel->setPointers(statusLabel,ui->pswdLineEdit,ui->usrnmLineEdit);
|
||||
if (loginHandel->makeConnection() == true)
|
||||
{
|
||||
setLabelConnectionStatus(jceLogin::jceStatus::JCE_YOU_ARE_IN);
|
||||
ui->loginButton->setText("&Logout");
|
||||
ui->ratesButton->setEnabled(true);
|
||||
ui->CoursesTab->setEnabled(true);
|
||||
ui->exportToCVSBtn->setEnabled(true);
|
||||
ui->getCalendarBtn->setEnabled(true);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
uiSetDisconnectMode();
|
||||
}
|
||||
}
|
||||
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
|
||||
{
|
||||
QPixmap iconPix;
|
||||
switch (statusDescription)
|
||||
{
|
||||
|
||||
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:
|
||||
iconPix.load(":/icons/blueStatusIcon.png");
|
||||
statusLabel->setText(tr("Connecting"));
|
||||
break;
|
||||
case jceLogin::jceStatus::JCE_YOU_ARE_IN:
|
||||
iconPix.load(":/icons/greenStatusIcon.png");
|
||||
statusLabel->setText(tr("Connected"));
|
||||
break;
|
||||
default:
|
||||
iconPix.load(":/icons/redStatusIcon.png");
|
||||
statusLabel->setText(tr("Disconnected"));
|
||||
break;
|
||||
}
|
||||
ButtomStatusLabel->setPixmap(iconPix);
|
||||
|
||||
this->repaint();
|
||||
}
|
||||
|
||||
void MainScreen::showMSG(QString msg)
|
||||
{
|
||||
QMessageBox msgBox;
|
||||
msgBox.setText(msg);
|
||||
msgBox.exec();
|
||||
}
|
||||
void MainScreen::on_actionCredits_triggered()
|
||||
{
|
||||
QMessageBox::about(this, "About", tr("CREDITS-ROOL-UP1") + " v1.0<br><br>"
|
||||
+ tr("CREDITS-ROOL-UP2")+"<br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
|
||||
+ tr("CREDITS-ROOL-UP3")+"<br>"
|
||||
"<a href='https://github.com/liranbg/jceAverageCalculator'>jceAverageCalculator Repository</a>"
|
||||
"<br><br>"+tr("CREDITS-ROOL-UP4")+"<a href='https://github.com/liranbg/jceConnection'> Jce Connection</a><br><br>"
|
||||
+tr("DevBy")+":"
|
||||
"<ul>"
|
||||
"<li><a href='mailto:liranbg@gmail.com'>"+tr("Liran")+"</a></li>"
|
||||
"<li><a href='mailto:sagidayan@gmail.com'>"+tr("Sagi")+"</a></li>"
|
||||
"</ul>");
|
||||
}
|
||||
|
||||
void MainScreen::on_clearTableButton_clicked()
|
||||
{
|
||||
|
||||
courseTableMgr->clearTable();
|
||||
ui->avgLCD->display(courseTableMgr->getAvg());
|
||||
}
|
||||
|
||||
void MainScreen::on_actionExit_triggered()
|
||||
{
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
||||
void MainScreen::on_keepLogin_clicked()
|
||||
{
|
||||
if (ui->keepLogin->isChecked())
|
||||
{
|
||||
data->setUsername(ui->usrnmLineEdit->text());
|
||||
data->setPassword(ui->pswdLineEdit->text());
|
||||
}
|
||||
else
|
||||
data->reset();
|
||||
}
|
||||
|
||||
void MainScreen::on_actionHow_To_triggered()
|
||||
{
|
||||
QMessageBox::information(this,"How To",
|
||||
"<b>How To..</b>"
|
||||
"<ul>"
|
||||
"<br><li>"+tr("HELP1")+"</li>"
|
||||
"<br><li>"+tr("HELP2")+"</li>"
|
||||
"<br><li>"+tr("HELP3")+"</li>"
|
||||
"<br><li>"+tr("HELP4")+"</li>"
|
||||
"<br><li>"+tr("HELP5")+"</li>"
|
||||
"<br><br>"+tr("HELP6")+
|
||||
"</ul>");
|
||||
|
||||
}
|
||||
|
||||
//void MainScreen::on_pushButton_2_clicked()
|
||||
//{
|
||||
// if(CSV_Exporter::exportCalendar(this->calendar->getSch()))
|
||||
// {
|
||||
// QMessageBox msgBox;
|
||||
// msgBox.setText("<center>Exported Successfuly!<br><b>HaazZaA!!");
|
||||
// msgBox.exec();
|
||||
// }else
|
||||
// {
|
||||
// QMessageBox msgBox;
|
||||
// msgBox.setIcon(QMessageBox::Critical);
|
||||
// msgBox.setText("<center>Something went wrong...<br></center>Maybe: <ul><li>You Canceled</li><li>Unable to save the File - try again</li></ul><br><br>"
|
||||
// "<b><center>In case of a serious problem, please file a bug report.<br>thank you. OpenJCE teem");
|
||||
// msgBox.exec();
|
||||
// }
|
||||
//}
|
||||
|
||||
void MainScreen::on_exportToCVSBtn_clicked()
|
||||
{
|
||||
if (loginHandel->isLoggedInFlag())
|
||||
{
|
||||
CalendarDialog calDialog;
|
||||
int buttonClicked = calDialog.exec();
|
||||
if(buttonClicked == 0)
|
||||
return;
|
||||
//calDialog.getStartDate(),calDialog.getEndDate()
|
||||
if(calDialog.ok())
|
||||
this->calendar->exportCalendarCSV(&calDialog);
|
||||
else
|
||||
showMSG("Somthig was not right with the dates you have chosen... try again");
|
||||
}
|
||||
}
|
||||
|
||||
void MainScreen::on_actionHebrew_triggered()
|
||||
{
|
||||
if (ui->actionEnglish->isChecked() || ui->actionOS_Default->isChecked())
|
||||
{
|
||||
ui->actionEnglish->setChecked(false);
|
||||
ui->actionOS_Default->setChecked(false);
|
||||
qDebug() << "Changed Language to hebrew";
|
||||
data->setLocal("he");
|
||||
showMSG("ההגדרות שלך יכנסו לתוקף בהפעלה הבאה של התוכנית");
|
||||
}
|
||||
else
|
||||
ui->actionHebrew->setChecked(true);
|
||||
}
|
||||
|
||||
void MainScreen::on_actionEnglish_triggered()
|
||||
{
|
||||
if (ui->actionHebrew->isChecked() || ui->actionOS_Default->isChecked())
|
||||
{
|
||||
ui->actionHebrew->setChecked(false);
|
||||
ui->actionOS_Default->setChecked(false);
|
||||
qDebug() << "Changed Language to English";
|
||||
data->setLocal("en");
|
||||
showMSG("Your settings will take effect next time you start the program");
|
||||
}
|
||||
else
|
||||
ui->actionEnglish->setChecked(true);
|
||||
}
|
||||
|
||||
|
||||
void MainScreen::on_actionOS_Default_triggered()
|
||||
{
|
||||
if (ui->actionHebrew->isChecked() || ui->actionEnglish->isChecked())
|
||||
{
|
||||
ui->actionHebrew->setChecked(false);
|
||||
ui->actionEnglish->setChecked(false);
|
||||
qDebug() << "Changed Language to OS Default";
|
||||
data->setLocal("default");
|
||||
showMSG("Your settings will take effect next time you start the program");
|
||||
}
|
||||
else
|
||||
ui->actionOS_Default->setChecked(true);
|
||||
}
|
||||
|
|
@ -9,6 +9,8 @@ CalendarDialog::CalendarDialog(QWidget *parent) :
|
|||
ui->setupUi(this);
|
||||
ui->calEnd->showToday();
|
||||
ui->calStart->showToday();
|
||||
|
||||
this->isOK = false;
|
||||
}
|
||||
|
||||
CalendarDialog::~CalendarDialog()
|
||||
|
|
@ -26,16 +28,60 @@ QDate CalendarDialog::getEndDate()
|
|||
return ui->calEnd->selectedDate();
|
||||
}
|
||||
|
||||
bool CalendarDialog::ok()
|
||||
{
|
||||
return this->isOK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void CalendarDialog::on_calStart_clicked(const QDate &date)
|
||||
{
|
||||
qDebug() << "FUCK!!!";
|
||||
|
||||
}
|
||||
|
||||
void CalendarDialog::on_calStart_selectionChanged()
|
||||
{
|
||||
qDebug() << "selection **************************************";
|
||||
if(ui->calStart->selectedDate() > ui->calEnd->selectedDate()){
|
||||
ui->lbl_status->setText("[ X ] The End of the semester is before it starts... ");
|
||||
this->isOK = false;
|
||||
}else if(ui->calStart->selectedDate() == ui->calEnd->selectedDate()){
|
||||
ui->lbl_status->setText("[ ! ] Semester Cannot start and end on the same date... Where are you studying?! :)");
|
||||
this->isOK = false;
|
||||
}else{
|
||||
ui->lbl_status->setText("[ V ] Looks ok, Press OK");
|
||||
this->isOK = true;
|
||||
}
|
||||
}
|
||||
|
||||
void CalendarDialog::on_buttonBox_accepted()
|
||||
{
|
||||
if(ui->calStart->selectedDate() > ui->calEnd->selectedDate())
|
||||
qDebug() << "start bigger than end!";
|
||||
}
|
||||
|
||||
void CalendarDialog::on_calEnd_clicked(const QDate &date)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CalendarDialog::on_calStart_activated(const QDate &date)
|
||||
{
|
||||
//null
|
||||
}
|
||||
|
||||
void CalendarDialog::on_calEnd_selectionChanged()
|
||||
{
|
||||
if(ui->calStart->selectedDate() > ui->calEnd->selectedDate()){
|
||||
ui->lbl_status->setText("[ X ] The End of the semester is before it starts... ");
|
||||
this->isOK = false;
|
||||
}else if(ui->calStart->selectedDate() == ui->calEnd->selectedDate()){
|
||||
ui->lbl_status->setText("[ ! ] Semester Cannot start and end on the same date... Where are you studying?! :)");
|
||||
this->isOK = false;
|
||||
}else{
|
||||
ui->lbl_status->setText("[ V ] Looks ok, Press OK");
|
||||
this->isOK = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,16 +18,19 @@ public:
|
|||
~CalendarDialog();
|
||||
QDate getStartDate();
|
||||
QDate getEndDate();
|
||||
bool ok();
|
||||
|
||||
private slots:
|
||||
void on_calStart_activated(const QDate &date);
|
||||
|
||||
void on_calStart_selectionChanged();
|
||||
|
||||
void on_calStart_clicked(const QDate &date);
|
||||
void on_buttonBox_accepted();
|
||||
void on_calEnd_clicked(const QDate &date);
|
||||
void on_calEnd_selectionChanged();
|
||||
|
||||
private:
|
||||
Ui::CalendarDialog *ui;
|
||||
bool isOK;
|
||||
};
|
||||
|
||||
#endif // CALENDARDIALOG_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue