Vertragsdaten ergänzt - Laufzeiten, Spieltage

models/dss.py

@@ -69,7 +69,22 @@ class dsscontracts(models.Model):
 
     client_other_projects = fields.Many2many('dss.projects',string='Weitere Projekte')
         
+    werbe_feld_selected = fields.Many2many('dss.advertisefields',string='Werbefelder')
 
+    main_runtime = fields.Integer('Gesamtlaufzeit')
+    split_runtime_count = fields.Integer('Laufzeit Teilungen')
+    split_runtime_time = fields.Integer('Laufzeit Sekunden')
+
+    contract_date = fields.Date('Vertragsdatum')
+    start_date = fields.Date('Ausstrahlungsdatum')
+
+    runtimesystem = fields.Selection([('M','Monatslaufzeit'),('T','Tagelaufzeit'), ('E','Eventlaufzeit'), ('S','Sonderlaufzeit')])
+    runtime_m = fields.Integer('Laufzeit')
+    runtime_t = fields.Integer('Laufzeit')
+    runtime_events = fields.Many2many('dss.eventdays')
+    runtime_divers = fields.Char('Laufzeit')
+    
+    
     info_account_changes = fields.Boolean('Benarichtigen bei Accountänderungen')
     info_spot_changes = fields.Boolean('Benarichtigen bei Spotänderungen')
     info_contract_changes = fields.Boolean('Benarichtigen bei Vertragsänderungen')
@@ -85,6 +100,7 @@ class dsscontracts(models.Model):
     todo_state_color =  fields.Char(related='todo_state.color')
     todo_state_text =  fields.Char(related='todo_state.statusname')
     todo_state_info =  fields.Char('Zusatzinfo')
+    todo_state_until =  fields.Date('Abarbeiten bis')
     
 
     @api.constrains('client_id')
@@ -471,6 +487,24 @@ class dssworkstatus(models.Model):
     def _default_uuid(self):
         return str(uuid.uuid4())
 
+class dsseventdays(models.Model):
+    _name = "dss.eventdays"
+    _description = "DigitalSignage EventSpieltage"
+    _inherit = ['mail.thread']
+    _rec_name = "eventname"
+#    _inherit = ['mail.thread', 'mail.activity.mixin']
+    uuid = fields.Char(default=lambda self: self._default_uuid(), required=True, readonly=True, copy=False, string='UUID')
+#    uuid = fields.Char('UUID', required=True, translate=True)
+    eventname = fields.Char('Eventname', required=True)
+    description = fields.Text('EventBeschreibung')
+    eventdate = fields.Date('EventDatum', required=True)
+    color = fields.Char(string='Color Index')
+
+    @api.model
+    def _default_uuid(self):
+        return str(uuid.uuid4())
+
+
 
 class dsstodostatus(models.Model):
     _name = "dss.todostate"
@@ -489,6 +523,24 @@ class dsstodostatus(models.Model):
     def _default_uuid(self):
         return str(uuid.uuid4())
 
+class dssadvertisefields(models.Model):
+    _name = "dss.advertisefields"
+    _description = "DigitalSignage Werbefelder"
+    _inherit = ['mail.thread']
+    _rec_name = "feldname"
+#    _inherit = ['mail.thread', 'mail.activity.mixin']
+    uuid = fields.Char(default=lambda self: self._default_uuid(), required=True, readonly=True, copy=False, string='UUID')
+#    uuid = fields.Char('UUID', required=True, translate=True)
+    feldname = fields.Char('Feldname', required=True)
+    project = fields.Many2one('dss.projects' , string='Project', store=True)
+    project_id = fields.Integer(related='project.projectid', string='Project ID')
+    color_used = fields.Char(string='Color Index')
+    color_unused = fields.Char(string='Color Index')
+    icon = fields.Image()
+
+    @api.model
+    def _default_uuid(self):
+        return str(uuid.uuid4())
 
 
 

security/ir.model.access.csv

