From 55b4c58a2d8d13dcb1868738c19b70fa8787af34 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 14 Jun 2023 14:52:35 +0300 Subject: [PATCH] fixed srca issues --- Mohem/key.jks | Bin 4081 -> 2055 bytes .../authentication/sms-page/sms-page.page.ts | 2 ++ .../services/connector/connector.service.ts | 6 ++++-- Mohem/src/app/home/home.page.ts | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Mohem/key.jks b/Mohem/key.jks index b608d41c9e76679a5dd1b4b7f715b90efb051bb0..39fd02a63e0ee2cff3f01d85150c71c7b59a3ea8 100644 GIT binary patch delta 1939 zcmV;E2WB#%$y z{{f7~kKtA-sXW({r`H(J1^R$9SB@HQCxEW>L2I){$1aM)2Cvbd@1D3gjmlBhHE&&M z=kHPjVj}Q=5P{fs?;PU50$vbs@G_+5{l6f}Yr4d+;i8wlIkj()wz3~R9RhYv-~R2T zImvs0!b*{W;LLu}^S3iCTa1W_tuvyYI-X$dAaTSwHe+Lgu&&2GNfP}0Od9C~Iw$WG zsXMT$U2HASX2SQjIL6SCzG5mq)%s4mFPLEG5Vu%=0@&tDrFz|hoDtJMcKFV`;@%ZQ zHtir3>OHsII3Jr>%Ro;;s4*z~b9Ry{MoXX!lXXp3o-5_7PcAnJ+!FDNIlKvbfX2Xr zam<%}y7UGm!=!R|p%56J@>C#uhdng`rcS={(vJ*`G8|$s9 z>F7UysGPv!-jlHce--851Qx)CcD?@NE{gLcOaau>U_DOwXEqsDiVl1Uk3tIu37=&IZ|5tjZX89CiHh^=xQc4r56S>tibV9H%zxPA5FlkDo_ z4RKNn7Od5i&qyePpRDmR5H^HSM+iTc9ilt@gzY^Q;3u$cW(ivnuwWx=m=HC8*7*QK zJx{cGw>PJm@uP)uJAEEGmzjz^1Bu?aXE4yJ)c-5+wN<;5lAG3nQTBIwug0Gxr{ds+ zMLLf=r?=d2!&`{T&k(>}hJb95fS@ypJZWGc@;vTgFB5{YD>v6f8l$}24^}O>%79=d z(f0(LpZ#kz`RR_H(^P#P-O$T_Gfz4BmO%G(MFqWIV%bB}g=AKxYS-3*s|}W?DWehh zr=f`2M`>C#k7-1seM76KLrXv5?(41HzWD3$G>j8vm{G3K59cnY2z5ZZ7@e6KfVerR zX4-^89g`El5V<=bUCh50^NZY?@%(%R%%BDTqMt>bGK}yH!8aT}D z7UIPFhPB@BXSLPIM+EjI)`X;fp<9~=7boAyZMD~|crJA3=#vc%9t0fMh7OZ24JQ~g zFg7tVGBYwVS{Ds8I509YI59FZGcq!hZVfYkmzStd5L=&c@wxn^aifq!rf;SOTG#^T zMl|W*{yc7>f3m?3gS&ePny%tc$p(+#5w2IrFm0BF%c`<*(%Crk--s|s|->3Jm50VLy@{gkz_8wwIg8!gH6elGvvqRuMP4mp({ zc>`Rgk^qUD18_G$Ub5%Bc71tZtUCXTa&?{7{6mBPqb+raCdV1pLyUCLB~EcK}E*!=DD7sXD^v@2MP2~WfI-> z9_&JRswx+xPJ zRv%TBtA{25bJK3hK*tOA%e}vS9>Jnxd3&FKdVP_3JmF5BxiPP2_$U1WrkX?_Ay)s$ zbE)ER+5hcfvW42W)-##HAWnoj^kDrU*~CKNiW0QgnviO{hQeTv=|mi5dOF}ZR9p*4 zzHi3Y^|)EEpyN<@H=;Xthm1{!!lzgY8f^EI#cJR$s{gaR<*`K!5eT%dE+g4m_9<8v ZU&h|8(m5(ipGWKqq-VE|ijsnT{n8jXr$zt( literal 4081 zcmajgX*d*a*8uPt#%{(MCJD*D%#3{PlJu!37AcqVSBkEV$a14Jmo%?WVWnIS83#PO%*(DEKCIlnaQ0?TDIk`54~KQsqyI= zYC8^`@SW8GNgxl7mwp2dpx-Wx)Hp~pnow(>suNk2F%xz5mtJ}uAr>cgzv|ylEiR1g zkt|k!k?$r5eJ@aDM$TNV4Ox?adyQ-CI1h?NG z+?&EF-Mi~6(Kqb+*rzQVq8@3-9CK278()SN9We$9HonRupoIy?GYvI!dtHb*O^4WZ zS24yxyI;~wWhC6ycEHxXd4{3h*F1y#1(B|K$UvsIgW6V6Mo|IX?OcLJCBhdJPaPhy zi>MHxtKXzut2%=Zew~aqi_Yrb(hWDzSA!@pq}s=9uc+@Gv}O$5(~(bsAmMgupr@nU7C1A3iL zDo8f``(~9I?)J|?M-azoU$dCT#9DhhXPdXmC6*HE$DI*|T5%K9Jc3<(Ovc_0L8;#s z!lb=rKDt-$!<}tHsghf~%=L{Wa1$LRp1UA8w9KNH+&AD==xLBYX(vDUJdt0g^QVoO ztJKWR(mVNV$pb0-9@#VxMX9-B;SHj%E@fNx4X8dSUk2SnZGG`QJh54zr%4_o#WUxf^JuUHj+|zPs!ZtQ-ehTh_B^-)i0=r;Gt8cjY-v4Ho zTp15rXmCm4ozCf?S7wIYErD3nD*dLVdYm|zJE2?wFs=8khwiR2Bs(kMTkOz~_!(|? z&O5&z1!yrG<2wx)UezXyr@KTQ4$$I%^YE|48W7`RE5sggO$m5FUV#>-kX+iZ2u0`{fBP|j z%bYVQjAU7@{bj-=JYg_V);zqYYv5fgW;oP@wC+YkNpBID-Bw!mK4L^J5y z;u@A5DU?nAk4P7k(fQf4^vbgKCTn+Sk-G+egi@#J5S_BQe*B;12n5jC$|=Fs{;bMQ zcnl2@9s?{Zp``)R(14^9cP8OrdM2rO>P__sLRY_a9ho-WGP8T}+=wC+o4L{>uqTdaod0Cmao)dDv zqVwy-hu%CSkx2#AmfYpCfm%iv>*J5 zjg61>8Nyq3vilQf zM)d*U(BYjyv(qpuU%81@(BlhtZ$zEnI&Em{^K_8-QLq#|>(a|pNDjV3Lkk1|p9{kU z;R1i^EC2!VfVfefw+r1|;JNdP?GEQWUrTYHky`#)#6O++Q$!%3IPEgNd#_m)ZT{S_ z{E#_Yv=r4+j!fkmtQI`p-9off?#`%frbKLHnCd>3&gCkA+5Y4M!FxO7=9BP>pls@#8Km6+A=J$MWI(g(SKr z4y~0=bXy36|Cckjgu?Cd#H-aJNdxBWomV2UR*es_Di@?zzPt*HmsMsJMhXb^bbp?K zJS`@~&6@t^t+<#ogJ?E5H30`*4Y>UKyrIP942%)^2!;%_y8bZd-NIA}^FC2})D3;- z!AJW^(t&cYtgA@iud1pFG`iq5+3}e}bCz2c#!XaqCwa=^?|BA!xrV|2hQ8i0^bhnj zf1p48FVItFoE(0ZYwG(JtBa2z%|h=51}s+>K}`<&=zQnT-xS}>7w-#bTh+npV25=G zU4*l({xEkeidXie>gwXc*TEb$_fp0aMMFFFDekX2k=?ZtmWG+L_bn}* zWA5zw6fjn!&OR0`wsD(ZxWPmS^w2}0Lr)kqMr;x~=HAy>mG#@#hs6hluC?+_l=duZ zbm=YM=}<8V!VO5!uN`R%hG(Z@CX(RxpVt6Rwp*UNKEi|VygG-g{(>J0 ziWQ)0t#7V=X|%UP_h!4VKvB4BedX7>=l7{6VvItCM7tkeDPy`{+EmRL5b00qipX&i zwXyup-wnTX>%`DM_?mnT35I1+Y6taj`Is_Ul)u)+knr)N@?nW55hq_AF1;n=G|uRD zj#6D7F-~UP582ns4i-bHBW(hjyx8=3rm zE;;dngS}J};$9L^k?`{3>4P00Y3rA1(F1XB*rV0f?wrvEifL|W*hiCy;aoy3=P8M| z7gI@O2ipzVh558^R*K@ZBg3wwvd==RWqi9bmZlk;P!ZRJkNigCF}gxjg*^`eufBXt zxD4Iwln%V1@`)O#$GxFK;adf+nonxf{bff>R05xK#q)XB3n3RCNG}ff-Lv>kn(VWQ zu)oQP(I9>;<(R4|jvsDg-<({{X3QuT7OhS+?0$-*d=R<9RapHN;!;6P=#h`p#sFv; z(CTiR?8)i9=Fj)bq(1wUEW+4f%?3_Lb6?zvDA{zcgb?CPg0+i29+>A-2uqb8br#Q9 zWw;6KGa)K?V7cvibXZIJ1XO%G)nDm!G1t`()!VlJWx>MGemGy`=@}LMk$g9qn8azJ zhBDrmcKki?LyJqw=vCAK)cI4M!Fd*?5wB#IMb(I>13Y{|=XX}4($VMMWD&ZnLIW%9 zlPUzIG*581d}UwN`D7v55*p{t@k$e{O}PsQGGNbT=~v=>aG%GEX0Kwy0%|ujZ;Oe! zYgHvFT*^OSY|OyEA?v8E^5Msk#{xvrwwVt#b$b|LPPEfZ4~_4f)^~c%C3O;S17B)i z^g8jRLamoQZvRS4knz=EZO`dq-LiJ1RXkf3$%&3d+^&>lfwMgV8i+KyDhF*{O@`X6 z>=?ZjSzOx#4*CWaJo6j){YZ*+2tNsjwps^_;C5f20(67k^WK~~Ou zkFDXr;3fL#`eO@zmEI~59F-e@bmc}n77iF#f5^|l)9ogovEz&(ntPXx5Dqodi`i3pdH_dzVQD?W(E6gOD{x~(!@aI3S}qa1=cg2! z)ISlUG%!vtFY3WSH`%ZZ{J)(?vK5T{n0TM479s)sj*fOnX{a%&0pX6U)R^| z1#e*#pm`42R+14NHrsnfI5>DyJNB@*8jadsSpF3_nxL?bq)mlbM`_jwGsu zL&a2KjWa!hb>5Eml<9x(BKa?q&HS;h_M_p<8CKvXta*NaCniDj#^<@-? z;pp)?l^&Whra)&5*0TlJ)|qdHJUpWuAWzLJ^FZMkze#)5v;y^m=hFYpdG%Z75o_zL z)fcjDK}(39%~?);;=gs~Z|5z(@MmYvGoeLlFwWqg@%#%tnAHIhQ~UnbdyQeB9bzM#*WqZr0tX`_Go^(epfSIR}F3^FA!8 zZ?NyqcX?V@DSpS*XlJAMo3wgufC20J7Tk$99*fpv=pTl}kLD%MO(rx?H*vgi=EOJ2 mg^#=bN*`mi&UA~nn60IPY-Fh0{td;}6U!-4OlSps_WuC7n`cu1 diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 57d0feba..85b11e31 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -417,6 +417,8 @@ export class SmsPageComponent implements OnInit { request.IsDeviceNFC = this.isNFCAvailable; + + this.authService.checkSMS(request, () => { }, this.translate.trPK('general', 'ok'), true).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 9c0c8b92..61322cb3 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -28,8 +28,10 @@ export class ConnectorService { public static timeOut = 180 * 1000; // public static host = 'http://mohemm-app-test.srca.org.sa:1010/'; - public static host = 'https://erptstapp.srca.org.sa/' //TEST UAT - // public static host = 'https://masaderapp.srca.org.sa/' //LIVE + // public static host = 'https://erptstapp.srca.org.sa/' //TEST UAT + public static host = 'https://masaderapp.srca.org.sa/' //LIVE + // public static host = 'https://erpuat.sfh.med.sa/'; //UAR SFHP + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 0f02c65a..99caadaf 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -173,6 +173,7 @@ export class HomePage implements OnInit { } ngOnInit() { + console.log('UUID IS: ' + this.device.uuid); let openDigitalIDCard = this.sharedData.getSharedData("loginWithDigitalIDButton", true); let openBusinessCard = this.sharedData.getSharedData("loginWithBusinessIDButton", true); this.direction = TranslatorService.getCurrentLanguageName(); @@ -840,7 +841,7 @@ export class HomePage implements OnInit { let totalTicketsLeft = 0; this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { - if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == " خطة استحقاق الاجازة الاعتيادية") { + if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "رصيد استحقاق الاجازة الاعتيادية") { this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');