From fa7685c57ad636b7438790b46e1a6df5f663b291 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 27 Jun 2022 14:18:44 +0300 Subject: [PATCH] fixed concurrent report issue and added new icon --- .../authentication/authentication.service.ts | 2 +- .../concurrent-report.component.ts | 7 ++++--- .../transaction-list.component.html | 6 +++++- .../transactions/transactions.component.ts | 4 +++- .../mohemm-action/ReportGenerated-OLD.png | Bin 0 -> 3429 bytes .../imgs/mohemm-action/ReportGenerated.png | Bin 3429 -> 1830 bytes 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png 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 0000000000000000000000000000000000000000..27417cb3d1fc13fc8f8b34f0b1dcff679323f848 GIT binary patch literal 3429 zcmaJ^c|6qlAD+~fo9=ZshE%Q@W0+=)%xFfgkz;a`xiD!CGb0Sqh9#1tm_<2~qs`Hl zJ5+L32oWJAw-`k>a{NZS?f(Aw_4~eF-|y#mJbEy}`N&1Og0!f}v1tAwruI#NZMGwHX}M?+REd zhs>t2xHKjMxT#1aG5xtlAYrP1)j((cBg^3Y-6vtkz=1>-SXT$KS<`nQ9{>NLboxJN z4%d$QZ@&Lim_rC+QNeap4%44a7EaDfbu$zTd7Mopa+z!blX>=g8*O};Tqehd$pS*5 zIxyg2M;e2|4B#C3M!@5d<_r#($RJbAu|^=Fgbs~HLBfxk!t}8E7zj=mtE-DUjxdFp zm_T803>J&U9K|5MbFoaaKb^|pe&uet0&d@JUFNlCw zIy4JQu~s&qb*q3EuA6o@H1w)L(t3A1y%@6%vtKrmUo%!^+3}~qz2+;4KNK1HWU%V_ z+`~WDhm9sS+5_5a9d(gNi#ewiV`<#HPCR@e6pC+lJ+#y#6ZWwC#@55?BG(=tTwrK2 zmutq7n1$CXNN-|(E^WVqmII>7!zX%+%YJ>;F?l;XKQqHQ5#zcqH*jH3)n!^#?ehMWiv9$*~XQL-fULUrR9j;ej*Vru5;8^<+rn^_B6VEy(>rEfmO*}9zf zcylHxH=UVg`8ZS~R`7ZyYVy#IlP~z6wM%IjRPEh!JC~0bjjV-~5!m>?Bz=`dzJJx8 z!t(2CB0HDoXP@#c#&jc5>e0|0zcZ>Q?xp_GkmHDt zUq*g)a8Xpi1mrze3ERFhpz0lw#(n~NIp+a#8%8H5i4ZIlvO<&olx2_W7Jf0Kk0rY| zx5pYiVw{#cHn(h`*4X79=eOu_D%`NUjiWG$^J+C*UzUoxR=<5R;c@A@&fQlK(>5}I z+vij2mXDfqP6=aXmgH;oc3~VkiRI6oiHkXlReMJA*@kTeMq(im@3V-j^-3x}Ea>=v zuMvq;`Dhn;o6Y-zubfj|l8_S_8PT_mhy#U_ECnc=;%OJX|g-Y-(!t5Xv7Z~*--^1&<7|P-E+z#=_zdK#c^f-I7!b$v`q-4JXxMnC55&ww!0uQrs48=GA}9<&?`^U6kT@i*I$xT8#7AEh zBGq87aJ_&EiJs^((+qajqzFLG;@(8%uI2XYW>+gH2cv6ETX@&uwP2 z1PbGVL!$I^tSrHWo3d|U#+X29|2(&=q?_#XDoB-h^c910d%=9mZ|jltcUOn`i9X_nPoy^T&X~+9 zODO$Hx9s{!;)#p1O~|QXi=wsgo08jP8tyr2miRxrvKN%nR*2qc{alc`d`i4Z>qCxx zn-XXgARn>2IYaETeXPTHVv|Aod+aCd>1B@$QQvE4z<-eH8)p>C-5wOs+JfXBwE+VT zl%%<3&29|`4Pyq$_gaz*kaJ%@M6@L4*cGp0AH;NlOs0P6I2qH#_y4m0UgZw6!m;56 zWI#i?SHjU(Z=~S%P>J1Imu_;3hniTfA|nlx%a2@7f;;Z|gr)|4?i?gkUuvDcZ;3Ym z5@o1|I-h=V=FWGW;!RIF=O6h=WxZxI^uBFp8=dy&HnKK*)M%2r6jcl`=d%r4% zix@1paR8j=VzwS^0q$Ehh%vfPwf()ozG9=I>)@xaoX}#=rGPIe{Ti$C5;wDWO1@}Q zCLwF<_N{BvmP)guiefhGPJrRi;1N_0r8&J4{qA~{ZE@>^uxI1gOEu2w_IA<9LwD}` zxRWH6ikaE&%~mtJ;JI_-v8X9D@wd_5l4rQs-OIZWGMP%g)lIj$yi{aI&q+jSN!Gds zy&75W>4!zNZuhOec1ddKLri38V(zHlvGJ>od&$kK)!F`+hw`mnJ_+t~DEx*GpNZ^D-IE$4$8ym6) zeO4;; zNQ;V_y#1-SM*dEE{nFXJ6T`2ZUcC2H8q5-LM*LB)Tl6gYV~Fig;FKp+p6ApN|HnNO zi(l@UOl(9+?215@&Y9<)NQ*9-T*@`+Gd{nls8sChm*&v2_~9B(S^GlYT|*UX(J9;P z#SxysI7~9}Lb1xy5jV1l9LBi^+Fky!x-r0Wyfj)?w=M=JVxi}~3hb9&*qzxM-=Y$6 zpj3J7V^cCL{^WSv1D7i(O-EFLk;+Kh-koN%qdn3q5zb#E&fmws@%KC^2^~&^*5_!j z(i`n>q)V?d^Yq947EEXEDkl#XCU0*i=o!!VAsFwZG}ODdD*EgFe5*ZIIvgge;sy;z zkK|rNojB=fcs>ZtGuh?qs27Ksqg*g-D*DYW#1fQh1>WhCFZULHYtPL97kTUXTE3`Q zp@U1a{DH#9r0S1vVxJ|~)epf_DH+xopah;HYNBNw{0N|sp~-x0rh?i0@iE6)V~b5Z GFa8HWpb>`v literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png index 27417cb3d1fc13fc8f8b34f0b1dcff679323f848..d7d38d22ad91eb563368cb54024b7a91ff77b102 100644 GIT binary patch literal 1830 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 GFa8HWpb>`v