MAJ V1.0.5
This commit is contained in:
pablo rodriguez
parent
0804f63eee
commit
09918899d8
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
BIN
resources/parametreImportationIncriptions.png
Normal file
BIN
resources/parametreImportationIncriptions.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
268
resources/parametreImportationIncriptions.svg
Normal file
268
resources/parametreImportationIncriptions.svg
Normal file
@ -0,0 +1,268 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="28.828678mm"
|
||||
height="14.719568mm"
|
||||
viewBox="0 0 28.828678 14.719568"
|
||||
version="1.1"
|
||||
id="svg339"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
sodipodi:docname="parametreImportationIncriptions.svg"
|
||||
inkscape:export-filename="parametreImportationIncriptions.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<sodipodi:namedview
|
||||
id="namedview341"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.3668074"
|
||||
inkscape:cx="72.03797"
|
||||
inkscape:cy="-11.196517"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1009"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer1" />
|
||||
<defs
|
||||
id="defs336">
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2845"
|
||||
id="radialGradient2849"
|
||||
cx="104.95018"
|
||||
cy="147.33727"
|
||||
fx="104.95018"
|
||||
fy="147.33727"
|
||||
r="32.36726"
|
||||
gradientTransform="matrix(0.08104781,0,0,0.08020764,69.180079,90.119011)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient2845">
|
||||
<stop
|
||||
style="stop-color:#ff0000;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop2841" />
|
||||
<stop
|
||||
id="stop2851"
|
||||
offset="0.2942684"
|
||||
style="stop-color:#000000;stop-opacity:1" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop2843" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="SVGID_1_"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="203.5132"
|
||||
y1="1729.0183"
|
||||
x2="967.98682"
|
||||
y2="404.98169"
|
||||
gradientTransform="matrix(1,0,0,-1,0,2132)">
|
||||
<stop
|
||||
offset="0"
|
||||
style="stop-color:#18884F"
|
||||
id="stop240" />
|
||||
<stop
|
||||
offset="0.5"
|
||||
style="stop-color:#117E43"
|
||||
id="stop242" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#0B6631"
|
||||
id="stop244" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-52.042134,-94.844805)">
|
||||
<g
|
||||
id="g996"
|
||||
transform="translate(1.2579235)">
|
||||
<g
|
||||
id="g388"
|
||||
transform="matrix(0.00528564,0,0,0.00572812,57.928801,96.104327)"
|
||||
style="stroke-width:93.5788">
|
||||
<path
|
||||
fill="#185c37"
|
||||
d="M 1437.75,1011.75 532.5,852 v 1180.393 c 0,53.907 43.7,97.607 97.607,97.607 v 0 h 1562.036 c 53.907,0 97.607,-43.7 97.607,-97.607 v 0 -434.893 z"
|
||||
id="path226"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
fill="#21a366"
|
||||
d="M 1437.75,0 H 630.107 C 576.2,0 532.5,43.7 532.5,97.607 c 0,0 0,0 0,0 V 532.5 L 1437.75,1065 1917,1224.75 2289.75,1065 V 532.5 Z"
|
||||
id="path228"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
fill="#107c41"
|
||||
d="m 532.5,532.5 h 905.25 V 1065 H 532.5 Z"
|
||||
id="path230"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
opacity="0.1"
|
||||
enable-background="new "
|
||||
d="M 1180.393,426 H 532.5 v 1331.25 h 647.893 c 53.834,-0.175 97.432,-43.773 97.607,-97.607 V 523.607 c -0.175,-53.834 -43.773,-97.432 -97.607,-97.607 z"
|
||||
id="path232"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
opacity="0.2"
|
||||
enable-background="new "
|
||||
d="M 1127.143,479.25 H 532.5 V 1810.5 h 594.643 c 53.834,-0.175 97.432,-43.773 97.607,-97.607 V 576.857 c -0.175,-53.834 -43.773,-97.432 -97.607,-97.607 z"
|
||||
id="path234"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
opacity="0.2"
|
||||
enable-background="new "
|
||||
d="M 1127.143,479.25 H 532.5 V 1704 h 594.643 c 53.834,-0.175 97.432,-43.773 97.607,-97.607 V 576.857 c -0.175,-53.834 -43.773,-97.432 -97.607,-97.607 z"
|
||||
id="path236"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
opacity="0.2"
|
||||
enable-background="new "
|
||||
d="M 1073.893,479.25 H 532.5 V 1704 h 541.393 c 53.834,-0.175 97.432,-43.773 97.607,-97.607 V 576.857 c -0.175,-53.834 -43.773,-97.432 -97.607,-97.607 z"
|
||||
id="path238"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
fill="url(#SVGID_1_)"
|
||||
d="m 97.607,479.25 h 976.285 c 53.907,0 97.607,43.7 97.607,97.607 v 976.285 c 0,53.907 -43.7,97.607 -97.607,97.607 H 97.607 C 43.7,1650.75 0,1607.05 0,1553.143 V 576.857 C 0,522.95 43.7,479.25 97.607,479.25 Z"
|
||||
id="path247"
|
||||
style="fill:url(#SVGID_1_);stroke-width:4152.57" />
|
||||
<path
|
||||
fill="#ffffff"
|
||||
d="M 302.3,1382.264 507.632,1064.095 319.5,747.683 h 151.336 l 102.666,202.35 c 9.479,19.223 15.975,33.494 19.49,42.919 h 1.331 c 6.745,-15.336 13.845,-30.228 21.3,-44.677 L 725.371,747.79 H 864.3 L 671.375,1062.338 869.2,1382.263 H 721.378 L 602.79,1160.158 c -5.586,-9.45 -10.326,-19.376 -14.164,-29.66 h -1.757 c -3.474,10.075 -8.083,19.722 -13.739,28.755 l -122.102,223.011 z"
|
||||
id="path249"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
fill="#33c481"
|
||||
d="M 2192.143,0 H 1437.75 v 532.5 h 852 V 97.607 C 2289.75,43.7 2246.05,0 2192.143,0 Z"
|
||||
id="path251"
|
||||
style="stroke-width:4152.57" />
|
||||
<path
|
||||
fill="#107c41"
|
||||
d="m 1437.75,1065 h 852 v 532.5 h -852 z"
|
||||
id="path253"
|
||||
style="stroke-width:4152.57" />
|
||||
</g>
|
||||
<g
|
||||
id="g2449"
|
||||
transform="matrix(0.78875217,0,0,0.83562547,-61.161659,54.856416)"
|
||||
style="stroke-width:13.7079">
|
||||
<g
|
||||
id="g2362"
|
||||
transform="matrix(0.11481241,0,0,0.11481241,235.1247,60.097108)"
|
||||
style="fill:#ffffff;stroke-width:3.16928">
|
||||
<path
|
||||
id="path2352"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.16928"
|
||||
sodipodi:type="inkscape:offset"
|
||||
inkscape:radius="2.0816321"
|
||||
inkscape:original="M -728.79883 -97.443359 C -732.61758 -96.26711 -738.63867 -95.09375 -738.63867 -95.09375 C -738.63867 -95.09375 -731.7393 -94.94546 -734.5293 -86.136719 C -736.23429 -80.742974 -739.26673 -71.237174 -743.76172 -58.554688 C -773.79669 -47.838448 -794.21289 -33.363281 -794.21289 -33.363281 C -776.76041 -43.084522 -760.15804 -50.147114 -744.93555 -55.255859 C -748.2818 -45.744619 -751.71015 -32.848903 -742.44141 -29.222656 C -735.68766 -26.578909 -724.97811 -32.985711 -719.10938 -40.470703 C -727.91562 -34.454459 -732.76531 -31.661254 -736.28906 -35.1875 C -739.8153 -38.713747 -735.13773 -50.611801 -733.64648 -54.716797 C -733.35773 -55.508046 -732.81602 -57.089455 -732.10352 -59.220703 C -688.15606 -71.58319 -658.54102 -67.646484 -658.54102 -67.646484 C -684.16725 -72.34523 -709.35393 -68.898744 -730.94141 -62.6875 C -728.91517 -68.778744 -726.13547 -77.251336 -723.54297 -85.205078 C -720.90172 -93.945069 -723.40509 -97.443359 -728.79883 -97.443359 z M -743.58984 -92.960938 C -747.07792 -92.973888 -754.66383 -91.342252 -759.5332 -78.111328 C -764.0182 -67.993838 -763.25172 -68.759604 -765.85547 -63.318359 C -768.65047 -57.477115 -771.31492 -55.392032 -770.51367 -55.800781 C -770.51367 -55.800781 -760.73539 -54.098532 -752.61914 -70.541016 C -748.14165 -79.613507 -746.74741 -90.766252 -741.35742 -92.78125 L -741.7168 -92.767578 C -741.7168 -92.767578 -742.42714 -92.956621 -743.58984 -92.960938 z M -777.41992 -90.025391 C -777.58874 -90.030791 -777.75313 -90.02411 -777.91406 -90 C -780.49281 -89.607501 -785.21484 -88.433594 -785.21484 -88.433594 C -785.21484 -88.433594 -783.62508 -88.631949 -782.39258 -85.314453 C -781.42258 -82.708205 -787.74805 -64.636719 -787.74805 -64.636719 C -787.74805 -64.636719 -791.83727 -52.92445 -787.57227 -49.189453 C -781.72978 -45.219457 -775.08016 -50.570706 -772.37891 -52.970703 C -771.80016 -53.591953 -771.47852 -54.009766 -771.47852 -54.009766 C -778.81352 -50.10727 -780.08008 -52.346175 -780.67383 -55.076172 C -781.26258 -57.80617 -777.36805 -67.953526 -774.43555 -77.509766 C -771.68634 -86.474601 -774.8876 -89.944573 -777.41992 -90.025391 z "
|
||||
d="m -728.79883,-99.525391 a 2.0818403,2.0818403 0 0 0 -0.61328,0.0918 c -3.60265,1.109687 -9.625,2.296875 -9.625,2.296875 a 2.0818403,2.0818403 0 0 0 -0.85742,2.988281 2.0818403,2.0818403 0 0 0 -1.39063,-0.642578 2.0818403,2.0818403 0 0 0 -0.15234,-0.07031 l -0.35938,0.01367 c -0.3556,-0.07346 -0.75505,-0.191488 -1.78515,-0.195313 -4.14843,-0.0154 -12.81206,2.376395 -17.9043,16.212891 l 0.0508,-0.125 c -4.50484,10.162242 -3.72896,9.371923 -6.29687,14.738281 -1.32796,2.775296 -2.60457,4.622948 -3.45508,5.738281 -0.42526,0.557667 -0.72389,0.903422 -0.96484,1.208985 -0.0602,0.07639 -0.11604,0.146904 -0.19922,0.271484 -0.0832,0.12458 -0.32442,0.03224 -0.38477,1.115235 -0.002,0.03343 0.0315,0.101142 0.0312,0.138671 -3.26321,1.68424 -4.9809,1.794931 -5.27148,1.703125 -0.15001,-0.04739 -0.12895,-0.02558 -0.25196,-0.232422 -0.12259,-0.206164 -0.28204,-0.655001 -0.41015,-1.242187 0.009,0.03958 0.006,-1.043993 0.31055,-2.423828 0.30499,-1.379836 0.81616,-3.1654 1.4414,-5.175781 1.25048,-4.020764 2.95996,-8.955559 4.44141,-13.783204 a 2.0818403,2.0818403 0 0 0 0,-0.002 c 1.46308,-4.770917 1.45024,-8.337021 0.43945,-10.949218 -1.01079,-2.612197 -3.1601,-4.186045 -5.34766,-4.25586 -0.26681,-0.0085 -0.55851,3.38e-4 -0.86914,0.04687 a 2.0818403,2.0818403 0 0 0 -0.004,0 c -2.81544,0.428524 -7.49024,1.605469 -7.49024,1.605469 a 2.0818403,2.0818403 0 0 0 0.75977,4.085937 c 0,0 -0.31156,0.0121 -0.39258,-0.0039 -0.081,-0.016 -0.11211,-0.04327 -0.0644,-0.01172 0.0953,0.0631 0.56053,0.420807 1.07031,1.792968 a 2.0818403,2.0818403 0 0 0 0,0.002 c -0.14489,-0.389294 -0.004,0.06941 -0.0703,0.6875 -0.0666,0.618091 -0.21927,1.481906 -0.4375,2.466797 -0.43646,1.969783 -1.12592,4.439751 -1.84766,6.833985 -1.44348,4.788466 -3.01367,9.27539 -3.01367,9.27539 a 2.0818403,2.0818403 0 0 0 0,0.002 c 0,0 -1.08395,3.07802 -1.60742,6.710938 -0.26174,1.816459 -0.39818,3.78972 -0.14258,5.707031 0.2556,1.917312 0.9236,3.883641 2.51953,5.28125 a 2.0818403,2.0818403 0 0 0 0.20117,0.15625 c 3.58452,2.435692 7.63432,1.997155 10.74805,0.695313 3.11373,-1.301843 5.58767,-3.389493 6.99805,-4.642578 a 2.0818403,2.0818403 0 0 0 0.14062,-0.138672 c 0.63385,-0.680395 1.02734,-1.1875 1.02735,-1.1875 a 2.0818403,2.0818403 0 0 0 0.20507,-0.992188 c 0.37683,0.0153 0.41104,0.0646 0.95703,0.01367 1.25802,-0.117332 2.97958,-0.477113 4.94336,-1.402344 3.92756,-1.850462 8.7531,-5.95371 12.97071,-14.498047 2.35061,-4.76291 3.83139,-9.898945 5.36718,-13.951171 1.5358,-4.052227 3.18566,-6.674713 4.75586,-7.261719 a 2.0818403,2.0818403 0 0 0 0.92383,-3.138672 2.0818403,2.0818403 0 0 0 1.02149,0.958984 c 0,0 1.08346,0.08943 1.81836,0.697266 0.7349,0.607836 1.5964,1.618533 0.35156,5.548828 a 2.0818403,2.0818403 0 0 0 0,0.002 c -1.64769,5.212463 -4.66559,14.57949 -8.91211,26.619141 -29.76401,10.777034 -49.99024,25.083984 -49.99024,25.083984 a 2.0818403,2.0818403 0 0 0 2.2168,3.515625 c 15.88496,-8.848113 30.99725,-15.392092 45.04688,-20.339844 -1.19533,3.842774 -2.25362,7.884246 -2.34766,11.802735 -0.0637,2.6552 0.28607,5.241932 1.42383,7.527343 1.13739,2.284674 3.12879,4.194391 5.875,5.269532 4.25616,1.666068 9.15965,0.447437 13.71679,-1.916016 4.55715,-2.363452 8.87789,-5.984987 12.01368,-9.984375 a 2.0818403,2.0818403 0 0 0 -2.8125,-3.003906 c -4.38006,2.992364 -7.75617,5.120208 -10.11328,5.984375 -1.17856,0.432083 -2.05684,0.542866 -2.69336,0.460937 -0.63653,-0.08193 -1.11151,-0.298574 -1.72657,-0.914062 a 2.0818403,2.0818403 0 0 0 0,-0.002 c -0.30497,-0.304974 -0.64745,-1.137453 -0.67578,-2.53125 -0.0283,-1.393798 0.23561,-3.207647 0.66992,-5.072266 0.86863,-3.729238 2.36908,-7.639825 3.13282,-9.742187 0.23425,-0.641978 0.70952,-2.052502 1.1875,-3.46875 43.00147,-11.899251 71.6875,-8.107422 71.6875,-8.107422 a 2.0818403,2.0818403 0 0 0 0.64843,-4.111328 c -24.61757,-4.513802 -48.64727,-1.519514 -69.63281,4.109375 1.8888,-5.707466 4.04998,-12.274864 6.23438,-18.976563 a 2.0818403,2.0818403 0 0 0 0.0137,-0.04297 c 1.39555,-4.617942 1.61694,-8.165472 0.25976,-10.917968 -1.35717,-2.752497 -4.3609,-4.003907 -7.50781,-4.003907 z" />
|
||||
</g>
|
||||
<g
|
||||
id="g489"
|
||||
transform="matrix(0.11481241,0,0,0.11481241,235.1247,60.097108)"
|
||||
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>
|
||||
<g
|
||||
id="g917"
|
||||
transform="matrix(1.3908222,0,0,1.3908222,-37.182281,-39.570898)"
|
||||
style="stroke:#000000">
|
||||
<path
|
||||
d="m 77.681625,99.462055 a 2.5017173,2.4745251 0 0 0 -0.617497,0.07773 0.51990865,0.37456613 71.463379 0 1 -0.215548,0.4575 0.51990865,0.37456613 71.463379 0 1 -0.436483,-0.190309 2.5017173,2.4745251 0 0 0 -0.875922,0.864254 0.51990865,0.37456613 26.46338 0 1 0.187772,0.48908 0.51990865,0.37456613 26.46338 0 1 -0.463413,0.17029 2.5017173,2.4745251 0 0 0 -0.0762,0.60599 2.5017173,2.4745251 0 0 0 0.08222,0.62911 0.37456613,0.51990865 71.463379 0 1 0.09188,-0.007 0.37456613,0.51990865 71.463379 0 1 0.392603,0.21908 0.37456613,0.51990865 71.463379 0 1 -0.202241,0.44472 2.5017173,2.4745251 0 0 0 0.88511,0.85623 0.37456613,0.51990865 26.46338 0 1 0.36261,-0.20193 0.37456613,0.51990865 26.46338 0 1 0.11749,0.0256 0.37456613,0.51990865 26.46338 0 1 0.1751,0.43707 2.5017173,2.4745251 0 0 0 0.596956,0.0715 2.5017173,2.4745251 0 0 0 0.629853,-0.0797 0.51990865,0.37456613 71.463379 0 1 0.215707,-0.45591 0.51990865,0.37456613 71.463379 0 1 0.09104,-0.0167 0.51990865,0.37456613 71.463379 0 1 0.343335,0.20403 2.5017173,2.4745251 0 0 0 0.872702,-0.86541 0.51990865,0.37456613 26.46338 0 1 -0.182388,-0.48485 0.51990865,0.37456613 26.46338 0 1 0.341066,-0.18297 0.51990865,0.37456613 26.46338 0 1 0.114691,0.0111 2.5017173,2.4745251 0 0 0 0.07572,-0.60408 2.5017173,2.4745251 0 0 0 -0.08206,-0.62838 0.37456613,0.51990865 71.463379 0 1 -0.476509,-0.21333 0.37456613,0.51990865 71.463379 0 1 0.196328,-0.44076 2.5017173,2.4745251 0 0 0 -0.881996,-0.856753 0.37456613,0.51990865 26.46338 0 1 -0.477354,0.172829 0.37456613,0.51990865 26.46338 0 1 -0.17547,-0.43474 2.5017173,2.4745251 0 0 0 -0.604665,-0.0734 2.5017173,2.4745251 0 0 0 -0.0044,0 z m 1.62e-4,1.651675 a 0.8318898,0.82284754 0 0 1 0.0043,0 0.8318898,0.82284754 0 0 1 0.831883,0.82286 0.8318898,0.82284754 0 0 1 -0.831883,0.82285 0.8318898,0.82284754 0 0 1 -0.831884,-0.82285 0.8318898,0.82284754 0 0 1 0.827607,-0.82286 z"
|
||||
style="fill:url(#radialGradient2849);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.243143;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="ellipse849" />
|
||||
<g
|
||||
id="g621"
|
||||
style="stroke:#000000">
|
||||
<path
|
||||
id="path912"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186896;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
inkscape:transform-center-x="10.254103"
|
||||
inkscape:transform-center-y="-47.31279"
|
||||
d="m 77.588719,96.644842 c -0.0404,0.0013 -0.08204,0.01648 -0.115512,0.04511 l -0.417318,0.356966 c -0.06693,0.05725 -0.07502,0.146142 -0.01813,0.199278 0.05688,0.05313 0.156552,0.04979 0.223485,-0.0075 l 0.207738,-0.177666 v 1.54706 c -0.715499,0.02807 -1.401585,0.281249 -1.961782,0.719962 l 0.224742,0.230816 c 0.531777,-0.407043 1.184241,-0.630932 1.858583,-0.633517 h 4.3e-5 c 0.0039,-7e-6 0.0078,-7e-6 0.01173,0 0.12881,-0.0089 0.127492,-0.27991 0.120497,-0.31768 v -1.555939 l 0.218585,0.186964 c 0.06693,0.05725 0.166644,0.06059 0.223528,0.0075 0.05688,-0.05314 0.0488,-0.142027 -0.01814,-0.199278 l -0.417361,-0.356966 c -0.03695,-0.03161 -0.08387,-0.04668 -0.128077,-0.04498 -0.0042,-1.72e-4 -0.0084,-2.64e-4 -0.01261,-1.29e-4 z" />
|
||||
<path
|
||||
d="m 81.358954,98.125884 c -0.02951,-0.02762 -0.06967,-0.04636 -0.113574,-0.04978 l -0.547502,-0.04268 c -0.08781,-0.0068 -0.156385,0.05029 -0.153734,0.128087 0.0027,0.07779 0.07549,0.145911 0.1633,0.152757 l 0.272522,0.02126 -1.093937,1.093937 c -0.525783,-0.486085 -1.189943,-0.792198 -1.896279,-0.8781 l -0.0043,0.322128 c 0.663847,0.0882 1.283521,0.391249 1.762181,0.866253 l 3e-5,3e-5 c 0.0028,0.0028 0.0055,0.0055 0.0083,0.0083 0.09738,0.08478 0.288076,-0.107777 0.309837,-0.13943 l 1.100216,-1.100215 0.02236,0.286767 c 0.0068,0.08781 0.07499,0.160678 0.152786,0.163329 0.07779,0.0027 0.134933,-0.06592 0.128087,-0.153734 l -0.0427,-0.547531 c -0.0038,-0.04848 -0.0263,-0.09231 -0.05876,-0.122371 -0.0028,-0.0031 -0.0057,-0.0061 -0.0088,-0.009 z"
|
||||
inkscape:transform-center-y="-37.450462"
|
||||
inkscape:transform-center-x="-25.189642"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path952" />
|
||||
<path
|
||||
id="path954"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
inkscape:transform-center-x="-47.312807"
|
||||
inkscape:transform-center-y="-10.254107"
|
||||
d="m 82.977659,101.8391 c -0.0013,-0.0404 -0.01648,-0.082 -0.04511,-0.11551 l -0.356966,-0.41732 c -0.05725,-0.0669 -0.146142,-0.075 -0.199277,-0.0181 -0.05314,0.0569 -0.0498,0.15656 0.0075,0.22349 l 0.177667,0.20774 h -1.547061 c -0.02807,-0.7155 -0.281248,-1.40159 -0.719962,-1.961786 l -0.230816,0.224741 c 0.407043,0.531775 0.630932,1.184245 0.633517,1.858585 v 4e-5 c 1.1e-5,0.004 1.1e-5,0.008 0,0.0117 0.0089,0.12881 0.27991,0.12749 0.31768,0.12049 h 1.555939 l -0.186964,0.21859 c -0.05725,0.0669 -0.06059,0.16664 -0.0075,0.22353 0.05313,0.0569 0.142025,0.0488 0.199278,-0.0181 l 0.356965,-0.41736 c 0.03161,-0.037 0.04668,-0.0839 0.04498,-0.12808 1.62e-4,-0.004 2.43e-4,-0.008 1.62e-4,-0.0126 z" />
|
||||
<path
|
||||
d="m 81.496617,105.60933 c 0.02761,-0.0295 0.04636,-0.0697 0.04978,-0.11357 l 0.04268,-0.5475 c 0.0068,-0.0878 -0.05029,-0.15639 -0.128086,-0.15374 -0.07779,0.003 -0.145911,0.0755 -0.152756,0.1633 l -0.02126,0.27253 -1.093937,-1.09394 c 0.486084,-0.52578 0.792198,-1.18994 0.8781,-1.89628 l -0.322128,-0.004 c -0.0882,0.66385 -0.391249,1.28353 -0.866253,1.76218 l -3e-5,4e-5 c -0.0028,0.003 -0.0055,0.006 -0.0083,0.008 -0.08478,0.0974 0.107777,0.28807 0.13943,0.30983 l 1.100214,1.10022 -0.286766,0.0224 c -0.08781,0.007 -0.160679,0.075 -0.16333,0.15278 -0.0027,0.0778 0.06592,0.13494 0.153734,0.12809 l 0.547531,-0.0427 c 0.04848,-0.004 0.09231,-0.0263 0.122371,-0.0588 0.0031,-0.003 0.0061,-0.006 0.009,-0.009 z"
|
||||
inkscape:transform-center-y="25.189655"
|
||||
inkscape:transform-center-x="-37.45047"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path956" />
|
||||
<path
|
||||
id="path958"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
inkscape:transform-center-x="-10.254104"
|
||||
inkscape:transform-center-y="47.312816"
|
||||
d="m 77.783402,107.22804 c 0.0404,-10e-4 0.08205,-0.0165 0.115513,-0.0451 l 0.417317,-0.35697 c 0.06694,-0.0572 0.07502,-0.14614 0.01814,-0.19927 -0.05688,-0.0531 -0.156553,-0.0498 -0.223486,0.007 l -0.207738,0.17767 v -1.54706 c 0.715498,-0.0281 1.401585,-0.28125 1.961781,-0.71996 l -0.22474,-0.23082 c -0.531778,0.40705 -1.184242,0.63093 -1.858584,0.63352 h -4.3e-5 c -0.0039,10e-6 -0.0078,10e-6 -0.01173,0 -0.12881,0.009 -0.12749,0.27991 -0.120496,0.31768 l -1e-6,1.55594 -0.218584,-0.18697 c -0.06694,-0.0572 -0.166645,-0.0606 -0.223528,-0.007 -0.05688,0.0531 -0.0488,0.14202 0.01814,0.19928 l 0.41736,0.35696 c 0.03695,0.0316 0.08388,0.0467 0.128077,0.045 0.0042,1.6e-4 0.0084,2.5e-4 0.01261,1.6e-4 z" />
|
||||
<path
|
||||
d="m 74.013167,105.74699 c 0.02952,0.0276 0.06967,0.0464 0.113575,0.0498 l 0.547501,0.0427 c 0.08781,0.007 0.156385,-0.0503 0.153734,-0.12809 -0.0027,-0.0778 -0.07549,-0.14591 -0.1633,-0.15276 l -0.272523,-0.0213 1.093937,-1.09394 c 0.525783,0.48609 1.189944,0.7922 1.896279,0.8781 l 0.0043,-0.32213 c -0.663846,-0.0882 -1.28352,-0.39124 -1.76218,-0.86625 l -3.1e-5,-3e-5 c -0.0028,-0.003 -0.0055,-0.006 -0.0083,-0.008 -0.09738,-0.0848 -0.288076,0.10778 -0.309837,0.13943 l -1.100215,1.10021 -0.02236,-0.28676 c -0.0068,-0.0878 -0.07499,-0.16068 -0.152785,-0.16333 -0.0778,-0.003 -0.134933,0.0659 -0.128088,0.15373 l 0.0427,0.54753 c 0.0038,0.0485 0.0263,0.0923 0.05876,0.12237 0.0028,0.003 0.0058,0.006 0.0088,0.009 z"
|
||||
inkscape:transform-center-y="37.450474"
|
||||
inkscape:transform-center-x="25.189669"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path960" />
|
||||
<path
|
||||
id="path962"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
inkscape:transform-center-x="47.31282"
|
||||
inkscape:transform-center-y="10.254102"
|
||||
d="m 72.394463,102.03378 c 0.0013,0.0404 0.01648,0.0821 0.04511,0.11551 l 0.356967,0.41732 c 0.05725,0.0669 0.146142,0.075 0.199277,0.0181 0.05313,-0.0569 0.0498,-0.15656 -0.0075,-0.22349 l -0.177667,-0.20774 h 1.547061 c 0.02807,0.7155 0.281249,1.40159 0.719961,1.96178 l 0.230816,-0.22474 c -0.407043,-0.53177 -0.630931,-1.18424 -0.633516,-1.85858 v -4e-5 c -1.1e-5,-0.004 -9e-6,-0.008 0,-0.0117 -0.0089,-0.12881 -0.27991,-0.12749 -0.31768,-0.12049 h -1.555938 l 0.186963,-0.21859 c 0.05725,-0.0669 0.06059,-0.16664 0.0075,-0.22353 -0.05314,-0.0569 -0.142027,-0.0488 -0.199279,0.0181 l -0.356965,0.41736 c -0.03161,0.0369 -0.04668,0.0839 -0.04498,0.12808 -1.62e-4,0.004 -2.43e-4,0.008 -1.62e-4,0.0126 z" />
|
||||
<path
|
||||
d="m 73.875506,98.263546 c -0.02761,0.02952 -0.04636,0.06967 -0.04979,0.113575 l -0.04267,0.547501 c -0.0068,0.08781 0.05029,0.156385 0.128086,0.153734 0.0778,-0.0027 0.14591,-0.07549 0.152756,-0.163301 l 0.02126,-0.272522 1.093938,1.093937 c -0.486085,0.52578 -0.792198,1.18994 -0.8781,1.89628 l 0.322127,0.004 c 0.0882,-0.66384 0.391249,-1.28352 0.866253,-1.762175 l 3e-5,-3.2e-5 c 0.0028,-0.0028 0.0055,-0.0055 0.0083,-0.0083 0.08478,-0.09738 -0.107777,-0.288077 -0.13943,-0.309839 l -1.100214,-1.100214 0.286766,-0.02236 c 0.08781,-0.0068 0.160679,-0.07499 0.16333,-0.152784 0.0026,-0.0778 -0.06592,-0.134934 -0.153733,-0.128089 l -0.547531,0.0427 c -0.04848,0.0038 -0.09231,0.0263 -0.122371,0.05876 -0.0031,0.0028 -0.0061,0.0058 -0.009,0.0088 z"
|
||||
inkscape:transform-center-y="-25.189673"
|
||||
inkscape:transform-center-x="37.450476"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.186925;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path964" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 26 KiB |
@ -24,9 +24,7 @@ import outils.supprimeCaracatresSpeciaux;
|
||||
public class importInscriptionXLS {
|
||||
|
||||
public static void importe(File file) {
|
||||
if(commandes.nBase==null) {
|
||||
commandes.nBase = recupeBases.recupeLaBase();
|
||||
}
|
||||
if(commandes.nBase==null) commandes.nBase = recupeBases.recupeLaBase();
|
||||
|
||||
noeud nYear = null;
|
||||
if(commandes.nBase.getAttributes("defaut_Year")!=null) {
|
||||
@ -71,19 +69,22 @@ public class importInscriptionXLS {
|
||||
boolean mailpersoPresent = false;
|
||||
boolean mailPresent = false;
|
||||
boolean portablePresent = false;
|
||||
|
||||
for (Cell cell : sheet.getRow(0)) {
|
||||
if(cell.getCellType()==CellType.STRING) {
|
||||
if(cell.getStringCellValue().equals("Individu - Nom")) nomPresent=true;
|
||||
if(cell.getStringCellValue().equals("Individu - Prénom")) prenomPresent=true;
|
||||
if(cell.getStringCellValue().equals("Individu - Code Etudiant")) codePresent=true;
|
||||
if(cell.getStringCellValue().equals("IAE - Version d'étape (lib. web)")) formationPresent=true;
|
||||
if(cell.getStringCellValue().equals("Profil étudiant (lib.)")) profilPresent=true;
|
||||
if(cell.getStringCellValue().equals("Bac ou équivalence (lib.)")) bacPresent=true;
|
||||
if(cell.getStringCellValue().equals("Individu - Email personnel")) mailpersoPresent=true;
|
||||
if(cell.getStringCellValue().equals("Individu - Email")) mailPresent=true;
|
||||
if(cell.getStringCellValue().equals("Individu - Tél. portable")) portablePresent=true;
|
||||
String nameColumns = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(cell.getStringCellValue());
|
||||
if(nameColumns.equals(commandes.nomColonneNomEtudiant)) nomPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonnePrenomEtudiant)) prenomPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneCodeEtudiant)) codePresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneFormation)) formationPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneProfilEtudiant)) profilPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneBacEtudiant)) bacPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneMailPersoEtudiant)) mailpersoPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonneMailUnivEtudiant)) mailPresent=true;
|
||||
if(nameColumns.equals(commandes.nomColonnePortableEtudiant)) portablePresent=true;
|
||||
}
|
||||
}
|
||||
|
||||
if(!(nomPresent&&prenomPresent&&codePresent&&formationPresent&&profilPresent
|
||||
&&bacPresent&&mailpersoPresent&&mailPresent&&portablePresent)) {
|
||||
JOptionPane.showMessageDialog(null, "Ce n'est pas une feuille d'inscription de luniversité d'Artois.");
|
||||
@ -116,8 +117,8 @@ public class importInscriptionXLS {
|
||||
|
||||
|
||||
// Création ou insertion des informations récupéré dans le HashMap Student;
|
||||
if(Student.get("IAE - Version d'étape (lib. web)")!=null) {
|
||||
String nameFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(Student.get("IAE - Version d'étape (lib. web)"));
|
||||
if(Student.get(commandes.nomColonneExcel_Formation)!=null) {
|
||||
String nameFormation = supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(Student.get(commandes.nomColonneExcel_Formation));
|
||||
noeud nFormation = null;
|
||||
|
||||
// récupère le noeud formation ou bien création du noeud formation
|
||||
@ -142,7 +143,7 @@ public class importInscriptionXLS {
|
||||
nYear.addChild(nFormation);
|
||||
}
|
||||
|
||||
String nameNoeudStudent = "n"+String.valueOf(Student.get("Individu - Code Etudiant"));
|
||||
String nameNoeudStudent = "n"+String.valueOf(Student.get(commandes.nomColonneExcel_CodeEtudiant));
|
||||
noeud nStudent = null;
|
||||
if(nFormation.getChild(nameNoeudStudent)!=null) {
|
||||
nStudent = nFormation.getChild(nameNoeudStudent);
|
||||
@ -154,15 +155,15 @@ public class importInscriptionXLS {
|
||||
// Les noms de colonnes obligatoires pour la création
|
||||
// Le noms des colonnes subissent un traitement pour supprimer les espaces et les carcatères spéciaux.
|
||||
for (Map.Entry<String, String> entry : Student.entrySet()) {
|
||||
if(entry.getKey().equals("Individu - Nom")
|
||||
|| entry.getKey().equals("Individu - Prénom")
|
||||
|| entry.getKey().equals("Individu - Code Etudiant")
|
||||
|| entry.getKey().equals("IAE - Version d'étape (lib. web)")
|
||||
|| entry.getKey().equals("Profil étudiant (lib.)")
|
||||
|| entry.getKey().equals("Bac ou équivalence (lib.)")
|
||||
|| entry.getKey().equals("Individu - Email personnel")
|
||||
|| entry.getKey().equals("Individu - Email")
|
||||
|| entry.getKey().equals("Individu - Tél. portable")) {
|
||||
if(entry.getKey().equals(commandes.nomColonneExcel_NomEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_PrenomEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_CodeEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_Formation)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_ProfilEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_BacEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_MailPersoEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_MailUnivEtudiant)
|
||||
|| entry.getKey().equals(commandes.nomColonneExcel_PortableEtudiant)) {
|
||||
nStudent.setAttribut(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(entry.getKey()), entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,6 +30,7 @@ import Inscriptions.importInscriptionCSV;
|
||||
import Inscriptions.importInscriptionXLS;
|
||||
import base.CreateUpdateZipArchive;
|
||||
import base.Hash;
|
||||
import base.correspondanceNomDeColonneInscription;
|
||||
import base.recupeBases;
|
||||
import base.sauvegardeXMLBase;
|
||||
import exportations.exportBaseToExcel;
|
||||
@ -75,8 +76,12 @@ public class Window_demarre extends JFrame {
|
||||
|
||||
|
||||
// mise à jour de la base de données si nouvelle version de l'application utilisé.
|
||||
commandes.nBase=recupeBases.recupeLaBase();
|
||||
commandes.nBase=recupeBases.recupeLaBase();
|
||||
|
||||
// Chargement des noms des colonnes qui ont servi pendant l'inscription des étudiant
|
||||
correspondanceNomDeColonneInscription.chargement();
|
||||
|
||||
// Mise à jour de la version
|
||||
VersionChecker.UpdateVersion(commandes.nBase);
|
||||
|
||||
if(commandes.blocageApplication) {
|
||||
@ -155,10 +160,9 @@ public class Window_demarre extends JFrame {
|
||||
frmEvalwriter.setResizable(false);
|
||||
|
||||
btnExporterTouteLaBase = new JButton("<html>Exporter toute la base dans<br>un classeur MS Excel</html>");
|
||||
btnExporterTouteLaBase.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
btnExporterTouteLaBase.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/exportbasetoexcel.png")));
|
||||
btnExporterTouteLaBase.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnExporterTouteLaBase.setBounds(22, 724, 377, 78);
|
||||
btnExporterTouteLaBase.setBounds(10, 432, 377, 60);
|
||||
|
||||
frmEvalwriter.getContentPane().add(btnExporterTouteLaBase);
|
||||
|
||||
@ -177,20 +181,16 @@ public class Window_demarre extends JFrame {
|
||||
lblTitre.setFont(new Font("Pacifico", Font.PLAIN, 26));
|
||||
lblTitre.setBounds(10, 35, 753, 202);
|
||||
frmEvalwriter.getContentPane().add(lblTitre);
|
||||
|
||||
btnMiseAJourDepuisClasseur.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
btnMiseAJourDepuisClasseur.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/majInscriptionToBase.png")));
|
||||
btnMiseAJourDepuisClasseur.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
btnMiseAJourDepuisClasseur.setBounds(10, 428, 377, 134);
|
||||
btnMiseAJourDepuisClasseur.setBounds(10, 501, 377, 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, 328, 366, 263);
|
||||
btnGestionnaire.setBounds(397, 432, 366, 159);
|
||||
frmEvalwriter.getContentPane().add(btnGestionnaire);
|
||||
|
||||
btnimporterDesInscriptionsdepuisClasseur.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
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);
|
||||
@ -239,6 +239,17 @@ 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.setForeground(Color.GRAY);
|
||||
btnNewButton.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
}
|
||||
});
|
||||
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);
|
||||
|
||||
|
||||
|
||||
btnHelpDownload.setVisible(commandes.newVersion);
|
||||
@ -297,6 +308,10 @@ public class Window_demarre extends JFrame {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
File f = FileChooserXLSX.retourneFileXLSX();
|
||||
if(f!=null) {
|
||||
// chargement des noms des colonne pour incription
|
||||
correspondanceNomDeColonneInscription.chargement();
|
||||
|
||||
// Importation des inscription
|
||||
importInscriptionXLS.importe(f);
|
||||
}
|
||||
}
|
||||
@ -415,5 +430,4 @@ public class Window_demarre extends JFrame {
|
||||
}
|
||||
lblFondImage.setIcon(new ImageIcon(resizedImage));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -681,9 +681,9 @@ public class Window_gestionnaire extends JFrame {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if(nStudent!=null) {
|
||||
|
||||
String nomStudent = nStudent.getAttributes("Individu_-_Nom");
|
||||
String prenomStudent = nStudent.getAttributes("Individu_-_Prenom");
|
||||
String codeStudent = nStudent.getAttributes("Individu_-_Code_Etudiant");
|
||||
String nomStudent = nStudent.getAttributes(commandes.nomColonneNomEtudiant);
|
||||
String prenomStudent = nStudent.getAttributes(commandes.nomColonnePrenomEtudiant);
|
||||
String codeStudent = nStudent.getAttributes(commandes.nomColonneCodeEtudiant);
|
||||
String nomFormation = cFormations.getSelectedItem().toString();
|
||||
|
||||
int userChoice = JOptionPane.showConfirmDialog(null, "<html>Vous êtes sur le point de supprimer de la formation : \"<b>" + nomFormation +"</b>\"<br>"
|
||||
@ -694,6 +694,7 @@ public class Window_gestionnaire extends JFrame {
|
||||
if (userChoice == JOptionPane.YES_OPTION) {
|
||||
System.out.println("Vous avez choisi Oui.");
|
||||
commandes.nBase.getChild(nomFormation).removeChild(nStudent);
|
||||
sauvegardeXMLBase.save(commandes.nBase,saveType.SANS_MESSAGE,"");
|
||||
majTable();
|
||||
} else if (userChoice == JOptionPane.NO_OPTION) {
|
||||
System.out.println("Vous avez choisi Non.");
|
||||
@ -849,9 +850,9 @@ public class Window_gestionnaire extends JFrame {
|
||||
for (int i = 0; i < table.getColumnCount(); i++) {
|
||||
rowData[i] = table.getValueAt(selectedRow, i);
|
||||
}
|
||||
int indexCode = head.get("Individu_-_Code_Etudiant");
|
||||
int indexNom = head.get("Individu_-_Nom");
|
||||
int indexPrenom = head.get("Individu_-_Prenom");
|
||||
int indexCode = head.get(commandes.nomColonneCodeEtudiant);
|
||||
int indexNom = head.get(commandes.nomColonneNomEtudiant);
|
||||
int indexPrenom = head.get(commandes.nomColonnePrenomEtudiant);
|
||||
|
||||
if(rowData[indexPrenom]!=null && rowData[indexNom]!=null && rowData[indexCode]!=null) {
|
||||
lblInformationStudent.setText(rowData[indexPrenom].toString() + " " + rowData[indexNom].toString() + " - " + rowData[indexCode].toString() );
|
||||
@ -952,7 +953,6 @@ public class Window_gestionnaire extends JFrame {
|
||||
if(cGroupeProjet.getItemCount()>0) selectedGroupeProjet = cGroupeProjet.getSelectedItem().toString();
|
||||
if(cRegime.getItemCount()>0) selectedRegime = cRegime.getSelectedItem().toString();
|
||||
|
||||
|
||||
cGroupeTD.removeAllItems();
|
||||
cGroupeTP.removeAllItems();
|
||||
cLV1.removeAllItems();
|
||||
@ -1279,19 +1279,27 @@ public class Window_gestionnaire extends JFrame {
|
||||
|
||||
if(nYears!=null) {
|
||||
noeud nFormation = nYears.getChild(cFormations.getSelectedItem().toString());
|
||||
String[][] data = new String[nFormation.getChildren().size()][34] ;
|
||||
int nombreAttribut = 40;
|
||||
if(nFormation.getFirstChild()!=null) nombreAttribut = nFormation.getFirstChild().getNumberAttribut();
|
||||
|
||||
String[][] data = new String[nFormation.getChildren().size()][nombreAttribut] ;
|
||||
|
||||
// création de l'entête
|
||||
int indexCol = 0;
|
||||
int compteur = 0;
|
||||
noeud firstStudent = nFormation.getFirstChild();
|
||||
|
||||
if(firstStudent==null) {
|
||||
firstStudent = new noeud("tester");
|
||||
}
|
||||
|
||||
for (Map.Entry<String, String> entry : firstStudent.getAttributes().entrySet()) {
|
||||
String key = entry.getKey();
|
||||
if(chckToutesLesColonnes.isSelected() ) {
|
||||
headTable.put(key, indexCol);
|
||||
indexCol++;
|
||||
}else {
|
||||
if(key.equals("Individu_-_Nom") || key.equals("Individu_-_Prenom") || key.equals("Individu_-_Code_Etudiant")) {
|
||||
if(key.equals(commandes.nomColonneNomEtudiant) || key.equals(commandes.nomColonnePrenomEtudiant) || key.equals(commandes.nomColonneCodeEtudiant)) {
|
||||
headTable.put(key, indexCol);
|
||||
indexCol++;
|
||||
}
|
||||
@ -1362,7 +1370,7 @@ public class Window_gestionnaire extends JFrame {
|
||||
|
||||
if(!textPaneNom.getText().isEmpty()) {
|
||||
searchStudent=true;
|
||||
nameStudent = nStudent.getAttributes("Individu_-_Nom").toLowerCase();
|
||||
nameStudent = nStudent.getAttributes(commandes.nomColonneNomEtudiant).toLowerCase();
|
||||
String nameSearch = textPaneNom.getText().toLowerCase();
|
||||
boolean commencePar = nameStudent.matches("^"+nameSearch+".*");
|
||||
if(commencePar) containNameStudent=true;
|
||||
@ -1386,10 +1394,10 @@ public class Window_gestionnaire extends JFrame {
|
||||
if(headTable.get(entry.getKey())!=null) {
|
||||
String key = entry.getKey();
|
||||
if(chckToutesLesColonnes.isSelected() ) {
|
||||
data[indexRow][headTable.get(key)] = entry.getValue();
|
||||
if(!key.equals(commandes.nomColonneFormation)) data[indexRow][headTable.get(key)] = entry.getValue();
|
||||
}else {
|
||||
int indexColumn = headTable.get(key);
|
||||
if(key.equals("Individu_-_Nom") || key.equals("Individu_-_Prenom") || key.equals("Individu_-_Code_Etudiant")) {
|
||||
if(key.equals(commandes.nomColonneNomEtudiant) || key.equals(commandes.nomColonnePrenomEtudiant) || key.equals(commandes.nomColonneCodeEtudiant)) {
|
||||
data[indexRow][indexColumn] = entry.getValue();
|
||||
}
|
||||
if(chckGroupePrincipal.isSelected() && key.equals("Groupe_Principal") ) {
|
||||
@ -1479,8 +1487,8 @@ public class Window_gestionnaire extends JFrame {
|
||||
if (row != -1 && column != -1) {
|
||||
String key = getColumnsName()[column];
|
||||
|
||||
if(key.equals("IAE_-_Etape_lib.") || key.equals("Individu_-_Code_Etudiant")
|
||||
|| key.equals("Individu_-_Email")) {
|
||||
if(key.equals(commandes.nomColonneFormation) || key.equals(commandes.nomColonneCodeEtudiant)
|
||||
|| key.equals(commandes.nomColonneMailUnivEtudiant)) {
|
||||
JOptionPane.showMessageDialog(null, "<html>Impossible de modifier ce contenu.<br>"
|
||||
+ "Actualisez la table pour ne plus voir votre saisie.</html>", "Erreur", JOptionPane.ERROR_MESSAGE);
|
||||
return;
|
||||
@ -1489,7 +1497,7 @@ public class Window_gestionnaire extends JFrame {
|
||||
String value = (String) table.getValueAt(row, column);
|
||||
|
||||
// Obtenir l'indice de la colonne "Individu_-_Code_Etudiant"
|
||||
int columnIndex = table.getColumnModel().getColumnIndex("Individu_-_Code_Etudiant");
|
||||
int columnIndex = table.getColumnModel().getColumnIndex(commandes.nomColonneCodeEtudiant);
|
||||
String numeroEtudiant = (String) table.getModel().getValueAt(row, columnIndex);
|
||||
|
||||
noeud nF = commandes.nBase.getChild(defautYear).getChild(cFormations.getSelectedItem().toString());
|
||||
|
||||
@ -30,6 +30,32 @@ public class base {
|
||||
nBase.setAttribut("date_derniere_modification",DateEnClairFR(aujourdhui));
|
||||
nBase.setAttribut("version",commandes.version);
|
||||
|
||||
// Chargement des noms des colonnes par défaut pour inscrire des étudiants.
|
||||
correspondanceNomDeColonneInscription.chargementParDefaut();
|
||||
|
||||
nBase.setAttribut("Formation",commandes.nomColonneFormation);
|
||||
nBase.setAttribut(commandes.nomColonneCodeEtudiant,commandes.nomColonneCodeEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneNomEtudiant,commandes.nomColonneNomEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonnePrenomEtudiant,commandes.nomColonnePrenomEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneProfilEtudiant,commandes.nomColonneProfilEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneBacEtudiant,commandes.nomColonneBacEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonnePortableEtudiant,commandes.nomColonnePortableEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneMailPersoEtudiant,commandes.nomColonneMailPersoEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneMailUnivEtudiant,commandes.nomColonneMailUnivEtudiant);
|
||||
|
||||
nBase.setAttribut("Excel_Formation",commandes.nomColonneExcel_Formation);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneCodeEtudiant,commandes.nomColonneExcel_CodeEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneNomEtudiant,commandes.nomColonneExcel_NomEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonnePrenomEtudiant,commandes.nomColonneExcel_PrenomEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneProfilEtudiant,commandes.nomColonneExcel_ProfilEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneBacEtudiant,commandes.nomColonneExcel_BacEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonnePortableEtudiant,commandes.nomColonneExcel_PortableEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneMailPersoEtudiant,commandes.nomColonneExcel_MailPersoEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneMailUnivEtudiant,commandes.nomColonneExcel_MailUnivEtudiant);
|
||||
|
||||
|
||||
|
||||
|
||||
String defaultValue = "2022-2023";
|
||||
String userInput = JOptionPane.showInputDialog("Quelle est l'année universitaire ? ",defaultValue);
|
||||
|
||||
@ -58,16 +84,14 @@ public class base {
|
||||
|
||||
|
||||
} else {
|
||||
System.out.println("Le format est valide, mais le premier nombre n'est pas inférieur au second nombre.");
|
||||
JPanel panel = new JPanel();
|
||||
JLabel message = new JLabel("<html><p>Le format est valide, la première année n'est pas inférieure à la seconde année.</p>"
|
||||
JLabel message = new JLabel("<html><p>Le format est valide, la première année n'est pas inférieure à la seconde année d'une année.</p>"
|
||||
+ "<p>Exemple de format : 2023-2024</p></html>");
|
||||
panel.add(message);
|
||||
JOptionPane.showMessageDialog(null, panel, "Erreur", JOptionPane.ERROR_MESSAGE);
|
||||
|
||||
}
|
||||
} else {
|
||||
System.out.println("Le format est invalide.");
|
||||
JPanel panel = new JPanel();
|
||||
JLabel message = new JLabel("<html><p>Le format est invalide.</p>"
|
||||
+ "<p>Exemple de format : 2023-2024</p></html>");
|
||||
|
||||
88
src/base/correspondanceNomDeColonneInscription.java
Normal file
88
src/base/correspondanceNomDeColonneInscription.java
Normal file
@ -0,0 +1,88 @@
|
||||
package base;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import outils.commandes;
|
||||
import outils.supprimeCaracatresSpeciaux;
|
||||
|
||||
public class correspondanceNomDeColonneInscription {
|
||||
|
||||
public static void chargement() {
|
||||
// Valeurs par défaut
|
||||
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");
|
||||
|
||||
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");
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 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() {
|
||||
|
||||
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.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";
|
||||
}
|
||||
|
||||
public static void modifierLesNoms(HashMap<String, String> nomColonne) {
|
||||
|
||||
String nomColonneFormationDansBase = commandes.nBase.getAttributes("Formation");
|
||||
|
||||
|
||||
commandes.nomColonneFormation = nomColonne.get("Formation");
|
||||
// commandes.nomColonneNomEtudiant = nomColonne.get("Individu_-_Nom");
|
||||
// commandes.nomColonneNomEtudiant = nomColonne.get("Individu_-_Prenom");
|
||||
// commandes.nomColonneCodeEtudiant = nomColonne.get("Individu_-_Code_Etudiant");
|
||||
// commandes.nomColonneProfilEtudiant = nomColonne.get("Profil étudiant (lib.)");
|
||||
// commandes.nomColonneProfilEtudiant = nomColonne.get("Bac ou équivalence (lib.)");
|
||||
// commandes.nomColonnePortableEtudiant = nomColonne.get("Individu - Tél. portable");
|
||||
// commandes.nomColonneMailPersoEtudiant = nomColonne.get("Individu - Email personnel");
|
||||
// commandes.nomColonneMailUnivEtudiant = nomColonne.get("Individu - Email");
|
||||
|
||||
String baseString = commandes.nBase.toWrite();
|
||||
|
||||
String regex = "\\s"+nomColonneFormationDansBase + "=";
|
||||
String texte = " " + nomColonne.get("Formation") + "=";
|
||||
baseString = baseString.replaceAll(regex,texte);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -4,6 +4,8 @@ import java.awt.BorderLayout;
|
||||
import java.awt.Dimension;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
@ -88,6 +90,8 @@ public class CreateCalcWorkbook extends JFrame{
|
||||
try (Workbook workbook = new XSSFWorkbook()) {
|
||||
int rows = data.length; // Nombre de lignes
|
||||
int columns = data[0].length;
|
||||
List<String> nomDesFeuillesPresentes = new ArrayList<String>();
|
||||
int compteurNom = 1;
|
||||
|
||||
// Créer un style de cellule avec des bordures
|
||||
CellStyle cellStyle = workbook.createCellStyle();
|
||||
@ -103,8 +107,19 @@ public class CreateCalcWorkbook extends JFrame{
|
||||
|
||||
String nameFormation = new String((String) data[i][0]);
|
||||
String[][] data1 = (String[][]) data[i][columns-1];
|
||||
|
||||
|
||||
String nomFeuille = new String(nameFormation);
|
||||
|
||||
if(nomFeuille.length()>26) {
|
||||
nomFeuille = nomFeuille.substring(0, 26);
|
||||
}
|
||||
if(!nomDesFeuillesPresentes.contains(nomFeuille)) {
|
||||
nomDesFeuillesPresentes.add(nomFeuille);
|
||||
}else {
|
||||
nomFeuille = nomFeuille + "_" +String.valueOf(compteurNom++);
|
||||
nomDesFeuillesPresentes.add(nomFeuille);
|
||||
}
|
||||
|
||||
Sheet sheet = workbook.createSheet(nomFeuille);
|
||||
|
||||
//Entête de la première ligne
|
||||
@ -119,19 +134,21 @@ public class CreateCalcWorkbook extends JFrame{
|
||||
|
||||
// Boucle pour insérer les données dans les colonnes
|
||||
int rowNum = 1;
|
||||
for (Object[] rowData : data1) {
|
||||
Row row = sheet.createRow(rowNum++);
|
||||
|
||||
int colNum = 0;
|
||||
for (Object cellData : rowData) {
|
||||
Cell cell = row.createCell(colNum++);
|
||||
if (cellData instanceof String) {
|
||||
cell.setCellValue((String) cellData);
|
||||
} else if (cellData instanceof Integer) {
|
||||
cell.setCellValue((Integer) cellData);
|
||||
}
|
||||
cell.setCellStyle(cellStyle);
|
||||
}
|
||||
if(data1!=null) {
|
||||
for (Object[] rowData : data1) {
|
||||
Row row = sheet.createRow(rowNum++);
|
||||
|
||||
int colNum = 0;
|
||||
for (Object cellData : rowData) {
|
||||
Cell cell = row.createCell(colNum++);
|
||||
if (cellData instanceof String) {
|
||||
cell.setCellValue((String) cellData);
|
||||
} else if (cellData instanceof Integer) {
|
||||
cell.setCellValue((Integer) cellData);
|
||||
}
|
||||
cell.setCellStyle(cellStyle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for(int j = 0 ; j < tailleHead; j++) {
|
||||
|
||||
@ -20,29 +20,25 @@ public class exportBaseToExcel {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static void exportBase() {
|
||||
|
||||
// Données
|
||||
Object[][] data = new Object[commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getNumberChildren()][33];
|
||||
|
||||
|
||||
|
||||
int indexFormation = 0 ;
|
||||
for(noeud formation : commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getChildren()) {
|
||||
|
||||
|
||||
data[indexFormation][0] = formation.getFirstChild().getAttributes("IAE_-_Version_detape_lib._web");
|
||||
data[indexFormation][0] = formation.getName();
|
||||
data[indexFormation][1] = "Formation";
|
||||
data[indexFormation][2] = "Individu_-_Code_Etudiant";
|
||||
data[indexFormation][3] = "Individu_-_Prenom";
|
||||
data[indexFormation][4] = "Individu_-_Nom";
|
||||
data[indexFormation][5] = "Profil_etudiant_lib.";
|
||||
data[indexFormation][6] = "Individu_-_Tel._portable";
|
||||
data[indexFormation][7] = "Individu_-_Email_personnel";
|
||||
data[indexFormation][8] = "Individu_-_Email";
|
||||
data[indexFormation][2] = commandes.nomColonneCodeEtudiant; //.nBase.getAttributes("Individu_-_Code_Etudiant");
|
||||
data[indexFormation][3] = commandes.nomColonnePrenomEtudiant; //nBase.getAttributes("Individu_-_Prenom");
|
||||
data[indexFormation][4] = commandes.nomColonneNomEtudiant; //nBase.getAttributes("Individu_-_Nom");
|
||||
data[indexFormation][5] = commandes.nomColonneProfilEtudiant; //nBase.getAttributes("Profil_etudiant_lib.");
|
||||
data[indexFormation][6] = commandes.nomColonnePortableEtudiant; //nBase.getAttributes("Individu_-_Tel._portable");
|
||||
data[indexFormation][7] = commandes.nomColonneMailPersoEtudiant; //nBase.getAttributes("Individu_-_Email_personnel");
|
||||
data[indexFormation][8] = commandes.nomColonneMailUnivEtudiant; //nBase.getAttributes("Individu_-_Email");
|
||||
data[indexFormation][9] = "Groupe_Principal";
|
||||
data[indexFormation][10] = "Groupe_TD";
|
||||
data[indexFormation][11] = "Groupe_LV1";
|
||||
@ -67,42 +63,41 @@ public class exportBaseToExcel {
|
||||
data[indexFormation][30] = "Num_convention_2";
|
||||
data[indexFormation][31] = "Periode_2";
|
||||
|
||||
String[][] data1 = new String[formation.getNumberChildren()][32];
|
||||
String[][] data1 = new String[formation.getNumberChildren()][31];
|
||||
|
||||
int indexStudent = 0;
|
||||
for(noeud nStudent : formation.getChildren()) {
|
||||
data1[indexStudent][0] = nStudent.getAttributes("IAE_-_Version_detape_lib._web");;
|
||||
data1[indexStudent][1] = nStudent.getAttributes("Individu_-_Code_Etudiant");
|
||||
data1[indexStudent][2] = nStudent.getAttributes("Individu_-_Prenom");
|
||||
data1[indexStudent][3] = nStudent.getAttributes("Individu_-_Nom");
|
||||
data1[indexStudent][4] = nStudent.getAttributes("Profil_etudiant_lib.");
|
||||
data1[indexStudent][5] = nStudent.getAttributes("Individu_-_Tel._portable");
|
||||
data1[indexStudent][6] = nStudent.getAttributes("Individu_-_Email_personnel");
|
||||
data1[indexStudent][7] = nStudent.getAttributes("Individu_-_Email");
|
||||
data1[indexStudent][8] = nStudent.getAttributes("Groupe");
|
||||
data1[indexStudent][9] = nStudent.getAttributes("Groupe_Principal");
|
||||
data1[indexStudent][10] = nStudent.getAttributes("Groupe_TD");
|
||||
data1[indexStudent][11] = nStudent.getAttributes("Groupe_LV1");
|
||||
data1[indexStudent][12] = nStudent.getAttributes("Groupe_LV2");
|
||||
data1[indexStudent][13] = nStudent.getAttributes("LV1");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("Groupe_TP");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][18] = nStudent.getAttributes("Groupe_Projet");
|
||||
data1[indexStudent][19] = nStudent.getAttributes("Groupe_Doc");
|
||||
data1[indexStudent][20] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][21] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][22] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
data1[indexStudent][23] = nStudent.getAttributes("UE_Libre");
|
||||
data1[indexStudent][24] = nStudent.getAttributes("Covoiturage");
|
||||
data1[indexStudent][25] = nStudent.getAttributes("Etudiant_Covoiturage");
|
||||
data1[indexStudent][26] = nStudent.getAttributes("Stage_1");
|
||||
data1[indexStudent][27] = nStudent.getAttributes("Num_convention_1");
|
||||
data1[indexStudent][28] = nStudent.getAttributes("Periode_1");
|
||||
data1[indexStudent][29] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][30] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][31] = nStudent.getAttributes("Periode_2");
|
||||
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("LV1");
|
||||
data1[indexStudent][13] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Groupe_TP");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("Groupe_Projet");
|
||||
data1[indexStudent][18] = nStudent.getAttributes("Groupe_Doc");
|
||||
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");
|
||||
|
||||
|
||||
data[indexFormation][32] = data1;
|
||||
@ -153,13 +148,13 @@ public class exportBaseToExcel {
|
||||
|
||||
data[0][0] = nTable.getFirstChild().getAttributes("IAE_-_Version_detape_lib._web");
|
||||
data[0][1] = "Formation";
|
||||
data[0][2] = "Individu_-_Code_Etudiant";
|
||||
data[0][3] = "Individu_-_Prenom";
|
||||
data[0][4] = "Individu_-_Nom";
|
||||
data[0][5] = "Profil_etudiant_lib.";
|
||||
data[0][6] = "Individu_-_Tel._portable";
|
||||
data[0][7] = "Individu_-_Email_personnel";
|
||||
data[0][8] = "Individu_-_Email";
|
||||
data[0][2] = commandes.nomColonneFormation; //"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";
|
||||
@ -189,14 +184,14 @@ public class exportBaseToExcel {
|
||||
|
||||
int indexStudent = 0;
|
||||
for(noeud nStudent : nTable.getChildren()) {
|
||||
data1[indexStudent][0] = nStudent.getAttributes("IAE_-_Version_detape_lib._web");;
|
||||
data1[indexStudent][1] = nStudent.getAttributes("Individu_-_Code_Etudiant");
|
||||
data1[indexStudent][2] = nStudent.getAttributes("Individu_-_Prenom");
|
||||
data1[indexStudent][3] = nStudent.getAttributes("Individu_-_Nom");
|
||||
data1[indexStudent][4] = nStudent.getAttributes("Profil_etudiant_lib.");
|
||||
data1[indexStudent][5] = nStudent.getAttributes("Individu_-_Tel._portable");
|
||||
data1[indexStudent][6] = nStudent.getAttributes("Individu_-_Email_personnel");
|
||||
data1[indexStudent][7] = nStudent.getAttributes("Individu_-_Email");
|
||||
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");
|
||||
|
||||
@ -10,6 +10,7 @@ import java.util.regex.Pattern;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import base.correspondanceNomDeColonneInscription;
|
||||
import base.recupeBases;
|
||||
import base.sauvegardeXMLBase;
|
||||
import base.sauvegardeXMLBase.saveType;
|
||||
@ -189,12 +190,36 @@ public class VersionChecker {
|
||||
|
||||
|
||||
if(versionDeLaBase.equals("1.0.4")) {
|
||||
correspondanceNomDeColonneInscription.chargementParDefaut();
|
||||
|
||||
nBase.setAttribut("Formation",commandes.nomColonneFormation);
|
||||
nBase.setAttribut(commandes.nomColonneCodeEtudiant,commandes.nomColonneCodeEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneNomEtudiant,commandes.nomColonneNomEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonnePrenomEtudiant,commandes.nomColonnePrenomEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneProfilEtudiant,commandes.nomColonneProfilEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneBacEtudiant,commandes.nomColonneBacEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonnePortableEtudiant,commandes.nomColonnePortableEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneMailPersoEtudiant,commandes.nomColonneMailPersoEtudiant);
|
||||
nBase.setAttribut(commandes.nomColonneMailUnivEtudiant,commandes.nomColonneMailUnivEtudiant);
|
||||
|
||||
nBase.setAttribut("Excel_Formation",commandes.nomColonneExcel_Formation);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneCodeEtudiant,commandes.nomColonneExcel_CodeEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneNomEtudiant,commandes.nomColonneExcel_NomEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonnePrenomEtudiant,commandes.nomColonneExcel_PrenomEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneProfilEtudiant,commandes.nomColonneExcel_ProfilEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneBacEtudiant,commandes.nomColonneExcel_BacEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonnePortableEtudiant,commandes.nomColonneExcel_PortableEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneMailPersoEtudiant,commandes.nomColonneExcel_MailPersoEtudiant);
|
||||
nBase.setAttribut("Excel_"+commandes.nomColonneMailUnivEtudiant,commandes.nomColonneExcel_MailUnivEtudiant);
|
||||
|
||||
|
||||
for(noeud nFormation : nBase.getFirstChild().getChildren()) {
|
||||
nFormation.setAttribut("Colonne_Groupe_TP", "true");
|
||||
for(noeud nStudent : nFormation.getChildren()) {
|
||||
nStudent.addAttribute("Groupe_TP", "");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -19,6 +19,11 @@ import outils.commandes;
|
||||
import outils.noeud;
|
||||
import outils.supprimeCaracatresSpeciaux;
|
||||
|
||||
/**
|
||||
* Mise à jour de la base depuis un classeur Ms Excel.
|
||||
* @author pabr6
|
||||
*
|
||||
*/
|
||||
public class importAllBaseToExcel {
|
||||
|
||||
public static void lecture(File file) {
|
||||
|
||||
@ -5,6 +5,30 @@ 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
|
||||
|
||||
|
||||
// nom des colonnes après traitement des caractères (Accès à la base XML)
|
||||
public static String nomColonneFormation = null;
|
||||
public static String nomColonneNomEtudiant = null;
|
||||
public static String nomColonnePrenomEtudiant = null;
|
||||
public static String nomColonneCodeEtudiant = null;
|
||||
public static String nomColonneProfilEtudiant = null;
|
||||
public static String nomColonneBacEtudiant = null;
|
||||
public static String nomColonnePortableEtudiant = null;
|
||||
public static String nomColonneMailPersoEtudiant = null;
|
||||
public static String nomColonneMailUnivEtudiant = null;
|
||||
|
||||
// nom des colonnes avant traitement des caractères (Accès au classeur des inscriptions)
|
||||
public static String nomColonneExcel_Formation = null;
|
||||
public static String nomColonneExcel_NomEtudiant = null;
|
||||
public static String nomColonneExcel_PrenomEtudiant = null;
|
||||
public static String nomColonneExcel_CodeEtudiant = null;
|
||||
public static String nomColonneExcel_ProfilEtudiant = null;
|
||||
public static String nomColonneExcel_BacEtudiant = null;
|
||||
public static String nomColonneExcel_PortableEtudiant = null;
|
||||
public static String nomColonneExcel_MailPersoEtudiant = null;
|
||||
public static String nomColonneExcel_MailUnivEtudiant = null;
|
||||
|
||||
|
||||
// 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.
|
||||
|
||||
@ -233,6 +233,7 @@ public class noeud implements Cloneable{
|
||||
|
||||
/**
|
||||
* Clone de l'objet.
|
||||
* Le noeud cloné n'a pas de Parent.
|
||||
*/
|
||||
public noeud clone() throws CloneNotSupportedException {
|
||||
noeud cloned = (noeud) super.clone();
|
||||
@ -242,10 +243,19 @@ public class noeud implements Cloneable{
|
||||
if(this.content!=null) cloned.content = new String(this.content);
|
||||
cloned.attributes = new TreeMap<String,String>(this.attributes);
|
||||
cloned.children = new ArrayList<noeud>(this.children);
|
||||
// if(this.Parent!=null) cloned.Parent = this.Parent.clone();
|
||||
|
||||
|
||||
return cloned;
|
||||
}
|
||||
|
||||
/**
|
||||
* Changement du nom d'un attribut.
|
||||
* @param oldName
|
||||
* @param newName
|
||||
*/
|
||||
public void changeAttributName(String oldName, String newName) {
|
||||
if(attributes.get(oldName)==null) return;
|
||||
String value = attributes.get(oldName);
|
||||
attributes.remove(oldName);
|
||||
attributes.put(newName, value);
|
||||
}
|
||||
|
||||
|
||||
|
||||
BIN
src/resources/parametreImportationIncriptions.png
Normal file
BIN
src/resources/parametreImportationIncriptions.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
Loading…
x
Reference in New Issue
Block a user