[Projekt: Entwicklung - Neon][TicketNr.: 1032314][Attribut-Entity erstellen]

09bce759 · S.Listl · ca2795c0 · 09bce759 · 09bce759 · 09bce759
Commit 09bce759 authored 6 years ago by S.Listl
--- a/entity/Attribute_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/date_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
--- a/entity/Attribute_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/user_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+//if (vars.exists("$field.AB_ATTRIBUTEID") && vars.get("$field.AB_ATTRIBUTEID") != "")
+//    result.string(SqlCondition.begin().andPrepare("ATTRIBUTE_PARENT_ID", vars.get("$field.AB_ATTRIBUTEID")));
\ No newline at end of file
--- a/entity/Comm_entity/entityfields/medium_id/valueProcess.js
+++ b/entity/Comm_entity/entityfields/medium_id/valueProcess.js
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -456,6 +456,23 @@
      <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
      <iconId>VAADIN:FILE_TEXT_O</iconId>
    </entityActionField>
+    <entityOutgoingField>
+      <name>OrgAttr_dfo</name>
+      <title>Attributes</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>OrgAttr_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>objectRowId</name>
+          <code>%aditoprj%/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid/code.js</code>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>

--- a/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid/code.js
+++ b/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid/code.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ORGID"));
\ No newline at end of file
--- a/entity/Org_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Org_entity/recordcontainers/db/onDBUpdate.js
@@ -3,7 +3,7 @@ import("Org_lib");
 import("Comm_lib");
 import("Entity_lib");

-// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Container
 FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
    if (state == FieldChanges.STATE_CHANGED())
        OrgUtils.setImage(vars.get("$field.ORGID"), value);

--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1458,6 +1458,9 @@
    <entry>
      <key>responsible</key>
    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+    </entry>
  </keyValueMap>
  <font name="Dialog" style="0" size="11" />
  <sqlModels>

--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -34,6 +34,10 @@
      <key>Show all activities</key>
      <value>Alle Aktivitäten anzeigen</value>
    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+      <value>Staat</value>
+    </entry>
    <entry>
      <key>Show all contracts</key>
      <value>Alle Verträge anzeigen</value>

--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1487,6 +1487,10 @@
    <entry>
      <key>responsible</key>
    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+      <value>state</value>
+    </entry>
  </keyValueMap>
  <font name="Dialog" style="0" size="11" />
 </language>
--- a/neonContext/AttributeRelation_context/AttributeRelation_context.aod
+++ b/neonContext/AttributeRelation_context/AttributeRelation_context.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>AttributeRelation_context</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterview>AttributeRelationTree_view</filterview>
+  <editview>AttributeRelationMultiEdit_view</editview>
+  <entity>AttributeRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>52dd8729-c22d-4767-b491-1e8c9d157ddb</name>
+      <view>AttributeRelationMultiEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
--- a/neonContext/Attribute_context/Attribute_context.aod
+++ b/neonContext/Attribute_context/Attribute_context.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>Attribute_context</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TAGS</icon>
+  <mainview>AttributeMain_view</mainview>
+  <filterview>AttributeFilter_view</filterview>
+  <editview>AttributeEdit_view</editview>
+  <preview>AttributePreview_view</preview>
+  <entity>Attribute_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>058f2577-b598-4d92-90ad-628342302a9c</name>
+      <view>AttributeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>96bf484d-dc8d-42ad-9242-dfefacc87956</name>
+      <view>AttributePreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>59089acc-a6db-48c2-8061-2d3ca8246e37</name>
+      <view>AttributeEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>05d998e7-7364-4425-aefe-3cf284933d52</name>
+      <view>AttributeMain_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -21,6 +21,10 @@
          <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
          <entityField>COUNTRY</entityField>
        </entityFieldLink>
+        <entityFieldLink>
+          <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
        <entityFieldLink>
          <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
          <entityField>ADDRESS</entityField>

--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -37,6 +37,10 @@
          <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
          <entityField>COUNTRY</entityField>
        </neonTableColumn>
+        <neonTableColumn>
+          <name>9a965a25-a8aa-4777-865e-138624f2d848</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
      </columns>
    </tableViewTemplate>
  </children>

--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -22,6 +22,10 @@
          <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
          <entityField>COUNTRY</entityField>
        </neonTableColumn>
+        <neonTableColumn>
+          <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
        <neonTableColumn>
          <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
          <entityField>ADDRESS</entityField>

--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -36,6 +36,10 @@
          <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
          <entityField>COUNTRY</entityField>
        </neonTableColumn>
+        <neonTableColumn>
+          <name>945bd8e7-9d0d-4e32-8908-24d8dfb74463</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
      </columns>
    </genericMultipleViewTemplate>
  </children>

--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>AttrEdit_template</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>0c6cd7c6-cced-4719-b0c5-08f8e3d13f2f</name>
+          <entityField>ATTRIBUTE_NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8cbc6049-2530-4960-b45f-830f3220889e</name>
+          <entityField>ATTRIBUTE_TYPE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeFilter_view</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table_template</name>
+      <entityField>#ENTITY</entityField>
+      <title>Attributes</title>
+      <columns>
+        <neonTableColumn>
+          <name>a8065137-406d-49ea-9ebf-a04fbecba2fb</name>
+          <entityField>ATTRIBUTE_NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>054d2c18-8434-4a47-bc0d-c8782f4d1a8f</name>
+          <entityField>ATTRIBUTE_TYPE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
--- a/neonView/AttributeMain_view/AttributeMain_view.aod
+++ b/neonView/AttributeMain_view/AttributeMain_view.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</name>
+      <entityField>#ENTITY</entityField>
+      <view>AttributePreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d8009eea-f473-4f65-8796-a1ab48ef3b49</name>
+      <entityField>#ENTITY</entityField>
+      <view>AttributeFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Attr_template</name>
+      <titleField>ATTRIBUTE_NAME</titleField>
+      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+  </children>
+</neonView>