From 204e5cb6609251a9e9c39df2220f28a42440a929 Mon Sep 17 00:00:00 2001 From: Niklas Meinzer Date: Thu, 18 Sep 2025 14:57:11 +0200 Subject: [PATCH] Adjust flat data for Bieterunde 2025 --- prepareFlatData.py | 2 +- src/App.js | 2 +- src/Data.js | 2 +- src/rent_data.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prepareFlatData.py b/prepareFlatData.py index 32c096c..f929b00 100644 --- a/prepareFlatData.py +++ b/prepareFlatData.py @@ -1,7 +1,7 @@ from pandas import read_excel import json -PATH = "/home/niklas/Nextcloud_Allmende/wohpro/04_AGs/04_AG_Finanzen/Finanzierungsplan MHS/2024-11-05_FP_Allmende_Umschuldung_Angebot Nachfinanzierung_Szenarien_Solimieten.xlsx" +PATH = "/home/niklas/ownCloud/wohpro/04_AGs/04_AG_Finanzen/Finanzierungsplan MHS/2025-09-11_FP_Allmende_AG_Treffen.xlsx" OUTPUT_PATH = "./rent_data.json" diff --git a/src/App.js b/src/App.js index c1560dd..ad4fdde 100644 --- a/src/App.js +++ b/src/App.js @@ -94,7 +94,7 @@ function App() { Nun siehst du den daraus resultierenden Mietpreis absolut und auf den Quadratmeter gerechnet. - ACHTUNG: Durch die vielen Änderungen in den letzten Tagen wurden dieses Tool zuletzt mit heißer Nadel gestrickt. Bitte verzeiht, wenn etwas nicht funktioniert. Wenn euch etwas komisch vorkommt, meldet euch bei Niklas. Die Zahlen sind alle ohne Gewähr. Grundlage für's Bieteverfahren sind die Zahlen, die wir rumgeschickt haben. + Wohnung diff --git a/src/Data.js b/src/Data.js index 4348bc2..bc80b84 100644 --- a/src/Data.js +++ b/src/Data.js @@ -103,7 +103,7 @@ export const flatData = { new Flat("W 3.2 (Cluster)", 5, true, true, [ new Room("1 Person", 1, "3.2.02"), new Room("2 Personen", 2, "3.2.05"), new Room("1 Person (rollstuhlgerecht)", 1, "3.2.09") ]), - new Flat("3.3", 3, true, false, null, ["3.3.02", "3.3.03", "3.3.04"]) + new Flat("3.3", 3, true) ] }, "south": { diff --git a/src/rent_data.json b/src/rent_data.json index d4687e0..aecc995 100644 --- a/src/rent_data.json +++ b/src/rent_data.json @@ -1 +1 @@ -{"0.1.02": {"size_private": 12.523, "size_shared": 13.1883333333333, "min_rent": 386.125030211818, "free_rent": 569.238656506753, "wbs_rent": 454.264741425668}, "0.1.03": {"size_private": 12.102, "size_shared": 13.9728333333333, "min_rent": 389.321506569916, "free_rent": 574.624687594623, "wbs_rent": 458.02530184696}, "0.1.04": {"size_private": 14.746, "size_shared": 13.9728333333333, "min_rent": 412.571805031566, "free_rent": 613.801210830743, "wbs_rent": 485.378594154784}, "0.2": {"size_private": 51.884, "size_shared": 0.0, "min_rent": 781.973511390723, "free_rent": 1151.97962115254, "wbs_rent": 919.968836930261}, "0.3": {"size_private": 60.195, "size_shared": 0.0, "min_rent": 876.30718405138, "free_rent": 1300.12488764853, "wbs_rent": 1030.94962829574}, "0.4": {"size_private": 54.905, "size_shared": 0.0, "min_rent": 808.538999912904, "free_rent": 1196.74220689245, "wbs_rent": 951.222352838709}, "0.5": {"size_private": 82.822, "size_shared": 0.0, "min_rent": 1096.53014293631, "free_rent": 1660.39235786928, "wbs_rent": 1290.03546227802}, "0.6": {"size_private": 93.304, "size_shared": 0.0, "min_rent": 1205.70473766968, "free_rent": 1835.7056394733, "wbs_rent": 1418.47616196433}, "1.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 1076.61262175037, "free_rent": 1626.83153142079, "wbs_rent": 1266.6030844122}, "1.2": {"size_private": 34.95, "size_shared": 0.0, "min_rent": 495.699572844585, "free_rent": 739.462624990402, "wbs_rent": 583.175968052453}, "1.3.02": {"size_private": 11.434, "size_shared": 9.014, "min_rent": 339.841342275679, "free_rent": 491.251099535204, "wbs_rent": 399.813343853739}, "1.3.03": {"size_private": 11.245, "size_shared": 9.014, "min_rent": 338.17935044162, "free_rent": 488.450659712349, "wbs_rent": 397.858059343081}, "1.3.04": {"size_private": 11.77, "size_shared": 7.377, "min_rent": 328.400858804193, "free_rent": 471.973997897461, "wbs_rent": 386.353951534344}, "1.4": {"size_private": 54.819, "size_shared": 0.0, "min_rent": 807.782749660369, "free_rent": 1195.46793268734, "wbs_rent": 950.332646659256}, "1.5.02": {"size_private": 15.448, "size_shared": 8.01425, "min_rent": 362.805807279976, "free_rent": 531.747002900486, "wbs_rent": 426.830361505854}, "1.5.03": {"size_private": 9.815, "size_shared": 8.01425, "min_rent": 313.271415738949, "free_rent": 448.282042465894, "wbs_rent": 368.554606751704}, "1.5.05": {"size_private": 11.489, "size_shared": 8.01425, "min_rent": 327.991914840614, "free_rent": 473.085938039746, "wbs_rent": 385.872840988957}, "1.5.06": {"size_private": 13.462, "size_shared": 8.01425, "min_rent": 345.341702610976, "free_rent": 502.320159047637, "wbs_rent": 406.284356012912}, "1.6.1": {"size_private": 108.761, "size_shared": 0.0, "min_rent": 1341.62753015143, "free_rent": 2064.73420212863, "wbs_rent": 1578.38532958991}, "1.6.2": {"size_private": 30.301, "size_shared": 0.0, "min_rent": 454.818091169769, "free_rent": 670.577732204955, "wbs_rent": 535.080107258552}, "2.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 1076.61262175037, "free_rent": 1626.83153142079, "wbs_rent": 1266.6030844122}, "2.2": {"size_private": 44.742, "size_shared": 0.0, "min_rent": 719.169565999986, "free_rent": 1046.15559356087, "wbs_rent": 846.081842352924}, "2.3.02": {"size_private": 27.255, "size_shared": 9.04425, "min_rent": 475.689347882173, "free_rent": 721.954653725778, "wbs_rent": 559.634526920203}, "2.3.05": {"size_private": 44.225, "size_shared": 18.0885, "min_rent": 852.43644172574, "free_rent": 1281.51500280576, "wbs_rent": 1002.86640203028}, "2.3.09": {"size_private": 40.129, "size_shared": 9.04425, "min_rent": 588.898251965111, "free_rent": 912.710538802105, "wbs_rent": 692.821472900131}, "2.4": {"size_private": 60.991, "size_shared": 0.0, "min_rent": 840.80689569112, "free_rent": 1261.91933261674, "wbs_rent": 989.184583166024}, "2.5": {"size_private": 54.175, "size_shared": 0.0, "min_rent": 681.756678716458, "free_rent": 1044.32217839978, "wbs_rent": 802.066680842891}, "2.6": {"size_private": 83.025, "size_shared": 0.0, "min_rent": 1098.3152452766, "free_rent": 1663.40023767902, "wbs_rent": 1292.13558267835}, "2.7": {"size_private": 93.4, "size_shared": 0.0, "min_rent": 1206.54892399809, "free_rent": 1837.1280850976, "wbs_rent": 1419.4693223507}, "3.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 1076.61262175037, "free_rent": 1626.83153142079, "wbs_rent": 1266.6030844122}, "3.2.02": {"size_private": 27.012, "size_shared": 9.092, "min_rent": 473.972396000691, "free_rent": 719.061606765925, "wbs_rent": 557.614583530225}, "3.2.05": {"size_private": 44.633, "size_shared": 18.184, "min_rent": 856.864023146103, "free_rent": 1288.97543376241, "wbs_rent": 1008.07532134836}, "3.2.09": {"size_private": 40.129, "size_shared": 9.092, "min_rent": 589.31814672742, "free_rent": 913.418057328778, "wbs_rent": 693.315466738141}, "3.3.02": {"size_private": 11.434, "size_shared": 9.014, "min_rent": 339.841342275679, "free_rent": 491.251099535204, "wbs_rent": 399.813343853739}, "3.3.03": {"size_private": 11.245, "size_shared": 9.014, "min_rent": 338.17935044162, "free_rent": 488.450659712349, "wbs_rent": 397.858059343081}, "3.3.04": {"size_private": 11.77, "size_shared": 7.377, "min_rent": 328.400858804193, "free_rent": 471.973997897461, "wbs_rent": 386.353951534344}} \ No newline at end of file +{"0.1.02": {"size_private": 12.523, "size_shared": 13.1883333333333, "min_rent": 349.712155237292, "free_rent": 523.184902902596, "wbs_rent": 411.426064985049}, "0.1.03": {"size_private": 12.102, "size_shared": 13.9728333333333, "min_rent": 353.218347191747, "free_rent": 528.889851373504, "wbs_rent": 415.550996696174}, "0.1.04": {"size_private": 14.746, "size_shared": 13.9728333333333, "min_rent": 378.721432549603, "free_rent": 570.386092796002, "wbs_rent": 445.554626528945}, "0.2": {"size_private": 51.884, "size_shared": 0.0, "min_rent": 718.32416803072, "free_rent": 1070.6101989127, "wbs_rent": 845.08725650673}, "0.3": {"size_private": 60.195, "size_shared": 0.0, "min_rent": 798.479477911123, "free_rent": 1201.03144181019, "wbs_rent": 939.387621071909}, "0.4": {"size_private": 54.905, "size_shared": 0.0, "min_rent": 747.454015905427, "free_rent": 1118.00756997773, "wbs_rent": 879.357665771091}, "0.5": {"size_private": 82.822, "size_shared": 0.0, "min_rent": 1018.68955306992, "free_rent": 1559.33673366935, "wbs_rent": 1198.45829772931}, "0.6": {"size_private": 93.304, "size_shared": 0.0, "min_rent": 1118.78241114801, "free_rent": 1722.19849510706, "wbs_rent": 1316.2146013506}, "1.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 994.90339252057, "free_rent": 1520.63411213082, "wbs_rent": 1170.47457943596}, "1.2": {"size_private": 34.95, "size_shared": 0.0, "min_rent": 467.309699744908, "free_rent": 701.69679347121, "wbs_rent": 549.776117346951}, "1.3.02": {"size_private": 11.434, "size_shared": 9.014, "min_rent": 303.955411228271, "free_rent": 448.669957380697, "wbs_rent": 357.594601445025}, "1.3.03": {"size_private": 11.245, "size_shared": 9.014, "min_rent": 300.614703446945, "free_rent": 443.234269319008, "wbs_rent": 353.664356996406}, "1.3.04": {"size_private": 11.77, "size_shared": 7.377, "min_rent": 309.894447283963, "free_rent": 458.3334028237, "wbs_rent": 364.581702687015}, "1.4": {"size_private": 54.819, "size_shared": 0.0, "min_rent": 746.634136081139, "free_rent": 1116.67353801067, "wbs_rent": 878.393101271928}, "1.5.02": {"size_private": 15.448, "size_shared": 8.01425, "min_rent": 362.436663985396, "free_rent": 545.421199352289, "wbs_rent": 426.396075276936}, "1.5.03": {"size_private": 9.815, "size_shared": 8.01425, "min_rent": 266.12472451771, "free_rent": 388.711395972007, "wbs_rent": 313.087911197306}, "1.5.05": {"size_private": 11.489, "size_shared": 8.01425, "min_rent": 294.7464512475, "free_rent": 435.281999710441, "wbs_rent": 346.760530879412}, "1.5.06": {"size_private": 13.462, "size_shared": 8.01425, "min_rent": 328.480421879444, "free_rent": 490.170769827481, "wbs_rent": 386.447555152287}, "1.6.1": {"size_private": 108.761, "size_shared": 0.0, "min_rent": 1118.78241114801, "free_rent": 1722.19849510706, "wbs_rent": 1316.2146013506}, "1.6.2": {"size_private": 30.301, "size_shared": 0.0, "min_rent": 399.375422068895, "free_rent": 591.160474129811, "wbs_rent": 469.853437728111}, "2.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 994.90339252057, "free_rent": 1520.63411213082, "wbs_rent": 1170.47457943596}, "2.2": {"size_private": 44.742, "size_shared": 0.0, "min_rent": 649.434971500536, "free_rent": 958.520124692018, "wbs_rent": 764.041142941807}, "2.3.02": {"size_private": 27.255, "size_shared": 9.04425, "min_rent": 446.322931698395, "free_rent": 680.317105843498, "wbs_rent": 525.085801998112}, "2.3.05": {"size_private": 44.225, "size_shared": 18.0885, "min_rent": 768.059420779515, "free_rent": 1164.30278617368, "wbs_rent": 903.599318564135}, "2.3.09": {"size_private": 40.129, "size_shared": 9.04425000000001, "min_rent": 626.793400720383, "free_rent": 973.961817731705, "wbs_rent": 737.404000847509}, "2.4": {"size_private": 60.991, "size_shared": 0.0, "min_rent": 806.167056969447, "free_rent": 1213.53995331311, "wbs_rent": 948.431831728762}, "2.5": {"size_private": 54.175, "size_shared": 0.0, "min_rent": 652.71828777392, "free_rent": 1003.37635195202, "wbs_rent": 767.903867969318}, "2.6": {"size_private": 83.025, "size_shared": 0.0, "min_rent": 1018.68955306992, "free_rent": 1559.33673366935, "wbs_rent": 1198.45829772931}, "2.7": {"size_private": 93.4, "size_shared": 0.0, "min_rent": 1118.78241114801, "free_rent": 1722.19849510706, "wbs_rent": 1316.2146013506}, "3.1": {"size_private": 80.557, "size_shared": 0.0, "min_rent": 994.90339252057, "free_rent": 1520.63411213082, "wbs_rent": 1170.47457943596}, "3.2.02": {"size_private": 27.012, "size_shared": 9.092, "min_rent": 449.545719529095, "free_rent": 685.560925561768, "wbs_rent": 528.877317093053}, "3.2.05": {"size_private": 44.633, "size_shared": 18.184, "min_rent": 773.470540494268, "free_rent": 1173.10725539373, "wbs_rent": 909.965341757963}, "3.2.09": {"size_private": 40.129, "size_shared": 9.092, "min_rent": 626.859864957374, "free_rent": 974.069962137978, "wbs_rent": 737.482194067499}, "3.3": {"size_private": 59.854, "size_shared": 0.0, "min_rent": 882.8847202566, "free_rent": 1298.85385705092, "wbs_rent": 1038.68790618424}} \ No newline at end of file