@@ -8,4 +8,6 @@ digitalsignage_dss_projectstate_group_user,access.dss.projectstate,model_dss_pro
 digitalsignage_dss_contractstate_group_user,access.dss.contractstate,model_dss_contractstate,base.group_user,1,1,1,1
 digitalsignage_dss_workstate_group_user,access.dss.workstate,model_dss_workstate,base.group_user,1,1,1,1
 digitalsignage_dss_todostate_group_user,access.dss.todostate,model_dss_todostate,base.group_user,1,1,1,1
-digitalsignage_dss_contracts_group_user,access.dss.contracts,model_dss_contracts,base.group_user,1,1,1,1
+digitalsignage_dss_contracts_group_user,access.dss.contracts,model_dss_contracts,base.group_user,1,1,1,1
+digitalsignage_dss_eventdays_group_user,access.dss.eventdays,model_dss_eventdays,base.group_user,1,1,1,1
+digitalsignage_dss_advertisefields_group_user,access.dss.advertisefields,model_dss_advertisefields,base.group_user,1,1,1,1

views/dss.xml

@@ -173,6 +173,13 @@
 			        </group>
 		              </div>
 		            </div>
+			    <div class="row">
+		              <div class="col-8">
+			        <group>
+                                  <field name="werbe_feld_selected" string="Werbefeld" widget="many2many_tags"/>
+			        </group>
+		              </div>
+		            </div>
 		          </div>
 		        </div>
 		      </div>
@@ -208,6 +215,11 @@
      		             <field name="todo_state" string="nächste Aufgabe"/>
                           </group>
 		        </div>
+		        <div class="row">
+                          <group>
+     		             <field name="todo_state_until" string="Aufgabe bis"/>
+                          </group>
+		        </div>
 		      </div>
 		    </div>
 		    <hr></hr>
@@ -291,6 +303,67 @@
   		      </div>
   		    <hr></hr>
                     <notebook>
+                      <page name="grundsettings" string="Grundeinstellungen">
+    	                <div class="row">
+   	                  <div class="col-4">
+  			    <group>
+  		              <field name="main_runtime" string="Gesamtlaufzeit Sekunden (Vertrag)"/>
+                            </group>
+  		          </div>
+  	                  <div class="col-3">
+  			    <group>
+  		              <field name="split_runtime_count" string="Laufzeit Anzahl"/>
+                            </group>
+  		          </div>
+  	                  <div class="col-3">
+  			    <group>
+  		              <field name="split_runtime_time" string="Laufzeit Sekunden"/>
+		            </group>
+  		          </div>
+  		        </div>
+                      </page>
+                      <page name="datesettings" string="Vertragszeiten">
+    	                <div class="row">
+   	                  <div class="col-4">
+  	         	    <group>
+                              <field name="contract_date" string="Vertragsdatum"/>
+                            </group>
+  		          </div>
+   	                  <div class="col-4">
+  	         	    <group>
+                              <field name="start_date" string="Ausstahlungsdatum"/>
+                            </group>
+  		          </div>
+  		        </div>
+    	                <div class="row">
+   	                  <div class="col-8">
+  	         	    <group>
+                              <field name="runtimesystem" string="Laufzeitmodel"/>
+                            </group>
+  		          </div>
+  		        </div>
+    	                <div class="row" >
+   	                  <div class="col-8">
+  	         	    <group attrs="{'invisible': [('runtimesystem','!=','M')]}" >>
+                              <field name="runtime_m" string="Laufzeit Monate"/>
+                            </group>
+  	         	    <group attrs="{'invisible': [('runtimesystem','!=','T')]}" >>
+                              <field name="runtime_t" string="Laufzeit Tage"/>
+                            </group>
+  	         	    <group attrs="{'invisible': [('runtimesystem','!=','E')]}" >>
+                              <field name="runtime_events" string="Laufzeit EventTage"/>
+                            </group>
+  	         	    <group attrs="{'invisible': [('runtimesystem','!=','S')]}" >>
+                              <field name="runtime_divers" string="Laufzeit sontige"/>
+                            </group>
+  		          </div>
+  		        </div>
+                      </page>
+                      <page name="querprojects" string="Weitere Projekte">
+			<group>
+  		          <field name="client_other_projects" string="Weitere Projekte"/>
+		        </group>
+                      </page>
                       <page name="informations" string="Informationen">
 			<group>
   		          <field name="contract_id" string="Kunden/Vert.nummer" readonly="1"/>

