added some fixes for edit mode of post coordination table and scale v…

…alue cards
protegeproject · Sep 30, 2024 · 1723e62 · 1723e62
1 parent eb8e8f2
commit 1723e62
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 72 deletions.
diff --git a/...u/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletPresenter.java b/...u/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletPresenter.java
@@ -44,6 +44,10 @@ public class PostCoordinationPortletPresenter extends AbstractWebProtegePortletP
 
     private final List<PostCoordinationCustomScales> postCoordinationCustomScalesList = new ArrayList<>();
 
+    private boolean editMode = false;
+
+    private Optional<OWLEntity> entityIri;
+
 
     @Inject
     public PostCoordinationPortletPresenter(@Nonnull SelectionModel selectionModel,
@@ -68,11 +72,7 @@ public void startPortlet(PortletUi portletUi, WebProtegeEventBus eventBus) {
         portletUi.setWidget(view.asWidget());
         setDisplaySelectedEntityNameAsSubtitle(true);
 
-        scaleValueCardPresenters.clear();
-        tableLabelsForAxes.clear();
-        compositeAxisList.clear();
-        scaleLabelsForAxes.clear();
-        genericScale.clear();
+        clearAllDate();
 
 
         dispatch.execute(GetPostCoordinationTableConfigurationAction.create("ICD"), result -> {
@@ -126,14 +126,12 @@ remove the orElseGet() and add back the orElseThrow() when we have proper labels
         });
 
         view.setEditButtonHandler(() -> {
-            scaleValueCardPresenters.values().forEach(presenter -> presenter.setEditMode(true));
-            view.setEditMode(true);
+            this.setEditMode(true);
         });
 
         view.setCancelButtonHandler(() -> {
-            handleAfterSetEntity(getSelectedEntity());
-            view.setEditMode(false);
-            scaleValueCardPresenters.values().forEach(presenter -> presenter.setEditMode(false));
+            handleAfterSetEntity(this.entityIri);
+            this.setEditMode(false);
         });
 
         view.setSaveButtonHandler((postcoordinationSpec) -> {
@@ -143,9 +141,10 @@ remove the orElseGet() and add back the orElseThrow() when we have proper labels
                             }
                     )
             );
-            view.setEditMode(false);
-            scaleValueCardPresenters.values().forEach(presenter -> presenter.setEditMode(false));
+            this.setEditMode(false);
         });
