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

offer refactoring

parent b4856ea4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 167 additions and 127 deletions
entity/Offer_entity/Offer_entity.aod
+ 4
− 2
View file @ 4427ceeb
......@@ -681,7 +681,8 @@
</children>
</entityConsumer>
<entityField>
<name>chooseTEXHeader</name>
<name>ChoosenTEXHeader</name>
<title>Choose Header</title>
<consumer>DocumentTemplateTex</consumer>
</entityField>
<entityConsumer>
......@@ -731,7 +732,8 @@
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>chooseTEXFooter</name>
<name>ChoosenTEXFooter</name>
<title>Choose Footer</title>
<consumer>DocumentTemplateTex</consumer>
</entityField>
</entityFields>
......
entity/Offer_entity/entityfields/footer/valueProcess.js
+ 19
− 19
View file @ 4427ceeb
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param"))
result.string(vars.get("$param.OfferFooter_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Vielen Dank!")
if (vars.get("$field.chooseTEXFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.chooseTEXFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param"))
result.string(vars.get("$param.OfferFooter_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Vielen Dank!")
if (vars.get("$field.ChoosenTEXFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChoosenTEXFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
\ No newline at end of file
entity/Offer_entity/entityfields/header/valueProcess.js
+ 19
− 19
View file @ 4427ceeb
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
result.string(vars.get("$param.OfferHeader_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:")
if (vars.get("$field.chooseTEXHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.chooseTEXHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
result.string(vars.get("$param.OfferHeader_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:")
if (vars.get("$field.ChoosenTEXHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChoosenTEXHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 12
− 0
View file @ 4427ceeb
......@@ -3933,6 +3933,18 @@
<entry>
<key>2. Classification</key>
</entry>
<entry>
<key>Choose Footer</key>
</entry>
<entry>
<key>Choose Header</key>
</entry>
<entry>
<key>#0</key>
</entry>
<entry>
<key>Email Template</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 14
− 0
View file @ 4427ceeb
......@@ -4887,6 +4887,20 @@
<key>2. Classification</key>
<value>2. Klassifizierung</value>
</entry>
<entry>
<key>Choose Footer</key>
<value>Footer auswählen</value>
</entry>
<entry>
<key>Choose Header</key>
<value>Header auswählen</value>
</entry>
<entry>
<key>#0</key>
</entry>
<entry>
<key>Email Template</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 12
− 0
View file @ 4427ceeb
......@@ -3985,6 +3985,18 @@
<entry>
<key>2. Classification</key>
</entry>
<entry>
<key>Choose Footer</key>
</entry>
<entry>
<key>Choose Header</key>
</entry>
<entry>
<key>#0</key>
</entry>
<entry>
<key>Email Template</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
neonView/OfferEdit_view/OfferEdit_view.aod
+ 87
− 87
View file @ 4427ceeb
<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferEdit_view</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:CART</icon>
<quickEntry v="2" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
<entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
<entityField>CURRENCY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce72d9f3-66ce-4a5e-a5af-c3a82520141d</name>
<entityField>PROBABILITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7a9b0943-eb06-4b44-a111-ed4e2749da6a</name>
<entityField>DELIVERYTERMS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>1e98fe37-8d52-4eef-8825-8ea14e7e20b5</name>
<entityField>PAYMENTTERMS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>45ddf7c2-531b-4e18-826d-9c652ecc4d01</name>
<entityField>INFO</entityField>
</entityFieldLink>
<entityFieldLink>
<name>6005aedd-bbfb-452f-bdc8-3b99247022d9</name>
<entityField>chooseTEXHeader</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
<entityField>HEADER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9954516a-3fc3-48b5-8fe9-9dfc74f021e8</name>
<entityField>FOOTER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>833e6193-fde6-4990-8a26-eaeb0f60de48</name>
<entityField>ChosenAddress</entityField>
</entityFieldLink>
<entityFieldLink>
<name>930dc6e3-a19f-4780-9553-9cfd4a158fd5</name>
<entityField>ADDRESS</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>52f93604-4ec3-427f-b220-27ab63a30560</name>
<entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferEdit_view</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:CART</icon>
<quickEntry v="2" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
<entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
<entityField>CURRENCY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce72d9f3-66ce-4a5e-a5af-c3a82520141d</name>
<entityField>PROBABILITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7a9b0943-eb06-4b44-a111-ed4e2749da6a</name>
<entityField>DELIVERYTERMS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>1e98fe37-8d52-4eef-8825-8ea14e7e20b5</name>
<entityField>PAYMENTTERMS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>45ddf7c2-531b-4e18-826d-9c652ecc4d01</name>
<entityField>INFO</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5a864380-5c23-45a3-8fb8-88a2d2abdf04</name>
<entityField>ChoosenTEXHeader</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
<entityField>HEADER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9954516a-3fc3-48b5-8fe9-9dfc74f021e8</name>
<entityField>FOOTER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>833e6193-fde6-4990-8a26-eaeb0f60de48</name>
<entityField>ChosenAddress</entityField>
</entityFieldLink>
<entityFieldLink>
<name>930dc6e3-a19f-4780-9553-9cfd4a158fd5</name>
<entityField>ADDRESS</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>52f93604-4ec3-427f-b220-27ab63a30560</name>
<entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
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