From ba18e1f0d0ec5fe6467e093d3b0a83e98a011212 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Thu, 23 Jan 2025 17:35:46 +0100 Subject: [PATCH] Add assigned to. --- .../resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties | 3 ++- .../org/jdrupes/vmoperator/vmmgmt/l10n_de.properties | 5 +++-- .../jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties index 88f140349..51ca610ad 100644 --- a/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties +++ b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties @@ -2,7 +2,7 @@ conletName = VM Management VMsSummary = VMs (running/total) -since = Since +assignedTo = Assigned to currentCpus = Current CPUs currentRam = Current RAM maximumCpus = Maximum CPUs @@ -11,6 +11,7 @@ nodeName = Node requestedCpus = Requested CPUs requestedRam = Requested RAM running = Running +since = Since usedBy = Used by usedFrom = Used from vmActions = Actions diff --git a/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n_de.properties b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n_de.properties index 80e36d2d2..3e67928be 100644 --- a/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n_de.properties +++ b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n_de.properties @@ -6,8 +6,7 @@ Period = Zeitraum Last\ hour = Letzte Stunde Last\ day = Letzter Tag -running = Gestartet -since = Seit +assignedTo = Zugewiesen an currentCpus = Aktuelle CPUs currentRam = Akuelles RAM maximumCpus = Maximale CPUs @@ -15,6 +14,8 @@ maximumRam = Maximales RAM nodeName = Knoten requestedCpus = Angeforderte CPUs requestedRam = Angefordertes RAM +running = Gestartet +since = Seit usedBy = Benutzt durch usedFrom = Benutzt von vmActions = Aktionen diff --git a/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts index 78f58510d..d96ad65f4 100644 --- a/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts @@ -112,6 +112,7 @@ window.orgJDrupesVmOperatorVmMgmt.initView = (viewDom: HTMLElement, ["currentCpus", "currentCpus"], ["currentRam", "currentRam"], ["nodeName", "nodeName"], + ["assignedTo", "assignedTo"], ["usedFrom", "usedFrom"], ["usedBy", "usedBy"] ], { @@ -183,6 +184,7 @@ JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmmgmt.VmMgmt", vmDefinition.currentRam = Number(vmDefinition.status.ram); vmDefinition.usedFrom = vmDefinition.status.consoleClient || ""; vmDefinition.usedBy = vmDefinition.status.consoleUser || ""; + vmDefinition.assignedTo = vmDefinition.status.assignment?.user || ""; for (const condition of vmDefinition.status.conditions) { if (condition.type === "Running") { vmDefinition.running = condition.status === "True";