views/mainsystem_view.xml

@@ -397,6 +397,81 @@
         </field>
     </record>
 
+
+    <record id="dss_advertisefields_view_tree" model="ir.ui.view">
+        <field name="name">dss_advertisefields_tree</field>
+        <field name="model">dss.advertisefields</field>
+        <field name="priority" eval="16"/>
+        <field name="arch" type="xml">
+            <tree string="Werbefelder">
+                <field name="feldname"/>
+                <field name="project"/>
+		<field name="color_used" widget="color"/>
+		<field name="color_unused" widget="color"/>
+		<field name="icon"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="dss_advertisefields_view_form" model="ir.ui.view">
+        <field name="name">dss_advertisefields_form</field>
+        <field name="model">dss.advertisefields</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group name="basethings">
+                          <field name="feldname" string="Feldname"/>
+                          <field name="project" string="Projekt"/>
+			  <field name="color_used" widget="color"/>
+			  <field name="color_unused" widget="color"/>
+                          <field name="icon" string="Icon"/>
+                	</group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="dss_eventdays_view_tree" model="ir.ui.view">
+        <field name="name">dss_eventdays_tree</field>
+        <field name="model">dss.eventdays</field>
+        <field name="priority" eval="16"/>
+        <field name="arch" type="xml">
+            <tree string="Spieltage">
+                <field name="eventname"/>
+                <field name="eventdate"/>
+		<field name="description"/>
+		<field name="color" widget="color"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="dss_eventdays_view_form" model="ir.ui.view">
+        <field name="name">dss_eventdays_form</field>
+        <field name="model">dss.eventdays</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group name="basethings">
+                          <field name="eventname" string="Name des Events"/>
+                          <field name="eventdate" string="Datum des Events"/>
+			  <field name="description" string="Beschreibung"/>
+			  <field name="color" widget="color"/>
+                	</group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                </div>
+            </form>
+        </field>
+    </record>
+
+
+
     <record id="action_dss_view" model="ir.actions.act_window">
         <field name="name">DigitalSignage Projekte</field>
         <field name="type">ir.actions.act_window</field>
@@ -514,6 +589,32 @@
         </field>
     </record>
 
+    <record id="action_dss_advertisefields_view" model="ir.actions.act_window">
+        <field name="name">DigitalSignage Werbefelder</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">dss.advertisefields</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{}</field>
+        <field name="help" type="html">
+            <p class="'o_view_nocontent_smiling_face">
+                Neues Werbefeld erstellen
+            </p>
+        </field>
+    </record>
+
+    <record id="action_dss_eventdays_view" model="ir.actions.act_window">
+        <field name="name">DigitalSignage EventSpieltage</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">dss.eventdays</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 Spieltag erstellen
+            </p>
+        </field>
+    </record>
+
     <menuitem
             id="menu_dss_config"
             name="Configuration"
@@ -602,5 +703,18 @@
             action="action_dss_todostate_view"
             sequence="8"/>
 
+    <menuitem
+            id="menu_dss_configuration_advertisefields"
+            name="Werbefelder verwalten"
+            parent="menu_dss_configurationen"
+            action="action_dss_advertisefields_view"
+            sequence="9"/>
+
+    <menuitem
+            id="menu_dss_configuration_eventdays"
+            name="Eventtage verwalten"
+            parent="menu_dss_configurationen"
+            action="action_dss_eventdays_view"
+            sequence="10"/>
 
 </odoo>