Skip to content
Snippets Groups Projects
Commit d2b4e4ad authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'Produktmanagement' 

# Conflicts:
#	aliasDefinition/Data_alias/Data_alias.aod
#	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
#	entity/Org_entity/Org_entity.aod
#	others/db_changes/masterChangelog.xml
#	process/Keyword_lib/process.js
parents 89265954 7ed01ef7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
neonView/ProductPreview_view/ProductPreview_view.aod 0 → 100644
+ 61
− 0
View file @ d2b4e4ad
<?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>ProductPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>ProductHeader_template</name>
<titleField>PRODUCTCODE</titleField>
<descriptionField>GROUPCODEID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>ProductInfo_template</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>00594c0e-6641-4f6d-9717-1eee2678ad5d</name>
<entityField>PRODUCTNAME</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7074979a-a2fc-4a57-98ad-3d8e98fde37a</name>
<entityField>ORG_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a5a3ecee-059d-4bf2-9654-abe3efd58510</name>
<entityField>UNIT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>abef7fe5-88f6-44fe-af91-38487eb9b750</name>
<entityField>ADVERTISING</entityField>
</entityFieldLink>
<entityFieldLink>
<name>505cc05b-0497-4baa-81cb-294ec6e1a133</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ba604dc5-06b2-44f2-a9b3-c4c3adb9f8f8</name>
<entityField>MINSTOCK</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3802b031-10fc-4694-8e06-71d0033ae351</name>
<entityField>STOCKCOUNT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>bcf1cada-cb5b-4012-85d1-544eabc5b86d</name>
<entityField>currentPurchasePrice</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4ef15389-761a-40e6-8774-f7145ace5c12</name>
<entityField>currentSalesPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
others/db_changes/masterChangelog.xml
+ 1
− 0
View file @ d2b4e4ad
......@@ -9,6 +9,7 @@
<include file="struct/create_address.xml"/>
<include file="struct/create_comm.xml"/>
<include file="struct/create_contract.xml"/>
<include file="struct/create_product.xml"/>
<include file="misc/1535533490181_persChanges.xml"/>
<include file="struct/1535612802325_addressChange.xml"/>
<include file="data/example_org/ORG_privat.xml"/>
......
others/db_changes/struct/create_prod2prod.xml 0 → 100644
+ 24
− 0
View file @ d2b4e4ad
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.schroeger" id="22a186c2-3eca-432e-b006-c179470b1732">
<createTable tableName="PROD2PROD">
<column name="PROD2PRODID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_PRODUCT_PRODUCTID"/>
</column>
<column name="OPTIONAL" type="CHAR(1)"/>
<column name="TAKEPRICE" type="CHAR(1)"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="SOURCE_ID" type="CHAR(36)"/>
<column name="DEST_ID" type="CHAR(36)"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="VARCHAR(50)"/>
<column name="USER_NEW" type="VARCHAR(50)">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/struct/create_product.xml 0 → 100644
+ 27
− 0
View file @ d2b4e4ad
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.schroeger" id="40ad5330-2163-400c-8fa7-d0d2461774b7">
<createTable tableName="PRODUCT">
<column name="PRODUCTID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_PRODUCT_PRODUCTID"/>
</column>
<column name="ADVERTISING" type="CHAR(1)"/>
<column name="GROUPCODEID" type="INTEGER"/>
<column name="MINSTOCK" type="NUMERIC(14,2)"/>
<column name="ORG_ID" type="CHAR(36)"/>
<column name="PRODUCTCODE" type="VARCHAR(50)"/>
<column name="PRODUCTNAME" type="VARCHAR(50)"/>
<column name="STATUS" type="INTEGER"/>
<column name="UNIT" type="INTEGER"/>
<column name="STANDARD" type="INTEGER"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="VARCHAR(50)"/>
<column name="USER_NEW" type="VARCHAR(50)">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
process/Keyword_lib/process.js
+ 24
− 6
View file @ d2b4e4ad
......@@ -130,18 +130,36 @@ function KeywordUtils(){
break;
case "CONTRACT.CONTRACTSTATUS":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("0", translate.text("gültig, unbefristet"))
,createKeywordEntry("1", translate.text("gültig, befristet"))
createKeywordEntry("0", translate.text("gltig, unbefristet"))
,createKeywordEntry("1", translate.text("gltig, befristet"))
,createKeywordEntry("2", translate.text("noch nicht unterschrieben"))
,createKeywordEntry("3", translate.text("keiner, Einzelberechnung"))
,createKeywordEntry("4", translate.text("gekündigt"))
,createKeywordEntry("4", translate.text("gekndigt"))
]);
break;
case "CONTRACT.PAYMENT":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("0", translate.text("jährlich"))
,createKeywordEntry("1", translate.text("halbjährlich"))
,createKeywordEntry("2", translate.text("vierteljährlich"))
createKeywordEntry("0", translate.text("jhrlich"))
,createKeywordEntry("1", translate.text("halbjhrlich"))
,createKeywordEntry("2", translate.text("vierteljhrlich"))
]);
break;
case "GROUPCODE":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Warengruppe 1"))
,createKeywordEntry("2", translate.text("Warengruppe 2"))
,createKeywordEntry("3", translate.text("Warengruppe 3"))
,createKeywordEntry("4", translate.text("Rabatt"))
,createKeywordEntry("5", translate.text("Ersatzteile"))
,createKeywordEntry("6", translate.text("Dienstleistung"))
]);
break;
case "UNIT":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Stck"))
,createKeywordEntry("2", translate.text("Kg"))
,createKeywordEntry("3", translate.text("Liter"))
,createKeywordEntry("4", translate.text("Stunden"))
]);
break;
default:
......
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