MAJ V4.3.2 (ajoute la méthode saut multiple. traduction du node

placement avant. Ajoute dans le calcul du hash des méthodes.)
This commit is contained in:
pablo rodriguez 2022-12-10 20:23:53 +01:00
parent cfa05a55f0
commit 4514f70d80
46 changed files with 307 additions and 26 deletions

View File

@ -12,6 +12,6 @@
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

Binary file not shown.

3
bin/.gitignore vendored
View File

@ -1,3 +0,0 @@
/fenetres/
/list/
/evaluer/

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

BIN
icons/sautmultiple.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

197
icons/sautmultiple.svg Normal file
View File

@ -0,0 +1,197 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="24"
height="24"
viewBox="0 0 24 24"
sodipodi:docname="sautmultiple.svg"
inkscape:export-filename="sautmultiple.png"
inkscape:export-xdpi="180"
inkscape:export-ydpi="180"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs6">
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter2109"
x="-0.032804601"
y="-0.023672309"
width="1.0656092"
height="1.0473446">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.20178938"
id="feGaussianBlur2111" />
</filter>
</defs>
<sodipodi:namedview
id="namedview4"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
showguides="false"
inkscape:guide-bbox="true"
inkscape:snap-global="true"
inkscape:zoom="23.098822"
inkscape:cx="4.9136705"
inkscape:cy="12.554753"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g5436"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
position="3.2214765,22.260403"
orientation="0,-1"
id="guide856"
inkscape:locked="false" />
<sodipodi:guide
position="1.9006711,20.456376"
orientation="1,0"
id="guide858"
inkscape:locked="false" />
<sodipodi:guide
position="22.195973,20.456376"
orientation="1,0"
id="guide860"
inkscape:locked="false" />
<sodipodi:guide
position="1.9006711,20.456376"
orientation="0,-1"
id="guide862"
inkscape:locked="false" />
<sodipodi:guide
position="22.195973,3.3181208"
orientation="0,-1"
id="guide1026"
inkscape:locked="false" />
<sodipodi:guide
position="22.195973,1.8684564"
orientation="0,-1"
id="guide1028"
inkscape:locked="false" />
<sodipodi:guide
position="1.9006711,4.5422819"
orientation="0,-1"
id="guide1030"
inkscape:locked="false" />
<sodipodi:guide
position="5.7342282,9.1167785"
orientation="0,-1"
id="guide1032"
inkscape:locked="false" />
<sodipodi:guide
position="5.7342282,9.1167785"
orientation="1,0"
id="guide1034"
inkscape:locked="false" />
<sodipodi:guide
position="17.84698,9.1167785"
orientation="1,0"
id="guide1036"
inkscape:locked="false" />
<sodipodi:guide
position="7.8281879,7.9892617"
orientation="0,-1"
id="guide1038"
inkscape:locked="false" />
<sodipodi:guide
position="8.1237963,13.205882"
orientation="1,0"
id="guide1040"
inkscape:locked="false" />
<sodipodi:guide
position="11.01745,7.9892617"
orientation="1,0"
id="guide1042"
inkscape:locked="false" />
<sodipodi:guide
position="4.7355705,11.146309"
orientation="1,0"
id="guide1044"
inkscape:locked="false" />
<sodipodi:guide
position="4.7355705,11.146309"
orientation="0,-1"
id="guide1046"
inkscape:locked="false" />
<sodipodi:guide
position="18.910067,11.146309"
orientation="1,0"
id="guide1048"
inkscape:locked="false" />
<sodipodi:guide
position="4.7355705,19.683221"
orientation="0,-1"
id="guide1050"
inkscape:locked="false" />
<sodipodi:guide
position="20.585235,1.868456"
orientation="1,0"
id="guide1247"
inkscape:locked="false" />
</sodipodi:namedview>
<g
inkscape:groupmode="layer"
inkscape:label="Image"
id="g8">
<g
id="g5436">
<g
id="g2196"
transform="matrix(0.61306522,0,0,0.61671817,2.4098375,-0.47735411)"
style="stroke-width:1.62631">
<path
id="path2017"
style="opacity:0.628821;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;filter:url(#filter2109);stop-color:#000000"
d="m 16.944674,1.2555804 c -0.466376,0 -0.841796,0.37542 -0.841796,0.8417969 V 13.806362 H 9.8587373 L 12.057956,11.60519 c 0.329778,-0.329778 0.329778,-0.861628 0,-1.191406 L 11.544284,9.9020646 c -0.164889,-0.164889 -0.378561,-0.248047 -0.59375,-0.248047 -0.215189,0 -0.430814,0.08316 -0.595703,0.248047 L 5.6810029,14.575893 5.1673311,15.089565 c -0.3297785,0.329778 -0.3297784,0.859675 0,1.189453 l 0.5136718,0.513672 4.6738281,4.673828 c 0.329778,0.329778 0.859675,0.329778 1.189453,0 l 0.513672,-0.513672 c 0.329778,-0.329778 0.329778,-0.859675 0,-1.189453 l -2.3749999,-2.375 h 7.2617179 1.896485 c 0.0583,0 0.115022,-0.0064 0.169922,-0.01758 0.0549,-0.01118 0.107811,-0.02758 0.158203,-0.04883 0.04958,-0.0209 0.09843,-0.04659 0.142578,-0.07617 7.59e-4,-5.12e-4 0.0012,-0.0014 0.002,-0.002 0.04477,-0.0302 0.08501,-0.06352 0.123047,-0.101563 0.03804,-0.03804 0.07332,-0.08023 0.103516,-0.125 0.09059,-0.134315 0.142578,-0.295812 0.142578,-0.470703 V 14.648159 2.0973773 c 0,-0.4663769 -0.37542,-0.8417969 -0.841797,-0.8417969 z" />
<path
id="rect1094"
style="opacity:1;fill:#000080;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
d="m 16.332429,1.8066008 c -0.466376,0 -0.841796,0.37542 -0.841796,0.8417969 V 14.357382 H 9.2464924 L 11.445711,12.15621 c 0.329778,-0.329778 0.329778,-0.861628 0,-1.191406 l -0.513672,-0.511719 c -0.164889,-0.164889 -0.378561,-0.248047 -0.59375,-0.248047 -0.215189,0 -0.4308136,0.08316 -0.5957026,0.248047 L 5.068758,15.126913 4.5550862,15.640585 c -0.3297785,0.329778 -0.3297784,0.859675 0,1.189453 l 0.5136718,0.513672 4.6738284,4.673828 c 0.3297776,0.329778 0.8596746,0.329778 1.1894526,0 l 0.513672,-0.513672 c 0.329778,-0.329778 0.329778,-0.859675 0,-1.189453 l -2.3749998,-2.375 h 7.2617178 1.896485 c 0.0583,0 0.115022,-0.0064 0.169922,-0.01758 0.0549,-0.01118 0.107811,-0.02758 0.158203,-0.04883 0.04958,-0.0209 0.09843,-0.04659 0.142578,-0.07617 7.59e-4,-5.12e-4 0.0012,-0.0014 0.002,-0.002 0.04477,-0.0302 0.08501,-0.06352 0.123047,-0.101563 0.03804,-0.03804 0.07332,-0.08023 0.103516,-0.125 0.09059,-0.134315 0.142578,-0.295812 0.142578,-0.470703 V 15.199179 2.6483977 c 0,-0.4663769 -0.37542,-0.8417969 -0.841797,-0.8417969 z" />
<path
id="path1582"
style="opacity:1;fill:#00c8c8;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
sodipodi:type="inkscape:offset"
inkscape:radius="-0.64285713"
inkscape:original="M 16.332031 1.8066406 C 15.865655 1.8066406 15.490234 2.1820606 15.490234 2.6484375 L 15.490234 14.357422 L 9.2460938 14.357422 L 11.445312 12.15625 C 11.77509 11.826472 11.775091 11.294622 11.445312 10.964844 L 10.931641 10.453125 C 10.766752 10.288236 10.55308 10.205078 10.337891 10.205078 C 10.122702 10.205078 9.9070765 10.288238 9.7421875 10.453125 L 5.0683594 15.126953 L 4.5546875 15.640625 C 4.224909 15.970403 4.2249091 16.5003 4.5546875 16.830078 L 5.0683594 17.34375 L 9.7421875 22.017578 C 10.071965 22.347356 10.601863 22.347356 10.931641 22.017578 L 11.445312 21.503906 C 11.77509 21.174128 11.775091 20.644231 11.445312 20.314453 L 9.0703125 17.939453 L 16.332031 17.939453 L 18.228516 17.939453 C 18.286816 17.939453 18.343538 17.933055 18.398438 17.921875 C 18.453337 17.910695 18.506249 17.894297 18.556641 17.873047 C 18.606221 17.852147 18.655071 17.826455 18.699219 17.796875 C 18.699219 17.796875 18.701172 17.794922 18.701172 17.794922 C 18.745942 17.764722 18.786182 17.731402 18.824219 17.693359 C 18.862259 17.655319 18.897538 17.613129 18.927734 17.568359 C 19.018324 17.434044 19.070312 17.272547 19.070312 17.097656 L 19.070312 15.199219 L 19.070312 2.6484375 C 19.070312 2.1820606 18.694893 1.8066406 18.228516 1.8066406 L 16.332031 1.8066406 z "
d="m 16.332031,2.4492188 c -0.121387,0 -0.199219,0.07783 -0.199219,0.1992187 V 14.357422 A 0.64292142,0.64292142 0 0 1 15.490234,15 H 9.2460938 A 0.64292142,0.64292142 0 0 1 8.7910156,13.902344 l 2.1992184,-2.201172 c 0.08541,-0.08541 0.08541,-0.195841 0,-0.28125 l -0.511718,-0.511719 a 0.64292142,0.64292142 0 0 1 -0.002,0 c -0.04495,-0.04495 -0.0891,-0.06055 -0.138671,-0.06055 -0.04957,0 -0.09746,0.01739 -0.140625,0.06055 l -4.6738285,4.673828 -0.5136719,0.513672 c -0.086307,0.08631 -0.086307,0.19299 0,0.279297 l 0.5136719,0.513672 4.6738285,4.673828 c 0.0863,0.08631 0.19299,0.08631 0.279296,0 l 0.513672,-0.513672 c 0.08631,-0.08631 0.08631,-0.19299 0,-0.279297 l -2.3749996,-2.375 a 0.64292142,0.64292142 0 0 1 0.4550781,-1.097656 h 7.2617185 1.896485 c 0.01127,0 0.02396,-0.0024 0.04102,-0.0059 0.0136,-0.0028 0.02607,-0.0051 0.03711,-0.0098 0.01241,-0.0052 0.02268,-0.0097 0.0293,-0.01367 a 0.64292142,0.64292142 0 0 1 0.0059,-0.0059 c 0.01109,-0.0075 0.01689,-0.01298 0.02734,-0.02344 0.01051,-0.01051 0.0203,-0.02175 0.02539,-0.0293 0.02077,-0.03079 0.0332,-0.06383 0.0332,-0.111328 V 15.199219 2.6484375 c 0,-0.1213901 -0.07783,-0.1992187 -0.199218,-0.1992187 z" />
</g>
<g
id="g472"
transform="matrix(0.61306522,0,0,0.61671817,2.4098375,9.9993706)"
style="stroke-width:1.62631">
<path
id="path466"
style="opacity:0.628821;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;filter:url(#filter2109);stop-color:#000000"
d="m 16.944674,1.2555804 c -0.466376,0 -0.841796,0.37542 -0.841796,0.8417969 V 13.806362 H 9.8587373 L 12.057956,11.60519 c 0.329778,-0.329778 0.329778,-0.861628 0,-1.191406 L 11.544284,9.9020646 c -0.164889,-0.164889 -0.378561,-0.248047 -0.59375,-0.248047 -0.215189,0 -0.430814,0.08316 -0.595703,0.248047 L 5.6810029,14.575893 5.1673311,15.089565 c -0.3297785,0.329778 -0.3297784,0.859675 0,1.189453 l 0.5136718,0.513672 4.6738281,4.673828 c 0.329778,0.329778 0.859675,0.329778 1.189453,0 l 0.513672,-0.513672 c 0.329778,-0.329778 0.329778,-0.859675 0,-1.189453 l -2.3749999,-2.375 h 7.2617179 1.896485 c 0.0583,0 0.115022,-0.0064 0.169922,-0.01758 0.0549,-0.01118 0.107811,-0.02758 0.158203,-0.04883 0.04958,-0.0209 0.09843,-0.04659 0.142578,-0.07617 7.59e-4,-5.12e-4 0.0012,-0.0014 0.002,-0.002 0.04477,-0.0302 0.08501,-0.06352 0.123047,-0.101563 0.03804,-0.03804 0.07332,-0.08023 0.103516,-0.125 0.09059,-0.134315 0.142578,-0.295812 0.142578,-0.470703 V 14.648159 2.0973773 c 0,-0.4663769 -0.37542,-0.8417969 -0.841797,-0.8417969 z" />
<path
id="path468"
style="opacity:1;fill:#000080;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
d="m 16.332429,1.8066008 c -0.466376,0 -0.841796,0.37542 -0.841796,0.8417969 V 14.357382 H 9.2464924 L 11.445711,12.15621 c 0.329778,-0.329778 0.329778,-0.861628 0,-1.191406 l -0.513672,-0.511719 c -0.164889,-0.164889 -0.378561,-0.248047 -0.59375,-0.248047 -0.215189,0 -0.4308136,0.08316 -0.5957026,0.248047 L 5.068758,15.126913 4.5550862,15.640585 c -0.3297785,0.329778 -0.3297784,0.859675 0,1.189453 l 0.5136718,0.513672 4.6738284,4.673828 c 0.3297776,0.329778 0.8596746,0.329778 1.1894526,0 l 0.513672,-0.513672 c 0.329778,-0.329778 0.329778,-0.859675 0,-1.189453 l -2.3749998,-2.375 h 7.2617178 1.896485 c 0.0583,0 0.115022,-0.0064 0.169922,-0.01758 0.0549,-0.01118 0.107811,-0.02758 0.158203,-0.04883 0.04958,-0.0209 0.09843,-0.04659 0.142578,-0.07617 7.59e-4,-5.12e-4 0.0012,-0.0014 0.002,-0.002 0.04477,-0.0302 0.08501,-0.06352 0.123047,-0.101563 0.03804,-0.03804 0.07332,-0.08023 0.103516,-0.125 0.09059,-0.134315 0.142578,-0.295812 0.142578,-0.470703 V 15.199179 2.6483977 c 0,-0.4663769 -0.37542,-0.8417969 -0.841797,-0.8417969 z" />
<path
id="path470"
style="opacity:1;fill:#00c8c8;fill-opacity:1;stroke-width:325.262;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
sodipodi:type="inkscape:offset"
inkscape:radius="-0.64285713"
inkscape:original="M 16.332031 1.8066406 C 15.865655 1.8066406 15.490234 2.1820606 15.490234 2.6484375 L 15.490234 14.357422 L 9.2460938 14.357422 L 11.445312 12.15625 C 11.77509 11.826472 11.775091 11.294622 11.445312 10.964844 L 10.931641 10.453125 C 10.766752 10.288236 10.55308 10.205078 10.337891 10.205078 C 10.122702 10.205078 9.9070765 10.288238 9.7421875 10.453125 L 5.0683594 15.126953 L 4.5546875 15.640625 C 4.224909 15.970403 4.2249091 16.5003 4.5546875 16.830078 L 5.0683594 17.34375 L 9.7421875 22.017578 C 10.071965 22.347356 10.601863 22.347356 10.931641 22.017578 L 11.445312 21.503906 C 11.77509 21.174128 11.775091 20.644231 11.445312 20.314453 L 9.0703125 17.939453 L 16.332031 17.939453 L 18.228516 17.939453 C 18.286816 17.939453 18.343538 17.933055 18.398438 17.921875 C 18.453337 17.910695 18.506249 17.894297 18.556641 17.873047 C 18.606221 17.852147 18.655071 17.826455 18.699219 17.796875 C 18.699219 17.796875 18.701172 17.794922 18.701172 17.794922 C 18.745942 17.764722 18.786182 17.731402 18.824219 17.693359 C 18.862259 17.655319 18.897538 17.613129 18.927734 17.568359 C 19.018324 17.434044 19.070312 17.272547 19.070312 17.097656 L 19.070312 15.199219 L 19.070312 2.6484375 C 19.070312 2.1820606 18.694893 1.8066406 18.228516 1.8066406 L 16.332031 1.8066406 z "
d="m 16.332031,2.4492188 c -0.121387,0 -0.199219,0.07783 -0.199219,0.1992187 V 14.357422 A 0.64292142,0.64292142 0 0 1 15.490234,15 H 9.2460938 A 0.64292142,0.64292142 0 0 1 8.7910156,13.902344 l 2.1992184,-2.201172 c 0.08541,-0.08541 0.08541,-0.195841 0,-0.28125 l -0.511718,-0.511719 a 0.64292142,0.64292142 0 0 1 -0.002,0 c -0.04495,-0.04495 -0.0891,-0.06055 -0.138671,-0.06055 -0.04957,0 -0.09746,0.01739 -0.140625,0.06055 l -4.6738285,4.673828 -0.5136719,0.513672 c -0.086307,0.08631 -0.086307,0.19299 0,0.279297 l 0.5136719,0.513672 4.6738285,4.673828 c 0.0863,0.08631 0.19299,0.08631 0.279296,0 l 0.513672,-0.513672 c 0.08631,-0.08631 0.08631,-0.19299 0,-0.279297 l -2.3749996,-2.375 a 0.64292142,0.64292142 0 0 1 0.4550781,-1.097656 h 7.2617185 1.896485 c 0.01127,0 0.02396,-0.0024 0.04102,-0.0059 0.0136,-0.0028 0.02607,-0.0051 0.03711,-0.0098 0.01241,-0.0052 0.02268,-0.0097 0.0293,-0.01367 a 0.64292142,0.64292142 0 0 1 0.0059,-0.0059 c 0.01109,-0.0075 0.01689,-0.01298 0.02734,-0.02344 0.01051,-0.01051 0.0203,-0.02175 0.02539,-0.0293 0.02077,-0.03079 0.0332,-0.06383 0.0332,-0.111328 V 15.199219 2.6484375 c 0,-0.1213901 -0.07783,-0.1992187 -0.199218,-0.1992187 z" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/sautmultiplemini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

