diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 1e613563..6d3d299e 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -145,7 +145,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 3.6; + request.VersionID = 3.7; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts index 8fb275f0..c064e86b 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts @@ -1290,9 +1290,10 @@ export class ConcurrentReportComponent implements OnInit { return values; } selectTemplates() { - this.elementRef - .nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; - this.getCppDiffStructure(this.template); + this.elementRef.nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; + if (this.template) { + this.getCppDiffStructure(this.template); + } } refreshStatus() { diff --git a/Mohem/src/app/reports/transaction-list/transaction-list.component.html b/Mohem/src/app/reports/transaction-list/transaction-list.component.html index cfffd088..21a758a7 100644 --- a/Mohem/src/app/reports/transaction-list/transaction-list.component.html +++ b/Mohem/src/app/reports/transaction-list/transaction-list.component.html @@ -1,7 +1,11 @@
- +
diff --git a/Mohem/src/app/reports/transactions/transactions.component.ts b/Mohem/src/app/reports/transactions/transactions.component.ts index b282f815..9755fb4a 100644 --- a/Mohem/src/app/reports/transactions/transactions.component.ts +++ b/Mohem/src/app/reports/transactions/transactions.component.ts @@ -118,7 +118,9 @@ export class TransactionsComponent implements OnInit { selectTemplates() { // this.elementRef // .nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; - this.refresh(); + if (this.template) { + this.refresh(); + } } createTransaction() { this.cs.openConcurrentReport(); diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png new file mode 100644 index 00000000..27417cb3 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png index 27417cb3..d7d38d22 100644 Binary files a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png and b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png differ