diff --git a/models/__pycache__/dss.cpython-311.pyc b/models/__pycache__/dss.cpython-311.pyc index 6b2a44b..e5951ed 100644 Binary files a/models/__pycache__/dss.cpython-311.pyc and b/models/__pycache__/dss.cpython-311.pyc differ diff --git a/models/dss.py b/models/dss.py index 10fe60f..1e643bb 100755 --- a/models/dss.py +++ b/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()) diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index d45d60f..fca5190 100755 --- a/security/ir.model.access.csv +++ b/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/views/dss.xml b/views/dss.xml index 650c759..85c196f 100755 --- a/views/dss.xml +++ b/views/dss.xml @@ -173,6 +173,13 @@ +
+
+ + + +
+
@@ -208,6 +215,11 @@ +
+ + + +
@@ -291,6 +303,67 @@
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+
+
+ > + + + > + + + > + + + > + + +
+
+ + + + + + diff --git a/views/mainsystem_view.xml b/views/mainsystem_view.xml index 7a35e29..4b81981 100755 --- a/views/mainsystem_view.xml +++ b/views/mainsystem_view.xml @@ -397,6 +397,81 @@ + + + dss_advertisefields_tree + dss.advertisefields + + + + + + + + + + + + + + dss_advertisefields_form + dss.advertisefields + +
+ + + + + + + + + + + +
+
+
+ + + + + dss_eventdays_tree + dss.eventdays + + + + + + + + + + + + + dss_eventdays_form + dss.eventdays + +
+ + + + + + + + + + +
+
+
+ + + + + DigitalSignage Projekte ir.actions.act_window @@ -514,6 +589,32 @@ + + DigitalSignage Werbefelder + ir.actions.act_window + dss.advertisefields + tree,form + {} + +

+ Neues Werbefeld erstellen +

+ + + + + DigitalSignage EventSpieltage + ir.actions.act_window + dss.eventdays + tree,form + {} + +

+ Neuen Spieltag erstellen +

+ + + + + +