Merge remote-tracking branch 'origin/Staging' into Dev
Conflicts: main/CourseTab/coursestablemanager.cpp
This commit is contained in:
commit
910372a363
2 changed files with 55 additions and 56 deletions
|
@ -37,13 +37,13 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -66,7 +66,6 @@ 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;
|
||||||
|
@ -74,9 +73,9 @@ bool coursesTableManager::changes(QString change, int row, int col)
|
||||||
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());
|
||||||
|
@ -88,35 +87,35 @@ bool coursesTableManager::changes(QString change, int row, int col)
|
||||||
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):
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -125,27 +124,27 @@ bool coursesTableManager::changes(QString change, int row, int col)
|
||||||
if (!isNumFlag) //not a number
|
if (!isNumFlag) //not a number
|
||||||
{
|
{
|
||||||
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());
|
||||||
colorTheGrade(row);
|
colorTheGrade(row);
|
||||||
}
|
}
|
||||||
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;
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -161,8 +160,8 @@ void coursesTableManager::addRow(const gradeCourse *courseToAdd)
|
||||||
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;
|
||||||
|
@ -223,7 +222,7 @@ void coursesTableManager::addRow(const gradeCourse *courseToAdd)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qCritical() << Q_FUNC_INFO << " no course to load!";
|
qCritical() << Q_FUNC_INFO << " no course to load!";
|
||||||
}
|
}
|
||||||
|
@ -234,9 +233,9 @@ void coursesTableManager::addRow(const gradeCourse *courseToAdd)
|
||||||
}
|
}
|
||||||
double coursesTableManager::getAvg()
|
double coursesTableManager::getAvg()
|
||||||
{
|
{
|
||||||
if (this->gp != NULL)
|
if (this->gp != NULL)
|
||||||
return gp->getAvg();
|
return gp->getAvg();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool coursesTableManager::showGraph()
|
bool coursesTableManager::showGraph()
|
||||||
|
@ -254,17 +253,17 @@ bool coursesTableManager::showGraph()
|
||||||
|
|
||||||
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
|
||||||
{
|
{
|
||||||
if (this->gp != NULL)
|
if (this->gp != NULL)
|
||||||
for (gradeCourse *c: gp->getCourses())
|
for (gradeCourse *c: gp->getCourses())
|
||||||
|
@ -279,11 +278,11 @@ 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)
|
||||||
{
|
{
|
||||||
if (gp != NULL)
|
if (gp != NULL)
|
||||||
gp->removeCourse(courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text());
|
gp->removeCourse(courseTBL->item(i,gradeCourse::CourseScheme::SERIAL)->text());
|
||||||
|
@ -330,10 +329,10 @@ 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)
|
||||||
|
@ -348,14 +347,14 @@ bool coursesTableManager::isCourseAlreadyInserted(double courseID)
|
||||||
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;
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -64,7 +64,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r
|
||||||
<enum>QTabWidget::Rounded</enum>
|
<enum>QTabWidget::Rounded</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="documentMode">
|
<property name="documentMode">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
|
|
Loading…
Reference in a new issue