Maj V1.0.5
This commit is contained in:
pablo rodriguez
parent
15ec763fe8
commit
0db701da4d
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 689 KiB After Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 391 KiB After Width: | Height: | Size: 444 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 642 KiB |
BIN
resources/Sans titre_28.jpg
Normal file
BIN
resources/Sans titre_28.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
BIN
resources/Sans titre_29.jpg
Normal file
BIN
resources/Sans titre_29.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 285 KiB After Width: | Height: | Size: 86 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 322 KiB |
BIN
resources/Sans titre_30.jpg
Normal file
BIN
resources/Sans titre_30.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 77 KiB |
BIN
resources/Sans titre_31.jpg
Normal file
BIN
resources/Sans titre_31.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 229 KiB |
BIN
resources/Sans titre_32.jpg
Normal file
BIN
resources/Sans titre_32.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 108 KiB |
BIN
resources/Sans titre_33.jpg
Normal file
BIN
resources/Sans titre_33.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 112 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 73 KiB |
@ -1,324 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
inkscape:export-ydpi="128"
|
||||
inkscape:export-xdpi="128"
|
||||
inkscape:export-filename="accueil.png"
|
||||
sodipodi:docname="accueil.svg"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 174.66718 10.000005"
|
||||
height="37.795296"
|
||||
width="660.15942"
|
||||
xml:space="preserve"
|
||||
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
|
||||
inkscape:collect="always"
|
||||
id="linearGradient1932"><stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop1928" /><stop
|
||||
style="stop-color:#ed60c9;stop-opacity:1;"
|
||||
offset="0.71511286"
|
||||
id="stop2786" /><stop
|
||||
style="stop-color:#db9d60;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop1930" /></linearGradient><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><radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient1932"
|
||||
id="radialGradient1934"
|
||||
cx="75.284492"
|
||||
cy="52.004837"
|
||||
fx="75.284492"
|
||||
fy="52.004837"
|
||||
r="37.683716"
|
||||
gradientTransform="matrix(1.4493524,0,0,0.13268325,-32.195302,47.700862)"
|
||||
gradientUnits="userSpaceOnUse" /></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="61.201468"
|
||||
inkscape:cx="144.09683"
|
||||
inkscape:zoom="2.8348993"
|
||||
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="46.02753,-1.0460123"
|
||||
inkscape:locked="false" /><sodipodi:guide
|
||||
position="19.132263,6.5267754"
|
||||
orientation="0,-1"
|
||||
id="guide946"
|
||||
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(-22.301472,-49.601023)"
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Calque 1"><g
|
||||
id="g854"
|
||||
transform="matrix(0.46962342,0,0,0.46954938,34.68549,31.42631)"
|
||||
style="stroke-width:1.56539"><g
|
||||
id="g919"
|
||||
transform="matrix(2.0256057,0,0,2.085527,3.858094,-3.9539377)"
|
||||
style="stroke:#000000;stroke-width:1.20891;stroke-opacity:1"><rect
|
||||
ry="0.56339979"
|
||||
y="4.3255968"
|
||||
x="0.92013353"
|
||||
height="3.7594025"
|
||||
width="3.8382711"
|
||||
id="rect12"
|
||||
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.078579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
rx="0.5800662" /><path
|
||||
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.683033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 1.6159,5.0384659 3.9724208,7.4062084"
|
||||
id="path841" /><path
|
||||
id="path843"
|
||||
d="M 3.9724208,5.0384659 1.6159,7.4062084"
|
||||
style="fill:none;stroke:#ffffff;stroke-width:0.683033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
|
||||
id="g923"
|
||||
transform="matrix(1.9487365,0,0,2.0063839,-0.66234441,-0.08147761)"
|
||||
style="stroke-width:1.20891"><rect
|
||||
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.078579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
id="rect10"
|
||||
width="3.8382711"
|
||||
height="3.7594025"
|
||||
x="0.92013353"
|
||||
y="0.34176376"
|
||||
ry="0.56339979"
|
||||
rx="0.5800662" /><path
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.319856px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
|
||||
id="path16"
|
||||
sodipodi:nodetypes="ccccc" /></g></g><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" /><text
|
||||
xml:space="preserve"
|
||||
style="font-size:7.1582px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.278467"
|
||||
x="21.843348"
|
||||
y="56.329731"
|
||||
id="text835"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan833"
|
||||
x="21.843348"
|
||||
y="56.329731"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.1582px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.278467">Gestion des inscriptions, des groupes, feuilles d'émargement</tspan></text><g
|
||||
transform="matrix(0.1376497,0,0,0.15959018,15.807283,23.767637)"
|
||||
id="g884"
|
||||
style="stroke-width:1.89623;stroke-miterlimit:4;stroke-dasharray:none"><rect
|
||||
style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.89623;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:7.58474;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><g
|
||||
id="g707"
|
||||
transform="matrix(-1.3014879,0,0,1.3013395,90.568179,-27.473987)"
|
||||
style="stroke-width:0.768395"><path
|
||||
style="fill:#ffaaaa;stroke:#ffaaaa;stroke-width:0.145387px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 32.868516,47.600605 -0.366612,-0.401844 c -0.130653,-0.0014 -0.244136,-0.02956 -0.445709,0.07959 -0.223557,0.171563 -0.330967,0.316158 -0.426213,0.457928 -0.08585,0.16678 -0.06788,0.284727 -0.04862,0.402065 l 0.389419,0.37004 z"
|
||||
id="path1605"
|
||||
sodipodi:nodetypes="ccccccc" /><path
|
||||
id="path903"
|
||||
d="m 33.069673,47.791562 0.480667,-0.318663 c 0.418787,0.621828 0.209483,0.808821 1.279672,1.881624"
|
||||
style="fill:none;stroke:#686868;stroke-width:0.27145;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.35985;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
transform="matrix(0.05389082,-0.02832206,0.02707528,0.05589484,22.682222,45.978325)"><path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.35985;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.35985;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.35985;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.35985;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
|
||||
id="g489"
|
||||
transform="matrix(0.08348366,0,0,0.08348366,79.288682,57.922646)"
|
||||
style="stroke-width:3.16928"><path
|
||||
d="m -741.71893,-92.768085 c 0,0 -11.32,-2.98625 -17.8125,14.655 -4.485,10.1175 -3.72125,9.35625 -6.325,14.7975 -2.795,5.84125 -5.46125,7.92125 -4.66,7.5125 0,0 9.78,1.7025 17.89625,-14.74 4.4775,-9.0725 5.87125,-20.2225 11.26125,-22.2375"
|
||||
style="fill:#193476;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.16928"
|
||||
id="path2574" /><path
|
||||
d="m -772.37643,-52.971835 c 0.57875,-0.62125 0.89875,-1.0375 0.89875,-1.0375 -7.335,3.9025 -8.60125,1.665 -9.195,-1.065 -0.58875,-2.73 3.30375,-12.87625 6.23625,-22.4325 2.9325,-9.5625 -0.9025,-12.87625 -3.4775,-12.49 -2.57875,0.3925 -7.3,1.5625 -7.3,1.5625 0,0 1.58875,-0.195 2.82125,3.1225 0.97,2.60625 -5.3575,20.6775 -5.3575,20.6775 0,0 -4.09,11.70875 0.175,15.44375 5.8425,3.97 12.4975,-1.38125 15.19875,-3.78125"
|
||||
style="fill:#f46717;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.16928"
|
||||
id="path2576" /><path
|
||||
d="m -658.54018,-67.648085 c -25.62625,-4.69875 -50.81375,-1.24875 -72.40125,4.9625 -0.42375,1.26875 -0.81,2.43 -1.16,3.465 43.9475,-12.3625 73.56125,-8.4275 73.56125,-8.4275"
|
||||
style="fill:#b3bbe5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.16928"
|
||||
id="path2578" /><path
|
||||
d="m -743.76143,-58.555585 c -30.035,10.71625 -50.45125,25.19 -50.45125,25.19 17.4525,-9.72125 34.0525,-16.78 49.275,-21.88875 0.0937,-0.26625 0.1875,-0.525 0.27875,-0.78375 0.30375,-0.8525 0.605,-1.69 0.8975,-2.5175"
|
||||
style="fill:#b3bbe5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.16928"
|
||||
id="path2580" /><path
|
||||
d="m -736.28768,-35.186835 c -3.52625,-3.52625 1.15,-15.425 2.64125,-19.53 0.28875,-0.79125 0.8325,-2.3725 1.545,-4.50375 0.35,-1.035 0.73625,-2.19625 1.16,-3.465 2.02625,-6.09125 4.805,-14.565 7.3975,-22.51875 2.64125,-8.74 0.1375,-12.23875 -5.25625,-12.23875 -3.81875,1.17625 -9.83875,2.34875 -9.83875,2.34875 0,0 6.9,0.1475 4.11,8.95625 -1.705,5.39375 -4.7375,14.9 -9.2325,27.5825 -0.2925,0.8275 -0.59375,1.665 -0.8975,2.5175 -0.0912,0.25875 -0.185,0.5175 -0.27875,0.78375 -3.34625,9.51125 -6.77125,22.40375 2.4975,26.03 6.75375,2.64375 17.46,-3.76 23.32875,-11.245 -8.80625,6.01625 -13.6525,8.80875 -17.17625,5.2825"
|
||||
style="fill:#35af3f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.16928"
|
||||
id="path2582" /></g><g
|
||||
id="g2056"
|
||||
transform="translate(-18.759485,-28.372554)"><g
|
||||
id="g1248"
|
||||
transform="translate(-3.4089682,16.030063)"><rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
|
||||
id="rect1446"
|
||||
width="6.6498156"
|
||||
height="6.4167376"
|
||||
x="50.830681"
|
||||
y="75.350082"
|
||||
ry="1.3043859" /><path
|
||||
style="fill:#03b7ea;fill-opacity:1;stroke:#000000;stroke-width:0.465;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 53.653937,84.776494 -0.02333,-7.326466 5.78651,5.249857 -3.803231,-0.863312 z"
|
||||
id="path633" /></g></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 16 KiB |
202
resources/voir.svg
Normal file
202
resources/voir.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 27 KiB |
BIN
resources/voirtouteslescolonnes.png
Normal file
BIN
resources/voirtouteslescolonnes.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
@ -141,6 +141,8 @@ public class importInscriptionXLS {
|
||||
nFormation.setAttribut("ToutesLesColonnes", "true");
|
||||
nFormation.setAttribut("Colonne_Stage1", "true");
|
||||
nFormation.setAttribut("Colonne_Stage2", "true");
|
||||
nFormation.setAttribut("nomColonne_Option", "Option");
|
||||
nFormation.setAttribut("Enabled_Colonne_Option", "true");
|
||||
nYear.addChild(nFormation);
|
||||
}
|
||||
|
||||
@ -183,7 +185,7 @@ public class importInscriptionXLS {
|
||||
if(nStudent.getAttributes("LV1")==null) nStudent.setAttribut("LV1","");
|
||||
if(nStudent.getAttributes("LV2")==null) nStudent.setAttribut("LV2","");
|
||||
if(nStudent.getAttributes("UE_Libre")==null) nStudent.setAttribut("UE_Libre","");
|
||||
if(nStudent.getAttributes("Option")==null) nStudent.setAttribut("Option","");
|
||||
if(nStudent.getAttributes(commandes.nomColonne_Option)==null) nStudent.setAttribut(commandes.nomColonne_Option,"");
|
||||
if(nStudent.getAttributes("Stage_1")==null) nStudent.setAttribut("Stage_1","");
|
||||
if(nStudent.getAttributes("Num_convention_1")==null) nStudent.setAttribut("Num_convention_1","");
|
||||
if(nStudent.getAttributes("Periode_1")==null) nStudent.setAttribut("Periode_1","");
|
||||
@ -203,6 +205,13 @@ public class importInscriptionXLS {
|
||||
JOptionPane.showInternalMessageDialog(null, e.toString());
|
||||
}
|
||||
|
||||
|
||||
//trie les noeuds enfants des formation par ordre alphabétique des noms des étudiants.
|
||||
for(noeud nFormation : commandes.nBase.getFirstChild().getChildren()) {
|
||||
nFormation.triAlphabetiqueDesEnfants(commandes.nomColonneNomEtudiant);
|
||||
}
|
||||
|
||||
|
||||
sauvegardeXMLBase.save(commandes.nBase,sauvegardeXMLBase.saveType.SANS_MESSAGE,"");
|
||||
|
||||
if(compteurInscription>1) JOptionPane.showMessageDialog(null, "<html>Les importations ou les mises à jour<br>des " + String.valueOf(compteurInscription) +" étudiants sont réussies.</html>");
|
||||
|
||||
@ -4,6 +4,7 @@ import javax.swing.JOptionPane;
|
||||
|
||||
import base.sauvegardeXMLBase;
|
||||
import base.sauvegardeXMLBase.saveType;
|
||||
import outils.commandes;
|
||||
import outils.noeud;
|
||||
import outils.supprimeCaracatresSpeciaux;
|
||||
|
||||
@ -108,7 +109,7 @@ public class majBaseWithCSV {
|
||||
n.setAttribut("LV1","");
|
||||
n.setAttribut("LV2","");
|
||||
n.setAttribut("UE_Libre","");
|
||||
n.setAttribut("Option","");
|
||||
n.setAttribut(commandes.nomColonne_Option,"");
|
||||
n.setAttribut("Stage_1","");
|
||||
n.setAttribut("Num_convention_1","");
|
||||
n.setAttribut("Periode_1","");
|
||||
|
||||
@ -30,7 +30,7 @@ import Inscriptions.importInscriptionCSV;
|
||||
import Inscriptions.importInscriptionXLS;
|
||||
import base.CreateUpdateZipArchive;
|
||||
import base.Hash;
|
||||
import base.correspondanceNomDeColonneInscription;
|
||||
import base.NomDeColonneInscriptionTable;
|
||||
import base.recupeBases;
|
||||
import base.sauvegardeXMLBase;
|
||||
import exportations.exportBaseToExcel;
|
||||
@ -49,10 +49,10 @@ public class Window_demarre extends JFrame {
|
||||
JButton btnExporterTouteLaBase;
|
||||
JButton actImporterInscriptionDepuisCSV;
|
||||
|
||||
JButton btnAideImportationInscriptionXLSX = new JButton("Aide à l'importation des inscriptions depuis Ms Excel");
|
||||
JButton btnAideImportationInscriptionXLSX = new JButton("Aide à l'importation des inscriptions");
|
||||
JButton btnHelpDownload = new JButton("Aide au téléchargement et à l'installation");
|
||||
JButton btnNewVersion = new JButton("<html>Nouvelle version disponible</html>");
|
||||
JButton btnNAideMiseAJour = new JButton("Aide à la mise en jour depuis classeur Ms Excel");
|
||||
JButton btnNAideMiseAJour = new JButton("Aide à la mise en jour");
|
||||
JButton btnMiseAJourDepuisClasseur = new JButton("<html>Mise à jour de la base depuis<br>un classeur Ms Excel</html>");
|
||||
JButton btnGestionnaire = new JButton("");
|
||||
JButton btnimporterDesInscriptionsdepuisClasseur = new JButton("<html>Importer des inscriptions<br>depuis un classeur Ms Excel</html>");
|
||||
@ -79,7 +79,7 @@ public class Window_demarre extends JFrame {
|
||||
commandes.nBase=recupeBases.recupeLaBase();
|
||||
|
||||
// Chargement des noms des colonnes qui ont servi pendant l'inscription des étudiant
|
||||
correspondanceNomDeColonneInscription.chargement();
|
||||
NomDeColonneInscriptionTable.chargement();
|
||||
|
||||
// Mise à jour de la version
|
||||
VersionChecker.UpdateVersion(commandes.nBase);
|
||||
@ -113,8 +113,8 @@ public class Window_demarre extends JFrame {
|
||||
}
|
||||
};
|
||||
|
||||
// Planification de la tâche de sauvegarde automatique à exécuter toutes les 10 minutes 10 * 60 * 1000
|
||||
timer.schedule(autoSaveTask, 0, 600000);
|
||||
// Planification de la tâche de sauvegarde automatique à exécuter toutes les 5 minutes 10 * 60 * 1000
|
||||
timer.schedule(autoSaveTask, 0, 300000);
|
||||
|
||||
|
||||
if(!commandes.messageAlerte.isEmpty()) {
|
||||
@ -142,7 +142,8 @@ public class Window_demarre extends JFrame {
|
||||
frmEvalwriter.setTitle("Gestion des inscriptions et des groupes - langues - informatique - stage - rentrée");
|
||||
|
||||
|
||||
frmEvalwriter.setBounds(100, 100, 789, 636);
|
||||
//frmEvalwriter.setBounds(100, 100, 789, 640);
|
||||
frmEvalwriter.setBounds(100, 100, 765, 641);
|
||||
|
||||
//Affiche le bouton "Nouvelle version dispoinible".
|
||||
if(commandes.newVersion) frmEvalwriter.setBounds(100, 100, 789, 745);
|
||||
@ -161,7 +162,7 @@ public class Window_demarre extends JFrame {
|
||||
btnExporterTouteLaBase = new JButton("<html>Exporter toute la base dans<br>un classeur MS Excel</html>");
|
||||
btnExporterTouteLaBase.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/exportbasetoexcel.png")));
|
||||
btnExporterTouteLaBase.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnExporterTouteLaBase.setBounds(10, 432, 377, 60);
|
||||
btnExporterTouteLaBase.setBounds(10, 530, 360, 60);
|
||||
|
||||
frmEvalwriter.getContentPane().add(btnExporterTouteLaBase);
|
||||
|
||||
@ -178,26 +179,26 @@ public class Window_demarre extends JFrame {
|
||||
if(commandes.helpme1) lblTitre.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/helpme1.png")));
|
||||
lblTitre.setHorizontalAlignment(SwingConstants.CENTER);
|
||||
lblTitre.setFont(new Font("Pacifico", Font.PLAIN, 26));
|
||||
lblTitre.setBounds(10, 35, 753, 202);
|
||||
lblTitre.setBounds(10, 35, 700, 202);
|
||||
frmEvalwriter.getContentPane().add(lblTitre);
|
||||
btnMiseAJourDepuisClasseur.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/majInscriptionToBase.png")));
|
||||
btnMiseAJourDepuisClasseur.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnMiseAJourDepuisClasseur.setBounds(10, 501, 377, 60);
|
||||
btnMiseAJourDepuisClasseur.setBounds(10, 460, 360, 60);
|
||||
frmEvalwriter.getContentPane().add(btnMiseAJourDepuisClasseur);
|
||||
|
||||
|
||||
btnGestionnaire.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/gestionnaire_bouton.png")));
|
||||
btnGestionnaire.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnGestionnaire.setBounds(397, 432, 366, 159);
|
||||
btnGestionnaire.setBounds(380, 390, 360, 201);
|
||||
frmEvalwriter.getContentPane().add(btnGestionnaire);
|
||||
btnimporterDesInscriptionsdepuisClasseur.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/bouton_inscription_excel.png")));
|
||||
btnimporterDesInscriptionsdepuisClasseur.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnimporterDesInscriptionsdepuisClasseur.setBounds(10, 328, 377, 60);
|
||||
btnimporterDesInscriptionsdepuisClasseur.setBounds(10, 320, 360, 60);
|
||||
frmEvalwriter.getContentPane().add(btnimporterDesInscriptionsdepuisClasseur);
|
||||
|
||||
btnNAideMiseAJour.setForeground(Color.GRAY);
|
||||
btnNAideMiseAJour.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
btnNAideMiseAJour.setBounds(10, 561, 377, 30);
|
||||
btnNAideMiseAJour.setBounds(772, 400, 345, 30);
|
||||
frmEvalwriter.getContentPane().add(btnNAideMiseAJour);
|
||||
|
||||
|
||||
@ -210,7 +211,7 @@ public class Window_demarre extends JFrame {
|
||||
|
||||
|
||||
lblFondImage.setVerticalAlignment(SwingConstants.BOTTOM);
|
||||
lblFondImage.setBounds(10, 0, 753, 317);
|
||||
lblFondImage.setBounds(10, 0, 730, 317);
|
||||
frmEvalwriter.getContentPane().add(lblFondImage);
|
||||
|
||||
affichageImageDeFond();
|
||||
@ -226,9 +227,8 @@ public class Window_demarre extends JFrame {
|
||||
btnHelpDownload.setBounds(10, 665, 753, 30);
|
||||
frmEvalwriter.getContentPane().add(btnHelpDownload);
|
||||
|
||||
|
||||
btnAideImportationInscriptionXLSX.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
btnAideImportationInscriptionXLSX.setBounds(10, 391, 753, 30);
|
||||
btnAideImportationInscriptionXLSX.setBounds(762, 359, 345, 30);
|
||||
frmEvalwriter.getContentPane().add(btnAideImportationInscriptionXLSX);
|
||||
btnAideImportationInscriptionXLSX.setForeground(Color.GRAY);
|
||||
|
||||
@ -238,16 +238,26 @@ public class Window_demarre extends JFrame {
|
||||
frmEvalwriter.getContentPane().add(btnAideImportationInscriptionCSV);
|
||||
btnAideImportationInscriptionCSV.setForeground(Color.GRAY);
|
||||
|
||||
JButton btnNewButton = new JButton("<html>Paramètres des importations<br>des inscriptions</html>");
|
||||
btnNewButton.addActionListener(new ActionListener() {
|
||||
JButton btnParametresClasseurInscription = new JButton("<html>Paramètres classeur<br>des inscriptions</html>");
|
||||
btnParametresClasseurInscription.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Window_parametreImportationInscription.Affiche();
|
||||
}
|
||||
});
|
||||
btnNewButton.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnNewButton.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/parametreImportationIncriptions.png")));
|
||||
btnNewButton.setBounds(397, 328, 366, 60);
|
||||
frmEvalwriter.getContentPane().add(btnNewButton);
|
||||
btnParametresClasseurInscription.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnParametresClasseurInscription.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/parametreImportationIncriptions.png")));
|
||||
btnParametresClasseurInscription.setBounds(10, 390, 360, 60);
|
||||
frmEvalwriter.getContentPane().add(btnParametresClasseurInscription);
|
||||
|
||||
JButton btnRenommerActiverColonne = new JButton("<html>Renommer et activer<br>des colonnes</html>");
|
||||
btnRenommerActiverColonne.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnRenommerActiverColonne.setBounds(380, 320, 360, 60);
|
||||
btnRenommerActiverColonne.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
renommerColonne.Affiche();
|
||||
}
|
||||
});
|
||||
frmEvalwriter.getContentPane().add(btnRenommerActiverColonne);
|
||||
|
||||
|
||||
|
||||
@ -308,7 +318,7 @@ public class Window_demarre extends JFrame {
|
||||
File f = FileChooserXLSX.retourneFileXLSX();
|
||||
if(f!=null) {
|
||||
// chargement des noms des colonne pour incription
|
||||
correspondanceNomDeColonneInscription.chargement();
|
||||
NomDeColonneInscriptionTable.chargement();
|
||||
|
||||
// Importation des inscription
|
||||
importInscriptionXLS.importe(f);
|
||||
@ -407,7 +417,7 @@ public class Window_demarre extends JFrame {
|
||||
*/
|
||||
private static void affichageImageDeFond() {
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(27) + 1;
|
||||
int randomNumber = random.nextInt(33) + 1;
|
||||
ImageIcon imageIcon = new ImageIcon(Window_demarre.class.getResource("/resources/Sans titre_"+ String.valueOf(randomNumber) +".jpg"));
|
||||
Image image = imageIcon.getImage();
|
||||
|
||||
@ -419,11 +429,12 @@ public class Window_demarre extends JFrame {
|
||||
Image resizedImage = image.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH);
|
||||
|
||||
|
||||
if(randomNumber==3 || randomNumber==4 || randomNumber==7
|
||||
if(randomNumber==7
|
||||
|| randomNumber==10 || randomNumber==11 || randomNumber==12
|
||||
|| randomNumber==14 || randomNumber==15 || randomNumber==18
|
||||
|| randomNumber==21 || randomNumber==22 || randomNumber==23
|
||||
|| randomNumber==25 || randomNumber==27) {
|
||||
|| randomNumber==14 || randomNumber==18 || randomNumber==21
|
||||
|| randomNumber==22 || randomNumber==23 || randomNumber==25
|
||||
|| randomNumber==27 || randomNumber==28
|
||||
) {
|
||||
lblAuteurVersion.setForeground(new Color(0, 0, 0));
|
||||
}else {
|
||||
lblAuteurVersion.setForeground(new Color(255, 255, 255));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,7 @@ import javax.swing.JTextField;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
|
||||
import base.correspondanceNomDeColonneInscription;
|
||||
import base.NomDeColonneInscriptionTable;
|
||||
import outils.commandes;
|
||||
|
||||
/**
|
||||
@ -63,7 +63,7 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
public void run() {
|
||||
try {
|
||||
// récupération des noms des colonnes et de la feuille.
|
||||
correspondanceNomDeColonneInscription.chargement();
|
||||
NomDeColonneInscriptionTable.chargement();
|
||||
// chargemente te affichage de la fenêtre.
|
||||
Window_parametreImportationInscription frame = new Window_parametreImportationInscription();
|
||||
frame.setVisible(true);
|
||||
@ -225,7 +225,7 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
txtNomColonneExcel_MailPersoEtudiant.setBounds(905, 661, 244, 34);
|
||||
contentPane.add(txtNomColonneExcel_MailPersoEtudiant);
|
||||
|
||||
lblleNomColonneExcel_MailPersoEtudiant_1 = new JLabel("<html>Le nom de la colonne : mail université<br>de l'étudiant</html>");
|
||||
lblleNomColonneExcel_MailPersoEtudiant_1 = new JLabel("<html>Le nom de la colonne : mail institutionnel<br>de l'étudiant</html>");
|
||||
lblleNomColonneExcel_MailPersoEtudiant_1.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblleNomColonneExcel_MailPersoEtudiant_1.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblleNomColonneExcel_MailPersoEtudiant_1.setBounds(606, 705, 307, 34);
|
||||
@ -253,9 +253,11 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
nomColonnesFeuille.put("Excel_Individu_-_Email", txtNomColonneExcel_MailUnivEtudiant.getText());
|
||||
nomColonnesFeuille.put("Excel_Feuille_Inscription", txtNomFeuille.getText());
|
||||
|
||||
correspondanceNomDeColonneInscription.modifierLesNoms(nomColonnesFeuille);
|
||||
if(!NomDeColonneInscriptionTable.colitionNomDesColonnes(nomColonnesFeuille)) {
|
||||
NomDeColonneInscriptionTable.modifierLesNoms(nomColonnesFeuille);
|
||||
dispose();
|
||||
}
|
||||
|
||||
dispose();
|
||||
}
|
||||
});
|
||||
btnEnregistrer.setFont(new Font("Tahoma", Font.BOLD, 18));
|
||||
@ -263,7 +265,7 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
contentPane.add(btnEnregistrer);
|
||||
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(27) + 1;
|
||||
int randomNumber = random.nextInt(33) + 1;
|
||||
ImageIcon imageIcon = new ImageIcon(Window_demarre.class.getResource("/resources/Sans titre_"+ String.valueOf(randomNumber) +".jpg"));
|
||||
Image image = imageIcon.getImage();
|
||||
|
||||
@ -279,11 +281,12 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
lblAuteurVersion.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblAuteurVersion.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblAuteurVersion.setBounds(20, 11, 325, 53);
|
||||
if(randomNumber==3 || randomNumber==4 || randomNumber==7
|
||||
if(randomNumber==7
|
||||
|| randomNumber==10 || randomNumber==11 || randomNumber==12
|
||||
|| randomNumber==14 || randomNumber==15 || randomNumber==18
|
||||
|| randomNumber==21 || randomNumber==22 || randomNumber==23
|
||||
|| randomNumber==25 || randomNumber==27) {
|
||||
|| randomNumber==14 || randomNumber==18 || randomNumber==21
|
||||
|| randomNumber==22 || randomNumber==23 || randomNumber==25
|
||||
|| randomNumber==27 || randomNumber==28
|
||||
) {
|
||||
lblAuteurVersion.setForeground(new Color(0, 0, 0));
|
||||
}else {
|
||||
lblAuteurVersion.setForeground(new Color(255, 255, 255));
|
||||
@ -298,7 +301,7 @@ public class Window_parametreImportationInscription extends JFrame {
|
||||
JButton btnValeurParDfaut = new JButton("Valeur par défaut");
|
||||
btnValeurParDfaut.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
correspondanceNomDeColonneInscription.chargementParDefaut();
|
||||
NomDeColonneInscriptionTable.chargementParDefaut();
|
||||
txtNomColonneExcel_Formation.setText(commandes.nomColonneExcel_Formation);
|
||||
txtNomColonneExcel_NomEtudiant.setText(commandes.nomColonneExcel_NomEtudiant);
|
||||
txtNomColonneExcel_PrenomEtudiant.setText(commandes.nomColonneExcel_PrenomEtudiant);
|
||||
|
||||
278
src/Windows/renommerColonne.java
Normal file
278
src/Windows/renommerColonne.java
Normal file
@ -0,0 +1,278 @@
|
||||
package Windows;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.EventQueue;
|
||||
import java.awt.Font;
|
||||
import java.awt.Image;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.util.HashMap;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
|
||||
import base.NomDeColonneInscriptionTable;
|
||||
import outils.commandes;
|
||||
import javax.swing.JCheckBox;
|
||||
|
||||
/**
|
||||
* Fenêtre permettant de changer les paramètres (nom de la feuille, noms des colonnes).
|
||||
* Pour importer les inscriptions depuis un classeur Ms Excel.
|
||||
* @author pabr6
|
||||
*
|
||||
*/
|
||||
public class renommerColonne extends JFrame {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
private JPanel contentPane;
|
||||
private JTextField txtNomOption;
|
||||
private JTextField txtNomInformation;
|
||||
private JTextField txtNomAtelierRentreeHoraire;
|
||||
private JLabel lblAtelierPreRentreeEnseignant;
|
||||
private JTextField txtNomAtelierPreRentreeEnseignant;
|
||||
private JLabel lblAtelierPreRentreeSalle;
|
||||
private JTextField txtNomAtelierPreRentreeSalle;
|
||||
private JButton btnEnregistrer;
|
||||
private JLabel lblImage;
|
||||
private JLabel lblAuteurVersion;
|
||||
private JCheckBox chckbxOption = new JCheckBox("activé");
|
||||
|
||||
/**
|
||||
* Lancement de l'affichage de la fenêtre.
|
||||
*/
|
||||
public static void Affiche() {
|
||||
EventQueue.invokeLater(new Runnable() {
|
||||
public void run() {
|
||||
try {
|
||||
// récupération des noms des colonnes et de la feuille.
|
||||
NomDeColonneInscriptionTable.chargement();
|
||||
// chargemente te affichage de la fenêtre.
|
||||
renommerColonne frame = new renommerColonne();
|
||||
frame.setVisible(true);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Crréation de la fenêtre.
|
||||
*/
|
||||
public renommerColonne() {
|
||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
contentPane = new JPanel();
|
||||
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
|
||||
|
||||
setContentPane(contentPane);
|
||||
|
||||
setTitle("Gestion des inscriptions et des groupes - langues - informatique - stage - rentrée");
|
||||
setBounds(0, 0, 1200, 860);
|
||||
|
||||
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(Window_demarre.class.getResource("/resources/logo.png"));
|
||||
setIconImage(img.getImage());
|
||||
|
||||
setResizable(false);
|
||||
|
||||
|
||||
setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
||||
getContentPane().setLayout(null);
|
||||
|
||||
JLabel lblOption = new JLabel("<html>Renommer la colonne :<br>\r\nOption</html>");
|
||||
lblOption.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblOption.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblOption.setBounds(10, 369, 264, 34);
|
||||
contentPane.add(lblOption);
|
||||
|
||||
txtNomOption = new JTextField();
|
||||
txtNomOption.setText(commandes.nomColonne_Option);
|
||||
txtNomOption.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
txtNomOption.setBounds(251, 369, 244, 34);
|
||||
contentPane.add(txtNomOption);
|
||||
txtNomOption.setColumns(32);
|
||||
|
||||
JLabel lblInformation = new JLabel("<html>Renommer la colonne :<br>Information</html>");
|
||||
lblInformation.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblInformation.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblInformation.setBounds(10, 414, 264, 34);
|
||||
contentPane.add(lblInformation);
|
||||
|
||||
txtNomInformation = new JTextField();
|
||||
txtNomInformation.setText("");
|
||||
txtNomInformation.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
txtNomInformation.setColumns(32);
|
||||
txtNomInformation.setBounds(251, 414, 244, 34);
|
||||
contentPane.add(txtNomInformation);
|
||||
|
||||
JLabel lblNewLabel = new JLabel("<html><p>Les colonnes ci-dessous peuvent être renommées. Elles seront renommées dans toutes les formations de la base.<br>Vous pouvez les désactivées. Si elles sont désactivé, alors elles ne s'afficheront pas dans le gestionnaire et elles ne seront pas importées.</p>");
|
||||
lblNewLabel.setForeground(Color.BLUE);
|
||||
lblNewLabel.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblNewLabel.setVerticalAlignment(SwingConstants.TOP);
|
||||
lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblNewLabel.setBounds(10, 319, 1164, 45);
|
||||
contentPane.add(lblNewLabel);
|
||||
|
||||
JLabel lblAtelierRentreeHoraire = new JLabel("<html>Le nom de la colonne :<br>Atelier-rentree_horaire</html>");
|
||||
lblAtelierRentreeHoraire.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblAtelierRentreeHoraire.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblAtelierRentreeHoraire.setBounds(10, 459, 264, 34);
|
||||
contentPane.add(lblAtelierRentreeHoraire);
|
||||
|
||||
txtNomAtelierRentreeHoraire = new JTextField();
|
||||
txtNomAtelierRentreeHoraire.setText("");
|
||||
txtNomAtelierRentreeHoraire.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
txtNomAtelierRentreeHoraire.setColumns(32);
|
||||
txtNomAtelierRentreeHoraire.setBounds(251, 458, 244, 34);
|
||||
contentPane.add(txtNomAtelierRentreeHoraire);
|
||||
|
||||
lblAtelierPreRentreeEnseignant = new JLabel("<html>Le nom de la colonne : <br>\r\nAtelier_pre-rentree_enseignant</html>");
|
||||
lblAtelierPreRentreeEnseignant.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblAtelierPreRentreeEnseignant.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblAtelierPreRentreeEnseignant.setBounds(10, 504, 264, 34);
|
||||
contentPane.add(lblAtelierPreRentreeEnseignant);
|
||||
|
||||
txtNomAtelierPreRentreeEnseignant = new JTextField();
|
||||
txtNomAtelierPreRentreeEnseignant.setText("");
|
||||
txtNomAtelierPreRentreeEnseignant.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
txtNomAtelierPreRentreeEnseignant.setColumns(32);
|
||||
txtNomAtelierPreRentreeEnseignant.setBounds(251, 503, 244, 34);
|
||||
contentPane.add(txtNomAtelierPreRentreeEnseignant);
|
||||
|
||||
lblAtelierPreRentreeSalle = new JLabel("<html>Le nom de la colonne :<br>\r\nAtelier_pre-rentree_salle</html>");
|
||||
lblAtelierPreRentreeSalle.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblAtelierPreRentreeSalle.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblAtelierPreRentreeSalle.setBounds(10, 549, 264, 34);
|
||||
contentPane.add(lblAtelierPreRentreeSalle);
|
||||
|
||||
txtNomAtelierPreRentreeSalle = new JTextField();
|
||||
txtNomAtelierPreRentreeSalle.setText(commandes.nomColonneExcel_CodeEtudiant);
|
||||
txtNomAtelierPreRentreeSalle.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
txtNomAtelierPreRentreeSalle.setColumns(32);
|
||||
txtNomAtelierPreRentreeSalle.setBounds(251, 549, 244, 34);
|
||||
contentPane.add(txtNomAtelierPreRentreeSalle);
|
||||
|
||||
btnEnregistrer = new JButton("Enregistrer");
|
||||
btnEnregistrer.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
HashMap<String, String> nomColonnesFeuille = new HashMap<String,String>();
|
||||
|
||||
// NomDeColonneInscriptionTable.chargement();
|
||||
|
||||
// nomColonnesFeuille.put("Information", txtNomInformation.getText());
|
||||
// nomColonnesFeuille.put("Atelier-rentree_horaire", txtNomAtelierRentreeHoraire.getText());
|
||||
// nomColonnesFeuille.put("Atelier_pre-rentree_enseignant", txtNomAtelierPreRentreeEnseignant.getText());
|
||||
// nomColonnesFeuille.put("Atelier_pre-rentree_salle", txtNomAtelierPreRentreeSalle.getText());
|
||||
nomColonnesFeuille.put("nomColonne_Option", txtNomOption.getText());
|
||||
|
||||
if(chckbxOption.isSelected()) {
|
||||
nomColonnesFeuille.put("Enabled_Colonne_Option", "true");
|
||||
}else {
|
||||
nomColonnesFeuille.put("Enabled_Colonne_Option", "false");
|
||||
}
|
||||
|
||||
if(!NomDeColonneInscriptionTable.colitionNomDesColonnes(nomColonnesFeuille)) {
|
||||
NomDeColonneInscriptionTable.modifierLesNoms(nomColonnesFeuille);
|
||||
dispose();
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
btnEnregistrer.setFont(new Font("Tahoma", Font.BOLD, 18));
|
||||
btnEnregistrer.setBounds(20, 750, 555, 61);
|
||||
contentPane.add(btnEnregistrer);
|
||||
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(33) + 1;
|
||||
ImageIcon imageIcon = new ImageIcon(Window_demarre.class.getResource("/resources/Sans titre_"+ String.valueOf(randomNumber) +".jpg"));
|
||||
Image image = imageIcon.getImage();
|
||||
|
||||
// Détermination de la taille souhaitée pour l'image
|
||||
int newWidth = getWidth();
|
||||
int newHeight = getHeight()-290;
|
||||
|
||||
// Redimensionnement de l'image pour qu'elle s'adapte à la taille souhaitée
|
||||
Image resizedImage = image.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH);
|
||||
|
||||
// label Auteur
|
||||
lblAuteurVersion = new JLabel("<html>Pablo Rodriguez - 2023<br>Version " + commandes.version +"</html>");
|
||||
lblAuteurVersion.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblAuteurVersion.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
lblAuteurVersion.setBounds(20, 11, 325, 53);
|
||||
if(randomNumber==7
|
||||
|| randomNumber==10 || randomNumber==11 || randomNumber==12
|
||||
|| randomNumber==14 || randomNumber==18 || randomNumber==21
|
||||
|| randomNumber==22 || randomNumber==23 || randomNumber==25
|
||||
|| randomNumber==27 || randomNumber==28
|
||||
) {
|
||||
lblAuteurVersion.setForeground(new Color(0, 0, 0));
|
||||
}else {
|
||||
lblAuteurVersion.setForeground(new Color(255, 255, 255));
|
||||
}
|
||||
contentPane.add(lblAuteurVersion);
|
||||
|
||||
lblImage = new JLabel("");
|
||||
lblImage.setIcon(new ImageIcon(resizedImage));
|
||||
lblImage.setBounds(10, 11, 1164, 297);
|
||||
contentPane.add(lblImage);
|
||||
|
||||
JButton btnValeurParDfaut = new JButton("Valeur par défaut");
|
||||
btnValeurParDfaut.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
NomDeColonneInscriptionTable.chargementParDefaut();
|
||||
txtNomInformation.setText("");
|
||||
txtNomAtelierRentreeHoraire.setText("");
|
||||
txtNomAtelierPreRentreeEnseignant.setText("");
|
||||
txtNomAtelierPreRentreeSalle.setText("");
|
||||
|
||||
txtNomOption.setText(commandes.nomColonne_Option);
|
||||
chckbxOption.setSelected(commandes.enabled_Colonne_Option);
|
||||
}
|
||||
});
|
||||
|
||||
btnValeurParDfaut.setFont(new Font("Tahoma", Font.BOLD, 18));
|
||||
btnValeurParDfaut.setBounds(605, 750, 544, 61);
|
||||
contentPane.add(btnValeurParDfaut);
|
||||
|
||||
chckbxOption.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
chckbxOption.setBounds(501, 367, 82, 23);
|
||||
chckbxOption.setSelected(commandes.enabled_Colonne_Option);
|
||||
contentPane.add(chckbxOption);
|
||||
|
||||
JCheckBox chckbxInformation = new JCheckBox("activé");
|
||||
chckbxInformation.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
chckbxInformation.setBounds(501, 413, 82, 23);
|
||||
contentPane.add(chckbxInformation);
|
||||
|
||||
JCheckBox chckbxAtelierRentreeHoraire = new JCheckBox("activé");
|
||||
chckbxAtelierRentreeHoraire.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
chckbxAtelierRentreeHoraire.setBounds(501, 458, 82, 23);
|
||||
contentPane.add(chckbxAtelierRentreeHoraire);
|
||||
|
||||
JCheckBox chckbxAtelierPreRentreeEnseignant = new JCheckBox("activé");
|
||||
chckbxAtelierPreRentreeEnseignant.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
chckbxAtelierPreRentreeEnseignant.setBounds(501, 503, 82, 23);
|
||||
contentPane.add(chckbxAtelierPreRentreeEnseignant);
|
||||
|
||||
JCheckBox chckbxAtelierPreRentreeESalle = new JCheckBox("activé");
|
||||
chckbxAtelierPreRentreeESalle.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
chckbxAtelierPreRentreeESalle.setBounds(501, 548, 82, 23);
|
||||
contentPane.add(chckbxAtelierPreRentreeESalle);
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -13,12 +13,11 @@ import javax.swing.KeyStroke;
|
||||
import Windows.Window_gestionnaire;
|
||||
import exportations.exportBaseToExcel;
|
||||
import exportations.exportBaseToExcel.exportType;
|
||||
import outils.noeud;
|
||||
|
||||
|
||||
|
||||
public class exportTable extends AbstractAction{
|
||||
private noeud nTable = null;
|
||||
// private noeud nTable = null;
|
||||
private Window_gestionnaire instance;
|
||||
|
||||
public exportTable(Window_gestionnaire instance) {
|
||||
@ -27,7 +26,7 @@ public class exportTable extends AbstractAction{
|
||||
putValue( Action.NAME, "Exporter la table Ms Excel" );
|
||||
putValue( Action.SMALL_ICON, new ImageIcon(Window_gestionnaire.class.getResource("/resources/exportTableToExcel.png")) );
|
||||
putValue( Action.LARGE_ICON_KEY, new ImageIcon(Window_gestionnaire.class.getResource("/resources/exportTableToExcel.png")) );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Exporter la table dans un classeur Ms Excel." );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Exporter la table en tenant compte des filtres." );
|
||||
putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_DOWN_MASK));
|
||||
|
||||
}
|
||||
@ -40,10 +39,10 @@ public class exportTable extends AbstractAction{
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
// TODO Auto-generated method stub
|
||||
// instance.majTable();
|
||||
this.nTable = instance.nTable;
|
||||
System.out.println(nTable.toWrite());
|
||||
if(nTable!=null) {
|
||||
exportBaseToExcel.exportTable(nTable, exportType.TABLE);
|
||||
// this.nTable = instance.nTable;
|
||||
System.out.println(instance.nTable.toWrite());
|
||||
if(instance.nTable!=null) {
|
||||
exportBaseToExcel.exportTable(instance.nTable, exportType.TABLE);
|
||||
}else {
|
||||
JOptionPane.showMessageDialog(null, "Erreur, la table est null","erreur", JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ public class CreateUpdateZipArchive {
|
||||
int numFilesInArchive = countFilesInArchive(archiveFilePath);
|
||||
|
||||
// Si l'archive contient déjà 5 fichiers, supprimer le plus ancien
|
||||
if (numFilesInArchive >= 100) {
|
||||
if (numFilesInArchive >= 300) {
|
||||
removeOldestFileFromArchive(archiveFilePath);
|
||||
}
|
||||
|
||||
|
||||
359
src/base/NomDeColonneInscriptionTable.java
Normal file
359
src/base/NomDeColonneInscriptionTable.java
Normal file
@ -0,0 +1,359 @@
|
||||
package base;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import base.sauvegardeXMLBase.saveType;
|
||||
import outils.commandes;
|
||||
import outils.noeud;
|
||||
import outils.supprimeCaracatresSpeciaux;
|
||||
|
||||
/**
|
||||
* Classe permettant de charger, de modifier, de mettre à jour dans la base les noms des colonnes
|
||||
* du classeur fourni par l'administration.
|
||||
* @author pabr6
|
||||
*
|
||||
*/
|
||||
public class NomDeColonneInscriptionTable {
|
||||
|
||||
/**
|
||||
* Chargement des valeurs qui sont présentes dans la base.
|
||||
* Ceux sont les valeurs des différents attributs du noeus base.
|
||||
*/
|
||||
public static void chargement() {
|
||||
// Valeurs par défaut
|
||||
if(commandes.nBase!=null) {
|
||||
// Ces attributs sont les noms des colonnes présentant dans les noeud de la base.
|
||||
commandes.nomColonneFormation = commandes.nBase.getAttributes("Formation");
|
||||
commandes.nomColonneNomEtudiant = commandes.nBase.getAttributes("Individu_-_Nom");
|
||||
commandes.nomColonnePrenomEtudiant = commandes.nBase.getAttributes("Individu_-_Prenom");
|
||||
commandes.nomColonneCodeEtudiant = commandes.nBase.getAttributes("Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneProfilEtudiant = commandes.nBase.getAttributes("Profil_etudiant_lib.");
|
||||
commandes.nomColonneBacEtudiant = commandes.nBase.getAttributes("Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonnePortableEtudiant = commandes.nBase.getAttributes("Individu_-_Tel._portable");
|
||||
commandes.nomColonneMailPersoEtudiant = commandes.nBase.getAttributes("Individu_-_Email_personnel");
|
||||
commandes.nomColonneMailUnivEtudiant = commandes.nBase.getAttributes("Individu_-_Email");
|
||||
|
||||
// Ces attributs permettent l'inscription à partir du classeur Ms Excel fourni.
|
||||
// Les noms de ces colonnes sont enregistré dans les attributs qui commencent par Excel_...
|
||||
commandes.nomColonneExcel_Formation = commandes.nBase.getAttributes("Excel_Formation");
|
||||
commandes.nomColonneExcel_NomEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Nom");
|
||||
commandes.nomColonneExcel_PrenomEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Prenom");
|
||||
commandes.nomColonneExcel_CodeEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneExcel_ProfilEtudiant = commandes.nBase.getAttributes("Excel_Profil_etudiant_lib.");
|
||||
commandes.nomColonneExcel_BacEtudiant = commandes.nBase.getAttributes("Excel_Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonneExcel_PortableEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Tel._portable");
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Email_personnel");
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Email");
|
||||
|
||||
commandes.nomFeuilleExcel_Inscription = commandes.nBase.getAttributes("Excel_Feuille_Inscription");
|
||||
|
||||
// nom des colonnes modifiables
|
||||
commandes.nomColonne_Option = commandes.nBase.getAttributes("nomColonne_Option");
|
||||
commandes.enabled_Colonne_Option = Boolean.valueOf(commandes.nBase.getAttributes("Enabled_Colonne_Option"));
|
||||
|
||||
|
||||
|
||||
}else {
|
||||
chargementParDefaut();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Chargement des noms des colonnes dans le classeur des inscriptions.
|
||||
* Ce classeur est fourni par le service administratif DSI qui le transmet au secrétarait de chaque UFR.
|
||||
* Ce classeur doit contenir ces colonnes après traitement des caractères.
|
||||
*/
|
||||
public static void chargementParDefaut() {
|
||||
|
||||
// Les noms des colonnes par défaut (classeur Ms Excel fourni)
|
||||
commandes.nomColonneExcel_Formation = "IAE - Version d'étape (lib. web)";
|
||||
commandes.nomColonneExcel_NomEtudiant = "Individu - Nom";
|
||||
commandes.nomColonneExcel_PrenomEtudiant = "Individu - Prénom";
|
||||
commandes.nomColonneExcel_CodeEtudiant = "Individu - Code Etudiant";
|
||||
commandes.nomColonneExcel_ProfilEtudiant = "Profil étudiant (lib.)";
|
||||
commandes.nomColonneExcel_BacEtudiant = "Bac ou équivalence (lib.)";
|
||||
commandes.nomColonneExcel_PortableEtudiant = "Individu - Tél. portable";
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = "Individu - Email personnel";
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = "Individu - Email";
|
||||
|
||||
commandes.nomFeuilleExcel_Inscription = "Inscrits détail";
|
||||
|
||||
commandes.nomColonneFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_Formation);//"IAE_-_Version_detape_lib._web";
|
||||
commandes.nomColonneNomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_NomEtudiant);//"Individu_-_Nom";
|
||||
commandes.nomColonnePrenomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PrenomEtudiant);; //"Individu_-_Prenom";
|
||||
commandes.nomColonneCodeEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_CodeEtudiant);//"Individu_-_Code_Etudiant";
|
||||
commandes.nomColonneProfilEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_ProfilEtudiant); //"Profil_etudiant_lib.";
|
||||
commandes.nomColonneBacEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_BacEtudiant);//"Bac_ou_equivalence_lib.";
|
||||
commandes.nomColonnePortableEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PortableEtudiant);//"Individu_-_Tel._portable";
|
||||
commandes.nomColonneMailPersoEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailPersoEtudiant);//"Individu_-_Email_personnel";
|
||||
commandes.nomColonneMailUnivEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailUnivEtudiant);//"Individu_-_Email";
|
||||
|
||||
|
||||
commandes.nomColonne_Option = "Option";
|
||||
commandes.enabled_Colonne_Option = true;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Apporte les modification dans la base avec les nouveaux nons des colonnes ou de la feuille.
|
||||
* @param nomColonne
|
||||
*/
|
||||
public static void modifierLesNoms(HashMap<String, String> nomColonne) {
|
||||
|
||||
if(nomColonne.containsKey("Excel_Formation")) {
|
||||
commandes.nomColonneExcel_Formation = nomColonne.get("Excel_Formation");
|
||||
commandes.nomColonneFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_Formation);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Nom")) {
|
||||
commandes.nomColonneExcel_NomEtudiant = nomColonne.get("Excel_Individu_-_Nom");
|
||||
commandes.nomColonneNomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_NomEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Prenom")) {
|
||||
commandes.nomColonneExcel_PrenomEtudiant = nomColonne.get("Excel_Individu_-_Prenom");
|
||||
commandes.nomColonnePrenomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PrenomEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Code_Etudiant")) {
|
||||
commandes.nomColonneExcel_CodeEtudiant = nomColonne.get("Excel_Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneCodeEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_CodeEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Profil_etudiant_lib.")) {
|
||||
commandes.nomColonneExcel_ProfilEtudiant = nomColonne.get("Excel_Profil_etudiant_lib.");
|
||||
commandes.nomColonneProfilEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_ProfilEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Bac_ou_equivalence_lib.")) {
|
||||
commandes.nomColonneExcel_BacEtudiant = nomColonne.get("Excel_Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonneBacEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_BacEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Tel._portable")) {
|
||||
commandes.nomColonneExcel_PortableEtudiant = nomColonne.get("Excel_Individu_-_Tel._portable");
|
||||
commandes.nomColonnePortableEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PortableEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Email_personnel")) {
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = nomColonne.get("Excel_Individu_-_Email_personnel");
|
||||
commandes.nomColonneMailPersoEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailPersoEtudiant);
|
||||
}
|
||||
if(nomColonne.containsKey("Excel_Individu_-_Email")) {
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = nomColonne.get("Excel_Individu_-_Email");
|
||||
commandes.nomColonneMailUnivEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailUnivEtudiant);
|
||||
}
|
||||
|
||||
if(nomColonne.containsKey("Excel_Feuille_Inscription")) commandes.nomFeuilleExcel_Inscription = nomColonne.get("Excel_Feuille_Inscription");
|
||||
|
||||
if(nomColonne.containsKey("nomColonne_Option")) {
|
||||
commandes.nomColonne_Option = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("nomColonne_Option"));
|
||||
commandes.enabled_Colonne_Option =Boolean.valueOf(nomColonne.get("Enabled_Colonne_Option"));
|
||||
}
|
||||
|
||||
// Ecriture dans la base pour prendre en compte les nouvelles colonnes et feuille
|
||||
if(commandes.nBase!=null) {
|
||||
// Ecriture de la formation
|
||||
String oldNameFormation = commandes.nBase.getAttributes("Formation");
|
||||
commandes.nBase.setAttribut("Formation", commandes.nomColonneFormation);
|
||||
commandes.nBase.setAttribut("Excel_Formation", commandes.nomColonneExcel_Formation);
|
||||
// ecriture du nom de l'étudiant
|
||||
String oldNameNomEtudiant = commandes.nBase.getAttributes("Individu_-_Nom");
|
||||
commandes.nBase.setAttribut("Individu_-_Nom", commandes.nomColonneNomEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Nom", commandes.nomColonneExcel_NomEtudiant);
|
||||
// ecriture du prénom de l'étudiant
|
||||
String oldNamePrenomEtudiant = commandes.nBase.getAttributes("Individu_-_Prenom");
|
||||
commandes.nBase.setAttribut("Individu_-_Prenom", commandes.nomColonnePrenomEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Prenom", commandes.nomColonneExcel_PrenomEtudiant);
|
||||
// ecriture du code de l'étudiant
|
||||
String oldNameCodeEtudiant = commandes.nBase.getAttributes("Individu_-_Code_Etudiant");
|
||||
commandes.nBase.setAttribut("Individu_-_Code_Etudiant", commandes.nomColonneCodeEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Code_Etudiant", commandes.nomColonneExcel_CodeEtudiant);
|
||||
// ecriture du profil de l'étudiant
|
||||
String oldNameProfilEtudiant = commandes.nBase.getAttributes("Profil_etudiant_lib.");
|
||||
commandes.nBase.setAttribut("Profil_etudiant_lib.", commandes.nomColonneProfilEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Profil_etudiant_lib.", commandes.nomColonneExcel_ProfilEtudiant);
|
||||
// ecriture du bac de l'étudiant
|
||||
String oldNameBacEtudiant = commandes.nBase.getAttributes("Bac_ou_equivalence_lib.");
|
||||
commandes.nBase.setAttribut("Bac_ou_equivalence_lib.", commandes.nomColonneBacEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Bac_ou_equivalence_lib.", commandes.nomColonneExcel_BacEtudiant);
|
||||
// ecriture du portable de l'étudiant
|
||||
String oldNamePortableEtudiant = commandes.nBase.getAttributes("Individu_-_Tel._portable");
|
||||
commandes.nBase.setAttribut("Individu_-_Tel._portable", commandes.nomColonnePortableEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Tel._portable", commandes.nomColonneExcel_PortableEtudiant);
|
||||
// ecriture du mail personnel de l'étudiant
|
||||
String oldNameMailPersoEtudiant = commandes.nBase.getAttributes("Individu_-_Email_personnel");
|
||||
commandes.nBase.setAttribut("Individu_-_Email_personnel", commandes.nomColonneMailPersoEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Email_personnel", commandes.nomColonneExcel_MailPersoEtudiant);
|
||||
// ecriture du mail université de l'étudiant
|
||||
String oldNameMailUnivEtudiant = commandes.nBase.getAttributes("Individu_-_Email");
|
||||
commandes.nBase.setAttribut("Individu_-_Email", commandes.nomColonneMailUnivEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Email", commandes.nomColonneExcel_MailUnivEtudiant);
|
||||
// ecriture nom de la feuille
|
||||
commandes.nBase.setAttribut("Excel_Feuille_Inscription", commandes.nomFeuilleExcel_Inscription);
|
||||
// colonneOpetion
|
||||
String oldNameOption = commandes.nBase.getAttributes("nomColonne_Option");
|
||||
commandes.nBase.setAttribut("nomColonne_Option", commandes.nomColonne_Option);
|
||||
commandes.nBase.setAttribut("Enabled_Colonne_Option",String.valueOf(commandes.enabled_Colonne_Option));
|
||||
|
||||
|
||||
if( commandes.nBase.getFirstChild()!=null) {
|
||||
for(noeud formation : commandes.nBase.getFirstChild().getChildren()) {
|
||||
for(noeud nStudent : formation.getChildren()) {
|
||||
nStudent.changeAttributName(oldNameFormation, commandes.nomColonneFormation);
|
||||
nStudent.changeAttributName(oldNameNomEtudiant, commandes.nomColonneNomEtudiant);
|
||||
nStudent.changeAttributName(oldNamePrenomEtudiant, commandes.nomColonnePrenomEtudiant);
|
||||
nStudent.changeAttributName(oldNameCodeEtudiant, commandes.nomColonneCodeEtudiant);
|
||||
nStudent.changeAttributName(oldNameProfilEtudiant, commandes.nomColonneProfilEtudiant);
|
||||
nStudent.changeAttributName(oldNameBacEtudiant, commandes.nomColonneBacEtudiant);
|
||||
nStudent.changeAttributName(oldNamePortableEtudiant, commandes.nomColonnePortableEtudiant);
|
||||
nStudent.changeAttributName(oldNameMailPersoEtudiant, commandes.nomColonneMailPersoEtudiant);
|
||||
nStudent.changeAttributName(oldNameMailUnivEtudiant, commandes.nomColonneMailUnivEtudiant);
|
||||
nStudent.changeAttributName(oldNameOption, commandes.nomColonne_Option);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sauvegardeXMLBase.save(commandes.nBase, saveType.SANS_MESSAGE, "");
|
||||
|
||||
JOptionPane.showMessageDialog(null, "Changement enregistré.");
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static boolean colitionNomDesColonnes(HashMap<String, String> nomColonne) {
|
||||
boolean result = false;
|
||||
StringBuilder message = new StringBuilder();
|
||||
commandes.listNomDesColonnes.clear();
|
||||
|
||||
commandes.listNomDesColonnes.add("Groupe_Principal");
|
||||
commandes.listNomDesColonnes.add("Formation");
|
||||
commandes.listNomDesColonnes.add("Groupe_TD");
|
||||
commandes.listNomDesColonnes.add("Groupe_LV1");
|
||||
commandes.listNomDesColonnes.add("Groupe_LV2");
|
||||
commandes.listNomDesColonnes.add("LV1");
|
||||
commandes.listNomDesColonnes.add("LV2");
|
||||
commandes.listNomDesColonnes.add("Regime");
|
||||
commandes.listNomDesColonnes.add("Groupe_TP");
|
||||
commandes.listNomDesColonnes.add("Groupe_Informatique");
|
||||
commandes.listNomDesColonnes.add("Groupe_Projet");
|
||||
commandes.listNomDesColonnes.add("Groupe_Doc");
|
||||
commandes.listNomDesColonnes.add("Atelier-rentree_horaire");
|
||||
commandes.listNomDesColonnes.add("Atelier_pre-rentree_enseignant");
|
||||
commandes.listNomDesColonnes.add("Atelier_pre-rentree_salle");
|
||||
commandes.listNomDesColonnes.add("UE_Libre");
|
||||
commandes.listNomDesColonnes.add("Covoiturage");
|
||||
commandes.listNomDesColonnes.add("Etudiant_Covoiturage");
|
||||
commandes.listNomDesColonnes.add("Stage_1");
|
||||
commandes.listNomDesColonnes.add("Num_convention_1");
|
||||
commandes.listNomDesColonnes.add("Periode_1");
|
||||
commandes.listNomDesColonnes.add("Stage_2");
|
||||
commandes.listNomDesColonnes.add("Num_convention_2");
|
||||
commandes.listNomDesColonnes.add("Periode_2");
|
||||
commandes.listNomDesColonnes.add("Information");
|
||||
|
||||
|
||||
verificationCollisition(nomColonne, message, result);
|
||||
|
||||
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Formation")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Formation")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Formation") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Nom")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Nom")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Individu_-_Nom") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Prenom")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Prenom")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Individu_-_Prenom") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Code_Etudiant")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Individu_-_Code_Etudiant")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Individu_-_Code_Etudiant") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Profil_etudiant_lib.")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nomColonne.get("Excel_Profil_etudiant_lib.")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Profil_etudiant_lib.") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(nomColonne.get("Excel_Bac_ou_equivalence_lib."))) {
|
||||
// commandes.listNomDesColonnes.add(nomColonne.get("Excel_Bac_ou_equivalence_lib."));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + nomColonne.get("Excel_Bac_ou_equivalence_lib.") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Tel._portable")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Tel._portable")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + commandes.nBase.getAttributes("Individu_-_Tel._portable") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
//
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Email_personnel")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Email_personnel")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + commandes.nBase.getAttributes("Individu_-_Email_personnel") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Email")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("Individu_-_Email")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + commandes.nBase.getAttributes("Individu_-_Email") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
// if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("nomColonne_Option")))) {
|
||||
// commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nBase.getAttributes("nomColonne_Option")));
|
||||
// }else {
|
||||
// message.append("<p>Le nom de la colonne " + commandes.nBase.getAttributes("nomColonne_Option") + " est en double.</p>");
|
||||
// result =true;
|
||||
// }
|
||||
|
||||
|
||||
if(result) {
|
||||
JOptionPane.showMessageDialog(null, "<html>"+ message.toString() + "<p>Recommencer votre saisie.</p></html>");
|
||||
}
|
||||
|
||||
return result ;
|
||||
}
|
||||
|
||||
|
||||
private static void verificationCollisition(HashMap<String, String> nomColonne, StringBuilder message, boolean result) {
|
||||
|
||||
for(Map.Entry<String, String> entry : commandes.nBase.getAttributes().entrySet()) {
|
||||
commandes.listNomDesColonnes.add(entry.getValue());
|
||||
}
|
||||
|
||||
|
||||
// Remplissage de la listNomDesColonnes et vérification
|
||||
for (Map.Entry<String, String> entry : nomColonne.entrySet()) {
|
||||
if(!commandes.listNomDesColonnes.contains(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(entry.getValue()))) {
|
||||
commandes.listNomDesColonnes.add(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(entry.getValue()));
|
||||
}else {
|
||||
message.append("<p>Le nom de la colonne " + entry.getKey() + " = "+ entry.getValue() + " est en double.</p>");
|
||||
result =true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -31,7 +31,7 @@ public class base {
|
||||
nBase.setAttribut("version",commandes.version);
|
||||
|
||||
// Chargement des noms des colonnes par défaut pour inscrire des étudiants.
|
||||
correspondanceNomDeColonneInscription.chargementParDefaut();
|
||||
NomDeColonneInscriptionTable.chargementParDefaut();
|
||||
|
||||
nBase.setAttribut("Formation",commandes.nomColonneFormation);
|
||||
nBase.setAttribut(commandes.nomColonneCodeEtudiant,commandes.nomColonneCodeEtudiant);
|
||||
|
||||
@ -1,179 +0,0 @@
|
||||
package base;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import base.sauvegardeXMLBase.saveType;
|
||||
import outils.commandes;
|
||||
import outils.noeud;
|
||||
import outils.supprimeCaracatresSpeciaux;
|
||||
|
||||
public class correspondanceNomDeColonneInscription {
|
||||
|
||||
/**
|
||||
* Chargement des valeurs qui sont présentes dans la base.
|
||||
* Ceux sont les valeurs des différents attributs du noeus base.
|
||||
*/
|
||||
public static void chargement() {
|
||||
// Valeurs par défaut
|
||||
if(commandes.nBase!=null) {
|
||||
// Ces attributs sont les noms des colonnes présentant dans les noeud de la base.
|
||||
commandes.nomColonneFormation = commandes.nBase.getAttributes("Formation");
|
||||
commandes.nomColonneNomEtudiant = commandes.nBase.getAttributes("Individu_-_Nom");
|
||||
commandes.nomColonnePrenomEtudiant = commandes.nBase.getAttributes("Individu_-_Prenom");
|
||||
commandes.nomColonneCodeEtudiant = commandes.nBase.getAttributes("Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneProfilEtudiant = commandes.nBase.getAttributes("Profil_etudiant_lib.");
|
||||
commandes.nomColonneBacEtudiant = commandes.nBase.getAttributes("Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonnePortableEtudiant = commandes.nBase.getAttributes("Individu_-_Tel._portable");
|
||||
commandes.nomColonneMailPersoEtudiant = commandes.nBase.getAttributes("Individu_-_Email_personnel");
|
||||
commandes.nomColonneMailUnivEtudiant = commandes.nBase.getAttributes("Individu_-_Email");
|
||||
|
||||
// Ces attributs permettent l'inscription à partir du classeur Ms Excel fourni.
|
||||
// Les noms de ces colonnes sont enregistré dans les attributs qui commencent par Excel_...
|
||||
commandes.nomColonneExcel_Formation = commandes.nBase.getAttributes("Excel_Formation");
|
||||
commandes.nomColonneExcel_NomEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Nom");
|
||||
commandes.nomColonneExcel_PrenomEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Prenom");
|
||||
commandes.nomColonneExcel_CodeEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneExcel_ProfilEtudiant = commandes.nBase.getAttributes("Excel_Profil_etudiant_lib.");
|
||||
commandes.nomColonneExcel_BacEtudiant = commandes.nBase.getAttributes("Excel_Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonneExcel_PortableEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Tel._portable");
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Email_personnel");
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = commandes.nBase.getAttributes("Excel_Individu_-_Email");
|
||||
|
||||
commandes.nomFeuilleExcel_Inscription = commandes.nBase.getAttributes("Excel_Feuille_Inscription");
|
||||
|
||||
}else {
|
||||
chargementParDefaut();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Chargement des noms des colonnes dans le classeur des inscriptions.
|
||||
* Ce classeur est fourni par le service administratif DSI qui le transmet au secrétarait de chaque UFR.
|
||||
* Ce classeur doit contenir ces colonnes après traitement des caractères.
|
||||
*/
|
||||
public static void chargementParDefaut() {
|
||||
|
||||
// Les noms des colonnes par défaut (classeur Ms Excel fourni)
|
||||
commandes.nomColonneExcel_Formation = "IAE - Version d'étape (lib. web)";
|
||||
commandes.nomColonneExcel_NomEtudiant = "Individu - Nom";
|
||||
commandes.nomColonneExcel_PrenomEtudiant = "Individu - Prénom";
|
||||
commandes.nomColonneExcel_CodeEtudiant = "Individu - Code Etudiant";
|
||||
commandes.nomColonneExcel_ProfilEtudiant = "Profil étudiant (lib.)";
|
||||
commandes.nomColonneExcel_BacEtudiant = "Bac ou équivalence (lib.)";
|
||||
commandes.nomColonneExcel_PortableEtudiant = "Individu - Tél. portable";
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = "Individu - Email personnel";
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = "Individu - Email";
|
||||
|
||||
commandes.nomFeuilleExcel_Inscription = "Inscrits détail";
|
||||
|
||||
commandes.nomColonneFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_Formation);//"IAE_-_Version_detape_lib._web";
|
||||
commandes.nomColonneNomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_NomEtudiant);//"Individu_-_Nom";
|
||||
commandes.nomColonnePrenomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PrenomEtudiant);; //"Individu_-_Prenom";
|
||||
commandes.nomColonneCodeEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_CodeEtudiant);//"Individu_-_Code_Etudiant";
|
||||
commandes.nomColonneProfilEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_ProfilEtudiant); //"Profil_etudiant_lib.";
|
||||
commandes.nomColonneBacEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_BacEtudiant);//"Bac_ou_equivalence_lib.";
|
||||
commandes.nomColonnePortableEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PortableEtudiant);//"Individu_-_Tel._portable";
|
||||
commandes.nomColonneMailPersoEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailPersoEtudiant);//"Individu_-_Email_personnel";
|
||||
commandes.nomColonneMailUnivEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailUnivEtudiant);//"Individu_-_Email";
|
||||
}
|
||||
|
||||
/**
|
||||
* Apporte les modification dans la base avec les nouveaux nons des colonnes ou de la feuille.
|
||||
* @param nomColonne
|
||||
*/
|
||||
public static void modifierLesNoms(HashMap<String, String> nomColonne) {
|
||||
|
||||
commandes.nomColonneExcel_Formation = nomColonne.get("Excel_Formation");
|
||||
commandes.nomColonneExcel_NomEtudiant = nomColonne.get("Excel_Individu_-_Nom");
|
||||
commandes.nomColonneExcel_PrenomEtudiant = nomColonne.get("Excel_Individu_-_Prenom");
|
||||
commandes.nomColonneExcel_CodeEtudiant = nomColonne.get("Excel_Individu_-_Code_Etudiant");
|
||||
commandes.nomColonneExcel_ProfilEtudiant = nomColonne.get("Excel_Profil_etudiant_lib.");
|
||||
commandes.nomColonneExcel_BacEtudiant = nomColonne.get("Excel_Bac_ou_equivalence_lib.");
|
||||
commandes.nomColonneExcel_PortableEtudiant = nomColonne.get("Excel_Individu_-_Tel._portable");
|
||||
commandes.nomColonneExcel_MailPersoEtudiant = nomColonne.get("Excel_Individu_-_Email_personnel");
|
||||
commandes.nomColonneExcel_MailUnivEtudiant = nomColonne.get("Excel_Individu_-_Email");
|
||||
|
||||
commandes.nomFeuilleExcel_Inscription = nomColonne.get("Excel_Feuille_Inscription");
|
||||
|
||||
commandes.nomColonneFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_Formation);//"IAE_-_Version_detape_lib._web";
|
||||
commandes.nomColonneNomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_NomEtudiant);//"Individu_-_Nom";
|
||||
commandes.nomColonnePrenomEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PrenomEtudiant);; //"Individu_-_Prenom";
|
||||
commandes.nomColonneCodeEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_CodeEtudiant);//"Individu_-_Code_Etudiant";
|
||||
commandes.nomColonneProfilEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_ProfilEtudiant); //"Profil_etudiant_lib.";
|
||||
commandes.nomColonneBacEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_BacEtudiant);//"Bac_ou_equivalence_lib.";
|
||||
commandes.nomColonnePortableEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_PortableEtudiant);//"Individu_-_Tel._portable";
|
||||
commandes.nomColonneMailPersoEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailPersoEtudiant);//"Individu_-_Email_personnel";
|
||||
commandes.nomColonneMailUnivEtudiant = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(commandes.nomColonneExcel_MailUnivEtudiant);//"Individu_-_Email";
|
||||
|
||||
|
||||
// Ecriture dans la base pour prendre en compte les nouvelles colonnes et feuille
|
||||
if(commandes.nBase!=null) {
|
||||
// Ecriture de la formation
|
||||
String oldNameFormation = commandes.nBase.getAttributes("Formation");
|
||||
commandes.nBase.setAttribut("Formation", commandes.nomColonneFormation);
|
||||
commandes.nBase.setAttribut("Excel_Formation", commandes.nomColonneExcel_Formation);
|
||||
// ecriture du nom de l'étudiant
|
||||
String oldNameNomEtudiant = commandes.nBase.getAttributes("Individu_-_Nom");
|
||||
commandes.nBase.setAttribut("Individu_-_Nom", commandes.nomColonneNomEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Nom", commandes.nomColonneExcel_NomEtudiant);
|
||||
// ecriture du prénom de l'étudiant
|
||||
String oldNamePrenomEtudiant = commandes.nBase.getAttributes("Individu_-_Prenom");
|
||||
commandes.nBase.setAttribut("Individu_-_Prenom", commandes.nomColonnePrenomEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Prenom", commandes.nomColonneExcel_PrenomEtudiant);
|
||||
// ecriture du code de l'étudiant
|
||||
String oldNameCodeEtudiant = commandes.nBase.getAttributes("Individu_-_Code_Etudiant");
|
||||
commandes.nBase.setAttribut("Individu_-_Code_Etudiant", commandes.nomColonneCodeEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Code_Etudiant", commandes.nomColonneExcel_CodeEtudiant);
|
||||
// ecriture du profil de l'étudiant
|
||||
String oldNameProfilEtudiant = commandes.nBase.getAttributes("Profil_etudiant_lib.");
|
||||
commandes.nBase.setAttribut("Profil_etudiant_lib.", commandes.nomColonneProfilEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Profil_etudiant_lib.", commandes.nomColonneExcel_ProfilEtudiant);
|
||||
// ecriture du bac de l'étudiant
|
||||
String oldNameBacEtudiant = commandes.nBase.getAttributes("Bac_ou_equivalence_lib.");
|
||||
commandes.nBase.setAttribut("Bac_ou_equivalence_lib.", commandes.nomColonneBacEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Bac_ou_equivalence_lib.", commandes.nomColonneExcel_BacEtudiant);
|
||||
// ecriture du portable de l'étudiant
|
||||
String oldNamePortableEtudiant = commandes.nBase.getAttributes("Individu_-_Tel._portable");
|
||||
commandes.nBase.setAttribut("Individu_-_Tel._portable", commandes.nomColonnePortableEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Tel._portable", commandes.nomColonneExcel_PortableEtudiant);
|
||||
// ecriture du mail personnel de l'étudiant
|
||||
String oldNameMailPersoEtudiant = commandes.nBase.getAttributes("Individu_-_Email_personnel");
|
||||
commandes.nBase.setAttribut("Individu_-_Email_personnel", commandes.nomColonneMailPersoEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Email_personnel", commandes.nomColonneExcel_MailPersoEtudiant);
|
||||
// ecriture du mail université de l'étudiant
|
||||
String oldNameMailUnivEtudiant = commandes.nBase.getAttributes("Individu_-_Email");
|
||||
commandes.nBase.setAttribut("Individu_-_Email", commandes.nomColonneMailUnivEtudiant);
|
||||
commandes.nBase.setAttribut("Excel_Individu_-_Email", commandes.nomColonneExcel_MailUnivEtudiant);
|
||||
// ecriture nom de la feuille
|
||||
commandes.nBase.setAttribut("Excel_Feuille_Inscription", commandes.nomFeuilleExcel_Inscription);
|
||||
|
||||
if( commandes.nBase.getFirstChild()!=null) {
|
||||
for(noeud formation : commandes.nBase.getFirstChild().getChildren()) {
|
||||
for(noeud nStudent : formation.getChildren()) {
|
||||
nStudent.changeAttributName(oldNameFormation, commandes.nomColonneFormation);
|
||||
nStudent.changeAttributName(oldNameNomEtudiant, commandes.nomColonneNomEtudiant);
|
||||
nStudent.changeAttributName(oldNamePrenomEtudiant, commandes.nomColonnePrenomEtudiant);
|
||||
nStudent.changeAttributName(oldNameCodeEtudiant, commandes.nomColonneCodeEtudiant);
|
||||
nStudent.changeAttributName(oldNameProfilEtudiant, commandes.nomColonneProfilEtudiant);
|
||||
nStudent.changeAttributName(oldNameBacEtudiant, commandes.nomColonneBacEtudiant);
|
||||
nStudent.changeAttributName(oldNamePortableEtudiant, commandes.nomColonnePortableEtudiant);
|
||||
nStudent.changeAttributName(oldNameMailPersoEtudiant, commandes.nomColonneMailPersoEtudiant);
|
||||
nStudent.changeAttributName(oldNameMailUnivEtudiant, commandes.nomColonneMailUnivEtudiant);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sauvegardeXMLBase.save(commandes.nBase, saveType.SANS_MESSAGE, "");
|
||||
|
||||
JOptionPane.showMessageDialog(null, "Changement enregistré.");
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -89,7 +89,11 @@ public class CreateCalcWorkbook extends JFrame{
|
||||
|
||||
try (Workbook workbook = new XSSFWorkbook()) {
|
||||
int rows = data.length; // Nombre de lignes
|
||||
int columns = data[0].length;
|
||||
int columns = data[0].length;;
|
||||
// for(int i = 0 ; i< data[0].length; i++) {
|
||||
// if(data[0].)
|
||||
// }
|
||||
|
||||
List<String> nomDesFeuillesPresentes = new ArrayList<String>();
|
||||
int compteurNom = 1;
|
||||
|
||||
@ -127,9 +131,13 @@ public class CreateCalcWorkbook extends JFrame{
|
||||
Cell cell1 = row1.createCell(0);
|
||||
int tailleHead = columns - 2 ;
|
||||
for(int j = 0 ; j < tailleHead; j++) {
|
||||
cell1 = row1.createCell(j);
|
||||
cell1.setCellValue((String) data[i][j+1]);
|
||||
cell1.setCellStyle(cellStyle);
|
||||
if(data[i][j+1]!=null) {
|
||||
System.out.println(j);
|
||||
System.out.println(data[i][j+1]);
|
||||
cell1 = row1.createCell(j);
|
||||
cell1.setCellValue((String) data[i][j+1]);
|
||||
cell1.setCellStyle(cellStyle);
|
||||
}
|
||||
}
|
||||
|
||||
// Boucle pour insérer les données dans les colonnes
|
||||
|
||||
@ -36,7 +36,7 @@ public class exportBaseToExcel {
|
||||
public static void exportBase() {
|
||||
|
||||
// Données
|
||||
Object[][] data = new Object[commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getNumberChildren()][33];
|
||||
Object[][] data = new Object[commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getNumberChildren()][34];
|
||||
|
||||
|
||||
int indexFormation = 0 ;
|
||||
@ -74,8 +74,9 @@ public class exportBaseToExcel {
|
||||
data[indexFormation][29] = "Stage_2";
|
||||
data[indexFormation][30] = "Num_convention_2";
|
||||
data[indexFormation][31] = "Periode_2";
|
||||
data[indexFormation][32] = commandes.nomColonne_Option;
|
||||
|
||||
String[][] data1 = new String[formation.getNumberChildren()][31];
|
||||
String[][] data1 = new String[formation.getNumberChildren()][32];
|
||||
|
||||
int indexStudent = 0;
|
||||
for(noeud nStudent : formation.getChildren()) {
|
||||
@ -110,9 +111,10 @@ public class exportBaseToExcel {
|
||||
data1[indexStudent][28] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][29] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][30] = nStudent.getAttributes("Periode_2");
|
||||
data1[indexStudent][31] = nStudent.getAttributes(commandes.nomColonne_Option);
|
||||
|
||||
|
||||
data[indexFormation][32] = data1;
|
||||
data[indexFormation][33] = data1;
|
||||
indexStudent++;
|
||||
}
|
||||
|
||||
@ -156,83 +158,90 @@ public class exportBaseToExcel {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Object[][] data = new Object[1][33];
|
||||
|
||||
String formation = nTable.getFirstChild().getAttributes(commandes.nomColonneFormation);
|
||||
int nombreDeColonne = 34;
|
||||
if(!commandes.enabled_Colonne_Option) nombreDeColonne--;
|
||||
|
||||
|
||||
data[0][0] = nTable.getFirstChild().getAttributes(commandes.nomColonneFormation);
|
||||
data[0][1] = "Formation";
|
||||
data[0][2] = commandes.nomColonneCodeEtudiant; //"Individu_-_Code_Etudiant";
|
||||
data[0][3] = commandes.nomColonnePrenomEtudiant;//"Individu_-_Prenom";
|
||||
data[0][4] = commandes.nomColonneNomEtudiant;//"Individu_-_Nom";
|
||||
data[0][5] = commandes.nomColonneProfilEtudiant;//"Profil_etudiant_lib.";
|
||||
data[0][6] = commandes.nomColonnePortableEtudiant; //"Individu_-_Tel._portable";
|
||||
data[0][7] = commandes.nomColonneMailPersoEtudiant; //"Individu_-_Email_personnel";
|
||||
data[0][8] = commandes.nomColonneMailUnivEtudiant; //"Individu_-_Email";
|
||||
data[0][9] = "Groupe_Principal";
|
||||
data[0][10] = "Groupe_TD";
|
||||
data[0][11] = "Groupe_LV1";
|
||||
data[0][12] = "Groupe_LV2";
|
||||
data[0][13] = "Groupe_Informatique";
|
||||
data[0][14] = "Groupe_Projet";
|
||||
data[0][15] = "Groupe_Doc";
|
||||
data[0][16] = "Groupe_TP";
|
||||
data[0][17] = "LV1";
|
||||
data[0][18] = "LV2";
|
||||
data[0][19] = "Regime";
|
||||
data[0][20] = "Atelier-rentree_horaire";
|
||||
data[0][21] = "Atelier_pre-rentree_enseignant";
|
||||
data[0][22] = "Atelier_pre-rentree_salle";
|
||||
data[0][23] = "UE_Libre";
|
||||
data[0][24] = "Covoiturage";
|
||||
data[0][25] = "Etudiant_Covoiturage";
|
||||
data[0][26] = "Stage_1";
|
||||
data[0][27] = "Num_convention_1";
|
||||
data[0][28] = "Periode_1";
|
||||
data[0][29] = "Stage_2";
|
||||
data[0][30] = "Num_convention_2";
|
||||
data[0][31] = "Periode_2";
|
||||
Object[][] data = new Object[1][nombreDeColonne];
|
||||
|
||||
String formation = nTable.getAttributes("Formation");
|
||||
|
||||
String[][] data1 = new String[nTable.getChildren().size()][31];
|
||||
int numCol = 0;
|
||||
data[0][numCol++] = formation;
|
||||
data[0][numCol++] = "Formation";
|
||||
data[0][numCol++] = commandes.nomColonneCodeEtudiant; //"Individu_-_Code_Etudiant";
|
||||
data[0][numCol++] = commandes.nomColonnePrenomEtudiant;//"Individu_-_Prenom";
|
||||
data[0][numCol++] = commandes.nomColonneNomEtudiant;//"Individu_-_Nom";
|
||||
data[0][numCol++] = commandes.nomColonneProfilEtudiant;//"Profil_etudiant_lib.";
|
||||
data[0][numCol++] = commandes.nomColonnePortableEtudiant; //"Individu_-_Tel._portable";
|
||||
data[0][numCol++] = commandes.nomColonneMailPersoEtudiant; //"Individu_-_Email_personnel";
|
||||
data[0][numCol++] = commandes.nomColonneMailUnivEtudiant; //"Individu_-_Email";
|
||||
data[0][numCol++] = "Groupe_Principal";
|
||||
data[0][numCol++] = "Groupe_TD";
|
||||
data[0][numCol++] = "Groupe_LV1";
|
||||
data[0][numCol++] = "Groupe_LV2";
|
||||
data[0][numCol++] = "Groupe_Informatique";
|
||||
data[0][numCol++] = "Groupe_Projet";
|
||||
data[0][numCol++] = "Groupe_Doc";
|
||||
data[0][numCol++] = "Groupe_TP";
|
||||
data[0][numCol++] = "LV1";
|
||||
data[0][numCol++] = "LV2";
|
||||
data[0][numCol++] = "Regime";
|
||||
data[0][numCol++] = "Atelier-rentree_horaire";
|
||||
data[0][numCol++] = "Atelier_pre-rentree_enseignant";
|
||||
data[0][numCol++] = "Atelier_pre-rentree_salle";
|
||||
data[0][numCol++] = "UE_Libre";
|
||||
data[0][numCol++] = "Covoiturage";
|
||||
data[0][numCol++] = "Etudiant_Covoiturage";
|
||||
data[0][numCol++] = "Stage_1";
|
||||
data[0][numCol++] = "Num_convention_1";
|
||||
data[0][numCol++] = "Periode_1";
|
||||
data[0][numCol++] = "Stage_2";
|
||||
data[0][numCol++] = "Num_convention_2";
|
||||
data[0][numCol++] = "Periode_2";
|
||||
if(commandes.enabled_Colonne_Option) data[0][numCol++] = commandes.nomColonne_Option;
|
||||
|
||||
// le nombre de colonne par défaut de data1 est nombreDeColonne - 2
|
||||
int nombreColoneData1 = nombreDeColonne -2;
|
||||
String[][] data1 = new String[nTable.getChildren().size()][nombreColoneData1];
|
||||
|
||||
int indexStudent = 0;
|
||||
for(noeud nStudent : nTable.getChildren()) {
|
||||
data1[indexStudent][0] = nStudent.getAttributes(commandes.nomColonneFormation);;
|
||||
data1[indexStudent][1] = nStudent.getAttributes(commandes.nomColonneCodeEtudiant);
|
||||
data1[indexStudent][2] = nStudent.getAttributes(commandes.nomColonnePrenomEtudiant);
|
||||
data1[indexStudent][3] = nStudent.getAttributes(commandes.nomColonneNomEtudiant);
|
||||
data1[indexStudent][4] = nStudent.getAttributes(commandes.nomColonneProfilEtudiant);
|
||||
data1[indexStudent][5] = nStudent.getAttributes(commandes.nomColonnePortableEtudiant);
|
||||
data1[indexStudent][6] = nStudent.getAttributes(commandes.nomColonneMailPersoEtudiant);
|
||||
data1[indexStudent][7] = nStudent.getAttributes(commandes.nomColonneMailUnivEtudiant);
|
||||
data1[indexStudent][8] = nStudent.getAttributes("Groupe_Principal");
|
||||
data1[indexStudent][9] = nStudent.getAttributes("Groupe_TD");
|
||||
data1[indexStudent][10] = nStudent.getAttributes("Groupe_LV1");
|
||||
data1[indexStudent][11] = nStudent.getAttributes("Groupe_LV2");
|
||||
data1[indexStudent][12] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][13] = nStudent.getAttributes("Groupe_Projet");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Groupe_Doc");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Groupe_TP");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("LV1");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][18] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][19] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][20] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][21] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
data1[indexStudent][22] = nStudent.getAttributes("UE_Libre");
|
||||
data1[indexStudent][23] = nStudent.getAttributes("Covoiturage");
|
||||
data1[indexStudent][24] = nStudent.getAttributes("Etudiant_Covoiturage");
|
||||
data1[indexStudent][25] = nStudent.getAttributes("Stage_1");
|
||||
data1[indexStudent][26] = nStudent.getAttributes("Num_convention_1");
|
||||
data1[indexStudent][27] = nStudent.getAttributes("Periode_1");
|
||||
data1[indexStudent][28] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][29] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][30] = nStudent.getAttributes("Periode_2");
|
||||
int col = 0;
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneFormation);;
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneCodeEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonnePrenomEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneNomEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneProfilEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonnePortableEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneMailPersoEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonneMailUnivEtudiant);
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_Principal");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_TD");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_LV1");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_LV2");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_Projet");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_Doc");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Groupe_TP");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("LV1");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("UE_Libre");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Covoiturage");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Etudiant_Covoiturage");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Stage_1");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Num_convention_1");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Periode_1");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][col++] = nStudent.getAttributes("Periode_2");
|
||||
if(commandes.enabled_Colonne_Option) data1[indexStudent][col++] = nStudent.getAttributes(commandes.nomColonne_Option);
|
||||
|
||||
data[0][32] = data1;
|
||||
data[0][numCol] = data1;
|
||||
indexStudent++;
|
||||
}
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ import java.util.regex.Pattern;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import base.correspondanceNomDeColonneInscription;
|
||||
import base.NomDeColonneInscriptionTable;
|
||||
import base.recupeBases;
|
||||
import base.sauvegardeXMLBase;
|
||||
import base.sauvegardeXMLBase.saveType;
|
||||
@ -257,7 +257,7 @@ public class VersionChecker {
|
||||
* @return
|
||||
*/
|
||||
public static noeud version104(noeud nBase) {
|
||||
correspondanceNomDeColonneInscription.chargementParDefaut();
|
||||
NomDeColonneInscriptionTable.chargementParDefaut();
|
||||
|
||||
nBase.setAttribut("Formation",commandes.nomColonneFormation);
|
||||
nBase.setAttribut(commandes.nomColonneCodeEtudiant,commandes.nomColonneCodeEtudiant);
|
||||
@ -281,12 +281,18 @@ public class VersionChecker {
|
||||
|
||||
nBase.setAttribut("Excel_Feuille_Inscription",commandes.nomFeuilleExcel_Inscription);
|
||||
|
||||
// Ajoute le groupe_TP dans la base.
|
||||
nBase.setAttribut("nomColonne_Option", "Option");
|
||||
nBase.setAttribut("Enabled_Colonne_Option", "true");
|
||||
|
||||
// Ajoute le groupe_TP dans la base base.
|
||||
// Trie les noeuds enfants des formation par ordre alphabétique des noms des enfants.
|
||||
// Ajoute Options et Enabled_Option dans le noeud base
|
||||
for(noeud nFormation : nBase.getFirstChild().getChildren()) {
|
||||
nFormation.setAttribut("Colonne_Groupe_TP", "true");
|
||||
for(noeud nStudent : nFormation.getChildren()) {
|
||||
nStudent.addAttribute("Groupe_TP", "");
|
||||
}
|
||||
nFormation.triAlphabetiqueDesEnfants(commandes.nomColonneNomEtudiant);
|
||||
}
|
||||
|
||||
return nBase;
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
package outils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Variables pour l'ensemble de l'application.
|
||||
* @author pabr6
|
||||
@ -10,7 +13,7 @@ public class commandes {
|
||||
public static noeud nBase = null; // La base de données sous forme de noeud.
|
||||
public static String version = "1.0.5"; // La version actuelle
|
||||
|
||||
|
||||
// Les colonnes obligatoires dû à l'inscription des étudaints.
|
||||
// nom des colonnes après traitement des caractères (Accès à la base XML)
|
||||
public static String nomColonneFormation = null;
|
||||
public static String nomColonneNomEtudiant = null;
|
||||
@ -22,7 +25,8 @@ public class commandes {
|
||||
public static String nomColonneMailPersoEtudiant = null;
|
||||
public static String nomColonneMailUnivEtudiant = null;
|
||||
|
||||
// nom des colonnes avant traitement des caractères (Accès au classeur des inscriptions)
|
||||
// nom des colonnes avant traitement des caractères
|
||||
//(Pour accéder au classeur des inscriptions)
|
||||
public static String nomColonneExcel_Formation = null;
|
||||
public static String nomColonneExcel_NomEtudiant = null;
|
||||
public static String nomColonneExcel_PrenomEtudiant = null;
|
||||
@ -34,6 +38,11 @@ public class commandes {
|
||||
public static String nomColonneExcel_MailUnivEtudiant = null;
|
||||
public static String nomFeuilleExcel_Inscription = null;
|
||||
|
||||
// liste des noms des colonnes pour éviter les colitions.
|
||||
public static List<String> listNomDesColonnes = new ArrayList<String>();
|
||||
|
||||
|
||||
|
||||
// Messages et sécurité
|
||||
public static Boolean newVersion = false; //Permet de vérifier l'existance d'un nouvelle version.
|
||||
public static Boolean helpme1 = false; //M'aider à compléter mon service annuel.
|
||||
@ -41,4 +50,9 @@ public class commandes {
|
||||
public static String messageAlerte = ""; //Message alerte
|
||||
|
||||
|
||||
//noms des colonnes de l'application qui sont modifiables
|
||||
public static String nomColonne_Option = "Option";
|
||||
public static boolean enabled_Colonne_Option = true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -2,8 +2,12 @@ package outils;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.SortedMap;
|
||||
import java.util.TreeMap;
|
||||
import java.util.regex.Pattern;
|
||||
@ -970,7 +974,8 @@ public class noeud implements Cloneable{
|
||||
* Supprime tous les enfants de ce noeud.<br>
|
||||
*/
|
||||
public void removeAllChildren() {
|
||||
this.children = new ArrayList<>();
|
||||
this.children.clear();
|
||||
// this.children = new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1091,6 +1096,30 @@ public class noeud implements Cloneable{
|
||||
}
|
||||
|
||||
|
||||
public void triAlphabetiqueDesEnfants(String nameAttribut) {
|
||||
Map<noeud, String> listeChild = new HashMap<noeud, String>();
|
||||
for(noeud child : children) {
|
||||
if(child.getAttributes().containsKey(nameAttribut)) {
|
||||
listeChild.put(child, child.getAttributes(nameAttribut));
|
||||
}
|
||||
}
|
||||
// Obtenir les entrées du dictionnaire sous forme de liste
|
||||
List<Map.Entry<noeud, String>> entryList = new ArrayList<>(listeChild.entrySet());
|
||||
|
||||
// Trier la liste d'entrées par ordre croissant des valeurs
|
||||
Collections.sort(entryList, Comparator.comparing(Map.Entry::getValue));
|
||||
|
||||
//supprime tous les enfants du noeud
|
||||
this.children.clear();
|
||||
|
||||
for(Entry<noeud,String> child : entryList) {
|
||||
this.children.add(child.getKey());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Mise à toujours de tous les styles des cellules en compétant par le style par défaut;<br>
|
||||
*/
|
||||
|
||||
@ -5,6 +5,7 @@ import java.text.Normalizer;
|
||||
public class supprimeCaracatresSpeciaux {
|
||||
|
||||
public static String TousLesCaracatresSpeciaux(String str) {
|
||||
|
||||
// Supprimer les accents
|
||||
String normalizedStr = Normalizer.normalize(str, Normalizer.Form.NFD);
|
||||
String accentRemovedStr = normalizedStr.replaceAll("\\p{InCombiningDiacriticalMarks}+", "");
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 391 KiB After Width: | Height: | Size: 444 KiB |
BIN
src/resources/Sans titre_28.jpg
Normal file
BIN
src/resources/Sans titre_28.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
BIN
src/resources/Sans titre_29.jpg
Normal file
BIN
src/resources/Sans titre_29.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 285 KiB After Width: | Height: | Size: 86 KiB |
BIN
src/resources/Sans titre_30.jpg
Normal file
BIN
src/resources/Sans titre_30.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 77 KiB |
BIN
src/resources/Sans titre_31.jpg
Normal file
BIN
src/resources/Sans titre_31.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 229 KiB |
BIN
src/resources/Sans titre_32.jpg
Normal file
BIN
src/resources/Sans titre_32.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 108 KiB |
BIN
src/resources/Sans titre_33.jpg
Normal file
BIN
src/resources/Sans titre_33.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 112 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 73 KiB |
BIN
src/resources/voirtouteslescolonnes.png
Normal file
BIN
src/resources/voirtouteslescolonnes.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Loading…
Reference in New Issue
Block a user