diff options
| author |   Philippe Lelong <lelong.ph@meltemus.com> | 2016-12-16 14:39:40 +0100 |
|---|---|---|
| committer |   José Bollo <jose.bollo@iot.bzh> | 2016-12-20 13:28:35 +0100 |
| commit | 02b9f906053148de3b94dd2097b81700820d5ae3 (patch) | |
| tree | a4337030ab8b7582c7e151f2160e2f08dc8680e7 | |
| parent | a7f9b7c13a736cc11e77858c2f7eb298557e8503 (diff) | |
modification in client def
Signed-off-by: Philippe Lelong <lelong.ph@meltemus.com>
| -rw-r--r-- | HomeScreen/src2/usermanagement.cpp | 5 | ||||
| -rw-r--r-- | HomeScreen/src2/usermanagement.h | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/HomeScreen/src2/usermanagement.cpp b/HomeScreen/src2/usermanagement.cpp index 54aff23..28c9894 100644 --- a/HomeScreen/src2/usermanagement.cpp +++ b/HomeScreen/src2/usermanagement.cpp @@ -29,7 +29,10 @@ void UserManagement::setUser(const User &user) QMetaObject::invokeMethod(shortcutArea, "languageChanged", Q_ARG(QVariant, user.graphPreferredLanguage)); QMetaObject::invokeMethod(statusArea, "languageChanged", Q_ARG(QVariant, user.graphPreferredLanguage)); QMetaObject::invokeMethod(home, "showSign90", Q_ARG(QVariant, true)); - QMetaObject::invokeMethod(home, "showVisa", Q_ARG(QVariant, true), Q_ARG(QVariant, "---- ---- ---- " + user.ccNumberMasked)); + if(user.ccNumberMasked.isEmpty()) + QMetaObject::invokeMethod(home, "showVisa", Q_ARG(QVariant, false), Q_ARG(QVariant, "")); + else + QMetaObject::invokeMethod(home, "showVisa", Q_ARG(QVariant, true), Q_ARG(QVariant, user.ccNumberMasked)); const QString welcome = QString("%1").arg(user.graphPreferredLanguage == "fr" ? "Bonjour " : "Hello") + " "; QMetaObject::invokeMethod(home, "showHello", Q_ARG(QVariant, welcome + user.first_name)); } diff --git a/HomeScreen/src2/usermanagement.h b/HomeScreen/src2/usermanagement.h index 1b1427d..89735ab 100644 --- a/HomeScreen/src2/usermanagement.h +++ b/HomeScreen/src2/usermanagement.h @@ -11,6 +11,11 @@ #ifndef REAL_SERVER #include <QtWebSockets/QWebSocketServer> #endif +//{"postal_address":"201 Mission Street","loc":"37.7914374,-122.3950694","country":"USA","mail":"bjensen@example.com", +//"city":"San Francisco","graphEmail":"bjensen@example.com","graphPreferredLanguage":"en","ccNumberMasked":"************1212", +//"ccExpYear":"19","description":"Original description","ccExpMonth":"01","groups":[],"last_name":"Jensen" +//"ccNumber":"123-1111-2222-3333-1212","house_identifier":"ForgeRock","phone":"+1 408 555 1862","name":"bjensen" +//"state":"CA","fax":"+1 408 555 1862","common_name":"Barbara Jensen","postal_code":"94105","first_name":"Barbara","keytoken":"EB:7C:23:C6:21:BF"} struct User { QString postal_address; QPointF loc; @@ -21,8 +26,8 @@ struct User { QString graphPreferredLanguage; QString ccNumberMasked; QString ccExpYear; - QString ccExpMonth; QString description; + QString ccExpMonth; QStringList groups; QString last_name; QString ccNumber; @@ -30,8 +35,8 @@ struct User { QString phone; QString name; QString state; - QString common_name; QString fax; + QString common_name; QString postal_code; QString first_name; QString keytoken; |