2018-08-02 Fred Gleason <fredg@paravelsystems.com>

* Modified reports in rdadmin(1) to display UTF-8 strings
	correctly.
This commit is contained in:
Fred Gleason 2018-08-02 16:37:58 -04:00
parent 7d54bc3691
commit dfa5438a65
2 changed files with 11 additions and 7 deletions

View File

@ -17296,3 +17296,6 @@
2018-08-02 Fred Gleason <fredg@paravelsystems.com> 2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdlibrary(1) to display UTF-8 strings * Modified reports in rdlibrary(1) to display UTF-8 strings
correctly. correctly.
2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdadmin(1) to display UTF-8 strings
correctly.

View File

@ -35,6 +35,7 @@
#include <rdcart.h> #include <rdcart.h>
#include <rddb.h> #include <rddb.h>
#include <rdescape_string.h> #include <rdescape_string.h>
#include <rdreport.h>
#include <rdtextfile.h> #include <rdtextfile.h>
#include "add_group.h" #include "add_group.h"
@ -304,7 +305,7 @@ void ListGroups::reportData()
// //
// Generate Header // Generate Header
// //
report=" Rivendell Group Report\n"; report=RDReport::center("Rivendell Group Report",94)+"\n";
report+=QString("Generated: ")+ report+=QString("Generated: ")+
QDateTime::currentDateTime().toString("MM/dd/yyyy - hh:mm:ss")+"\n"; QDateTime::currentDateTime().toString("MM/dd/yyyy - hh:mm:ss")+"\n";
report+="\n"; report+="\n";
@ -329,12 +330,12 @@ void ListGroups::reportData()
// //
// Group Name // Group Name
// //
report+=QString().sprintf("%-10s ",(const char *)q->value(0).toString()); report+=RDReport::leftJustify(q->value(0).toString(),10)+" ";
// //
// Group Description // Group Description
// //
report+=QString().sprintf("%-44s ",(const char *)q->value(1).toString()); report+=RDReport::leftJustify(q->value(1).toString(),44)+" ";
// //
// Cart Range // Cart Range
@ -350,7 +351,7 @@ void ListGroups::reportData()
// //
// Enforce Range // Enforce Range
// //
report+=QString().sprintf(" %s ",(const char *)q->value(4).toString()); report+=QString(" ")+q->value(4).toString()+" ";
// //
// Default Cart Type // Default Cart Type
@ -372,17 +373,17 @@ void ListGroups::reportData()
// //
// Music Reports // Music Reports
// //
report+=QString().sprintf(" %s ",(const char *)q->value(6).toString()); report+=QString(" ")+q->value(6).toString()+" ";
// //
// Traffic Reports // Traffic Reports
// //
report+=QString().sprintf(" %s ",(const char *)q->value(7).toString()); report+=QString(" ")+q->value(7).toString()+" ";
// //
// Now & Next // Now & Next
// //
report+=QString().sprintf(" %s",(const char *)q->value(8).toString()); report+=QString(" ")+q->value(8).toString();
// //
// End of Line // End of Line