Skip to content
Snippets Groups Projects
Commit 200e8ed4 authored by Andreas Minderjahn's avatar Andreas Minderjahn :heavy_check_mark: Committed by Martin Groppe
Browse files

- FilterView Sortierung und Darstellung korrigiert. 

- Favorites Funktion hinzugefügt.
parent cf0e3afb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 32 deletions
entity/BulkMail_entity/BulkMail_entity.aod
+ 34
− 0
View file @ 200e8ed4
......@@ -10,6 +10,7 @@
<contentTitleProcess>%aditoprj%/entity/BulkMail_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/BulkMail_entity/contentDescriptionProcess.js</contentDescriptionProcess>
<afterUiInit>%aditoprj%/entity/BulkMail_entity/afterUiInit.js</afterUiInit>
<useFavorites v="true" />
<iconId>VAADIN:AT</iconId>
<titlePlural>Bulk mails</titlePlural>
<recordContainer>db</recordContainer>
......@@ -573,6 +574,21 @@
<title>Send Date</title>
<contentType>DATE</contentType>
</entityField>
<entityField>
<name>dateLastEdit</name>
<title>Edited on</title>
<contentType>DATE</contentType>
</entityField>
<entityField>
<name>userLastEdit</name>
<title>Editor</title>
<contentType>TEXT</contentType>
<groupable v="true" />
</entityField>
<entityField>
<name>BULKMAIL_OBJECTTYPE</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -713,6 +729,16 @@
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/firstsenddate.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>dateLastEdit.value</name>
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>userLastEdit.value</name>
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......@@ -752,6 +778,14 @@
<filterConditionProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/filterextensions/uniqueclickcount_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
<filterExtension>
<name>Favorite_Filter</name>
<title>Favoritegroup</title>
<contentType>TEXT</contentType>
<filterValuesProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
<filterConditionProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
</filterExtensions>
</dbRecordContainer>
</recordContainers>
......
entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 200e8ed4
import("Context_lib");
import("system.result");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js 0 → 100644
+ 12
− 0
View file @ 200e8ed4
import("system.vars");
import("Favorites_lib");
import("system.result");
import("Sql_lib");
var operator = vars.get("$local.operator");
var rawvalue = vars.get("$local.rawvalue");
var objecttype = vars.get("$field.BULKMAIL_OBJECTTYPE");
var idcolumn = "BULKMAIL.BULKMAILID";
result.string(FavoritesUtil.getFilterDisplayCondition(objecttype, operator, rawvalue, idcolumn));
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js 0 → 100644
+ 5
− 0
View file @ 200e8ed4
import("Context_lib");
import("system.result");
import("Favorites_lib");
result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
+ 5
− 1
View file @ 200e8ed4
import("system.result");
import("system.db");
import("Sql_lib");
result.object({"BULKMAIL.DATE_EDIT": db.DESCENDING})
\ No newline at end of file
ref = {};
ref[SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING;
result.object(ref);
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js 0 → 100644
+ 6
− 0
View file @ 200e8ed4
import("system.result");
import("Sql_lib");
var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW");
result.string(cond.toString());
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js 0 → 100644
+ 6
− 0
View file @ 200e8ed4
import("system.result");
import("Sql_lib");
var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW");
result.string(cond.toString());
\ No newline at end of file
neonView/BulkMailFilter_view/BulkMailFilter_view.aod
+ 18
− 30
View file @ 200e8ed4
......@@ -59,38 +59,30 @@
<name>4d9c0321-a9d9-409b-8839-d1a5b9a19215</name>
<entityField>NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9ad2e3dd-5496-43f4-b6ff-5b2b8c1fb6db</name>
<entityField>SUBJECT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>735b4d0d-3730-4bd4-bf29-a3651b5e1e3c</name>
<entityField>STATUS</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b3ecda59-3ca2-426e-9a31-f94b60848fe2</name>
<entityField>INTEREST_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>6bb9e1df-af54-45a5-a9b5-69bfe45e3491</name>
<entityField>DOCUMENTTEMPLATE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>d8f9dce6-8c10-4235-b3c3-2d15d01586bc</name>
<entityField>DESCRIPTION</entityField>
<name>735b4d0d-3730-4bd4-bf29-a3651b5e1e3c</name>
<entityField>STATUS</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f8f3ad38-e353-4d25-876d-f4500235c9ac</name>
<entityField>DATE_EDIT</entityField>
<entityField>dateLastEdit</entityField>
</neonTableColumn>
<neonTableColumn>
<name>39ec7935-15d5-4105-a528-b6a592a34272</name>
<entityField>USER_EDIT</entityField>
<entityField>userLastEdit</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f15736a2-cead-48b1-ba5f-6b59960e8602</name>
<entityField>firstSendDate</entityField>
</neonTableColumn>
<neonTableColumn>
<name>d8f9dce6-8c10-4235-b3c3-2d15d01586bc</name>
<entityField>DESCRIPTION</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
<treeTableViewTemplate>
......@@ -113,32 +105,28 @@
<entityField>NAME</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>cbe4e32a-8376-4463-906a-b3735858e0b0</name>
<entityField>SUBJECT</entityField>
<name>6d5b98a5-f466-48a9-b1ef-5a7374154d1d</name>
<entityField>INTEREST_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>082ad0f3-3471-4621-941d-27e2974d1fd0</name>
<entityField>STATUS</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>6d5b98a5-f466-48a9-b1ef-5a7374154d1d</name>
<entityField>INTEREST_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>7ad055c2-2adf-4ea1-b2bb-b4f4cbdc643f</name>
<entityField>DOCUMENTTEMPLATE_ID</entityField>
<name>761af530-f8c5-4465-93a1-c584b4d5cfcb</name>
<entityField>firstSendDate</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>820a8174-e95f-4394-b62a-299ac9c7eddf</name>
<entityField>DESCRIPTION</entityField>
<name>72074419-3f7c-476b-90d4-93e1f48c5a2d</name>
<entityField>dateLastEdit</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>761af530-f8c5-4465-93a1-c584b4d5cfcb</name>
<entityField>DATE_EDIT</entityField>
<name>9e9bd735-78e6-490d-9e4e-4f8f822254e5</name>
<entityField>userLastEdit</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>72074419-3f7c-476b-90d4-93e1f48c5a2d</name>
<entityField>USER_EDIT</entityField>
<name>820a8174-e95f-4394-b62a-299ac9c7eddf</name>
<entityField>DESCRIPTION</entityField>
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
......
neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+ 9
− 1
View file @ 200e8ed4
......@@ -14,10 +14,18 @@
<name>Card</name>
<iconField>ICON</iconField>
<titleField>NAME</titleField>
<descriptionField>STATUS</descriptionField>
<subtitleField>STATUS</subtitleField>
<descriptionField>DESCRIPTION</descriptionField>
<favoriteAction1>sendMail</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorites</name>
<objectType>BULKMAIL_OBJECTTYPE</objectType>
<rowId>#UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorites</title>
</favoriteViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<showDrawer v="true" />
......
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