IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update check transaction page for added target date in creation transaction

Browse Source
This commit is contained in:
Dario 2020-05-06 10:46:51 +02:00
parent 6f1a4617f6
commit 64657c96a0
6 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/cpp/HTTPInterface/CheckTransactionPage.cpp
View File

@ -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 << "</th><th>";
#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Zieldatum") );
responseStream << "</th><th>";
#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Gradido") );
responseStream << "</th></tr>\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<td class=\"grd-success-color\">";
responseStream << "\t\t\t\t\t\t<td>";
#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( creationTransaction->getTargetDateString() );
responseStream << "</td>\n";
responseStream << "\t\t\t\t\t\t<td class=\"grd-success-color\">";
#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( creationTransaction->getAmountString() );
responseStream << " GDD</td>\n";
responseStream << "\t\t\t\t\t</tr>\n";
@ -413,22 +420,22 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t\t</table>\n";
responseStream << "\t\t\t </div>\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 <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break\">\n";
responseStream << "\t\t\t\t <thead><tr><th>";
#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 << "</th></tr></thead>\n";
responseStream << "\t\t\t\t <tbody><tr><td>";
#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 << " &lt;";
#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 << "&gt;</td></tr></tbody>\n";
responseStream << "\t\t\t\t</table>\n";
@ -436,12 +443,12 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break tab-container\">\n";
responseStream << "\t\t\t\t <thead><tr><th>";
#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 << "</th></tr></thead>\n";
responseStream << "\t\t\t\t <tbody><tr>\n";
responseStream << "\t\t\t\t\t <td class=\"tab-content\">";
#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 << "</td></tr></tbody>\n";
responseStream << "\t\t\t\t</table>\n";
@ -452,32 +459,32 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t <div class=\"row mb-3\">\n";
responseStream << "\t\t\t\t<div class=\"col-md-10 mx-auto\">\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 <div class=\"form-group\">\n";
responseStream << "\t\t\t\t\t <label for=\"sign-password\">";
#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Ich brauche nochmal dein Passwort") );
responseStream << "</label>\n";
responseStream << "\t\t\t\t\t <input type=\"password\" class=\"form-control\" id=\"sign-password\" name=\"sign-password\" placeholder=\"";
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Passwort") );
responseStream << "\">\n";
responseStream << "\t\t\t\t </div>\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 <button type=\"submit\" class=\"btn btn-sm btn-primary\" name=\"ok\" value=\"ok\">\n";
responseStream << "\t\t\t\t\t<i class=\"mdi mdi-signature-freehand\"></i>\n";
responseStream << "\t\t\t\t\t";
#line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion unterzeichnen") );
responseStream << "\n";
responseStream << "\t\t\t\t </button>\n";
responseStream << "\t\t\t\t <button type=\"submit\" class=\"btn btn-sm btn-warning\" name=\"abort\" value=\"abort\">\n";
responseStream << "\t\t\t\t\t<i class=\"mdi mdi-delete\"></i>\n";
responseStream << "\t\t\t\t\t";
#line 187 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
#line 188 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion verwerfen") );
responseStream << "\n";
responseStream << "\t\t\t\t </button>\n";
@ -488,7 +495,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t </div>\n";
responseStream << "\t</div>\n";
responseStream << "</div>\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</div>\n";
responseStream << "\t\t</div>\n";

3
src/cpp/main.cpp
View File

@ -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));

9
src/cpp/model/TransactionCreation.cpp
View File

@ -1,4 +1,5 @@
#include "TransactionCreation.h"
#include "Poco/DateTimeFormatter.h"
#include <sodium.h>
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");
}

1
src/cpp/model/TransactionCreation.h
View File

@ -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;

3
src/cpsp/checkTransaction.cpsp
View File

@ -139,7 +139,7 @@ enum PageState {
<div class="table-responsive mb-4">
<table class="table info-table table-striped table-bordered">
<thead>
<tr><th><%= gettext("Konto") %></th><th><%= gettext("Gradido") %></th></tr>
<tr><th><%= gettext("Konto") %></th><th><%= gettext("Zieldatum") %></th><th><%= gettext("Gradido") %></th></tr>
</thead>
<tbody>
<tr>
@ -148,6 +148,7 @@ enum PageState {
<% } else { %>
<td class="small">0x<%= creationTransaction->getPublicHex() %></td>
<% } %>
<td><%= creationTransaction->getTargetDateString() %></td>
<td class="grd-success-color"><%= creationTransaction->getAmountString() %> GDD</td>
</tr>
</tbody>

2
src/proto

@ -1 +1 @@
Subproject commit 77e878253ac2a044eb59700386c961c812667eae
Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca