GerhardHoffmann/UpdatePTUDevCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added lastCommit to tariff-struct. Added jsonParseFailed().

Browse Source
This commit is contained in:
Gerhard Hoffmann
2023-08-11 11:09:51 +02:00
parent a932ed5471
commit 853787cd4b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ismas/ismas_client.cpp
View File

@@ -753,11 +753,21 @@ QString IsmasClient::sanityCheckFailed(int resultCode, QString reason, QString c
version.toStdString().c_str()); version.toStdString().c_str());
} }
QString IsmasClient::updateOfPSAFailed(int resultCode, QString reason, QString const &version) { QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString const &version) {
return updateNewsToIsmas("U0003", return updateNewsToIsmas("U0003",
m_progressInPercent, m_progressInPercent,
resultCode, resultCode,
"UPDATE ERROR", "JSON-PARSE-ERROR",
reason.toStdString().c_str(),
version.toStdString().c_str());
}
QString IsmasClient::updateOfPSAFailed(int resultCode, QString step,
QString reason, QString const &version) {
return updateNewsToIsmas("U0003",
m_progressInPercent,
resultCode,
step.toStdString().c_str(),
reason.toStdString().c_str(), reason.toStdString().c_str(),
version.toStdString().c_str()); version.toStdString().c_str());
} }

4
ismas/ismas_client.h
View File

@@ -12,6 +12,7 @@ struct PSAInstalled {
int zone; int zone;
int size; int size;
QString blob; QString blob;
QString lastCommit;
QString info; QString info;
QString loadTime; QString loadTime;
} tariff; } tariff;
@@ -155,8 +156,9 @@ public:
// and update accepted // and update accepted
QString updateOfPSASucceeded(QString const &version = QString()); // update process succeeded QString updateOfPSASucceeded(QString const &version = QString()); // update process succeeded
QString updateOfPSAContinues(QString currentStage, QString currentStageInfo, QString const &version = QString()); QString updateOfPSAContinues(QString currentStage, QString currentStageInfo, QString const &version = QString());
QString updateOfPSAFailed(int resultCode, QString reason, QString const &version = QString()); QString updateOfPSAFailed(int resultCode, QString step, QString reason, QString const &version = QString());
QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString()); QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString());
QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
QString updateOfPSASendVersion(PSAInstalled const &psa); QString updateOfPSASendVersion(PSAInstalled const &psa);