[locations] Add warnings/cleanup for bad machine to roomplan mappings

4 files changed, 28 insertions, 0 deletions

diff --git a/modules-available/locations/lang/de/messages.json b/modules-available/locations/lang/de/messages.json
index 6b682c7e..44855daf 100644
--- a/modules-available/locations/lang/de/messages.json
+++ b/modules-available/locations/lang/de/messages.json
@@ -3,8 +3,12 @@
     "invalid-location-id": "Ung\u00fcltige Orts-id: {{0}}",
     "location-deleted": "Location wurde gel\u00f6scht (Locations: {{0}}, Subnets: {{1}})",
     "location-updated": "Location {{0}} wurde aktualisiert",
+    "moved-n-machines": "{{0}} Rechner verschoben",
+    "no-mismatch-location": "Keine widerspr\u00fcchlichen Zuweisungen f\u00fcr diesen Ort",
     "no-permission-location": "Keine Rechte f\u00fcr Ort {{0}}",
+    "no-valid-machines-selected": "Keine g\u00fcltigen Rechner ausgew\u00e4hlt",
     "parameter-missing": "Fehlender Parameter: {{0}}",
+    "reset-n-machines": "{{0}} Rechner aus Raumplan entfernt",
     "subnets-created": "Subnetze angelegt: {{0}}",
     "subnets-deleted": "Subnetze gel\u00f6scht: {{0}}",
     "subnets-updated": "Subnetze aktualisiert: {{0}}"
diff --git a/modules-available/locations/lang/de/template-tags.json b/modules-available/locations/lang/de/template-tags.json
index 96273ce4..45464e48 100644
--- a/modules-available/locations/lang/de/template-tags.json
+++ b/modules-available/locations/lang/de/template-tags.json
@@ -11,21 +11,31 @@
     "lang_editConfigVariables": "Konfig.-Variablen",
     "lang_editRoomplan": "Raumplan bearbeiten",
     "lang_endAddress": "Endadresse",
+    "lang_fixMachineAssign": "Zuweisungen anzeigen\/aufheben",
+    "lang_ip": "IP-Adresse",
     "lang_listOfSubnets": "Liste der Subnetze",
     "lang_location": "Ort",
+    "lang_locationBySubnet": "Zugeh\u00f6rigkeit durch IP-Adresse",
     "lang_locationInfo": "Details zu diesem Ort",
+    "lang_locationMismatch": "Fehlerhafte Rechnerzuweisung durch Raumplaner",
     "lang_locationName": "Name",
     "lang_locationOtherOverlap": "Achtung! Folgende Orte haben sich \u00fcberlappende Netzbereiche",
     "lang_locationSelfOverlap": "Folgender Ort hat mehrere sich \u00fcberschneidende Netzbereiche",
     "lang_locationSettings": "Raum\/Ort bearbeiten",
     "lang_locationsMainHeading": "Verwaltung von R\u00e4umen\/Orten",
+    "lang_machine": "Rechner",
     "lang_machineCount": "Rechner",
     "lang_machineLoad": "Besetzt",
     "lang_matchingMachines": "Enthaltene Rechner",
+    "lang_mismatchHeading": "Rechner mit widerspr\u00fcchlicher Raumzuweisung",
+    "lang_mismatchIntroText": "Die hier aufgelisteten Rechner wurden mittels des Raumplaners im oben genannten Raum platziert. Ihrer IP-Adresse nach fallen diese jedoch in einen anderen Raum (durch die f\u00fcr diesen definierten IP-Ranges). Wenn Sie die entsprechenden Rechner hier markieren und auf \"Zur\u00fccksetzen\" klicken, werden die Rechner aus dem oben genannten Raumplan entfernt. Wenn Sie stattdessen auf \"Verschieben\" klicken, werden die Rechner mit ihrer aktuellen Position aus dem jetzigen Raum in den eigentlichen Raum (siehe letzte Spalte der Tabelle) verschoben.",
+    "lang_moveMachines": "In durch Subnet zugeordneten Raum verschieben",
+    "lang_moveable": "Verschiebbar",
     "lang_name": "Name",
     "lang_overrideCount": "Angepasst",
     "lang_parentLocation": "\u00dcbergeordneter Ort",
     "lang_referencingLectures": "Veranstaltungen",
+    "lang_resetMachines": "Raumzuweisung zur\u00fccksetzen",
     "lang_showRoomplan": "Raumplan anzeigen",
     "lang_startAddress": "Startadresse",
     "lang_subnet": "IP-Bereich",
diff --git a/modules-available/locations/lang/en/messages.json b/modules-available/locations/lang/en/messages.json
index 95788c47..80b99ff0 100644
--- a/modules-available/locations/lang/en/messages.json
+++ b/modules-available/locations/lang/en/messages.json
@@ -3,8 +3,12 @@
     "invalid-location-id": "Invalid location id: {{0}}",
     "location-deleted": "Location has been deleted (locations: {{0}}, subnets: {{1}})",
     "location-updated": "Location {{0}} has been updated",
+    "moved-n-machines": "Moved {{0}} machines",
+    "no-mismatch-location": "No mismatches for this location",
     "no-permission-location": "No permissions for location {{0}}",
+    "no-valid-machines-selected": "No valid machines selected",
     "parameter-missing": "Missing parameter: {{0}}",
+    "reset-n-machines": "Removed {{0}} machines from room plan",
     "subnets-created": "{{0}} subnet(s) created",
     "subnets-deleted": "{{0}} subnet(s) deleted",
     "subnets-updated": "{{0}} subnet(s) updated"
diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json
index 64211e27..abcb7606 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -11,21 +11,31 @@
     "lang_editConfigVariables": "Config vars",
     "lang_editRoomplan": "Edit roomplan",
     "lang_endAddress": "End address",
+    "lang_fixMachineAssign": "Fix or remove assignment",
+    "lang_ip": "IP address",
     "lang_listOfSubnets": "List of subnets",
     "lang_location": "Location",
+    "lang_locationBySubnet": "Location by IP address",
     "lang_locationInfo": "Location details",
+    "lang_locationMismatch": "Mismatching assignment via room planner",
     "lang_locationName": "Name",
     "lang_locationOtherOverlap": "Warning! These locations have overlapping address ranges",
     "lang_locationSelfOverlap": "The following location has multiple address ranges that are overlapping",
     "lang_locationSettings": "Edit this room or location",
     "lang_locationsMainHeading": "Manage rooms and locations",
+    "lang_machine": "Machine",
     "lang_machineCount": "Clients",
     "lang_machineLoad": "In use",
     "lang_matchingMachines": "Matching clients",
+    "lang_mismatchHeading": "Machines with mismatching room plan assignment",
+    "lang_mismatchIntroText": "Machines listed here are assigned to the room above, but judging from their IP address, should actually be in another room (because of the IP range(s) assigned to that room). By selecting machines below and clicking \"reset\", they will be removed from their current room plan. If you choose \"move\", they will be transferred to the plan of the room they should actually belong to (see last column of table).",
+    "lang_moveMachines": "Move to room designated by IP address",
+    "lang_moveable": "Moveable",
     "lang_name": "Name",
     "lang_overrideCount": "Overridden",
     "lang_parentLocation": "Parent location",
     "lang_referencingLectures": "Assigned Lectures",
+    "lang_resetMachines": "Reset room assignment",
     "lang_showRoomplan": "Show room plan",
     "lang_startAddress": "Start address",
     "lang_subnet": "IP range",