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

Merge branch 'master' of https://github.com/liranbg/JceManager

Browse source
This commit is contained in:
Sagi Dayan 2014-09-12 11:54:09 +03:00
commit fe5a144bd3
8 changed files with 539 additions and 540 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
jceGrade.pro
View file

@ -14,10 +14,8 @@ CONFIG += console static
TRANSLATIONS = jce_en.ts \ TRANSLATIONS = jce_en.ts \
jce_he.ts jce_he.ts
FORMS += \ FORMS += \
main/mainscreen.ui \ main/mainscreen.ui
src/jceData/Calendar/calendardialog.ui
OTHER_FILES += OTHER_FILES +=
@ -42,8 +40,7 @@ HEADERS += \
src/jceData/Calendar/calendarCourse.h \ src/jceData/Calendar/calendarCourse.h \
src/jceData/Calendar/calendarSchedule.h \ src/jceData/Calendar/calendarSchedule.h \
src/jceData/CSV/csv_exporter.h \ src/jceData/CSV/csv_exporter.h \
src/appDatabase/simplecrypt.h \ src/appDatabase/simplecrypt.h
src/jceData/Calendar/calendardialog.h
SOURCES += \ SOURCES += \
main/CalendarTab/CalendarManager.cpp \ main/CalendarTab/CalendarManager.cpp \
@ -62,6 +59,6 @@ SOURCES += \
src/jceData/Calendar/calendarCourse.cpp \ src/jceData/Calendar/calendarCourse.cpp \
src/jceData/Calendar/calendarSchedule.cpp \ src/jceData/Calendar/calendarSchedule.cpp \
src/jceData/CSV/csv_exporter.cpp \ src/jceData/CSV/csv_exporter.cpp \
src/appDatabase/simplecrypt.cpp \ src/appDatabase/simplecrypt.cpp
src/jceData/Calendar/calendardialog.cpp

2
main/CalendarTab/CalendarManager.cpp
View file

@ -12,7 +12,7 @@ void CalendarManager::setCalendar(std::string html)
} }
void CalendarManager::exportCalendarCSV() //need to add fix to the null pointer bug void CalendarManager::exportCalendarCSV() //need to add fix to the null pointer bug
{ {
if (caliSchedPtr->getCourses()->empty()) if (caliSchedPtr->getCourses() == NULL)
return; return;
QMessageBox msgBox; QMessageBox msgBox;
int buttonClicked = caliDialog->exec(); int buttonClicked = caliDialog->exec();

2
src/jceData/Calendar/calendarPage.cpp
View file

@ -7,10 +7,12 @@ std::string CalendarPage::htmlToString()
void CalendarPage::setPage(std::string html) void CalendarPage::setPage(std::string html)
{ {
courses = new std::list<calendarCourse*>(); courses = new std::list<calendarCourse*>();
tempHtml = getString(html); tempHtml = getString(html);
tempHtml = tokenToLines(tempHtml); tempHtml = tokenToLines(tempHtml);
calendarListInit(tempHtml); calendarListInit(tempHtml);
} }
std::string CalendarPage::tokenToLines(std::string &textToPhrase) std::string CalendarPage::tokenToLines(std::string &textToPhrase)