Skip to content
Snippets Groups Projects
Commit 68f4ffd8 authored by Nico Bugl's avatar Nico Bugl
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1036650][Modularisierung der Module... 

[Projekt: Entwicklung - Neon][TicketNr.: 1036650][Modularisierung der Module aus dem Vertriebsprojekt]
- Forecast fertig umgebaut
- Bewertung/Klassifizierung kann nicht umgebaut werden weil geht noch nicht im Basic
- Offer fertig umgebaut
- Zeiterfassung bzw Timetracking ist bereits umgebaut
parent 2fe071f0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 47 deletions
entity/Salesproject_entity/Salesproject_entity.aod
+ 18
− 20
View file @ 68f4ffd8
......@@ -152,19 +152,22 @@
</children>
</entityConsumer>
<entityConsumer>
<name>SalesprojectForecasts</name>
<name>Forecasts</name>
<title>Forecast</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>SalesprojectForecast_entity</entityName>
<fieldName>SalesprojectForecasts</fieldName>
<entityName>Forecast_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......@@ -187,19 +190,22 @@
</children>
</entityConsumer>
<entityConsumer>
<name>SalesprojectOffers</name>
<name>Offers</name>
<title>Offer</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
<fieldName>SalesprojectOffers</fieldName>
<fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......@@ -253,7 +259,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>SalesprojectClassification_entity</entityName>
<entityName>Classification_entity</entityName>
<fieldName>SalesprojectClassifications</fieldName>
</dependency>
<children>
......@@ -526,14 +532,6 @@
<entityProvider>
<name>openSalesprojects</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
<entityName>Offer_entity</entityName>
<fieldName>Salesprojects</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>State_param</name>
......
entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 68f4ffd8
import("system.logging");
import("system.vars");
import("system.result");
result.string(vars.get("$field.SALESPROJECTID"));
logging.log("Salesprojectid: " + vars.get("$field.SALESPROJECTID"))
\ No newline at end of file
entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 68f4ffd8
import("Context_lib");
import("system.result");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 68f4ffd8
import("system.logging");
import("system.vars");
import("system.result");
result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 68f4ffd8
import("system.logging");
import("Context_lib");
import("system.result");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+ 0
− 2
View file @ 68f4ffd8
......@@ -8,9 +8,7 @@ if (currentId)
{
var toDelete = [
"SALESPROJECT_COMPETITION",
"SALESPROJECT_CLASSIFICATION",
"SALESPROJECT_MILESTONE",
"SALESPROJECT_FORECAST",
"SALESPROJECT_MEMBER",
"SALESPROJECT_SOURCE"
];
......
entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+ 2
− 2
View file @ 68f4ffd8
......@@ -33,7 +33,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
if (state == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd')
{
// set all offers of the salesproject to lost
db.updateData("OFFER", ["STATUS"], null, ["a5682630-01ae-4769-8f03-47dc1db44da4"], SqlCondition.equals("OFFER.SALESPROJECT_ID", vars.getString("$field.SALESPROJECTID"), "1=2"));
db.updateData("OFFER", ["STATUS"], null, ["a5682630-01ae-4769-8f03-47dc1db44da4"], SqlCondition.equals("OFFER.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
_updateReasons();
clearReason = false;
}
......@@ -50,7 +50,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
{
// do not notify as the user just got a question, if he really would like to clear the forecast
needToUpdateForecast = false;
db.deleteData("SALESPROJECT_FORECAST", SqlCondition.equals("SALESPROJECT_FORECAST.SALESPROJECT_ID", vars.getString("$field.SALESPROJECTID"), "1=2"));
db.deleteData("FORECAST", SqlCondition.equals("FORECAST.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
}
// if state changed, but not to one of the above states
else
......
neonContext/SalesprojectClassification/SalesprojectClassification.aod → neonContext/Classification/Classification.aod
+ 6
− 6
View file @ 68f4ffd8
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>SalesprojectClassification</name>
<name>Classification</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>SalesprojectClassificationFilter_view</filterview>
<preview>SalesprojectClassificationPreview_view</preview>
<entity>SalesprojectClassification_entity</entity>
<filterview>ClassificationFilter_view</filterview>
<preview>ClassificationPreview_view</preview>
<entity>Classification_entity</entity>
<references>
<neonViewReference>
<name>c0720a84-98a8-459d-bdf5-b3daf56ee059</name>
<view>SalesprojectClassificationFilter_view</view>
<view>ClassificationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>e5f1c9a7-19a8-433e-b25e-83001d4f7bf8</name>
<view>SalesprojectClassificationPreview_view</view>
<view>ClassificationPreview_view</view>
</neonViewReference>
</references>
</neonContext>
neonContext/SalesprojectForecast/SalesprojectForecast.aod → neonContext/Forecast/Forecast.aod
+ 8
− 8
View file @ 68f4ffd8
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>SalesprojectForecast</name>
<name>Forecast</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>SalesprojectForecastFilter_view</filterview>
<editview>SalesprojectForecastEdit_view</editview>
<preview>SalesprojectForecastPreview_view</preview>
<entity>SalesprojectForecast_entity</entity>
<filterview>ForecastFilter_view</filterview>
<editview>ForecastEdit_view</editview>
<preview>ForecastPreview_view</preview>
<entity>Forecast_entity</entity>
<references>
<neonViewReference>
<name>20d80c15-97f0-490c-b845-b2b4f63c6a5d</name>
<view>SalesprojectForecastFilter_view</view>
<view>ForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>7cc72509-722b-4d4f-870c-08878129ceb9</name>
<view>SalesprojectForecastEdit_view</view>
<view>ForecastEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
<view>SalesprojectForecastPreview_view</view>
<view>ForecastPreview_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod → neonView/ClassificationFilter_view/ClassificationFilter_view.aod
+ 1
− 1
View file @ 68f4ffd8
<?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>SalesprojectClassificationFilter_view</name>
<name>ClassificationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
......
neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod → neonView/ClassificationPreview_view/ClassificationPreview_view.aod
+ 1
− 1
View file @ 68f4ffd8
<?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>SalesprojectClassificationPreview_view</name>
<name>ClassificationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
......
neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod → neonView/ForecastEdit_view/ForecastEdit_view.aod
+ 1
− 1
View file @ 68f4ffd8
<?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>SalesprojectForecastEdit_view</name>
<name>ForecastEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<isSmall v="true" />
<layout>
......
neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod → neonView/ForecastFilter_view/ForecastFilter_view.aod
+ 9
− 1
View file @ 68f4ffd8
<?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>SalesprojectForecastFilter_view</name>
<name>ForecastFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
......@@ -29,6 +29,14 @@
<name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
<entityField>INFO</entityField>
</neonTableColumn>
<neonTableColumn>
<name>945c0ec1-826f-4dc7-9556-7bd3d5e0afbc</name>
<entityField>OBJECT_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>1ac60cf5-fa50-4305-81b4-859a883ddc3e</name>
<entityField>OBJECT_ROWID</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
......
neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod → neonView/ForecastPreview_view/ForecastPreview_view.aod
+ 1
− 1
View file @ 68f4ffd8
<?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>SalesprojectForecastPreview_view</name>
<name>ForecastPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
......
neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+ 3
− 3
View file @ 68f4ffd8
......@@ -26,8 +26,8 @@
</neonViewReference>
<neonViewReference>
<name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
<entityField>SalesprojectForecasts</entityField>
<view>SalesprojectForecastFilter_view</view>
<entityField>Forecasts</entityField>
<view>ForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>8986df12-88fc-49a8-9e48-f4c1f371532f</name>
......@@ -46,7 +46,7 @@
</neonViewReference>
<neonViewReference>
<name>b1deae1b-c39a-48bd-9221-ed4153ee8ec9</name>
<entityField>SalesprojectOffers</entityField>
<entityField>Offers</entityField>
<view>OfferFilter_view</view>
</neonViewReference>
<neonViewReference>
......
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 68f4ffd8
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>xRM-Basic_current</projectName>
<projectName>basic_25042019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
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