Skip to content
Snippets Groups Projects
Commit aa2f7c8c authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

#1060652 Favorites: last tweaks regarding user experience

parent 041b6ef3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 49 deletions
entity/Contract_entity/Contract_entity.aod
+ 1
− 0
View file @ aa2f7c8c
......@@ -10,6 +10,7 @@
<onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
<useFavorites v="true" />
<iconId>VAADIN:FILE_TEXT</iconId>
<imageProcess>%aditoprj%/entity/Contract_entity/imageProcess.js</imageProcess>
<titlePlural>Contracts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/Contract_entity/imageProcess.js 0 → 100644
+ 4
− 0
View file @ aa2f7c8c
import("system.vars");
import("system.result");
result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 1
− 0
View file @ aa2f7c8c
......@@ -10,6 +10,7 @@
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/onValidation.js</onValidation>
<useFavorites v="true" />
<iconId>VAADIN:FILE_FONT</iconId>
<imageProcess>%aditoprj%/entity/DocumentTemplate_entity/imageProcess.js</imageProcess>
<titlePlural>Document templates</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/DocumentTemplate_entity/imageProcess.js 0 → 100644
+ 4
− 0
View file @ aa2f7c8c
import("system.vars");
import("system.result");
result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
entity/Favorite_entity/Favorite_entity.aod
+ 7
− 3
View file @ aa2f7c8c
......@@ -4,6 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:STAR</icon>
<title>Favorite</title>
<siblings>
<element>Organisation_entity</element>
</siblings>
<grantCreate v="true" />
<grantUpdate v="true" />
<grantDelete v="true" />
......@@ -28,7 +31,8 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
<titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/titleProcess.js</titleProcess>
<title>Object type</title>
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -36,7 +40,8 @@
</entityField>
<entityField>
<name>GROUP_TITLE</name>
<titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
<title>Group name</title>
<groupable v="true" />
</entityField>
<entityField>
<name>GROUP_TYPE</name>
......@@ -50,7 +55,6 @@
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
<titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/picture/titleProcess.js</titleProcess>
</entityField>
</entityFields>
<recordContainers>
......
entity/Favorite_entity/entityfields/object_type/titleProcess.js deleted 100644 → 0
+ 0
− 4
View file @ 041b6ef3
import("system.result");
import("system.translate");
result.string(translate.text("Object type"));
\ No newline at end of file
entity/Favorite_entity/entityfields/picture/titleProcess.js deleted 100644 → 0
+ 0
− 4
View file @ 041b6ef3
import("system.result");
import("system.translate");
result.string(translate.text("Picture"));
\ No newline at end of file
entity/Offer_entity/Offer_entity.aod
+ 1
− 0
View file @ aa2f7c8c
......@@ -14,6 +14,7 @@
<afterOperatingState>%aditoprj%/entity/Offer_entity/afterOperatingState.js</afterOperatingState>
<useFavorites v="true" />
<iconId>VAADIN:CART</iconId>
<imageProcess>%aditoprj%/entity/Offer_entity/imageProcess.js</imageProcess>
<titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/Favorite_entity/entityfields/group_title/titleProcess.js → entity/Offer_entity/imageProcess.js
+ 5
− 0
View file @ aa2f7c8c
import("system.result");
import("system.translate");
import("system.vars");
import("system.result");
result.string(translate.text("Group name"));
\ No newline at end of file
result.string("TEXT:" + translate.text("Offer"));
\ No newline at end of file
entity/Salesproject_entity/Salesproject_entity.aod
+ 1
− 0
View file @ aa2f7c8c
......@@ -14,6 +14,7 @@
<afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
<useFavorites v="true" />
<iconId>VAADIN:BOOK_DOLLAR</iconId>
<imageProcess>%aditoprj%/entity/Salesproject_entity/imageProcess.js</imageProcess>
<titlePlural>Sales Projects</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/Salesproject_entity/imageProcess.js 0 → 100644
+ 4
− 0
View file @ aa2f7c8c
import("system.vars");
import("system.result");
result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+ 24
− 38
View file @ aa2f7c8c
......@@ -4,55 +4,45 @@
<title>FavoriteFilter_view</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<dashletConfigurations>
<neonDashletConfiguration>
<name>favoriteDashletConfiguration</name>
<title>favorites</title>
<description>Shows all favorites set by an specific user.</description>
<fragment>Favorite/filter?grouping=GROUP_TITLE</fragment>
<fragmentCustomizable v="true" />
<provider></provider>
<icon>VAADIN:STAR</icon>
<categories>
<neonDashletCategory>
<name>favorites</name>
<title>Favorites</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>
</groupLayout>
</layout>
<children>
<tableViewTemplate>
<name>FavoriteFilter</name>
<iconField>#IMAGE</iconField>
<titleField>TITLE</titleField>
<entityField>#ENTITY</entityField>
<linkedColumns>
<element>PICTURE</element>
<element>OBJECT_TYPE</element>
<element>TITLE</element>
<element>GROUP_TITLE</element>
</linkedColumns>
<fixedFilterFields />
<isCreatable v="false" />
<isEditable v="false" />
<title>favoriteFilter_view</title>
<columns>
<neonTableColumn>
<name>a87e6491-7d8a-4009-9da8-c72348c22b4a</name>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
<entityField>OBJECT_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>075e4e29-515c-4d9e-b195-f481af367b42</name>
<entityField>TITLE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>929170b5-b460-4558-9aa6-f7657f49098c</name>
<entityField>GROUP_TITLE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
<treeTableViewTemplate>
<name>FavoriteTree</name>
<parentField>TITLE</parentField>
<defaultGroupFields>
<element>GROUP_TITLE</element>
</defaultGroupFields>
<entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
<name>3f35104a-7ccc-44aa-8b9a-9de31d410f81</name>
<entityField>PICTURE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
<entityField>GROUP_TITLE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>b7660bdb-7ae4-46c5-a0a6-5127244bfcf8</name>
<entityField>OBJECT_TYPE</entityField>
......@@ -61,10 +51,6 @@
<name>d68cc010-2d84-43d1-a333-39f9fdd3a23a</name>
<entityField>TITLE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
<entityField>GROUP_TITLE</entityField>
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
</children>
......
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