milestone commit

This commit is contained in:
jopster
2024-05-17 13:55:26 +02:00
parent f6dde36a63
commit cbd55b3073
9 changed files with 514 additions and 255 deletions
+13 -11
View File
@@ -9,7 +9,7 @@
<form>
<header>
<button name="pydoviewallads" string="Gesamter Verlauf" type="object" class="oe_hightlight"/>
<button name="pydonewad" string="Neue Aktualisierung" type="object" class="oe_hightlight" enabled="0" attrs="{'invisible': [('adtype','!=','MAIN')]}"/>
<button name="pydonewad" string="Neue Aktualisierung" type="object" class="oe_hightlight" enabled="0"/><!-- attrs="{'invisible': [('adtype','!=','MAIN')]}"/>-->
<!--- <field name="ad_state" widget="statusbar" statusbar_visible="in Arbeit,Fertig erstellt,Online/Gedruckt"/>-->
</header>
<sheet>
@@ -39,7 +39,6 @@
<div class="row">
<div class="col-10">
<group>
<field name="mediastructure" string="System-Aufbau"/>
</group>
</div>
</div>
@@ -125,12 +124,12 @@
<hr></hr>
<notebook>
<page name="informations" string="Dateien">
<field name="mediarelations" >
-- <field name="need_media">
<tree string="Dateien" editable="False" create="False">
<field name="mediatype_type" invisible="1"/>
<field name="mediatype" string=" Verwendung "/>
<field name="field" string="von Feld"/>
<field name="mediatype_name" string=" Verwendung "/>
<field name="mediafile" string=" Datei " filename="mediafile_file"/>
<field name="mediafile_preview" string=" Inhalt " options="{'size':[150]}" widget="image"/>
<field name="mediafile" string=" Inhalt " options="{'size':[150]}" widget="image"/>
<field name="mediafile_file"/>
<field name="secured_ro" string=" Gesperrt " widget="boolean_toggle"/>
<field name="used_ro" string=" Benutzt " widget="boolean_toggle"/>
@@ -142,8 +141,10 @@
<field name="contract" string="Vertrag" readonly="1"/>
<field name="contract_id" string="Kunden/Vert.nummer" readonly="1"/>
<field name="id" string="Vertrags Interne Id" readonly="1"/>
<field name="uuid" string="Datensatz UUID"/>
<field name="adpos"/>
<field name="uuid" string="Datensatz UUID" readonly="1"/>
<field name="adpos" string="Reihenfolge" readonly="1"/>
<field name="ad_is_lastpos" string="ist Letzte" readonly="1"/>
<field name="ad_state_func" string="Status" readonly="1"/>
</group>
</page>
<page name="createhistory" string="DSInformation">
@@ -156,11 +157,11 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<!-- <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>
<field name="activity_ids"/>
</div>-->
</form>
</field>
</record>
@@ -264,6 +265,7 @@
</div>
<div class="col-1">
<strong style="font-size:8px;text-align:right;"><field name="create_date"/></strong>
<strong style="font-size:8px;text-align:right;"><field name="ad_is_lastpos" widget="boolean_toggle" /></strong>
</div>
</div>
<div class="row" style="--gutter-x:10px;">
+97 -56
View File
@@ -6,9 +6,9 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.contracts</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[('project', '=', active_id)]</field>
<field name="domain">[('projectid', '=', active_id)]</field>
<field name="context">{
'default_project': active_id,
'default_projectid': active_id
'show_project_update': True
}
</field>
@@ -40,29 +40,6 @@
</record>
<record id="action_dss_project_view_contract" model="ir.actions.act_window">
<field name="name">DigitalSignage Vertrag</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.contracts</field>
<field name="view_mode">form</field>
</record>
<record id="act_dss_contracts" model="ir.actions.act_window">
<field name="name">DigitalSignage Alle Vertraege</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.contracts</field>
<field name="view_mode">kanban,tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No Contracts/Clients found. Let's create one!
</p>
<p>
Keep track of the progress of your contracts from creation to completion.<br/>
Collaborate efficiently by chatting in real-time or via email.
</p>
</field>
</record>
<record id="dss_project_new_contract_kanbanform" model="ir.ui.view">
<field name="name">dss.contracts.view.kanbanform</field>
<field name="model">dss.contracts</field>
@@ -107,11 +84,27 @@
<field name="context">{"default_allow_billable": 1}</field>
</record>
<record id="action_dss_main_contracts" model="ir.actions.act_window">
<field name="name">DigitalSignage Alle Vertraege</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">dss.contracts</field>
<field name="view_mode">tree,form,kanban</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No Contracts/Clients found. Let's create one!
</p>
<p>
Keep track of the progress of your contracts from creation to completion.<br/>
Collaborate efficiently by chatting in real-time or via email.
</p>
</field>
</record>
<record id="dss_main_contracts_tree" model="ir.ui.view">
<field name="name">dss_contracts_tree</field>
<field name="model">dss.contracts</field>
<field eval="1" name="priority"/>
<field name="arch" type="xml">
<tree string="Vertragsuebersicht" editable="bottom" multi_edit="1" edit="1" default_order="contract_id">
<field name="contract_state"/>
@@ -123,7 +116,7 @@
</record>
<record id="dss_main_contracts_form" model="ir.ui.view">
<field name="name">dss_contracts_form</field>
<field name="name">dss_main_contracts_form</field>
<field name="model">dss.contracts</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
@@ -179,7 +172,7 @@
<div class="row">
<div class="col-8">
<group>
<field name="werbe_feld_selected" string="Werbefeld" widget="many2many_tags"/>
<field name="werbe_feld_selected" string="Werbefeld" widget="many2many_tags" option="{'not_delete': True}" domain="[('project','=',project),('contract','=',False)]"/>
</group>
</div>
</div>
@@ -204,23 +197,23 @@
</div>
<div class="row">
<group>
<field name="work_state" string="Arbeitsstand"/>
<field name="ads_last_work_state" string="Arbeitsstand"/>
</group>
</div>
<field name="work_state_text" invisible="1"/>
<div class="row" attrs="{'invisible': [('work_state_text','!=','Sonstiges')]}" >
<field name="ads_last_work_state_text" invisible="1"/>
<div class="row" attrs="{'invisible': [('ads_last_work_state_text','!=','Sonstiges')]}" >
<group>
<field name="work_state_info"/>
</group>
</div>
<div class="row">
<group>
<field name="todo_state" string="nächste Aufgabe"/>
<field name="ads_last_todo_state" string="nächste Aufgabe"/>
</group>
</div>
<div class="row">
<group>
<field name="todo_state_until" string="Aufgabe bis"/>
<field name="ads_last_todo_state_until" string="Aufgabe bis"/>
</group>
</div>
</div>
@@ -258,9 +251,9 @@
<group>
<field name="client_short_strasse"/>
</group>
</div>
</div>
<div class="row">
</div>
</div>
<div class="row">
<div class="col-3">
<group>
<field name="client_short_land"/>
@@ -371,28 +364,61 @@
</div>
</div>
</page>
<page name="contractsettings" string="Werbedaten/Verlauf">
-- <group>
<field name="ads" string="Werbekampagnen">
<tree string="kampagnen" editable="False" create="False">
<field name="adname" invisible="1"/>
<field name="create_date" string=" Verwendung "/>
<field name="description" string=" Datei " filename="mediafile_file"/>
<page name="contractsettings" string="Kampagnen/Verlauf">
<group>
<field name="ads" string="" readonly="1">
<tree string="kampagnen" editable="none" create="none">
<field name="adname" string="Kampagne"/>
<field name="adtype" string="Kamapgnen-Art"/>
<field name="create_date" string="Erstellt am"/>
<field name="description" string="Bemerkung"/>
<field name="ad_state_color" string="Status" widget="color"/>
</tree>
</field>
</group>
</page>
<page name="querprojects" string="Weitere Projekte">
<page name="contractmedia" string="letzte Medien">
<group>
<field name="client_other_projects" string="Weitere Projekte"/>
<field name="last_media" string="" readonly="1">
<tree string="kampagnen" editable="none" create="none" >
<field name="field" string="vom Feld"/>
<field name="ad" string="vom Kampagne"/>
<field name="mediatype_name" string="Nutzung"/>
<button name="dload" string="" type="object" icon="fa-download"/>
<field name="mediafile" string="Vorschau" options="{'size':[50]}" widget="image"/>
<field name="secured_ro" string="Gesperrt" widget="boolean_toggle"/>
<field name="used_ro" string="Genutzt" widget="boolean_toggle"/>
</tree>
</field>
</group>
</page>
<page name="contractmedia" string="Erforderliche Medien">
<group>
<field name="need_media" string="" readonly="1">
<tree string="kampagnen" editable="none" create="none" >
<field name="field" string="vom Feld"/>
<field name="mediatype_name" string="Nutzung"/>
<field name="mediatype_type" string="Art"/>
<!-- <field name="secured_ro" string="Gesperrt" widget="boolean_toggle"/>
<field name="used_ro" string="Genutzt" widget="boolean_toggle"/>-->
</tree>
</field>
</group>
</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"/>
<field name="id" string="Vertrags Interne Id" readonly="1"/>
<field name="projectIid" string="Project IId" readonly="1"/>
<field name="uuid" string="Datensatz UUID"/>
<field name="contract_id" string="Kunden/Vert.nummer" readonly="1"/>
<field name="id" string="Vertrags Interne Id" readonly="1"/>
<field name="ads_last_state" string="letzter Vorgang" readonly="1"/>
<field name="projectIid" string="Project IId" readonly="1"/>
<field name="uuid" string="Datensatz UUID"/>
<field name="project_ad_structure" string="Project Aufbau" readonly="1"/>
<field name="cloudlink"/>
</group>
</page>
</notebook>
@@ -406,6 +432,7 @@
</field>
</record>
<record id="dss_main_contracts_kanban" model="ir.ui.view">
<field name="name">dss_contracts_kanban</field>
<field name="model">dss.contracts</field>
@@ -422,28 +449,42 @@
quick_create_view="dss_contracts_view_form_simplified_footer"
on_create="pyaction_new_contract_kanban"
> -->
<kanban class="o_kanban_mobile" on_click="pyaction_view_contract" on_create="quick_create" quick_create_view="DigitalSignage.dss_project_new_contract_kanbanform" type="object" default_group_by="contract_state">
<kanban class="o_kanban_mobile oe_background_gray o_emphasize_colors" on_create="quick_create" quick_create_view="DigitalSignage.dss_project_new_contract_kanbanform" action="pyaction_view_contract" type="object" default_group_by="contract_state">-->
<field name="contract_name"/>
<field name="contract_state"/>
<field name="contract_state_order"/>
<field name="work_state_color"/>
<field name="todo_state_color"/>
<field name="ads_last_work_state_color"/>
<field name="ads_last_todo_state_color"/>
<field name="ads_last_state_color"/>
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_global_click o_has_icon oe_kanban_content oe_kanban_card">
<div class="oe_kanban_content oe_kanban_global_click o_kanban_get_form">
<div class="row" style="--gutter-x:10px;">
<div class="col-2" t-attf-style="background-color:{{record.work_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">
<div class="col-3" t-attf-style="background-color:{{record.ads_last_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">
</div>
<div class="col-3" t-attf-style="background-color:{{record.ads_last_work_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">
</div>
<!-- <t t-esc="record.work_state_color"/>
<t t-esc="record.work_state_color.value"/>-->
<div class="col-2" t-attf-style="background-color:{{record.todo_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">
<div class="col-3" t-attf-style="background-color:{{record.ads_last_todo_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">
<!-- <div class="col-2" t-attf-style="background-color:{{record.work_state_color.value}};padding-left: 1px;height:10px;border-style:solid;border-width:0.2px;">-->
</div>
</div>
<div class="row" style="--gutter-x:10px;">
<div class="col-3" t-attf-style="background-color:#ffffff;padding-left: 1px;height:13px;border-style:solid;border-width:0.2px;">
<p style="font-size:7px"><field name="ads_last_state_text"/></p>
</div>
<div class="col-3" t-attf-style="background-color:#ffffff;padding-left: 1px;height:13px;border-style:solid;border-width:0.2px;">
<p style="font-size:7px"><field name="ads_last_work_state_text"/></p>
</div>
<div class="col-3" t-attf-style="background-color:#ffffff;padding-left: 1px;height:13px;border-style:solid;border-width:0.2px;">
<p style="font-size:7px"><field name="ads_last_todo_state_text"/></p>
</div>
</div>
<div class="row" style="--gutter-x:10px;">
<div class="col-4" style="padding-left: 1px;height:5px">
<strong><field name="work_state_color" invisible="1"/></strong>
<strong><field name="ads_last_work_state_color" invisible="1"/></strong>
</div>
</div>
<div class="row" style="--gutter-x:10px;">
@@ -457,7 +498,7 @@
</div>
<div class="row" style="--gutter-x:10px;">
<div class="col-10" style="padding-left: 1px">
<span style="font-size:9px">Status : <field name="work_state_text"/></span>
<span style="font-size:9px">Status : <field name="ads_last_work_state_text"/></span>
</div>
</div>
<div class="row" style="--gutter-x:10px;">
@@ -467,7 +508,7 @@
</div>
<div class="row" style="--gutter-x:10px;">
<div class="col-10" style="padding-left: 1px">
<span style="font-size:9px">Aktion : <field name="todo_state_text"/></span>
<span style="font-size:9px">Aktion : <field name="ads_last_todo_state_text"/></span>
</div>
</div>
</div>
+4 -3
View File
@@ -18,12 +18,13 @@
<field name="maxsize_h"/>
<field name="maxsize_w"/>
<field name="cloudlink"/>
<field name="filepartname"/>
</group>
<notebook>
<page name="informations" string="Informationen">
<tree string="Dateien">
</tree>
<group>
<field name="standard_image" string="Standard Bild" options="{'size':[200]}" widget="image"/>
</group>
</page>
<page name="informations" string="Informationen">
<group>
+2 -1
View File
@@ -17,6 +17,7 @@
<field name="grundsystemname" string="Kategorie"/>
<field name="errichtet_am"/>
<field name="aktstatus_color" widget="color"/>
<field name="cloudlink"/>
</group>
<notebook>
<page name="partnersettings" string="Partner/Adressen">
@@ -71,7 +72,7 @@
<div class="row" style="--gutter-x:10px;">
<div class="col-2" style="padding-left: 1px">
<field name="grundsystemicon" widget="image" string="intern" class="system_icon_small oe_avatar"/>
<!-- <img t-attf-src="/DigitalSignage/static/images/{{grundsystemname.icon}}.jpg"></img>-->
<!-- <img t-attf-src="/DigitalSignage/static/images/{{grundsystemnameicon5050}}.jpg"></img>-->
</div>
<div class="col-10">
<div class="row">
+2 -54
View File
@@ -281,7 +281,7 @@
<tree string="Werbeaktions-Status">
<field name="color" widget="color"/>
<field name="statusname"/>
<field name="default" string="Standardwert"/>
<field name="func" string="Funktion"/>
<field name="icon"/>
<field name="order"/>
</tree>
@@ -297,7 +297,7 @@
<group>
<group name="basethings">
<field name="statusname" string="Statusname"/>
<field name="default" string="Standardwert"/>
<field name="func" string="Funktion"/>
<field name="color" string="Farbindex" widget="color"/>
<field name="icon" string="Icon"/>
<field name="order"/>
@@ -390,45 +390,6 @@
</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">
<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_eventdays_view_tree" model="ir.ui.view">
<field name="name">dss_eventdays_tree</field>
@@ -644,19 +605,6 @@
</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>
+8 -1
View File
@@ -60,7 +60,7 @@
id="menu_dss_contracts_details"
name="Vertraege managen"
parent="menu_dss_main_view"
action="act_dss_contracts"
action="action_dss_main_contracts"
sequence="4"/>
<menuitem
@@ -77,6 +77,13 @@
action="action_dss_systems_view"
sequence="30"/>
<menuitem
id="menu_dss_mediarelations_systems"
name="MediaRelationen"
parent="menu_dss_internsetup"
action="action_dss_mediarelations_view"
sequence="60"/>
<menuitem
id="menu_dss_configurationen"
name="Werte"