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

refactor all booleans to tinyint

parent 77060aa5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 66 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 19
− 19
View file @ c5ff9a90
......@@ -140,8 +140,8 @@
<name>TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -266,8 +266,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1195,10 +1195,10 @@
<name>STANDARD</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......@@ -1656,10 +1656,10 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="1" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......@@ -1669,10 +1669,10 @@
<name>TAKEPRICE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="1" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......@@ -2164,10 +2164,10 @@
<name>IN_OUT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......@@ -2777,10 +2777,10 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......
entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js
+ 2
− 2
View file @ c5ff9a90
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["0", translate.text("Yes")]
,["1", translate.text("No")]
[1, translate.text("Yes")]
,[0, translate.text("No")]
]);
\ No newline at end of file
entity/Offeritem_entity/entityfields/optional/valueProcess.js
+ 1
− 1
View file @ c5ff9a90
......@@ -3,4 +3,4 @@ import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string("1");
\ No newline at end of file
result.string("0");
\ No newline at end of file
entity/Prod2prod_entity/Prod2prod_entity.aod
+ 1
− 0
View file @ c5ff9a90
......@@ -101,6 +101,7 @@
<contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<isPageable v="false" />
<isSortable v="false" />
<rowCountProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/rowCountProcess.js</rowCountProcess>
<onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
......
entity/Prod2prod_entity/entityfields/optional/possibleItemsProcess.js
+ 2
− 2
View file @ c5ff9a90
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["0", translate.text("Yes")]
,["1", translate.text("No")]
[1, translate.text("Yes")]
,[0, translate.text("No")]
]);
\ No newline at end of file
entity/Prod2prod_entity/entityfields/optional/valueProcess.js
+ 1
− 1
View file @ c5ff9a90
......@@ -3,4 +3,4 @@
//import("system.neon");
//
//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
// result.string("1");
\ No newline at end of file
// result.string("0");
\ No newline at end of file
entity/Prod2prod_entity/entityfields/takeprice/possibleItemsProcess.js
+ 2
− 2
View file @ c5ff9a90
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["Y", translate.text("Yes")]
,["N", translate.text("No")]
[1, translate.text("Yes")]
,[0, translate.text("No")]
]);
\ No newline at end of file
entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+ 0
− 1
View file @ c5ff9a90
......@@ -10,6 +10,5 @@ var prodid = vars.exists("$param.ProductId_param")
if(prodid != "")
{
var p2pUtils = new Prod2ProdUtils(prodid);
logging.log(p2pUtils.getPartsListForRecordContainer().toSource())
result.object(p2pUtils.getPartsListForRecordContainer());
}
\ No newline at end of file
entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
+ 4
− 2
View file @ c5ff9a90
import("system.vars");
import("system.db");
import("Sql_lib");
db.deleteData("PROD2PROD", "PROD2PRODID = '" + vars.get("$field.UID") + "'");
\ No newline at end of file
db.deleteData("PROD2PROD", SqlCondition.begin()
.andPrepareVars("PROD2PROD.PROD2PRODID", "$field.UID", "# = ?")
.build("1 = 0"));
\ No newline at end of file
entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js
+ 1
− 3
View file @ c5ff9a90
......@@ -20,6 +20,4 @@ var vals = [ vars.get("$field.UID")
, vars.get("$field.DATE_NEW")
, vars.get("$field.USER_NEW") ];
var colTypes = db.getColumnTypes("PROD2PROD", cols);
db.insertData("PROD2PROD", cols, colTypes, vals);
\ No newline at end of file
db.insertData("PROD2PROD", cols, null, vals);
\ No newline at end of file
entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
+ 8
− 2
View file @ c5ff9a90
import("system.datetime");
import("system.vars");
import("system.db");
imp
var cols = [ "DEST_ID"
, "SOURCE_ID"
......@@ -18,6 +19,11 @@ var vals = [ vars.get("$field.DEST_ID")
, vars.get("$field.DATE_EDIT")
, vars.get("$field.USER_EDIT") ];
var colTypes = db.getColumnTypes("PROD2PROD", cols);
db.updateData("PROD2PROD", cols, colTypes, vals, "PROD2PRODID = '" + vars.get("$field.UID") + "'");
\ No newline at end of file
db.updateData("PROD2PROD",
cols,
null,
vals,
SqlCondition.begin()
.andPrepareVars("PROD2PROD.PROD2PRODID", "$field.UID", "# = ?")
.build("1 = 0"));
\ No newline at end of file
entity/Prod2prod_entity/recordcontainers/jdito/rowCountProcess.js 0 → 100644
+ 0
− 0
View file @ c5ff9a90
entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js
+ 1
− 1
View file @ c5ff9a90
......@@ -3,5 +3,5 @@ import("system.translate");
result.object([
["1", translate.text("IN")],
["-1", translate.text("OUT")]
["0", translate.text("OUT")]
]);
\ No newline at end of file
entity/Stock_entity/recordcontainers/db/conditionProcess.js
+ 3
− 4
View file @ c5ff9a90
import("system.result");
import("system.vars");
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
result.string("STOCK.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
result.string(SqlCondition.begin()
.andPrepareVars("STOCK.PRODUCT_ID", "$param.ProductId_param")
.build("1 = 0"));
\ No newline at end of file
others/db_changes/data/example_offer/OFFER_1000.xml
+ 8
− 8
View file @ c5ff9a90
......@@ -12,7 +12,7 @@
<column name="PROBABILITY" valueNumeric="5"/>
<column name="NET" valueNumeric="210.00"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="CURRENCY" valueNumeric="1"/>
<column name="CURRENCY" valueNumeric="0"/>
<column name="LANGUAGE" value="de-DE"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:11:19"/>
......@@ -29,7 +29,7 @@
<column name="PRODUCT_ID" value="P101 "/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/>
......@@ -45,7 +45,7 @@
<column name="ITEMSORT" valueNumeric="2"/>
<column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
<column name="ITEMNAME" value="AX47"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:29"/>
......@@ -61,7 +61,7 @@
<column name="ITEMSORT" valueNumeric="3"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="ITEMNAME" value="Produktname4.1"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:35"/>
......@@ -77,7 +77,7 @@
<column name="ITEMSORT" valueNumeric="4"/>
<column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
<column name="ITEMNAME" value="Sonderrabatt"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.1.1.1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:38"/>
......@@ -93,7 +93,7 @@
<column name="ITEMSORT" valueNumeric="5"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="ITEMNAME" value="Produktname4.2a"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:48"/>
......@@ -109,7 +109,7 @@
<column name="ITEMSORT" valueNumeric="6"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="ITEMNAME" value="Produktname1.1"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.2"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:51"/>
......@@ -125,7 +125,7 @@
<column name="ITEMSORT" valueNumeric="7"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1.3"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:55"/>
......
others/db_changes/data/example_offer/OFFER_1001.xml
+ 1
− 1
View file @ c5ff9a90
......@@ -29,7 +29,7 @@
<column name="PRODUCT_ID" value="P101 "/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/>
......
others/db_changes/data/example_offer/OFFER_1002.xml
+ 1
− 1
View file @ c5ff9a90
......@@ -29,7 +29,7 @@
<column name="PRODUCT_ID" value="P101 "/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/>
......
others/db_changes/data/example_offer/OFFER_1003.xml
+ 1
− 1
View file @ c5ff9a90
......@@ -29,7 +29,7 @@
<column name="PRODUCT_ID" value="P101 "/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/>
......
others/db_changes/data/example_offer/OFFER_1004.xml
+ 1
− 1
View file @ c5ff9a90
......@@ -29,7 +29,7 @@
<column name="PRODUCT_ID" value="P101 "/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="1"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/>
......
others/db_changes/data/example_product/PRODUCT_42154311.xml
+ 14
− 14
View file @ c5ff9a90
......@@ -88,8 +88,8 @@
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="c5288f96-41f0-4b9b-b79f-23da12ad485b"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="N"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="0"/>
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SOURCE_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
<column name="DEST_ID" value="P101 "/>
......@@ -98,8 +98,8 @@
</insert>
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="f78cf164-3a9d-43a6-a58c-9f462e5ed012"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="Y"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="1"/>
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SOURCE_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="DEST_ID" value="P101 "/>
......@@ -108,8 +108,8 @@
</insert>
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="cbd0699d-947c-4f6c-8c43-e9dcea72447a"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="Y"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="1"/>
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SOURCE_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="DEST_ID" value="P101 "/>
......@@ -118,8 +118,8 @@
</insert>
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="aefd0be1-325d-42f7-9b79-1bab24e7ae23"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="Y"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="1"/>
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SOURCE_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="DEST_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
......@@ -128,8 +128,8 @@
</insert>
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="e413c0f8-c953-4380-ad2e-b9c04411baad"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="N"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="0"/>
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SOURCE_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="DEST_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
......@@ -138,8 +138,8 @@
</insert>
<insert tableName="PROD2PROD">
<column name="PROD2PRODID" value="cb43c351-38dc-4b1e-b408-2d9afcfdbb13"/>
<column name="OPTIONAL" value="1"/>
<column name="TAKEPRICE" value="N"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="TAKEPRICE" valueNumeric="0"/>
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SOURCE_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
<column name="DEST_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
......@@ -254,7 +254,7 @@
</insert>
<insert tableName="STOCK">
<column name="STOCKID" value="bd4c1a16-1b80-4b3e-aa67-306f387a62df"/>
<column name="IN_OUT" valueNumeric="-1"/>
<column name="IN_OUT" valueNumeric="0"/>
<column name="QUANTITY" valueNumeric="23"/>
<column name="PRODUCT_ID" value="P101 "/>
<column name="ENTRYDATE" valueDate="2018-11-22T00:00:00"/>
......@@ -264,7 +264,7 @@
</insert>
<insert tableName="STOCK">
<column name="STOCKID" value="3caba278-9d38-485c-9d78-11ea969b832c"/>
<column name="IN_OUT" valueNumeric="-1"/>
<column name="IN_OUT" valueNumeric="0"/>
<column name="QUANTITY" valueNumeric="17"/>
<column name="PRODUCT_ID" value="P101 "/>
<column name="ENTRYDATE" valueDate="2018-11-15T00:00:00"/>
......
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