eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 02:29:17 +02:00
Code Issues 123 Wiki Activity

report generation from template, crash on exit fix

Browse Source
This commit is contained in:
milek7
2019-04-24 18:29:28 +02:00
parent 0a947ad094
commit 1060e47a43
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
widgets/trainingcard.cpp
View File

@@ -14,6 +14,12 @@ trainingcard_panel::trainingcard_panel()
clear(); clear();
} }
trainingcard_panel::~trainingcard_panel()
{
if (save_thread.joinable())
save_thread.join();
}
void trainingcard_panel::clear() void trainingcard_panel::clear()
{ {
start_time_wall.reset(); start_time_wall.reset();
@@ -38,21 +44,6 @@ void trainingcard_panel::clear()
remarks.resize(4096, 0); remarks.resize(4096, 0);
} }
std::string trainingcard_panel::json_escape(const std::string &s) {
std::ostringstream o;
for (auto c = s.cbegin(); c != s.cend(); c++) {
if (*c == '\x00')
return o.str();
if (*c == '"' || *c == '\\' || ('\x00' <= *c && *c <= '\x1f')) {
o << "\\u"
<< std::hex << std::setw(4) << std::setfill('0') << (int)*c;
} else {
o << *c;
}
}
return o.str();
}
void trainingcard_panel::save_thread_func() void trainingcard_panel::save_thread_func()
{ {
std::tm *tm = std::localtime(&(*start_time_wall)); std::tm *tm = std::localtime(&(*start_time_wall));
@@ -66,21 +57,29 @@ void trainingcard_panel::save_thread_func()
+ std::to_string(tm->tm_hour) + std::to_string(tm->tm_min) + "_" + std::string(trainee_name.c_str()) + "_" + std::string(instructor_name.c_str()); + std::to_string(tm->tm_hour) + std::to_string(tm->tm_min) + "_" + std::string(trainee_name.c_str()) + "_" + std::string(instructor_name.c_str());
std::fstream temp("reports/" + rep + ".html", std::ios_base::out | std::ios_base::binary); std::fstream temp("reports/" + rep + ".html", std::ios_base::out | std::ios_base::binary);
std::fstream input("report_template.html", std::ios_base::in | std::ios_base::binary);
temp << "<!DOCTYPE html><meta charset=\"utf-8\"> " << std::endl; std::string in_line;
temp << "<body>" << std::endl; while (std::getline(input, in_line)) {
temp << "<div><b>Miejsce: </b>" << (std::string(place.c_str())) << "</div><br>" << std::endl; const std::string magic("{{CONTENT}}");
temp << "<div><b>Data: </b>" << (date) << "</div><br>" << std::endl; if (in_line.compare(0, magic.size(), magic) == 0) {
temp << "<div><b>Czas: </b>" << (from) << " - " << (to) << "</div><br>" << std::endl; temp << "<div><b>Miejsce: </b>" << (std::string(place.c_str())) << "</div><br />" << std::endl;
temp << "<div><b>Imię (imiona) i nazwisko szkolonego: </b>" << (trainee_name) << "</div><br>" << std::endl; temp << "<div><b>Data: </b>" << (date) << "</div><br />" << std::endl;
temp << "<div><b>Data urodzenia: </b>" << (trainee_birthdate) << "</div><br>" << std::endl; temp << "<div><b>Czas: </b>" << (from) << " - " << (to) << "</div><br />" << std::endl;
temp << "<div><b>Firma: </b>" << (trainee_company) << "</div><br>" << std::endl; temp << "<div><b>Imię (imiona) i nazwisko szkolonego: </b>" << (trainee_name) << "</div><br />" << std::endl;
temp << "<div><b>Imię i nazwisko instruktora: </b>" << (instructor_name) << "</div><br>" << std::endl; temp << "<div><b>Data urodzenia: </b>" << (trainee_birthdate) << "</div><br />" << std::endl;
temp << "<div><b>Odcinek trasy: </b>" << (track_segment) << "</div><br>" << std::endl; temp << "<div><b>Firma: </b>" << (trainee_company) << "</div><br />" << std::endl;
if (distance > 0.0f) temp << "<div><b>Imię i nazwisko instruktora: </b>" << (instructor_name) << "</div><br />" << std::endl;
temp << "<div><b>Przebyta odległość: </b>" << std::round(distance) << " km</div><br>" << std::endl; temp << "<div><b>Odcinek trasy: </b>" << (track_segment) << "</div><br />" << std::endl;
temp << "<div><b>Uwagi: </b><br>" << (remarks) << "</div><br>" << std::endl; if (distance > 0.0f)
temp << "<div><b>Przebyta odległość: </b>" << std::round(distance) << " km</div><br />" << std::endl;
temp << "<div><b>Uwagi: </b><br />" << (remarks) << "</div>" << std::endl;
} else {
temp << in_line;
}
}
input.close();
temp.close(); temp.close();
state.store(EndRecording(rep)); state.store(EndRecording(rep));

3
widgets/trainingcard.h
View File

@@ -16,8 +16,6 @@ class trainingcard_panel : public ui_panel
std::thread save_thread; std::thread save_thread;
std::atomic<int> state; std::atomic<int> state;
std::string json_escape(const std::string &s);
void save_thread_func(); void save_thread_func();
void clear(); void clear();
@@ -30,6 +28,7 @@ class trainingcard_panel : public ui_panel
public: public:
trainingcard_panel(); trainingcard_panel();
~trainingcard_panel();
void render_contents() override; void render_contents() override;
}; };