From b9522c87068cc95d059649fdaee82eaf588bc770 Mon Sep 17 00:00:00 2001
From: jopster <lm_ssh@LMOdoo.logumedia.de>
Date: Thu, 6 Jun 2024 10:51:14 +0200
Subject: [PATCH] =?UTF-8?q?Aufr=C3=A4umen,=20System=20Standorte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __manifest__.py                               |   2 +
 ...s_geraeteypen.xml => dss_geraetetypen.xml} |   0
 views/dss_systems.xml                         | 124 ++++++++++++++++++
 views/mainsystem_view.xml                     | 119 -----------------
 views/menu.xml                                |  48 ++++---
 5 files changed, 154 insertions(+), 139 deletions(-)
 rename views/{dss_geraeteypen.xml => dss_geraetetypen.xml} (100%)
 create mode 100755 views/dss_systems.xml

diff --git a/__manifest__.py b/__manifest__.py
index 8d68d8b..57d0f48 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -22,7 +22,9 @@
          'views/dss_ads.xml','views/dss_settings.xml',
          'views/dss_mediafiles.xml',
          'views/dss_addstructures.xml',
+         'views/dss_geraetetypen.xml',
          'views/dss_texts.xml',
+         'views/dss_systems.xml',
          'views/mainsystem_view.xml',
          'views/menu.xml',
          'views/company_view.xml',
