mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-07 03:30:44 +00:00
Add Sessions overview charts to reports. Temporarily disabled local HTML template cache
This commit is contained in:
parent
df7c1817a0
commit
293fe7a78c
@ -46,6 +46,7 @@
|
|||||||
{{graph.Leaks}}
|
{{graph.Leaks}}
|
||||||
{{graph.Pressure}}
|
{{graph.Pressure}}
|
||||||
{{graph.Settings}}
|
{{graph.Settings}}
|
||||||
|
{{graph.Sessions}}
|
||||||
{{graph.%PB}}
|
{{graph.%PB}}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -47,6 +47,9 @@ Report::Report(QWidget *parent, gGraphView * shared, Overview * overview) :
|
|||||||
graphs["Settings"]=SET=new gGraph(GraphView,"Settings",graph_print_height,0);
|
graphs["Settings"]=SET=new gGraph(GraphView,"Settings",graph_print_height,0);
|
||||||
SET->AddLayer(m_overview->set);
|
SET->AddLayer(m_overview->set);
|
||||||
|
|
||||||
|
graphs["Sessions"]=SES=new gGraph(GraphView,"Sessions",graph_print_height,0);
|
||||||
|
SES->AddLayer(m_overview->ses);
|
||||||
|
|
||||||
|
|
||||||
for (QHash<QString,gGraph *>::iterator g=graphs.begin();g!=graphs.end();g++) {
|
for (QHash<QString,gGraph *>::iterator g=graphs.begin();g!=graphs.end();g++) {
|
||||||
gGraph *gr=g.value();
|
gGraph *gr=g.value();
|
||||||
@ -196,7 +199,7 @@ QString Report::GenerateReport(QString templ,QDate start, QDate end)
|
|||||||
file.setFileName(filename);
|
file.setFileName(filename);
|
||||||
|
|
||||||
QByteArray input;
|
QByteArray input;
|
||||||
if (file.exists()) {
|
if (0) { //file.exists()) {
|
||||||
file.open(QIODevice::ReadOnly);
|
file.open(QIODevice::ReadOnly);
|
||||||
input=file.readAll();
|
input=file.readAll();
|
||||||
file.close();
|
file.close();
|
||||||
|
4
report.h
4
report.h
@ -35,8 +35,8 @@ private:
|
|||||||
Overview * m_overview;
|
Overview * m_overview;
|
||||||
gGraphView * shared;
|
gGraphView * shared;
|
||||||
gGraphView * GraphView;
|
gGraphView * GraphView;
|
||||||
gGraph *AHI,*UC,*PR,*LK,*NPB,*SET;
|
gGraph *AHI,*UC,*PR,*LK,*NPB,*SET,*SES;
|
||||||
SummaryChart *bc,*uc,*pr,*lk,*npb,*set;
|
SummaryChart *bc,*uc,*pr,*lk,*npb,*set,*ses;
|
||||||
QHash<QString,QVariant> locals;
|
QHash<QString,QVariant> locals;
|
||||||
QHash<QString,gGraph *> graphs;
|
QHash<QString,gGraph *> graphs;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user