View File

@ -330,10 +330,15 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String
String Tst = nod.getNodes().get(k).getAttributs().get("resultat");
String Key = evaluation.traduction.get(nod.getNodes().get(k).getAttributs().get("elt") + " " + evaluation.withoutCodeAndPoint(nod.getNodes().get(k).getAttributs().get("attribut")));
if(Key==null) Key = nod.getNodes().get(k).getAttributs().get("elt") + " " + evaluation.withoutCodeAndPoint(nod.getNodes().get(k).getAttributs().get("attribut"));
String Key = null;
if(nod.getNodes().get(k).getAttributs().get("attribut")!=null) {
Key = evaluation.traduction.get(nod.getNodes().get(k).getAttributs().get("elt") + " " + evaluation.withoutCodeAndPoint(nod.getNodes().get(k).getAttributs().get("attribut")));
if(Key==null) Key = nod.getNodes().get(k).getAttributs().get("elt") + " " + evaluation.withoutCodeAndPoint(nod.getNodes().get(k).getAttributs().get("attribut"));
}else {
Key = evaluation.traduction.get(nod.getNodes().get(k).getAttributs().get("elt"));
}
String valueStudent = nod.getNodes().get(k).getAttributs().get("valueStudent");
String valueSujet = evaluation.withoutCodeAndPoint(nod.getNodes().get(k).getAttributs().get("valueSujet"));
int niveau = Integer.valueOf(nod.getNodes().get(k).getAttributs().get("niveau"));

