MAJ V4.4.3
This commit is contained in:
pablo rodriguez
parent
5d5c7af09b
commit
3f9266a1a7
Binary file not shown.
8
bin/.gitignore
vendored
8
bin/.gitignore
vendored
@ -1,3 +1,7 @@
|
|||||||
|
/MEPTL/
|
||||||
|
/action/
|
||||||
|
/calcul/
|
||||||
|
/evaluer/
|
||||||
/fenetres/
|
/fenetres/
|
||||||
/list/
|
/list/
|
||||||
/menucontextuel/
|
/menucontextuel/
|
||||||
@ -5,7 +9,3 @@
|
|||||||
/sousmenuEvaluation/
|
/sousmenuEvaluation/
|
||||||
/sousmenuRecherche/
|
/sousmenuRecherche/
|
||||||
/sousmenuRepresentation/
|
/sousmenuRepresentation/
|
||||||
/MEPTL/
|
|
||||||
/action/
|
|
||||||
/evaluer/
|
|
||||||
/resources/
|
|
||||||
|
|||||||
Binary file not shown.
BIN
bin/chargehistoriqueevaluation.png
Normal file
BIN
bin/chargehistoriqueevaluation.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
bin/chargehistoriqueevaluationmini.png
Normal file
BIN
bin/chargehistoriqueevaluationmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
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.
BIN
bin/newlogo.png
Normal file
BIN
bin/newlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
59
bin/newlogo.svg
Normal file
59
bin/newlogo.svg
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="45"
|
||||||
|
height="45"
|
||||||
|
viewBox="0 0 11.90625 11.90625"
|
||||||
|
version="1.1"
|
||||||
|
id="svg5"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
|
sodipodi:docname="newlogo.svg"
|
||||||
|
inkscape:export-filename="nonewlogomini.png"
|
||||||
|
inkscape:export-xdpi="51.200001"
|
||||||
|
inkscape:export-ydpi="51.200001"
|
||||||
|
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"><sodipodi:namedview
|
||||||
|
id="namedview7"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:showpageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#d1d1d1"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="11.675119"
|
||||||
|
inkscape:cx="-14.603706"
|
||||||
|
inkscape:cy="22.655015"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1009"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="layer1" /><defs
|
||||||
|
id="defs2" /><g
|
||||||
|
inkscape:label="Calque 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"><path
|
||||||
|
id="path248"
|
||||||
|
style="fill:#000000;stroke-width:1"
|
||||||
|
d="M 5.843571 0.00051676432 C 5.4277559 0.00020147157 5.2863767 0.012254974 4.9195964 0.077514648 C 3.3428554 0.35805786 1.898711 1.3030546 1.0061401 2.6385986 C 0.45788102 3.4589524 0.13164203 4.3674791 0.022220866 5.3789998 C -0.0043916975 5.6250133 -0.0077483922 6.2275617 0.016019694 6.4678223 C 0.15459911 7.8686383 0.72720238 9.1194307 1.6763835 10.094991 C 2.7269679 11.174773 4.1404246 11.817309 5.6409993 11.897465 C 6.6084342 11.949142 7.6275346 11.746073 8.5038737 11.32644 C 8.9599459 11.108052 9.4457238 10.800431 9.7585775 10.531657 C 10.049004 10.28215 10.55105 9.7549147 10.732678 9.5089803 C 11.373486 8.6412895 11.762571 7.6327824 11.884546 6.5225993 C 11.913799 6.2563808 11.913609 5.6301039 11.884029 5.3609131 C 11.774015 4.3597522 11.450179 3.4664187 10.900627 2.6453166 C 10.010766 1.3157472 8.671459 0.4232146 7.0832886 0.10180257 C 6.6912177 0.022455721 6.429383 0.00096264955 5.843571 0.00051676432 z M 5.9438232 0.42994792 C 7.1233976 0.43554381 8.2835478 0.82131368 9.2480143 1.5513265 C 9.5395569 1.7719976 9.9104318 2.1230726 10.138399 2.3936523 C 10.825471 3.2091536 11.261608 4.1927064 11.400854 5.2410238 C 11.587942 6.6495105 11.200691 8.1280659 10.347172 9.264034 C 9.7194357 10.099504 8.8949919 10.728042 7.9235474 11.111466 C 7.6727409 11.210458 7.5033563 11.263982 7.2243652 11.332642 C 6.8673962 11.420489 6.5665703 11.46424 6.1784342 11.48457 C 5.9241591 11.4979 5.8841056 11.497887 5.6208455 11.483537 C 4.6562672 11.430955 3.706945 11.117039 2.878894 10.577132 C 2.3780028 10.250541 1.8803127 9.7862502 1.5167033 9.3058919 C 0.41737914 7.8535926 0.09776581 5.9936645 0.65215658 4.2746745 C 1.2387211 2.4559231 2.7119103 1.0704786 4.5604451 0.59996338 C 5.0174922 0.48362925 5.4822507 0.42775822 5.9438232 0.42994792 z " /><path
|
||||||
|
style="fill:#a05a2c;stroke-width:1"
|
||||||
|
d="M 6.1477989,6.9883244 C 6.0173579,6.8974704 5.6850044,6.6703528 5.4092349,6.4836192 5.1334654,6.2968856 4.9046538,6.138955 4.9007649,6.1326629 4.8929228,6.119974 5.0248136,5.9552912 5.9035228,4.8805872 7.3716743,3.0849664 7.8568809,2.5225602 8.0458793,2.3973676 c 0.079166,-0.05244 0.1979524,-0.09519 0.2644945,-0.09519 0.1120796,0 0.2409438,0.069091 0.3064535,0.1643063 0.020492,0.029784 0.046258,0.090624 0.057258,0.1351994 0.01723,0.069819 0.017957,0.095179 0.00525,0.1830678 C 8.659547,2.9216138 8.6219021,3.0214071 8.4920454,3.2812432 8.051537,4.162677 6.4325275,7.1562365 6.3974169,7.1542263 6.3905677,7.1538126 6.2782398,7.0791783 6.1477989,6.9883244 Z"
|
||||||
|
id="path310" /><path
|
||||||
|
style="fill:#d4aa00;stroke-width:1"
|
||||||
|
d="M 3.6927415,9.5028365 C 3.5108364,9.3209314 3.2976433,8.9700657 3.2194296,8.7238774 3.1644043,8.5506772 3.1511784,8.4752422 3.1511922,8.3346833 3.1512042,8.1818316 3.1856892,8.0403193 3.2691028,7.8507854 3.4649642,7.4057464 3.9022075,6.918264 4.3125928,6.6873995 4.5135612,6.5743435 4.7109046,6.5071828 4.8475567,6.5053381 c 0.072328,-9.792e-4 0.091605,0.00459 0.1968502,0.056827 0.098729,0.049004 0.9791374,0.6237719 1.0287283,0.6715972 0.013938,0.013442 0.011437,0.040372 -0.015835,0.170472 C 5.9577602,7.8790841 5.7884117,8.2914317 5.6248197,8.457283 5.4857322,8.5982911 5.3298825,8.6497828 4.6883216,8.7666978 4.2423972,8.8479605 4.0762347,8.9092328 3.9476646,9.0398149 3.8237005,9.1657179 3.7405351,9.3704263 3.7585518,9.5053059 c 0.00424,0.031774 0.00473,0.057771 0.00108,0.057771 -0.00365,0 -0.033751,-0.027108 -0.066884,-0.06024 z"
|
||||||
|
id="path308" /><g
|
||||||
|
id="g920"
|
||||||
|
transform="translate(-12.2149,0.13597292)"><path
|
||||||
|
style="fill:none;stroke:#ff0000;stroke-width:0.765;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 0.74785105,0.79317534 10.877833,11.036468"
|
||||||
|
id="path351" /><path
|
||||||
|
style="fill:none;stroke:#ff0000;stroke-width:0.765;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 10.877833,0.79317534 0.74785105,11.036468"
|
||||||
|
id="path907" /></g></g></svg>
|
||||||
|
After Width: | Height: | Size: 5.3 KiB |
BIN
bin/newlogomini.png
Normal file
BIN
bin/newlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1003 B |
BIN
bin/nonewlogo.png
Normal file
BIN
bin/nonewlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
bin/nonewlogomini.png
Normal file
BIN
bin/nonewlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1018 B |
BIN
bin/resources/chargehistoriqueevaluation.png
Normal file
BIN
bin/resources/chargehistoriqueevaluation.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
bin/resources/chargehistoriqueevaluationmini.png
Normal file
BIN
bin/resources/chargehistoriqueevaluationmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
bin/resources/newlogo.png
Normal file
BIN
bin/resources/newlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
bin/resources/newlogomini.png
Normal file
BIN
bin/resources/newlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1003 B |
BIN
bin/resources/nonewlogo.png
Normal file
BIN
bin/resources/nonewlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
bin/resources/nonewlogomini.png
Normal file
BIN
bin/resources/nonewlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1018 B |
BIN
bin/resources/sauvegardehistoriqueevaluation.png
Normal file
BIN
bin/resources/sauvegardehistoriqueevaluation.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
bin/resources/sauvegardehistoriqueevaluationmini.png
Normal file
BIN
bin/resources/sauvegardehistoriqueevaluationmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 983 B |
64
bin/sauvegardeHistoriqueEvaluation.svg
Normal file
64
bin/sauvegardeHistoriqueEvaluation.svg
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="45"
|
||||||
|
height="45"
|
||||||
|
viewBox="0 0 11.90625 11.90625"
|
||||||
|
version="1.1"
|
||||||
|
id="svg5"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
|
sodipodi:docname="sauvegardeHistoriqueEvaluation.svg"
|
||||||
|
inkscape:export-filename="sauvegardehistoriqueevaluation.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96"
|
||||||
|
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"><sodipodi:namedview
|
||||||
|
id="namedview7"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:showpageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#d1d1d1"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="6.3757142"
|
||||||
|
inkscape:cx="-3.0584809"
|
||||||
|
inkscape:cy="24.232579"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1009"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="g447" /><defs
|
||||||
|
id="defs2" /><g
|
||||||
|
inkscape:label="Calque 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"><g
|
||||||
|
id="g447"
|
||||||
|
transform="matrix(0.07295087,0,0,0.07295087,7.1535362,-1.4012141)"
|
||||||
|
style="stroke-width:13.7079"><path
|
||||||
|
style="fill:#55ff99;stroke-width:13.7079"
|
||||||
|
d="m -39.6043,79.546324 c -15.35341,-1.374484 -25.508021,-3.510873 -35.496453,-7.46796 -12.502279,-4.95299 -20.626799,-11.905377 -22.61675,-19.353808 -0.475215,-1.778741 -0.451961,-5.220878 0.04833,-7.154307 0.647033,-2.500522 2.617291,-5.684044 5.148201,-8.318411 9.333576,-9.71511 29.074576,-16.563658 52.644592,-18.263462 4.62983,-0.33389 16.2998,-0.331613 21.04187,0.0041 24.91057,1.763562 45.95691,9.513212 54.31655,20.000359 7.28315,9.136686 4.43743,19.264145 -7.66198,27.267757 -2.42999,1.607407 -6.93282,4.039452 -8.95144,4.834803 -0.50933,0.200676 -1.52682,0.631208 -2.26109,0.956738 -1.93238,0.856692 -9.04871,3.12338 -12.33818,3.929952 -6.63755,1.627513 -13.19959,2.648024 -22.31011,3.469611 -4.62998,0.417534 -17.33385,0.473279 -21.56354,0.09462 z"
|
||||||
|
id="path343" /><path
|
||||||
|
style="fill:#00ff66;stroke-width:13.7079"
|
||||||
|
d="m -36.16472,111.56113 c -25.16853,-1.18739 -46.834654,-8.29596 -56.467898,-18.526913 -2.12703,-2.25901 -3.374311,-4.116309 -4.504511,-6.707577 l -0.807799,-1.852084 -0.05525,-12.170833 c -0.04925,-10.848404 -0.01491,-12.023863 0.315979,-10.818218 1.038406,3.783558 4.373249,8.169096 8.784726,11.552495 12.331228,9.457481 34.886015,15.2454 59.494893,15.267342 27.09653,0.02416 51.67524,-7.039568 62.87448,-18.069634 1.49683,-1.474214 3.65497,-4.148895 3.65497,-4.529768 0,-0.109833 0.22676,-0.518157 0.50392,-0.907386 0.27715,-0.389228 0.71108,-1.360109 0.96428,-2.15751 0.2532,-0.797401 0.56222,-1.562931 0.68671,-1.701176 0.1258,-0.139702 0.22634,4.612659 0.22634,10.698721 0,9.238332 -0.0675,11.221562 -0.43156,12.686771 -0.74553,3.000177 -2.3926,5.813867 -5.08224,8.682007 l -0.80637,0.8599 h -5.73141 c -6.21064,0 -7.74563,0.22495 -10.27255,1.50544 -2.10019,1.06424 -4.18783,3.24253 -5.35089,5.583213 -0.55737,1.12171 -1.03907,2.08075 -1.07045,2.13119 -0.0314,0.0504 -0.80954,-0.20436 -1.72923,-0.56623 -3.33302,-1.31141 -6.78277,-1.1617 -10.15722,0.44082 -1.59153,0.75582 -2.5628,1.5226 -5.32955,4.20748 l -3.38333,3.28322 -4.36562,0.44556 c -4.81357,0.49127 -12.92975,0.96699 -15.61042,0.91498 -0.94588,-0.0184 -3.80338,-0.13167 -6.35,-0.25181 z"
|
||||||
|
id="path341" /><path
|
||||||
|
style="fill:#00d455;stroke-width:13.7079"
|
||||||
|
d="m -38.14909,143.3183 c -8.555104,-0.58033 -17.055445,-1.78441 -23.384357,-3.31241 -18.435233,-4.45086 -31.075681,-12.01516 -35.316752,-21.13428 -1.171563,-2.51908 -1.221593,-3.15184 -1.202992,-15.21476 0.0098,-6.330153 0.05614,-11.390313 0.103058,-11.244793 0.04692,0.14552 0.274615,0.87911 0.505988,1.63021 1.420816,4.61233 6.685036,10.183453 13.257551,14.030453 9.497874,5.55926 22.988638,9.50568 38.246569,11.18818 7.191605,0.79302 15.344255,1.08469 22.254305,0.79618 3.25025,-0.13571 6.53462,-0.32312 7.29861,-0.41647 l 1.38906,-0.16973 v 2.00283 c 0,1.84929 0.34351,3.2303 1.43389,5.76456 0.13873,0.32245 -0.001,0.47633 -0.55822,0.61363 -1.41893,0.34979 -3.94696,1.97021 -5.29122,3.39157 -2.41954,2.5583 -3.52195,5.58226 -3.52195,9.66082 0,2.24277 -0.0339,2.38744 -0.59531,2.53788 -0.82659,0.22152 -10.7685,0.13727 -14.61823,-0.12387 z"
|
||||||
|
id="path339" /><path
|
||||||
|
style="fill:#00aa44;stroke-width:13.7079"
|
||||||
|
d="m -37.75222,175.20376 c -0.50932,-0.0571 -3.18823,-0.2946 -5.95312,-0.52776 -13.439837,-1.13336 -27.342278,-4.68981 -36.719905,-9.39348 -5.161158,-2.58876 -8.595442,-4.95929 -11.794112,-8.14095 -2.320155,-2.30782 -3.740044,-4.34071 -4.91127,-7.03158 l -0.814301,-1.87085 -0.05525,-12.17083 c -0.04999,-11.01311 -0.01892,-12.0382 0.326651,-10.77652 0.428773,1.56545 0.835468,2.4165 2.097803,4.38984 8.579457,13.41185 36.25397,22.57236 67.613094,22.38053 l 5.15937,-0.0316 0.53971,1.54386 c 1.25489,3.5896 4.03422,6.53566 7.23287,7.66673 1.55913,0.55132 1.53491,0.41325 0.5502,3.13754 -0.85773,2.37298 -0.79347,5.83469 0.15219,8.19847 0.38736,0.96825 0.66015,1.80461 0.60619,1.85857 -0.50645,0.50645 -20.62749,1.14951 -24.03012,0.76799 z"
|
||||||
|
id="path337" /><path
|
||||||
|
id="path331"
|
||||||
|
style="fill:#008000;stroke-width:13.7079"
|
||||||
|
d="m 23.921021,106.44689 c -2.16709,0.0446 -2.009467,0.47209 -2.282032,2.61948 -0.251299,1.9798 -1.1936,7.70028 -1.35909,8.25066 -0.08086,0.26891 -0.837385,0.67928 -1.907894,1.03508 -0.975509,0.32422 -2.603844,0.98702 -3.618383,1.47277 -1.014539,0.48576 -1.969365,0.88315 -2.121835,0.88315 -0.15247,0 -1.346219,-0.7714 -2.653068,-1.7141 -1.306838,-0.94269 -3.244381,-2.34168 -4.30568,-3.10886 C 4.61174,115.11789 3.59971,114.458 3.424081,114.4185 c -0.17562,-0.0395 -1.803316,1.41609 -3.616834,3.23494 l -3.296956,3.30729 0.567924,0.73329 c 0.312559,0.4035 1.141675,1.56524 1.842265,2.58124 0.700599,1.016 1.898897,2.73021 2.662886,3.80958 0.763979,1.07939 1.389063,2.10646 1.389063,2.28255 0,0.17608 -0.351589,0.97903 -0.781348,1.78439 -0.42976,0.80536 -1.098575,2.42433 -1.486214,3.5972 L 0,137.88115 l -1.358056,0.27491 c -0.74695,0.15119 -3.19222,0.56788 -5.433777,0.92605 -2.241568,0.35818 -4.178981,0.75491 -4.305681,0.8816 -0.12666,0.1267 -0.197513,2.3005 -0.157613,4.83071 l 0.07235,4.60075 2.645834,0.45062 c 1.455208,0.248 3.945677,0.67265 5.534545,0.94361 l 2.88923,0.49248 0.713651,2.10943 c 0.39261,1.1601 1.100808,2.86538 1.573548,3.78943 0.968299,1.89274 0.973075,1.86325 -0.721403,4.17236 -2.308738,3.14616 -4.192563,5.81456 -4.527373,6.41304 -0.346129,0.61871 -0.243717,0.75518 2.94349,3.9424 l 3.301607,3.30212 2.348694,-1.63142 c 1.291639,-0.89728 3.360207,-2.34014 4.597136,-3.20601 1.236928,-0.86587 2.367234,-1.57457 2.511474,-1.5751 0.14423,-4.4e-4 1.096738,0.40506 2.116667,0.90072 1.019939,0.49565 2.652126,1.16465 3.627685,1.48674 l 1.774052,0.58549 0.273369,1.35754 c 0.150449,0.74661 0.456858,2.48863 0.680578,3.87108 0.22373,1.38244 0.541774,3.31721 0.706934,4.29948 l 0.30024,1.78594 h 4.714958 c 4.675435,0 4.716295,-0.005 4.843115,-0.59532 0.26715,-1.24345 1.447972,-7.80139 1.652612,-9.17773 l 0.213941,-1.43815 2.513541,-0.95912 c 1.382439,-0.52732 3.015016,-1.21924 3.627686,-1.53789 1.442208,-0.7501 1.787278,-0.73107 2.948657,0.16226 0.530259,0.40788 2.554252,1.85255 4.4974,3.21014 l 3.533116,2.46807 3.2799,-3.27215 c 1.80401,-1.79968 3.27991,-3.35891 3.27991,-3.46491 0,-0.106 -1.33946,-2.05152 -2.97656,-4.32376 -1.63711,-2.27225 -3.12216,-4.33367 -3.30006,-4.5806 -0.26785,-0.37178 -0.17206,-0.74346 0.55604,-2.16214 0.48359,-0.94227 1.15858,-2.54651 1.50016,-3.56516 0.34157,-1.01864 0.71843,-1.98573 0.83768,-2.14922 0.11925,-0.16349 0.84001,-0.37699 1.60145,-0.47439 1.18359,-0.15143 7.28724,-1.23984 9.12348,-1.62678 0.5903,-0.12442 0.59531,-0.16437 0.59531,-4.84053 v -4.71496 l -1.78594,-0.29249 c -0.98227,-0.16097 -3.33375,-0.54499 -5.22552,-0.85317 -1.89178,-0.30817 -3.65962,-0.64619 -3.92844,-0.75086 -0.31247,-0.12167 -0.75606,-0.9627 -1.23042,-2.33164 -0.40809,-1.17771 -1.10834,-2.83661 -1.55598,-3.6866 -0.74109,-1.4072 -0.77885,-1.59333 -0.42116,-2.08308 0.21606,-0.29582 0.59844,-0.83561 0.85008,-1.19941 0.25164,-0.3638 1.57822,-2.25104 2.94762,-4.19354 l 2.48977,-3.53157 -3.30884,-3.30884 c -3.20998,-3.20997 -3.32908,-3.29856 -3.96565,-2.95072 -0.64496,0.35241 -1.884953,1.23869 -5.963459,4.26175 -1.129249,0.83702 -2.31155,1.5916 -2.62723,1.6769 -0.36565,0.0988 -1.277943,-0.18069 -2.513542,-0.76998 -1.066759,-0.50876 -2.713329,-1.20866 -3.659208,-1.55546 l -1.719791,-0.63045 -0.322461,-1.97352 c -0.17748,-1.08541 -0.600952,-3.58086 -0.940511,-5.5454 l -0.617017,-3.57187 -4.686536,-0.0724 c -1.340926,-0.0207 -2.321895,-0.0485 -3.044258,-0.0336 z m 2.977079,24.95403 c 1.428629,-0.003 2.850263,0.13423 3.752742,0.4129 3.937747,1.21587 6.998843,4.02981 8.561752,7.87032 1.996118,4.90503 0.846776,10.51015 -2.92902,14.28595 -1.737129,1.73712 -4.60482,3.28861 -6.848678,3.70468 h -5.17e-4 c -2.994027,0.55517 -5.476749,0.20617 -8.342126,-1.17202 -3.235967,-1.55644 -5.883529,-4.66933 -6.974768,-8.20002 -0.57672,-1.86612 -0.546118,-5.6998 0.06046,-7.56181 1.394049,-4.27939 4.770717,-7.65133 8.924003,-8.91108 0.931609,-0.28258 2.367522,-0.42587 3.796152,-0.42892 z" /><path
|
||||||
|
style="fill:#ff0000;stroke:#800000;stroke-width:3.62687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 63.495772,20.345355 c -39.141809,11.541139 -77.112387,35.07855 -89.310565,87.035135 l 28.4428534,3.41314 -49.4905634,29.01171 -11.945999,-58.023422 15.927997,18.20343 C -28.478443,47.466178 21.473128,26.871234 64.064626,20.345356 Z"
|
||||||
|
id="path349"
|
||||||
|
sodipodi:nodetypes="cccccccc" /></g></g></svg>
|
||||||
|
After Width: | Height: | Size: 9.7 KiB |
BIN
bin/sauvegardehistoriqueevaluation.png
Normal file
BIN
bin/sauvegardehistoriqueevaluation.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
bin/sauvegardehistoriqueevaluationmini.png
Normal file
BIN
bin/sauvegardehistoriqueevaluationmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 983 B |
BIN
icons/newlogo.png
Normal file
BIN
icons/newlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
59
icons/newlogo.svg
Normal file
59
icons/newlogo.svg
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="45"
|
||||||
|
height="45"
|
||||||
|
viewBox="0 0 11.90625 11.90625"
|
||||||
|
version="1.1"
|
||||||
|
id="svg5"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
|
sodipodi:docname="newlogo.svg"
|
||||||
|
inkscape:export-filename="nonewlogomini.png"
|
||||||
|
inkscape:export-xdpi="51.200001"
|
||||||
|
inkscape:export-ydpi="51.200001"
|
||||||
|
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"><sodipodi:namedview
|
||||||
|
id="namedview7"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:showpageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#d1d1d1"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="11.675119"
|
||||||
|
inkscape:cx="-14.603706"
|
||||||
|
inkscape:cy="22.655015"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1009"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="layer1" /><defs
|
||||||
|
id="defs2" /><g
|
||||||
|
inkscape:label="Calque 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"><path
|
||||||
|
id="path248"
|
||||||
|
style="fill:#000000;stroke-width:1"
|
||||||
|
d="M 5.843571 0.00051676432 C 5.4277559 0.00020147157 5.2863767 0.012254974 4.9195964 0.077514648 C 3.3428554 0.35805786 1.898711 1.3030546 1.0061401 2.6385986 C 0.45788102 3.4589524 0.13164203 4.3674791 0.022220866 5.3789998 C -0.0043916975 5.6250133 -0.0077483922 6.2275617 0.016019694 6.4678223 C 0.15459911 7.8686383 0.72720238 9.1194307 1.6763835 10.094991 C 2.7269679 11.174773 4.1404246 11.817309 5.6409993 11.897465 C 6.6084342 11.949142 7.6275346 11.746073 8.5038737 11.32644 C 8.9599459 11.108052 9.4457238 10.800431 9.7585775 10.531657 C 10.049004 10.28215 10.55105 9.7549147 10.732678 9.5089803 C 11.373486 8.6412895 11.762571 7.6327824 11.884546 6.5225993 C 11.913799 6.2563808 11.913609 5.6301039 11.884029 5.3609131 C 11.774015 4.3597522 11.450179 3.4664187 10.900627 2.6453166 C 10.010766 1.3157472 8.671459 0.4232146 7.0832886 0.10180257 C 6.6912177 0.022455721 6.429383 0.00096264955 5.843571 0.00051676432 z M 5.9438232 0.42994792 C 7.1233976 0.43554381 8.2835478 0.82131368 9.2480143 1.5513265 C 9.5395569 1.7719976 9.9104318 2.1230726 10.138399 2.3936523 C 10.825471 3.2091536 11.261608 4.1927064 11.400854 5.2410238 C 11.587942 6.6495105 11.200691 8.1280659 10.347172 9.264034 C 9.7194357 10.099504 8.8949919 10.728042 7.9235474 11.111466 C 7.6727409 11.210458 7.5033563 11.263982 7.2243652 11.332642 C 6.8673962 11.420489 6.5665703 11.46424 6.1784342 11.48457 C 5.9241591 11.4979 5.8841056 11.497887 5.6208455 11.483537 C 4.6562672 11.430955 3.706945 11.117039 2.878894 10.577132 C 2.3780028 10.250541 1.8803127 9.7862502 1.5167033 9.3058919 C 0.41737914 7.8535926 0.09776581 5.9936645 0.65215658 4.2746745 C 1.2387211 2.4559231 2.7119103 1.0704786 4.5604451 0.59996338 C 5.0174922 0.48362925 5.4822507 0.42775822 5.9438232 0.42994792 z " /><path
|
||||||
|
style="fill:#a05a2c;stroke-width:1"
|
||||||
|
d="M 6.1477989,6.9883244 C 6.0173579,6.8974704 5.6850044,6.6703528 5.4092349,6.4836192 5.1334654,6.2968856 4.9046538,6.138955 4.9007649,6.1326629 4.8929228,6.119974 5.0248136,5.9552912 5.9035228,4.8805872 7.3716743,3.0849664 7.8568809,2.5225602 8.0458793,2.3973676 c 0.079166,-0.05244 0.1979524,-0.09519 0.2644945,-0.09519 0.1120796,0 0.2409438,0.069091 0.3064535,0.1643063 0.020492,0.029784 0.046258,0.090624 0.057258,0.1351994 0.01723,0.069819 0.017957,0.095179 0.00525,0.1830678 C 8.659547,2.9216138 8.6219021,3.0214071 8.4920454,3.2812432 8.051537,4.162677 6.4325275,7.1562365 6.3974169,7.1542263 6.3905677,7.1538126 6.2782398,7.0791783 6.1477989,6.9883244 Z"
|
||||||
|
id="path310" /><path
|
||||||
|
style="fill:#d4aa00;stroke-width:1"
|
||||||
|
d="M 3.6927415,9.5028365 C 3.5108364,9.3209314 3.2976433,8.9700657 3.2194296,8.7238774 3.1644043,8.5506772 3.1511784,8.4752422 3.1511922,8.3346833 3.1512042,8.1818316 3.1856892,8.0403193 3.2691028,7.8507854 3.4649642,7.4057464 3.9022075,6.918264 4.3125928,6.6873995 4.5135612,6.5743435 4.7109046,6.5071828 4.8475567,6.5053381 c 0.072328,-9.792e-4 0.091605,0.00459 0.1968502,0.056827 0.098729,0.049004 0.9791374,0.6237719 1.0287283,0.6715972 0.013938,0.013442 0.011437,0.040372 -0.015835,0.170472 C 5.9577602,7.8790841 5.7884117,8.2914317 5.6248197,8.457283 5.4857322,8.5982911 5.3298825,8.6497828 4.6883216,8.7666978 4.2423972,8.8479605 4.0762347,8.9092328 3.9476646,9.0398149 3.8237005,9.1657179 3.7405351,9.3704263 3.7585518,9.5053059 c 0.00424,0.031774 0.00473,0.057771 0.00108,0.057771 -0.00365,0 -0.033751,-0.027108 -0.066884,-0.06024 z"
|
||||||
|
id="path308" /><g
|
||||||
|
id="g920"
|
||||||
|
transform="translate(-12.2149,0.13597292)"><path
|
||||||
|
style="fill:none;stroke:#ff0000;stroke-width:0.765;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 0.74785105,0.79317534 10.877833,11.036468"
|
||||||
|
id="path351" /><path
|
||||||
|
style="fill:none;stroke:#ff0000;stroke-width:0.765;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 10.877833,0.79317534 0.74785105,11.036468"
|
||||||
|
id="path907" /></g></g></svg>
|
||||||
|
After Width: | Height: | Size: 5.3 KiB |
BIN
icons/newlogomini.png
Normal file
BIN
icons/newlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1003 B |
BIN
icons/nonewlogo.png
Normal file
BIN
icons/nonewlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
icons/nonewlogomini.png
Normal file
BIN
icons/nonewlogomini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1018 B |
@ -21,10 +21,17 @@ public class commandes {
|
|||||||
//** Le node du fichier d'analyse
|
//** Le node du fichier d'analyse
|
||||||
public static node sujet = new node();
|
public static node sujet = new node();
|
||||||
public static node sujetSauvegarde = new node();
|
public static node sujetSauvegarde = new node();
|
||||||
|
|
||||||
|
//** Le node base de données des évaluations
|
||||||
|
public static node evaluationsBase = null;
|
||||||
|
|
||||||
|
//** L'arbre
|
||||||
public static JTree tree = new JTree();
|
public static JTree tree = new JTree();
|
||||||
|
|
||||||
|
//** Le node CSV - liste des étudiants
|
||||||
public static node nodeCSV = null;
|
public static node nodeCSV = null;
|
||||||
|
|
||||||
//**version
|
//** Version
|
||||||
public static String version ="V4.4.3"; // La version actuelle
|
public static String version ="V4.4.3"; // La version actuelle
|
||||||
public static String branch = "Origin";
|
public static String branch = "Origin";
|
||||||
public static String Annee ="2023";
|
public static String Annee ="2023";
|
||||||
|
|||||||
@ -1,11 +1,19 @@
|
|||||||
package action;
|
package action;
|
||||||
|
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
|
||||||
import javax.swing.AbstractAction;
|
import javax.swing.AbstractAction;
|
||||||
import javax.swing.Action;
|
import javax.swing.Action;
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
|
import javax.swing.filechooser.FileSystemView;
|
||||||
|
|
||||||
|
import MEPTL.commandes;
|
||||||
|
import cXML.node;
|
||||||
|
import fenetres.chargeEvaluations;
|
||||||
import fenetres.create;
|
import fenetres.create;
|
||||||
|
|
||||||
public class actOpenHistoriqueEvaluation extends AbstractAction{
|
public class actOpenHistoriqueEvaluation extends AbstractAction{
|
||||||
@ -18,7 +26,46 @@ public class actOpenHistoriqueEvaluation extends AbstractAction{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
nodeEvaluations();
|
||||||
|
if(commandes.evaluationsBase!=null) {
|
||||||
|
chargeEvaluations.getInstance();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void nodeEvaluations() {
|
||||||
|
|
||||||
|
File directory = new File(FileSystemView.getFileSystemView().getDefaultDirectory().getPath());
|
||||||
|
if (directory.exists()){
|
||||||
|
File file = null;
|
||||||
|
if(commandes.os.contains("Win")) {
|
||||||
|
file = new File(directory.getAbsolutePath() + "\\" + "base_evaluations_analyseWriter.xml");
|
||||||
|
}else {
|
||||||
|
file = new File(directory.getAbsolutePath() + "/" + "base_evaluations_analyseWriter.xml");
|
||||||
|
}
|
||||||
|
if(file!=null) {
|
||||||
|
BufferedReader br;
|
||||||
|
try {
|
||||||
|
br = new BufferedReader(
|
||||||
|
new InputStreamReader(
|
||||||
|
new FileInputStream(file.getAbsoluteFile()), "UTF-8"));
|
||||||
|
String line;
|
||||||
|
StringBuilder targetString = new StringBuilder();
|
||||||
|
while ((line = br.readLine()) != null) {
|
||||||
|
targetString.append(line);
|
||||||
|
}
|
||||||
|
node evaluations = new node(targetString.toString().replace("\t","").replace("\r", "").replace("\n", ""));
|
||||||
|
if(evaluations!=null) {
|
||||||
|
if(evaluations.getNodes().size()>0) {
|
||||||
|
if(evaluations.getNodes().get(0).getNomElt().equals("evaluation")) {
|
||||||
|
commandes.evaluationsBase = evaluations;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}catch (Exception e) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,10 @@ import java.awt.event.KeyEvent;
|
|||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
|
import java.text.ParseException;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
import javax.swing.AbstractAction;
|
import javax.swing.AbstractAction;
|
||||||
import javax.swing.Action;
|
import javax.swing.Action;
|
||||||
@ -14,6 +17,7 @@ import javax.swing.JOptionPane;
|
|||||||
import javax.swing.filechooser.FileSystemView;
|
import javax.swing.filechooser.FileSystemView;
|
||||||
|
|
||||||
import MEPTL.commandes;
|
import MEPTL.commandes;
|
||||||
|
import cXML.Run;
|
||||||
import cXML.node;
|
import cXML.node;
|
||||||
import fenetres.create;
|
import fenetres.create;
|
||||||
|
|
||||||
@ -36,9 +40,19 @@ public class actSaveHistoriqueEvaluation extends AbstractAction{
|
|||||||
if(!name.isBlank()) {
|
if(!name.isBlank()) {
|
||||||
node evaluations = nodeEvaluations();
|
node evaluations = nodeEvaluations();
|
||||||
if(!isEvaluationExist(evaluations, name)) {
|
if(!isEvaluationExist(evaluations, name)) {
|
||||||
sauvegardeEvaluation(new node(), name);
|
evaluations.getNodes().add(creationNodeEvaluation(new node(), name));
|
||||||
}else {
|
}else {
|
||||||
sauvegardeEvaluation(evaluations.retourneFirstNodeByNameAndAttributValueExactStrict("evaluation", "name", name), name);
|
evaluations.getNodes().add(creationNodeEvaluation(evaluations.retourneFirstNodeByNameAndAttributValueExactStrict("evaluation", "name", name), name));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Mise à jour de la base de données
|
||||||
|
Date aujourdhui = new Date();
|
||||||
|
evaluations.getAttributs().put("version", commandes.version);
|
||||||
|
try {
|
||||||
|
evaluations.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui));
|
||||||
|
ecritureBaseEvaluation(evaluations);
|
||||||
|
} catch (ParseException | IOException e1) {
|
||||||
|
e1.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -49,20 +63,23 @@ public class actSaveHistoriqueEvaluation extends AbstractAction{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isEvaluationExist(node evaluations, String nameEvaluation) {
|
private boolean isEvaluationExist(node evaluations, String nameEvaluation) {
|
||||||
|
if(evaluations!=null) {
|
||||||
if(evaluations.retourneFirstNodeByNameAndAttributValueExactStrict("evaluation", "name", nameEvaluation)!=null) return true;
|
if(evaluations.retourneFirstNodeByNameAndAttributValueExactStrict("evaluation", "name", nameEvaluation)!=null) return true;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private node nodeEvaluations() {
|
private node nodeEvaluations() {
|
||||||
node evaluations = null;
|
node evaluations = new node();
|
||||||
|
evaluations.setNomElt("evaluations");
|
||||||
File directory = new File(FileSystemView.getFileSystemView().getDefaultDirectory().getPath());
|
File directory = new File(FileSystemView.getFileSystemView().getDefaultDirectory().getPath());
|
||||||
if (directory.exists()){
|
if (directory.exists()){
|
||||||
File file = null;
|
File file = null;
|
||||||
if(commandes.os.contains("Win")) {
|
if(commandes.os.contains("Win")) {
|
||||||
file = new File(directory.getAbsolutePath() + "\\" + "evaluations.xml");
|
file = new File(directory.getAbsolutePath() + "\\" + "base_evaluations_analyseWriter.xml");
|
||||||
}else {
|
}else {
|
||||||
file = new File(directory.getAbsolutePath() + "/" + "evaluations.xml");
|
file = new File(directory.getAbsolutePath() + "/" + "base_evaluations_analyseWriter.xml");
|
||||||
}
|
}
|
||||||
if(file!=null) {
|
if(file!=null) {
|
||||||
BufferedReader br;
|
BufferedReader br;
|
||||||
@ -75,20 +92,19 @@ public class actSaveHistoriqueEvaluation extends AbstractAction{
|
|||||||
while ((line = br.readLine()) != null) {
|
while ((line = br.readLine()) != null) {
|
||||||
targetString.append(line);
|
targetString.append(line);
|
||||||
}
|
}
|
||||||
evaluations = new node(targetString.toString());
|
evaluations = new node(targetString.toString().replace("\t","").replace("\r", "").replace("\n", ""));
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
// TODO: handle exception
|
|
||||||
}
|
}
|
||||||
}else {
|
|
||||||
evaluations = new node();
|
|
||||||
evaluations.setNomElt("evaluations");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return evaluations;
|
return evaluations;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sauvegardeEvaluation(node evaluation, String name) {
|
private node creationNodeEvaluation(node evaluation, String name) {
|
||||||
evaluation.setNomElt("evaluation");
|
evaluation.setNomElt("evaluation");
|
||||||
|
Date aujourdhui = new Date();
|
||||||
|
evaluation.getAttributs().put("version", commandes.version);
|
||||||
evaluation.getAttributs().put("name", name);
|
evaluation.getAttributs().put("name", name);
|
||||||
evaluation.getAttributs().put("PathFilenameAnalysis", commandes.PathFilenameAnalysis);
|
evaluation.getAttributs().put("PathFilenameAnalysis", commandes.PathFilenameAnalysis);
|
||||||
evaluation.getAttributs().put("path", commandes.path);
|
evaluation.getAttributs().put("path", commandes.path);
|
||||||
@ -111,6 +127,13 @@ public class actSaveHistoriqueEvaluation extends AbstractAction{
|
|||||||
evaluation.getNodes().add(commandes.sujet);
|
evaluation.getNodes().add(commandes.sujet);
|
||||||
evaluation.getNodes().add(commandes.nodeCSV);
|
evaluation.getNodes().add(commandes.nodeCSV);
|
||||||
|
|
||||||
|
try {
|
||||||
|
evaluation.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui));
|
||||||
|
} catch (ParseException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!commandes.nameSVG.isBlank() && !commandes.contenuFichierSVG.isBlank()) {
|
if(!commandes.nameSVG.isBlank() && !commandes.contenuFichierSVG.isBlank()) {
|
||||||
node SVG = new node();
|
node SVG = new node();
|
||||||
SVG.setNomElt("nodSVG");
|
SVG.setNomElt("nodSVG");
|
||||||
@ -118,7 +141,12 @@ public class actSaveHistoriqueEvaluation extends AbstractAction{
|
|||||||
evaluation.getNodes().add(SVG);
|
evaluation.getNodes().add(SVG);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return evaluation;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ecritureBaseEvaluation(node evaluations) throws IOException {
|
||||||
|
File directory = new File(FileSystemView.getFileSystemView().getDefaultDirectory().getPath());
|
||||||
|
Run.ecritureNodeEnXML(evaluations, "base_evaluations_analyseWriter.xml", directory.getAbsolutePath(), Run.TypeFile.Evaluation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -212,7 +212,8 @@ public class attributs extends JFrame {
|
|||||||
|
|
||||||
JPanel panelCentre = new JPanel();
|
JPanel panelCentre = new JPanel();
|
||||||
scrollPaneCentre.setViewportView(panelCentre);
|
scrollPaneCentre.setViewportView(panelCentre);
|
||||||
panelCentre.setLayout(new MigLayout("", "[100px:n,grow][150px:n,grow 150][::80px][80px:n]", "[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]"));
|
panelCentre.setLayout(new MigLayout("gap rel 0", "[100px:n,grow][150px:n,grow 150][::80px][80px:n]",
|
||||||
|
"[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]"));
|
||||||
|
|
||||||
JLabel lblNewLabel = new JLabel("Nom attribut");
|
JLabel lblNewLabel = new JLabel("Nom attribut");
|
||||||
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 11));
|
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 11));
|
||||||
|
|||||||
233
src/fenetres/chargeEvaluations.java
Normal file
233
src/fenetres/chargeEvaluations.java
Normal file
@ -0,0 +1,233 @@
|
|||||||
|
package fenetres;
|
||||||
|
|
||||||
|
import java.awt.BorderLayout;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Component;
|
||||||
|
import java.awt.FlowLayout;
|
||||||
|
import java.awt.Font;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
|
import java.awt.event.MouseAdapter;
|
||||||
|
import java.awt.event.MouseEvent;
|
||||||
|
import java.awt.event.MouseListener;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import javax.swing.FocusManager;
|
||||||
|
import javax.swing.ImageIcon;
|
||||||
|
import javax.swing.JButton;
|
||||||
|
import javax.swing.JFrame;
|
||||||
|
import javax.swing.JLabel;
|
||||||
|
import javax.swing.JPanel;
|
||||||
|
import javax.swing.JRadioButton;
|
||||||
|
import javax.swing.JScrollPane;
|
||||||
|
import javax.swing.border.EmptyBorder;
|
||||||
|
|
||||||
|
import MEPTL.commandes;
|
||||||
|
import cXML.node;
|
||||||
|
import net.miginfocom.swing.MigLayout;
|
||||||
|
|
||||||
|
public class chargeEvaluations extends JFrame {
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
private static chargeEvaluations instance;
|
||||||
|
private JPanel contentPane;
|
||||||
|
ArrayList<JLabel> LeslabelsTitre = new ArrayList<JLabel>();
|
||||||
|
ArrayList<JLabel> LeslabelsMeta = new ArrayList<JLabel>();
|
||||||
|
ArrayList<JLabel> LeslabelsDate = new ArrayList<JLabel>();
|
||||||
|
ArrayList<JRadioButton> LesRadioButtons = new ArrayList<JRadioButton>();
|
||||||
|
int indexSelect=0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the frame.
|
||||||
|
*/
|
||||||
|
public static chargeEvaluations getInstance() {
|
||||||
|
|
||||||
|
if (instance == null) {
|
||||||
|
instance = new chargeEvaluations();
|
||||||
|
}
|
||||||
|
// instance.actualise();
|
||||||
|
// instance.setVisible(true);
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public chargeEvaluations() {
|
||||||
|
setBounds(100, 100, 870, 600);
|
||||||
|
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
||||||
|
|
||||||
|
setBounds(100, 100, 806, 669);
|
||||||
|
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 évaluations");
|
||||||
|
|
||||||
|
|
||||||
|
contentPane = new JPanel();
|
||||||
|
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
|
||||||
|
setContentPane(contentPane);
|
||||||
|
contentPane.setLayout(new BorderLayout(0, 0));
|
||||||
|
|
||||||
|
JPanel panelGauche = new JPanel();
|
||||||
|
contentPane.add(panelGauche, BorderLayout.WEST);
|
||||||
|
|
||||||
|
JPanel panelHaut = new JPanel();
|
||||||
|
contentPane.add(panelHaut, BorderLayout.NORTH);
|
||||||
|
|
||||||
|
JLabel lblInformationBaseEvluation = new JLabel("");
|
||||||
|
lblInformationBaseEvluation.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||||
|
panelHaut.add(lblInformationBaseEvluation);
|
||||||
|
|
||||||
|
JPanel panelBas = new JPanel();
|
||||||
|
contentPane.add(panelBas, BorderLayout.SOUTH);
|
||||||
|
panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5));
|
||||||
|
|
||||||
|
JButton btnValide = new JButton("Charger l'évaluation");
|
||||||
|
btnValide.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||||
|
btnValide.setForeground(Color.RED);
|
||||||
|
panelBas.add(btnValide);
|
||||||
|
|
||||||
|
JScrollPane scrollPaneCentre = new JScrollPane();
|
||||||
|
contentPane.add(scrollPaneCentre, BorderLayout.CENTER);
|
||||||
|
|
||||||
|
JPanel panelCentre = new JPanel();
|
||||||
|
scrollPaneCentre.setViewportView(panelCentre);
|
||||||
|
panelCentre.setLayout(new MigLayout("gap rel 0", "[100px:n,grow][50px:n,grow][150px:n,grow 150][150px:n,grow 150]",
|
||||||
|
"[20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0]"));
|
||||||
|
|
||||||
|
|
||||||
|
String dateDernierEnregistrement = commandes.evaluationsBase.getAttributs().get("date");
|
||||||
|
|
||||||
|
String nombreEvluation = String.valueOf(commandes.evaluationsBase.getNodes().size());
|
||||||
|
|
||||||
|
lblInformationBaseEvluation.setText("<html>Date dernier enregistrement : " + dateDernierEnregistrement + " -- Nombre d'évaluation : " + nombreEvluation);
|
||||||
|
|
||||||
|
for(int i = 0 ; i<commandes.evaluationsBase.getNodes().size(); i++ ) {
|
||||||
|
LesRadioButtons.add(new JRadioButton(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("name")));
|
||||||
|
LeslabelsDate.add(new JLabel(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("date")));
|
||||||
|
|
||||||
|
|
||||||
|
String Titre = commandes.evaluationsBase.getNodes().get(i).retourneFirstEnfantsByName("fichier").getAttributs().get("titre");
|
||||||
|
String MetatSujet = commandes.evaluationsBase.getNodes().get(i).retourneFirstEnfantsByName("fichier").getAttributs().get("metaSujet");
|
||||||
|
|
||||||
|
LeslabelsTitre.add(new JLabel(Titre));
|
||||||
|
LeslabelsMeta.add(new JLabel(MetatSujet));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
for(int i = 0 ; i<LesRadioButtons.size(); i++ ) {
|
||||||
|
panelCentre.add(LesRadioButtons.get(i), "cell 0 "+i);
|
||||||
|
panelCentre.add(LeslabelsDate.get(i), "cell 1 "+i);
|
||||||
|
panelCentre.add(LeslabelsTitre.get(i), "cell 2 "+i);
|
||||||
|
panelCentre.add(LeslabelsMeta.get(i), "cell 3 "+i);
|
||||||
|
|
||||||
|
LesRadioButtons.get(i).addMouseListener(new MyMouseListener());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
addMouseListener((MouseListener) new MouseAdapter() {
|
||||||
|
public void mousePressed(MouseEvent me) {
|
||||||
|
System.out.println(me);
|
||||||
|
Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
|
||||||
|
System.out.println(focusOwner.getName());
|
||||||
|
}
|
||||||
|
public void mouseClicked(MouseEvent evt) {
|
||||||
|
if (evt.getClickCount() == 3) {
|
||||||
|
System.out.println("triple-click");
|
||||||
|
} else if (evt.getClickCount() == 2) {
|
||||||
|
System.out.println("double-click");
|
||||||
|
}
|
||||||
|
else if (evt.getClickCount() == 1) {
|
||||||
|
System.out.println("click");
|
||||||
|
}
|
||||||
|
Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
|
||||||
|
indexSelect = LesRadioButtons.indexOf(focusOwner);
|
||||||
|
System.out.println("indexSelect = " + indexSelect);
|
||||||
|
|
||||||
|
for(int i = 0; i < LesRadioButtons.size();i++) {
|
||||||
|
if(i!=indexSelect)LesRadioButtons.get(i).setSelected(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
btnValide.addActionListener(new ActionListener() {
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
for(int i = 0 ; i < LesRadioButtons.size();i++) {
|
||||||
|
if(LesRadioButtons.get(i).isSelected()) {
|
||||||
|
chargeEvaluationSelected(commandes.evaluationsBase.getNodes().get(i));
|
||||||
|
dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MyMouseListener extends MouseAdapter {
|
||||||
|
public void mouseClicked(MouseEvent evt) {
|
||||||
|
if (evt.getClickCount() == 3) {
|
||||||
|
System.out.println("triple-click");
|
||||||
|
} else if (evt.getClickCount() == 2) {
|
||||||
|
System.out.println("double-click");
|
||||||
|
}
|
||||||
|
else if (evt.getClickCount() == 1) {
|
||||||
|
System.out.println("click");
|
||||||
|
}
|
||||||
|
Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
|
||||||
|
indexSelect = LesRadioButtons.indexOf(focusOwner);
|
||||||
|
System.out.println("indexSelect = " + indexSelect);
|
||||||
|
|
||||||
|
for(int i = 0; i < LesRadioButtons.size();i++) {
|
||||||
|
if(i!=indexSelect)LesRadioButtons.get(i).setSelected(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void chargeEvaluationSelected(node evaluation) {
|
||||||
|
|
||||||
|
commandes.version = evaluation.getAttributs().get("version");
|
||||||
|
commandes.PathFilenameAnalysis = evaluation.getAttributs().get("PathFilenameAnalysis");
|
||||||
|
commandes.path = evaluation.getAttributs().get("path");
|
||||||
|
commandes.fichierStudentMoodle = Boolean.valueOf(evaluation.getAttributs().get("fichierStudentMoodle"));
|
||||||
|
commandes.sansFeeback = Boolean.valueOf(evaluation.getAttributs().get("sansFeeback"));
|
||||||
|
commandes.noDetail = Boolean.valueOf(evaluation.getAttributs().get("noDetail"));
|
||||||
|
commandes.noNote = Boolean.valueOf(evaluation.getAttributs().get("noNote"));
|
||||||
|
commandes.zipfeedback = Boolean.valueOf(evaluation.getAttributs().get("zipfeedback"));
|
||||||
|
commandes.verifHisto2 = Boolean.valueOf(evaluation.getAttributs().get("verifHisto2"));
|
||||||
|
commandes.ecritNoteCSV = Boolean.valueOf(evaluation.getAttributs().get("ecritNoteCSV"));
|
||||||
|
commandes.newLogo = Boolean.valueOf(evaluation.getAttributs().get("newLogo"));
|
||||||
|
commandes.noLogo = Boolean.valueOf(evaluation.getAttributs().get("noLogo"));
|
||||||
|
|
||||||
|
commandes.fourniCSV = Boolean.valueOf(evaluation.getAttributs().get("fourniCSV"));
|
||||||
|
commandes.nameCSV = evaluation.getAttributs().get("nameCSV");
|
||||||
|
|
||||||
|
commandes.fourniCSV = Boolean.valueOf(evaluation.getAttributs().get("fourniCSV"));
|
||||||
|
commandes.nameSVG = evaluation.getAttributs().get("nameSVG");
|
||||||
|
|
||||||
|
commandes.sujet = evaluation.retourneFirstEnfantsByName("fichier");
|
||||||
|
commandes.nodeCSV = evaluation.retourneFirstEnfantsByName("fileCSV");
|
||||||
|
|
||||||
|
commandes.contenuFichierSVG = evaluation.retourneFirstEnfantsByName("nodSVG").retourneLesContenusEnfants("");
|
||||||
|
|
||||||
|
commandes.fichierAnalyseValide = true;
|
||||||
|
|
||||||
|
evaluate.getInstance();
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -646,12 +646,10 @@ public class evaluate extends JFrame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(commandes.path!=null) lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> :<br>" + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
|
||||||
|
if(commandes.analysis_filename!=null) lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> :<br>" + commandes.analysis_filename + "</HTML>");
|
||||||
lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> :<br>" + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
|
if(commandes.nameSVG!=null) lblFichierSVG.setText("<HTML><B><U>Fichier SVG</U></B> :<br>" + commandes.nameSVG.substring(commandes.nameSVG.lastIndexOf("\\")+1,commandes.nameSVG.length()) + "</HTML>");
|
||||||
lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> :<br>" + commandes.analysis_filename + "</HTML>");
|
if(commandes.nameCSV!=null) lblFichierCSV.setText("<HTML><B><U>Fichier CSV</U></B> :<br>" + commandes.nameCSV + "</HTML>");
|
||||||
lblFichierSVG.setText("<HTML><B><U>Fichier SVG</U></B> :<br>" + commandes.nameSVG.substring(commandes.nameSVG.lastIndexOf("\\")+1,commandes.nameSVG.length()) + "</HTML>");
|
|
||||||
lblFichierCSV.setText("<HTML><B><U>Fichier CSV</U></B> :<br>" + commandes.nameCSV + "</HTML>");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user