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

#1055989 Favorites: optimizations

parent ecc5ed89
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 43 deletions
......@@ -8,7 +8,7 @@
<contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
<useFavorites v="true" />
<useFavorites v="false" />
<iconId>VAADIN:USER</iconId>
<titlePlural>Employees</titlePlural>
<recordContainer>jdito</recordContainer>
......@@ -379,10 +379,6 @@
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>EMPLOYEE_OBJECTTYPE</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
import("system.result");
result.string("Employee");
\ No newline at end of file
......@@ -7,6 +7,7 @@
<grantCreate v="true" />
<grantUpdate v="true" />
<grantDelete v="true" />
<contentTitleProcess>%aditoprj%/entity/ExportTemplate_entity/contentTitleProcess.js</contentTitleProcess>
<useFavorites v="true" />
<iconId>NEON:EXPORT</iconId>
<titlePlural>Export Templates</titlePlural>
......
import("system.vars");
import("system.result");
result.string(vars.get("$field.TITLE"));
\ No newline at end of file
......@@ -37,7 +37,6 @@
<entityField>
<name>GROUP_TITLE</name>
<titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>GROUP_TYPE</name>
......
import("system.vars");
import("system.result");
import("system.translate");
if(vars.get("$field.GROUP_TITLE").equals(""))
// result.string(translate.text("Standard"))
result.string("Standard");
\ No newline at end of file
import("system.result");
import("system.translate");
result.string(translate.text("Name"));
\ No newline at end of file
result.string(translate.text("Title"));
\ No newline at end of file
......@@ -95,9 +95,9 @@ function isValid(value, filter)
case "NOT_CONTAINS":
return !value.includes(filterValue);
case "ISNULL":
return value == null;
return value == null || value === "";
case "ISNOTNULL":
return value != null;
return value != null && value !== "";
}
return false;
......
......@@ -15,7 +15,7 @@ var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
.arrayColumn();
groupNames.forEach(element => {
allTypes.push([element, element]);
allTypes.push([element, element]);
});
result.object(Array.from(allTypes));
......
......@@ -9,7 +9,7 @@
<element>Product_entity</element>
</siblings>
<onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
<useFavorites v="true" />
<useFavorites v="false" />
<titlePlural>Prices</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......@@ -230,10 +230,6 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>PRODUCTPRICE_OBJECTTYPE</name>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
import("system.result");
result.string("Productprice");
\ No newline at end of file
......@@ -16,13 +16,6 @@
<subtitleField>TITLE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorite</name>
<objectType>EMPLOYEE_OBJECTTYPE</objectType>
<rowId>SHORT_UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorite</title>
</favoriteViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
......
......@@ -16,13 +16,6 @@
<subtitleField>PRODUCT_ID</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorites</name>
<objectType>PRODUCTPRICE_OBJECTTYPE</objectType>
<rowId>#UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorites</title>
</favoriteViewTemplate>
<genericViewTemplate>
<name>PriceInfo</name>
<showDrawer v="true" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment