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: Add support to is_displayed_as_panel and is_displayed_as_table. #29

Merged
merged 1 commit into from
May 16, 2024
Merged

feat: Add support to is_displayed_as_panel and is_displayed_as_table. #29

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
30 changes: 22 additions & 8 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 @@ -34,6 +34,7 @@
import org.compiere.model.MTable;
import org.compiere.model.MWindow;
import org.compiere.model.PO;
import org.compiere.model.Query;
import org.compiere.util.Util;
import org.spin.eca56.util.support.DictionaryDocument;

Expand Down Expand Up @@ -72,6 +73,8 @@ public DictionaryDocument withEntity(PO entity) {
documentDetail.put("name", browser.get_Translation(I_AD_Browse.COLUMNNAME_Name, getLanguage()));
documentDetail.put("description", browser.get_Translation(I_AD_Browse.COLUMNNAME_Description, getLanguage()));
documentDetail.put("help", browser.get_Translation(I_AD_Browse.COLUMNNAME_Help, getLanguage()));
documentDetail.put("is_active", browser.isActive());

documentDetail.put("is_execute_query_by_default", browser.isExecutedQueryByDefault());
documentDetail.put("is_collapsible_by_default", browser.isCollapsibleByDefault());
documentDetail.put("is_selected_by_default", browser.isSelectedByDefault());
Expand Down Expand Up @@ -111,12 +114,22 @@ public DictionaryDocument withEntity(PO entity) {
)
);

documentDetail.put("fields", convertFields(browser.getFields()));
documentDetail.put("display_fields", convertFields(browser.getDisplayFields()));
documentDetail.put("criteria_fields", convertFields(browser.getCriteriaFields()));
documentDetail.put("identifier_fields", convertFields(browser.getIdentifierFields()));
documentDetail.put("order_fields", convertFields(browser.getOrderByFields()));
documentDetail.put("editable_fields", convertFields(browser.getNotReadOnlyFields()));
final String whereClause = MBrowseField.COLUMNNAME_AD_Browse_ID + "=?";
List<MBrowseField> browseFields = new Query(
browser.getCtx(),
MBrowseField.Table_Name,
whereClause,
null
)
.setParameters(browser.getAD_Browse_ID())
.setOrderBy(MBrowseField.COLUMNNAME_SeqNo)
.list();
documentDetail.put("fields", convertFields(browseFields));
// documentDetail.put("display_fields", convertFields(browser.getDisplayFields()));
// documentDetail.put("criteria_fields", convertFields(browser.getCriteriaFields()));
// documentDetail.put("identifier_fields", convertFields(browser.getIdentifierFields()));
// documentDetail.put("order_fields", convertFields(browser.getOrderByFields()));
// documentDetail.put("editable_fields", convertFields(browser.getNotReadOnlyFields()));

