diff --git a/src/cpp/HTTPInterface/CheckTransactionPage.cpp b/src/cpp/HTTPInterface/CheckTransactionPage.cpp index 0d1442bb8..8ccc9b899 100644 --- a/src/cpp/HTTPInterface/CheckTransactionPage.cpp +++ b/src/cpp/HTTPInterface/CheckTransactionPage.cpp @@ -375,6 +375,9 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( gettext("Konto") ); responseStream << ""; +#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" + responseStream << ( gettext("Zieldatum") ); + responseStream << ""; #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( gettext("Gradido") ); responseStream << "\n"; @@ -404,8 +407,12 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t\t\t\t\t"; #line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; - responseStream << "\t\t\t\t\t\t"; + responseStream << "\t\t\t\t\t\t"; #line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" + responseStream << ( creationTransaction->getTargetDateString() ); + responseStream << "\n"; + responseStream << "\t\t\t\t\t\t"; +#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( creationTransaction->getAmountString() ); responseStream << " GDD\n"; responseStream << "\t\t\t\t\t\n"; @@ -413,22 +420,22 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t \n"; responseStream << "\t\t\t "; -#line 156 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 157 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t
"; -#line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( gettext("Aktives Konto") ); responseStream << "
"; -#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getFirstName() ); responseStream << " "; -#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getLastName() ); responseStream << " <"; -#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getEmail() ); responseStream << ">
\n"; @@ -436,12 +443,12 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t\t \n"; responseStream << "\t\t\t\t
"; -#line 165 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( gettext("Verwendungszweck") ); responseStream << "
"; -#line 167 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 168 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( memo ); responseStream << "
\n"; @@ -452,32 +459,32 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t\t "; -#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" if(!accountUser->hasCryptoKey()) { responseStream << "\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t\t\t \n"; responseStream << "\t\t\t\t\t \n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t\t"; -#line 180 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 181 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t \n"; @@ -488,7 +495,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t
\n"; responseStream << "\t
\n"; responseStream << "
\n"; -#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" +#line 197 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" } // begin include footer_ripple.cpsp responseStream << "\t\t\t
\n"; responseStream << "\t\t\n"; diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index e646601ba..715352f91 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -27,13 +27,14 @@ int main(int argc, char** argv) } std::string dateTimeString = __DATE__; - //printf("date time string: %s\n", dateTimeString.data()); + //printf("Building date time string: %s\n", dateTimeString.data()); std::string formatString("%b %d %Y"); int timeZone = 0; Poco::DateTime buildDateTime = Poco::DateTimeParser::parse(formatString, dateTimeString, timeZone); ServerConfig::g_versionString = Poco::DateTimeFormatter::format(buildDateTime, "0.%y.%m.%d"); //ServerConfig::g_versionString = "0.20.KW13.02"; + printf("Version: %s\n", ServerConfig::g_versionString.data()); printf("User size: %d Bytes, Session size: %d Bytes\n", sizeof(User), sizeof(Session)); printf("model sizes: User: %d Bytes, EmailOptIn: %d Bytes\n", sizeof(model::table::User), sizeof(model::table::EmailOptIn)); diff --git a/src/cpp/model/TransactionCreation.cpp b/src/cpp/model/TransactionCreation.cpp index 2bac6e924..8408823de 100644 --- a/src/cpp/model/TransactionCreation.cpp +++ b/src/cpp/model/TransactionCreation.cpp @@ -1,4 +1,5 @@ #include "TransactionCreation.h" +#include "Poco/DateTimeFormatter.h" #include TransactionCreation::TransactionCreation(const std::string& memo, const model::messages::gradido::TransactionCreation& protoCreation) @@ -52,3 +53,11 @@ int TransactionCreation::prepare() return 0; } +std::string TransactionCreation::getTargetDateString() +{ + // proto format is seconds, poco timestamp format is microseconds + Poco::Timestamp pocoStamp(mProtoCreation.target_date().seconds() * 1000*1000); + //Poco::DateTime(pocoStamp); + return Poco::DateTimeFormatter::format(pocoStamp, "%d. %b %y"); +} + diff --git a/src/cpp/model/TransactionCreation.h b/src/cpp/model/TransactionCreation.h index 6db89f3e7..a696ff962 100644 --- a/src/cpp/model/TransactionCreation.h +++ b/src/cpp/model/TransactionCreation.h @@ -28,6 +28,7 @@ public: inline char* getPublicHex() { return mReceiverPublicHex; } inline std::string getAmountString() { return amountToString(getAmount()); } + std::string getTargetDateString(); protected: const model::messages::gradido::TransactionCreation& mProtoCreation; diff --git a/src/cpsp/checkTransaction.cpsp b/src/cpsp/checkTransaction.cpsp index d3360f388..2bdd29f09 100644 --- a/src/cpsp/checkTransaction.cpsp +++ b/src/cpsp/checkTransaction.cpsp @@ -139,7 +139,7 @@ enum PageState {
- + @@ -148,6 +148,7 @@ enum PageState { <% } else { %> <% } %> + diff --git a/src/proto b/src/proto index 77e878253..9004e6978 160000 --- a/src/proto +++ b/src/proto @@ -1 +1 @@ -Subproject commit 77e878253ac2a044eb59700386c961c812667eae +Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca
<%= gettext("Konto") %><%= gettext("Gradido") %>
<%= gettext("Konto") %><%= gettext("Zieldatum") %><%= gettext("Gradido") %>
0x<%= creationTransaction->getPublicHex() %><%= creationTransaction->getTargetDateString() %> <%= creationTransaction->getAmountString() %> GDD