Subversion Repositories wimsdev

Rev

Rev 5889 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5889 Rev 5923
Line 128... Line 128...
128 
 
 128 
 
129 
AAA=!nospace $AAA
 129 
AAA=!nospace $AAA
130 
# pfff
 130 
# pfff
131 
!for p=1 to 3
 131 
!for p=1 to 3
132 
    AAA=!replace internal ,, by , in $AAA
 132 
    AAA=!replace internal ,, by , in $AAA
133 
!next p
133 
!next p
134 
c1=!char 1 of $AAA
 134 
c1=!char 1 of $AAA
135 
c2=!char -1 of $AAA
 135 
c2=!char -1 of $AAA
136 
!if $c1=,
 136 
!if $c1=,
137 
    AAA=!char 2 to -1 of $AAA
 137 
    AAA=!char 2 to -1 of $AAA
138 
!endif
 138 
!endif
Line 244... Line 244...
244 
		    	!exit
 244 
		    	!exit
245 
		    !endif
 245 
		    !endif
246 
		!next p
 246 
		!next p
247 
	    !endif
 247 
	    !endif
248 
	!next s
 248 
	!next s
249 
    !endif
 249 
    !endif
250 
!endif
 250 
!endif
251 
 
 251 
 
252 
:READY1
 252 
:READY1
253 
 
 253 
 
254 
!for p in +,-,*,^,/,|
 254 
!for p in +,-,*,^,/,|
Line 357... Line 357...
357 
!else
 357 
!else
358 
    !if $arglist != $empty
 358 
    !if $arglist != $empty
359 
	maxscore=$[$P1*$maxscore]
 359 
	maxscore=$[$P1*$maxscore]
360 
	testvar= <b>&nbsp;$arglist =...&nbsp;</b>
 360 
	testvar= <b>&nbsp;$arglist =...&nbsp;</b>
361 
	errortext=!record 53 of $remarkdir/commonremarks.$taal
 361 
	errortext=!record 53 of $remarkdir/commonremarks.$taal
362 
	goback=1
 362 
	goback=1
363 
	!exit
 363 
	!exit
364 
    !endif
 364 
    !endif
365 
!endif
365 
!endif
366 
 
 366 
 
367 
AAA=!nospace $AAA
 367 
AAA=!nospace $AAA
Line 563... Line 563...
563 
G1=$empty
 563 
G1=$empty
564 
G2=$empty
 564 
G2=$empty
565 
A0=$empty
 565 
A0=$empty
566 
A1=$empty
 566 
A1=$empty
567 
A2=$empty
 567 
A2=$empty
568 
 
 568 
A3=$empty
569 
!for p=1 to $tg
 569 
!for p=1 to $tg
570 
    g=!item $p of $GGG
 570 
    g=!item $p of $GGG
571 
    ar1=!item $p of $afr1
 571 
    ar1=!item $p of $afr1
572 
    ar2=!item $p of $afr2
 572 
    ar2=!item $p of $afr2
573 
    g1=$[(round($ar1*($g)))/$ar1]
 573 
    g1=$[(round($ar1*($g)))/$ar1]
Line 589... Line 589...
589 
    a1=$[(round($ar1*($a)))/$ar1]
 589 
    a1=$[(round($ar1*($a)))/$ar1]
590 
    a2=$[(round($ar2*($a)))/$ar1]
 590 
    a2=$[(round($ar2*($a)))/$ar1]
591 
    A0=!append item $a to $A0
 591 
    A0=!append item $a to $A0
592 
    A1=!append item $a1 to $A1
 592 
    A1=!append item $a1 to $A1
593 
    A2=!append item $a2 to $A2
 593 
    A2=!append item $a2 to $A2
- 
 
 594 
    # 5/11/2012
- 
 
 595 
    # we maken een lijst om -0,0,sqrt(0),-sqrt(0) als antwoorden af te vangen
