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

minor cleanup

Browse source
This commit is contained in:
Dorian Zedler 2019-02-18 18:05:39 +01:00
parent 3c09310c67
commit 74726a10d8
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qml/Pages/LoginPage.qml
View file

@ -69,16 +69,22 @@ Page {
Label { Label {
id: infoText id: infoText
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: parent.width * 0.8 width: parent.width * 0.8
height: parent.height * 0.2 height: parent.height * 0.2
horizontalAlignment: Text.AlignHCenter
fontSizeMode: Text.Fit; fontSizeMode: Text.Fit;
minimumPixelSize: 10; minimumPixelSize: 10;
font.pixelSize: 72 font.pixelSize: 72
wrapMode: Text.Wrap
text: "<html>Bitte melde dich mit den Anmeldedaten der <a href='http://www.fanny-leicht.de/'>Fanny-Webseite</a> an. text: "<html>Bitte melde dich mit den Anmeldedaten der <a href='http://www.fanny-leicht.de/'>Fanny-Webseite</a> an.
<a href='http://www.fanny-leicht.de/j34/index.php/aktuelles/vertretungsplan'>Weitere Informationen</a></html>" <a href='http://www.fanny-leicht.de/j34/index.php/aktuelles/vertretungsplan'>Weitere Informationen</a></html>"
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
onLinkActivated: { onLinkActivated: {
Qt.openUrlExternally(link) Qt.openUrlExternally(link)
} }
@ -224,11 +230,14 @@ Page {
CheckDelegate { CheckDelegate {
id: cBperm id: cBperm
text: qsTr("Angemeldet bleiben")
checked: true
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
height: formCol.rowHeight height: formCol.rowHeight
checked: true
text: qsTr("Angemeldet bleiben")
} }
FancyButton { FancyButton {
@ -242,8 +251,10 @@ Page {
height: formCol.rowHeight height: formCol.rowHeight
text: qsTr("Anmelden")
enabled: tiuname.length > 0 & tipasswd.length > 0 enabled: tiuname.length > 0 & tipasswd.length > 0
text: qsTr("Anmelden")
onClicked: root.login(tiuname.text, tipasswd.text, cBperm.checked) onClicked: root.login(tiuname.text, tipasswd.text, cBperm.checked)
} }
@ -258,18 +269,25 @@ Page {
height: formCol.rowHeight height: formCol.rowHeight
text: qsTr("Registrieren")
enabled: true enabled: true
text: qsTr("Registrieren")
onClicked: Qt.openUrlExternally("http://www.fanny-leicht.de/j34/index.php/login?view=registration") onClicked: Qt.openUrlExternally("http://www.fanny-leicht.de/j34/index.php/login?view=registration")
} }
Label { Label {
id: laStatus id: laStatus
text: qsTr("")
font.pixelSize: height * 0.3
color: "red"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
height: formCol.rowHeight height: formCol.rowHeight
font.pixelSize: height * 0.3
color: "red"
text: qsTr("")
} }
} }

2
sources/serverconn.cpp
View file

@ -154,8 +154,6 @@ int ServerConn::getEvents(QString day)
pdata.addQueryItem("mode", pGlobalAppSettings->loadSetting("teacherMode") == "true" ? "1":"0"); pdata.addQueryItem("mode", pGlobalAppSettings->loadSetting("teacherMode") == "true" ? "1":"0");
pdata.addQueryItem("day", day); pdata.addQueryItem("day", day);
qDebug() << day;
// send the request // send the request
ReturnData_t ret = this->senddata(QUrl("http://www.fanny-leicht.de/j34/templates/g5_helium/intern/events.php"), pdata); ReturnData_t ret = this->senddata(QUrl("http://www.fanny-leicht.de/j34/templates/g5_helium/intern/events.php"), pdata);