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

[Projekt: Entwicklung - Neon][TicketNr.: 1029618][Neuanlage funktioniert nicht] 

[Projekt: Entwicklung - Neon][TicketNr.: 1029623][Neuanlage]
parent 1d9cca28
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 92 additions and 42 deletions
entity/Offeritem_entity/onDBInsert.js
+ 3
− 1
View file @ ff309303
......@@ -5,10 +5,12 @@ import("system.db");
import("system.util");
import("OfferOrder_lib");
import("Product_lib");
logging.log("INSEEEERRTTTTT")
var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
logging.log("INSEEEERRTTTTT222222")
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
......
entity/Org_entity/Org_entity.aod
+ 25
− 29
View file @ ff309303
......@@ -45,7 +45,6 @@
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
......@@ -82,7 +81,6 @@
<name>ORG_USER_NEW</name>
<tableName>ORG</tableName>
<columnName>USER_NEW</columnName>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
......@@ -99,7 +97,6 @@
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
......@@ -140,7 +137,6 @@
<name>REL_USER_NEW</name>
<tableName>RELATION</tableName>
<columnName>USER_NEW</columnName>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
......@@ -457,58 +453,58 @@
<name>NAME.value</name>
<value>ORG.NAME</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
<value>ORG.TYPE</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGID.value</name>
<value>ORG.ORGID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
<value>RELATION.STATUS</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_DATE_EDIT.value</name>
<value>ORG.DATE_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_USER_NEW.value</name>
<value>ORG.USER_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_DATE_NEW.value</name>
<value>ORG.DATE_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_USER_EDIT.value</name>
<name>ORGID.value</name>
<value>ORG.ORGID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_USER_EDIT.value</name>
<value>ORG.USER_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_USER_NEW.value</name>
<value>ORG.USER_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_ID.value</name>
<value>RELATION.ORG_ID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_DATE_NEW.value</name>
<value>RELATION.DATE_NEW</value>
<name>REL_DATE_EDIT.value</name>
<value>RELATION.DATE_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_USER_EDIT.value</name>
<value>ORG.USER_EDIT</value>
<name>REL_DATE_NEW.value</name>
<value>RELATION.DATE_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_DATE_EDIT.value</name>
<value>RELATION.DATE_EDIT</value>
<name>REL_USER_EDIT.value</name>
<value>RELATION.USER_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_USER_NEW.value</name>
<value>ORG.USER_NEW</value>
<name>REL_USER_NEW.value</name>
<value>RELATION.USER_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONID.value</name>
<value>RELATION.RELATIONID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
<value>RELATION.STATUS</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
<value>ORG.TYPE</value>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Org_entity/entityfields/rel_user_new/valueProcess.js
+ 4
− 1
View file @ ff309303
import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
logging.log("NOOOOW")
logging.log(vars.get("$sys.operatingstate"))
logging.log(vars.getString("$sys.user"))
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
neonContext/Offeritem_context/Offeritem_context.aod
+ 4
− 0
View file @ ff309303
......@@ -15,5 +15,9 @@
<name>3439b9ca-cc68-47f7-bfae-676280b28cdf</name>
<view>OfferitemPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>440a19f2-4893-47b9-b10c-864540b6287f</name>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/OfferEdit_view/OfferEdit_view.aod
+ 2
− 2
View file @ ff309303
......@@ -56,9 +56,9 @@
</fields>
</genericViewTemplate>
<neonViewReference>
<name>a5e09fc0-5df1-489c-b660-414bd6f64308</name>
<name>a74af385-7088-4168-9e0a-22e4b73dd6fb</name>
<entityField>OfferOfferitem_dfo</entityField>
<view>OfferitemFilter_view</view>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod 0 → 100644
+ 51
− 0
View file @ ff309303
<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OfferitemMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericMultipleViewTemplate>
<name>OfferitemData</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
<entityField>ITEMPOSITION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
<entityField>PRODUCT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
<entityField>QUANTITY</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
<entityField>UNIT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
<entityField>VAT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
</neonView>
others/db_changes/struct/create_offer.xml
+ 1
− 3
View file @ ff309303
......@@ -9,9 +9,7 @@
<constraints nullable="false"/>
</column>
<column name="SALESPROJECT_ID" type="CHAR(36)"/>
<column name="OFFER_ID" type="CHAR(36)">
<constraints foreignKeyName="FK_OFFER_OFFER_ID" references="OFFER(OFFERID)"/>
</column>
<column name="OFFER_ID" type="CHAR(36)"/>
<column name="HEADER" type="NCLOB"/>
<column name="FOOTER" type="NCLOB"/>
<column name="OFFERDATE" type="TIMESTAMP"/>
......
others/db_changes/struct/create_offeritem.xml
+ 1
− 3
View file @ ff309303
......@@ -5,9 +5,7 @@
<column name="OFFERITEMID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_OFFERITEM_OFFERITEMID"/>
</column>
<column name="OFFER_ID" type="CHAR(36)">
<constraints nullable="false" foreignKeyName="FK_OFFERITEM_OFFER_ID" references="OFFER(OFFERID)"/>
</column>
<column name="OFFER_ID" type="CHAR(36)"/>
<column name="UNIT" type="INTEGER"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="INTEGER"/>
......
others/db_changes/struct/create_relation.xml
+ 1
− 3
View file @ ff309303
......@@ -4,9 +4,7 @@
<createTable tableName="RELATION">
<column name="STATUS" type="SMALLINT"/>
<column name="LANGUAGE" type="CHAR(5)"/>
<column name="ORG_ID" type="CHAR(36)">
<constraints nullable="false" foreignKeyName="FK_RELATION_ORG_ID" references="ORG(ORGID)"/>
</column>
<column name="ORG_ID" type="CHAR(36)"/>
<column name="PERS_ID" type="CHAR(36)" />
<column name="RELATIONID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_RELATION_RELATIONID"/>
......
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