MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-04-27 17:01:17 +02:00
parent d65a109560
commit d5730e88a5
27 changed files with 596 additions and 46 deletions

File diff suppressed because one or more lines are too long

1
bin/.gitignore vendored
View File

@ -173,3 +173,4 @@
/zipstudent.svg
/zipstudentmini.png
/baseListesEtudiants/
/resources/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,379 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="128"
inkscape:export-xdpi="128"
inkscape:export-filename="accueilBaseListesEtudiants.png"
sodipodi:docname="accueilChargeListesEtudiants.svg"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8"
version="1.1"
viewBox="0 0 158.74996 18.990533"
height="71.775246"
width="600"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2">
<linearGradient
id="k"
gradientTransform="matrix(7.99974,0,0,7.9977797,-873.96742,-7808.7674)"
gradientUnits="userSpaceOnUse"
x1="122.75008"
x2="111.74973"
xlink:href="#b"
y1="991.62115"
y2="977.11713" />
<linearGradient
id="b">
<stop
offset="0"
stop-color="#0369a3"
id="stop7" />
<stop
offset="1"
stop-color="#1c99e0"
id="stop9" />
</linearGradient>
<linearGradient
id="j"
gradientUnits="userSpaceOnUse"
x1="108.00134"
x2="20.001341"
y1="122"
y2="6">
<stop
offset="0"
stop-color="#e6e6e6"
id="stop35" />
<stop
offset="1"
stop-color="#fff"
id="stop37" />
</linearGradient>
<linearGradient
id="i"
gradientUnits="userSpaceOnUse"
x1="108.00134"
x2="20.001341"
xlink:href="#b"
y1="130"
y2="14" />
<linearGradient
id="h"
gradientTransform="matrix(4.4999,0,0,3.66665,-942.97741,2199.6564)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="-581.63782"
y2="-578.63782">
<stop
offset="0"
stop-color="#63bbee"
id="stop29" />
<stop
offset="1"
stop-color="#aadcf7"
id="stop31" />
</linearGradient>
<linearGradient
id="g"
gradientTransform="matrix(-4.19983,0,0,3.9111,1540.9405,-4523.1636)"
gradientUnits="userSpaceOnUse"
x2="0"
xlink:href="#a"
y1="1173"
y2="1178" />
<linearGradient
id="a">
<stop
offset="0"
stop-color="#666"
id="stop2" />
<stop
offset="1"
stop-color="#333"
id="stop4" />
</linearGradient>
<linearGradient
id="f"
gradientTransform="matrix(4.19983,0,0,3.9111,-1392.9394,-4521.9436)"
gradientUnits="userSpaceOnUse"
x2="0"
xlink:href="#a"
y1="1173"
y2="1178" />
<linearGradient
id="e"
gradientTransform="matrix(1.19997,0,0,1.22222,-281.19161,858.5534)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="-629.66907"
y2="-635.54944">
<stop
offset="0"
stop-color="#18a303"
id="stop22" />
<stop
offset="1"
stop-color="#106802"
id="stop24" />
</linearGradient>
<linearGradient
id="d"
gradientTransform="matrix(4.19983,0,0,3.9111,-1392.9394,-4517.0536)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="1173"
y2="1178">
<stop
offset="0"
stop-color="#0369a3"
id="stop17" />
<stop
offset="1"
stop-color="#023f62"
id="stop19" />
</linearGradient>
<linearGradient
id="c"
gradientTransform="matrix(0,0.791084,-1.28,0,1499.6005,-282.0136)"
gradientUnits="userSpaceOnUse"
x1="445.69522"
x2="441.38797"
y1="1103.5776"
y2="1099.8198">
<stop
offset="0"
stop-color="#e9b913"
id="stop12" />
<stop
offset="1"
stop-color="#ff0"
id="stop14" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1534"
id="linearGradient1536"
x1="-28.89456"
y1="79.43959"
x2="-28.613434"
y2="168.68048"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.10627944,0,0,0.10627944,76.968448,70.552162)" />
<linearGradient
inkscape:collect="always"
id="linearGradient1534">
<stop
style="stop-color:#00ff00;stop-opacity:1"
offset="0"
id="stop1530" />
<stop
style="stop-color:#008080;stop-opacity:1"
offset="1"
id="stop1532" />
</linearGradient>
</defs>
<sodipodi:namedview
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="-8"
inkscape:window-height="1009"
inkscape:window-width="1920"
lock-margins="true"
units="px"
fit-margin-bottom="2"
fit-margin-right="2"
fit-margin-left="2"
fit-margin-top="2"
inkscape:guide-bbox="true"
showguides="true"
inkscape:snap-global="true"
showgrid="false"
inkscape:document-rotation="0"
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="36.104513"
inkscape:cx="300"
inkscape:zoom="2.105"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0"
inkscape:snap-midpoints="true"
inkscape:snap-intersection-paths="true"
inkscape:snap-smooth-nodes="true"
inkscape:object-paths="true"
inkscape:snap-page="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
id="guide1680"
orientation="0,-1"
position="19.73243,7.0842602"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(-26.106428,-46.642428)"
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Calque 1">
<rect
style="fill:none;stroke:none;stroke-width:0.148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
id="rect4845"
width="66.024391"
height="16.182283"
x="31.987135"
y="46.825306" />
<g
id="g2452"
transform="translate(10.916237)">
<text
xml:space="preserve"
style="font-size:7.05556px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;stroke-width:0.192132"
x="45.652493"
y="58.318031"
id="text835"><tspan
sodipodi:role="line"
id="tspan833"
x="45.652493"
y="58.318031"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:0.192132">Base de données des listes d'étudiants</tspan></text>
<g
id="g1624"
transform="matrix(0.06830722,0,0,0.06834751,32.178819,43.679325)"
style="stroke-width:1.17108">
<g
transform="matrix(3.4017825,0,0,3.4017825,-95.08183,-189.09441)"
id="g884"
style="stroke-width:1.64491;stroke-miterlimit:4;stroke-dasharray:none">
<rect
style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.64491;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
id="rect880"
width="38.433739"
height="35.890331"
x="37.868542"
y="83.64991"
ry="2.5985754"
rx="2.5985754" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.57951;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
d="M 71.512572,88.41099 60.11298,113.78783 43.185151,105.76978 55.59032,107.11953 Z"
id="path882"
sodipodi:nodetypes="ccccc" />
</g>
<path
style="fill:#ffaaaa;stroke:#ffaaaa;stroke-width:3.76712px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 62.421182,83.450948 53.247834,73.396095 c -3.269201,-0.03495 -6.108773,-0.739553 -11.152516,1.99147 -5.59384,4.292817 -8.281453,7.910846 -10.664708,11.458206 -2.148177,4.173122 -1.698608,7.124368 -1.216677,10.060391 l 9.74404,9.259068 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
transform="matrix(1.315503,-0.76811157,0.73918702,1.366979,-196.76404,56.095615)"
id="path903"
d="m 142.61305,103.6418 9.43978,-0.5287 c 1.19321,12.05269 -3.29434,12.95393 3.79047,36.57198"
style="fill:none;stroke:#686868;stroke-width:4.57259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g
id="g901"
style="stroke-width:1.40817;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(1.3484552,-0.70866904,0.67747724,1.3985899,-192.46008,42.858566)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.40817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:1.40817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -29.6731,-89.58453 19.78207,-6.217222 29.3905,89.301932 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#cccccc;stroke:#000000;stroke-width:1.40817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 119.25765,105.69279 19.78206,-6.217223 5.18467,15.184943 -20.19347,6.3466 z"
id="path896"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#000000;stroke:none;stroke-width:1.40817;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 1.82913,-13.90142 c -1.86721,0.41019 -1.24071,5.14178 -2.26609,5.73964 -0.90416,0.52717 -2.9307,-2.35026 -4.06786,-2.12548 -1.70014,0.33605 2.39156,6.64425 -1.96215,4.47795 z"
id="path1247"
sodipodi:nodetypes="ccsscc" />
</g>
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.88056px;line-height:1.2;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:0.264583"
x="45.893505"
y="63.859547"
id="text2437"><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.88056px;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:0.264583"
x="45.893505"
y="63.859547"
id="tspan2649">Double cliquer sur une évaluation pour la charger en mémoire et l'utiliser. </tspan></text>
<g
id="g1"
transform="translate(-35.641518,-30.231974)">
<path
id="path482"
style="fill:url(#linearGradient1536);fill-opacity:1;stroke:none;stroke-width:0.430337;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stop-color:#000000"
d="m 72.066335,77.781556 c -0.314514,-6.1e-5 -0.627796,0.0062 -0.805852,0.01907 -1.812948,0.130745 -3.33151,0.657397 -4.049426,1.404657 -0.194671,0.20263 -0.346347,0.44788 -0.396115,0.640214 -0.03848,0.148714 -0.04037,0.413496 -0.0038,0.550312 0.153062,0.572917 0.778105,1.107597 1.73975,1.488568 0.768284,0.30437 1.549363,0.468566 2.73031,0.574286 0.325336,0.02913 1.302437,0.02503 1.658563,-0.0071 0.70076,-0.0632 1.205777,-0.141802 1.716321,-0.266985 0.253017,-0.06204 0.799973,-0.236506 0.948607,-0.3024 0.05648,-0.02504 0.135177,-0.05812 0.174355,-0.07356 0.155265,-0.06118 0.501254,-0.248503 0.688162,-0.372142 0.930656,-0.615621 1.149745,-1.394413 0.589542,-2.097185 -0.643003,-0.806643 -2.261953,-1.402499 -4.178012,-1.538148 -0.182375,-0.01291 -0.497877,-0.01955 -0.812391,-0.01961 z m -5.252483,3.287705 0.04195,1.910839 c 0.747473,2.559428 9.554269,2.577971 10.500608,0 v -1.910839 c -1.25543,2.680569 -9.360782,2.863756 -10.542562,0 z m 0.01852,2.504193 0.04196,1.910835 c 0.747472,2.559429 9.553724,2.577973 10.50006,0 v -1.910835 c -1.255427,2.680566 -9.360234,2.863757 -10.542015,0 z m -0.06375,2.277529 0.04195,1.910292 c 0.747472,2.559428 9.553722,2.57797 10.50006,0 v -1.910292 c -1.255428,2.680567 -9.360234,2.863758 -10.542014,0 z" />
<g
id="g2"
transform="matrix(0.82699238,0,0,0.82699238,64.745039,80.427835)">
<path
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.4649331,3.6987471 2.1436896,0.299894 2.0437247,-0.4887164 -0.033322,0.8996834 0.3554304,0.488717 v 1.032969 L 8.5968114,6.2645101 7.9637011,7.4529811 6.8863027,8.1971631 5.6422961,8.0527701 4.8314707,7.1864081 4.3427538,6.2311891 4.0317523,6.0534731 3.7762867,5.3981491 4.0317523,4.7428241 4.2316817,4.4762511 4.2427887,3.6987471 Z"
id="path455" />
<g
id="g379"
transform="matrix(0.01113254,0,0,0.01113254,0.33749402,1.6862516)"
style="fill:#000000;stroke-width:23.7666">
<g
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
id="g377"
style="fill:#000000;stroke-width:27.0149">
<path
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
id="path367"
style="fill:#000000;stroke-width:27.0149" />
<path
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
id="path369"
style="fill:#000000;stroke-width:27.0149" />
<path
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
id="path371"
style="fill:#000000;stroke-width:27.0149" />
<path
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
id="path373"
style="fill:#000000;stroke-width:27.0149" />
<path
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
id="path375"
style="fill:#000000;stroke-width:27.0149" />
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -16,7 +16,7 @@ import fenetres.create;
public class actOpenBaseEvaluation extends AbstractAction{
{
putValue( Action.NAME, "Charger une évaluation" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/chargehistoriqueevaluationmini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/BaseEvaluationsmini.png")) );
putValue( Action.SHORT_DESCRIPTION, "Charger une évaluation" );
}
private static final long serialVersionUID = 1L;

View File

@ -0,0 +1,30 @@
package action;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import MEPTL.commandes;
import baseListesEtudiants.recupeNodeBaseListesEtudiants;
import fenetres.baseDonneesListesEtudiants;
import fenetres.create;
public class actOpenBaseListesEtudiants extends AbstractAction{
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Charger une liste d'étudiants" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/baselisteetudiant.png")) );
putValue( Action.SHORT_DESCRIPTION, "Charger une liste d'étudiants" );
}
@Override
public void actionPerformed(ActionEvent e) {
new recupeNodeBaseListesEtudiants();
if(commandes.listesEtudiants!=null) {
baseDonneesListesEtudiants.getInstance();
}
}
}

View File

@ -21,7 +21,7 @@ public class actSaveEvaluation extends AbstractAction{
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Enregister l'évaluation" );
putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/saveEvaluationmini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/resources/saveEvaluationmini.png")) );
putValue( Action.MNEMONIC_KEY, KeyEvent.VK_S );
putValue( Action.SHORT_DESCRIPTION, "Enregistrer l'évaluation dans la base des évaluations. (CTRL+S)" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK ) );

View File

@ -93,21 +93,25 @@ public class recupeNodeBaseEvaluations {
while ((line = br.readLine()) != null) {
targetString.append(line);
}
node evaluations = new node();
String codeTexte = targetString.toString().replace("\t","").replace("\r", "").replace("\n", "");
evaluations = evaluations.allFirstNodesEvaluationFichierOnly(targetString.toString().replace("\t","").replace("\r", "").replace("\n", ""));
if(evaluations!=null) {
if(evaluations.getNodes().size()>0) {
if(evaluations.getNomElt().equals("evaluations")) {
commandes.evaluationsBase = evaluations;
commandes.PathBaseEvaluations = (directoryName);
commandes.NameBaseEvaluations = NameNewBase;
commandes.PathBaseEvaluationDefaut = false;
if(codeTexte.contains("<evaluations ")&&codeTexte.contains("</evaluations>")) {
node evaluations = new node();
evaluations = evaluations.allFirstNodesEvaluationFichierOnly(codeTexte);
if(evaluations!=null) {
if(evaluations.getNodes().size()>0) {
if(evaluations.getNomElt().equals("evaluations")) {
commandes.evaluationsBase = evaluations;
commandes.PathBaseEvaluations = (directoryName);
commandes.NameBaseEvaluations = NameNewBase;
commandes.PathBaseEvaluationDefaut = false;
}
}
}
}else {
JLabel texte = new JLabel("<html><p>Ce fichier n'est pas une base de données des évaluations d'analyseWriter.</p></html>");
JOptionPane.showMessageDialog(null, texte);JOptionPane.showMessageDialog(null, texte);
}
}catch (Exception e) {
JLabel texte = new JLabel("<html><p>La base de données n'est pas située dans le même répertoire que celui de l'application.</p><br>"
+"<p>Vous pouvez charger ou créer une base de données depuis la fenêtre \"<b>base de données d'évaluation</b>\" de l'application.</p></html>");

View File

@ -19,7 +19,7 @@ public class myTableBaseListesEtudiants extends AbstractTableModel{
*/
private static final long serialVersionUID = 1L;
private String[][] listes = new String[0][2];
private List<String> columNames = new ArrayList<>(Arrays.asList(new String[] {"Nom de la liste","Année"}));
private List<String> columNames = new ArrayList<>(Arrays.asList(new String[] {"Nom de la liste","Année", "Nombre d'étudiant"}));
@Override
public int getRowCount() {
return listes.length;
@ -54,8 +54,9 @@ public class myTableBaseListesEtudiants extends AbstractTableModel{
for(int i = 0 ; i<commandes.listesEtudiants.getNodes().size();i++) {
listes[i][0] = commandes.listesEtudiants.getNodes().get(i).getAttributs().get("nameListStudent");
listes[i][1] = commandes.listesEtudiants.getNodes().get(i).getAttributs().get("year");
listes[i][2] = String.valueOf(commandes.listesEtudiants.getNodes().get(i).getNodes().size());
}
fireTableRowsInserted(0, commandes.evaluationsBase.getNodes().size()-1);
fireTableRowsInserted(0, commandes.listesEtudiants.getNodes().size()-1);
}

View File

@ -27,30 +27,24 @@ public class ChargePathBaseEvaluation extends JFileChooser {
/**
*
* @param avecFusion : Si True ajoute les évaluations de la seconde base
*/
public ChargePathBaseEvaluation() {
setDialogTitle("Sélectionner la base de données des évaluations.");
FileNameExtensionFilter filter = new FileNameExtensionFilter("Base de données des évaluations", "xml");
setFileFilter(filter);
setPreferredSize(new Dimension(550, 420));
int response = showOpenDialog(null);
if(response == JFileChooser.APPROVE_OPTION) {
File file = new File(getSelectedFile().getAbsolutePath());
String ext = file.getName().substring(file.getName().lastIndexOf("."));
if(ext.equals(".xml")){
openFileXML(file);
}
}
}
@Override
@ -67,20 +61,14 @@ public class ChargePathBaseEvaluation extends JFileChooser {
* @param file
*/
private void openFileXML(File file) {
if(commandes.os.contains("Win")) {
commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("\\")); // Sur Windows
}else {
commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("/")); // Sur mac & Linux
}
String directoryName = getCurrentDirectory().getPath();
String nameNewBase = file.getName().toString();
new recupeNodeBaseEvaluations(directoryName,nameNewBase);
new recupeNodeBaseEvaluations(directoryName,nameNewBase);
}

View File

@ -32,7 +32,6 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumnModel;
import MEPTL.commandes;
import action.actOpenBaseEvaluation;
import baseEvaluations.chargeEvaluation;
import baseEvaluations.creerNouvelleEvaluation;
import baseEvaluations.myTableBaseEvaluation;
@ -127,7 +126,7 @@ public baseDonneesEvaluations() {
textPane_1.setBackground(SystemColor.menu);
panelBas.add(textPane_1);
lblCheminVersBase.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/chargehistoriqueevaluationmini.png")));
lblCheminVersBase.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/BaseEvaluationsmini.png")));
panelBas.add(lblCheminVersBase);
if(commandes.evaluationChargeEnMemoire!=null) {
@ -184,19 +183,17 @@ public baseDonneesEvaluations() {
btnRenommerEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
btnRenommerEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/renommeEvaluaton.png")));
panelGauche.add(btnRenommerEvaluation, "cell 0 5,growx,aligny top");
btnRenommerEvaluation.setForeground(new Color(153, 50, 204));
btnRenommerEvaluation.setFont(new Font("Tahoma", Font.BOLD, 15));
btnFusionnerBase.setToolTipText("Importer des évaluations dans la base par défaut depuis une autre base.");
btnFusionnerBase.setForeground(new Color(56, 184, 149));
btnFusionnerBase.setHorizontalAlignment(SwingConstants.LEFT);
btnFusionnerBase.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/fusionneBaseEvaluation.png")));
btnFusionnerBase.setFont(new Font("Tahoma", Font.BOLD, 15));
panelGauche.add(btnFusionnerBase, "cell 0 6,growx,aligny top");
btnFusionnerBase.setEnabled(false);
btnChargerFichierAnalyse.setToolTipText("Création d'une évaluation à partir d'un fichier d'analyse au format XML.");
btnChargerFichierAnalyse.setForeground(new Color(0, 64, 128));
btnChargerFichierAnalyse.setHorizontalAlignment(SwingConstants.LEFT);
btnChargerFichierAnalyse.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/fichierAnalyse.png")));
@ -428,7 +425,6 @@ private void ListenerAction() {
* Fusionner deux bases d'évaluations
*/
btnFusionnerBase.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
new ChargePathBaseEvaluation();
@ -437,7 +433,6 @@ private void ListenerAction() {
table.setModel(model);
selectRow(commandes.IndexEvaluationCharger);
}
});
@ -458,7 +453,9 @@ private void ListenerAction() {
btnChargerNewBase.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
new ChargePathBaseEvaluation();
new actOpenBaseEvaluation();
if(commandes.evaluationsBase!=null) {
baseDonneesEvaluations.getInstance();
}
if(commandes.PathBaseEvaluationDefaut) {
lblCheminVersBase.setText(commandes.PathBaseEvaluations);
}else {
@ -653,8 +650,10 @@ private void ListenerAction() {
if(!nomEvaluation.isBlank()) {
evaluation.getAttributs().put("name",nomEvaluation);
new creerNouvelleEvaluation(evaluation);
new recupeNodeBaseEvaluations();
model.addOrUpdate();
table.setModel(model);
table = new JTable(model);
// table.setModel(model);
}
}
}

View File

@ -0,0 +1,145 @@
package fenetres;
import java.awt.BorderLayout;
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumnModel;
import MEPTL.commandes;
import baseListesEtudiants.myTableBaseListesEtudiants;
import net.miginfocom.swing.MigLayout;
public class baseDonneesListesEtudiants extends JFrame{
private static final long serialVersionUID = 1L;
private static baseDonneesListesEtudiants instance;
public static boolean isDispose = true;
private static JTable table;
private myTableBaseListesEtudiants model = new myTableBaseListesEtudiants();
private final JButton btnFermer = new JButton("<html>Femer</html>");
JScrollPane scrollPaneTable = new JScrollPane();
JScrollPane scrollPaneBoutons = new JScrollPane();
int indexSelect=0;
ListSelectionModel lsm = null;
public baseDonneesListesEtudiants() {
super();
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
setLocationRelativeTo( null );
setSize(1600,900);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
setIconImage(img.getImage());
setTitle(commandes.Titre + " - La base de données des listes des étudiants");
JPanel panelHaut = new JPanel();
getContentPane().add(panelHaut, BorderLayout.NORTH);
JLabel lblNewLabel = new JLabel("");
lblNewLabel.setIcon(new ImageIcon(baseDonneesListesEtudiants.class.getResource("/resources/accueilBaseListesEtudiants.png")));
panelHaut.add(lblNewLabel);
JPanel panelBas = new JPanel();
getContentPane().add(panelBas, BorderLayout.SOUTH);
JPanel panelGauche = new JPanel();
panelGauche.setLayout(new MigLayout("", "[:300px:400px,fill]", "[53px][][][][][][][][][30.00][20px:n][][][]"));
scrollPaneBoutons = new JScrollPane(panelGauche);
getContentPane().add(scrollPaneBoutons, BorderLayout.WEST);
model.addOrUpdate();
table = new JTable(model);
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
TableColumnModel columnModel = table.getColumnModel();
columnModel.getColumn(0).setPreferredWidth(300);
columnModel.getColumn(0).setMaxWidth(400);
columnModel.getColumn(1).setPreferredWidth(300);
columnModel.getColumn(1).setMaxWidth(400);
columnModel.getColumn(2).setPreferredWidth(300);
columnModel.getColumn(2).setMaxWidth(400);
table.setFont(new Font("Tahoma", Font.PLAIN, 14));
scrollPaneTable = new JScrollPane(table);
getContentPane().add(scrollPaneTable, BorderLayout.CENTER);
//*Détection de la ligne sélectionnée
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
ListSelectionModel rowSM = table.getSelectionModel();
rowSM.addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
//Ignore extra messages.
if (e.getValueIsAdjusting()) return;
lsm = (ListSelectionModel)e.getSource();
if (lsm.isSelectionEmpty()) {
System.out.println("Aucune ligne sélectionnée.");
} else {
indexSelect = lsm.getMinSelectionIndex();
System.out.println("La ligne " + indexSelect + " est sélectionnée.");
}
}
});
btnFermer.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/quitteEvaluation.png")));
btnFermer.setHorizontalAlignment(SwingConstants.LEFT);
btnFermer.setFont(new Font("Tahoma", Font.BOLD, 15));
panelGauche.add(btnFermer, "cell 0 12,growx,aligny top");
ListenerAction();
}
public static void selectRow(int indexRow) {
table.setRowSelectionInterval(indexRow, indexRow);
}
public static baseDonneesListesEtudiants getInstance() {
if (isDispose) {
instance = new baseDonneesListesEtudiants();
}
instance.setVisible(true);
isDispose=false;
return instance;
}
private void ListenerAction() {
/**
* Femer la fenêtre.
*/
btnFermer.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
isDispose=true;
dispose();
}
});
}
}

View File

@ -729,7 +729,7 @@ public final class create extends JFrame {
toolBarPrincipal.setName("outils principaux");
JButton btnChargeEvaluation = toolBarPrincipal.add( new actOpenBaseEvaluation() );
btnChargeEvaluation.setIcon(new ImageIcon(create.class.getResource("/resources/chargehistoriqueevaluation.png")));
btnChargeEvaluation.setIcon(new ImageIcon(create.class.getResource("/resources/BaseEvaluations.png")));
btnChargeEvaluation.setHideActionText(true);
toolBarPrincipal.add(btnChargeEvaluation);

View File

@ -8,6 +8,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
@ -30,6 +31,7 @@ import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileNameExtensionFilter;
import MEPTL.commandes;
import MEPTL.meptl;
import MEPTL.verificationFichierAnalyse_node_commandesSujet;
@ -38,6 +40,7 @@ import action.actDocumentation;
import action.actExit;
import action.actLicence;
import action.actOpenBaseEvaluation;
import action.actOpenBaseListesEtudiants;
import action.actSaveEvaluation;
import action.actTutoriels;
import cXML.Run;
@ -565,7 +568,7 @@ public class evaluate extends JFrame {
private void createToolBar() {
toolBar = new JToolBar();
btnChargeEvaluation = toolBar.add( new actOpenBaseEvaluation());
btnChargeEvaluation.setIcon(new ImageIcon(create.class.getResource("/resources/chargehistoriqueevaluation.png")));
btnChargeEvaluation.setIcon(new ImageIcon(create.class.getResource("/resources/BaseEvaluations.png")));
btnChargeEvaluation.setHideActionText(true);
toolBar.add(btnChargeEvaluation);
@ -584,7 +587,7 @@ public class evaluate extends JFrame {
// btnSaveEvluation.setHideActionText(true);
// toolBar.add(btnSaveEvluation);
toolBar.addSeparator();
toolBar.addSeparator();
JButton btnInformationAnalyse = toolBar.add( actCodeFichierAnalyse );
btnInformationAnalyse.setVisible(false);
@ -608,8 +611,8 @@ public class evaluate extends JFrame {
toolBar.addSeparator();
JButton btnBaseListeEtudiant = new JButton("");
btnBaseListeEtudiant.setIcon(new ImageIcon(evaluate.class.getResource("/resources/baselisteetudiant.png")));
JButton btnBaseListeEtudiant = new JButton(new actOpenBaseListesEtudiants());
btnBaseListeEtudiant.setText("");
toolBar.add(btnBaseListeEtudiant);
JButton btnFichierCSV = toolBar.add(actChargeListeEtudiantCSV );

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 1.4 KiB