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

fix classification admin

parent 3552becf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 37 additions and 96 deletions
entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+ 28
− 72
View file @ 35a435d0
......@@ -2,35 +2,17 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ClassificationAdmin_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
<icon>VAADIN:LIST_OL</icon>
<title>Classification</title>
<grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:LIST_OL</iconId>
<titlePlural>Classifications</titlePlural>
<recordContainer>jdito</recordContainer>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>UID</name>
<title>Usage</title>
<consumer>KeywordClassificationTypes</consumer>
<displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CLASSIFICATIONID</name>
<valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CLASSIFICATIONSCORE_ID</name>
<title>Selection</title>
<consumer>ClassificationScores</consumer>
<titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>ClassificationType_param</name>
<expose v="true" />
......@@ -63,18 +45,6 @@
<displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CLASSIFICATIONTYPE_ID</name>
<valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
<valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
<valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>KeywordClassificationTypes</name>
<dependency>
......@@ -130,51 +100,37 @@
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<isFilterable v="true" />
<isRequireContainerFiltering v="true" />
<contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>2f70bf47-42e3-40a2-b076-0da34cfb80d9</name>
<tableName>CLASSIFICATIONTYPE</tableName>
<primaryKey>CLASSIFICATIONTYPEID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<dbRecordFieldMapping>
<name>CLASSIFICATIONGROUP.value</name>
<isFilterable v="false" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONSCORE_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONTYPEID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONTYPE_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
<isFilterable v="false" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONGROUP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SCORETYPE.value</name>
<isFilterable v="true" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<recordfield>CLASSIFICATIONTYPE.SCORETYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CLASSIFICATIONTYPE.value</name>
<isFilterable v="true" />
</jDitoRecordFieldMapping>
<recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CLASSIFICATIONTYPEID.value</name>
<recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</dbRecordContainer>
</recordContainers>
</entity>
entity/ClassificationAdmin_entity/contentTitleProcess.js
+ 1
− 1
View file @ 35a435d0
import("system.vars");
import("system.result");
result.string(vars.get("$field.UID.displayValue"))
\ No newline at end of file
result.string(vars.get("$field.CLASSIFICATIONTYPE.displayValue"))
\ No newline at end of file
entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
+ 1
− 0
View file @ 35a435d0
import("system.logging");
import("Classification_lib");
import("system.neon");
import("system.vars");
......
entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
+ 1
− 1
View file @ 35a435d0
......@@ -18,7 +18,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if (groups.indexOf(newGroup, 0) != -1 && ClassificationUtils.getGroupFromDb(vars.get("$field.CLASSIFICATIONTYPEID")) != newGroup)
{
result.string(translate.text("The new Classification name already exists."));
//result.string(translate.text("The new Classification name already exists."));
}
}
else
......
entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 3552becf
import("system.vars");
import("system.translate");
import("Sql_lib");
import("system.db");
import("system.result");
if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
{
// TODO: loadEntity / #Title
result.string(translate.text(db.cell(SqlCondition.begin()
.andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
.buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
}
\ No newline at end of file
entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js deleted 100644 → 0
+ 0
− 9
View file @ 3552becf
import("system.neon");
import("system.result");
import("system.vars");
import("system.translate");
if (vars.get("$sys.recordstate") && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
{
result.string(translate.text(vars.get("$field.SCORETYPE")));
}
\ No newline at end of file
entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js 0 → 100644
+ 6
− 0
View file @ 35a435d0
import("system.result");
import("system.db");
result.object({
"CLASSIFICATIONTYPE.CLASSIFICATIONGROUP": db.ASCENDING
})
\ No newline at end of file
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