sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

1.1 is coming

Browse source
This commit is contained in:
liranbg 2014-10-24 03:24:50 +03:00
parent 174c5ca19f 1eec1a9d5d
commit ba13f4324b
5 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/mainscreen.cpp
View file

@ -271,7 +271,7 @@ void MainScreen::on_getCalendarBtn_clicked()
page = loginHandel->getCurrentPageContect(); page = loginHandel->getCurrentPageContect();
calendar->setCalendar(page); calendar->setCalendar(page);
qDebug() << Q_FUNC_INFO << "calendar is loaded"; qDebug() << Q_FUNC_INFO << "calendar is loaded. getting exam schedule";
//auto getting exam //auto getting exam
if (loginHandel->isLoggedInFlag()) if (loginHandel->isLoggedInFlag())

3
src/jceData/Calendar/coursesSchedule/calendarPage.cpp
View file

@ -6,10 +6,9 @@
*/ */
void CalendarPage::setPage(QString html) void CalendarPage::setPage(QString html)
{ {
courses.clear(); courses.clear();
tempHtml = getString(html); tempHtml = getString(html);
calendarListInit(tempHtml); calendarListInit(tempHtml);
} }
/** /**
* @brief CalendarPage::calendarListInit - make an object from each line of course * @brief CalendarPage::calendarListInit - make an object from each line of course

18
src/jceData/Calendar/coursesSchedule/calendarPageCourse.cpp
View file

@ -113,21 +113,25 @@ int calendarCourse::getDay() const
*/ */
void calendarCourse::setDay(const QString &value) void calendarCourse::setDay(const QString &value)
{ {
std::string dayTemp = value.toStdString().substr(0,2); //recieving two characters respresting days QString dayTemp = value.mid(0,1); //recieving character's respresting the day
if (dayTemp.compare("\u05D0") == 0) //alef QChar letter = (QString::fromWCharArray(&dayTemp.toStdWString().at(0)).at(0));
if (letter.unicode() == 1488) //alef
day = 1; day = 1;
else if (dayTemp.compare("\u05D1") == 0) //bet else if (letter.unicode() == 1489) //bet
day = 2; day = 2;
else if (dayTemp.compare("\u05D2") == 0) //gimel else if (letter.unicode() == 1490) //gimel
day = 3; day = 3;
else if (dayTemp.compare("\u05D3") == 0) //dalet else if (letter.unicode() == 1491) //dalet
day = 4; day = 4;
else if (dayTemp.compare("\u05D4") == 0) //hey else if (letter.unicode() == 1492) //hey
day = 5; day = 5;
else if (dayTemp.compare("\u05D5") == 0) //vav else if (letter.unicode() == 1493) //vav
day = 6; day = 6;
else else
{
qDebug() << "error on parsing day!";
day= -1; day= -1;
}
} }
QString calendarCourse::getRoom() const QString calendarCourse::getRoom() const
{ {

1
src/jceData/Calendar/coursesSchedule/calendarPageCourse.h
View file

@ -3,6 +3,7 @@
#include "../../course.h" #include "../../course.h"
#include <QTime> #include <QTime>
#include <QDebug>
#define CALENDAR_COURSE_FIELDS 8 #define CALENDAR_COURSE_FIELDS 8

26
src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp
View file

@ -28,8 +28,9 @@ calendarSchedule::calendarSchedule(QWidget *parent) : QTableWidget(parent)
setHorizontalHeaderLabels(days); setHorizontalHeaderLabels(days);
setVerticalHeaderLabels(hours); setVerticalHeaderLabels(hours);
setEditTriggers(QAbstractItemView::NoEditTriggers); setEditTriggers(QAbstractItemView::NoEditTriggers);
horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
verticalHeader()->setSectionResizeMode(QHeaderView::Stretch); this->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
this->resizeRowsToContents();
} }
@ -46,9 +47,9 @@ void calendarSchedule::clearTableItems()
for (i = 0; i < rowCount(); i++) for (i = 0; i < rowCount(); i++)
for (j = 0; j < columnCount(); j++) for (j = 0; j < columnCount(); j++)
if (this->takeItem(i,j) != NULL) if (this->takeItem(i,j) != NULL)
delete this->takeItem(i,j); delete this->takeItem(i,j);s
// horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); this->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
// verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); this->resizeRowsToContents();
} }
void calendarSchedule::insertCourseIntoTable() void calendarSchedule::insertCourseIntoTable()
@ -82,23 +83,22 @@ void calendarSchedule::insertCourseIntoTable()
item = new QTableWidgetItem(courseString); item = new QTableWidgetItem(courseString);
item->setToolTip(coursePtr->toString()); item->setToolTip(coursePtr->toString());
if (this->takeItem(row,col) != NULL) if (this->takeItem(row,col) != NULL)
{
delete this->takeItem(row,col); delete this->takeItem(row,col);
}
this->setItem(row,col,item); this->setItem(row,col,item);
// qDebug() << "set row,col,item" << row << "," << col << "," << coursePtr->getSerialNum();
currentHour++; currentHour++;
--blocksNumber; --blocksNumber;
} }
horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
} }
this->resizeRowsToContents();
// horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
// verticalHeader()->setSectionResizeMode(QHeaderView::Interactive);
horizontalHeader()->stretchLastSection();
verticalHeader()->stretchLastSection();
} }