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

DSGVO keyword registry to lower case

parent 9e24c9c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 33 deletions
entity/DSGVOInfo_entity/entityfields/datedeadline/mandatoryProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,4 +3,4 @@ import("KeywordRegistry_basic");
import("system.vars");
import("system.result");
result.object(vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName() && vars.get("$field.deadline") != "" && vars.get("$field.deadline") != $KeywordRegistry.DSGVODeadline$onTime());
\ No newline at end of file
result.object(vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName() && vars.get("$field.deadline") != "" && vars.get("$field.deadline") != $KeywordRegistry.dsgvoDeadline$onTime());
\ No newline at end of file
entity/DSGVOInfo_entity/entityfields/datedeadline/stateProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -6,7 +6,7 @@ import("KeywordRegistry_basic");
if (vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName())
{
if (vars.get("$field.deadline") && vars.get("$field.deadline") != $KeywordRegistry.DSGVODeadline$onTime())
if (vars.get("$field.deadline") && vars.get("$field.deadline") != $KeywordRegistry.dsgvoDeadline$onTime())
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_DISABLED);
......
entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
+ 1
− 1
View file @ 925cdff9
......@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
import("system.vars");
import("system.neon");
if (vars.get("$this.value") == $KeywordRegistry.DSGVODeadline$onTime())
if (vars.get("$this.value") == $KeywordRegistry.dsgvoDeadline$onTime())
{
neon.setFieldValues({
"$field.dateDeadline": ""
......
entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js
+ 2
− 2
View file @ 925cdff9
......@@ -3,5 +3,5 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none()
&& vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$inland());
\ No newline at end of file
result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none()
&& vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$inland());
\ No newline at end of file
entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none() && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$inland())
if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none() && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$inland())
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
......
entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js
+ 1
− 1
View file @ 925cdff9
import("KeywordRegistry_basic");
import("system.result");
result.string($KeywordRegistry.DSGVOGuarantee());
\ No newline at end of file
result.string($KeywordRegistry.dsgvoGuarantee());
\ No newline at end of file
entity/DSGVOInfo_entity/entityfields/recipient/mandatoryProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,4 +3,4 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none());
\ No newline at end of file
result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none());
\ No newline at end of file
entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -4,7 +4,7 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none())
if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none())
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
......
entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
+ 1
− 1
View file @ 925cdff9
......@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
import("system.vars");
import("system.neon");
if (vars.get("$this.value") == $KeywordRegistry.DSGVOTransmission$none())
if (vars.get("$this.value") == $KeywordRegistry.dsgvoTransmission$none())
{
neon.setFieldValues({
"$field.RECIPIENT": "",
......
entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
+ 1
− 1
View file @ 925cdff9
......@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOGuarantee(), "DSGVOINFO.GUARANTEE");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoGuarantee(), "DSGVOINFO.GUARANTEE");
result.string(sql);
entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
+ 1
− 1
View file @ 925cdff9
......@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOTransmission(), "DSGVOINFO.TRANSMISSION");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoTransmission(), "DSGVOINFO.TRANSMISSION");
result.string(sql);
entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,4 +3,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), vars.get("$this.value")));
\ No newline at end of file
result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), vars.get("$this.value")));
\ No newline at end of file
entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js
+ 1
− 1
View file @ 925cdff9
import("system.result");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.DSGVOPurpose());
\ No newline at end of file
result.string($KeywordRegistry.dsgvoPurpose());
\ No newline at end of file
entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js
+ 1
− 1
View file @ 925cdff9
import("system.result");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.DSGVOStatuoritysource());
\ No newline at end of file
result.string($KeywordRegistry.dsgvoStatuoritysource());
\ No newline at end of file
entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js
+ 1
− 1
View file @ 925cdff9
import("system.result");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.DSGVOType());
\ No newline at end of file
result.string($KeywordRegistry.dsgvoType());
\ No newline at end of file
entity/DSGVO_entity/entityfields/purpose/displayValueProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,4 +3,4 @@ import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOPurpose(), vars.get("$field.PURPOSE")));
\ No newline at end of file
result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoPurpose(), vars.get("$field.PURPOSE")));
\ No newline at end of file
entity/DSGVO_entity/entityfields/statuoritysource/displayValueProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -3,4 +3,4 @@ import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOStatuoritysource(), vars.get("$field.STATUORITYSOURCE")));
\ No newline at end of file
result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoStatuoritysource(), vars.get("$field.STATUORITYSOURCE")));
\ No newline at end of file
entity/DSGVO_entity/entityfields/value/contentTypeProcess.js
+ 1
− 1
View file @ 925cdff9
......@@ -8,7 +8,7 @@ import("system.neon");
logging.log(vars.get("$field.DSGVOTYPE"));
switch (vars.get("$field.DSGVOTYPE").trim())
{
case $KeywordRegistry.DSGVOType$birth().trim():
case $KeywordRegistry.dsgvoType$birth().trim():
result.string("DATE");
break;
default:
......
entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 925cdff9
......@@ -15,7 +15,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
vars.get("$field.ROW_ID"), vars.get("$sys.date"), vars.get("$field.TABLENAME"),
null, KeywordUtils. vars.get("$field.RIGHT").valueOf(), vars.get("$field.VALID_TO"),
vars.get("$field.CONTACT_ID"), vars.get("$field.USE").valueOf()];
// KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOUse(), "DSGVO.USE");
// KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoUse(), "DSGVO.USE");
db.insertData("DSGVO", cols, null, vals);
}
......
process/DataPrivacy_lib/process.js
+ 13
− 13
View file @ 925cdff9
......@@ -222,7 +222,7 @@ DataPrivacyUtils.getDSGVO = function(pContactId, pFilterCond)
"DATE_EDIT," + // 9
"USER_NEW," + // 10
"USER_EDIT, " + // 11
KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOType(), "DSGVOTYPE") // 12 - dsgvotype-displayvalue
KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoType(), "DSGVOTYPE") // 12 - dsgvotype-displayvalue
var data = db.table(cond.buildSql("select " + select + " from DSGVO", "1 = 2"));
......@@ -296,7 +296,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
"", // "DATE_EDIT," + // 9
currentUser, // "USER_NEW," + // 10
"", // "USER_EDIT " // 11
KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), StringUtils.toChar36(dsgvotype.key)), // 12
KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), StringUtils.toChar36(dsgvotype.key)), // 12
])
}
});
......@@ -354,10 +354,10 @@ DataPrivacyUtils.dataForExport = function(pContactId, pLocale)
var dsgvotype = DataPrivacyType.get(pRow.DSGVOTYPE);
var newRow = [
KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), pRow.DSGVOTYPE, pLocale),
KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), pRow.DSGVOTYPE, pLocale),
(dsgvotype.formatAsDate ? datetime.toDate(pRow.VALUE, translate.text("dd.MM.yyyy", pLocale), "UTC") : pRow.VALUE),
KeywordUtils.getViewValue($KeywordRegistry.DSGVOStatuoritysource(), pRow.STATUORITYSOURCE, pLocale),
KeywordUtils.getViewValue($KeywordRegistry.DSGVOPurpose(), pRow.PURPOSE, pLocale),
KeywordUtils.getViewValue($KeywordRegistry.dsgvoStatuoritysource(), pRow.STATUORITYSOURCE, pLocale),
KeywordUtils.getViewValue($KeywordRegistry.dsgvoPurpose(), pRow.PURPOSE, pLocale),
datetime.toDate(pRow.VALID_TO, translate.text("dd.MM.yyyy", pLocale), "UTC"),
];
......@@ -414,7 +414,7 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
// text for transmission
var transmission = "";
if (pDSGVOInfo.transmission != $KeywordRegistry.DSGVOTransmission$none())
if (pDSGVOInfo.transmission != $KeywordRegistry.dsgvoTransmission$none())
{
// load recipient // TODO: evtl. put this load entity into lib and use it in all display value processes
var recipientConfig = entities.createConfigForLoadingRows()
......@@ -426,9 +426,9 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
transmission = translate.text("The data is transmitted to the following recipients:", pLocale);
transmission += " " + pDSGVOInfo.recipient;
if (pDSGVOInfo.transmission == $KeywordRegistry.DSGVOTransmission$foreign())
if (pDSGVOInfo.transmission == $KeywordRegistry.dsgvoTransmission$foreign())
{
pDSGVOInfo.garantees = KeywordUtils.getViewValue($KeywordRegistry.DSGVOGuarantee(), pDSGVOInfo.garantees, pLocale),
pDSGVOInfo.garantees = KeywordUtils.getViewValue($KeywordRegistry.dsgvoGuarantee(), pDSGVOInfo.garantees, pLocale),
transmission += "\n" + translate.text("The transfer of data to recipients located in a third country is based on the following guarantees:", pLocale)
+ "\n" + pDSGVOInfo.garantees;
......@@ -452,15 +452,15 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
// text for deadline
var deadline = "";
if(pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$onTime())
if(pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$onTime())
deadline = translate.text("We hereby comply with your request within the statutory period of one month.", pLocale);
else
{
deadline = translate.withArguments("As stated in our letter of %0, we have made use of the possibility to extend the deadline to three months due to %1.",
[datetime.toDate(pDSGVOInfo.deadlineDate, translate.text("dd.MM.yyyy", pLocale)),
(pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$complex() ? translate.text("the high complexity of your application", pLocale)
(pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$complex() ? translate.text("the high complexity of your application", pLocale)
:
(pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$count() ? translate.text("the number of your applications", pLocale) : ""))
(pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$count() ? translate.text("the number of your applications", pLocale) : ""))
], pLocale)
}
......@@ -613,7 +613,7 @@ DataPrivacyUtils.dsgvoMkDataAnonymous = function(pPersId, pContactId)
//condition = " CONTACT_ID = '" + pContactId + "' and ADDRESSID = '" + data[i][9] + "' ";
updArray.push(["ADDRESS", columns, columnTypes, values, condition]);
}
newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), $KeywordRegistry.DSGVOTablename$address()));
newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTablename(), $KeywordRegistry.dsgvoTablename$address()));
}
//Kommunikationsdaten
......@@ -637,7 +637,7 @@ DataPrivacyUtils.dsgvoMkDataAnonymous = function(pPersId, pContactId)
updArray.push(["COMM", columns, columnTypes, values, condition]);
}
newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), $KeywordRegistry.DSGVOTablename$communication()));
newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTablename(), $KeywordRegistry.dsgvoTablename$communication()));
}
if (updArray.length > 0)
......
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