View File

@ -110,6 +110,14 @@ public class calculNombrePointEvaluation {
}
}
if(nod.getAttributs().get("evalPlacement")!=null) {
try {
point = point + Integer.valueOf(nod.getAttributs().get("evalPlacement"));
} catch (Exception e) {
JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut evalPlacement");
}
}
//***********************************************
//** Les points par la méthode analyseStyle *****
//***********************************************

View File

@ -26,8 +26,8 @@ public class evaluation {
/**
* Chargement des traductions des éléments de l'exercice an utilsant le node "<b>translation</b>" du fichier d'analyse.<br>
* Les noms des éléments sont placés dans un dictionnaire la key et la valeur est le code HTML.
* Chargement des traductions des éléments de l'exercice en utilsant le node "<b>translation</b>" du fichier d'analyse.<br>
* Les noms des éléments sont placés dans un dictionnaire la key et la valeur est le code HTML.</br>
*
* @param translation Le node "<b>translation</b>" qui se trouve dans le node "<b>setting</b>" du fichier d'analyse.
*/

View File

@ -347,13 +347,10 @@ public class evaluationAttribut {
if(k.equals("evalPlacement") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
if(nodeStudent!=null) {
int calcul = 0;
node nodeSujetfrereAvant = sujet.retourneLeNodeFrereAvant();
node nodeStudentfereAvant = nodeStudent.retourneLeNodeFrereAvant();
if(nodeSujetfrereAvant==null) nodeSujetfrereAvant = new node();
if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node();
String A = nodeSujetfrereAvant.retourneLesContenusEnfants("");
String B = nodeStudentfereAvant.retourneLesContenusEnfants("");
if(A.isEmpty() && B.isEmpty()) calcul++;
@ -682,10 +679,10 @@ public class evaluationAttribut {
node item = null;
if(nodStudent!=null) {
//compare la même valeur "contenuParagraph" pour obtenir les points mais si un vosinage du contenu.
item = retourneNoteAvecResultatsAnalyse("Placement","", contenuParagraph,contenuParagraph + "" +point, nameElt );
item = retourneNoteAvecResultatsAnalyse("Placement","avant", contenuParagraph,contenuParagraph + "" +point, nameElt );
}else {
evaluation.IncrementPointTotal(Integer.valueOf(point));
item = new node("Placement", "Erreur : -"+ point, "" , "null", contenuParagraph, 2, evaluation.getPointEnJeu(),nameElt);
item = new node("Placement", "Erreur : -"+ point, "avant" , "null", contenuParagraph, 2, evaluation.getPointEnJeu(),nameElt);
}
retour.getNodes().add(item);
return retour;
@ -694,11 +691,11 @@ public class evaluationAttribut {
/**
* Retourne le node avec les résultats de la comparaison entre les deux valeurs (étudiant et sujet).<br>
* <br>
* @param nameNode
* @param nameNode : nom du node de retour.
* @param Tst (résultat de la comparaison)
* @param property
* @param valueAttributStudent
* @param valueAttributSujet
* @param property : le nom de l'attribut.
* @param valueAttributStudent : la valeur de l'attribut de student.
* @param valueAttributSujet : la valeur de l'attribut du sujet.
* @return
*/
public static node retourneNoteAvecResultatsAnalyse(String nameNode, String property, String valueStudent, String valueSujet, String nameElt) {

View File

@ -65,6 +65,8 @@ import fenetres.create_act.actTitrePrincipal;
import fenetres.create_act.actUpNode;
import fenetres.create_act.actevalNameCreator;
import fenetres.create_act.actsautfalse;
import fenetres.create_act.actsautmultiplefalse;
import fenetres.create_act.actsautmultipletrue;
import fenetres.create_act.actsauttrue;
import list.listeDesNodesAllContent;
import list.listeDesNodesAnalyseStyle;
@ -106,7 +108,7 @@ if(nod!=null) {
if(nod.getLevel()>1 ) {
mnPopupTree.addSeparator();
mnPopupTree.add(mnPourFeedback());
mnPopupTree.add(mnPourFeedback(nod));
if(listeDesNodesRechercheByContenu.isRechercheByContenu(nod)||listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(nod)) {
mnPopupTree.addSeparator();
@ -201,6 +203,18 @@ if(nod!=null) {
return mnSautNiveau1;
}
/**
* Menu saut de ligne entre les nodes.</br>
* @return
*/
private JMenu mnSautMultiple() {
JMenu mnSautMultiple = new JMenu("Saut de ligne entre les nodes");
mnSautMultiple.setIcon( new ImageIcon(create.class.getResource("/resources/sautmultiplemini.png")));
mnSautMultiple.add(new actsautmultipletrue());
mnSautMultiple.add(new actsautmultiplefalse());
return mnSautMultiple;
}
/**
* Menu Titre.</br>
* @return
@ -449,13 +463,17 @@ if(nod!=null) {
* Ce menu apparaît dans tous nodes supérieur à 1.</br>
* @return
*/
private JMenu mnPourFeedback() {
private JMenu mnPourFeedback(node nod) {
JMenu mnPourFeedback = new JMenu("Pour représentation feedback");
mnPourFeedback.add(mnSaut());
mnPourFeedback.addSeparator();
mnPourFeedback.add(mnTitre());
mnPourFeedback.addSeparator();
mnPourFeedback.add(mnAddMenuNiveauSup1());
if(listeDesNodesPourEvaluerPage.isPage(nod)) {
mnPourFeedback.addSeparator();
mnPourFeedback.add(mnSautMultiple());
}
return mnPourFeedback;
}

View File

@ -0,0 +1,30 @@
package fenetres.create_act;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import cXML.node;
public class actsautmultiplefalse extends AbstractAction{
{
putValue( Action.NAME, "false" );
putValue( Action.SHORT_DESCRIPTION, "false" );
}
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
for(int i = 0 ; i < nod.getNodes().size();i++) {
nod.getNodes().get(i).getAttributs().put("saut", "false");
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}
}

View File

@ -0,0 +1,29 @@
package fenetres.create_act;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import cXML.node;
public class actsautmultipletrue extends AbstractAction{
{
putValue( Action.NAME, "true" );
putValue( Action.SHORT_DESCRIPTION, "true" );
}
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
for(int i = 0 ; i < nod.getNodes().size();i++) {
nod.getNodes().get(i).getAttributs().put("saut", "true");
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}
}

View File

@ -172,12 +172,12 @@ public class evaluerLesFichiersEtudiants implements Runnable{
// Run.ecritureNodeEnXML(nodStudent, "fichier student","",false,""); //écriture du node nodStudent de l'étudiant
node ana = analyseFichier.analyse(nodStudent, commandes.sujet, i, a);
// try {
// Run.ecritureNodeEnXML(ana, "analyse", commandes.path, "");
// } catch (IOException e1) {
// // TODO Auto-generated catch block
// e1.printStackTrace();
// }
try {
Run.ecritureNodeEnXML(ana, "analyse", commandes.path, "");
} catch (IOException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
//**************************************************
//** Ecriture des fichiers d'analyse des students **
//**************************************************

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B