From 9046149c163f8b87ef254fdfd4844318675479df Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Wed, 17 Apr 2019 11:15:59 +0200 Subject: [PATCH] Previews to HeaderFooterLayout --- .../SalesprojectMember/SalesprojectMember.aod | 5 -- .../ActivityLinkPreview_view.aod | 4 +- .../ActivityPreview_view.aod | 5 +- .../AppointmentPreview_view.aod | 72 +++++++++---------- .../AttributePreview_view.aod | 5 +- .../ContractPreview_view.aod | 5 +- .../EmployeePreview_view.aod | 5 +- .../KeywordEntryPreview_view.aod | 5 +- .../ObjectTreePreview/ObjectTreePreview.aod | 4 +- .../OfferPreview_view/OfferPreview_view.aod | 5 +- .../OfferitemPreview_view.aod | 5 +- .../OrderPreview_view/OrderPreview_view.aod | 5 +- .../OrderitemPreview_view.aod | 5 +- .../OrganisationPreview_view.aod | 5 +- .../PersonPreview_view/PersonPreview_view.aod | 5 +- .../ProductPreview_view.aod | 5 +- ...projectClassificationEntryPreview_view.aod | 4 +- ...SalesprojectClassificationPreview_view.aod | 4 +- .../SalesprojectCompetitionPreview_view.aod | 5 +- .../SalesprojectForecastPreview_view.aod | 5 +- .../SalesprojectMemberPreview_view.aod | 18 ----- .../SalesprojectPreview_view.aod | 1 + .../SalesprojectSourcePreview_view.aod | 5 +- .../TaskPreview_view/TaskPreview_view.aod | 5 +- .../TimetrackingPreview_view.aod | 4 +- 25 files changed, 95 insertions(+), 101 deletions(-) delete mode 100644 neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod diff --git a/neonContext/SalesprojectMember/SalesprojectMember.aod b/neonContext/SalesprojectMember/SalesprojectMember.aod index f337d45bcc6..be5169e7862 100644 --- a/neonContext/SalesprojectMember/SalesprojectMember.aod +++ b/neonContext/SalesprojectMember/SalesprojectMember.aod @@ -4,7 +4,6 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <filterview>SalesprojectMemberFilter_view</filterview> <editview>SalesprojectMemberEdit_view</editview> - <preview>SalesprojectMemberPreview_view</preview> <entity>SalesprojectMember_entity</entity> <references> <neonViewReference> @@ -15,9 +14,5 @@ <name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name> <view>SalesprojectMemberEdit_view</view> </neonViewReference> - <neonViewReference> - <name>dc850b82-3c28-4626-a0fd-a856c624c2e3</name> - <view>SalesprojectMemberPreview_view</view> - </neonViewReference> </references> </neonContext> diff --git a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod index 891ec75b0ff..b384acfdd50 100644 --- a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod +++ b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod @@ -3,9 +3,9 @@ <name>ActivityLinkPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + </headerFooterLayout> </layout> <children> <genericViewTemplate> diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod index 695059b3a6a..5553ffc4d22 100644 --- a/neonView/ActivityPreview_view/ActivityPreview_view.aod +++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod @@ -3,9 +3,10 @@ <name>ActivityPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod index 53f8e32a4db..ff89173c01e 100644 --- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod +++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod @@ -1,36 +1,36 @@ -<?xml version="1.0" encoding="UTF-8"?> -<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> - <name>AppointmentPreview_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation> - <layout> - <boxLayout> - <name>layout</name> - </boxLayout> - </layout> - <children> - <appointmentPreviewViewTemplate> - <name>Appointments</name> - <summaryField>SUMMARY</summaryField> - <descriptionField>DESCRIPTION</descriptionField> - <beginField>BEGIN</beginField> - <endField>END</endField> - <periodField>STARTEND</periodField> - <attendeesField>ATTENDEES</attendeesField> - <privateField>CLASSIFICATION</privateField> - <transparencyField>TRANSPARENCY</transparencyField> - <statusField>STATUS</statusField> - <locationField>LOCATION</locationField> - <linkField>LINKS</linkField> - <organizerField>ORGANIZER</organizerField> - <categoriesField>CATEGORIES</categoriesField> - <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1> - <entityField>#ENTITY</entityField> - </appointmentPreviewViewTemplate> - <neonViewReference> - <name>be0befe0-4b29-4c23-924a-0167240d2b54</name> - <entityField>AppointmentLinks</entityField> - <view>AppointmentLinkFilter_view</view> - </neonViewReference> - </children> -</neonView> +<?xml version="1.0" encoding="UTF-8"?> +<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> + <name>AppointmentPreview_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation> + <layout> + <headerFooterLayout> + <name>layout</name> + </headerFooterLayout> + </layout> + <children> + <appointmentPreviewViewTemplate> + <name>Appointments</name> + <summaryField>SUMMARY</summaryField> + <descriptionField>DESCRIPTION</descriptionField> + <beginField>BEGIN</beginField> + <endField>END</endField> + <periodField>STARTEND</periodField> + <attendeesField>ATTENDEES</attendeesField> + <privateField>CLASSIFICATION</privateField> + <transparencyField>TRANSPARENCY</transparencyField> + <statusField>STATUS</statusField> + <locationField>LOCATION</locationField> + <linkField>LINKS</linkField> + <organizerField>ORGANIZER</organizerField> + <categoriesField>CATEGORIES</categoriesField> + <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1> + <entityField>#ENTITY</entityField> + </appointmentPreviewViewTemplate> + <neonViewReference> + <name>be0befe0-4b29-4c23-924a-0167240d2b54</name> + <entityField>AppointmentLinks</entityField> + <view>AppointmentLinkFilter_view</view> + </neonViewReference> + </children> +</neonView> diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod index 1a5041da04b..7a86c4599a0 100644 --- a/neonView/AttributePreview_view/AttributePreview_view.aod +++ b/neonView/AttributePreview_view/AttributePreview_view.aod @@ -3,9 +3,10 @@ <name>AttributePreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Head</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod index ff1f59a0aab..fe91f152b3c 100644 --- a/neonView/ContractPreview_view/ContractPreview_view.aod +++ b/neonView/ContractPreview_view/ContractPreview_view.aod @@ -3,9 +3,10 @@ <name>ContractPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod index 198c613625f..9854f076d27 100644 --- a/neonView/EmployeePreview_view/EmployeePreview_view.aod +++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod @@ -3,9 +3,10 @@ <name>EmployeePreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod index f8a6856aa39..56c89cf8897 100644 --- a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod +++ b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod @@ -3,9 +3,10 @@ <name>KeywordEntryPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/ObjectTreePreview/ObjectTreePreview.aod b/neonView/ObjectTreePreview/ObjectTreePreview.aod index b6b2c90c68a..d7e3916a28c 100644 --- a/neonView/ObjectTreePreview/ObjectTreePreview.aod +++ b/neonView/ObjectTreePreview/ObjectTreePreview.aod @@ -3,9 +3,9 @@ <name>ObjectTreePreview</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + </headerFooterLayout> </layout> <children> <genericViewTemplate> diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod index 5ebc5733ab8..e5300d203e9 100644 --- a/neonView/OfferPreview_view/OfferPreview_view.aod +++ b/neonView/OfferPreview_view/OfferPreview_view.aod @@ -3,9 +3,10 @@ <name>OfferPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <footer>Header</footer> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod index 6927e3f06da..c93ad8c9ef3 100644 --- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod +++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod @@ -3,9 +3,10 @@ <name>OfferitemPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod index 62dcd724c0b..d9aa97ac59c 100644 --- a/neonView/OrderPreview_view/OrderPreview_view.aod +++ b/neonView/OrderPreview_view/OrderPreview_view.aod @@ -3,9 +3,10 @@ <name>OrderPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod index 71fd61ff899..9cf09add5fc 100644 --- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod +++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod @@ -3,9 +3,10 @@ <name>OrderitemPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod index 37be5f599a7..4ac4e0f3527 100644 --- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod +++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod @@ -3,9 +3,10 @@ <name>OrganisationPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod index dea509d10e2..4948fa0ae20 100644 --- a/neonView/PersonPreview_view/PersonPreview_view.aod +++ b/neonView/PersonPreview_view/PersonPreview_view.aod @@ -3,9 +3,10 @@ <name>PersonPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod index b66c4446cdd..7e1a9a45302 100644 --- a/neonView/ProductPreview_view/ProductPreview_view.aod +++ b/neonView/ProductPreview_view/ProductPreview_view.aod @@ -3,9 +3,10 @@ <name>ProductPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod index cf4ddc5040f..32393670ae7 100644 --- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod +++ b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod @@ -4,9 +4,9 @@ <title>asdf</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + </headerFooterLayout> </layout> <children> <titledListViewTemplate> diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod index b6773490cfb..7fc86e84750 100644 --- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod +++ b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod @@ -3,9 +3,9 @@ <name>SalesprojectClassificationPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + </headerFooterLayout> </layout> <children> <genericViewTemplate> diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod index e3f46d07846..bac5b4dc39e 100644 --- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod +++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod @@ -3,9 +3,10 @@ <name>SalesprojectCompetitionPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod index 1afb1bf945c..8b7f0b9c84e 100644 --- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod +++ b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod @@ -3,9 +3,10 @@ <name>SalesprojectForecastPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod deleted file mode 100644 index b940c76d5bf..00000000000 --- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> - <name>SalesprojectMemberPreview_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <boxLayout> - <name>layout</name> - </boxLayout> - </layout> - <children> - <cardViewTemplate> - <name>Header</name> - <titleField>CONTACT_ID</titleField> - <descriptionField>SALESPROJECT_ROLE</descriptionField> - <entityField>#ENTITY</entityField> - </cardViewTemplate> - </children> -</neonView> diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod index 26ce3663b06..3cbdfdbad94 100644 --- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod +++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod @@ -5,6 +5,7 @@ <layout> <headerFooterLayout> <name>layout</name> + <header>Head</header> <footer>AdditionalInfo</footer> </headerFooterLayout> </layout> diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod index 9191fc15cb6..dd2d009711d 100644 --- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod +++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod @@ -3,9 +3,10 @@ <name>SalesprojectSourcePreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod index 16fa80da79e..8ebad251dee 100644 --- a/neonView/TaskPreview_view/TaskPreview_view.aod +++ b/neonView/TaskPreview_view/TaskPreview_view.aod @@ -3,9 +3,10 @@ <name>TaskPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + <header>Header</header> + </headerFooterLayout> </layout> <children> <cardViewTemplate> diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod index 140d82d9c74..4a5957525d9 100644 --- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod +++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod @@ -3,9 +3,9 @@ <name>TimetrackingPreview_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <headerFooterLayout> <name>layout</name> - </boxLayout> + </headerFooterLayout> </layout> <children> <genericViewTemplate> -- GitLab