sorting is by type and not by string! #25

This commit is contained in:
Liran BN 2014-10-06 19:41:55 +03:00
parent da17cc1784
commit 63c5ec9cc7

View file

@ -2,49 +2,49 @@
coursesTableManager::coursesTableManager(QTableWidget *ptr, user *usrPtr) coursesTableManager::coursesTableManager(QTableWidget *ptr, user *usrPtr)
{ {
this->gp = NULL; this->gp = NULL;
this->us = usrPtr; this->us = usrPtr;
this->courseTBL = ptr; this->courseTBL = ptr;
/* /*
* Initilizing Table * Initilizing Table
*/ */
courseTBL->setRowCount(0); courseTBL->setRowCount(0);
courseTBL->setColumnCount(COURSE_FIELDS); courseTBL->setColumnCount(COURSE_FIELDS);
QStringList mz; QStringList mz;
mz << QObject::tr("Number") << QObject::tr("Year") << QObject::tr("Semester") << QObject::tr("Serial") << QObject::tr("Name") << QObject::tr("Type") << QObject::tr("Points") << QObject::tr("Hours") << QObject::tr("Grade") << QObject::tr("Additions"); mz << QObject::tr("Number") << QObject::tr("Year") << QObject::tr("Semester") << QObject::tr("Serial") << QObject::tr("Name") << QObject::tr("Type") << QObject::tr("Points") << QObject::tr("Hours") << QObject::tr("Grade") << QObject::tr("Additions");
courseTBL->setHorizontalHeaderLabels(mz); courseTBL->setHorizontalHeaderLabels(mz);
courseTBL->verticalHeader()->setVisible(false); courseTBL->verticalHeader()->setVisible(false);
courseTBL->setSelectionMode(QAbstractItemView::SingleSelection); courseTBL->setSelectionMode(QAbstractItemView::SingleSelection);
courseTBL->setShowGrid(true); courseTBL->setShowGrid(true);
courseTBL->setStyleSheet("QTableView {selection-background-color: red;}"); courseTBL->setStyleSheet("QTableView {selection-background-color: red;}");
/* /*
* *
*/ */
graph = new gradegraph(NULL,gp); graph = new gradegraph(NULL,gp);
} }
coursesTableManager::~coursesTableManager() coursesTableManager::~coursesTableManager()
{ {
courseTBL = NULL; courseTBL = NULL;
delete gp; delete gp;
gp = NULL; gp = NULL;
} }
/** /**
* @brief coursesTableManager::insertJceCoursesIntoTable phrasing the course list to rows in table * @brief coursesTableManager::insertJceCoursesIntoTable phrasing the course list to rows in table
*/ */
void coursesTableManager::insertJceCoursesIntoTable() void coursesTableManager::insertJceCoursesIntoTable()
{ {
for (gradeCourse *c: *gp->getCourses()) for (gradeCourse *c: *gp->getCourses())
{ {
if (us->getInfluenceCourseOnly()) if (us->getInfluenceCourseOnly())
{ {
if (isCourseInfluence(c)) if (isCourseInfluence(c))
addRow(c);
}
else
addRow(c); addRow(c);
}
else
addRow(c);
} }
} }
/** /**
@ -53,7 +53,7 @@ void coursesTableManager::insertJceCoursesIntoTable()
*/ */
void coursesTableManager::setCoursesList(QString &html) void coursesTableManager::setCoursesList(QString &html)
{ {
gp = new GradePage(html); gp = new GradePage(html);
} }
/** /**
* @brief coursesTableManager::changes when user changes the table manually it updates it * @brief coursesTableManager::changes when user changes the table manually it updates it
@ -65,81 +65,81 @@ void coursesTableManager::setCoursesList(QString &html)
bool coursesTableManager::changes(QString change, int row, int col) bool coursesTableManager::changes(QString change, int row, int col)
{ {
bool isNumFlag = true; bool isNumFlag = true;
if (courseTBL->item(row,gradeCourse::CourseScheme::SERIAL) == NULL) if (courseTBL->item(row,gradeCourse::CourseScheme::SERIAL) == NULL)
return true; return true;
int serialCourse = courseTBL->item(row,gradeCourse::CourseScheme::SERIAL)->text().toInt(); int serialCourse = courseTBL->item(row,gradeCourse::CourseScheme::SERIAL)->text().toInt();
for (gradeCourse *c: *gp->getCourses()) for (gradeCourse *c: *gp->getCourses())
{ {
if (c->getSerialNum() == serialCourse) if (c->getSerialNum() == serialCourse)
{ {
switch (col) switch (col)
{ {
case (gradeCourse::CourseScheme::COURSE_NUMBER_IN_LIST): case (gradeCourse::CourseScheme::COURSE_NUMBER_IN_LIST):
c->setCourseNumInList(change.toInt()); c->setCourseNumInList(change.toInt());
break; break;
case (gradeCourse::CourseScheme::YEAR): case (gradeCourse::CourseScheme::YEAR):
c->setYear(change.toInt()); c->setYear(change.toInt());
break; break;
case (gradeCourse::CourseScheme::SEMESTER): case (gradeCourse::CourseScheme::SEMESTER):
c->setSemester(change.toInt()); c->setSemester(change.toInt());
break; break;
case (gradeCourse::CourseScheme::NAME): case (gradeCourse::CourseScheme::NAME):
c->setName(change); c->setName(change);
break; break;
case (gradeCourse::CourseScheme::TYPE): case (gradeCourse::CourseScheme::TYPE):
c->setType(change); c->setType(change);
break; break;
case (gradeCourse::CourseScheme::POINTS): case (gradeCourse::CourseScheme::POINTS):
{ {
change.toDouble(&isNumFlag); change.toDouble(&isNumFlag);
if (!isNumFlag) if (!isNumFlag)
{ {
courseTBL->item(row,col)->setText(QString::number(c->getPoints())); courseTBL->item(row,col)->setText(QString::number(c->getPoints()));
} }
else else
c->setPoints(change.toDouble()); c->setPoints(change.toDouble());
break; break;
} }
case (gradeCourse::CourseScheme::HOURS): case (gradeCourse::CourseScheme::HOURS):
{ {
change.toDouble(&isNumFlag); change.toDouble(&isNumFlag);
if (!isNumFlag) if (!isNumFlag)
{ {
courseTBL->item(row,col)->setText(QString::number(c->getHours())); courseTBL->item(row,col)->setText(QString::number(c->getHours()));
} }
else else
c->setHours(change.toDouble()); c->setHours(change.toDouble());
break; break;
} }
case (gradeCourse::CourseScheme::GRADE): case (gradeCourse::CourseScheme::GRADE):
{ {
change.toDouble(&isNumFlag); change.toDouble(&isNumFlag);
if (!isNumFlag) if (!isNumFlag)
{ {
courseTBL->item(row,col)->setText(QString::number(c->getGrade())); courseTBL->item(row,col)->setText(QString::number(c->getGrade()));
} }
else else
{ {
if ((change.toDouble() >= 0) && (change.toDouble() <= 100)) if ((change.toDouble() >= 0) && (change.toDouble() <= 100))
c->setGrade(change.toDouble()); c->setGrade(change.toDouble());
else else
courseTBL->item(row,col)->setText(QString::number(c->getGrade())); courseTBL->item(row,col)->setText(QString::number(c->getGrade()));
} }
break; break;
} }
case (gradeCourse::CourseScheme::ADDITION): case (gradeCourse::CourseScheme::ADDITION):
c->setAdditions(change); c->setAdditions(change);
break; break;
} }
break; break;
} }
} }
return isNumFlag; return isNumFlag;
} }
/** /**
@ -148,91 +148,110 @@ bool coursesTableManager::changes(QString change, int row, int col)
*/ */
void coursesTableManager::addRow(const gradeCourse *courseToAdd) void coursesTableManager::addRow(const gradeCourse *courseToAdd)
{ {
int i=1,j=1; int i=1,j=1;
j = 0; j = 0;
QTableWidgetItem *number,*year,*semester,*serial,*name,*type,*points,*hours,*grade,*addition; QTableWidgetItem *number,*year,*semester,*serial,*name,*type,*points,*hours,*grade,*addition;
const gradeCourse * c; const gradeCourse * c;
if (courseToAdd != NULL) if (courseToAdd != NULL)
{ {
c = courseToAdd; c = courseToAdd;
if (!isCourseAlreadyInserted(c->getSerialNum())) if (!isCourseAlreadyInserted(c->getSerialNum()))
{ {
courseTBL->setRowCount(courseTBL->rowCount() + 1); courseTBL->setRowCount(courseTBL->rowCount() + 1);
i = courseTBL->rowCount()-1; i = courseTBL->rowCount()-1;
number = new QTableWidgetItem(QString::number(c->getCourseNumInList())); number = new QTableWidgetItem();
number->setFlags(number->flags() & ~Qt::ItemIsEditable); number->setData(Qt::EditRole, c->getCourseNumInList());
year = new QTableWidgetItem(QString::number(c->getYear())); number->setFlags(number->flags() & ~Qt::ItemIsEditable);
year->setFlags(year->flags() & ~Qt::ItemIsEditable);
semester = new QTableWidgetItem(QString::number(c->getSemester()));
semester->setFlags(semester->flags() & ~Qt::ItemIsEditable);
serial = new QTableWidgetItem(QString::number(c->getSerialNum()));
serial->setFlags(serial->flags() & ~Qt::ItemIsEditable);
points = new QTableWidgetItem(QString::number(c->getPoints()));
points->setFlags(points->flags() & ~Qt::ItemIsEditable);
hours = new QTableWidgetItem(QString::number(c->getHours()));
hours->setFlags(hours->flags() & ~Qt::ItemIsEditable);
grade = new QTableWidgetItem(QString::number(c->getGrade()));
name = new QTableWidgetItem(c->getName());
name->setFlags(name->flags() & ~Qt::ItemIsEditable);
type = new QTableWidgetItem(c->getType());
type->setFlags(type->flags() & ~Qt::ItemIsEditable);
addition = new QTableWidgetItem(c->getAddidtions());
courseTBL->setItem(i,j++,number);
courseTBL->setItem(i,j++,year);
courseTBL->setItem(i,j++,semester);
courseTBL->setItem(i,j++,serial);
courseTBL->setItem(i,j++,name);
courseTBL->setItem(i,j++,type);
courseTBL->setItem(i,j++,points);
courseTBL->setItem(i,j++,hours);
courseTBL->setItem(i,j++,grade);
courseTBL->setItem(i,j,addition);
year = new QTableWidgetItem();
year->setData(Qt::EditRole,c->getYear());
year->setFlags(year->flags() & ~Qt::ItemIsEditable);
semester = new QTableWidgetItem();
semester->setData(Qt::EditRole,c->getSemester());
semester->setFlags(semester->flags() & ~Qt::ItemIsEditable);
serial = new QTableWidgetItem();
serial->setData(Qt::EditRole,c->getSerialNum());
serial->setFlags(serial->flags() & ~Qt::ItemIsEditable);
name = new QTableWidgetItem();
name->setData(Qt::EditRole,c->getName());
name->setFlags(name->flags() & ~Qt::ItemIsEditable);
type = new QTableWidgetItem();
type->setData(Qt::EditRole, c->getType());
type->setFlags(type->flags() & ~Qt::ItemIsEditable);
points = new QTableWidgetItem();
points->setData(Qt::EditRole, c->getPoints());
points->setFlags(points->flags() & ~Qt::ItemIsEditable);
hours = new QTableWidgetItem();
hours->setData(Qt::EditRole, c->getHours());
hours->setFlags(hours->flags() & ~Qt::ItemIsEditable);
grade = new QTableWidgetItem();
grade->setData(Qt::EditRole,c->getGrade());
addition = new QTableWidgetItem();
addition->setData(Qt::EditRole,c->getAddidtions());
courseTBL->setItem(i,j++,number);
courseTBL->setItem(i,j++,year);
courseTBL->setItem(i,j++,semester);
courseTBL->setItem(i,j++,serial);
courseTBL->setItem(i,j++,name);
courseTBL->setItem(i,j++,type);
courseTBL->setItem(i,j++,points);
courseTBL->setItem(i,j++,hours);
courseTBL->setItem(i,j++,grade);
courseTBL->setItem(i,j,addition);
} }
} }
else else
{ {
qCritical() << Q_FUNC_INFO << "no course to load!"; qCritical() << Q_FUNC_INFO << "no course to load!";
} }
courseTBL->resizeColumnsToContents(); courseTBL->resizeColumnsToContents();
} }
double coursesTableManager::getAvg() double coursesTableManager::getAvg()
{ {
if (this->gp != NULL) if (this->gp != NULL)
return gp->getAvg(); return gp->getAvg();
return 0; return 0;
} }
void coursesTableManager::showGraph() void coursesTableManager::showGraph()
{ {
if (gp != NULL) if (gp != NULL)
this->graph->show(); this->graph->show();
} }
void coursesTableManager::influnceCourseChanged(bool ignoreCourseStatus) void coursesTableManager::influnceCourseChanged(bool ignoreCourseStatus)
{ {
if (ignoreCourseStatus) if (ignoreCourseStatus)
{ {
int i = 0; int i = 0;
while (i < courseTBL->rowCount()) while (i < courseTBL->rowCount())
{ {
if (courseTBL->item(i,gradeCourse::CourseScheme::POINTS)->text().compare("0") == 0) if (courseTBL->item(i,gradeCourse::CourseScheme::POINTS)->text().compare("0") == 0)
courseTBL->removeRow(i--); courseTBL->removeRow(i--);
i++; i++;
} }
} }
else else
{ {
for (gradeCourse *c: *gp->getCourses()) for (gradeCourse *c: *gp->getCourses())
{ {
if (!(isCourseAlreadyInserted(c->getSerialNum()))) if (!(isCourseAlreadyInserted(c->getSerialNum())))
if (c->getPoints() == 0) if (c->getPoints() == 0)
addRow(c); addRow(c);
} }
} }
@ -240,49 +259,49 @@ void coursesTableManager::influnceCourseChanged(bool ignoreCourseStatus)
void coursesTableManager::clearTable() void coursesTableManager::clearTable()
{ {
if (courseTBL->rowCount() == 0) if (courseTBL->rowCount() == 0)
return; return;
int i = 0; //starting point int i = 0; //starting point
while (courseTBL->rowCount() > i) while (courseTBL->rowCount() > i)
{ {
gp->removeCourse(courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text()); gp->removeCourse(courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text());
courseTBL->removeRow(i); courseTBL->removeRow(i);
} }
gp = NULL; gp = NULL;
courseTBL->repaint(); courseTBL->repaint();
} }
gradeCourse *coursesTableManager::getCourseByRow(int row) gradeCourse *coursesTableManager::getCourseByRow(int row)
{ {
QString courseSerial = courseTBL->item(row,gradeCourse::CourseScheme::SERIAL)->text(); QString courseSerial = courseTBL->item(row,gradeCourse::CourseScheme::SERIAL)->text();
for (gradeCourse *c: *gp->getCourses()) for (gradeCourse *c: *gp->getCourses())
{ {
if (c->getSerialNum() == courseSerial.toDouble()) if (c->getSerialNum() == courseSerial.toDouble())
return c; return c;
} }
return NULL; return NULL;
} }
bool coursesTableManager::isCourseAlreadyInserted(double courseID) bool coursesTableManager::isCourseAlreadyInserted(double courseID)
{ {
int i; int i;
for (i = courseTBL->rowCount(); i >= 0; --i) for (i = courseTBL->rowCount(); i >= 0; --i)
{ {
if (courseTBL->item(i,gradeCourse::CourseScheme::SERIAL) != NULL) if (courseTBL->item(i,gradeCourse::CourseScheme::SERIAL) != NULL)
{ {
QString courseSerial = courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text(); QString courseSerial = courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text();
if (QString::number(courseID) == courseSerial) if (QString::number(courseID) == courseSerial)
return true; return true;
} }
} }
return false; return false;
} }
bool coursesTableManager::isCourseInfluence(const gradeCourse *courseToCheck) bool coursesTableManager::isCourseInfluence(const gradeCourse *courseToCheck)
{ {
if (courseToCheck->getPoints() > 0) if (courseToCheck->getPoints() > 0)
return true; return true;
return false; return false;
} }