From bb50cc60e97adc5dbd08fb19c71a54c86f182004 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Mon, 9 Oct 2023 11:10:07 +0200 Subject: [PATCH] Fix result display --- .../blocks/EdoniqTestBlock.vue | 16 ++++++++-------- .../competenceCertificate.cy.js | 3 +-- env_secrets/local_chrigu.env | Bin 2285 -> 2283 bytes 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue index e993c236..1cb19b05 100644 --- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue +++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue @@ -176,19 +176,19 @@ async function startTest() { $t("assignment.von x Punkten", { x: assignmentCompletion.evaluation_max_points, }) - }}, - {{ + }} + ({{ ( ((assignmentCompletion.evaluation_points ?? 0) / (assignmentCompletion.evaluation_max_points ?? 1)) * 100 ).toFixed(0) - }}%, - - ({{ $t("a.Bestanden") }}) - - - ({{ $t("a.Nicht Bestanden") }}) + }}%) + + {{ $t("a.Nicht Bestanden") }} diff --git a/cypress/e2e/competenceNavi/competenceCertificate.cy.js b/cypress/e2e/competenceNavi/competenceCertificate.cy.js index 9b679590..fa02af85 100644 --- a/cypress/e2e/competenceNavi/competenceCertificate.cy.js +++ b/cypress/e2e/competenceNavi/competenceCertificate.cy.js @@ -99,8 +99,7 @@ describe("competenceCertificate.cy.js", () => { ).click(); cy.get('[data-cy="test-result"]') .should("contain", "19 von 24 Punkten") - .and("contain", "79%") - .and("contain", "Bestanden"); + .and("contain", "79%"); }); it("check with finished failed edoniq test", () => { diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index 322ce59142aae56ea6e12862c58f0ff2acd8e2de..e4b54548e5c117aa6239830be218600cc9435d02 100644 GIT binary patch literal 2283 zcmVx)R@tkisL5y1Qc_vm^1ERI_fKN8l48nbLvW%nh-avC?ZBJkPET!tDKd{u z_iAG!VQH)bht64rp)JxDZB|@)^{Db`94Yn@EdEKH`{qI9#I{ZI-#E`P4c&hoU%d0r zJ{E3_#corHH!V?C!8uz*I_A@VH;6fXSOX6)3>EBV-xuHh9q6%-im%G2Dn^b$=gK_7 z;SR|Rb)>xuXAX!0gD;Yusc$AA%O5@hb#{wDzqh^#S3X*Jmq9D8J&lp7#26ASLZjiIEXuOoqi!>HY;hFiljyO!hE6QF(@71!Mll~K zxf?i}18(C|g$&88tx@Luvur`#a*;IyHUz*)XLCS}oKOw?H}B6*+nMvngk;w8Eha;{ zGIbH}PH}(w!(!B*ru5kH^NlbnY!s!=u9tOET zvT{NsP{Gy`Rgm^f={m=GM=pW0F)d!mk^Nog5)LF;U>La-w;@3$_8p`Q^=o=??T<0l zIxCO)GG4oLn^$z!_U-JnC&WA;d4S`?@K-l_3+%{`>I)e;MB+_t{=|3aU$@LQ zl7dbu22>p^#^RRrm%}4ikKx7FzpIRWym81L8#E!WP+7&YsK@P0&~y6FU`F1Jw^~M@udZZ=5@1i{ou5Y)<-vhZSsN)K7m*gh0PAG?h8jZ>Q)e zbTctIZi;AQi&2rtW+LsWlu=)brve%c9u-Cbs1zA>&4rk-_PvEminf)ZYEUo3DMGn~ z`l>6E#9F&_i)~~gWZlW~FON*7N`;o`WLPO=+YPNWpJwiJb|#xe2We1YJv8(J-_&psu#bi+a6*j z=Uo#x!QEmzlw{M41!58VSTO=HU;+F8A}cj`6W=_(Ua($okhgBC!3gbCYXzcYn1F@R$M-Pm;%LAZQu2$mdSZ zvA#&Ha&7RsTM*=-bT@drg(uO@WDaajd7wmpkP6vblDPc#Q|1wGj`7U3g)QW#$q%YqN)$i-V@8Xd^4ldTNS#h}Ab$ znCZIj-~)Vz%+`?1?I;^~X}lqnnUk*XUlU%p^lzpeR4)Sl3=uD`*t(M`mf*d#OxY^> zSGljJXPO_djMHv?l~Uzdp-ZSemLhA5k{9B741E2~V z?@2IFnR2tC(%pR(uL6kSs>$Gb>_}}YB9`w*Ym?#iMh5ZJg`4|ZDc&~~FT3d^D>MMQCux!b;j{Pm+R?kwP zX)%1Ml5xN?lR+fV?>|(%zliOW4K*NS_bW9I&)BlBbIm%fI4deT6WnvZq!GS8NPG1K zyGgz!l{8O_kCJ;-gkhXUyXxqh28!7f`XLdP%u*o9Kie{E3|kvlXq#a`u4RfM8(5ei zNu!_Gwvnx(NaMHuNZ;_-`@uTY(Hcs@XxH6LV%pJM>2la)%6X!m?j#>7ZSFSEndkYcFSSQbLp#^WEER_7h;BWrpCZGedL1KH4*l+ zume&ncCS$SgFs)T>Fx{6P_r;MV3HL3I}j&>{1;)FIYB=LxhI{h)xe6{snEx5KjMld zSrE>5E3R^Bbrxi;SKa;2pbQ^tfF5N%LDZcbV%d$05(>+fBJ+Qih9A(-u_};yS=oyV zbGcpv1`ztRw`~DktRAtqJU_PpQMqpPgJX&)a+SsK8=NkdX$sUQtw=p5w1?~*3n;LT zWtV6o5O51{u!-UL|M^v(+fd5f2aQ8b&P3eAtxHHL8rgso9+0jfN9sGJ&O1$Xq^Ff$osDNt3MSS zZMo;A+cl<~LN~Z99;T!j6-`(_ja&T2JFY*8{ajNlV;<|LcOCv7A=)sYr~5M{g}Y)& Fo5D#JUt$0N literal 2285 zcmV}u61)UV`S;;lX)FR3Lr!e4bu1HQi=%>ZAS3bcwY!oS9g03fJm|{k1ikEpw)4U?|1o8F`it*VCro`rsoh%P@&=2HmVBjP_Fq6m#BK-g^?ligbnCk0fO`S;kA3i zQP|-hE-VaZp4Esxeomc%xW-NByK@vgK$QaI0F-OxEhCqA3A%pD>^~4f6(^TwCCxw{ zRQLK@aG4tuaoZhRvT=)ZBG~tR%tH&JO^yC$ ztCNFR=DijnI%5KDvb~8lnLThjos;C_XVoSRPhKSVh{d;5n>Ff8R*157YHjO>okY0_ z;!vk9Jt$l8pGDO_ityb+qzKRH;jh7arElJby|eOyOEeKOxR2nV zXyu1&P%_pBwgBqgh5aAI7}J{bht_ke?eX72D|x_^^IGi^+kBSJz(fy%G_1~>x&@8} zOJhYl@(xu}06HU&8uUjxMU8NPDHb{THF$@*cdWQFm%)xie2UDtlZ{c>l`_m9B+G&kXP`n{*yx#2`CVw%}e-V>l&YBi3Fw{-{yQ6Y7%cbbEmiUL*7?#=1t4 zKy!W}YGo4&Vlnq&{S>R?>@Rm{)?O@?0;?< zve%qa9b01ZQ_4J8SJzeWe)u^>w{Wgk+O+%&>Sp59VcAS}(EP1@mEVq~$I*BjV}f-r zypRpC8=+(AhG|3Whkgrm2RArs^Es*g>CPIi(&6B`PiH=9vX*9qH6t8wL!aEx;|OB( zO^usfAd&xhPcx`Wt~@=Tofw9u&u=17lB0H0$iJ`?JP91L^`3m-yp-ox*9OFm#~{<` zFC@EG%zhrU5muJk0IE~7beDek2BGRmNy`|$a}Xg{sC-wtW*pcU92G}Y${<(XADG{< zhrN1@*}*q#Bz$+O5D>&r2g#wUH%6`LS5juwwe&3zr>&j%Yz&(+JXvnsG;6`ar z?0Ah!PHy92J8ig+0#9P;f5d+}l~fucL6&r6}cl9r+y20GH&` zo&3?z#CO|Jw}e`KijS`v>i8mxE|FeeH|kP`zhem}xJAa`>ci`93%@pf54yfwzCv3n z%r>b}{3&e^xUON;CN8Elqy-6H-SpI=o~0xn81GEEm>}G-+1?r$HBp{vJ{M+ z!HlkOQ&+J-@~0W`b0l_<`4TNP6y%3cQKh^I@ct&8K7>!xU^1;w0JzKD(5jDZ{WJA4 z&Cgq+aF;Ab{5GEHaHJ4Ke}M8=-#IgOdPh zb2=?RPidZDYz3Lk+NCWmk5m5~S3o==VqQo_TbJi^$&QTXTM$Mao|hq`S{d1fpkliE z>{_cnKYmDti9aRT1uY_Hdfe6MN6{%I^WpTRF>;3u$=QlAo`6&|%rP(?%3!j1LUKE6 z*tQcOF$`D@*J>4AUA)(`e{ZN=jp=e-JYJuyu&kyWIivLC4cZ{SEBn%qlI65nB93T8 z5rQ=*{mvk)Gn3KqSKWXK$6|di`FjgJeuE-)aVI5K+{J(KDe&J7*WyAV^ z5xiLnJN>2}pqPaRUx8lOQCqb&Xb$bYXO>nit< z9s2WxvIIm}w~3sq)>uADBY@BUYLU)0iXFDgi!J^ckfo@L1|KUfIGq{z@gdk|3327t znk?seKOq~Hq~QgLB7S<6hw3l$%p>J5At_9_ocCr}y>v?%-`>sEEDABl6lS<;{)>HP zy^hiiR9v^Y1y;utx+6yyxqysZNA(+C$`q)2olip^5*HWIdPTyf?J~l1_I_R9t5E(> zp)u~pRC?As8abA`d~@Z3Q<%4R*BpX|!VSH&;n7%wGTmh%9rjS;Eej?q9|N&