add secondary PC

rudnerbjoern · Oct 18, 2024 · 491fd94 · 491fd94
1 parent 7a331b7
commit 491fd94
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -89,6 +89,7 @@ The class `Workstation` is a child class of `PhysicalDevice`.
 | Location             | Foreign key to a Location                                              | No         |
 | User                 | Foreign key to a Person/Contact                                        | No         |
 | PC                   | Foreign key to a [PC](#pc)                                             | Yes        |
+| Secondary PC         | Foreign key to a [PC](#pc)                                             | No         |
 | Docking Station      | Foreign key to a [Docking Station](#dockingstation)                    | No         |
 | Monitor A            | Foreign key to a [Monitor](#monitor)                                   | No         |
 | Monitor B            | Foreign key to a [Monitor](#monitor)                                   | No         |

diff --git a/br-peripherals/datamodel.br-peripherals.xml b/br-peripherals/datamodel.br-peripherals.xml
@@ -79,6 +79,21 @@
                     <extkey_attcode>pc_id</extkey_attcode>
                     <target_attcode>name</target_attcode>
                 </field>
+                <field id="pcB_id" xsi:type="AttributeExternalKey">
+                    <filter><![CDATA[SELECT PC AS obj JOIN Organization AS child ON obj.org_id = child.id JOIN Organization AS root ON child.parent_id BELOW root.id WHERE root.id=:this->org_id AND obj.workstation_id = 0]]></filter>
+                    <dependencies>
+                        <attribute id="org_id" />
+                    </dependencies>
+                    <sql>pcB_id</sql>
+                    <target_class>PC</target_class>
+                    <is_null_allowed>true</is_null_allowed>
+                    <on_target_delete>DEL_MANUAL</on_target_delete>
+                    <allow_target_creation>false</allow_target_creation>
+                </field>
+                <field id="pcB_name" xsi:type="AttributeExternalField">
+                    <extkey_attcode>pcB_id</extkey_attcode>
+                    <target_attcode>name</target_attcode>
+                </field>
                 <field id="monitorA_id" xsi:type="AttributeExternalKey">
                     <filter><![CDATA[SELECT Monitor AS obj JOIN Organization AS child ON obj.org_id = child.id JOIN Organization AS root ON child.parent_id BELOW root.id WHERE root.id=:this->org_id AND obj.workstation_id = 0]]></filter>
                     <dependencies>
@@ -319,7 +334,7 @@
                     <code>
                         <![CDATA[public static function GetPeripherals()
 {
-return array('pc_id','monitorA_id','monitorB_id','dockingstation_id',
+return array('pc_id','pcB_id','monitorA_id','monitorB_id','dockingstation_id',
              'keyboard_id','mouse_id','headset_id',
              'mobilephone_id','telephonyA_id','telephonyB_id',
              'printerA_id','printerB_id',
@@ -482,6 +497,12 @@ return array('pc_id','monitorA_id','monitorB_id','dockingstation_id',
         // disconnect the old Workstation
         $this->DisconnectTargetFromWorkstation($this->GetOriginal('pc_id'));
     }
+    if (array_key_exists('pcB_id', $aChanges)) {
+        // record in the local memory object that the secondary PC was changed
+        $this->bPCBChanged = true;
+        // disconnect the old Workstation
+        $this->DisconnectTargetFromWorkstation($this->GetOriginal('pcB_id'));
+    }
     if (array_key_exists('monitorA_id', $aChanges)) {
         // record in the local memory object that the MonitorA was changed
         $this->bMonitorAChanged = true;
@@ -590,6 +611,8 @@ return array('pc_id','monitorA_id','monitorB_id','dockingstation_id',
     // The Workstation is updated in DB and assigned Peripherals changed
     if (isset($this->bPCChanged))
         $this->ConnectTargetToWorkstation($this->Get('pc_id'), $bUpdateLocations);
+    if (isset($this->bPCBChanged))
+        $this->ConnectTargetToWorkstation($this->Get('pcB_id'), $bUpdateLocations);
     if (isset($this->bMonitorAChanged))
         $this->ConnectTargetToWorkstation($this->Get('monitorA_id'), $bUpdateLocations);
     if (isset($this->bMonitorBChanged))
@@ -718,6 +741,9 @@ return array('pc_id','monitorA_id','monitorB_id','dockingstation_id',
                                         <item id="pc_id">
                                             <rank>10</rank>
                                         </item>
+                                        <item id="pcB_id">
+                                            <rank>15</rank>
+                                        </item>
                                         <item id="monitorA_id">
                                             <rank>20</rank>
                                         </item>

diff --git a/br-peripherals/de.dict.br-peripherals.php b/br-peripherals/de.dict.br-peripherals.php
@@ -14,6 +14,7 @@
     'Class:Workstation+' => 'Ein Arbeitsplatz',
     'Class:Workstation/Attribute:user_id' => 'Benutzer',
     'Class:Workstation/Attribute:pc_id' => 'PC',
+    'Class:Workstation/Attribute:pcB_id' => 'Zweiter PC',
     'Class:Workstation/Attribute:monitorA_id' => 'Bildschirm A',
     'Class:Workstation/Attribute:monitorB_id' => 'Bildschirm B',
     'Class:Workstation/Attribute:dockingstation_id' => 'Docking Station',

diff --git a/br-peripherals/en.dict.br-peripherals.php b/br-peripherals/en.dict.br-peripherals.php
@@ -14,6 +14,7 @@
     'Class:Workstation+' => 'A workstation',
     'Class:Workstation/Attribute:user_id' => 'User',
     'Class:Workstation/Attribute:pc_id' => 'PC',
+    'Class:Workstation/Attribute:pcB_id' => 'secondary PC',
     'Class:Workstation/Attribute:monitorA_id' => 'Monitor A',
     'Class:Workstation/Attribute:monitorB_id' => 'Monitor B',
     'Class:Workstation/Attribute:dockingstation_id' => 'Docking station',