From a41ea1a6ae94de8841c3b85f27e419926359cdfc Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Sep 2020 13:26:05 +0200 Subject: [PATCH] update Hedera Topics Page to show existing topics --- skeema/gradido_login/hedera_topics.sql | 4 +- .../HTTPInterface/AdminHederaAccountPage.cpp | 68 ++--- src/cpp/HTTPInterface/AdminTopicPage.cpp | 245 ++++++++++++++---- src/cpp/controller/HederaAccount.cpp | 24 +- src/cpp/controller/HederaAccount.h | 6 +- src/cpp/controller/HederaRequest.cpp | 38 ++- src/cpp/controller/HederaTopic.cpp | 34 ++- src/cpp/controller/HederaTopic.h | 9 +- src/cpp/lib/DataTypeConverter.cpp | 11 + src/cpp/lib/DataTypeConverter.h | 6 + src/cpp/model/table/HederaAccount.cpp | 20 +- src/cpp/model/table/HederaAccount.h | 1 + src/cpp/model/table/HederaTopic.cpp | 37 ++- src/cpp/model/table/HederaTopic.h | 10 +- src/cpp/model/table/ModelBase.cpp | 24 ++ src/cpp/model/table/ModelBase.h | 26 +- src/cpsp/adminHederaAccount.cpsp | 18 +- src/cpsp/adminTopic.cpsp | 55 +++- 18 files changed, 500 insertions(+), 136 deletions(-) diff --git a/skeema/gradido_login/hedera_topics.sql b/skeema/gradido_login/hedera_topics.sql index b9adaefc2..8bf279f3b 100644 --- a/skeema/gradido_login/hedera_topics.sql +++ b/skeema/gradido_login/hedera_topics.sql @@ -7,9 +7,9 @@ CREATE TABLE `hedera_topics` ( `group_id` int unsigned NOT NULL, `admin_key_id` int unsigned DEFAULT NULL, `submit_key_id` int unsigned DEFAULT NULL, - `current_timeout` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00', + `current_timeout` DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00', `sequence_number` bigint unsigned DEFAULT '0', - `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `updated` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `topic_hedera_id` (`topic_hedera_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp index 5ff4f7218..4bcf9b614 100644 --- a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp +++ b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp @@ -349,8 +349,8 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request responseStream << "\n"; responseStream << "\t\t\t\t\t
"; #line 266 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" - responseStream << ( hedera_account_model->getBalanceDouble() ); - responseStream << " hbar
\n"; + responseStream << ( hedera_account_model->getBalanceString() ); + responseStream << "\n"; responseStream << "\t\t\t\t\t
"; #line 267 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" responseStream << ( model::table::HederaAccount::hederaNetworkTypeToString(hedera_account_model->getNetworkType()) ); @@ -366,27 +366,29 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request #line 269 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" responseStream << ( hedera_account_model->getUpdatedString() ); responseStream << "
\n"; - responseStream << "\t\t\t\t\t\n"; - responseStream << "\t\t\t\t\t"; -#line 273 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" - if(changeEncryption != "") { responseStream << "\n"; - responseStream << "\t\t\t\t\t\t\n"; - responseStream << "\t\t\t\t\t"; -#line 277 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" + responseStream << "\t\t\t\t\t\t\t\tChange Encryption\n"; + responseStream << "\t\t\t\t\t\t\t\n"; + responseStream << "\t\t\t\t\t\t"; +#line 278 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" } responseStream << "\n"; + responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t"; -#line 279 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" +#line 281 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp" } responseStream << "\n"; responseStream << "\t\t\n"; responseStream << "\t\n"; @@ -395,7 +397,7 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request responseStream << "\t\n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t\n"; @@ -411,21 +413,21 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t
\n"; @@ -436,46 +438,46 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request responseStream << "\t
\n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\n"; @@ -506,7 +508,7 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request // end include footer.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "