From 4b1f783424d04ba82a832d873b9d78496f02aaca Mon Sep 17 00:00:00 2001 From: Maria Hofmann <m.hofmann@adito.de> Date: Wed, 26 Jun 2019 13:35:41 +0200 Subject: [PATCH] recordContainers --- .../recordcontainers/jdito/contentProcess.js | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/entity/DSGVO_entity/recordcontainers/jdito/contentProcess.js b/entity/DSGVO_entity/recordcontainers/jdito/contentProcess.js index cdd6f8fbb9..79113fb710 100644 --- a/entity/DSGVO_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/DSGVO_entity/recordcontainers/jdito/contentProcess.js @@ -10,12 +10,8 @@ var recordCond = SqlCondition.begin(); recordCond.andPrepare("$param.currentPerson_param", "$field.CONTACT_ID"); -//var dataQuery = recordCond.buildSql("select DSGVOID, ROW_ID, STATUORITYSOURCE, PURPOSE, TABLENAME, TYPE, VALID_TO, CONTACT_ID " + -// "from DSGVO ", "1 = 1"); //, "order by DATE_NEW desc, USER_NEW asc"); - var dataQuery = recordCond.buildSql("select DSGVOID, ROW_ID, TABLENAME, TYPE, STATUORITYSOURCE, PURPOSE, VALID_TO, CONTACT_ID, DATE_NEW, DATE_EDIT, USER_NEW, USER_EDIT from DSGVO ", "1 = 1"); -logging.log(dataQuery.length); logging.log(dataQuery); var res = _groupData(dataQuery); @@ -138,11 +134,11 @@ function _groupData(pData) ["STATUORITYSOURCE", pData[i][4]], ["PURPOSE", pData[i][5]], ["VALID_TO", pData[i][6]], - ["CONTACT_ID", pData[i][7]] - ["DATE_NEW", pData[i][8]], - ["DATE_EDIT", pData[i][9]], - ["USER_NEW", pData[i][10]], - ["USER_EDIT", pData[i][11]]);*/ + ["CONTACT_ID", pData[i][7]] + ["DATE_NEW", pData[i][8]], + ["DATE_EDIT", pData[i][9]], + ["USER_NEW", pData[i][10]], + ["USER_EDIT", pData[i][11]]);*/ res.push(pData[i][0], pData[i][1], pData[i][2], @@ -168,11 +164,11 @@ function _groupData(pData) ["STATUORITYSOURCE", pData[i][4]], ["PURPOSE", pData[i][5]], ["VALID_TO", pData[i][6]], - ["CONTACT_ID", pData[i][7]] - ["DATE_NEW", pData[i][8]], - ["DATE_EDIT", pData[i][9]], - ["USER_NEW", pData[i][10]], - ["USER_EDIT", pData[i][11]]);*/ + ["CONTACT_ID", pData[i][7]] + ["DATE_NEW", pData[i][8]], + ["DATE_EDIT", pData[i][9]], + ["USER_NEW", pData[i][10]], + ["USER_EDIT", pData[i][11]]);*/ res.push(pData[i][0], pData[i][1], pData[i][2], -- GitLab