Merge branch 'master' of https://github.com/liranbg/JceManager
This commit is contained in:
commit
fe5a144bd3
8 changed files with 539 additions and 540 deletions
11
jceGrade.pro
11
jceGrade.pro
|
@ -14,10 +14,8 @@ CONFIG += console static
|
|||
TRANSLATIONS = jce_en.ts \
|
||||
jce_he.ts
|
||||
|
||||
|
||||
FORMS += \
|
||||
main/mainscreen.ui \
|
||||
src/jceData/Calendar/calendardialog.ui
|
||||
main/mainscreen.ui
|
||||
|
||||
OTHER_FILES +=
|
||||
|
||||
|
@ -42,8 +40,7 @@ HEADERS += \
|
|||
src/jceData/Calendar/calendarCourse.h \
|
||||
src/jceData/Calendar/calendarSchedule.h \
|
||||
src/jceData/CSV/csv_exporter.h \
|
||||
src/appDatabase/simplecrypt.h \
|
||||
src/jceData/Calendar/calendardialog.h
|
||||
src/appDatabase/simplecrypt.h
|
||||
|
||||
SOURCES += \
|
||||
main/CalendarTab/CalendarManager.cpp \
|
||||
|
@ -62,6 +59,6 @@ SOURCES += \
|
|||
src/jceData/Calendar/calendarCourse.cpp \
|
||||
src/jceData/Calendar/calendarSchedule.cpp \
|
||||
src/jceData/CSV/csv_exporter.cpp \
|
||||
src/appDatabase/simplecrypt.cpp \
|
||||
src/jceData/Calendar/calendardialog.cpp
|
||||
src/appDatabase/simplecrypt.cpp
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ void CalendarManager::setCalendar(std::string html)
|
|||
}
|
||||
void CalendarManager::exportCalendarCSV() //need to add fix to the null pointer bug
|
||||
{
|
||||
if (caliSchedPtr->getCourses()->empty())
|
||||
if (caliSchedPtr->getCourses() == NULL)
|
||||
return;
|
||||
QMessageBox msgBox;
|
||||
int buttonClicked = caliDialog->exec();
|
||||
|
|
|
@ -7,10 +7,12 @@ std::string CalendarPage::htmlToString()
|
|||
|
||||
void CalendarPage::setPage(std::string html)
|
||||
{
|
||||
|
||||
courses = new std::list<calendarCourse*>();
|
||||
tempHtml = getString(html);
|
||||
tempHtml = tokenToLines(tempHtml);
|
||||
calendarListInit(tempHtml);
|
||||
|
||||
}
|
||||
|
||||
std::string CalendarPage::tokenToLines(std::string &textToPhrase)
|
||||
|
|
Loading…
Reference in a new issue