+
+        this.setEditMode(false);
     }
 
     private ScaleValueCardPresenter createScaleValueCardPresenter(PostCoordinationTableAxisLabel axis, PostCoordinationScaleValue scaleValue) {
@@ -159,7 +158,7 @@ protected void handleReloadRequest() {
 
     @Override
     protected void handleAfterSetEntity(Optional<OWLEntity> entityData) {
-        clearScaleValueCards();
+        this.entityIri = entityData;
         logger.info("Fac fetch la entity " + entityData);
         entityData.ifPresent(owlEntity -> dispatch.execute(GetEntityCustomScalesAction.create(owlEntity.getIRI().toString(), getProjectId()),
                 (result) -> {
@@ -171,9 +170,8 @@ protected void handleAfterSetEntity(Optional<OWLEntity> entityData) {
                 (result) -> {
                     logger.info("ALEX post coord result: " + result);
                     view.setTableData(result.getPostCoordinationSpecification());
+                    setEditMode(false);
                 }));
-
-
     }
 
     private void clearScaleValueCards() {
@@ -182,6 +180,14 @@ private void clearScaleValueCards() {
         view.getScaleValueCardsView().clear();
     }
 
+    private void clearAllDate() {
+        clearScaleValueCards();
+        tableLabelsForAxes.clear();
+        compositeAxisList.clear();
+        scaleLabelsForAxes.clear();
+        genericScale.clear();
+    }
+
     public void removeScaleValueCardPresenter(String axisIri) {
         ScaleValueCardPresenter presenter = scaleValueCardPresenters.get(axisIri);
         if (presenter != null) {
@@ -208,7 +214,7 @@ private void addScaleValueCardPresenter(String axisIri) {
                 PostCoordinationScaleValue.create(axisIri, currentAxisLabels.getScaleLabel(), existingScaleValueForAxis, genericScale1)
         );
         scaleValueCardPresenters.put(axisIri, newPresenter);
-        newPresenter.start(view.getScaleValueCardsView(), false);
+        newPresenter.start(view.getScaleValueCardsView(), editMode);
     }
 
     private TableCellChangedHandler handleTableCellChanged() {
@@ -266,4 +272,10 @@ private boolean isScaleValuePresenterCreated(String axisIri) {
                 .orElseGet(() -> scaleValueCardPresenters.get(axisIri) != null);
     }
 
+    public void setEditMode(boolean editMode) {
+        this.editMode = editMode;
+        scaleValueCardPresenters.values().forEach(presenter -> presenter.setEditMode(editMode));
+        view.setEditMode(editMode);
+    }
+
 }
diff --git a/...du/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletViewImpl.java b/...du/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletViewImpl.java
@@ -72,8 +72,10 @@ public PostCoordinationPortletViewImpl(DispatchServiceManager dispatch) {
 
 
     public void setEditMode(boolean editMode) {
-        setTableState(!editMode);
+        readOnly = !editMode;
+        setTableState(readOnly);
         saveValuesButton.setVisible(editMode);
+        cancelButton.setVisible(editMode);
         editValuesButton.setVisible(!editMode);
     }
 
@@ -84,7 +86,7 @@ public void setEditButtonHandler(EditButtonHandler handler) {
 
     @Override
     public void setCancelButtonHandler(CancelButtonHandler handler) {
-        this.cancelButtonHandler.handleCancelButton();
+        this.cancelButtonHandler = handler;
     }
 
     @Override
@@ -100,54 +102,6 @@ private void setTableState(boolean readOnly) {
         }
     }
 
-    private void cancelValues() {
-        dispatch.execute(GetEntityPostCoordinationAction.create(entityIri, this.projectId),
-                (result) -> this.setTableData(result.getPostCoordinationSpecification()));
-    }
-
-
-    private void saveValues() {
-        WhoficEntityPostCoordinationSpecification specification = new WhoficEntityPostCoordinationSpecification(entityIri, "ICD", new ArrayList<>());
-        boolean somethingChanged = false;
-        for (PostCoordinationTableRow tableRow : this.tableRows) {
-            PostCoordinationSpecification postCoordinationSpecification = new PostCoordinationSpecification(tableRow.getLinearizationDefinition().getWhoficEntityIri(),
-                    new ArrayList<>(),
-                    new ArrayList<>(),
-                    new ArrayList<>(),
-                    new ArrayList<>());
-            for (PostCoordinationTableCell cell : tableRow.getCellList()) {
-                if (cell.isTouched()) {
-                    if (cell.getValue().equalsIgnoreCase("NOT_ALLOWED")) {
-                        postCoordinationSpecification.getNotAllowedAxes().add(cell.getAxisLabel().getPostCoordinationAxis());
-                        somethingChanged = true;
-                    }
-                    if (cell.getValue().equalsIgnoreCase("ALLOWED")) {
-                        postCoordinationSpecification.getAllowedAxes().add(cell.getAxisLabel().getPostCoordinationAxis());
-                        somethingChanged = true;
-                    }
-                    if (cell.getValue().equalsIgnoreCase("REQUIRED")) {
-                        postCoordinationSpecification.getRequiredAxes().add(cell.getAxisLabel().getPostCoordinationAxis());
-                        somethingChanged = true;
-                    }
-                    if (cell.getValue().startsWith("DEFAULT")) {
-                        postCoordinationSpecification.getDefaultAxes().add(cell.getAxisLabel().getPostCoordinationAxis());
-                        somethingChanged = true;
-                    }
-                }
-            }
-            specification.getPostCoordinationSpecifications().add(postCoordinationSpecification);
-        }
-        if (somethingChanged) {
-            dispatch.execute(SaveEntityPostCoordinationAction.create(projectId, specification), (result) -> {
-                setTableState(true);
-                editValuesButton.setVisible(true);
-                saveValuesButton.setVisible(false);
-                logger.info("ALEX a venit cu rezult");
-            });
-
-        }
-    }
-
     private Optional<WhoficEntityPostCoordinationSpecification> createEditedSpec() {
         WhoficEntityPostCoordinationSpecification specification = new WhoficEntityPostCoordinationSpecification(entityIri, "ICD", new ArrayList<>());
         boolean somethingChanged = false;
@@ -395,6 +349,7 @@ public void setTableData(WhoficEntityPostCoordinationSpecification whoficSpecifi
         setTableState(true);
         editValuesButton.setVisible(true);
         saveValuesButton.setVisible(false);
+        cancelButton.setVisible(false);
     }
 
     private static final String SVG = "<div style='width: 12px; height: 12px; margin-right:2px;' >" +

diff --git a/...ord/bmir/protege/web/client/postcoordination/scaleValuesCard/ScaleValueCardPresenter.java b/...ord/bmir/protege/web/client/postcoordination/scaleValuesCard/ScaleValueCardPresenter.java
@@ -16,6 +16,8 @@ public class ScaleValueCardPresenter {
     private final DispatchServiceManager dispatchServiceManager;
     private final ProjectId projectId;
 
+    private boolean isReadOnly = true;
+
 
     public ScaleValueCardPresenter(PostCoordinationTableAxisLabel postCoordinationAxis,
                                    PostCoordinationScaleValue scaleValue,
@@ -43,7 +45,11 @@ private void initTable() {
         view.addSelectValueButton();
 
         dispatchServiceManager.execute(GetRenderedOwlEntitiesAction.create(projectId, new HashSet<>(scaleValue.getValueIris())),
-                result -> result.getRenderedEntities().forEach(renderedEntity -> addRow(!renderedEntity.getBrowserText().equals("") ? renderedEntity.getBrowserText() : renderedEntity.getEntity().toStringID()))
+                result -> {
+            result.getRenderedEntities()
+                    .forEach(renderedEntity -> addRow(!renderedEntity.getBrowserText().equals("") ? renderedEntity.getBrowserText() : renderedEntity.getEntity().toStringID()));
+            view.setEditMode(isReadOnly);
+                }
         );
 
         view.setDeleteValueButtonHandler((value) -> scaleValue.getValueIris().remove(value));
@@ -64,13 +70,14 @@ public PostCoordinationScaleValue getValues() {
     }
 
     public void setEditMode(boolean editMode) {
+        isReadOnly = !editMode;
         view.setEditMode(editMode);
     }
 
     public void start(VerticalPanel panel, boolean isEditMode) {
         bindView();
         initTable();
-        view.setEditMode(isEditMode);
+        setEditMode(isEditMode);
         panel.add(view.asWidget());
     }
 }
diff --git a/...ford/bmir/protege/web/client/postcoordination/scaleValuesCard/ScaleValueCardViewImpl.java b/...ford/bmir/protege/web/client/postcoordination/scaleValuesCard/ScaleValueCardViewImpl.java
@@ -149,10 +149,14 @@ public void setEditMode(boolean enabled) {
 
     private void setReadOnly(boolean readOnly) {
         isReadOnly = readOnly;
-        if (isReadOnly) {
-            rootPanel.addStyleName(postCoordinationStyle.disabled());
-        } else {
-            rootPanel.removeStyleName(postCoordinationStyle.disabled());
+
+        for (int i = 1; i < valueTable.getRowCount(); i++) {
+            if (readOnly) {
+                valueTable.getRowFormatter().addStyleName(i, postCoordinationStyle.disabled());
+            } else {
+                valueTable.getRowFormatter().removeStyleName(i, postCoordinationStyle.disabled());
+            }
         }
     }
+
 }