Skip to content
Snippets Groups Projects
Commit 87941cb8 authored by S.Listl's avatar S.Listl
Browse files

DocumentTemplate refactoring

parent 8a10f1c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 84 additions and 97 deletions
entity/Activity_entity/entityfields/bindata/onValueChange.js
+ 3
− 5
View file @ 87941cb8
......@@ -4,11 +4,9 @@ import("MimeType_lib");
import("Document_lib");
import("system.vars");
var upload = vars.get("$local.value");
var mimeType = DocumentUtil.getMimeTypeFromUpload(upload);
if (mimeType == MimeTypes.ODT() || mimeType == MimeTypes.DOCX())
var upload = new FileUpload(vars.get("$local.value"));
if (upload.mimeType == MimeTypes.ODT() || upload.mimeType == MimeTypes.DOCX())
{
var bindata = DocumentUtil.getBindataFromUpload(upload);
var content = text.parseDocument(bindata);
var content = text.parseDocument(upload.bindata);
neon.setFieldValue("$field.INFO", content.trim());
}
entity/Activity_entity/recordcontainers/db/onDBInsert.js
+ 4
− 4
View file @ 87941cb8
......@@ -3,12 +3,12 @@ import("ActivityTask_lib");
import("system.vars");
import("system.db");
var bindata = vars.get("$field.bindata");
if (bindata)
var upload = new FileUpload(vars.get("$field.bindata"));
if (upload.isFilled())
{
documents = [
DocumentUtil.getFilenameFromUpload(bindata),
DocumentUtil.getBindataFromUpload(bindata),
upload.filename,
upload.bindata,
false
];
}
......
entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
+ 3
− 4
View file @ 87941cb8
......@@ -4,12 +4,11 @@ import("Document_lib");
import("system.vars");
import("DocumentTemplate_lib");
var upload = vars.get("$field.bindata");
var mimeType = DocumentUtil.getMimeTypeFromUpload(vars.get("$field.bindata"));
var type;
if (upload)
if (mimeType)
{
type = DocumentUtil.getMimeTypeFromUpload(upload);
type = DocumentTemplate.types.fromMimeType(type);
type = DocumentTemplate.types.fromMimeType(mimeType);
}
else
{
......
entity/BulkMail_entity/entityfields/content/valueProcess.js
+ 1
− 1
View file @ 87941cb8
......@@ -8,7 +8,7 @@ import("Bulkmail_lib");
if (vars.get("$this.value") == null && vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
{
var upload = vars.get("$field.bindata");
var upload = new FileUpload(vars.get("$field.bindata"));
var template;
if (upload)
template = DocumentTemplate.fromUpload(upload);
......
entity/BulkMail_entity/entityfields/subject/valueProcess.js
+ 3
− 8
View file @ 87941cb8
......@@ -7,12 +7,7 @@ import("system.vars");
if (vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var upload = vars.get("$field.bindata");
if (upload)
{
var binData = DocumentUtil.getBindataFromUpload(upload);
var type = DocumentUtil.getMimeTypeFromUpload(upload);
if (DocumentTemplate.types.fromMimeType(type) == DocumentTemplate.types.EML)
result.string(Email.fromRFC(binData).subject);
}
var upload = new FileUpload(vars.get("$field.bindata"));
if (upload.isFilled() && DocumentTemplate.types.fromMimeType(upload.mimeType) == DocumentTemplate.types.EML)
result.string(Email.fromRFC(upload.bindata).subject);
}
\ No newline at end of file
entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 87941cb8
......@@ -14,7 +14,7 @@ var bulkMailId = rowdata["BULKMAIL.BULKMAILID"];
var templateId = rowdata["BULKMAIL.DOCUMENTTEMPLATE_ID"];
var bulkMailName = rowdata["BULKMAIL.NAME"];
var template = DocumentTemplate.getSelectedTemplate(templateId, bindata, content, DocumentTemplate.types.HTML);
var template = DocumentTemplate.getSelectedTemplate(templateId, new FileUpload(bindata), content, DocumentTemplate.types.HTML);
if (template.content)
{
......
entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
+ 1
− 1
View file @ 87941cb8
......@@ -14,7 +14,7 @@ var bulkMailId = rowdata["BULKMAIL.BULKMAILID"];
var templateId = rowdata["BULKMAIL.DOCUMENTTEMPLATE_ID"];
var bulkMailName = rowdata["BULKMAIL.NAME"];
var template = DocumentTemplate.getSelectedTemplate(templateId, bindata, content, DocumentTemplate.types.HTML);
var template = DocumentTemplate.getSelectedTemplate(templateId, new FileUpload(bindata), content, DocumentTemplate.types.HTML);
if (template.content)
{
......
entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
+ 3
− 2
View file @ 87941cb8
import("MimeType_lib");
import("Document_lib");
import("system.neon");
import("system.result");
......@@ -5,9 +6,9 @@ import("system.vars");
if(vars.get("$field.KIND").trim() == "TEX" && vars.get("$field.BINDATA") == "")
{
var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
var mimeType = DocumentUtil.getMimeTypeFromUpload(vars.get("$field.NAME"));
if(fileExtension == "txt" || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
if (mimeType == MimeTypes.TXT() || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
......
entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
+ 3
− 2
View file @ 87941cb8
import("MimeType_lib");
import("Sql_lib");
import("Document_lib");
import("system.util");
......@@ -8,9 +9,9 @@ import("system.vars");
if(vars.get("$field.KIND").trim() == "TEX" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
{
var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
var mimeType = DocumentUtil.getMimeTypeFromUpload(vars.get("$field.NAME"));
if(fileExtension == "txt")
if (mimeType == MimeTypes.TXT())
{
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATEID")
......
entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
+ 1
− 1
View file @ 87941cb8
......@@ -2,7 +2,7 @@ import("Sql_lib");
import("system.vars");
import("system.db");
var binaryId = db.cell(SqlCondition.begin()
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATEID")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getSystemAlias());
......
entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+ 4
− 25
View file @ 87941cb8
import("system.result");
import("DocumentTemplate_lib");
import("system.vars");
import("system.db");
import("system.util");
import("Document_lib");
import("Sql_lib");
//TODO - Function
var rowdata = vars.get("$local.rowdata");
var upload = new FileUpload(vars.get("$field.BINDATA"));
var rowId = vars.get("$local.uid");
var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
var filename = "";
var bindata = "";
if(bindataUpload != "")
{
filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
bindata = bindataUpload;
}
else if(rowdata["DOCUMENTTEMPLATE.KIND"].trim() == "TEX" && vars.get("$field.texText") != "")
{
filename = rowdata["DOCUMENTTEMPLATE.NAME"] + ".txt";
bindata = util.encodeBase64String(vars.get("$field.texText"));
}
if(bindata != "" && filename != "")
{
db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$local.uid"),
"", bindata, filename, "", "", SqlUtils.getSystemAlias());
}
\ No newline at end of file
DocumentTemplateUtils.insertTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], vars.get("$field.texText"), rowdata["DOCUMENTTEMPLATE.NAME"]);
\ No newline at end of file
entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+ 4
− 35
View file @ 87941cb8
import("Binary_lib");
import("system.util");
import("DocumentTemplate_lib");
import("system.vars");
import("system.db");
import("Document_lib");
import("Sql_lib");
//TODO - Function
var rowdata = vars.get("$local.rowdata");
var upload = new FileUpload(vars.get("$field.BINDATA"));
var rowId = vars.get("$local.uid");
var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
var filename = "";
var bindata = "";
if(bindataUpload != "")
{
bindata = bindataUpload;
filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
if(filename != null && filename != "")
filename = rowdata["DOCUMENTTEMPLATE.NAME"] + ".txt";
}
else if(rowdata["DOCUMENTTEMPLATE.KIND"].trim() == "TEX" && vars.get("$field.texText") != "")
{
filename = rowdata["DOCUMENTTEMPLATE.NAME"] + ".txt";
bindata = util.encodeBase64String(vars.get("$field.texText"));
}
if(bindata != "" && filename != "")
{
var assignmentTable = "DOCUMENTTEMPLATE";
var assignmentName= "DOCUMENT";
var rowId = vars.get("$local.uid");
var binMeta = db.getBinaryMetadata(assignmentTable, assignmentName, rowId, false, SqlUtils.getSystemAlias(), "MAINDOCUMENT");
if (binMeta.length == 0)
SingleBinaryUtils.insertMainDocument(assignmentTable, assignmentName, rowId, bindata, filename, null, SqlUtils.getSystemAlias());
else
db.updateBinary(binMeta[0][db.BINARY_ID], "", bindata, filename, "", "MAINDOCUMENT", SqlUtils.getSystemAlias());
}
\ No newline at end of file
DocumentTemplateUtils.updateTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], vars.get("$field.texText"), rowdata["DOCUMENTTEMPLATE.NAME"]);
\ No newline at end of file
entity/Email_entity/Email_entity.aod
+ 11
− 0
View file @ 87941cb8
......@@ -62,6 +62,17 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>bindata</name>
<contentType>FILE</contentType>
</entityField>
<entityActionField>
<name>downloadTemplate</name>
<title>Download template</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/downloadtemplate/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_FONT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
</entityActionField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/Email_entity/entityfields/downloadtemplate/onActionProcess.js 0 → 100644
+ 8
− 0
View file @ 87941cb8
import("system.neon");
import("DocumentTemplate_lib");
import("system.vars");
var templateId = vars.get("$field.DOCUMENT_TEMPLATE");
var template = DocumentTemplate.loadTemplate(templateId);
if (template.content)
neon.download(template.content, template.filename);
\ No newline at end of file
entity/Email_entity/entityfields/downloadtemplate/stateProcess.js 0 → 100644
+ 8
− 0
View file @ 87941cb8
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$field.DOCUMENT_TEMPLATE"))
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Email_entity/recordcontainers/jdito/onInsert.js
+ 3
− 1
View file @ 87941cb8
......@@ -4,11 +4,13 @@ import("Employee_lib");
import("system.vars");
import("Email_lib");
import("Contact_lib");
import("Document_lib");
var contactId = vars.get("$param.ContactId_param");
var eml = EmailWritingUtils.openMailTemplate(
vars.get("$field.RECIPIENT"),
EmployeeUtils.getCurrentContactId(),
vars.get("$field.DOCUMENT_TEMPLATE"),
contactId
contactId,
new FileUpload(vars.get("$field.bindata"))
);
entity/Letter_entity/recordcontainers/jdito/onInsert.js
+ 1
− 3
View file @ 87941cb8
import("system.logging");
import("system.translate");
import("Contact_lib");
import("ActivityTask_lib");
......@@ -8,8 +7,7 @@ import("system.text");
import("DocumentTemplate_lib");
import("KeywordRegistry_basic");
var template = DocumentTemplate.getSelectedTemplate(vars.get("$field.DOCUMENT_TEMPLATE"), vars.get("$field.bindata"));
logging.log(vars.get("$field.bindata").split(";").join(";\n"))
var template = DocumentTemplate.getSelectedTemplate(vars.get("$field.DOCUMENT_TEMPLATE"), new FileUpload(vars.get("$field.bindata")));
var contactId = vars.get("$param.ContactId_param");
var content = template.getReplacedContentByContactId(contactId, true);
if (template.type)
......
entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 87941cb8
......@@ -5,7 +5,7 @@ import("system.vars");
import("system.db");
import("Document_lib");
var bindata = vars.get("$field.bindata");
var bindata = new FileUpload(vars.get("$field.bindata"));
var rowdata = vars.get("$local.rowdata");
var letterId = rowdata["SERIALLETTER.SERIALLETTERID"];
var templateId = rowdata["SERIALLETTER.DOCUMENTTEMPLATE_ID"];
......
entity/SerialLetter_entity/recordcontainers/db/onDBUpdate.js
+ 1
− 1
View file @ 87941cb8
......@@ -6,7 +6,7 @@ import("system.vars");
import("system.db");
import("Document_lib");
var bindata = vars.get("$field.bindata");
var bindata = new FileUpload(vars.get("$field.bindata"));
var rowdata = vars.get("$local.rowdata");
var letterId = rowdata["SERIALLETTER.SERIALLETTERID"];
var templateId = rowdata["SERIALLETTER.DOCUMENTTEMPLATE_ID"];
......
neonView/EmailEdit_view/EmailEdit_view.aod
+ 20
− 2
View file @ 87941cb8
......@@ -4,9 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<isSmall v="true" />
<layout>
<boxLayout>
<noneLayout>
<name>layout</name>
</boxLayout>
</noneLayout>
</layout>
<children>
<genericViewTemplate>
......@@ -24,5 +24,23 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
<actionsViewTemplate>
<name>Actions</name>
<actions>
<element>downloadTemplate</element>
</actions>
<entityField>#ENTITY</entityField>
</actionsViewTemplate>
<genericViewTemplate>
<name>Generic2</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>0db54c16-72f2-4df9-9ecc-e9ebaaedf20f</name>
<entityField>bindata</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</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