- 
 
 596 
    A3=!append item $[1*($a)] to $A3
594 
!next p
 597 
!next p
595 
 
 598 
 
596 
!if NaN isin $A0,$A1,$A2
 599 
!if NaN isin $A0,$A1,$A2
597 
    maxscore=$[$P3*$maxscore]
 600 
    maxscore=$[$P3*$maxscore]
598 
    goback=1
 601 
    goback=1
Line 637... Line 640...
637 
!else
 640 
!else
638 
    # one inputfield/question but multiple answers possible in textarea
 641 
    # one inputfield/question but multiple answers possible in textarea
639 
    # sequence in reply does not matter
642 
    # sequence in reply does not matter
640 
    # x=10 and x=100 == x=100 and x=10
643 
    # x=10 and x=100 == x=100 and x=10
641 
    # so check for doublures
 644 
    # so check for doublures
- 
 
 645 
    # A3 5/11/2012
- 
 
 646 
    check_uniq=!listuniq $A3
642 
    check_uniq=!listuniq $A0
 647 
    #check_uniq=!listuniq $A0
643 
    tchk=!itemcnt $check_uniq
 648 
    tchk=!itemcnt $check_uniq
644 
    !if $ta>$tchk
 649 
    !if $ta>$tchk
645 
	testvar=$[$ta - $tchk]
 650 
	testvar=$[$ta - $tchk]
646 
        ex=!record 51 of $remarkdir/commonremarks.$taal
 651 
        ex=!record 51 of $remarkdir/commonremarks.$taal
647 
	extra=!append line <br />$ex to $extra
 652 
	extra=!append line <br />$ex to $extra
Line 682... Line 687...
682 
tot1=!exec pari $parivraag1
 687 
tot1=!exec pari $parivraag1
683 
tot2=!exec pari $parivraag2
 688 
tot2=!exec pari $parivraag2
684 
tot0=!lines2items $tot0
 689 
tot0=!lines2items $tot0
685 
tot1=!lines2items $tot1
 690 
tot1=!lines2items $tot1
686 
tot2=!lines2items $tot2
 691 
tot2=!lines2items $tot2
- 
 
 692 
 
687 
!if $wims_exec_error != $empty
 693 
!if $wims_exec_error != $empty
688 
    maxscore=$[$P4*$maxscore]
 694 
    maxscore=$[$P4*$maxscore]
689 
    goback=1
 695 
    goback=1
690 
    errortext=!record 26 of $remarkdir/commonremarks.$taal
 696 
    errortext=!record 26 of $remarkdir/commonremarks.$taal
691 
 !exit
 697 
 !exit
692 
!endif
 698 
!endif
693 
 
 699 
 
694 
 
 700 
 
695 
!if $use_arg=1
 701 
!if $use_arg=1
696 
    arg=&nbsp;<em>$arglist</em>&nbsp;=&nbsp;
 702 
    arg=&nbsp;<em>$arglist</em>&nbsp;=&nbsp;
697 
!else
 703 
!else
698 
    arg=$empty
 704 
    arg=$empty
699 
!endif
 705 
!endif
Line 740... Line 746...
740 
	        !increase score2
 746 
	        !increase score2
741 
	    !else
 747 
	    !else
742 
		k=#ff0000
 748 
		k=#ff0000
743 
	    !endif
 749 
	    !endif
744 
	!endif
 750 
	!endif
745 
    !endif
751 
    !endif
746 
    !increase i
 752 
    !increase i
747 
    !if $ta>1
 753 
    !if $ta>1
748 
	rep=!append line <li><span style="color:$k">$arg<b>$a</b></span></li> to $rep
 754 
	rep=!append line <li><span style="color:$k">$arg<b>$a</b></span></li> to $rep
749 
    !else
 755 
    !else
750 
	rep=<span style="color:$k">$arg<b>$a</b></span>
 756 
	rep=<span style="color:$k">$arg<b>$a</b></span>