MAJ V1.0.1 (JRE 1.8 with JDK 1.8.0_271)

This commit is contained in:
pablo rodriguez 2023-07-03 09:19:08 +02:00
parent f152091610
commit 837bbeac2b
9 changed files with 77 additions and 36 deletions

BIN
Base.xlsx

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

View File

@ -163,8 +163,8 @@
inkscape:document-rotation="0"
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="45.257179"
inkscape:cx="268.88089"
inkscape:cy="45.848777"
inkscape:cx="320.94144"
inkscape:zoom="1.6903395"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -310,33 +310,35 @@
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="g2362"
transform="matrix(0.11481241,0,0,0.11481241,235.1247,60.097108)"
style="stroke-width:3.16928;fill:#ffffff"><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
id="g2449"
transform="matrix(1.1432259,0,0,1.1432259,-22.591005,-7.8839574)"><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="g2056"
transform="translate(-35.154076,-15.621205)"><g
id="g1248"

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -10,6 +10,7 @@ import java.awt.event.InputEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -334,8 +335,6 @@ public class gestionnaire extends JFrame {
}
});
JMenu menuExport = new JMenu("Export");
menuExport.setFont(new Font("Tahoma", Font.BOLD, 14));
JMenuItem exportItem = menuExport.add(new exportTable(this));
@ -345,6 +344,30 @@ public class gestionnaire extends JFrame {
menuExport.add(emargement);
menuBar.add(menuExport);
JMenu mnNewMenu = new JMenu("Base");
mnNewMenu.setFont(new Font("Tahoma", Font.BOLD, 14));
menuBar.add(mnNewMenu);
JMenuItem menueSauvegardeBase = new JMenuItem("Créer une sauvegarde de la base");
mnNewMenu.add(menueSauvegardeBase);
menueSauvegardeBase.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
File f = FileChooserXML.retourneFileXML();
if(f!=null) {
sauvegardeXMLBase.saveSauvegarde(commandes.nBase, f.getAbsolutePath());
}
}
});
mnNewMenu.addSeparator();
JMenuItem menuSelectYearDefautl = new JMenuItem("Sélectionner une année universitaire par défaut");
mnNewMenu.add(menuSelectYearDefautl);
JMenuItem menuCreateYearDefault = new JMenuItem("Créer une année universitaire");
mnNewMenu.add(menuCreateYearDefault);
panelNorth.add(panelFiltre);
@ -1291,6 +1314,4 @@ public class gestionnaire extends JFrame {
ignoreItemStateChange = false;
}
}
}

View File

@ -32,7 +32,7 @@ public class sauvegardeXMLBase {
}
public static void saveSauvegarde(noeud nBase) {
public static void saveSauvegarde(noeud nBase) {
// Sauvegarde de la base
String directoryName = Paths.get("").toAbsolutePath().toString()+ "/base_sauvegarde.xml";
@ -46,6 +46,24 @@ public static void saveSauvegarde(noeud nBase) {
}
public static void saveSauvegarde(noeud nBase, String path) {
if(!path.endsWith(".xml")) {
path = path + ".xml";
}
try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(path), StandardCharsets.UTF_8))) {
writer.write(nBase.toWrite());
JOptionPane.showMessageDialog(null, "Sauvegarde réussi.","Message",JOptionPane.OK_OPTION);
} catch (IOException e) {
e.printStackTrace();
JOptionPane.showMessageDialog(null, e.toString(), "Erreur dans la méthode saveSauvegarde.", JOptionPane.ERROR_MESSAGE);
}
}
public static void saveModif(noeud nBase, Integer nbreModif) {
// Sauvegarde de la base