diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index f742a84e6a9a213a2e1312efcd6e10a6f0ec8759..7982c0fd617494431e6d766947deed920e121b6f 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -154,6 +154,19 @@
<entityField>
<name>DISPLAYVALUE</name>
</entityField>
+ <entityActionGroup>
+ <name>fitlerviewActionGroup</name>
+ <title>Action</title>
+ <children>
+ <entityActionField>
+ <name>refreshClassificationsOfThisDataset</name>
+ <title>refresh classifications</title>
+ <onActionProcess>%aditoprj%/entity/Classification_entity/entityfields/fitlerviewactiongroup/children/refreshclassificationsofthisdataset/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:REFRESH</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Classification_entity/entityfields/fitlerviewactiongroup/children/refreshclassificationsofthisdataset/onActionProcess.js b/entity/Classification_entity/entityfields/fitlerviewactiongroup/children/refreshclassificationsofthisdataset/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..10cfa6bda238dca910902b0b1a731d2e483336eb
--- /dev/null
+++ b/entity/Classification_entity/entityfields/fitlerviewactiongroup/children/refreshclassificationsofthisdataset/onActionProcess.js
@@ -0,0 +1,18 @@
+import("system.process");
+import("system.util");
+import("system.vars");
+
+var params = {
+ "refreshSingleRecord_param" : true,
+ "ObjectRowid_param" : vars.get("$param.ObjectRowid_param"),
+ "ObjectType_param" : vars.get("$param.ObjectType_param")}
+
+var processConfig = process.createStartAsyncConfig()
+ .setName("updateClassifications_serverProcess")
+ .setUser( vars.get("$sys.user"))
+ .setThreadPriority(process.THREADPRIORITY_LOW)
+ .setTimerType(process.TIMERTYPE_SERVER)
+ .setLocalVariables(params);
+
+
+process.startAsync(processConfig);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index b5833b64f5ecf3d48d8f3dab232a9c7a5d454cc1..7fa729d04454f39ba0ddc079d7f64358dbc6eaa4 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7866,6 +7866,9 @@
<entry>
<key>No file selected.</key>
</entry>
+ <entry>
+ <key>refresh classifications</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 14bf2f3c5a44a5c3ef82bade6a9007cabe2e71be..eeb0d827e44eece5703b085d9e35b107bc4c16e8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10364,6 +10364,10 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Responsible Districts</key>
</entry>
+ <entry>
+ <key>refresh classifications</key>
+ <value>Klassifizierungen neuberechnen</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index abb7f58ef767d3c497afe536834c899fe91e52fd..d98310a5d1c81b881eef33fc0dbdc4070657c6be 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7947,6 +7947,9 @@
<entry>
<key>No file selected.</key>
</entry>
+ <entry>
+ <key>refresh classifications</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index d716cc7ddad99a078168f38f67b53ae66dde236e..4d7d91c696787b2329a89ee872308fea857c45f7 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -10,9 +10,9 @@
<children>
<treeTableViewTemplate>
<name>ClassificationTreeTable</name>
- <hideActions v="true" />
<showChildrenCount v="false" />
<entityField>#ENTITY</entityField>
+ <favoriteActionGroup1>fitlerviewActionGroup</favoriteActionGroup1>
<linkedColumns />
<defaultGroupFields>
<element>CLASSIFICATIONGROUP</element>
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index c0754df5bf42441f5bd9ca3f433c7234c58ec1f2..25419ec3b80a5f2d41f83626ad8c6d50cfb1d8cf 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -309,8 +309,11 @@ ClassificationUtils.setClassificationStorageDatasetsOutdated = function (pTarget
//set outdated flag for the classificationStorage datasets
if(relevantForClassification && classificationStorageIds.length > 0) // also check for the classificationStorageIds.length since it could be empty
{
- var cond = newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", classificationStorageIds, SqlBuilder.IN());
- cond.updateData(true, "CLASSIFICATIONSTORAGE", ["OUTDATED"], null, [1]);
+ for (i = 0; i < classificationStorageIds.length; i++)
+ {
+ var cond = newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", classificationStorageIds[i], SqlBuilder.IN());
+ cond.updateData(true, "CLASSIFICATIONSTORAGE", ["OUTDATED"], null, [1]);
+ }
}
};
diff --git a/process/updateClassifications_serverProcess/process.js b/process/updateClassifications_serverProcess/process.js
index db4ab9c27872d6cafb239be8b3f848e9dbaad65e..4bcfa2bb2214469b5deeb45b9d371eef7fe66865 100644
--- a/process/updateClassifications_serverProcess/process.js
+++ b/process/updateClassifications_serverProcess/process.js
@@ -1,3 +1,4 @@
+import("system.vars");
import("Context_lib");
import("system.util");
import("Util_lib");
@@ -50,12 +51,26 @@ achievedScoresStmt, position, bestPossibleScoreStmt, storedClassificationFlag, d
var table = "CLASSIFICATIONSTORAGE";
var column = ["CLASSIFICATIONVALUE"];
var runUpdating = 0;
-
+var singleRefresh = false;
+if(vars.exists("$local.refreshSingleRecord_param") && vars.get("$local.refreshSingleRecord_param"))
+{
+ singleRefresh = vars.get("$local.refreshSingleRecord_param");
+}
//all classificationgroups and their object_type that have atleast one classificationtype with the outdated flag set
-outdatedGroupsAndObjectTypes = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.FILTER")
+if(!singleRefresh)
+{
+ outdatedGroupsAndObjectTypes = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.FILTER")
.from("CLASSIFICATIONTYPE")
.where("CLASSIFICATIONTYPE.OUTDATED", 1)
.table();
+}
+else
+{
+ outdatedGroupsAndObjectTypes = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.FILTER")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", vars.get("$local.ObjectType_param"))
+ .table();
+}
objectTypesThatNeedUpdate = [];
for (i = 0; i < outdatedGroupsAndObjectTypes.length; i++)
@@ -95,41 +110,42 @@ for (i = 0; i < outdatedGroupsAndObjectTypes.length; i++)
helperObject[classificationTypeId] = "";
}
}
-
-//object_type, object_rowId, classificationstorageId and the classificationstring (e.g. "ACB") of the classificationStorage datasets that habe the outdated flag set
-outdatedStoredClassifications = newSelect("CLASSIFICATIONSTORAGE.OBJECT_TYPE, CLASSIFICATIONSTORAGE.OBJECT_ROWID, \n\
- CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID, CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE")
- .from("CLASSIFICATIONSTORAGE")
- .where("CLASSIFICATIONSTORAGE.OUTDATED", 1)
- .orderBy("OBJECT_TYPE")
- .table();
-helperObject = {};
-if(outdatedStoredClassifications)
+if(!singleRefresh)
{
- //build classificationStorageObject out of outdatedStoredClassifications
- for (i = 0; i < outdatedStoredClassifications.length; i++)
+ //object_type, object_rowId, classificationstorageId and the classificationstring (e.g. "ACB") of the classificationStorage datasets that habe the outdated flag set
+ outdatedStoredClassifications = newSelect("CLASSIFICATIONSTORAGE.OBJECT_TYPE, CLASSIFICATIONSTORAGE.OBJECT_ROWID, \n\
+ CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID, CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE")
+ .from("CLASSIFICATIONSTORAGE")
+ .where("CLASSIFICATIONSTORAGE.OUTDATED", 1)
+ .orderBy("OBJECT_TYPE")
+ .table();
+ helperObject = {};
+ if(outdatedStoredClassifications)
{
- for (ii = 0; ii < outdatedStoredClassifications[i].length; ii++)
+ //build classificationStorageObject out of outdatedStoredClassifications
+ for (i = 0; i < outdatedStoredClassifications.length; i++)
{
- [object_type, object_rowId, classificationStorageId, classificationScore] = outdatedStoredClassifications[i];
-
- if(!helperObject.hasOwnProperty(object_type)) //objectType
+ for (ii = 0; ii < outdatedStoredClassifications[i].length; ii++)
{
- classificationStorageObject[object_type] = {}; //puts objectType in classificationStorageObject and already initializes the object that later get's filled with the groups and their types
- helperObject[object_type] = "";
- objectTypes.push(object_type); //also push all the objectTypes in an Array for later (the updating happens one objectType at a time)
+ [object_type, object_rowId, classificationStorageId, classificationScore] = outdatedStoredClassifications[i];
- }
- if(!helperObject.hasOwnProperty(object_rowId)) //objectRowId
- {
- classificationStorageObject[object_type][object_rowId] = [classificationStorageId, classificationScore]; //same logic as before
- helperObject[object_rowId] = "";
- objectRowIdArray.push(object_rowId); //also push all the objectTypes in an Array for later
+ if(!helperObject.hasOwnProperty(object_type)) //objectType
+ {
+ classificationStorageObject[object_type] = {}; //puts objectType in classificationStorageObject and already initializes the object that later get's filled with the groups and their types
+ helperObject[object_type] = "";
+ objectTypes.push(object_type); //also push all the objectTypes in an Array for later (the updating happens one objectType at a time)
+
+ }
+ if(!helperObject.hasOwnProperty(object_rowId)) //objectRowId
+ {
+ classificationStorageObject[object_type][object_rowId] = [classificationStorageId, classificationScore]; //same logic as before
+ helperObject[object_rowId] = "";
+ objectRowIdArray.push(object_rowId); //also push all the objectTypes in an Array for later
+ }
}
}
}
-}
-
+}
if(outdatedStoredClassifications.length > 0)
{ storedClassificationFlag = true; //this variable can easily be checked to see what we are updating
@@ -225,8 +241,14 @@ for (xyz = 0; xyz < runUpdating; xyz++)
}
if(!storedClassificationFlag) // we already habe the classificationStorageObject if we are updating for the outdated classificationStorage
{
+ let condIfSingle;
+ if(vars.exists("$local.ObjectRowid_param") && vars.get("$local.ObjectRowid_param"))
+ {
+ condIfSingle = newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$local.ObjectRowid_param"));
+ }
classificationStorageArray = newSelect("OBJECT_TYPE, OBJECT_ROWID, CLASSIFICATIONSTORAGEID, CLASSIFICATIONVALUE")
.from("CLASSIFICATIONSTORAGE")
+ .whereIfSet(condIfSingle)
.orderBy("OBJECT_TYPE")
.table();
helperObject = {}; //resets the helper object
@@ -479,14 +501,17 @@ for (xyz = 0; xyz < runUpdating; xyz++)
}
}
}
-
- if(!storedClassificationFlag)
+ if(singleRefresh)
{
- correctCondition = newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", groupsThatNeedUpdate, SqlBuilder.IN())
+ correctCondition = newWhere(currentObjectColumn, vars.get("$local.ObjectRowid_param"));
+ }
+ else if(!storedClassificationFlag)
+ {
+ correctCondition = newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", groupsThatNeedUpdate, SqlBuilder.IN());
}
else
{
- correctCondition = newWhere(currentObjectColumn, objectRowIdArray, SqlBuilder.IN())
+ correctCondition = newWhere(currentObjectColumn, objectRowIdArray, SqlBuilder.IN());
}
achievedScoresStmt = newSelect(currentObjectColumn + ", CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, \n\
@@ -632,7 +657,7 @@ for (xyz = 0; xyz < runUpdating; xyz++)
}
}
- if(!storedClassificationFlag)
+ if(!storedClassificationFlag && !singleRefresh)
{ for (i = 0; i < scoreArray.length; i++)
{
let cond = newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", scoreArray[i][2]);
@@ -809,10 +834,18 @@ function _buildBestPossibleScoresGroupObjFn(pBatchData, pBatchNum)
function _insertPersistendClassificationDataIfNeeded()
{
- var objectsWithClassification = newSelect("distinct CLASSIFICATION.OBJECT_ROWID")
+ var objectsWithClassification;
+ if(singleRefresh)
+ {
+ objectsWithClassification = [vars.get("$local.ObjectRowid_param")];
+ }
+ else
+ {
+ objectsWithClassification = newSelect("distinct CLASSIFICATION.OBJECT_ROWID")
.from("CLASSIFICATION")
.where("CLASSIFICATION.OBJECT_TYPE", objectTypes[i])
.arrayColumn();
+ }
for (z = 0; z < objectsWithClassification.length; z++) {
uid = objectsWithClassification[z];