Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Reference ContextColumns on field. #12

Merged
merged 1 commit into from
Apr 12, 2024
Merged

feat: Reference ContextColumns on field. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/main/java/org/spin/eca56/util/support/documents/Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,26 @@ private Map<String, Object> parseField(MBrowseField field) {
elementName = field.getAD_Element().getColumnName();
}
detail.put("element_name", elementName);
String embeddedContextColumn = null;
ReferenceValues referenceValues = ReferenceUtil.getReferenceDefinition(columnName, field.getAD_Reference_ID(), field.getAD_Reference_Value_ID(), field.getAD_Val_Rule_ID());
if(referenceValues != null) {
// Map<String, Object> referenceDetail = new HashMap<>();
Map<String, Object> referenceDetail = new HashMap<>();
// referenceDetail.put("id", referenceValues.getReferenceId());
// referenceDetail.put("table_name", referenceValues.getTableName());
// detail.put("display_type", referenceDetail);
embeddedContextColumn = referenceValues.getEmbeddedContextColumn();
referenceDetail.put("table_name", referenceValues.getTableName());
referenceDetail.put("context_column_names", ReferenceUtil.getContextColumnNames(
referenceValues.getEmbeddedContextColumn()
)
);
detail.put("reference", referenceDetail);
}
detail.put("context_column_names", ReferenceUtil.getContextColumnNames(
Optional.ofNullable(field.getDefaultValue()).orElse("")
+ Optional.ofNullable(field.getDefaultValue2()).orElse("")
+ Optional.ofNullable(field.getDisplayLogic()).orElse("")
+ Optional.ofNullable(field.getReadOnlyLogic()).orElse("")
+ Optional.ofNullable(embeddedContextColumn).orElse("")));
)
);
detail.put("dependent_fields", DependenceUtil.generateDependentBrowseFields(field));
return detail;
}

private Browser() {
super();
}
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/org/spin/eca56/util/support/documents/Process.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,29 +157,30 @@ Map<String, Object> parseProcessParameter(MProcessPara parameter) {
detail.put("is_info_only", parameter.isInfoOnly());

// External Info
String embeddedContextColumn = null;
ReferenceValues referenceValues = ReferenceUtil.getReferenceDefinition(parameter.getColumnName(), parameter.getAD_Reference_ID(), parameter.getAD_Reference_Value_ID(), parameter.getAD_Val_Rule_ID());
if(referenceValues != null) {
// Map<String, Object> referenceDetail = new HashMap<>();
Map<String, Object> referenceDetail = new HashMap<>();
// referenceDetail.put("id", referenceValues.getReferenceId());
// referenceDetail.put("table_name", referenceValues.getTableName());
embeddedContextColumn = referenceValues.getEmbeddedContextColumn();
referenceDetail.put("table_name", referenceValues.getTableName());
referenceDetail.put("context_column_names", ReferenceUtil.getContextColumnNames(
referenceValues.getEmbeddedContextColumn()
)
);
detail.put("reference", referenceDetail);
}
detail.put("context_column_names", ReferenceUtil.getContextColumnNames(
Optional.ofNullable(parameter.getDefaultValue()).orElse("")
+ Optional.ofNullable(parameter.getDefaultValue2()).orElse("")
+ Optional.ofNullable(parameter.getDisplayLogic()).orElse("")
+ Optional.ofNullable(parameter.getReadOnlyLogic()).orElse("")
+ Optional.ofNullable(embeddedContextColumn).orElse(""))
)
);
detail.put("dependent_fields", DependenceUtil.generateDependentProcessParameters(parameter));
return detail;
}

private Process() {
super();
}

/**
* Default instance
* @return
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/org/spin/eca56/util/support/documents/Window.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,21 +366,21 @@ private Map<String, Object> parseField(MField field) {
if(validationRuleId <= 0) {
validationRuleId = column.getAD_Val_Rule_ID();
}
String embeddedContextColumn = null;

ReferenceValues referenceValues = ReferenceUtil.getReferenceDefinition(column.getColumnName(), displayTypeId, referenceValueId, validationRuleId);
if(referenceValues != null) {
// Map<String, Object> referenceDetail = new HashMap<>();
Map<String, Object> referenceDetail = new HashMap<>();
// referenceDetail.put("id", referenceValues.getReferenceId());
// referenceDetail.put("table_name", referenceValues.getTableName());
// detail.put("display_type", referenceDetail);
embeddedContextColumn = referenceValues.getEmbeddedContextColumn();
referenceDetail.put("table_name", referenceValues.getTableName());
referenceDetail.put("context_column_names", ReferenceUtil.getContextColumnNames(
referenceValues.getEmbeddedContextColumn()
)
);
detail.put("reference", referenceDetail);
}
detail.put("context_column_names", ReferenceUtil.getContextColumnNames(
Optional.ofNullable(field.getDefaultValue()).orElse(column.getDefaultValue())
+ Optional.ofNullable(field.getDisplayLogic()).orElse("")
+ Optional.ofNullable(column.getMandatoryLogic()).orElse("")
+ Optional.ofNullable(column.getReadOnlyLogic()).orElse("")
+ Optional.ofNullable(embeddedContextColumn).orElse(""))
Optional.ofNullable(field.getDefaultValue()).orElse(column.getDefaultValue())
)
);
detail.put("dependent_fields", DependenceUtil.generateDependentWindowFields(field));
detail.put("process_id", column.getAD_Process_ID());
Expand Down