diff --git a/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp b/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp index 3be7c3b20..d63bfc649 100644 --- a/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp +++ b/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp @@ -350,15 +350,18 @@ QMap< QString, QString> US_auditTrailGMP::read_autoflowGMPReportEsign_record( QS //slot to.. void US_auditTrailGMP::initPanel_auto( QMap < QString, QString > & protocol_details ) { + //clear all GUI, internals + reset_panel(); + //Main ID for parent GMP run: autoflowID_passed = protocol_details[ "autoflowID" ]; //GMP Run Name gmpRunName_passed = protocol_details["gmp_runname"]; - - //clear all GUI, internals - reset_panel(); + //init HTML + initHTML(); + qDebug() << "After reset..."; //0. Loaded Run @@ -483,6 +486,9 @@ void US_auditTrailGMP::initPanel_auto( QMap < QString, QString > & protocol_deta eSignTree ->expandAll(); uInteractionsTree->topLevelItem(0)->setExpanded(true); + + //conclude HTML + closeHTML(); resize( 1400, 1000 ); } @@ -552,7 +558,6 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin genL_v_rows->setSpacing ( 2 ); genL_v_rows->setContentsMargins( 20, 10, 20, 15 ); - int row; //read autoflowStatus record: @@ -694,8 +699,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin html_assembled += tr( "" ); html_assembled += tr( "" ); html_assembled += tr( "
There were NO remote operations.
" ); - html_assembled += tr("
"); - + QGridLayout* genL1 = new QGridLayout(); QVBoxLayout* genL11 = new QVBoxLayout(); @@ -2116,7 +2120,7 @@ bool US_auditTrailGMP::mkdir( const QString& baseDir, const QString& subdir ) //GMP init html void US_auditTrailGMP::assemble_GMP_init( QMap< QString, QMap < QString, QString > > status_map_c, QString createdGMPrunts ) { - html_assembled += tr("
"); + //html_assembled += tr("
"); html_assembled += tr( "

GMP Run Initiation (1. EXPERIMENT)

" ); //html_assembled += tr("
"); @@ -2507,3 +2511,65 @@ void US_auditTrailGMP::assemble_GMP_analysis_cancelled( QMap < QString, QString html_assembled += tr( "" ); } + +//initHTML +void US_auditTrailGMP::initHTML( void ) +{ + QString rptpage; + + // Compose the report header + rptpage = QString( "\n" ); + rptpage += "\n"; + rptpage += "\n"; + rptpage += " \n"; + rptpage += " Ultrascan III Composite Report \n"; + rptpage += " \n"; + rptpage += " \n"; + rptpage += " \n \n"; + + QString html_title = tr( + "

Audit Trail for GMP Run:
%1

" + "
" + ) + .arg( gmpRunName_passed ) //1 + ; + + html_assembled += + rptpage + + html_title; + +} + +//close HTML +void US_auditTrailGMP::closeHTML( void ) +{ + //do we need close remark? + html_assembled += "\n"; +} diff --git a/programs/us_audit_trail_gmp/us_audit_trail_gmp.h b/programs/us_audit_trail_gmp/us_audit_trail_gmp.h index eefa8d161..c4287e1af 100644 --- a/programs/us_audit_trail_gmp/us_audit_trail_gmp.h +++ b/programs/us_audit_trail_gmp/us_audit_trail_gmp.h @@ -92,6 +92,9 @@ class US_auditTrailGMP : public US_Widgets void assemble_GMP_editing( QMap< QString, QMap < QString, QString > >, QString, QString ); void assemble_GMP_analysis_fitmen( QMap < QString, QString > ); void assemble_GMP_analysis_cancelled( QMap < QString, QString >, QString ); + void initHTML( void ); + void closeHTML( void ); + signals: