Skip to content
Snippets Groups Projects
Commit ef25ae97 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Fix Images

parent ad63176b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 124 deletions
entity/Pers_entity/Pers_entity.aod
+ 0
− 1
View file @ ef25ae97
......@@ -95,7 +95,6 @@
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityFieldGroup>
......
entity/Pers_entity/entityfields/image/onValueChange.js
+ 7
− 26
View file @ ef25ae97
import("system.logging");
import("system.vars");
import("system.neon");
// TODO: "$field.IMAGE" is not set propperly. This is a workaround with $local.value
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
if (vars.exists("$local.value"))
if (vars.get("$field.IMAGE"))
{
var newImage = vars.get("$local.value");
if (newImage)
{
vars.set("$image.changedImage", vars.get("$local.value"));
}
else
{
vars.set("$image.changedImage", "deleted");
}
vars.set("$image.changedImage", true);
}
/*
// TODO: "$field.IMAGE" is not set propperly. This is a workaround with $local.value
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
vars.set("$image.changedImage", true);
logging.log("changed value: " + vars.get("$field.IMAGE").toSource());
logging.log("changed local.value: " + vars.get("$local.value").toSource());
logging.log("changed operatingstate: " + vars.get("$sys.operatingstate"));
*/
\ No newline at end of file
else
{
vars.set("$image.changedImage", "deleted");
}
\ No newline at end of file
entity/Pers_entity/entityfields/image/valueProcess.js
+ 4
− 50
View file @ ef25ae97
import("system.vars");
import("system.result");
import("Pers_lib");
result.string(PersUtils.getImage(vars.get("$field.PERSID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
/*
import("system.logging");
import("system.vars");
import("system.neon");
import("system.result");
import("system.vars");
import("Pers_lib");
logging.log("value: " + vars.get("$field.IMAGE").toSource());
logging.log("operatingstate: " + vars.get("$sys.operatingstate"));
var operatingstate = vars.get("$sys.operatingstate");
var image = vars.get("$field.IMAGE");
if (operatingstate == neon.OPERATINGSTATE_VIEW)
{
result.string(PersUtils.getImage(vars.get("$field.PERSID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
}
else if (operatingstate == neon.OPERATINGSTATE_EDIT)
{
result.string(image);
}
else if (operatingstate == neon.OPERATINGSTATE_NEW)
{
logging.log(vars.get("$field.PERSID"));
result.string("");
}
/*
if (operatingstate == neon.OPERATINGSTATE_EDIT && !image)
{
logging.log("edit " + image)
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
{
result.string(PersUtils.getImage(vars.get("$field.PERSID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
}*/
//if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
/*
// if ()
if (vars.get("$field.IMAGE") && vars.get("$field.IMAGE") != "TEXT:")
{
result.string(vars.get("$field.IMAGE"));
}
else
{*/
//}
}
\ No newline at end of file
entity/Pers_entity/recordcontainers/db/onDBUpdate.js
+ 2
− 24
View file @ ef25ae97
import("system.vars");
import("Pers_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer
if (vars.exists("$image.changedImage"))
{
if (vars.get("$image.changedImage"))
{
var imageData = vars.getString("$image.changedImage");
if (imageData != "deleted")
{
PersUtils.setImage(vars.get("$field.PERSID"), imageData);
}
else
{
PersUtils.removeImage(vars.get("$field.PERSID"));
}
}
}
vars.set("$image.changedImage", false);
/*
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer
if (vars.exists("$image.changedImage"))
{
if (vars.get("$image.changedImage"))
{
var imageData = vars.getString("$field.IMAGE");
if (imageData)
if (vars.get("$image.changedImage") != "deleted")
{
PersUtils.setImage(vars.get("$field.PERSID"), imageData);
}
......@@ -38,6 +18,4 @@ if (vars.exists("$image.changedImage"))
}
}
vars.set("$image.changedImage", false);
*/
\ No newline at end of file
vars.set("$image.changedImage", false);
\ No newline at end of file
entity/Product_entity/Product_entity.aod
+ 3
− 0
View file @ ef25ae97
......@@ -178,6 +178,9 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/image/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Product_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityOutgoingField>
<name>ProductStockCount_dfo</name>
......
entity/Product_entity/entityfields/image/onValueChange.js
+ 7
− 14
View file @ ef25ae97
import("system.logging");
import("system.vars");
// TODO: "$field.IMAGE" is not set propperly. This is a workaround with $local.value
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
if (vars.exists("$local.value"))
var newImage = vars.get("$field.IMAGE");
if (newImage)
{
var newImage = vars.get("$local.value");
if (newImage)
{
vars.set("$image.changedImage", vars.get("$local.value"));
}
else
{
vars.set("$image.changedImage", "deleted");
}
vars.set("$image.changedImage", newImage);
}
else
{
vars.set("$image.changedImage", "deleted");
}
\ No newline at end of file
entity/Product_entity/entityfields/image/valueProcess.js
+ 6
− 2
View file @ ef25ae97
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
import("Product_lib");
result.string(ProductUtils.getImage(vars.get("$field.PRODUCTID"), vars.getString("$field.PRODUCTNAME")));
\ No newline at end of file
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
{
result.string(ProductUtils.getImage(vars.get("$field.PRODUCTID"), vars.getString("$field.PRODUCTNAME")));
}
\ No newline at end of file
entity/Product_entity/recordcontainers/db/onDBUpdate.js
+ 2
− 2
View file @ ef25ae97
......@@ -6,8 +6,8 @@ if (vars.exists("$image.changedImage"))
{
if (vars.get("$image.changedImage"))
{
var imageData = vars.getString("$image.changedImage");
if (imageData != "deleted")
var imageData = vars.getString("$field.IMAGE");
if (vars.get("$image.changedImage") != "deleted")
{
ProductUtils.setImage(vars.get("$field.PRODUCTID"), imageData);
}
......
neonView/PersEdit_view/PersEdit_view.aod
+ 1
− 5
View file @ ef25ae97
......@@ -11,15 +11,11 @@
</layout>
<children>
<genericViewTemplate>
<name>PersEdit_generic</name>
<name>PersEdit_template</name>
<editMode v="true" />
<showDrawer v="false" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>df3ab07b-c535-4ddc-9c7b-bca80006c805</name>
<entityField>IMAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
<entityField>ORG_ID</entityField>
......
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