diff --git a/views/dss_geraeteypen.xml b/views/dss_geraetetypen.xml
similarity index 100%
rename from views/dss_geraeteypen.xml
rename to views/dss_geraetetypen.xml
diff --git a/views/dss_systems.xml b/views/dss_systems.xml
new file mode 100755
index 0000000..4949662
--- /dev/null
+++ b/views/dss_systems.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="dss_systems_view_form" model="ir.ui.view">
+        <field name="name">dss_systems_form</field>
+        <field name="model">dss.systems</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="systemname"/>
+ 			            <field name="grundsystem" string="Nutzung für "/>
+			            <field name="grundsystem_kennung" invisible="1"/>
+                        <field name="standort" string="Standort des Geräts"/>
+                    </group>
+                    <group name="components" string="Für LCD Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
+			  <field name="osvorhanden"/>
+			  <field name="has_heizung"/>
+			  <field name="has_klima"/>
+			  <field name="has_fan"/>
+                    </group>
+                    <group name="components" string="Für LED Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" colspan="4" >
+			  <field name="has_heizung"/>
+			  <field name="has_klima"/>
+			  <field name="has_fan"/>
+                    </group>
+                    <notebook>
+                      <page name="osssetings" string="LCDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
+                        <group name="lcdsettings">
+			  <field name="lcd_ausrichtung"/>
+			  <field name="lcd_touch"/>
+			</group>
+                        <group name="ledsettings_hw" string="LCD Hardware">
+     			  <field name="lcd_panel"/>
+     			  <field name="lcd_mainboard"/>
+			  <field name="lcd_touchcontroler"/>
+			  <field name="lcd_netzteil"/>
+			</group>
+                      </page>
+                      <page name="osssetings" string="LEDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" >
+                        <group name="ledsettings" string="LED Grunddaten">
+			  <field name="led_pixelpitch" colspan="2"/>
+			  <field name="led_breite"/>
+			  <field name="led_hoehe"/>
+			  <field name="led_pixel_breite"/>
+			  <field name="led_pixel_hoehe"/>
+			</group>
+                        <group name="ledsettings_hw" string="LED Hardware">
+     			  <field name="led_module"/>
+     			  <field name="led_receivingcard"/>
+			  <field name="led_netzteile"/>
+			</group>
+                      </page>
+                      <page name="aussehen" string="Aussehen/Bauart">
+                        <group name="aussehen_farbe" string="Farbgebung">
+                          <field name="farbe" widget='color'/>
+                        </group>
+                        <group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}">
+                          <field name="lcd_montage"/>
+                          <field name="lcd_montage_sonstige"  attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
+                        </group>
+                        <group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}">
+                          <field name="led_montage"/>
+                          <field name="led_montage_sonstige"  attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
+                        </group>
+                      </page>
+                      <page name="energie" string="Ausstatung">
+                        <group name="energie" string="Austattung">
+                          <field name="stromzaehler"/>
+                          <field name="stromverbrauch_avg"/>
+                        </group>
+                      </page>
+                      <page name="osssetings" string="Betriebssystem" attrs="{'invisible': [('osvorhanden','=',False)]}">
+                        <group name="osversion" string="Version/Art">
+                          <field name="ostyp" string="Betriebssystem"/>
+                          <field name="osname" string="Version/Name"/>
+                        </group>
+                      </page>
+                      <page name="geraetesettings" string="Zubehör" colspan="4">
+                        <group>
+                          <field name="zusatz_integrationen" string="Instal. Zubehör"/>
+		       </group>
+                      </page>
+                      <page name="informations" string="Informationen">
+                        <field name="id" string="Iid" readonly="1"/>
+                        <field name="uuid" string="UUID" readonly="1"/>
+                      </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" options="{'post_refresh':True}" help="Follow this project to automatically track the events associated to tasks and issues of this project." groups="base.group_user"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+
+    <record id="dss_systems_view_tree" model="ir.ui.view">
+        <field name="name">dss_systems_tree</field>
+        <field name="model">dss.systems</field>
+        <field name="priority" eval="16"/>
+        <field name="arch" type="xml">
+            <tree string="Systemtypen">
+                <field name="systemname" string="Name des Geraet/Systems"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="action_dss_systems_view" model="ir.actions.act_window">
+        <field name="name">DigitalSignage Systeme</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">dss.systems</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{}</field>
+        <field name="help" type="html">
+            <p class="'o_view_nocontent_smiling_face">
+                Neuen Systemtyp erstellen
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/views/mainsystem_view.xml b/views/mainsystem_view.xml
index f0142c8..03900ca 100755
--- a/views/mainsystem_view.xml
+++ b/views/mainsystem_view.xml
@@ -1,112 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="dss_systems_view_form" model="ir.ui.view">
-        <field name="name">dss_systems_form</field>
-        <field name="model">dss.systems</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="systemname"/>
- 			<field name="grundsystem" string="Nutzung für "/>
-			<field name="grundsystem_kennung" invisible="1"/>
-                    </group>
-                    <group name="components" string="Für LCD Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
-			  <field name="osvorhanden"/>
-			  <field name="has_heizung"/>
-			  <field name="has_klima"/>
-			  <field name="has_fan"/>
-                    </group>
-                    <group name="components" string="Für LED Gesamtsysteme" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" colspan="4" >
-			  <field name="has_heizung"/>
-			  <field name="has_klima"/>
-			  <field name="has_fan"/>
-                    </group>
-                    <notebook>
-                      <page name="osssetings" string="LCDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}" >
-                        <group name="lcdsettings">
-			  <field name="lcd_ausrichtung"/>
-			  <field name="lcd_touch"/>
-			</group>
-                        <group name="ledsettings_hw" string="LCD Hardware">
-     			  <field name="lcd_panel"/>
-     			  <field name="lcd_mainboard"/>
-			  <field name="lcd_touchcontroler"/>
-			  <field name="lcd_netzteil"/>
-			</group>
-                      </page>
-                      <page name="osssetings" string="LEDSystem Daten" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}" >
-                        <group name="ledsettings" string="LED Grunddaten">
-			  <field name="led_pixelpitch" colspan="2"/>
-			  <field name="led_breite"/>
-			  <field name="led_hoehe"/>
-			  <field name="led_pixel_breite"/>
-			  <field name="led_pixel_hoehe"/>
-			</group>
-                        <group name="ledsettings_hw" string="LED Hardware">
-     			  <field name="led_module"/>
-     			  <field name="led_receivingcard"/>
-			  <field name="led_netzteile"/>
-			</group>
-                      </page>
-                      <page name="aussehen" string="Aussehen/Bauart">
-                        <group name="aussehen_farbe" string="Farbgebung">
-                          <field name="farbe" widget='color'/>
-                        </group>
-                        <group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LCD')]}">
-                          <field name="lcd_montage"/>
-                          <field name="lcd_montage_sonstige"  attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
-                        </group>
-                        <group name="aussehen_Bauart" string="Bauart/Montage" attrs="{'invisible': [('grundsystem_kennung','!=','LED')]}">
-                          <field name="led_montage"/>
-                          <field name="led_montage_sonstige"  attrs="{'invisible': [('grundsystem_kennung','!=','XXX')]}"/>
-                        </group>
-                      </page>
-                      <page name="energie" string="Ausstatung">
-                        <group name="energie" string="Austattung">
-                          <field name="stromzaehler"/>
-                          <field name="stromverbrauch_avg"/>
-                        </group>
-                      </page>
-                      <page name="osssetings" string="Betriebssystem" attrs="{'invisible': [('osvorhanden','=',False)]}">
-                        <group name="osversion" string="Version/Art">
-                          <field name="ostyp" string="Betriebssystem"/>
-                          <field name="osname" string="Version/Name"/>
-                        </group>
-                      </page>
-                      <page name="geraetesettings" string="Zubehör" colspan="4">
-                        <group> 
-                          <field name="zusatz_integrationen" string="Instal. Zubehör"/>
-		       </group>
-                      </page>
-                      <page name="informations" string="Informationen">
-                        <field name="id" string="Iid" readonly="1"/>
-                        <field name="uuid" string="UUID" readonly="1"/>
-                      </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" options="{'post_refresh':True}" help="Follow this project to automatically track the events associated to tasks and issues of this project." groups="base.group_user"/>
-                    <field name="activity_ids"/>
-                    <field name="message_ids"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-
-    <record id="dss_systems_view_tree" model="ir.ui.view">
-        <field name="name">dss_systems_tree</field>
-        <field name="model">dss.systems</field>
-        <field name="priority" eval="16"/>
-        <field name="arch" type="xml">
-            <tree string="Systemtypen">
-                <field name="systemname"/>
-            </tree>
-        </field>
-    </record>
-
     <record id="dss_software_view_form" model="ir.ui.view">
         <field name="name">dss_software_form</field>
         <field name="model">dss.software</field>
