Merge branch 'documentmanagement' of gitlab.adito.de:xrm/basic into documentmanagement

# Conflicts:
#	entity/DocumentTemplate_entity/DocumentTemplate_entity.aod

entity/DocumentTemplate_entity/DocumentTemplate_entity.aod

@@ -37,6 +37,7 @@
       <consumer>KeywordDocumentTemplateType</consumer>
       <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>USER_EDIT</name>
@@ -143,6 +144,20 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>htmlText</name>
+      <title>HTML</title>
+      <contentType>HTML</contentType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>texText</name>
+      <title>Text</title>
+      <contentType>LONG_TEXT</contentType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js

+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "")
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file

entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js

+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "")
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file

entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js

 import("system.vars");
 import("system.db");
+import("system.util");
 import("Document_lib");
 
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+//TODO - Function
+
+var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+var filename = "";
+var bindata = "";
 
 if(bindata != "")
 {
-    db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$field.DOCUMENTTEMPLATEID"), "", 
-                                bindata, DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA")), 
-                                "", "", "_____SYSTEMALIAS");
+    filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
+    bindata  = bindataUpload;
+}
+else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
+{
+    filename = vars.get("$field.NAME") + ".html";
+    bindata  = util.encodeBase64String(vars.get("$field.htmlText"));
+}
+else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
+{
+    filename = vars.get("$field.NAME") + ".txt";
+    bindata  = util.encodeBase64String(vars.get("$field.texText"));
+}
+
+if(bindata != "" && filename != "")
+{
+    db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$field.DOCUMENTTEMPLATEID"), 
+                    "", bindata, filename, "", "", "_____SYSTEMALIAS");
 }
\ No newline at end of file

entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js

+import("system.util");
 import("system.vars");
 import("system.db");
 import("Document_lib");
 
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+//TODO - Function
 
-if(bindata != "")
+var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+var filename      = "";
+var bindata       = "";
+
+if(bindataUpload != "")
+{
+    bindata = bindataUpload;
+    filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
+}
+else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
+{
+    filename = vars.get("$field.NAME") + ".html";
+    bindata  = util.encodeBase64String(vars.get("$field.htmlText"));
+}
+else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
+{
+    filename = vars.get("$field.NAME") + ".txt";
+    bindata  = util.encodeBase64String(vars.get("$field.texText"));
+}
+
+if(bindata != "" && filename != "")
 {
-    var bId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
-    db.updateBinary(bId, "", bindata, DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA")), "", "", "_____SYSTEMALIAS");
+    var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+    db.updateBinary(binaryId, "", bindata, filename, "", "", "_____SYSTEMALIAS");
 }
\ No newline at end of file

neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod

@@ -33,6 +33,14 @@
           <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
+          <entityField>htmlText</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
+          <entityField>texText</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>0fed8c5c-1be5-4599-938d-31241c4c9395</name>
           <entityField>DESCRIPTION</entityField>