Skip to content
Snippets Groups Projects
Commit c5633bd5 authored by Sophia Leierseder's avatar Sophia Leierseder
Browse files

changes tabs salesproject

parent 2ff179d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 119 additions and 63 deletions
entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+ 19
− 0
View file @ c5633bd5
......@@ -179,6 +179,25 @@
<title>Max participants</title>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ADVERTISINGBAN_ICON</name>
<contentType>TEXT</contentType>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>ParticipantsCommRestiction</name>
<dependency>
<name>dependency</name>
<entityName>CommRestriction_Entity</entityName>
<fieldName>PersonsCommRestriction</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js 0 → 100644
+ 14
− 0
View file @ c5633bd5
import("system.result");
import("Sql_lib");
import("system.logging");
import("system.vars");
import("system.db");
var contact = vars.get("$field.CONTACT_ID");
var commres = db.table(SqlCondition.begin()
.andPrepareVars("COMMRESTRICTION.CONTACT_ID", "$field.CONTACT_ID")
.buildSql("select MEDIUM from COMMRESTRICTION", "1=2"));
logging.log(commres.toSource());
result.string(commres);
neonContext/Salesproject/Salesproject.aod
+ 2
− 2
View file @ c5633bd5
......@@ -52,11 +52,11 @@
</neonViewReference>
<neonViewReference>
<name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
<view>SalesprojectClassificationAttribute_view</view>
<view>SalesprojectClassificationAndChart_view</view>
</neonViewReference>
<neonViewReference>
<name>99f70216-c195-4c08-a6ab-3a4d5acc759b</name>
<view>SalesprojectClassScoreAttribute_view</view>
<view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>b3e34681-eef6-48d3-a4e6-975a6fe77e7b</name>
......
neonContext/Timetracking/Timetracking.aod
+ 4
− 0
View file @ c5633bd5
......@@ -35,5 +35,9 @@
<name>1290dad5-f796-4847-9510-05607e079f30</name>
<view>TimetrackingAnalysesDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>9f848d8a-5dee-4388-8ade-6aa2c3f6c21f</name>
<view>TimetrackingFilterAnalyses</view>
</neonViewReference>
</references>
</neonContext>
neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod 0 → 100644
+ 25
− 0
View file @ c5633bd5
<?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>SalesprojectClassificationAndChart_view</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>b2bbddb9-1a44-4926-9707-7052f96e5963</name>
<entityField>Classifications</entityField>
<view>ClassificationTree_view</view>
</neonViewReference>
<neonViewReference>
<name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
<entityField>Classifications</entityField>
<view>ClassificationChart_view</view>
</neonViewReference>
</children>
</neonView>
neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+ 24
− 25
View file @ c5633bd5
<?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>SalesprojectClassificationAttribute_view</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>793ed21a-147f-4ca0-a86a-ddbf79db92b6</name>
<entityField>Classifications</entityField>
<view>ClassificationDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
<entityField>Classifications</entityField>
<view>ClassificationChart_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>SalesprojectClassificationAttribute_view</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
<direction>VERTICAL</direction>
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
<entityField>#ENTITY</entityField>
<view>SalesprojectClassificationAndChart_view</view>
</neonViewReference>
<neonViewReference>
<name>523e3855-eade-4cce-842d-9b272b028cbb</name>
<entityField>AttributeTree</entityField>
<view>AttributeRelationTreeDrawer_view</view>
</neonViewReference>
</children>
</neonView>
neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
+ 2
− 7
View file @ c5633bd5
......@@ -6,8 +6,8 @@
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<maxDirectionElements v="2" />
<direction>VERTICAL</direction>
<maxDirectionElements v="0" />
</boxLayout>
</layout>
<children>
......@@ -16,11 +16,6 @@
<entityField>Timetrackings</entityField>
<view>TimetrackingDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>5d00dd5a-7c80-41b4-a53e-29375be4f806</name>
<entityField>Timetrackings</entityField>
<view>TimetrackingAnalyses_view</view>
</neonViewReference>
<neonViewReference>
<name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name>
<entityField>Competitions</entityField>
......
neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+ 1
− 1
View file @ c5633bd5
......@@ -27,7 +27,7 @@
<neonViewReference>
<name>67659a20-068f-4522-ad33-2c35e29f929a</name>
<entityField>#ENTITY</entityField>
<view>SalesprojectClassScoreAttribute_view</view>
<view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
......
neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
+ 2
− 2
View file @ c5633bd5
......@@ -12,9 +12,9 @@
</layout>
<children>
<neonViewReference>
<name>c399a9ac-e0ad-490c-8ffb-247fc806233b</name>
<name>e192d0d6-8d36-437a-a9cf-775c811c2761</name>
<entityField>Forecasts</entityField>
<view>ForecastDrawer_view</view>
<view>ForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>ca2581ac-0987-4fa4-a45a-c33ea4cd61e1</name>
......
neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
+ 2
− 2
View file @ c5633bd5
......@@ -10,9 +10,9 @@
</layout>
<children>
<neonViewReference>
<name>463458e6-fb6a-4550-b4b4-04b61969f9f2</name>
<name>c6133a75-f87d-448f-bf52-e360373aa7f7</name>
<entityField>#ENTITY</entityField>
<view>TimetrackingFilter_view</view>
<view>TimetrackingFilterAnalyses</view>
</neonViewReference>
</children>
</neonView>
neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod → neonView/TimetrackingFilterAnalyses/TimetrackingFilterAnalyses.aod
+ 24
− 24
View file @ c5633bd5
<?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>SalesprojectClassScoreAttribute_view</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
<direction>VERTICAL</direction>
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
<entityField>#ENTITY</entityField>
<view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>523e3855-eade-4cce-842d-9b272b028cbb</name>
<entityField>AttributeTree</entityField>
<view>AttributeRelationTreeDrawer_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>TimetrackingFilterAnalyses</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>373d9986-ad06-4a86-9f5d-801ecee6139c</name>
<entityField>#ENTITY</entityField>
<view>TimetrackingFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>9b1e339c-70aa-4841-8e8f-b66fd2e9f9f5</name>
<entityField>#ENTITY</entityField>
<view>TimetrackingAnalyses_view</view>
</neonViewReference>
</children>
</neonView>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment