dorian/fanny-app
dorian/fanny-app
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

cleaned up code of foodplan

Browse source
This commit is contained in:
Dorian Zedler 2018-12-23 21:12:33 +01:00
parent c6e1e12cfe
commit bcfc802932
2 changed files with 11 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
headers/serverconn.h
View file

@ -42,7 +42,6 @@ public:
Q_INVOKABLE int checkConn(); Q_INVOKABLE int checkConn();
Q_INVOKABLE float getProgress(); Q_INVOKABLE float getProgress();
Q_INVOKABLE int getFoodPlan(); Q_INVOKABLE int getFoodPlan();
Q_INVOKABLE QVariantMap getFoodPlanData(int index);
Q_INVOKABLE QVariantMap getEventData(int index); Q_INVOKABLE QVariantMap getEventData(int index);
Q_INVOKABLE int getEvents(QString day); Q_INVOKABLE int getEvents(QString day);
Q_INVOKABLE int getEventCount(); Q_INVOKABLE int getEventCount();

76
sources/serverconn.cpp
View file

@ -286,7 +286,6 @@ int ServerConn::getEvents(QString day){
int ServerConn::getFoodPlan() int ServerConn::getFoodPlan()
{ {
this->progress = 0; this->progress = 0;
ReturnData_t ret; //this is a custom type to store the returned data
// Call the webservice // Call the webservice
QNetworkRequest request(QUrl("http://www.treffpunkt-fanny.de/fuer-schueler-und-lehrer/speiseplan.html")); QNetworkRequest request(QUrl("http://www.treffpunkt-fanny.de/fuer-schueler-und-lehrer/speiseplan.html"));
@ -326,18 +325,18 @@ int ServerConn::getFoodPlan()
// m_weekplan is a list, that contains a list for each day, which contains: cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert. // m_weekplan is a list, that contains a list for each day, which contains: cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert.
// read the whole website // read the whole website
ret.text = QString::fromUtf8(reply->readAll()); QString returnedData = QString::fromUtf8(reply->readAll());
// remove unnecessary stuff // remove unnecessary stuff
ret.text.replace("\n",""); returnedData.replace("\n","");
ret.text.replace("\r",""); returnedData.replace("\r","");
ret.text.replace("\t",""); returnedData.replace("\t","");
// workaround for changing html syntax // workaround for changing html syntax
ret.text.replace("width=\"25%\"", "style=\"width: 25%;\""); returnedData.replace("style=\"width: 25%;\"", "width=\"25%\"");
// split the string at the beginning of the tables // split the string at the beginning of the tables
QStringList documentList = ret.text.split( "<table class=\"speiseplan\">" ); QStringList documentList = returnedData.split( "<table class=\"speiseplan\">" );
// enshure that the data is valid // enshure that the data is valid
if(documentList.length() < 2){ if(documentList.length() < 2){
@ -485,74 +484,21 @@ int ServerConn::getFoodPlan()
// append the day to the weeklist // append the day to the weeklist
temp_weekplan.append({daylist[0], daylist[1], daylist[2], daylist[3], daylist[4], daylist[5]}); temp_weekplan.append({daylist[0], daylist[1], daylist[2], daylist[3], daylist[4], daylist[5]});
} }
/*
function getDateString(index){
var date = _cppServerConn.getFoodPlanData(index).date
console.log(date.getTime())
console.log(today.getTime())
if(date.getDate() === today.getDate()){
return("Heute")
}
else if(date.getTime() < (today.getTime() + (24 * 60 * 60 * 1000) )){
return("Morgen")
}
else {
return(Qt.formatDateTime(_cppServerConn.getFoodPlanData(index).date, "dddd, d.M.yy"))
}
}
function isDayVisible(index){
var date = _cppServerConn.getFoodPlanData(index).date
// console.warn(date.getTime())
// console.warn(today.getTime())
// console.log("")
return( date.getTime() > today.getTime() || date.getDate() === today.getDate())
}
}
}
*/
} }
//qDebug() << temp_weekplan; // write data to global foodplan
this->m_weekplan = temp_weekplan; //write changes to global foodplan this->m_weekplan = temp_weekplan;
// check if there is any valid data
if(this->m_weekplan.isEmpty()){ if(this->m_weekplan.isEmpty()){
// no data
return(901); return(901);
} }
// success
return(200); return(200);
} }
QVariantMap ServerConn::getFoodPlanData(int index)
{
//cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert.
// QStringList ret; //list to return
// //qDebug() << index;
// for(int i=0;i<=5;i++){
// if(m_weekplan.size() > index){
// //qDebug() << i << m_weekplan[index].size();
// if(m_weekplan[index].size() > i){
// ret.append(m_weekplan[index][i]);
// //qDebug() << i << m_weekplan[index][i];
// }
// else {
// ret.append(nullptr);
// }
// }
// else {
// ret.append(nullptr);
// }
// }
//date_string_on_db
//qDebug() << Date;
//qDebug() << ret;
//return { {"cookteam", ret[0]}, {"date", Date}, {"main_dish", ret[2]}, {"main_dish_veg", ret[3]}, {"bgarnish", ret[4]}, {"dessert", ret[5]} };
}
QVariantMap ServerConn::getEventData(int index) QVariantMap ServerConn::getEventData(int index)
{ {
//cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert. //cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert.