diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 314442c74..79883a237 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -29,7 +29,7 @@ jobs: outputs: tags: ${{ steps.meta.outputs.tags }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@v4 - run: cp openapi.yaml data/output - name: Log in to the Container registry uses: docker/login-action@v3 diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml index 6c9662cda..775d7ed35 100644 --- a/.github/workflows/data-cicd.yml +++ b/.github/workflows/data-cicd.yml @@ -15,7 +15,7 @@ jobs: matrix: python-version: ["3.10", "3.11"] steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -30,7 +30,7 @@ jobs: #type-check: # runs-on: ubuntu-latest # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 #- name: Set up Python ${{ matrix.python-version }} # uses: actions/setup-python@v4 # with: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 941a556af..eb9a4183a 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -12,7 +12,7 @@ jobs: linting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: cache: 'npm' diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml index ea8236e9c..719084ceb 100644 --- a/.github/workflows/server-cicd.yml +++ b/.github/workflows/server-cicd.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup | Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@v4 - name: Setup | Rust uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup | Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@v4 - name: Setup | Rust uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml index 6403f382e..c4733f447 100644 --- a/.github/workflows/webclient-cicd.yml +++ b/.github/workflows/webclient-cicd.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: jobs: - webclient-ui-test: + webclient-e2e-test: strategy: matrix: browser: @@ -17,10 +17,10 @@ jobs: - firefox runs-on: ubuntu-latest container: - image: cypress/browsers:node16.16.0-chrome107-ff107 + image: cypress/browsers:node-20.9.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-1 options: --user 1001 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@v4 - uses: actions/setup-node@v4 - uses: pnpm/action-setup@v2.4.0 with: @@ -36,7 +36,7 @@ jobs: webclient-linting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: cache: 'npm' @@ -48,7 +48,7 @@ jobs: uses: ./.github/workflows/_docker-build.yml needs: - webclient-linting - - webclient-ui-test + - webclient-e2e-test with: image_suffix: webclient context: ./webclient diff --git a/webclient/README.md b/webclient/README.md index 5269b6bb7..61fec2352 100644 --- a/webclient/README.md +++ b/webclient/README.md @@ -77,22 +77,21 @@ Each of those files are similar but differ in some aspects. If you serve the release build with a webserver (such as Nginx) you need to select the correct files based on the request URL and headers. ```plain --.html - ↑ ↑ - │ └── The page language. Either "de" or "en" at the moment. - │ It should be selected based on the "lang" Cookie or else the "Accept-Language" header. +.html + ↑ └── The page theme. Either "light" or "dark" at the moment. It should be selected based on the "theme" Cookie ("light" by default). ``` The language-selector is working in development and this differentialtion is only happening in the build. For the theme we can not do so for some reason (If you know of a better way, hit us up). -To test a different theme, you can change `$theme` [here](./src/assets/variables.scss). Values are `light` and `dark`. +To test a different theme, you can change `$theme` [here](./src/assets/variables.scss) and `theme='...'` [here](./index.html). Values are `light` and `dark`. ## Architecture The NavigaTUM webclient is made as a single-page application based on [Vue.js](https://vuejs.org/) and [Vue Router](https://router.vuejs.org/). -For state management we use [pinia](https://pinia.vuejs.org/) and our CSS framework is [Spectre.css](https://picturepan2.github.io/spectre/). +For state management we use [pinia](https://pinia.vuejs.org/). +Our CSS framework is currently being migrated from [Spectre.css](https://picturepan2.github.io/spectre/) to [Tailwind](https://tailwindcss.com/). (if you're interested in helping out, please contact us ^^) ### Directory structure (only the important parts) @@ -100,7 +99,7 @@ For state management we use [pinia](https://pinia.vuejs.org/) and our CSS framew webclient ├── public/ # 🠔 Static assets such as icons, which cannot get inlined ├── src/ -│ ├── codegen/ # 🠔 code generated via openapi.yaml for typechecking reasons +│ ├── api_types/ # 🠔 code generated via openapi.yaml for typechecking reasons │ ├── assets/ # 🠔 Static assets such as icons │ │ ├── md/ # 🠔 Static pages written in markdown. Served at `/about/`. │ │ ├── variables.scss # 🠔 Include-script for Spectre.CSS @@ -108,12 +107,11 @@ webclient │ │ ├── spectre-all.scss # 🠔 Include-script for Spectre.CSS │ │ └── logos # 🠔 The Logos used by the app │ ├── components/ # 🠔 Vue components, which are used in views. -│ ├── views/ # 🠔 The views are parts of App.vue, which are loaded dynamically based on our routes. -│ ├── router.ts # 🠔 The views are parts of App.vue, which are loaded dynamically based on our routes. +│ ├── pages/ # 🠔 The views are parts of App.vue, which are loaded dynamically based on our routes. +│ ├── router.ts # 🠔 The routes of our app. This is where the views are loaded. │ ├── App.vue # 🠔 Main view -│ └── main.ts # 🠔 Inialization of Vue.js. This is the entrypoint of our app, from which App.vue and associated Views/Components are loaded +│ └── main.ts # 🠔 Inialization of Vue.js. This is the entrypoint of our app, from which App.vue and associated views/components are loaded ├── vite.config.ts # 🠔 Build configuration -├── gulpfile.js # 🠔 Gulp configuration └── package.json # 🠔 Node package definition and dependencies ``` @@ -130,9 +128,21 @@ The reason behind these tests is that they fundamentally increase the future pro There are a few ways of running cypress -#### Running headless +#### e2e tests -For running headless, it is assumed, that you are on a normal machine (not a mac) and have [Chrome](https://www.google.com/intl/de/chrome/) + [Firefox Developer Edition](https://www.mozilla.org/de/firefox/developer/) installed. +For running e2e tests, it is assumed, that you + +- are on a normal machine (not a mac) +- have [Chrome](https://www.google.com/intl/de/chrome/) + [Firefox Developer Edition](https://www.mozilla.org/de/firefox/developer/) installed. +- have the webclient running on `http://localhost:3000` (i.e. `npm run dev`) + +The interface for interacting with cypress can be opened via + +```bash +pnpm run cy:open +``` + +##### Running headless ```bash pnpm run test @@ -140,14 +150,16 @@ pnpm run test There are also some subtargets preconfigured like `cy:run:chrome` and `cy:run:firefox`, but likely for debugging you want the second mode. -#### Running headed - -The interface for interacting with cypress can be opened via +#### component tests ```bash -pnpm run cy:open +pnpm run test:components ``` +Currently, these are not run in CI, as I could not get cypress to behave in [#892](https://github.com/TUM-Dev/NavigaTUM/pull/892) + +#### Running headed + ### Writing Tests Our Cypress test suite is located in the cypress directory, organized into different files and folders based on the features and components being tested. diff --git a/webclient/build.sh b/webclient/build.sh index 0c4b0b097..4133838ff 100755 --- a/webclient/build.sh +++ b/webclient/build.sh @@ -7,8 +7,9 @@ rm -fr ../dist for THEME in light dark do - # make sure we are really only building the right theme and language + # make sure we are really only building the right theme sed -i "s/\$theme: .*/\$theme: \"${THEME}\";/" src/assets/variables.scss + sed -i 's/class="light"/class="${THEME}"/' index.html echo "Building ${THEME}" npm run build-only diff --git a/webclient/cypress.config.ts b/webclient/cypress.config.ts index a48aa31f7..ced9fe31c 100644 --- a/webclient/cypress.config.ts +++ b/webclient/cypress.config.ts @@ -8,5 +8,10 @@ export default defineConfig({ setupNodeEvents(on, config) { initPlugin(on, config); }, + component: { + devServer: { + framework: "vue", + bundler: "vite", + }, }, }); diff --git a/webclient/cypress.d.ts b/webclient/cypress.d.ts new file mode 100644 index 000000000..bc68c679b --- /dev/null +++ b/webclient/cypress.d.ts @@ -0,0 +1,8 @@ +import type { mount } from "cypress/vue"; +declare global { + namespace Cypress { + interface Chainable { + mount: mount; + } + } +} diff --git a/webclient/cypress/e2e/feedback.cy.ts b/webclient/cypress/e2e/feedback.cy.ts index 9244aee89..dbba32d36 100644 --- a/webclient/cypress/e2e/feedback.cy.ts +++ b/webclient/cypress/e2e/feedback.cy.ts @@ -25,48 +25,10 @@ describe("Check if opening the feedback form works from every subview", () => { }); function checkFeedbackForm(selector_which_should_open_the_modal: string) { - // mock the feedback api - cy.intercept("POST", "/api/feedback/get_token", { statusCode: 201, fixture: "feedback/get_token.json" }); - cy.intercept("POST", "/api/feedback/feedback", { statusCode: 201, fixture: "feedback/feedback.json" }); - // open the modal cy.get('[data-cy="feedback-modal"]').should("not.exist"); + cy.intercept("POST", "/api/feedback/get_token", { statusCode: 201, fixture: "feedback/get_token.json" }); cy.get(selector_which_should_open_the_modal).click({ scrollBehavior: false }); - - // check that the modal is opened cy.get('[data-cy="feedback-modal"]').should("exist"); - cy.get('[data-cy="feedback-error"]').should("be.empty"); - cy.get("#feedback-privacy").should("not.be.checked"); - cy.get("#feedback-delete").should("not.be.checked"); - - // make shure that the modal is empty - cy.get("#feedback-subject").clear(); - cy.get("#feedback-body").clear(); - - // fill out the form, but don't accept the privacy policy - cy.get('[data-cy="feedback-send"]').click(); - cy.get('[data-cy="feedback-error"]').contains("musst die Datenschutzerklärung akzeptiert haben"); - cy.get("#feedback-privacy").parent().click(); - - // try to submit without filling out the form - cy.get('[data-cy="feedback-send"]').click(); - cy.get('[data-cy="feedback-error"]').contains("Betreff fehlt"); - - // fill out the form partially - cy.get("#feedback-subject").type("A catchy title"); - cy.get('[data-cy="feedback-send"]').click(); - cy.get('[data-cy="feedback-error"]').contains("Nachricht fehlt"); - - // successful feedback - cy.get("#feedback-body").type("A clear description what happened where and how we should improve it"); - cy.get('[data-cy="feedback-modal"] .modal-body').scrollTo("bottom"); - cy.get('[data-cy="feedback-send"]').click(); - - // check that the next page is loaded correctly - cy.get('[data-cy="feedback-modal"]', { timeout: 10_000 }).should("not.exist"); // wait for the site to be interactive - cy.get('[data-cy="feedback-success-modal"]').should("exist"); - cy.contains("Vielen Dank für dein Feedback!"); - cy.contains("OK").click(); - cy.get('[data-cy="feedback-success-modal"]').should("not.exist"); } export {}; diff --git a/webclient/cypress/e2e/frontpage.cy.ts b/webclient/cypress/e2e/frontpage.cy.ts index c18c784d4..36ae7bd48 100644 --- a/webclient/cypress/e2e/frontpage.cy.ts +++ b/webclient/cypress/e2e/frontpage.cy.ts @@ -1,10 +1,10 @@ describe("Check if navigating from the frontpage works as expected", () => { - it("navigating to the mi", () => { + it("navigating to the mri", () => { cy.intercept("GET", "/api/get/root?lang=de", { fixture: "get/root.de.json" }); cy.visit("http://localhost:3000/"); cy.intercept("GET", "/api/get/mi?lang=de", { fixture: "get/mi.de.json" }); - cy.contains("Informatik").click(); - cy.url().should("include", "/building/mi"); + cy.contains("MRI").click(); + cy.url().should("to.match", /(site|campus|view)\/mri/); }); it("navigating to an initally hidden entry", () => { cy.intercept("GET", "/api/get/root?lang=de", { fixture: "get/root.de.json" }); diff --git a/webclient/cypress/fixtures/get/5502.U1.234M.de.json b/webclient/cypress/fixtures/get/5502.U1.234M.de.json index c024d0c70..2b2758d99 100644 --- a/webclient/cypress/fixtures/get/5502.U1.234M.de.json +++ b/webclient/cypress/fixtures/get/5502.U1.234M.de.json @@ -12,7 +12,7 @@ "available": [ { "coordinates": [ - [11.667617801785777, 48.26719015728], + [11.667617801785775, 48.26719015728], [11.67160725799323, 48.26672188711042], [11.670921198214224, 48.264131842720005], [11.66693174200677, 48.26460011288958] @@ -77,10 +77,10 @@ "mvg": [ [ { - "distance": 151.78735095918518, - "lat": 48.264861448458, - "lon": 11.6712265832549, - "name": "Garch.,Forschungsz.", + "distance": 151.68967369397032, + "lat": 48.2648576635194, + "lon": 11.6712180818262, + "name": "Garching, Forschungszentrum", "station_id": "de:09184:460", "sub_stations": [ { @@ -98,10 +98,10 @@ ] }, { - "distance": 371.9601320484891, - "lat": 48.26754040849, - "lon": 11.6655043148943, - "name": "Garching, Lichtenbergstra\u00dfe", + "distance": 372.836588151467, + "lat": 48.2675391261317, + "lon": 11.6654896055231, + "name": "Technische Universit\u00e4t", "station_id": "de:09184:2070", "sub_stations": [ { @@ -113,10 +113,10 @@ ] }, { - "distance": 536.2865825745195, - "lat": 48.2611537274888, - "lon": 11.6684777384851, - "name": "Garching, Boltzmannstra\u00dfe", + "distance": 536.4514806807185, + "lat": 48.261153584156, + "lon": 11.6684673014264, + "name": "Boltzmannstra\u00dfe", "station_id": "de:09184:2073", "sub_stations": [ { @@ -128,10 +128,10 @@ ] }, { - "distance": 734.139257166537, - "lat": 48.2619251948158, - "lon": 11.6619380032158, - "name": "Garching, Ludwig-Prandtl-Str.", + "distance": 734.5577320501662, + "lat": 48.2619259866443, + "lon": 11.6619300467174, + "name": "Ludwig-Prandtl-Stra\u00dfe", "station_id": "de:09184:2071", "sub_stations": [ { diff --git a/webclient/cypress/fixtures/get/garching-interims.de.json b/webclient/cypress/fixtures/get/garching-interims.de.json index a22a97711..ef55898af 100644 --- a/webclient/cypress/fixtures/get/garching-interims.de.json +++ b/webclient/cypress/fixtures/get/garching-interims.de.json @@ -1,8 +1,8 @@ { "aliases": [], "coords": { - "lat": 48.265346093925615, - "lon": 11.66939813473795, + "lat": 48.26575827844281, + "lon": 11.6700899776052, "source": "inferred" }, "id": "garching-interims", @@ -18,8 +18,8 @@ "scale": "10000", "source": "Roomfinder", "width": 676, - "x": 347, - "y": 219 + "x": 366, + "y": 203 }, { "file": "rf54.webp", @@ -29,8 +29,8 @@ "scale": "200000", "source": "Roomfinder", "width": 640, - "x": 445, - "y": 28 + "x": 446, + "y": 27 }, { "file": "rf156.webp", @@ -40,8 +40,8 @@ "scale": "400000", "source": "Roomfinder", "width": 420, - "x": 265, - "y": 164 + "x": 266, + "y": 163 } ], "default": "rf80" @@ -55,10 +55,10 @@ "mvg": [ [ { - "distance": 145.67749552342772, - "lat": 48.264861448458, - "lon": 11.6712265832549, - "name": "Garch.,Forschungsz.", + "distance": 130.3898215039303, + "lat": 48.2648576635194, + "lon": 11.6712180818262, + "name": "Garching, Forschungszentrum", "station_id": "de:09184:460", "sub_stations": [ { @@ -76,10 +76,10 @@ ] }, { - "distance": 377.6279619291787, - "lat": 48.26754040849, - "lon": 11.6655043148943, - "name": "Garching, Lichtenbergstra\u00dfe", + "distance": 393.90537089882025, + "lat": 48.2675391261317, + "lon": 11.6654896055231, + "name": "Technische Universit\u00e4t", "station_id": "de:09184:2070", "sub_stations": [ { @@ -91,10 +91,10 @@ ] }, { - "distance": 471.1222486504986, - "lat": 48.2611537274888, - "lon": 11.6684777384851, - "name": "Garching, Boltzmannstra\u00dfe", + "distance": 525.9190675284061, + "lat": 48.261153584156, + "lon": 11.6684673014264, + "name": "Boltzmannstra\u00dfe", "station_id": "de:09184:2073", "sub_stations": [ { @@ -106,10 +106,10 @@ ] }, { - "distance": 670.5532721301503, - "lat": 48.2619251948158, - "lon": 11.6619380032158, - "name": "Garching, Ludwig-Prandtl-Str.", + "distance": 739.2073320979617, + "lat": 48.2619259866443, + "lon": 11.6619300467174, + "name": "Ludwig-Prandtl-Stra\u00dfe", "station_id": "de:09184:2071", "sub_stations": [ { @@ -128,17 +128,17 @@ "computed": [ { "name": "Anzahl Geb\u00e4ude", - "text": "2" + "text": "3" }, { "name": "Anzahl R\u00e4ume", - "text": "39 (32 ohne Flure etc.)" + "text": "43 (36 ohne Flure etc.)" } ] }, "ranking_factors": { - "rank_boost": 2, - "rank_combined": 1102, + "rank_boost": 3, + "rank_combined": 1103, "rank_type": 1100, "rank_usage": 100 }, @@ -157,6 +157,12 @@ "name": "Interims I", "subtext": "18 R\u00e4ume", "thumb": "5620_0.webp" + }, + { + "id": "5539", + "name": "Interims III", + "subtext": "4 R\u00e4ume", + "thumb": null } ], "n_visible": 6 @@ -235,6 +241,10 @@ "id": "5416.EG.016", "name": "5416.EG.016 (Technik)" }, + { + "id": "5539.EG.003", + "name": "5539.EG.003 (Technikraum Tentomax)" + }, { "id": "5620.01.103", "name": "5620.01.103 (Wartungsschacht)" @@ -252,7 +262,7 @@ "name": "5620.EG.011 (Technik)" } ], - "count": 9, + "count": 10, "name": "Geb\u00e4udeleittechnik" }, { @@ -265,6 +275,18 @@ "id": "5416.01.004", "name": "5416.01.004 (H\u00f6rsaal 1 \"Interims II\")" }, + { + "id": "5539.EG.001A", + "name": "5539.EG.001A (H\u00f6rsaal 1A)" + }, + { + "id": "5539.EG.001B", + "name": "5539.EG.001B (H\u00f6rsaal 1B)" + }, + { + "id": "5539.EG.002", + "name": "5539.EG.002 (H\u00f6rsaal 2)" + }, { "id": "5620.01.101", "name": "5620.01.101 (H\u00f6rsaal 1, \"Interims I\")" @@ -274,7 +296,7 @@ "name": "5620.01.102 (H\u00f6rsaal 2, \"Interims I\")" } ], - "count": 4, + "count": 7, "name": "H\u00f6rsaal" }, { diff --git a/webclient/cypress/fixtures/get/garching.de.json b/webclient/cypress/fixtures/get/garching.de.json index f35fedad0..00dbc0dae 100644 --- a/webclient/cypress/fixtures/get/garching.de.json +++ b/webclient/cypress/fixtures/get/garching.de.json @@ -98,10 +98,10 @@ "mvg": [ [ { - "distance": 61.61505625703897, - "lat": 48.264861448458, - "lon": 11.6712265832549, - "name": "Garch.,Forschungsz.", + "distance": 62.232314520383866, + "lat": 48.2648576635194, + "lon": 11.6712180818262, + "name": "Garching, Forschungszentrum", "station_id": "de:09184:460", "sub_stations": [ { @@ -119,10 +119,10 @@ ] }, { - "distance": 505.942339949703, - "lat": 48.26754040849, - "lon": 11.6655043148943, - "name": "Garching, Lichtenbergstra\u00dfe", + "distance": 506.8332653806992, + "lat": 48.2675391261317, + "lon": 11.6654896055231, + "name": "Technische Universit\u00e4t", "station_id": "de:09184:2070", "sub_stations": [ { @@ -134,10 +134,10 @@ ] }, { - "distance": 521.1123725115802, - "lat": 48.2611537274888, - "lon": 11.6684777384851, - "name": "Garching, Boltzmannstra\u00dfe", + "distance": 521.4610814943909, + "lat": 48.261153584156, + "lon": 11.6684673014264, + "name": "Boltzmannstra\u00dfe", "station_id": "de:09184:2073", "sub_stations": [ { @@ -149,10 +149,10 @@ ] }, { - "distance": 806.6378814596823, - "lat": 48.2619251948158, - "lon": 11.6619380032158, - "name": "Garching, Ludwig-Prandtl-Str.", + "distance": 807.113914025057, + "lat": 48.2619259866443, + "lon": 11.6619300467174, + "name": "Ludwig-Prandtl-Stra\u00dfe", "station_id": "de:09184:2071", "sub_stations": [ { @@ -175,11 +175,11 @@ }, { "name": "Anzahl Geb\u00e4ude", - "text": "90" + "text": "91" }, { "name": "Anzahl R\u00e4ume", - "text": "12894 (10047 ohne Flure etc.)" + "text": "12949 (10097 ohne Flure etc.)" } ], "links": [ @@ -194,8 +194,8 @@ ] }, "ranking_factors": { - "rank_boost": 90, - "rank_combined": 1190, + "rank_boost": 91, + "rank_combined": 1191, "rank_type": 1100, "rank_usage": 100 }, @@ -207,13 +207,13 @@ "id": "mi", "name": "Mathe/Info (MI)", "subtext": "1907 R\u00e4ume", - "thumb": "mi_1.webp" + "thumb": "mi_4.webp" }, { "id": "mw", "name": "Maschinenwesen (MW)", "subtext": "3654 R\u00e4ume", - "thumb": "mw_0.webp" + "thumb": "mw_1.webp" }, { "id": "physik", @@ -230,20 +230,20 @@ { "id": "garching-interims", "name": "Interimsh\u00f6rs\u00e4le", - "subtext": "2 Geb\u00e4ude, 39 R\u00e4ume", + "subtext": "3 Geb\u00e4ude, 43 R\u00e4ume", "thumb": null }, { "id": "5532", "name": "StudiTUM", "subtext": "83 R\u00e4ume", - "thumb": "5532_0.webp" + "thumb": "5532_1.webp" }, { "id": "frm-2", "name": "FRM II", "subtext": "38 Geb\u00e4ude, 593 R\u00e4ume", - "thumb": "frm-2_1.webp" + "thumb": "frm-2_4.webp" }, { "id": "chemie-nebengebaeude", @@ -255,7 +255,7 @@ "id": "5901", "name": "Elektro- und Informationstechnik (EI, ZEITlab)", "subtext": "364 R\u00e4ume", - "thumb": "5901_4.webp" + "thumb": "5901_0.webp" }, { "id": "5415", @@ -263,17 +263,23 @@ "subtext": "306 R\u00e4ume", "thumb": "5415_1.webp" }, + { + "id": "5302", + "name": "(Alte) Mensa Garching", + "subtext": "238 R\u00e4ume", + "thumb": "5302_0.webp" + }, { "id": "galileo", "name": "Galileo", "subtext": "222 R\u00e4ume", - "thumb": "galileo_0.webp" + "thumb": "galileo_1.webp" }, { "id": "5304", "name": "(Neue) Mensa Garching", "subtext": "219 R\u00e4ume", - "thumb": "5304_2.webp" + "thumb": "5304_3.webp" }, { "id": "5701", @@ -281,17 +287,11 @@ "subtext": "205 R\u00e4ume", "thumb": "5701_0.webp" }, - { - "id": "5302", - "name": "(Alte) Mensa Garching", - "subtext": "187 R\u00e4ume", - "thumb": "5302_0.webp" - }, { "id": "5414", "name": "Zentrum f\u00fcr Energie und Information (ZEI)", "subtext": "174 R\u00e4ume", - "thumb": "5414_3.webp" + "thumb": "5414_2.webp" }, { "id": "5301", @@ -303,7 +303,7 @@ "id": "5433", "name": "Entrepreneurship Research Institute", "subtext": "101 R\u00e4ume", - "thumb": "5433_2.webp" + "thumb": "5433_3.webp" }, { "id": "5531", @@ -315,7 +315,7 @@ "id": "5622", "name": "Sportanlage Garching / Dusch Container", "subtext": "18 R\u00e4ume", - "thumb": "5622_1.webp" + "thumb": "5622_0.webp" }, { "id": "mpi", @@ -576,34 +576,6 @@ "id": "5212.EG.003", "name": "5212.EG.003 (Post/Annahme)" }, - { - "id": "5302.01.101A", - "name": "5302.01.101A (Cafe-Kiosk)" - }, - { - "id": "5302.01.107", - "name": "5302.01.107 (Ausgabe)" - }, - { - "id": "5302.EG.012", - "name": "5302.EG.012 (Annahme)" - }, - { - "id": "5302.EG.014", - "name": "5302.EG.014 (Ausgabe)" - }, - { - "id": "5302.EG.039", - "name": "5302.EG.039 (Ausgabe)" - }, - { - "id": "5302.EG.040", - "name": "5302.EG.040 (Annahme/Ausgabe)" - }, - { - "id": "5302.EG.050", - "name": "5302.EG.050 (Speiseausgabe)" - }, { "id": "5304.01.105", "name": "5304.01.105 (Geschirrr\u00fcckgabe)" @@ -645,7 +617,7 @@ "name": "5606.EG.040 (Post)" } ], - "count": 24, + "count": 17, "name": "Anlieferung" }, { @@ -718,6 +690,14 @@ "id": "5301.U1.009", "name": "5301.U1.009 (Archiv)" }, + { + "id": "5302.01.014", + "name": "5302.01.014 (Archiv Verwaltung)" + }, + { + "id": "5302.01.037", + "name": "5302.01.037 (Archiv/Lager)" + }, { "id": "5401.EG.117C", "name": "5401.EG.117C (B\u00fcchermagazin)" @@ -899,7 +879,7 @@ "name": "5701.01.028 (Dokumentation)" } ], - "count": 62, + "count": 64, "name": "Archiv" }, { @@ -1097,12 +1077,8 @@ "name": "5301.EG.506 (Aufzug)" }, { - "id": "5302.EG.033A", - "name": "5302.EG.033A (Aufzug)" - }, - { - "id": "5302.EG.046", - "name": "5302.EG.046 (Personen Aufzug)" + "id": "5302.EG.809E", + "name": "5302.EG.809E (Aufzug)" }, { "id": "5304.02.024", @@ -1841,7 +1817,7 @@ "name": "5901.U1.502 (Personenaufzug)" } ], - "count": 234, + "count": 233, "name": "Aufzug" }, { @@ -1891,8 +1867,8 @@ "name": "5301.U1.506 (Aufzugsschacht)" }, { - "id": "5302.EG.047", - "name": "5302.EG.047 (Aufzugsmaschr.)" + "id": "5302.EG.800B", + "name": "5302.EG.800B (Aufzugstechnik)" }, { "id": "5302.U2.002", @@ -2073,12 +2049,8 @@ "name": "5301.04.506 (Aufzugschacht)" }, { - "id": "5302.01.121", - "name": "5302.01.121 (Aufzugschacht)" - }, - { - "id": "5302.01.122", - "name": "5302.01.122 (Aufzugschacht)" + "id": "5302.EG.801B", + "name": "5302.EG.801B (Aufzugsschacht)" }, { "id": "5302.U1.013", @@ -2173,7 +2145,7 @@ "name": "5532.Z1.091 (Aufzugsraum)" } ], - "count": 36, + "count": 35, "name": "Aufzugsschacht" }, { @@ -2707,8 +2679,8 @@ "name": "5257.02.030 (Kranken u. Ruheraum)" }, { - "id": "5302.EG.003A", - "name": "5302.EG.003A (Sanit\u00e4tsraum)" + "id": "5302.EG.006A", + "name": "5302.EG.006A (Sanit\u00e4tsraum)" }, { "id": "5304.EG.302", @@ -2946,6 +2918,10 @@ "id": "5301.03.021", "name": "5301.03.021 (Besprechungsraum 4)" }, + { + "id": "5302.01.036", + "name": "5302.01.036 (Besprechungsraum)" + }, { "id": "5302.Z1.218Z", "name": "5302.Z1.218Z (Besprechungsraum)" @@ -3594,10 +3570,6 @@ "id": "8123.05.008", "name": "8123.05.008 (Besprechungsraum 4)" }, - { - "id": "8123.05.009", - "name": "8123.05.009 (Besprechungsraum 3)" - }, { "id": "8123.05.016", "name": "8123.05.016 (Besprechungsraum 1)" @@ -3656,6 +3628,10 @@ "id": "5204.EG.010", "name": "5204.EG.010 (Bibliothek)" }, + { + "id": "5302.01.038", + "name": "5302.01.038 (Bibliothek)" + }, { "id": "5402.03.230H", "name": "5402.03.230H (Bibliothek)" @@ -3733,7 +3709,7 @@ "name": "5701.01.006 (Bibliothek)" } ], - "count": 30, + "count": 31, "name": "Bibliothek" }, { @@ -6827,20 +6803,188 @@ "name": "5301.EG.008 (Information)" }, { - "id": "5302.01.105", - "name": "5302.01.105 (B\u00fcro)" + "id": "5302.01.001", + "name": "5302.01.001 (B\u00fcro)" + }, + { + "id": "5302.01.004", + "name": "5302.01.004 (B\u00fcro)" + }, + { + "id": "5302.01.005", + "name": "5302.01.005 (B\u00fcro)" + }, + { + "id": "5302.01.006", + "name": "5302.01.006 (B\u00fcro)" + }, + { + "id": "5302.01.007", + "name": "5302.01.007 (B\u00fcro)" + }, + { + "id": "5302.01.009", + "name": "5302.01.009 (Prof.-B\u00fcro)" + }, + { + "id": "5302.01.010", + "name": "5302.01.010 (Prof.-B\u00fcro)" + }, + { + "id": "5302.01.012", + "name": "5302.01.012 (Prof.-B\u00fcro)" + }, + { + "id": "5302.01.015", + "name": "5302.01.015 (ELT. Versorgung)" + }, + { + "id": "5302.01.018", + "name": "5302.01.018 (B\u00fcro)" + }, + { + "id": "5302.01.019", + "name": "5302.01.019 (B\u00fcro)" + }, + { + "id": "5302.01.020", + "name": "5302.01.020 (B\u00fcro)" + }, + { + "id": "5302.01.024", + "name": "5302.01.024 (B\u00fcro)" + }, + { + "id": "5302.01.025", + "name": "5302.01.025 (B\u00fcro)" + }, + { + "id": "5302.01.032", + "name": "5302.01.032 (Bacheloranden- / Masteranden)" + }, + { + "id": "5302.01.040", + "name": "5302.01.040 (B\u00fcro)" + }, + { + "id": "5302.01.041", + "name": "5302.01.041 (B\u00fcro)" + }, + { + "id": "5302.01.042", + "name": "5302.01.042 (B\u00fcro)" + }, + { + "id": "5302.01.044", + "name": "5302.01.044 (B\u00fcro)" + }, + { + "id": "5302.01.045", + "name": "5302.01.045 (B\u00fcro)" + }, + { + "id": "5302.01.046", + "name": "5302.01.046 (B\u00fcro)" + }, + { + "id": "5302.01.047", + "name": "5302.01.047 (B\u00fcro)" + }, + { + "id": "5302.01.048", + "name": "5302.01.048 (B\u00fcro)" + }, + { + "id": "5302.01.049", + "name": "5302.01.049 (B\u00fcro)" + }, + { + "id": "5302.01.050", + "name": "5302.01.050 (B\u00fcro)" + }, + { + "id": "5302.01.051", + "name": "5302.01.051 (B\u00fcro)" + }, + { + "id": "5302.01.052", + "name": "5302.01.052 (B\u00fcro)" + }, + { + "id": "5302.EG.032B", + "name": "5302.EG.032B (Thermografieauswertung)" + }, + { + "id": "5302.EG.041C", + "name": "5302.EG.041C (B\u00fcro)" + }, + { + "id": "5302.EG.042C", + "name": "5302.EG.042C (B\u00fcro)" + }, + { + "id": "5302.EG.043C", + "name": "5302.EG.043C (B\u00fcro)" + }, + { + "id": "5302.EG.044C", + "name": "5302.EG.044C (B\u00fcro)" + }, + { + "id": "5302.EG.045C", + "name": "5302.EG.045C (B\u00fcro)" + }, + { + "id": "5302.EG.046C", + "name": "5302.EG.046C (B\u00fcro)" + }, + { + "id": "5302.EG.047C", + "name": "5302.EG.047C (B\u00fcro)" + }, + { + "id": "5302.EG.048C", + "name": "5302.EG.048C (B\u00fcro)" + }, + { + "id": "5302.EG.055C", + "name": "5302.EG.055C (B\u00fcro)" + }, + { + "id": "5302.EG.056C", + "name": "5302.EG.056C (B\u00fcro)" }, { - "id": "5302.01.106", - "name": "5302.01.106 (B\u00fcro)" + "id": "5302.EG.057C", + "name": "5302.EG.057C (B\u00fcro)" }, { - "id": "5302.EG.011", - "name": "5302.EG.011 (B\u00fcro)" + "id": "5302.EG.058C", + "name": "5302.EG.058C (Auswertung/Dokum.)" }, { - "id": "5302.EG.030", - "name": "5302.EG.030 (B\u00fcro)" + "id": "5302.EG.069F", + "name": "5302.EG.069F (B\u00fcro Elektronikwerkstatt)" + }, + { + "id": "5302.EG.077F", + "name": "5302.EG.077F (B\u00fcro)" + }, + { + "id": "5302.EG.078F", + "name": "5302.EG.078F (B\u00fcro)" + }, + { + "id": "5302.EG.079F", + "name": "5302.EG.079F (Auswertung/Dokum.)" + }, + { + "id": "5302.EG.080F", + "name": "5302.EG.080F (B\u00fcro)" + }, + { + "id": "5302.EG.081F", + "name": "5302.EG.081F (Auswertung/Dokum.)" }, { "id": "5302.TP.207A", @@ -10980,11 +11124,11 @@ }, { "id": "5510.EG.012", - "name": "5510.EG.012 (Pr\u00fcfungsb\u00fcro)" + "name": "5510.EG.012 (Masterpr\u00fcfungsausschuss)" }, { "id": "5510.EG.012A", - "name": "5510.EG.012A (B\u00fcro)" + "name": "5510.EG.012A (Pr\u00fcfungsplanung und Praktikumsamt)" }, { "id": "5510.EG.014", @@ -10992,7 +11136,7 @@ }, { "id": "5510.EG.015", - "name": "5510.EG.015 (Hausmeisterb\u00fcro)" + "name": "5510.EG.015 (Bachelorpr\u00fcfungsausschuss)" }, { "id": "5510.EG.016", @@ -11004,7 +11148,7 @@ }, { "id": "5510.EG.018", - "name": "5510.EG.018 (IKOM)" + "name": "5510.EG.018 (B\u00fcro)" }, { "id": "5510.EG.025", @@ -11012,7 +11156,7 @@ }, { "id": "5510.EG.026A", - "name": "5510.EG.026A (Leitung Pr\u00fcfungsb\u00fcro)" + "name": "5510.EG.026A (Leitung Study & Teaching, Studienfachberatung)" }, { "id": "5510.EG.026B", @@ -11020,11 +11164,11 @@ }, { "id": "5510.EG.026M", - "name": "5510.EG.026M (Studienb\u00fcro)" + "name": "5510.EG.026M (School Office Finanzen)" }, { "id": "5510.EG.026N", - "name": "5510.EG.026N (B\u00fcro)" + "name": "5510.EG.026N (Study and Teaching Qualit\u00e4tsmanagement)" }, { "id": "5510.EG.050A", @@ -11490,6 +11634,10 @@ "id": "5605.03.040", "name": "5605.03.040 (B\u00fcro)" }, + { + "id": "5605.03.041", + "name": "5605.03.041 (B\u00fcro)" + }, { "id": "5605.03.042", "name": "5605.03.042 (B\u00fcro)" @@ -14110,6 +14258,10 @@ "id": "8123.05.007", "name": "8123.05.007 (B\u00fcro)" }, + { + "id": "8123.05.009", + "name": "8123.05.009 (B\u00fcro)" + }, { "id": "8123.05.025", "name": "8123.05.025 (B\u00fcro)" @@ -14131,7 +14283,7 @@ "name": "8124.EG.016 (Gro\u00dfraumb\u00fcro)" } ], - "count": 2598, + "count": 2642, "name": "B\u00fcro" }, { @@ -14144,10 +14296,6 @@ "id": "5301.EG.010", "name": "5301.EG.010 (Kiosk)" }, - { - "id": "5302.EG.002", - "name": "5302.EG.002 (Cafeteria)" - }, { "id": "5304.EG.201", "name": "5304.EG.201 (Cafeteria)" @@ -14177,7 +14325,7 @@ "name": "5610.EG.021 (Cafeteria)" } ], - "count": 10, + "count": 9, "name": "Cafeteria" }, { @@ -14996,18 +15144,6 @@ "id": "5301.U1.505", "name": "5301.U1.505 (Trafo)" }, - { - "id": "5302.EG.063", - "name": "5302.EG.063 (Transformatoren)" - }, - { - "id": "5302.EG.064", - "name": "5302.EG.064 (Transformatoren)" - }, - { - "id": "5302.EG.065", - "name": "5302.EG.065 (Transformatoren)" - }, { "id": "5302.TP.219", "name": "5302.TP.219 (Stromversorg.)" @@ -16173,7 +16309,7 @@ "name": "5701.U1.206 (Batterieraum)" } ], - "count": 391, + "count": 388, "name": "Elektrische Stromversorgung" }, { @@ -18167,44 +18303,96 @@ "name": "5301.U1.704 (Flur)" }, { - "id": "5302.01.101", - "name": "5302.01.101 (Foyer)" + "id": "5302.01.701", + "name": "5302.01.701 (Flur)" + }, + { + "id": "5302.01.702", + "name": "5302.01.702 (Flur)" + }, + { + "id": "5302.01.703", + "name": "5302.01.703 (Flur)" }, { - "id": "5302.EG.002C", - "name": "5302.EG.002C (Flur / Cafeteria)" + "id": "5302.01.704", + "name": "5302.01.704 (Flur)" }, { - "id": "5302.EG.018B", - "name": "5302.EG.018B (Flur)" + "id": "5302.01.705", + "name": "5302.01.705 (Flur)" }, { - "id": "5302.EG.018C", - "name": "5302.EG.018C (Flur)" + "id": "5302.01.706", + "name": "5302.01.706 (Flur)" }, { - "id": "5302.EG.023", - "name": "5302.EG.023 (Flur)" + "id": "5302.01.709", + "name": "5302.01.709 (Flur)" }, { - "id": "5302.EG.042", - "name": "5302.EG.042 (Flur)" + "id": "5302.01.710", + "name": "5302.01.710 (Flur)" }, { - "id": "5302.EG.044", - "name": "5302.EG.044 (Flur)" + "id": "5302.EG.700A", + "name": "5302.EG.700A (Flur)" }, { - "id": "5302.EG.044A", - "name": "5302.EG.044A (Flur)" + "id": "5302.EG.701A", + "name": "5302.EG.701A (Flur)" }, { - "id": "5302.EG.052", - "name": "5302.EG.052 (Flur)" + "id": "5302.EG.702A", + "name": "5302.EG.702A (Flur)" }, { - "id": "5302.EG.055", - "name": "5302.EG.055 (Flur)" + "id": "5302.EG.703B", + "name": "5302.EG.703B (Flur)" + }, + { + "id": "5302.EG.704B", + "name": "5302.EG.704B (Flur)" + }, + { + "id": "5302.EG.705B", + "name": "5302.EG.705B (Flur)" + }, + { + "id": "5302.EG.706C", + "name": "5302.EG.706C (Flur)" + }, + { + "id": "5302.EG.707C", + "name": "5302.EG.707C (Flur)" + }, + { + "id": "5302.EG.708C", + "name": "5302.EG.708C (Flur)" + }, + { + "id": "5302.EG.709D", + "name": "5302.EG.709D (Flur)" + }, + { + "id": "5302.EG.710D", + "name": "5302.EG.710D (Flur)" + }, + { + "id": "5302.EG.711F", + "name": "5302.EG.711F (Flur)" + }, + { + "id": "5302.EG.712F", + "name": "5302.EG.712F (Flur)" + }, + { + "id": "5302.EG.713F", + "name": "5302.EG.713F (Flur)" + }, + { + "id": "5302.EG.714E", + "name": "5302.EG.714E (Flur)" }, { "id": "5302.TP.109", @@ -22475,7 +22663,7 @@ "name": "8124.EG.016C (Flur/Treppe (Anteilige Allgem. Fl.))" } ], - "count": 1349, + "count": 1362, "name": "Flur" }, { @@ -24135,20 +24323,12 @@ "name": "5301.U1.004 (Umkleide-Herren)" }, { - "id": "5302.EG.004", - "name": "5302.EG.004 (Umkleide)" - }, - { - "id": "5302.EG.005A", - "name": "5302.EG.005A (Umkleide)" - }, - { - "id": "5302.EG.005B", - "name": "5302.EG.005B (Umkleide)" + "id": "5302.EG.007A", + "name": "5302.EG.007A (Umkleide Herren)" }, { - "id": "5302.EG.005C", - "name": "5302.EG.005C (Umkleide)" + "id": "5302.EG.010A", + "name": "5302.EG.010A (Umkleide Damen)" }, { "id": "5304.EG.318", @@ -24487,7 +24667,7 @@ "name": "8120.04.029 (Flur/Garderobe)" } ], - "count": 99, + "count": 97, "name": "Garderobe" }, { @@ -25127,56 +25307,8 @@ "name": "5301.U1.504 (Technik)" }, { - "id": "5302.01.112", - "name": "5302.01.112 (Install.Schacht)" - }, - { - "id": "5302.01.114", - "name": "5302.01.114 (Install.Schacht)" - }, - { - "id": "5302.01.117", - "name": "5302.01.117 (Installation)" - }, - { - "id": "5302.01.124", - "name": "5302.01.124 (Install.Schacht)" - }, - { - "id": "5302.01.125", - "name": "5302.01.125 (Install.Schacht)" - }, - { - "id": "5302.EG.018A", - "name": "5302.EG.018A (Install.Schacht)" - }, - { - "id": "5302.EG.026", - "name": "5302.EG.026 (Hausanschluss)" - }, - { - "id": "5302.EG.048", - "name": "5302.EG.048 (Install.Schacht)" - }, - { - "id": "5302.EG.056", - "name": "5302.EG.056 (Install.Schacht)" - }, - { - "id": "5302.EG.057", - "name": "5302.EG.057 (Install.Schacht)" - }, - { - "id": "5302.EG.058", - "name": "5302.EG.058 (Install.Schacht)" - }, - { - "id": "5302.EG.059", - "name": "5302.EG.059 (Install.Schacht)" - }, - { - "id": "5302.EG.060", - "name": "5302.EG.060 (Install. Schacht)" + "id": "5302.EG.019A", + "name": "5302.EG.019A (Hydraulikaggregate)" }, { "id": "5302.TP.108", @@ -29986,6 +30118,10 @@ "id": "5532.U1.002", "name": "5532.U1.002 (BMA)" }, + { + "id": "5539.EG.003", + "name": "5539.EG.003 (Technikraum Tentomax)" + }, { "id": "5601.U1.034B", "name": "5601.U1.034B (Hebeanlage)" @@ -30371,7 +30507,7 @@ "name": "8122.01.005A (Technik)" } ], - "count": 1450, + "count": 1439, "name": "Geb\u00e4udeleittechnik" }, { @@ -30380,6 +30516,18 @@ "id": "5204.U1.002", "name": "5204.U1.002 (Lager Ger\u00e4te)" }, + { + "id": "5302.EG.038B", + "name": "5302.EG.038B (Ger\u00e4telager)" + }, + { + "id": "5302.EG.082E", + "name": "5302.EG.082E (Ger\u00e4telager)" + }, + { + "id": "5302.EG.082F", + "name": "5302.EG.082F (Ger\u00e4telager)" + }, { "id": "5407.02.720J", "name": "5407.02.720J (Lager)" @@ -30405,7 +30553,7 @@ "name": "5506.EG.661O (Ger\u00e4telager)" } ], - "count": 7, + "count": 10, "name": "Ger\u00e4teraum" }, { @@ -30440,18 +30588,6 @@ "id": "5125.EG.001", "name": "5125.EG.001 (BMZ)" }, - { - "id": "5302.01.102", - "name": "5302.01.102 (Gesch\u00e4ft 1)" - }, - { - "id": "5302.01.102A", - "name": "5302.01.102A (Gesch\u00e4ft 2)" - }, - { - "id": "5302.01.102B", - "name": "5302.01.102B (Gesch\u00e4ft 3)" - }, { "id": "5304.EG.102", "name": "5304.EG.102 (Infopoint)" @@ -30489,7 +30625,7 @@ "name": "5530.EG.006 (Empfang)" } ], - "count": 16, + "count": 13, "name": "Gesch\u00e4ftsraum" }, { @@ -31248,6 +31384,18 @@ "id": "5510.EG.001", "name": "5510.EG.001 (Gustav-Niemann-H\u00f6rsaal)" }, + { + "id": "5539.EG.001A", + "name": "5539.EG.001A (H\u00f6rsaal 1A)" + }, + { + "id": "5539.EG.001B", + "name": "5539.EG.001B (H\u00f6rsaal 1B)" + }, + { + "id": "5539.EG.002", + "name": "5539.EG.002 (H\u00f6rsaal 2)" + }, { "id": "5602.EG.001", "name": "5602.EG.001 (MI HS 1, Friedrich L. Bauer H\u00f6rsaal)" @@ -31285,7 +31433,7 @@ "name": "8120.EG.001 (H\u00f6rsaal im Galileo)" } ], - "count": 27, + "count": 30, "name": "H\u00f6rsaal" }, { @@ -31418,6 +31566,22 @@ "id": "5301.03.033", "name": "5301.03.033 (Drucker)" }, + { + "id": "5302.01.016", + "name": "5302.01.016 (Kopierer)" + }, + { + "id": "5302.01.030", + "name": "5302.01.030 (Kopierer)" + }, + { + "id": "5302.01.054", + "name": "5302.01.054 (Kopierer)" + }, + { + "id": "5302.EG.054C", + "name": "5302.EG.054C (Kopierer)" + }, { "id": "5401.01.100C", "name": "5401.01.100C (Scannerraum)" @@ -31739,7 +31903,7 @@ "name": "8122.01.057 (Kopierer/Lager)" } ], - "count": 98, + "count": 102, "name": "Kopierraum" }, { @@ -31809,40 +31973,8 @@ "name": "5301.EG.009 (Cafeteria K\u00fcche)" }, { - "id": "5302.01.108", - "name": "5302.01.108 (Mensak\u00fcche)" - }, - { - "id": "5302.01.109", - "name": "5302.01.109 (Sp\u00fclk\u00fcche)" - }, - { - "id": "5302.EG.002D", - "name": "5302.EG.002D (Cafeteria-K\u00fcche)" - }, - { - "id": "5302.EG.028", - "name": "5302.EG.028 (K\u00fcchenvorb.)" - }, - { - "id": "5302.EG.029", - "name": "5302.EG.029 (K\u00fcchenvorb.)" - }, - { - "id": "5302.EG.029A", - "name": "5302.EG.029A (K\u00fcchenvorb.)" - }, - { - "id": "5302.EG.031", - "name": "5302.EG.031 (Gro\u00dfk\u00fcche)" - }, - { - "id": "5302.EG.038", - "name": "5302.EG.038 (Sp\u00fclk\u00fcche)" - }, - { - "id": "5302.EG.041", - "name": "5302.EG.041 (Sp\u00fclk\u00fcche)" + "id": "5302.01.028", + "name": "5302.01.028 (K\u00fcche/Pausenraum)" }, { "id": "5304.01.102", @@ -31957,7 +32089,7 @@ "name": "8122.01.017 (K\u00fcche)" } ], - "count": 53, + "count": 45, "name": "K\u00fcche" }, { @@ -31982,38 +32114,6 @@ "id": "5301.04.006", "name": "5301.04.006 (K\u00fchlung)" }, - { - "id": "5302.01.110", - "name": "5302.01.110 (K\u00fchlraum)" - }, - { - "id": "5302.EG.015A", - "name": "5302.EG.015A (K\u00fchlraum)" - }, - { - "id": "5302.EG.015B", - "name": "5302.EG.015B (K\u00fchlraum)" - }, - { - "id": "5302.EG.016A", - "name": "5302.EG.016A (K\u00fchlraum)" - }, - { - "id": "5302.EG.016B", - "name": "5302.EG.016B (K\u00fchlraum)" - }, - { - "id": "5302.EG.020", - "name": "5302.EG.020 (K\u00fchlraum)" - }, - { - "id": "5302.EG.021", - "name": "5302.EG.021 (K\u00fchlraum)" - }, - { - "id": "5302.EG.024", - "name": "5302.EG.024 (K\u00fchlraum)" - }, { "id": "5304.01.305", "name": "5304.01.305 (K\u00fchlzellen)" @@ -32087,7 +32187,7 @@ "name": "5701.EG.023 (K\u00fchlraum)" } ], - "count": 31, + "count": 23, "name": "K\u00fchlraum" }, { @@ -32120,6 +32220,10 @@ "id": "5204.EG.009", "name": "5204.EG.009 (Techn. Labor)" }, + { + "id": "5302.EG.062D", + "name": "5302.EG.062D (M\u00f6rtellabor)" + }, { "id": "5302.TP.101", "name": "5302.TP.101 (Labor)" @@ -32741,7 +32845,7 @@ "name": "5901.EG.063 (Prozesslab. / Etching)" } ], - "count": 162, + "count": 163, "name": "Labor (Technik)" }, { @@ -33008,6 +33112,10 @@ "id": "5251.U1.007", "name": "5251.U1.007 (Dekontaminationsraum)" }, + { + "id": "5302.EG.065F", + "name": "5302.EG.065F (Elektrochemielabor)" + }, { "id": "5401.EG.100A", "name": "5401.EG.100A (Chemielabor (K.B., MV, 750kg))" @@ -34569,7 +34677,7 @@ "name": "5901.EG.084 (Biolabor-Zellkultur S2)" } ], - "count": 452, + "count": 453, "name": "Labor - Chemie" }, { @@ -35756,6 +35864,110 @@ "id": "5257.EG.022", "name": "5257.EG.022 (Me\u00dfmittelraum)" }, + { + "id": "5302.EG.016A", + "name": "5302.EG.016A (Pr\u00fcfhalle Staubzone)" + }, + { + "id": "5302.EG.017A", + "name": "5302.EG.017A (Termografiepr\u00fcfraum)" + }, + { + "id": "5302.EG.018A", + "name": "5302.EG.018A (Pr\u00fcfhalle HFP)" + }, + { + "id": "5302.EG.024A", + "name": "5302.EG.024A (Nebelkammer)" + }, + { + "id": "5302.EG.027B", + "name": "5302.EG.027B (Nebelkammer)" + }, + { + "id": "5302.EG.029B", + "name": "5302.EG.029B (Pr\u00fcfraum Living Lab)" + }, + { + "id": "5302.EG.030B", + "name": "5302.EG.030B (Betonpr\u00fcfraum)" + }, + { + "id": "5302.EG.031B", + "name": "5302.EG.031B (Feinm\u00f6rtelpr\u00fcfraum)" + }, + { + "id": "5302.EG.033B", + "name": "5302.EG.033B (Termografiepr\u00fcfraum)" + }, + { + "id": "5302.EG.052C", + "name": "5302.EG.052C (Pr\u00fcfraum REM)" + }, + { + "id": "5302.EG.053C", + "name": "5302.EG.053C (Physiklabor XRD)" + }, + { + "id": "5302.EG.059C", + "name": "5302.EG.059C (Pr\u00fcflabor Messraum)" + }, + { + "id": "5302.EG.061D", + "name": "5302.EG.061D (Pr\u00fcflabor Autoklav.)" + }, + { + "id": "5302.EG.063D", + "name": "5302.EG.063D (Pr\u00fcflabor Thermoan.)" + }, + { + "id": "5302.EG.064F", + "name": "5302.EG.064F (Pr\u00fcflabor Ofenraum)" + }, + { + "id": "5302.EG.066F", + "name": "5302.EG.066F (Bewehrungsvermessung)" + }, + { + "id": "5302.EG.067F", + "name": "5302.EG.067F (Pr\u00fcflabor Hg-Druckpor.)" + }, + { + "id": "5302.EG.068F", + "name": "5302.EG.068F (Pr\u00fcflabor Hg-Druckpor.)" + }, + { + "id": "5302.EG.070F", + "name": "5302.EG.070F (Labor/Elektronikwerkstatt/B\u00fcro)" + }, + { + "id": "5302.EG.072F", + "name": "5302.EG.072F (Pr\u00fcfraum Feinmessraum)" + }, + { + "id": "5302.EG.073F", + "name": "5302.EG.073F (Pr\u00fcflabor Frostpr\u00fcfung)" + }, + { + "id": "5302.EG.074F", + "name": "5302.EG.074F (Betondruckraum Kuka-Rob.)" + }, + { + "id": "5302.EG.075F", + "name": "5302.EG.075F (Pr\u00fcflabor Dauerhaftig.)" + }, + { + "id": "5302.EG.076F", + "name": "5302.EG.076F (Pr\u00fcflabor)" + }, + { + "id": "5302.EG.084E", + "name": "5302.EG.084E (Spannungsrisskorrosionslabor)" + }, + { + "id": "5302.EG.091E", + "name": "5302.EG.091E (ZIP-Labor)" + }, { "id": "5302.TP.202", "name": "5302.TP.202 (Messraum)" @@ -36556,10 +36768,6 @@ "id": "5605.03.039", "name": "5605.03.039 (Computerlabor)" }, - { - "id": "5605.03.041", - "name": "5605.03.041 (Computerlabor)" - }, { "id": "5607.01.038", "name": "5607.01.038 (Labor)" @@ -36609,7 +36817,7 @@ "name": "5901.EG.066 (Prozesslab. / Ofenr.)" } ], - "count": 488, + "count": 513, "name": "Labor - Physik" }, { @@ -37225,36 +37433,60 @@ "name": "5301.U1.502 (Lager)" }, { - "id": "5302.01.111", - "name": "5302.01.111 (Lager)" + "id": "5302.01.053", + "name": "5302.01.053 (B\u00fcrobedarfslager)" }, { - "id": "5302.EG.002E", - "name": "5302.EG.002E (Lager / Cafeteria)" + "id": "5302.01.057", + "name": "5302.01.057 (Lager)" }, { - "id": "5302.EG.010", - "name": "5302.EG.010 (Lager)" + "id": "5302.EG.012A", + "name": "5302.EG.012A (Klimaraum Konstantklima 3)" }, { - "id": "5302.EG.017", - "name": "5302.EG.017 (Lager)" + "id": "5302.EG.013A", + "name": "5302.EG.013A (Klimaraum Konstantklima 4)" }, { - "id": "5302.EG.018", - "name": "5302.EG.018 (Lager)" + "id": "5302.EG.015A", + "name": "5302.EG.015A (Klimaraum Konstantklima 1)" }, { - "id": "5302.EG.022", - "name": "5302.EG.022 (Lager)" + "id": "5302.EG.020A", + "name": "5302.EG.020A (Probenlager Stahl)" }, { - "id": "5302.EG.029B", - "name": "5302.EG.029B (Lager)" + "id": "5302.EG.025A", + "name": "5302.EG.025A (Lager)" + }, + { + "id": "5302.EG.026B", + "name": "5302.EG.026B (Ger\u00e4telager)" }, { - "id": "5302.EG.032", - "name": "5302.EG.032 (Lager)" + "id": "5302.EG.034B", + "name": "5302.EG.034B (Lager)" + }, + { + "id": "5302.EG.035B", + "name": "5302.EG.035B (Lager)" + }, + { + "id": "5302.EG.060D", + "name": "5302.EG.060D (Probenlager)" + }, + { + "id": "5302.EG.083E", + "name": "5302.EG.083E (Pr\u00fcfmittellager)" + }, + { + "id": "5302.EG.089E", + "name": "5302.EG.089E (Konstantklima 5)" + }, + { + "id": "5302.EG.090E", + "name": "5302.EG.090E (Probenlager)" }, { "id": "5302.U2.003", @@ -38973,7 +39205,7 @@ "name": "5901.U1.049 (Lager)" } ], - "count": 583, + "count": 589, "name": "Lager" }, { @@ -39028,18 +39260,6 @@ "id": "5301.02.022", "name": "5301.02.022 (Zeitschriften/Lesesaal)" }, - { - "id": "5302.01.123", - "name": "5302.01.123 (Leseraum)" - }, - { - "id": "5302.01.127", - "name": "5302.01.127 (Lesepl\u00e4tze)" - }, - { - "id": "5302.01.128", - "name": "5302.01.128 (Lesepl\u00e4tze)" - }, { "id": "5401.01.100A", "name": "5401.01.100A (Lesesaal)" @@ -39081,7 +39301,7 @@ "name": "5603.EG.019 (Lesesaal)" } ], - "count": 17, + "count": 14, "name": "Lesesaal" }, { @@ -39596,14 +39816,6 @@ }, { "children": [ - { - "id": "5302.EG.001", - "name": "5302.EG.001 (Speisesaal)" - }, - { - "id": "5302.EG.001B", - "name": "5302.EG.001B (Speisesaal)" - }, { "id": "5304.01.101", "name": "5304.01.101 (Speisesaal)" @@ -39613,7 +39825,7 @@ "name": "5508.EG.801 (Speisesaal)" } ], - "count": 4, + "count": 2, "name": "Mensa" }, { @@ -39784,14 +39996,6 @@ "id": "5143.EG.012", "name": "5143.EG.012 (M\u00fcllentsorgung)" }, - { - "id": "5302.01.118", - "name": "5302.01.118 (M\u00fcll)" - }, - { - "id": "5302.EG.009", - "name": "5302.EG.009 (M\u00fcll)" - }, { "id": "5402.01.201K", "name": "5402.01.201K (Sonderm\u00fcllzwischenlager)" @@ -39893,7 +40097,7 @@ "name": "5531.EG.019 (M\u00fcllraum)" } ], - "count": 28, + "count": 26, "name": "M\u00fcllsammelraum" }, { @@ -40447,12 +40651,8 @@ "name": "5301.U1.002 (Putzraum)" }, { - "id": "5302.01.116", - "name": "5302.01.116 (Putzraum)" - }, - { - "id": "5302.EG.035", - "name": "5302.EG.035 (Putzraum)" + "id": "5302.01.029", + "name": "5302.01.029 (Putzraum)" }, { "id": "5302.TP.213A", @@ -40987,7 +41187,7 @@ "name": "8123.05.030 (Putzraum)" } ], - "count": 164, + "count": 163, "name": "Putzraum" }, { @@ -41598,6 +41798,18 @@ "id": "5212.EG.704B", "name": "5212.EG.704B (Schleuse)" }, + { + "id": "5302.EG.022A", + "name": "5302.EG.022A (Schleuse 3)" + }, + { + "id": "5302.EG.023A", + "name": "5302.EG.023A (Schleuse 2)" + }, + { + "id": "5302.EG.088E", + "name": "5302.EG.088E (Schleuse 1)" + }, { "id": "5402.04.241L", "name": "5402.04.241L (Schleuse)" @@ -41715,7 +41927,7 @@ "name": "5901.EG.080 (Personalschleuse)" } ], - "count": 54, + "count": 57, "name": "Schleuse" }, { @@ -41764,6 +41976,14 @@ "id": "5212.02.013", "name": "5212.02.013 (Sekretariat)" }, + { + "id": "5302.01.008", + "name": "5302.01.008 (Sekretariat)" + }, + { + "id": "5302.01.011", + "name": "5302.01.011 (Sekretariat)" + }, { "id": "5403.02.310D", "name": "5403.02.310D (Sekretariat)" @@ -42157,7 +42377,7 @@ "name": "8120.05.007 (Sekretariat)" } ], - "count": 109, + "count": 111, "name": "Sekretariat" }, { @@ -42214,6 +42434,14 @@ "id": "5212.EG.006", "name": "5212.EG.006 (Seminar 1)" }, + { + "id": "5302.01.022", + "name": "5302.01.022 (Seminarraum 2)" + }, + { + "id": "5302.01.023", + "name": "5302.01.023 (Seminarraum 1)" + }, { "id": "5403.02.310A", "name": "5403.02.310A (Seminarraum)" @@ -42460,7 +42688,7 @@ }, { "id": "5510.EG.029", - "name": "5510.EG.029 (Praktikumsraum)" + "name": "5510.EG.029 (Zentrum f\u00fcr Schl\u00fcsselkompetenzen Kreativwerkstatt)" }, { "id": "5515.EG.005", @@ -42763,7 +42991,7 @@ "name": "8123.05.017 (Seminarraum)" } ], - "count": 150, + "count": 152, "name": "Seminarraum" }, { @@ -42860,6 +43088,26 @@ "id": "5301.U1.008", "name": "5301.U1.008 (EDV)" }, + { + "id": "5302.01.017", + "name": "5302.01.017 (Dateninstall.)" + }, + { + "id": "5302.01.055", + "name": "5302.01.055 (Dateninstall.)" + }, + { + "id": "5302.01.058", + "name": "5302.01.058 (Serverraum)" + }, + { + "id": "5302.EG.040C", + "name": "5302.EG.040C (Dateiinstall.)" + }, + { + "id": "5302.EG.087E", + "name": "5302.EG.087E (Dateiinstall.)" + }, { "id": "5304.02.202", "name": "5304.02.202 (EDV)" @@ -43421,7 +43669,7 @@ "name": "8123.05.002 (Server)" } ], - "count": 163, + "count": 168, "name": "Serverraum" }, { @@ -43574,6 +43822,18 @@ "id": "5301.04.003", "name": "5301.04.003 (Kaminzimmer)" }, + { + "id": "5302.01.039", + "name": "5302.01.039 (Raum optional)" + }, + { + "id": "5302.EG.005A", + "name": "5302.EG.005A (Sozialraum)" + }, + { + "id": "5302.EG.092E", + "name": "5302.EG.092E (Relaxationsraum)" + }, { "id": "5304.EG.214", "name": "5304.EG.214 (Sozialraum Cafeteria)" @@ -43999,19 +44259,9 @@ "name": "8123.05.015 (Empfang/Aufenthalt/Teek\u00fcche)" } ], - "count": 133, + "count": 136, "name": "Sozialraum" }, - { - "children": [ - { - "id": "5302.01.103", - "name": "5302.01.103 (Cafeteria)" - } - ], - "count": 1, - "name": "Speiseraum" - }, { "children": [ { @@ -44372,6 +44622,10 @@ "id": "5212.EG.027", "name": "5212.EG.027 (Teek\u00fcche)" }, + { + "id": "5302.EG.049C", + "name": "5302.EG.049C (Teek\u00fcche)" + }, { "id": "5401.01.100D", "name": "5401.01.100D (Teek\u00fcche)" @@ -44749,7 +45003,7 @@ "name": "8123.05.003 (Teek\u00fcche)" } ], - "count": 102, + "count": 103, "name": "Teek\u00fcche" }, { @@ -45433,80 +45687,40 @@ "name": "5301.U1.800 (Treppenhaus)" }, { - "id": "5302.01.126", - "name": "5302.01.126 (Treppe)" - }, - { - "id": "5302.01.160", - "name": "5302.01.160 (Treppe)" + "id": "5302.01.752", + "name": "5302.01.752 (Treppenhaus 3)" }, { - "id": "5302.01.162", - "name": "5302.01.162 (Treppe)" + "id": "5302.01.753", + "name": "5302.01.753 (Treppenhaus 4)" }, { - "id": "5302.01.163", - "name": "5302.01.163 (Treppe)" - }, - { - "id": "5302.01.164", - "name": "5302.01.164 (Treppe)" - }, - { - "id": "5302.01.165", - "name": "5302.01.165 (Treppe)" - }, - { - "id": "5302.01.166", - "name": "5302.01.166 (Treppe)" - }, - { - "id": "5302.01.167", - "name": "5302.01.167 (Treppe)" - }, - { - "id": "5302.01.168", - "name": "5302.01.168 (Treppe)" + "id": "5302.01.754", + "name": "5302.01.754 (Treppenhaus 5)" }, { "id": "5302.02.205", "name": "5302.02.205 (Treppenraum)" }, { - "id": "5302.EG.037", - "name": "5302.EG.037 (Treppenhaus)" - }, - { - "id": "5302.EG.042A", - "name": "5302.EG.042A (Treppe)" - }, - { - "id": "5302.EG.051", - "name": "5302.EG.051 (Treppe)" - }, - { - "id": "5302.EG.052A", - "name": "5302.EG.052A (Treppe)" - }, - { - "id": "5302.EG.053", - "name": "5302.EG.053 (Treppe)" + "id": "5302.EG.750E", + "name": "5302.EG.750E (Treppenhaus 1)" }, { - "id": "5302.EG.054", - "name": "5302.EG.054 (Treppe)" + "id": "5302.EG.751C", + "name": "5302.EG.751C (Treppenhaus 2)" }, { - "id": "5302.EG.055A", - "name": "5302.EG.055A (Treppe)" + "id": "5302.EG.752D", + "name": "5302.EG.752D (Treppenhaus 3)" }, { - "id": "5302.EG.061", - "name": "5302.EG.061 (Treppe)" + "id": "5302.EG.753F", + "name": "5302.EG.753F (Treppenhaus 4)" }, { - "id": "5302.EG.062", - "name": "5302.EG.062 (Treppe)" + "id": "5302.EG.754F", + "name": "5302.EG.754F (Treppenhaus 5)" }, { "id": "5302.TP.214B", @@ -47537,7 +47751,7 @@ "name": "5901.U1.403 (Treppenhaus C)" } ], - "count": 662, + "count": 652, "name": "Treppenhaus" }, { @@ -47676,6 +47890,10 @@ "id": "5204.EG.036", "name": "5204.EG.036 (Versuchshalle)" }, + { + "id": "5302.EG.028B", + "name": "5302.EG.028B (Testfeld)" + }, { "id": "5401.EG.111K", "name": "5401.EG.111K (Technikum)" @@ -47841,7 +48059,7 @@ "name": "5701.EG.204 (Versuchshalle)" } ], - "count": 56, + "count": 57, "name": "Versuchshalle" }, { @@ -48014,6 +48232,10 @@ "id": "5212.U1.602", "name": "5212.U1.602 (WC)" }, + { + "id": "5302.01.003", + "name": "5302.01.003 (WC)" + }, { "id": "5304.EG.218", "name": "5304.EG.218 (WC-Personal / Cafeteria)" @@ -48223,7 +48445,7 @@ "name": "5701.EG.211 (WC)" } ], - "count": 55, + "count": 56, "name": "WC" }, { @@ -48281,8 +48503,8 @@ "name": "5301.U1.030 (Beh.-WC)" }, { - "id": "5302.01.115A", - "name": "5302.01.115A (Beh.-WC / Wickeltisch)" + "id": "5302.01.002", + "name": "5302.01.002 (Beh.-WC)" }, { "id": "5304.EG.207", @@ -48619,16 +48841,12 @@ "name": "5301.U1.032 (WC-Damen)" }, { - "id": "5302.01.113", - "name": "5302.01.113 (WC-Damen)" - }, - { - "id": "5302.EG.002A", - "name": "5302.EG.002A (WC-Damen / Cafeteria)" + "id": "5302.EG.011A", + "name": "5302.EG.011A (WC-Damen mit Dusche)" }, { - "id": "5302.EG.025A", - "name": "5302.EG.025A (WC-Damen / Wickeltisch)" + "id": "5302.EG.051C", + "name": "5302.EG.051C (WC-Damen)" }, { "id": "5302.TP.210", @@ -49323,7 +49541,7 @@ "name": "8123.05.023 (WC-Damen)" } ], - "count": 221, + "count": 220, "name": "WC Damen" }, { @@ -49541,16 +49759,16 @@ "name": "5301.U1.031 (WC-Herren)" }, { - "id": "5302.01.115", - "name": "5302.01.115 (WC-Herren)" + "id": "5302.EG.008A", + "name": "5302.EG.008A (WC-Herren mit Dusche)" }, { - "id": "5302.EG.002B", - "name": "5302.EG.002B (WC-Herren / Cafeteria)" + "id": "5302.EG.009A", + "name": "5302.EG.009A (WC-Herren mit Dusche)" }, { - "id": "5302.EG.025B", - "name": "5302.EG.025B (WC-Herren)" + "id": "5302.EG.050C", + "name": "5302.EG.050C (WC-Herren)" }, { "id": "5302.TP.209", @@ -50418,6 +50636,10 @@ "id": "5257.EG.013", "name": "5257.EG.013 (WC-Vorraum Damen)" }, + { + "id": "5302.01.027", + "name": "5302.01.027 (WC-Herren)" + }, { "id": "5304.EG.205", "name": "5304.EG.205 (WC-Vorraum Damen / Cafeteria)" @@ -50714,10 +50936,6 @@ "id": "5510.U1.001E", "name": "5510.U1.001E (WC-Damen Vorraum)" }, - { - "id": "5515.EG.001", - "name": "5515.EG.001 (WC-Damen)" - }, { "id": "5515.EG.001A", "name": "5515.EG.001A (WC-Vorraum Damen)" @@ -50878,6 +51096,16 @@ "count": 124, "name": "WC Vorraum" }, + { + "children": [ + { + "id": "5515.EG.001", + "name": "5515.EG.001 (WC-Damen)" + } + ], + "count": 1, + "name": "WC-Damen" + }, { "children": [ { @@ -50916,22 +51144,6 @@ "id": "5257.EG.012", "name": "5257.EG.012 (Waschraum Damen)" }, - { - "id": "5302.EG.006", - "name": "5302.EG.006 (Waschraum)" - }, - { - "id": "5302.EG.007A", - "name": "5302.EG.007A (Waschraum)" - }, - { - "id": "5302.EG.007B", - "name": "5302.EG.007B (Waschraum)" - }, - { - "id": "5302.EG.007C", - "name": "5302.EG.007C (Waschraum)" - }, { "id": "5304.EG.303", "name": "5304.EG.303 (Wasch.- Trockenraum)" @@ -50977,7 +51189,7 @@ "name": "5608.U1.018B (Waschraum)" } ], - "count": 24, + "count": 20, "name": "Waschraum" }, { @@ -51333,8 +51545,12 @@ "name": "5257.EG.020C (Werkstatt)" }, { - "id": "5302.EG.019", - "name": "5302.EG.019 (Werkstatt)" + "id": "5302.EG.003A", + "name": "5302.EG.003A (Aufbereitung Siebraum)" + }, + { + "id": "5302.EG.071F", + "name": "5302.EG.071F (Maschinenwerkstatt/B\u00fcro)" }, { "id": "5302.TP.107", @@ -51825,7 +52041,7 @@ "name": "5901.EG.048 (E- Werkstatt)" } ], - "count": 155, + "count": 156, "name": "Werkstatt" }, { @@ -51895,12 +52111,16 @@ "name": "5257.EG.004 (Windfang)" }, { - "id": "5302.01.119A", - "name": "5302.01.119A (Windfang)" + "id": "5302.01.700", + "name": "5302.01.700 (Empfang S\u00fcd)" }, { - "id": "5302.01.119B", - "name": "5302.01.119B (Windfang)" + "id": "5302.01.707", + "name": "5302.01.707 (Empfang Ost 1)" + }, + { + "id": "5302.01.708", + "name": "5302.01.708 (Empfang Ost 2)" }, { "id": "5401.01.101J", @@ -52003,7 +52223,7 @@ "name": "5901.EG.001D (Foyer - Windfang)" } ], - "count": 43, + "count": 44, "name": "Windfang" }, { @@ -52132,7 +52352,7 @@ }, { "id": "5504.02.450", - "name": "5504.02.450 (Zeichensaal)" + "name": "5504.02.450 (Empore Zeichensaal MW zu 1450)" }, { "id": "5505.01.550", diff --git a/webclient/cypress/fixtures/get/mi.de.json b/webclient/cypress/fixtures/get/mi.de.json index 515dfba6e..d76ca6510 100644 --- a/webclient/cypress/fixtures/get/mi.de.json +++ b/webclient/cypress/fixtures/get/mi.de.json @@ -80,6 +80,20 @@ }, "id": "mi", "imgs": [ + { + "author": { + "text": "Scharger, Albert / TUM", + "url": null + }, + "license": { + "text": "Free for use in reporting on TUM, with the copyright noted" + }, + "name": "mi_4.webp", + "source": { + "text": "mediaTUM", + "url": "https://mediatum.ub.tum.de/1232767?show_id=608137" + } + }, { "author": { "text": "Benz, Uli / TUM", @@ -102,10 +116,10 @@ "license": { "text": "Free for use in reporting on TUM, with the copyright noted" }, - "name": "mi_4.webp", + "name": "mi_3.webp", "source": { "text": "mediaTUM", - "url": "https://mediatum.ub.tum.de/1232767?show_id=608137" + "url": "https://mediatum.ub.tum.de/1232767?show_id=614629" } }, { @@ -135,20 +149,6 @@ "text": "mediaTUM", "url": "https://mediatum.ub.tum.de/1232767?show_id=1575463" } - }, - { - "author": { - "text": "Scharger, Albert / TUM", - "url": null - }, - "license": { - "text": "Free for use in reporting on TUM, with the copyright noted" - }, - "name": "mi_3.webp", - "source": { - "text": "mediaTUM", - "url": "https://mediatum.ub.tum.de/1232767?show_id=614629" - } } ], "maps": { @@ -233,10 +233,10 @@ "roomfinder": { "available": [ { - "file": "rf93.webp", + "file": "rf101.webp", "height": 605, - "id": "rf93", - "name": "FMI Garching BT05 EG", + "id": "rf101", + "name": "FMI Garching BT05 1.OG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -244,10 +244,10 @@ "y": 574 }, { - "file": "rf115.webp", + "file": "rf116.webp", "height": 605, - "id": "rf115", - "name": "FMI Garching BT05 2.OG", + "id": "rf116", + "name": "FMI Garching BT05 3.OG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -255,10 +255,10 @@ "y": 574 }, { - "file": "rf146.webp", + "file": "rf93.webp", "height": 605, - "id": "rf146", - "name": "FMI Garching BT05 UG", + "id": "rf93", + "name": "FMI Garching BT05 EG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -266,10 +266,10 @@ "y": 574 }, { - "file": "rf106.webp", + "file": "rf130.webp", "height": 605, - "id": "rf106", - "name": "FMI Garching BT10 1.OG", + "id": "rf130", + "name": "FMI Garching BT10 2.OG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -277,10 +277,10 @@ "y": 38 }, { - "file": "rf131.webp", + "file": "rf97.webp", "height": 605, - "id": "rf131", - "name": "FMI Garching BT10 3.OG", + "id": "rf97", + "name": "FMI Garching BT10 EG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -310,10 +310,10 @@ "y": 62 }, { - "file": "rf94.webp", + "file": "rf100.webp", "height": 605, - "id": "rf94", - "name": "FMI Garching BT04 EG", + "id": "rf100", + "name": "FMI Garching BT04 1.OG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -321,10 +321,10 @@ "y": 59 }, { - "file": "rf112.webp", + "file": "rf113.webp", "height": 605, - "id": "rf112", - "name": "FMI Garching BT04 2.OG", + "id": "rf113", + "name": "FMI Garching BT04 3.OG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -332,10 +332,10 @@ "y": 59 }, { - "file": "rf114.webp", + "file": "rf145.webp", "height": 605, - "id": "rf114", - "name": "FMI Garching BT04 4.OG", + "id": "rf145", + "name": "FMI Garching BT04 UG", "scale": "500", "source": "Roomfinder", "width": 295, @@ -354,10 +354,10 @@ "y": 69 }, { - "file": "rf144.webp", + "file": "rf87/6.webp", "height": 487, - "id": "rf144", - "name": "FMI Garching BT02 UG", + "id": "rf87", + "name": "FMI Garching BT02/1 EG", "scale": "500", "source": "Roomfinder", "width": 399, @@ -431,7 +431,7 @@ "y": 167 } ], - "default": "rf93" + "default": "rf101" } }, "name": "Fakult\u00e4t Mathematik & Informatik (FMI oder MI)", @@ -442,10 +442,10 @@ "mvg": [ [ { - "distance": 154.74928238048713, - "lat": 48.2611537274888, - "lon": 11.6684777384851, - "name": "Garching, Boltzmannstra\u00dfe", + "distance": 154.61981732778332, + "lat": 48.261153584156, + "lon": 11.6684673014264, + "name": "Boltzmannstra\u00dfe", "station_id": "de:09184:2073", "sub_stations": [ { @@ -457,10 +457,10 @@ ] }, { - "distance": 349.33813612854465, - "lat": 48.264861448458, - "lon": 11.6712265832549, - "name": "Garch.,Forschungsz.", + "distance": 348.6049478416985, + "lat": 48.2648576635194, + "lon": 11.6712180818262, + "name": "Garching, Forschungszentrum", "station_id": "de:09184:460", "sub_stations": [ { @@ -478,10 +478,10 @@ ] }, { - "distance": 459.44652240644797, - "lat": 48.2619251948158, - "lon": 11.6619380032158, - "name": "Garching, Ludwig-Prandtl-Str.", + "distance": 460.01673270054545, + "lat": 48.2619259866443, + "lon": 11.6619300467174, + "name": "Ludwig-Prandtl-Stra\u00dfe", "station_id": "de:09184:2071", "sub_stations": [ { @@ -493,10 +493,10 @@ ] }, { - "distance": 589.9029164550143, - "lat": 48.26754040849, - "lon": 11.6655043148943, - "name": "Garching, Lichtenbergstra\u00dfe", + "distance": 590.1208669059968, + "lat": 48.2675391261317, + "lon": 11.6654896055231, + "name": "Technische Universit\u00e4t", "station_id": "de:09184:2070", "sub_stations": [ { @@ -1491,6 +1491,10 @@ "id": "5605.03.040", "name": "5605.03.040 (B\u00fcro)" }, + { + "id": "5605.03.041", + "name": "5605.03.041 (B\u00fcro)" + }, { "id": "5605.03.042", "name": "5605.03.042 (B\u00fcro)" @@ -3420,7 +3424,7 @@ "name": "5613.EG.065 (Prof.-B\u00fcro)" } ], - "count": 568, + "count": 569, "name": "B\u00fcro" }, { @@ -5731,10 +5735,6 @@ "id": "5605.03.039", "name": "5605.03.039 (Computerlabor)" }, - { - "id": "5605.03.041", - "name": "5605.03.041 (Computerlabor)" - }, { "id": "5607.01.038", "name": "5607.01.038 (Labor)" @@ -5776,7 +5776,7 @@ "name": "5613.03.007 (Labor)" } ], - "count": 18, + "count": 17, "name": "Labor - Physik" }, { diff --git a/webclient/cypress/fixtures/get/mw.de.json b/webclient/cypress/fixtures/get/mw.de.json index 870dfa510..b2b7a7a51 100644 --- a/webclient/cypress/fixtures/get/mw.de.json +++ b/webclient/cypress/fixtures/get/mw.de.json @@ -9,59 +9,59 @@ "imgs": [ { "author": { - "text": "Renardo la vulpo", + "text": "Heddergott, Andreas / TUM", "url": null }, "license": { - "text": "CC-BY-SA 4.0", - "url": "https://creativecommons.org/licenses/by-sa/4.0/deed.en" + "text": "frei f\u00fcer Berichterstattung \u00fcber TU M\u00fcnchen" }, - "name": "mw_0.webp", + "name": "mw_1.webp", "source": { - "text": "Wikimedia Commons", - "url": "https://commons.wikimedia.org/wiki/File:Garching,_Eberhard-von-Kuenheim-Bau,_2.jpeg" + "text": "mediaTUM", + "url": "https://mediatum.ub.tum.de/652209?show_id=1165202" } }, { "author": { - "text": "Benz, Uli / TUM", + "text": "Andreas Heddergott", "url": null }, "license": { - "text": "Free for use in reporting on TUM, with the copyright noted" + "text": "\u00a9Andreas Heddergott / TUM150; frei f\u00fcr die Berichterstattung \u00fcber die TUM unter Nennung des Copyrightde" }, - "name": "mw_3.webp", + "name": "mw_2.webp", "source": { "text": "mediaTUM", - "url": "https://mediatum.ub.tum.de/1232767?show_id=998437" + "url": "https://mediatum.ub.tum.de/1436723?show_id=1437615" } }, { "author": { - "text": "Heddergott, Andreas / TUM", + "text": "Renardo la vulpo", "url": null }, "license": { - "text": "frei f\u00fcer Berichterstattung \u00fcber TU M\u00fcnchen" + "text": "CC-BY-SA 4.0", + "url": "https://creativecommons.org/licenses/by-sa/4.0/deed.en" }, - "name": "mw_1.webp", + "name": "mw_0.webp", "source": { - "text": "mediaTUM", - "url": "https://mediatum.ub.tum.de/652209?show_id=1165202" + "text": "Wikimedia Commons", + "url": "https://commons.wikimedia.org/wiki/File:Garching,_Eberhard-von-Kuenheim-Bau,_2.jpeg" } }, { "author": { - "text": "Andreas Heddergott", + "text": "Benz, Uli / TUM", "url": null }, "license": { - "text": "\u00a9Andreas Heddergott / TUM150; frei f\u00fcr die Berichterstattung \u00fcber die TUM unter Nennung des Copyrightde" + "text": "Free for use in reporting on TUM, with the copyright noted" }, - "name": "mw_2.webp", + "name": "mw_3.webp", "source": { "text": "mediaTUM", - "url": "https://mediatum.ub.tum.de/1436723?show_id=1437615" + "url": "https://mediatum.ub.tum.de/1232767?show_id=998437" } } ], @@ -71,7 +71,7 @@ "available": [ { "coordinates": [ - [11.667617801785777, 48.26719015728], + [11.667617801785775, 48.26719015728], [11.67160725799323, 48.26672188711042], [11.670921198214224, 48.264131842720005], [11.66693174200677, 48.26460011288958] @@ -132,10 +132,10 @@ "mvg": [ [ { - "distance": 171.45136085771452, - "lat": 48.264861448458, - "lon": 11.6712265832549, - "name": "Garch.,Forschungsz.", + "distance": 171.111887759142, + "lat": 48.2648576635194, + "lon": 11.6712180818262, + "name": "Garching, Forschungszentrum", "station_id": "de:09184:460", "sub_stations": [ { @@ -153,10 +153,10 @@ ] }, { - "distance": 347.6119944567136, - "lat": 48.26754040849, - "lon": 11.6655043148943, - "name": "Garching, Lichtenbergstra\u00dfe", + "distance": 348.3843981354987, + "lat": 48.2675391261317, + "lon": 11.6654896055231, + "name": "Technische Universit\u00e4t", "station_id": "de:09184:2070", "sub_stations": [ { @@ -168,10 +168,10 @@ ] }, { - "distance": 499.57615780846555, - "lat": 48.2611537274888, - "lon": 11.6684777384851, - "name": "Garching, Boltzmannstra\u00dfe", + "distance": 499.6764180387375, + "lat": 48.261153584156, + "lon": 11.6684673014264, + "name": "Boltzmannstra\u00dfe", "station_id": "de:09184:2073", "sub_stations": [ { @@ -183,10 +183,10 @@ ] }, { - "distance": 677.1645168316126, - "lat": 48.2619251948158, - "lon": 11.6619380032158, - "name": "Garching, Ludwig-Prandtl-Str.", + "distance": 677.5794127376404, + "lat": 48.2619259866443, + "lon": 11.6619300467174, + "name": "Ludwig-Prandtl-Stra\u00dfe", "station_id": "de:09184:2071", "sub_stations": [ { @@ -3431,11 +3431,11 @@ }, { "id": "5510.EG.012", - "name": "5510.EG.012 (Pr\u00fcfungsb\u00fcro)" + "name": "5510.EG.012 (Masterpr\u00fcfungsausschuss)" }, { "id": "5510.EG.012A", - "name": "5510.EG.012A (B\u00fcro)" + "name": "5510.EG.012A (Pr\u00fcfungsplanung und Praktikumsamt)" }, { "id": "5510.EG.014", @@ -3443,7 +3443,7 @@ }, { "id": "5510.EG.015", - "name": "5510.EG.015 (Hausmeisterb\u00fcro)" + "name": "5510.EG.015 (Bachelorpr\u00fcfungsausschuss)" }, { "id": "5510.EG.016", @@ -3455,7 +3455,7 @@ }, { "id": "5510.EG.018", - "name": "5510.EG.018 (IKOM)" + "name": "5510.EG.018 (B\u00fcro)" }, { "id": "5510.EG.025", @@ -3463,7 +3463,7 @@ }, { "id": "5510.EG.026A", - "name": "5510.EG.026A (Leitung Pr\u00fcfungsb\u00fcro)" + "name": "5510.EG.026A (Leitung Study & Teaching, Studienfachberatung)" }, { "id": "5510.EG.026B", @@ -3471,11 +3471,11 @@ }, { "id": "5510.EG.026M", - "name": "5510.EG.026M (Studienb\u00fcro)" + "name": "5510.EG.026M (School Office Finanzen)" }, { "id": "5510.EG.026N", - "name": "5510.EG.026N (B\u00fcro)" + "name": "5510.EG.026N (Study and Teaching Qualit\u00e4tsmanagement)" }, { "id": "5510.EG.050A", @@ -12479,7 +12479,7 @@ }, { "id": "5510.EG.029", - "name": "5510.EG.029 (Praktikumsraum)" + "name": "5510.EG.029 (Zentrum f\u00fcr Schl\u00fcsselkompetenzen Kreativwerkstatt)" }, { "id": "5515.EG.005", @@ -14763,10 +14763,6 @@ "id": "5510.U1.001E", "name": "5510.U1.001E (WC-Damen Vorraum)" }, - { - "id": "5515.EG.001", - "name": "5515.EG.001 (WC-Damen)" - }, { "id": "5515.EG.001A", "name": "5515.EG.001A (WC-Vorraum Damen)" @@ -14784,9 +14780,19 @@ "name": "5517.EG.870P (WC-Damen Vorraum)" } ], - "count": 20, + "count": 19, "name": "WC Vorraum" }, + { + "children": [ + { + "id": "5515.EG.001", + "name": "5515.EG.001 (WC-Damen)" + } + ], + "count": 1, + "name": "WC-Damen" + }, { "children": [ { @@ -15263,7 +15269,7 @@ }, { "id": "5504.02.450", - "name": "5504.02.450 (Zeichensaal)" + "name": "5504.02.450 (Empore Zeichensaal MW zu 1450)" }, { "id": "5505.01.550", diff --git a/webclient/cypress/fixtures/get/root.de.json b/webclient/cypress/fixtures/get/root.de.json index 74512ea90..360faccd1 100644 --- a/webclient/cypress/fixtures/get/root.de.json +++ b/webclient/cypress/fixtures/get/root.de.json @@ -8,11 +8,11 @@ "computed": [ { "name": "Anzahl Geb\u00e4ude", - "text": "479" + "text": "483" }, { "name": "Anzahl R\u00e4ume", - "text": "33978 (26662 ohne Flure etc.)" + "text": "34081 (26754 ohne Flure etc.)" } ] }, @@ -135,10 +135,6 @@ "name": "Campus im Olympiapark" }, { - "coords": { - "lat": 48.884541355672695, - "lon": 12.58400509316536 - }, "id": "cs", "name": "Campus Straubing" }, diff --git a/webclient/cypress/fixtures/search/f.de.json b/webclient/cypress/fixtures/search/f.de.json index 4d31eda0e..062c10af0 100644 --- a/webclient/cypress/fixtures/search/f.de.json +++ b/webclient/cypress/fixtures/search/f.de.json @@ -33,46 +33,46 @@ "type": "area" } ], - "estimatedTotalHits": 134, + "estimatedTotalHits": 135, "facet": "sites_buildings", "n_visible": 5 }, { "entries": [ + { + "id": "0503.EG.360", + "name": "0503.EG.360 (Theodor-\u0019F\u0017ischer-H\u00f6rsaal)", + "subtext": "stammgel\u00e4nde, Thierschbau (Z3)", + "subtext_bold": "0360@0503", + "type": "room" + }, { "id": "0503.02.300", "name": "0503.02.300 (\u0019F\u0017riedrich von Thiersch H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, Thierschbau (Z3)", + "subtext": "stammgel\u00e4nde, Thierschbau (Z3)", "subtext_bold": "2300@0503", "type": "room" }, + { + "id": "0101.Z1.080", + "name": "0101.Z1.080 (August-\u0019F\u0017\u00f6ppl-H\u00f6rsaal)", + "subtext": "stammgel\u00e4nde, U-Trakt (N1)", + "subtext_bold": "N1080ZG@0101", + "type": "room" + }, { "id": "5401.01.101K", "name": "5401.01.101K (Hans-\u0019F\u0017ischer-H\u00f6rsaal)", - "subtext": "Garching, Chemie", + "subtext": "garching, Chemie", "subtext_bold": "21010@5401", "type": "room" }, { "id": "5602.EG.001", "name": "5602.EG.001 (MI HS 1, \u0019F\u0017riedrich L. Bauer H\u00f6rsaal)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.02.001@5602", "type": "room" - }, - { - "id": "0101.Z1.080", - "name": "0101.Z1.080 (August-\u0019F\u0017\u00f6ppl-H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, U-Trakt (N1)", - "subtext_bold": "N1080ZG@0101", - "type": "room" - }, - { - "id": "0503.EG.360", - "name": "0503.EG.360 (Theodor-\u0019F\u0017ischer-H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, Thierschbau (Z3)", - "subtext_bold": "0360@0503", - "type": "room" } ], "estimatedTotalHits": 1000, diff --git a/webclient/cypress/fixtures/search/f.long.de.json b/webclient/cypress/fixtures/search/f.long.de.json index e325133bf..e9e73d7f2 100644 --- a/webclient/cypress/fixtures/search/f.long.de.json +++ b/webclient/cypress/fixtures/search/f.long.de.json @@ -63,149 +63,149 @@ "type": "area" } ], - "estimatedTotalHits": 134, + "estimatedTotalHits": 135, "facet": "sites_buildings", "n_visible": 10 }, { "entries": [ + { + "id": "0503.EG.360", + "name": "0503.EG.360 (Theodor-\u0019F\u0017ischer-H\u00f6rsaal)", + "subtext": "stammgel\u00e4nde, Thierschbau (Z3)", + "subtext_bold": "0360@0503", + "type": "room" + }, { "id": "0503.02.300", "name": "0503.02.300 (\u0019F\u0017riedrich von Thiersch H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, Thierschbau (Z3)", + "subtext": "stammgel\u00e4nde, Thierschbau (Z3)", "subtext_bold": "2300@0503", "type": "room" }, + { + "id": "0101.Z1.080", + "name": "0101.Z1.080 (August-\u0019F\u0017\u00f6ppl-H\u00f6rsaal)", + "subtext": "stammgel\u00e4nde, U-Trakt (N1)", + "subtext_bold": "N1080ZG@0101", + "type": "room" + }, { "id": "5401.01.101K", "name": "5401.01.101K (Hans-\u0019F\u0017ischer-H\u00f6rsaal)", - "subtext": "Garching, Chemie", + "subtext": "garching, Chemie", "subtext_bold": "21010@5401", "type": "room" }, { "id": "5602.EG.001", "name": "5602.EG.001 (MI HS 1, \u0019F\u0017riedrich L. Bauer H\u00f6rsaal)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.02.001@5602", "type": "room" }, - { - "id": "0101.Z1.080", - "name": "0101.Z1.080 (August-\u0019F\u0017\u00f6ppl-H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, U-Trakt (N1)", - "subtext_bold": "N1080ZG@0101", - "type": "room" - }, - { - "id": "0503.EG.360", - "name": "0503.EG.360 (Theodor-\u0019F\u0017ischer-H\u00f6rsaal)", - "subtext": "Stammgel\u00e4nde, Thierschbau (Z3)", - "subtext_bold": "0360@0503", - "type": "room" - }, { "id": "4277.EG.127", "name": "4277.EG.127 (H\u00f6rsaal 24 (WZWH24))", - "subtext": "Weihenstephan, Forstwissenschaften", + "subtext": "weihenstephan, Forstwissenschaften", "subtext_bold": "2.0.EG 8@4277", "type": "room" }, { "id": "4277.EG.128", "name": "4277.EG.128 (H\u00f6rsaal 23 (WZWH23))", - "subtext": "Weihenstephan, Forstwissenschaften", + "subtext": "weihenstephan, Forstwissenschaften", "subtext_bold": "2.0.EG 6 H23@4277", "type": "room" }, { "id": "4277.EG.129", "name": "4277.EG.129 (H\u00f6rsaal 22 (WZWH22))", - "subtext": "Weihenstephan, Forstwissenschaften", + "subtext": "weihenstephan, Forstwissenschaften", "subtext_bold": "2.0.EG 4@4277", "type": "room" }, { "id": "4277.EG.130", "name": "4277.EG.130 (H\u00f6rsaal 21 (WZWH21))", - "subtext": "Weihenstephan, Forstwissenschaften", + "subtext": "weihenstephan, Forstwissenschaften", "subtext_bold": "2.0.EG 2@4277", "type": "room" }, { "id": "5301.EG.001", "name": "5301.EG.001 (Auditorium)", - "subtext": "Garching, Institute for Advanced Study (IAS)", + "subtext": "garching, Institute for Advanced Study (IAS)", "subtext_bold": "0.001@5301", "type": "room" }, + { + "id": "1608.EG.001", + "name": "1608.EG.001 (H\u00f6rsaal)", + "subtext": "am-biederstein-mri-au\u00dfenstelle, Altbau 8, Institut f\u00fcr Medizinische Mikr (Bau 608)", + "subtext_bold": "8.0.1@1608", + "type": "room" + }, { "id": "3505.EG.017", "name": "3505.EG.017 (H\u00f6rsaal U7-a)", - "subtext": "Campus Straubing (CS), Biotechnologie und Nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", + "subtext": "campus-straubing-cs-biotechnologie-und-nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", "subtext_bold": "00.520@3505", "type": "room" }, { "id": "3505.EG.021", "name": "3505.EG.021 (H\u00f6rsaal U7-b)", - "subtext": "Campus Straubing (CS), Biotechnologie und Nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", + "subtext": "campus-straubing-cs-biotechnologie-und-nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", "subtext_bold": "00.510@3505", "type": "room" }, { "id": "3505.EG.064", "name": "3505.EG.064 (H\u00f6rsaal U1)", - "subtext": "Campus Straubing (CS), Biotechnologie und Nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", + "subtext": "campus-straubing-cs-biotechnologie-und-nachhaltigkeit, H\u00f6rsaal und Forschungsgeb\u00e4ude (Uferstra\u00dfe 53)", "subtext_bold": "00.220@3505", "type": "room" }, - { - "id": "1608.EG.001", - "name": "1608.EG.001 (H\u00f6rsaal)", - "subtext": "Am Biederstein (MRI Au\u00dfenstelle), Altbau 8, Institut f\u00fcr Medizinische Mikr (Bau 608)", - "subtext_bold": "8.0.1@1608", - "type": "room" - }, { "id": "5604.EG.011", "name": "5604.EG.011 (MI H\u00f6rsaal 2)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.04.011@5604", "type": "room" }, { "id": "5606.EG.011", "name": "5606.EG.011 (MI H\u00f6rsaal 3)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.011@5606", "type": "room" }, { "id": "5502.EG.250", "name": "5502.EG.250 (Ludwig-Prandtl-H\u00f6rsaal)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0250@5502", "type": "room" }, { "id": "5502.01.250", "name": "5502.01.250 (H\u00f6rsaal)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "1250@5502", "type": "room" }, { "id": "5506.EG.608M", "name": "5506.EG.608M (Otto-Lilienthal-H\u00f6rsaal)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0608M@5506", "type": "room" }, { "id": "5503.EG.350", "name": "5503.EG.350 (Egbert-von-Hoyer-H\u00f6rsaal)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0350@5503", "type": "room" } diff --git a/webclient/cypress/fixtures/search/fs.de.json b/webclient/cypress/fixtures/search/fs.de.json index 5b6275776..0a772d5f3 100644 --- a/webclient/cypress/fixtures/search/fs.de.json +++ b/webclient/cypress/fixtures/search/fs.de.json @@ -5,35 +5,35 @@ { "id": "9377.01.130", "name": "9377.01.130 (Projektraum \u0019Fachschaft\u0017)", - "subtext": "Taufkirchen/Ottobr., Lise-Meitner-Stra\u00dfe 9-11", + "subtext": "taufkirchen-ottobr., Lise-Meitner-Stra\u00dfe 9-11", "subtext_bold": "01.130@9377", "type": "room" }, - { - "id": "2333.01.103", - "name": "2333.01.103 (\u0019Fachschaft\u0017 Sport)", - "subtext": "Campus im Olympiapark (SZ), CiO/SG Hallen Ost", - "subtext_bold": "01.2333.103@2333", - "type": "room" - }, { "id": "5506.EG.690D", "name": "5506.EG.690D (Halle \u0019FS\u0017D/Ironbird/Forschungsflugzeug)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0690D@5506", "type": "room" }, + { + "id": "2333.01.103", + "name": "2333.01.103 (\u0019Fachschaft\u0017 Sport)", + "subtext": "campus-im-olympiapark-sz, CiO/SG Hallen Ost", + "subtext_bold": "01.2333.103@2333", + "type": "room" + }, { "id": "0504.EG.424", "name": "0504.EG.424 (Arbeitsraum/Studenten/\u0019Fachschaft\u0017)", - "subtext": "Stammgel\u00e4nde, Landwirtschaftsbau (Z4)", + "subtext": "stammgel\u00e4nde, Landwirtschaftsbau (Z4)", "subtext_bold": "0424@0504", "type": "room" }, { "id": "0101.02.157", "name": "0101.02.157 (\u0019Fachschaft\u0017 Bau, Geo und Umwelt)", - "subtext": "Stammgel\u00e4nde, U-Trakt (N1)", + "subtext": "stammgel\u00e4nde, U-Trakt (N1)", "subtext_bold": "N2157@0101", "type": "room" }, @@ -45,31 +45,31 @@ "type": "room" }, { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", + "id": "5101.EG.257", + "name": "5101.EG.257 (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", + "subtext": "garching, Physik I", + "subtext_bold": "2257@5101", "type": "room" }, { - "id": "2941.01.101L", - "name": "2941.01.101L (\u0019Fachschaft\u0017)", - "subtext": "Campus im Olympiapark (SZ), Institutsgeb\u00e4ude Sportmedizin, Uptown M\u00fcnchen", - "subtext_bold": "L101@2941", + "id": "5606.EG.036", + "name": "5606.EG.036 (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", + "subtext": "garching, Mathe/Info (MI)", + "subtext_bold": "00.06.036@5606", "type": "room" }, { - "id": "4219.U1.002", - "name": "4219.U1.002 (B\u00fcro \u0019Fachschaft\u0017 Landschaft)", - "subtext": "Weihenstephan, Landschaftsentwicklung", - "subtext_bold": "U 02@4219", + "id": "5606.EG.037", + "name": "5606.EG.037 (Besprechungsraum \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", + "subtext": "garching, Mathe/Info (MI)", + "subtext_bold": "00.06.037@5606", "type": "room" }, { - "id": "0104.U1.403", - "name": "0104.U1.403 (\u0019Fachschaft\u0017 EI)", - "subtext": "Stammgel\u00e4nde, E-Technik Elektrophysik (N4)", - "subtext_bold": "N-1403@0104", + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", "type": "room" } ], diff --git a/webclient/cypress/fixtures/search/fs.long.de.json b/webclient/cypress/fixtures/search/fs.long.de.json index d2cfb1d0e..cea7803d9 100644 --- a/webclient/cypress/fixtures/search/fs.long.de.json +++ b/webclient/cypress/fixtures/search/fs.long.de.json @@ -5,35 +5,35 @@ { "id": "9377.01.130", "name": "9377.01.130 (Projektraum \u0019Fachschaft\u0017)", - "subtext": "Taufkirchen/Ottobr., Lise-Meitner-Stra\u00dfe 9-11", + "subtext": "taufkirchen-ottobr., Lise-Meitner-Stra\u00dfe 9-11", "subtext_bold": "01.130@9377", "type": "room" }, - { - "id": "2333.01.103", - "name": "2333.01.103 (\u0019Fachschaft\u0017 Sport)", - "subtext": "Campus im Olympiapark (SZ), CiO/SG Hallen Ost", - "subtext_bold": "01.2333.103@2333", - "type": "room" - }, { "id": "5506.EG.690D", "name": "5506.EG.690D (Halle \u0019FS\u0017D/Ironbird/Forschungsflugzeug)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0690D@5506", "type": "room" }, + { + "id": "2333.01.103", + "name": "2333.01.103 (\u0019Fachschaft\u0017 Sport)", + "subtext": "campus-im-olympiapark-sz, CiO/SG Hallen Ost", + "subtext_bold": "01.2333.103@2333", + "type": "room" + }, { "id": "0504.EG.424", "name": "0504.EG.424 (Arbeitsraum/Studenten/\u0019Fachschaft\u0017)", - "subtext": "Stammgel\u00e4nde, Landwirtschaftsbau (Z4)", + "subtext": "stammgel\u00e4nde, Landwirtschaftsbau (Z4)", "subtext_bold": "0424@0504", "type": "room" }, { "id": "0101.02.157", "name": "0101.02.157 (\u0019Fachschaft\u0017 Bau, Geo und Umwelt)", - "subtext": "Stammgel\u00e4nde, U-Trakt (N1)", + "subtext": "stammgel\u00e4nde, U-Trakt (N1)", "subtext_bold": "N2157@0101", "type": "room" }, @@ -44,110 +44,110 @@ "subtext_bold": "130@2907", "type": "room" }, - { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", - "type": "room" - }, - { - "id": "2941.01.101L", - "name": "2941.01.101L (\u0019Fachschaft\u0017)", - "subtext": "Campus im Olympiapark (SZ), Institutsgeb\u00e4ude Sportmedizin, Uptown M\u00fcnchen", - "subtext_bold": "L101@2941", - "type": "room" - }, - { - "id": "4219.U1.002", - "name": "4219.U1.002 (B\u00fcro \u0019Fachschaft\u0017 Landschaft)", - "subtext": "Weihenstephan, Landschaftsentwicklung", - "subtext_bold": "U 02@4219", - "type": "room" - }, - { - "id": "0104.U1.403", - "name": "0104.U1.403 (\u0019Fachschaft\u0017 EI)", - "subtext": "Stammgel\u00e4nde, E-Technik Elektrophysik (N4)", - "subtext_bold": "N-1403@0104", - "type": "room" - }, { "id": "5101.EG.257", "name": "5101.EG.257 (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Physik I", + "subtext": "garching, Physik I", "subtext_bold": "2257@5101", "type": "room" }, { "id": "5606.EG.036", "name": "5606.EG.036 (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.036@5606", "type": "room" }, { "id": "5606.EG.037", "name": "5606.EG.037 (Besprechungsraum \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.037@5606", "type": "room" }, + { + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", + "type": "room" + }, { "id": "5501.EG.101", "name": "5501.EG.101 (\u0019Fachschaft\u0017 Maschinenbau / \u0019FS\u0017MB)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0101@5501", "type": "room" }, { - "id": "0508.EG.817", - "name": "0508.EG.817 (\u0019Fachschaft\u0017 Architektur)", - "subtext": "Stammgel\u00e4nde, Heizkraftwerk (Z8)", - "subtext_bold": "0817@0508", + "id": "2941.01.101L", + "name": "2941.01.101L (\u0019Fachschaft\u0017)", + "subtext": "campus-im-olympiapark-sz, Institutsgeb\u00e4ude Sportmedizin, Uptown M\u00fcnchen", + "subtext_bold": "L101@2941", "type": "room" }, { - "id": "0508.EG.817A", - "name": "0508.EG.817A (\u0019Fachschaft\u0017 Architektur)", - "subtext": "Stammgel\u00e4nde, Heizkraftwerk (Z8)", - "subtext_bold": "0817A@0508", + "id": "4219.U1.002", + "name": "4219.U1.002 (B\u00fcro \u0019Fachschaft\u0017 Landschaft)", + "subtext": "weihenstephan, Landschaftsentwicklung", + "subtext_bold": "U 02@4219", "type": "room" }, { - "id": "5502.U1.234M", - "name": "5502.U1.234M (Druckerei \u0019Fachschaft\u0017 Maschinenbau / \u0019FS\u0017MB)", - "subtext": "Garching, Maschinenwesen (MW)", - "subtext_bold": "U234M@5502", + "id": "0104.U1.403", + "name": "0104.U1.403 (\u0019Fachschaft\u0017 EI)", + "subtext": "stammgel\u00e4nde, E-Technik Elektrophysik (N4)", + "subtext_bold": "N-1403@0104", "type": "room" }, { - "id": "0104.U1.413", - "name": "0104.U1.413 (Druckraum \u0019FS\u0017EI)", - "subtext": "Stammgel\u00e4nde, E-Technik Elektrophysik (N4)", - "subtext_bold": "N-1413@0104", + "id": "0508.EG.817", + "name": "0508.EG.817 (\u0019Fachschaft\u0017 Architektur)", + "subtext": "stammgel\u00e4nde, Heizkraftwerk (Z8)", + "subtext_bold": "0817@0508", + "type": "room" + }, + { + "id": "0508.EG.817A", + "name": "0508.EG.817A (\u0019Fachschaft\u0017 Architektur)", + "subtext": "stammgel\u00e4nde, Heizkraftwerk (Z8)", + "subtext_bold": "0817A@0508", "type": "room" }, { "id": "5606.EG.038", "name": "5606.EG.038 (Lager \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.038@5606", "type": "room" }, { "id": "5606.EG.039", "name": "5606.EG.039 (Skriptenverkauf \u0019Fachschaft\u0017 Mathe Physik Informatik Chemie / MPIC)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.039@5606", "type": "room" }, + { + "id": "5502.U1.234M", + "name": "5502.U1.234M (Druckerei \u0019Fachschaft\u0017 Maschinenbau / \u0019FS\u0017MB)", + "subtext": "garching, Maschinenwesen (MW)", + "subtext_bold": "U234M@5502", + "type": "room" + }, { "id": "5510.EG.011M", "name": "5510.EG.011M (Skriptenverkauf \u0019Fachschaft\u0017 Maschinenbau / \u0019FS\u0017MB)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0011M@5510", "type": "room" + }, + { + "id": "0104.U1.413", + "name": "0104.U1.413 (Druckraum \u0019FS\u0017EI)", + "subtext": "stammgel\u00e4nde, E-Technik Elektrophysik (N4)", + "subtext_bold": "N-1413@0104", + "type": "room" } ], "estimatedTotalHits": 21, diff --git a/webclient/cypress/fixtures/search/fsm.de.json b/webclient/cypress/fixtures/search/fsm.de.json index fbfa0cd12..33aadccde 100644 --- a/webclient/cypress/fixtures/search/fsm.de.json +++ b/webclient/cypress/fixtures/search/fsm.de.json @@ -5,21 +5,21 @@ { "id": "5501.EG.101", "name": "5501.EG.101 (Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0101@5501", "type": "room" }, { "id": "5502.U1.234M", "name": "5502.U1.234M (Druckerei Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "U234M@5502", "type": "room" }, { "id": "5510.EG.011M", "name": "5510.EG.011M (Skriptenverkauf Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0011M@5510", "type": "room" } diff --git a/webclient/cypress/fixtures/search/fsm.long.de.json b/webclient/cypress/fixtures/search/fsm.long.de.json index fbfa0cd12..33aadccde 100644 --- a/webclient/cypress/fixtures/search/fsm.long.de.json +++ b/webclient/cypress/fixtures/search/fsm.long.de.json @@ -5,21 +5,21 @@ { "id": "5501.EG.101", "name": "5501.EG.101 (Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0101@5501", "type": "room" }, { "id": "5502.U1.234M", "name": "5502.U1.234M (Druckerei Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "U234M@5502", "type": "room" }, { "id": "5510.EG.011M", "name": "5510.EG.011M (Skriptenverkauf Fachschaft Maschinenbau / \u0019FSM\u0017B)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0011M@5510", "type": "room" } diff --git a/webclient/cypress/fixtures/search/fsmb.de.json b/webclient/cypress/fixtures/search/fsmb.de.json index 3e04f2f52..a5bade4a4 100644 --- a/webclient/cypress/fixtures/search/fsmb.de.json +++ b/webclient/cypress/fixtures/search/fsmb.de.json @@ -5,21 +5,21 @@ { "id": "5501.EG.101", "name": "5501.EG.101 (Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0101@5501", "type": "room" }, { "id": "5502.U1.234M", "name": "5502.U1.234M (Druckerei Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "U234M@5502", "type": "room" }, { "id": "5510.EG.011M", "name": "5510.EG.011M (Skriptenverkauf Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0011M@5510", "type": "room" } diff --git a/webclient/cypress/fixtures/search/fsmb.long.de.json b/webclient/cypress/fixtures/search/fsmb.long.de.json index 46cf4fe78..748eb511e 100644 --- a/webclient/cypress/fixtures/search/fsmb.long.de.json +++ b/webclient/cypress/fixtures/search/fsmb.long.de.json @@ -5,21 +5,21 @@ { "id": "5501.EG.101", "name": "5501.EG.101 (Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0101@5501", "type": "room" }, { "id": "5502.U1.234M", "name": "5502.U1.234M (Druckerei Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "U234M@5502", "type": "room" }, { "id": "5510.EG.011M", "name": "5510.EG.011M (Skriptenverkauf Fachschaft Maschinenbau / \u0019FSMB\u0017)", - "subtext": "Garching, Maschinenwesen (MW)", + "subtext": "garching, Maschinenwesen (MW)", "subtext_bold": "0011M@5510", "type": "room" } @@ -34,5 +34,5 @@ "n_visible": 0 } ], - "time_ms": 4 + "time_ms": 3 } diff --git a/webclient/cypress/fixtures/search/fsmp.de.json b/webclient/cypress/fixtures/search/fsmp.de.json index b472205d9..15e636f99 100644 --- a/webclient/cypress/fixtures/search/fsmp.de.json +++ b/webclient/cypress/fixtures/search/fsmp.de.json @@ -11,5 +11,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 2 } diff --git a/webclient/cypress/fixtures/search/fsmp.long.de.json b/webclient/cypress/fixtures/search/fsmp.long.de.json index b472205d9..13b1df760 100644 --- a/webclient/cypress/fixtures/search/fsmp.long.de.json +++ b/webclient/cypress/fixtures/search/fsmp.long.de.json @@ -11,5 +11,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 1 } diff --git a/webclient/cypress/fixtures/search/fsmpi.de.json b/webclient/cypress/fixtures/search/fsmpi.de.json index c20aaa403..94b0535e9 100644 --- a/webclient/cypress/fixtures/search/fsmpi.de.json +++ b/webclient/cypress/fixtures/search/fsmpi.de.json @@ -39,38 +39,38 @@ }, { "entries": [ - { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", - "type": "room" - }, { "id": "5101.EG.257", "name": "5101.EG.257 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Physik I", + "subtext": "garching, Physik I", "subtext_bold": "2257@5101", "type": "room" }, { "id": "5606.EG.036", "name": "5606.EG.036 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.036@5606", "type": "room" }, { "id": "5606.EG.037", "name": "5606.EG.037 (Besprechungsraum Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.037@5606", "type": "room" }, + { + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", + "type": "room" + }, { "id": "5606.EG.038", "name": "5606.EG.038 (Lager Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.038@5606", "type": "room" } @@ -79,5 +79,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 5 } diff --git a/webclient/cypress/fixtures/search/fsmpi.long.de.json b/webclient/cypress/fixtures/search/fsmpi.long.de.json index c99fbb758..ddbc8ee41 100644 --- a/webclient/cypress/fixtures/search/fsmpi.long.de.json +++ b/webclient/cypress/fixtures/search/fsmpi.long.de.json @@ -57,45 +57,45 @@ }, { "entries": [ - { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", - "type": "room" - }, { "id": "5101.EG.257", "name": "5101.EG.257 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Physik I", + "subtext": "garching, Physik I", "subtext_bold": "2257@5101", "type": "room" }, { "id": "5606.EG.036", "name": "5606.EG.036 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.036@5606", "type": "room" }, { "id": "5606.EG.037", "name": "5606.EG.037 (Besprechungsraum Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.037@5606", "type": "room" }, + { + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", + "type": "room" + }, { "id": "5606.EG.038", "name": "5606.EG.038 (Lager Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.038@5606", "type": "room" }, { "id": "5606.EG.039", "name": "5606.EG.039 (Skriptenverkauf Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.039@5606", "type": "room" } @@ -104,5 +104,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 10 } diff --git a/webclient/cypress/fixtures/search/fsmpic.de.json b/webclient/cypress/fixtures/search/fsmpic.de.json index c20aaa403..94b0535e9 100644 --- a/webclient/cypress/fixtures/search/fsmpic.de.json +++ b/webclient/cypress/fixtures/search/fsmpic.de.json @@ -39,38 +39,38 @@ }, { "entries": [ - { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", - "type": "room" - }, { "id": "5101.EG.257", "name": "5101.EG.257 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Physik I", + "subtext": "garching, Physik I", "subtext_bold": "2257@5101", "type": "room" }, { "id": "5606.EG.036", "name": "5606.EG.036 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.036@5606", "type": "room" }, { "id": "5606.EG.037", "name": "5606.EG.037 (Besprechungsraum Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.037@5606", "type": "room" }, + { + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", + "type": "room" + }, { "id": "5606.EG.038", "name": "5606.EG.038 (Lager Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.038@5606", "type": "room" } @@ -79,5 +79,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 5 } diff --git a/webclient/cypress/fixtures/search/fsmpic.long.de.json b/webclient/cypress/fixtures/search/fsmpic.long.de.json index c99fbb758..3b411f247 100644 --- a/webclient/cypress/fixtures/search/fsmpic.long.de.json +++ b/webclient/cypress/fixtures/search/fsmpic.long.de.json @@ -57,45 +57,45 @@ }, { "entries": [ - { - "id": "5406.01.650C", - "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Chemie", - "subtext_bold": "26503@5406", - "type": "room" - }, { "id": "5101.EG.257", "name": "5101.EG.257 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Physik I", + "subtext": "garching, Physik I", "subtext_bold": "2257@5101", "type": "room" }, { "id": "5606.EG.036", "name": "5606.EG.036 (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.036@5606", "type": "room" }, { "id": "5606.EG.037", "name": "5606.EG.037 (Besprechungsraum Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.037@5606", "type": "room" }, + { + "id": "5406.01.650C", + "name": "5406.01.650C (B\u00fcro Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", + "subtext": "garching, Chemie", + "subtext_bold": "26503@5406", + "type": "room" + }, { "id": "5606.EG.038", "name": "5606.EG.038 (Lager Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.038@5606", "type": "room" }, { "id": "5606.EG.039", "name": "5606.EG.039 (Skriptenverkauf Fachschaft Mathe Physik Informatik Chemie / \u0019MPIC\u0017)", - "subtext": "Garching, Mathe/Info (MI)", + "subtext": "garching, Mathe/Info (MI)", "subtext_bold": "00.06.039@5606", "type": "room" } @@ -104,5 +104,5 @@ "facet": "rooms" } ], - "time_ms": 0 + "time_ms": 5 } diff --git a/webclient/cypress/support/component-index.html b/webclient/cypress/support/component-index.html new file mode 100644 index 000000000..f46521eae --- /dev/null +++ b/webclient/cypress/support/component-index.html @@ -0,0 +1,15 @@ + + + + + + + Components App + + + + +
+ + + diff --git a/webclient/cypress/support/component.ts b/webclient/cypress/support/component.ts new file mode 100644 index 000000000..0e90934cf --- /dev/null +++ b/webclient/cypress/support/component.ts @@ -0,0 +1,42 @@ +import { createPinia } from "pinia"; // or Vuex +import { createI18n } from "vue-i18n"; +import { mount } from "cypress/vue"; +import { createMemoryHistory, createRouter } from "vue-router"; +import { routes } from "../../src/router"; + +// We recommend that you pull this out +// into a constants file that you share with +// your main.js file. +const i18nOptions = { + legacy: false, + locale: localStorage.getItem("lang") || "de", + messages: { de: {}, en: {} }, + globalInjection: true, + missingWarn: true, + warnHtmlMessage: true, +}; + +Cypress.Commands.add("mount", (component, options = {}) => { + options.global = options.global || {}; + options.global.plugins = options.global.plugins || []; + options.global.plugins = options.global.plugins || []; + options.global.plugins.push(createPinia()); + options.global.plugins.push(createI18n(i18nOptions)); + + // create router if one is not provided + if (!options.router) { + options.router = createRouter({ + routes: routes, + history: createMemoryHistory(), + }); + } + + // Add router plugin + options.global.plugins.push({ + install(app) { + app.use(options.router); + }, + }); + + return mount(component, options); +}); diff --git a/webclient/index.html b/webclient/index.html index 11b13b5b0..b96265056 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -1,5 +1,5 @@ - +