Skip to content
Snippets Groups Projects
Commit 3a4e8033 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Address: adjust visibility of region and repositioning of region and state fields

parent d5c8e57a
No related branches found
No related tags found
No related merge requests found
......@@ -68,6 +68,8 @@
<entityField>
<name>REGION</name>
<title>Region</title>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
......
import("system.vars");
import("system.neon");
import("system.result");
var fieldState;
//requested change: since it's difficult to the user how to fill the REGION of an address it's only displayed in viewmode and hidden in edit mode
//This results in the behaviour that a stored region can never be edited by the user by design
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
fieldState = neon.COMPONENTSTATE_INVISIBLE;
else
fieldState = neon.COMPONENTSTATE_AUTO;
result.string(fieldState);
\ No newline at end of file
......@@ -27,14 +27,6 @@
<width v="100" />
<expandRatio v="100" />
</neonTableColumn>
<neonTableColumn>
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>e809ff52-e8f7-443a-bf34-7e36daa2de42</name>
<entityField>Zip_ws</entityField>
......@@ -63,6 +55,14 @@
<name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
<entityField>BUILDINGNO</entityField>
</neonTableColumn>
<neonTableColumn>
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>6e369a01-965f-41d9-9b0a-6128a3827e47</name>
<entityField>ADDRESSADDITION</entityField>
......
......@@ -26,14 +26,6 @@
<entityField>AddressSearch</entityField>
<width v="100" />
</neonTableColumn>
<neonTableColumn>
<name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b9379fcc-3212-488b-8f90-cade09c00f3c</name>
<entityField>Zip_ws</entityField>
......@@ -63,6 +55,14 @@
<name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
<entityField>BUILDINGNO</entityField>
</neonTableColumn>
<neonTableColumn>
<name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>37df9198-cb7b-4080-a040-21ed32e26948</name>
<entityField>ADDRESSADDITION</entityField>
......
......@@ -25,14 +25,6 @@
<entityField>AddressSearch</entityField>
<width v="100" />
</neonTableColumn>
<neonTableColumn>
<name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b9379fcc-3212-488b-8f90-cade09c00f3c</name>
<entityField>Zip_ws</entityField>
......@@ -62,6 +54,14 @@
<name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
<entityField>BUILDINGNO</entityField>
</neonTableColumn>
<neonTableColumn>
<name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
<entityField>STATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
<entityField>REGION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>37df9198-cb7b-4080-a040-21ed32e26948</name>
<entityField>ADDRESSADDITION</entityField>
......
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