@@ -421,19 +315,6 @@
     </record>
 
 
-    <record id="action_dss_systems_view" model="ir.actions.act_window">
-        <field name="name">DigitalSignage Systeme</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">dss.systems</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{}</field>
-        <field name="help" type="html">
-            <p class="'o_view_nocontent_smiling_face">
-                Neuen Systemtyp erstellen
-            </p>
-        </field>
-    </record>
-
     <record id="action_dss_geraetetypen_view" model="ir.actions.act_window">
         <field name="name">DigitalSignage Hardware</field>
         <field name="type">ir.actions.act_window</field>
diff --git a/views/menu.xml b/views/menu.xml
index 65fe004..4a464d7 100755
--- a/views/menu.xml
+++ b/views/menu.xml
@@ -76,12 +76,6 @@
             action="action_dss_mediatypes_view"
             sequence="1"/>
 
-    <menuitem
-            id="menu_dss_configuration_systems"
-            name="Systemtypen"
-            parent="menu_dss_internsetup"
-            action="action_dss_systems_view"
-            sequence="30"/>
 
     <menuitem
             id="menu_dss_mediarelations_systems"
@@ -90,6 +84,34 @@
             action="action_dss_mediarelations_view"
             sequence="60"/>
 
+    <menuitem
+            id="menu_dss_hardware_configurationen"
+            name="Hard.-/Software"
+            parent="menu_dss_config"
+            sequence="30"/>
+
+        <menuitem
+            id="menu_dss_configuration_geraetetypen"
+            name="Hardware verwalten"
+            parent="menu_dss_hardware_configurationen"
+            action="action_dss_geraetetypen_view"
+            sequence="31"/>
+
+        <menuitem
+            id="menu_dss_configuration_systems"
+            name="Geräte/Systeme"
+            parent="menu_dss_hardware_configurationen"
+            action="action_dss_systems_view"
+            sequence="32"/>
+
+        <menuitem
+            id="menu_dss_configuration_software"
+            name="Software verwalten"
+            parent="menu_dss_hardware_configurationen"
+            action="action_dss_software_view"
+            sequence="33"/>
+
+
     <menuitem
             id="menu_dss_configurationen"
             name="Werte"
@@ -109,20 +131,6 @@
             action="action_dss_systemtypen_view"
             sequence="20"/>
 
-    <menuitem
-            id="menu_dss_configuration_geraetetypen"
-            name="Hardware verwalten"
-            parent="menu_dss_config"
-            action="action_dss_geraetetypen_view"
-            sequence="30"/>
-
-    <menuitem
-            id="menu_dss_configuration_software"
-            name="Software verwalten"
-            parent="menu_dss_config"
-            action="action_dss_software_view"
-            sequence="40"/>
-
     <menuitem
             id="menu_dss_configuration_projectstate"
             name="Projektstati verwalten"