Changeset 6494 for trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_assmntUnitMlqXhtmlTransf/xhtmlContent.xsl.xsl

Timestamp:

09/08/06 20:11:07 (6 years ago)

Author:

sys

Message:

displayResult Mlq

File:

• trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_assmntUnitMlqXhtmlTransf/xhtmlContent.xsl.xsl (modified) (3 diffs)

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_assmntUnitMlqXhtmlTransf/xhtmlContent.xsl.xsl

@@ -122 +122 @@
                         for(var j=0, vLenJ=vGroup.length; j < vLenJ; j++) {
                                 var vItems = scDragMgr.getLabels(vGroup[j]);
-                                for(var k=0, vLenK = vItems.length; k < vLenK; k++) {
+                                var vLenK = vItems.length;
+                                <!-- si zone de drop vide, on incrémente pour laisser une place
+-->                             if(vLenK == 0) vOffset++;
+                                else for(var k=0; k &lt; vLenK; k++) {
                                         vItems[k].rG = i;
                                         vItems[k].rO = vOffset++;
@@ -343 +346 @@
 -->
         this.refreshResult = function(pDisplay){
-                if(pDisplay) this._ResultDisplay = pDisplay;
-                if(this._resultDisplay == "none") for(var i=this.fLabels.length -1; i &gt;=0; i--) this.fLabels[i].className="";
+                if(pDisplay) this.fResultDisplay = pDisplay;
+                if(this.fResultDisplay == "none") for(var i=this.fLabels.length -1; i &gt;=0; i--) this.fLabels[i].className="";
                 else for(var i=this.fLabels.length -1; i &gt;=0; i--) {
                         var vLabel = this.fLabels[i];
                         <xsl0:choose>
                                 <xsl0:when test="$vInteraction='orderLabels'">
-                        vLabel.className = (vLabel.sO == vLabel.rO ) ? "<xsl0:value-of select="si(sm:resultDisplaying/@classIfRight, sm:resultDisplaying/@classIfRight, 'assmntResult_Right')"/>" : "<xsl0:value-of select="si(sm:resultDisplaying/@classIfWrong, sm:resultDisplaying/@classIfWrong, 'assmntResult_Wrong')"/>";
+                        vLabel.className = (vLabel.sO == vLabel.rO &amp;&amp; vLabel.sG == vLabel.rG) ? "<xsl0:value-of select="si(sm:resultDisplaying/@classIfRight, sm:resultDisplaying/@classIfRight, 'assmntResult_Right')"/>" : "<xsl0:value-of select="si(sm:resultDisplaying/@classIfWrong, sm:resultDisplaying/@classIfWrong, 'assmntResult_Wrong')"/>";
                                 </xsl0:when>
                                 <xsl0:when test="$vInteraction='associateLabels'">
-                        vLabel.className = (this.fGroupsC[vLabel.rG].isRight) ? "<xsl0:value-of select="si(sm:resultDisplaying/@classIfRight, sm:resultDisplaying/@classIfRight, 'assmntResult_Right')"/>" : "<xsl0:value-of select="si(sm:resultDisplaying/@classIfWrong, sm:resultDisplaying/@classIfWrong, 'assmntResult_Wrong')"/>";
+                        vLabel.className = (this.fGroupsC[vLabel.sG].isRight<xsl0:if test="sm:scoreComputing/sm:orderingScoring/@algorithm"> &amp;&amp; vLabel.sO == vLabel.rO</xsl0:if>) ? "<xsl0:value-of select="si(sm:resultDisplaying/@classIfRight, sm:resultDisplaying/@classIfRight, 'assmntResult_Right')"/>" : "<xsl0:value-of select="si(sm:resultDisplaying/@classIfWrong, sm:resultDisplaying/@classIfWrong, 'assmntResult_Wrong')"/>";
                                 </xsl0:when>
                                 <xsl0:when test="$vInteraction='matchTarget'">
@@ -372 +375 @@
                 this.synch();
 <!-- Affectation du mode pour l'affichage du résultat
- -->    this._ResultDisplay = "<xsl0:value-of select="si(sm:initBody/sm:resultDisplay/@mode, sm:initBody/sm:resultDisplay/@mode, 'none')"/>";
+ -->    this.fResultDisplay = "<xsl0:value-of select="si(sm:initBody/sm:resultDisplay/@mode, sm:initBody/sm:resultDisplay/@mode, 'none')"/>";
 <!-- Load des scores -->
                 <xsl0:if test="count(sm:loadData/sm:scoreSessionKey/*) &gt; 0">var vLoadScoreSession = <xsl0:apply-templates select="sm:loadData/sm:scoreSessionKey/*" mode="session"/>;