From f00ccc72dd59580047cfd51ebfbe9f6b9989219a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 29 Apr 2021 11:16:18 +0200 Subject: [PATCH] move from unfinished version to refined version --- .../src/cpp/HTTPInterface/AdminGroupsPage.cpp | 68 +++++++++++-------- login_server/src/cpp/controller/Group.cpp | 24 ++----- login_server/src/cpp/controller/Group.h | 2 +- login_server/src/cpsp/adminGroups.cpsp | 5 ++ 4 files changed, 48 insertions(+), 51 deletions(-) diff --git a/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp b/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp index c83a41564..807889d11 100644 --- a/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp +++ b/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp @@ -5,10 +5,10 @@ #include "Poco/DeflatingStream.h" -#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" #include "../controller/Group.h" -#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 1 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" #include "../ServerConfig.h" @@ -27,7 +27,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: if (_compressResponse) response.set("Content-Encoding", "gzip"); Poco::Net::HTMLForm form(request, request.stream()); -#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" const char* pageName = "Gruppen"; @@ -46,6 +46,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: alias, form.get("group-name", ""), form.get("group-url", ""), + form.get("group-host", ""), form.get("group-home", ""), form.get("group-desc", "") ); @@ -58,7 +59,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: //auto groups = controller::Group::load("gdd1"); //std::vector> groups; -#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" bool withMaterialIcons = false; std::ostream& _responseStream = response.send(); @@ -73,20 +74,20 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: responseStream << "\n"; responseStream << "\n"; responseStream << "Gradido Login Server: "; -#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 11 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" responseStream << ( pageName ); responseStream << "\n"; responseStream << "\n"; -#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 13 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" if(withMaterialIcons) { responseStream << "\n"; responseStream << "\n"; -#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 15 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" } responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; @@ -95,29 +96,29 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\t
    \n"; responseStream << "\t\t\t\t\t"; -#line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 22 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" if(!user.isNull()) { responseStream << "\n"; responseStream << "\t\t\t\t\t\t
  • getGroupBaseUrl() ); responseStream << "/\">Startseite
    • \n"; responseStream << "\t\t\t\t\t"; -#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 24 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" } responseStream << "\n"; responseStream << "\t\t\t\t\t
  • Gruppen
    • \n"; responseStream << "\t\t\t\t\t
  • Node Server
    • \n"; responseStream << "\t\t\t\t\t
  • Hedera Accounts
    • \n"; responseStream << "\t\t\t\t\t
  • Hedera Topics
    • \n"; responseStream << "\t\t\t\t
\n"; @@ -126,7 +127,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: responseStream << "\t\t
"; // end include header_large.cpsp responseStream << "\n"; -#line 41 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 42 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "
\n"; @@ -140,44 +141,49 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: responseStream << "\t\t\t\t
Name
\n"; responseStream << "\t\t\t\t
Alias
\n"; responseStream << "\t\t\t\t
Url
\n"; + responseStream << "\t\t\t\t
Host
\n"; responseStream << "\t\t\t\t
Home
\n"; responseStream << "\t\t\t\t
"; -#line 54 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 56 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( gettext("Description") ); responseStream << "
\n"; responseStream << "\t\t\t
\n"; responseStream << "\t\t\t"; -#line 56 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 58 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" for(auto it = groups.begin(); it != groups.end(); it++) { auto group_model = (*it)->getModel(); responseStream << "\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t\t\t
"; -#line 59 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 61 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getID() ); responseStream << "
\n"; responseStream << "\t\t\t\t\t
"; -#line 60 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 62 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getName() ); responseStream << "
\n"; responseStream << "\t\t\t\t\t
"; -#line 61 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 63 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getAlias() ); responseStream << "
\n"; responseStream << "\t\t\t\t\t
"; -#line 62 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 64 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getUrl() ); responseStream << "
\n"; + responseStream << "\t\t\t\t\t
"; +#line 65 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" + responseStream << ( group_model->getHost() ); + responseStream << "
\n"; responseStream << "\t\t\t\t\t
"; -#line 63 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 66 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getHome() ); responseStream << "
\n"; responseStream << "\t\t\t\t\t
"; -#line 64 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 67 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" responseStream << ( group_model->getDescription()); responseStream << "
\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t"; -#line 66 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp" +#line 69 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp" } responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t
\n"; @@ -192,15 +198,17 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: 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\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\n"; @@ -212,14 +220,14 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco: responseStream << " \n"; responseStream << "
\n"; responseStream << " "; -#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "

Login Server in Entwicklung

\n"; responseStream << "

Alpha "; -#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp" responseStream << ( ServerConfig::g_versionString ); responseStream << "

\n"; responseStream << "
\n"; diff --git a/login_server/src/cpp/controller/Group.cpp b/login_server/src/cpp/controller/Group.cpp index 9217b640a..0cf04e39e 100644 --- a/login_server/src/cpp/controller/Group.cpp +++ b/login_server/src/cpp/controller/Group.cpp @@ -15,9 +15,9 @@ namespace controller { } - Poco::AutoPtr Group::create(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description) + Poco::AutoPtr Group::create(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description) { - auto db = new model::table::Group(alias, name, url,"", home, description); + auto db = new model::table::Group(alias, name, url, host, home, description); auto group = new Group(db); return Poco::AutoPtr(group); } @@ -51,25 +51,9 @@ namespace controller { { auto db = new model::table::Group(); std::vector group_list; - // throw an unresolved external symbol error - //group_list = db->loadAllFromDB(); - // work around for not working call to loadAllFromDB - auto cm = ConnectionManager::getInstance(); - auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER); - Poco::Data::Statement select(session); - - select << "SELECT id, alias, name, url, home, description FROM " << db->getTableName() - , Poco::Data::Keywords::into(group_list); - - size_t resultCount = 0; - try { - resultCount = select.execute(); - } - catch (Poco::Exception& ex) { - printf("[Group::listAll] poco exception: %s\n", ex.displayText().data()); - } - // work around end + group_list = db->loadAllFromDB(); + std::vector> resultVector; resultVector.reserve(group_list.size()); diff --git a/login_server/src/cpp/controller/Group.h b/login_server/src/cpp/controller/Group.h index 3f084acd4..b1061b82c 100644 --- a/login_server/src/cpp/controller/Group.h +++ b/login_server/src/cpp/controller/Group.h @@ -16,7 +16,7 @@ namespace controller { ~Group(); - static Poco::AutoPtr create(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description); + static Poco::AutoPtr create(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description); static std::vector> load(const std::string& alias); static Poco::AutoPtr load(int id); diff --git a/login_server/src/cpsp/adminGroups.cpsp b/login_server/src/cpsp/adminGroups.cpsp index 64df38205..a894c23ac 100644 --- a/login_server/src/cpsp/adminGroups.cpsp +++ b/login_server/src/cpsp/adminGroups.cpsp @@ -25,6 +25,7 @@ alias, form.get("group-name", ""), form.get("group-url", ""), + form.get("group-host", ""), form.get("group-home", ""), form.get("group-desc", "") ); @@ -50,6 +51,7 @@
Name
Alias
Url
+
Host
Home
<%= gettext("Description") %>
@@ -60,6 +62,7 @@
<%= group_model->getName() %>
<%= group_model->getAlias() %>
<%= group_model->getUrl() %>
+
<%= group_model->getHost() %>
<%= group_model->getHome() %>
<%= group_model->getDescription()%>
@@ -77,6 +80,8 @@ + +