putDocument(documentDetail);
return this;
Expand All @@ -141,6 +154,7 @@ private Map<String, Object> parseField(MBrowseField field) {
detail.put("name", field.get_Translation(I_AD_Browse_Field.COLUMNNAME_Name, getLanguage()));
detail.put("description", field.get_Translation(I_AD_Browse_Field.COLUMNNAME_Description, getLanguage()));
detail.put("help", field.get_Translation(I_AD_Browse_Field.COLUMNNAME_Help, getLanguage()));
detail.put("is_active", field.isActive());
detail.put("display_type", field.getAD_Reference_ID());
detail.put("callout", field.getCallout());

Expand Down Expand Up @@ -169,8 +183,8 @@ private Map<String, Object> parseField(MBrowseField field) {
detail.put("sequence", field.getSeqNo());
detail.put("grid_sequence", field.getSeqNoGrid());
// Custom display
detail.put("is_displayed_as_panel", field.isQueryCriteria() ? "Y" : "N");
detail.put("is_displayed_as_table", field.isDisplayed() ? 'Y' : 'N');
detail.put("is_displayed_as_panel", field.isActive() && field.isQueryCriteria() ? "Y" : "N");
detail.put("is_displayed_as_table", field.isActive() && field.isDisplayed() ? 'Y' : 'N');

// Editable Properties
detail.put("is_read_only", field.isReadOnly());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/spin/eca56/util/support/documents/Form.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public DictionaryDocument withEntity(PO entity) {
documentDetail.put("name", form.get_Translation(I_AD_Form.COLUMNNAME_Name, getLanguage()));
documentDetail.put("description", form.get_Translation(I_AD_Form.COLUMNNAME_Description, getLanguage()));
documentDetail.put("help", form.get_Translation(I_AD_Form.COLUMNNAME_Help, getLanguage()));
documentDetail.put("is_active", form.isActive());

String fileName = form.getClassname();
if (!Util.isEmpty(fileName, true)) {
Expand Down
23 changes: 18 additions & 5 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 @@ -32,6 +32,7 @@
import org.compiere.model.MProcessPara;
import org.compiere.model.MReportView;
import org.compiere.model.PO;
import org.compiere.model.Query;
import org.compiere.wf.MWorkflow;
import org.spin.eca56.util.support.DictionaryDocument;
import org.spin.util.AbstractExportFormat;
Expand Down Expand Up @@ -73,6 +74,7 @@ public DictionaryDocument withEntity(PO entity) {
documentDetail.put("name", process.get_Translation(I_AD_Process.COLUMNNAME_Name, getLanguage()));
documentDetail.put("description", process.get_Translation(I_AD_Process.COLUMNNAME_Description, getLanguage()));
documentDetail.put("help", process.get_Translation(I_AD_Process.COLUMNNAME_Help, getLanguage()));
documentDetail.put("is_active", process.isActive());
documentDetail.put("show_help", process.getShowHelp());

// Report
Expand Down Expand Up @@ -109,12 +111,22 @@ public DictionaryDocument withEntity(PO entity) {
}

// Parameters
List<MProcessPara> parameters = process.getParametersAsList();
final StringBuffer whereClause = new StringBuffer(MProcessPara.COLUMNNAME_AD_Process_ID + "=?");
List<MProcessPara> parameters = new Query(
process.getCtx(),
I_AD_Process_Para.Table_Name,
whereClause.toString(),
null
)
.setParameters(process.getAD_Process_ID())
.setOrderBy(MProcessPara.COLUMNNAME_SeqNo)
.list();

boolean hasParameters = parameters != null && !parameters.isEmpty();
documentDetail.put("has_parameters", hasParameters);
documentDetail.put("has_parameters", hasParameters);

List<Map<String, Object>> parametersDetail = new ArrayList<>();
if(hasParameters ) {
if(hasParameters) {
parameters.forEach(parameter -> {
Map<String, Object> detail = parseProcessParameter(parameter);
parametersDetail.add(detail);
Expand All @@ -134,6 +146,7 @@ Map<String, Object> parseProcessParameter(MProcessPara parameter) {
detail.put("name", parameter.get_Translation(I_AD_Process_Para.COLUMNNAME_Name, getLanguage()));
detail.put("description", parameter.get_Translation(I_AD_Process_Para.COLUMNNAME_Description, getLanguage()));
detail.put("help", parameter.get_Translation(I_AD_Process_Para.COLUMNNAME_Help, getLanguage()));
detail.put("is_active", parameter.isActive());
detail.put("display_type", parameter.getAD_Reference_ID());

// Value Properties
Expand All @@ -149,11 +162,11 @@ Map<String, Object> parseProcessParameter(MProcessPara parameter) {
detail.put("display_logic", parameter.getDisplayLogic());
detail.put("sequence", parameter.getSeqNo());
// Custom display
detail.put("is_displayed_as_panel", "Y");
detail.put("is_displayed_as_panel", parameter.isActive() ? "Y" : "N");

// Mandatory Properties
detail.put("is_mandatory", parameter.isMandatory());

// Editable Properties
detail.put("read_only_logic", parameter.getReadOnlyLogic());
detail.put("is_info_only", parameter.isInfoOnly());
Expand Down
17 changes: 12 additions & 5 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 @@ -70,6 +70,7 @@ public DictionaryDocument withEntity(PO entity) {
documentDetail.put("help", window.get_Translation(I_AD_Window.COLUMNNAME_Help, getLanguage()));
documentDetail.put("window_type", window.getWindowType());
documentDetail.put("is_sales_transaction", window.isSOTrx());
documentDetail.put("is_active", window.isActive());
// Tabs
documentDetail.put("tabs", convertTabs(Arrays.asList(window.getTabs(false, null))));
putDocument(documentDetail);
Expand All @@ -92,18 +93,23 @@ private List<Map<String, Object>> convertTabs(List<MTab> tabs) {
return tabsDetail;
}
tabs.forEach(tab -> {
if (!tab.isActive()) {
return;
}
tabsDetail.add(parseTab(tab));
});
return tabsDetail;
}

private Map<String, Object> parseTab(MTab tab) {
Map<String, Object> detail = new HashMap<>();
detail.put("id", tab.getAD_Tab_ID());
detail.put("uuid", tab.getUUID());
detail.put("name", tab.get_Translation(I_AD_Tab.COLUMNNAME_Name, getLanguage()));
detail.put("description", tab.get_Translation(I_AD_Tab.COLUMNNAME_Description, getLanguage()));
detail.put("help", tab.get_Translation(I_AD_Tab.COLUMNNAME_Help, getLanguage()));
detail.put("is_active", tab.isActive());

// Record attributes
detail.put("is_insert_record", tab.isInsertRecord());
detail.put("commit_warning", tab.get_Translation(I_AD_Tab.COLUMNNAME_CommitWarning, getLanguage()));
Expand Down Expand Up @@ -235,8 +241,8 @@ private Map<String, Object> parseTab(MTab tab) {
// Fields
List<MField> fields = Arrays.asList(tab.getFields(false, null));
detail.put("fields", convertFields(fields));
detail.put("row_fields", convertFields(fields.stream().filter(field -> field.isDisplayed()).collect(Collectors.toList())));
detail.put("grid_fields", convertFields(fields.stream().filter(field -> field.isDisplayedGrid()).collect(Collectors.toList())));
// detail.put("row_fields", convertFields(fields.stream().filter(field -> field.isDisplayed()).collect(Collectors.toList())));
// detail.put("grid_fields", convertFields(fields.stream().filter(field -> field.isDisplayedGrid()).collect(Collectors.toList())));
// Processes
return detail;
}
Expand Down Expand Up @@ -336,6 +342,7 @@ private Map<String, Object> parseField(MField field) {
detail.put("name", field.get_Translation(I_AD_Field.COLUMNNAME_Name, getLanguage()));
detail.put("description", field.get_Translation(I_AD_Field.COLUMNNAME_Description, getLanguage()));
detail.put("help", field.get_Translation(I_AD_Field.COLUMNNAME_Help, getLanguage()));
detail.put("is_active", field.isActive());

//
detail.put("is_allow_copy", field.isAllowCopy());
Expand Down Expand Up @@ -375,8 +382,8 @@ private Map<String, Object> parseField(MField field) {
detail.put("is_displayed_grid", field.isDisplayedGrid());
detail.put("grid_sequence", field.getSeqNoGrid());
// Custom display
detail.put("is_displayed_as_panel", field.isDisplayed() ? "Y" : "N");
detail.put("is_displayed_as_table", field.isDisplayedGrid() ? 'Y' : 'N');
detail.put("is_displayed_as_panel", field.isActive() && field.isDisplayed() ? "Y" : "N");
detail.put("is_displayed_as_table", field.isActive() && field.isDisplayedGrid() ? 'Y' : 'N');

// Editable Properties
detail.put("is_read_only", field.isReadOnly());
Expand Down
Loading