diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index bdb865d..cd026c1 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -35,14 +35,14 @@ fText(int(timer/30), 900, 1100, 50, "red"); } if(scene == ROUND_RESULT){ - fText(CheckPeople(0, round) +"人", 275, 425, 50, "black"); - fText(CHOICE_NUMBER-question[round].answer[A] + "Pt", 400, 500, 50, "black"); - fText(CheckPeople(1, round)+"人", 725, 425, 50, "black"); - fText(CHOICE_NUMBER-question[round].answer[B] + "Pt", 850, 500, 50, "black"); - fText(CheckPeople(2, round)+"人", 275, 725, 50, "black"); - fText(CHOICE_NUMBER-question[round].answer[C] + "Pt", 400, 800, 50, "black"); - fText(CheckPeople(3, round)+"人", 725, 725, 50, "black"); - fText(CHOICE_NUMBER-question[round].answer[A] + "Pt", 850, 800, 50, "black"); + fText(CheckPeople(A, round) +"人", 275, 425, 50, "black"); + fText(CHOICE_NUMBER-checkOrder(A, round) + "Pt", 400, 500, 50, "black"); + fText(CheckPeople(B, round)+"人", 725, 425, 50, "black"); + fText(CHOICE_NUMBER-checkOrder(B, round) + "Pt", 850, 500, 50, "black"); + fText(CheckPeople(C, round)+"人", 275, 725, 50, "black"); + fText(CHOICE_NUMBER-checkOrder(C, round) + "Pt", 400, 800, 50, "black"); + fText(CheckPeople(D, round)+"人", 725, 725, 50, "black"); + fText(CHOICE_NUMBER-checkOrder(D, round) + "Pt", 850, 800, 50, "black"); } if(scene == WAIT_SCENE){ setAlp(50); @@ -171,4 +171,13 @@ } else { return 0; } -} \ No newline at end of file +} + +function checkOrder(choice, show_round){ + for(var i = 0; i < CHOICE_NUMBER; i ++){ + if(choice == question[show_round].answer[i]){ + return i; + } + } + return E; +}