Skip to content
Snippets Groups Projects
Commit 39b2777e authored by S.Listl's avatar S.Listl
Browse files

Merge origin/master

parents 9efa178c 9b88b3e7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 184 additions and 30 deletions
entity/Task_entity/iconIdProcess.js 0 → 100644
+ 10
− 0
View file @ 39b2777e
import("system.vars");
import("system.result");
import("system.neon");
import("Keyword_lib");
var category = vars.getString("$field.PRIORITY");
var kwd = KeywordUtils.createKeyword("TASK.PRIORITY");
var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
result.string(icon || "VAADIN:TASKS");
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 28
− 0
View file @ 39b2777e
......@@ -1459,6 +1459,34 @@
<key>responsible</key>
</entry>
<entry>
<key>Kundenstammblatt</key>
</entry>
<entry>
<key>Person</key>
</entry>
<entry>
<key>Detail</key>
</entry>
<entry>
<key>Object 2</key>
</entry>
<entry>
<key>Object 1</key>
</entry>
<entry>
<key>Type 2</key>
</entry>
<entry>
<key>Type 1</key>
</entry>
<entry>
<key>Relations</key>
</entry>
<entry>
<key>Object Relation</key>
</entry>
<entry>
<key>${FORECAST_ENGLISH}</key>
<key>${ADDRESS_STATE}</key>
</entry>
<entry>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 34
− 0
View file @ 39b2777e
......@@ -1581,6 +1581,7 @@
</entry>
<entry>
<key>Object</key>
<value>Objekt</value>
</entry>
<entry>
<key>Attributes</key>
......@@ -1876,6 +1877,39 @@
<key>{$DATE_EDIT}</key>
<value>Änderungsdatum</value>
</entry>
<entry>
<key>Kundenstammblatt</key>
</entry>
<entry>
<key>Person</key>
</entry>
<entry>
<key>Detail</key>
</entry>
<entry>
<key>Object 2</key>
</entry>
<entry>
<key>Object 1</key>
</entry>
<entry>
<key>Type 2</key>
</entry>
<entry>
<key>Type 1</key>
</entry>
<entry>
<key>Relations</key>
<value>Beziehungen</value>
</entry>
<entry>
<key>Object Relation</key>
<value>Objektbeziehung</value>
</entry>
<entry>
<key>${FORECAST_ENGLISH}</key>
<value>Forecast</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 29
− 0
View file @ 39b2777e
......@@ -1488,6 +1488,35 @@
<key>responsible</key>
</entry>
<entry>
<key>Kundenstammblatt</key>
</entry>
<entry>
<key>Person</key>
</entry>
<entry>
<key>Detail</key>
</entry>
<entry>
<key>Object 2</key>
</entry>
<entry>
<key>Object 1</key>
</entry>
<entry>
<key>Type 2</key>
</entry>
<entry>
<key>Type 1</key>
</entry>
<entry>
<key>Relations</key>
</entry>
<entry>
<key>Object Relation</key>
</entry>
<entry>
<key>${FORECAST_ENGLISH}</key>
<value>Forecast</value>
<key>${ADDRESS_STATE}</key>
<value>state</value>
</entry>
......
neonContext/ObjectRelation_context/ObjectRelation_context.aod
+ 6
− 0
View file @ 39b2777e
......@@ -2,11 +2,17 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>ObjectRelation_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>ObjectRelationFilter_view</filterview>
<preview>ObjectRelationPreview_view</preview>
<entity>ObjectRelation_entity</entity>
<references>
<neonViewReference>
<name>f6b27aa2-d0a7-479c-812e-8b16400b564b</name>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name>
<view>ObjectRelationPreview_view</view>
</neonViewReference>
</references>
</neonContext>
neonContext/Task_context/Task_context.aod
+ 0
− 1
View file @ 39b2777e
......@@ -4,7 +4,6 @@
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonContext/Task_context/documentation.adoc</documentation>
<icon>VAADIN:TASKS</icon>
<mainview>TaskMain_view</mainview>
<filterview>TaskFilter_view</filterview>
<editview>TaskEdit_view</editview>
......
neonView/ActivityFilter_view/ActivityFilter_view.aod
+ 8
− 8
View file @ 39b2777e
......@@ -55,6 +55,14 @@
</groupLayout>
</layout>
<children>
<timelineViewTemplate>
<name>TimelineFilter_template</name>
<dateField>ENTRYDATE</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
<iconIdField>DIRECTION_ICON</iconIdField>
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
<name>table_template</name>
<entityField>#ENTITY</entityField>
......@@ -81,14 +89,6 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
<timelineViewTemplate>
<name>TimelineFilter_template</name>
<dateField>ENTRYDATE</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
<iconIdField>DIRECTION_ICON</iconIdField>
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<treetableViewTemplate>
<name>Treetable_template</name>
<titleField>SUBJECT</titleField>
......
neonView/ActivityMain_view/ActivityMain_view.aod
+ 5
− 0
View file @ 39b2777e
......@@ -24,5 +24,10 @@
<entityField>ActivityDocument_dfo</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>644418a6-7945-493b-be3f-86b3b62daaab</name>
<entityField>ActivityObjectRelation_dfo</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
</children>
</neonView>
neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+ 0
− 6
View file @ 39b2777e
......@@ -32,12 +32,6 @@
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
<neonTableColumn>
<name>99e92d98-81b4-4e68-927e-a77771b31ed7</name>
<entityField>OBJECT2_TYPE</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
......
neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod 0 → 100644
+ 23
− 0
View file @ 39b2777e
<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>ObjectRelationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Object</name>
<entityField>#ENTITY</entityField>
<title>Object</title>
<fields>
<entityFieldLink>
<name>eabe1737-7a31-4181-8c32-bda6a9f7d7e9</name>
<entityField>OBJECT2_ROWID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+ 3
− 2
View file @ 39b2777e
......@@ -52,10 +52,11 @@
<tableViewTemplate>
<name>SalesprojectFilter_table</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
<neonTableColumn>
<name>91a153d4-4ede-4ba1-b11e-713e476e77c9</name>
<entityField>PROJECTCODE</entityField>
<name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
<entityField>RELATION_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9f6b967e-5140-420f-84ca-2273920221bd</name>
......
neonView/TaskFilter_view/TaskFilter_view.aod
+ 17
− 2
View file @ 39b2777e
......@@ -4,11 +4,19 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<boxLayout>
<groupLayout>
<name>layout</name>
</boxLayout>
</groupLayout>
</layout>
<children>
<timelineViewTemplate>
<name>mainTimeline</name>
<dateField>START_DATE</dateField>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconIdField>#ICON</iconIdField>
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
<name>mainTable</name>
<entityField>#ENTITY</entityField>
......@@ -41,5 +49,12 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
<treetableViewTemplate>
<name>mainTreetable</name>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>#ICON</iconField>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
</children>
</neonView>
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 39b2777e
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>basic 2019</projectName>
<projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
process/OfferOrder_lib/process.js
+ 20
− 9
View file @ 39b2777e
import("system.logging");
import("system.translate");
import("system.text");
import("system.vars");
......@@ -140,12 +141,16 @@ function ItemUtils(pOfferOrderId, pTableName) {
* get a new SqlCondition Object with tablename + "ITEM." + tablename + "ITEMID" = pItemId
*
* @param {String} pItemId item id
* @param {String} [pTableName=this.tableName] table name, if this is not available
*
* @return {SqlCondition}
*/
ItemUtils.prototype.getNewItemIdCondition = function(pItemId)
ItemUtils.prototype.getNewItemIdCondition = function(pItemId, pTableName)
{
return SqlCondition.begin().andPrepare(this.tableName + "ITEM." + this.tableName + "ITEMID", pItemId);
if (pTableName == undefined)
pTableName = this.tableName;
logging.log("hää" + pTableName)
return SqlCondition.begin().andPrepare(pTableName + "ITEM." + pTableName + "ITEMID", pItemId);
}
/**
......@@ -168,7 +173,7 @@ ItemUtils.prototype.getNetAndVat = function(itemIds) {
itemIds.forEach(function(pItem)
{
condition.andPrepare(this.tableName + "ITEM." + this.tableName + "ITEMID", pItem, "# <> ?");
});
}, this);
}
var orderItems = db.table(condition.buildSql("select QUANTITY, PRICE, DISCOUNT, VAT, OPTIONAL from " + this.tableName + "ITEM", "1 = 0"));
......@@ -280,8 +285,9 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
columns = columns.concat(additionalProductInfo.map(function(item) {return item[0]}));
var colTypes = db.getColumnTypes(table, columns);
__itemInsertStatement(partsList.root, assignedTo, currency, relationId);
logging.log(partsList.toSource())
// partsList[rootProdId] = root node
__itemInsertStatement(partsList[rootProdId], assignedTo, currency, relationId);
if (statements.length > 0)
db.inserts(statements);
......@@ -332,7 +338,8 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
statements.push([table, columns, colTypes, vals]);
insertedItemIds.push(newid);
logging.log(p2pid)
__itemInsertStatement(partsList[p2pid], newid);
}
}
......@@ -352,7 +359,7 @@ ItemUtils.prototype.deletePartsList = function(itemId) {
//save address for this here to get class variables in recursive sub function __itemDeleteStatement
var self = this;
logging.log("1 " + self.tableName)
var statements = [];
__itemDeleteStatement(itemId);
......@@ -366,11 +373,15 @@ ItemUtils.prototype.deletePartsList = function(itemId) {
//recursive function for building item delete statements
function __itemDeleteStatement(itemId) {
var itemsToDelete = self.ItemTree[itemId].ids;
logging.log("2 " + self.tableName)
var itemsToDelete = self.ItemTree[itemId].ids;
logging.log("__ " + self.tableName)
logging.log(itemsToDelete.toSource())
for (var i = 0; i < itemsToDelete.length; i++) {
//unshift due to foreign key constraints (Delete hierarchically starting at the bottom)
statements.unshift(self.getNewItemIdCondition(itemsToDelete[i]).build("1 = 2"));
logging.log("3 " + self.tableName)
statements.unshift(self.getNewItemIdCondition(itemsToDelete[i], self.tableName).build("1 = 2"));
deletedItemIds.push(itemsToDelete[i]);
__itemDeleteStatement(itemsToDelete[i]);
}
......
process/Sql_lib/process.js
+ 0
− 1
View file @ 39b2777e
import("system.logging");
import("system.translate");
import("system.vars");
import("system.db");
......
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