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 ea13c7a0e..81948cc23 100644 --- a/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp +++ b/programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp @@ -624,7 +624,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_time = us_label( tr("Initiation Time:") ); lb_time->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); QLabel* lb_time1 = us_label( tr("Initiated on:") ); - QLineEdit* le_time1 = us_lineedit( createdGMPrunts, 0, true ); + QLineEdit* le_time1 = us_lineedit( createdGMPrunts + " (UTC)", 0, true ); row=0; genL2 -> addWidget( lb_time, row++, 0, 1, 6 ); @@ -805,7 +805,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_time_o1 = us_label( tr("Type:") ); QLineEdit* le_time_o1 = us_lineedit( status_map[ "Remote Operation" ][ "type"], 0, true ); QLabel* lb_time_o2 = us_label( tr("Performed on:") ); - QLineEdit* le_time_o2 = us_lineedit( operation_types_live_update_ts[ im.key() ], 0, true ); + QLineEdit* le_time_o2 = us_lineedit( operation_types_live_update_ts[ im.key() ] + " (UTC)", 0, true ); row=0; genL2 -> addWidget( lb_time_o, row++, 0, 1, 6 ); @@ -959,7 +959,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_time_ref1 = us_label( tr("Ref. Scan Method:") ); QLineEdit* le_time_ref1 = us_lineedit( status_map[ "RefScan" ][ "type"], 0, true ); QLabel* lb_time_ref2 = us_label( tr("Data Saved on:") ); - QLineEdit* le_time_ref2 = us_lineedit( data_types_import_ts[ im.key() ], 0, true ); + QLineEdit* le_time_ref2 = us_lineedit( data_types_import_ts[ im.key() ] + " (UTC)", 0, true ); row=0; genL2 -> addWidget( lb_time_ref, row++, 0, 1, 6 ); @@ -1245,7 +1245,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_ts = us_label( tr("Edit Profiles Saved on:") ); lb_ts->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); QLabel* lb_ts1 = us_label( tr("TimeStamp:") ); - QLineEdit* le_ts1 = us_lineedit( data_types_edit_ts[ im.key() ], 0, true ); + QLineEdit* le_ts1 = us_lineedit( data_types_edit_ts[ im.key() ] + " (UTC)", 0, true ); row=0; genL3 -> addWidget( lb_ts, row++, 0, 1, 6 ); @@ -1362,7 +1362,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_men3 = us_label( tr("Performed by:") ); QLineEdit* le_men3 = us_lineedit( performed_by, 0, true ); QLabel* lb_men4 = us_label( tr("TimeStamp:") ); - QLineEdit* le_men4 = us_lineedit( when, 0, true ); + QLineEdit* le_men4 = us_lineedit( when + " (UTC)", 0, true ); genL1 -> addWidget( lb_men1, row, 1, 1, 2 ); genL1 -> addWidget( le_men1, row, 3, 1, 3 ); @@ -1428,7 +1428,7 @@ QVector< QGroupBox *> US_auditTrailGMP::createGroup_stages( QString name, QStrin QLabel* lb_canc3 = us_label( tr("Reason:") ); QLineEdit* le_canc3 = us_lineedit( reason, 0, true ); QLabel* lb_canc4 = us_label( tr("TimeStamp:") ); - QLineEdit* le_canc4 = us_lineedit( when, 0, true ); + QLineEdit* le_canc4 = us_lineedit( when + " (UTC)", 0, true ); genL1 -> addWidget( lb_canc1, row, 1, 1, 2 ); @@ -2396,7 +2396,7 @@ void US_auditTrailGMP::assemble_GMP_init( QMap< QString, QMap < QString, QString "" "" - "" + "" "" "
Initiated at: %1 Initiated at: %1 (UTC)
" ) @@ -2460,7 +2460,7 @@ void US_auditTrailGMP::assemble_GMP_live_update( QMap< QString, QMap < QString, "" "" " " - "" + "" "" "
Type: %1 Performed at: %2 Performed at: %2 (UTC)
" ) @@ -2529,7 +2529,7 @@ void US_auditTrailGMP::assemble_GMP_import( QMap< QString, QMap < QString, QStri "" "" " " - "" + "" "" "
Ref. Scan Method: %1 Data Saved at: %2 Data Saved at: %2 (UTC)
" ) @@ -2620,7 +2620,7 @@ void US_auditTrailGMP::assemble_GMP_editing( QMap< QString, QMap < QString, QStr "" "" - "" + "" "
%1
%1 (UTC)
" ) .arg( oper_ts ) //1 @@ -2679,7 +2679,7 @@ void US_auditTrailGMP::assemble_GMP_analysis_fitmen( QMap < QString, QString > a " Channel: %1, " " %2, " " by: %3, " - " at: %4 " + " at: %4 (UTC)" "" ) .arg( mfa.key() ) //1 @@ -2740,7 +2740,7 @@ void US_auditTrailGMP::assemble_GMP_analysis_cancelled( QMap < QString, QString " Reason: %3, " "" "" - " When: %4 " + " When: %4 (UTC)" "" ) .arg( cj.key() ) //1 diff --git a/programs/us_esigner_gmp/us_esigner_gmp.cpp b/programs/us_esigner_gmp/us_esigner_gmp.cpp index 8462c80fb..566b8b5d7 100644 --- a/programs/us_esigner_gmp/us_esigner_gmp.cpp +++ b/programs/us_esigner_gmp/us_esigner_gmp.cpp @@ -4682,8 +4682,8 @@ QString US_eSignaturesGMP::compose_updated_eSign_Json( int u_ID, QString u_fname current_esignee += "{\"Comment\":\"" + comment_esignee + "\","; //TimeDate fro current e-signee: - QDateTime date = QDateTime::currentDateTime(); - QString timedate_esignee = date.toString("MM-dd-yyyy hh:mm:ss"); + QDateTime date = QDateTime::currentDateTimeUtc(); + QString timedate_esignee = date.toString("MM-dd-yyyy hh:mm:ss") + " (UTC)"; current_esignee += "\"timeDate\":\"" + timedate_esignee + "\"}}"; if ( esigned_array.size() == 0 || !esigned_array.size() ) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index e64a56a95..65ef2e882 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -6316,7 +6316,7 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) "" "" - "" + "" "" "
Initiated at: %1 Initiated at: %1 (UTC)
" ) @@ -6407,7 +6407,7 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) "" "" " " - "" + "" "" "
Type: %1 Performed at: %2 Performed at: %2 (UTC)
" ) @@ -6513,7 +6513,7 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) "" "" " " - "" + "" "" "
Ref. Scan Method: %1 Data Saved at: %2 Data Saved at: %2 (UTC)
" ) @@ -6682,11 +6682,11 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) //Edit Profiles Saved: html_assembled += tr( "" - "" + "" "
Edit Profiles Saved at: Edit Profiles Saved on:
" "" - "" + "" "
%1
%1 (UTC)
" ) .arg( data_types_edit_ts[ im.key() ] ) //1 @@ -6753,7 +6753,7 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) " Channel: %1, " " %2, " " by: %3, " - " at: %4 " + " at: %4 (UTC)" "" ) .arg( mfa.key() ) //1 @@ -6816,7 +6816,7 @@ void US_ReporterGMP::assemble_user_inputs_html( void ) " Reason: %3, " "" "" - " When: %4 " + " When: %4 (UTC) " "" ) .arg( cj.key() ) //1 @@ -11692,8 +11692,8 @@ void US_ReporterGMP::get_current_date() // current_date = dNow.toString( fmt ); - QDateTime date = QDateTime::currentDateTime(); - current_date = date.toString("MM/dd/yyyy hh:mm:ss"); + QDateTime date = QDateTime::currentDateTimeUtc(); + current_date = date.toString("MM/dd/yyyy hh:mm:ss") + " (UTC)"; qDebug() << "Current date -- " << current_date; }