提交 99f00b02 编写于 作者: T Tijs Rademakers

Fix exit criteria visualization on plan models

上级 293a4fea
...@@ -213,6 +213,11 @@ public class DefaultCaseDiagramGenerator implements CaseDiagramGenerator { ...@@ -213,6 +213,11 @@ public class DefaultCaseDiagramGenerator implements CaseDiagramGenerator {
Stage planModel = caseModel.getPlanModel(); Stage planModel = caseModel.getPlanModel();
GraphicInfo graphicInfo = cmmnModel.getGraphicInfo(planModel.getId()); GraphicInfo graphicInfo = cmmnModel.getGraphicInfo(planModel.getId());
caseDiagramCanvas.drawStage(planModel.getName(), graphicInfo, scaleFactor); caseDiagramCanvas.drawStage(planModel.getName(), graphicInfo, scaleFactor);
for (Criterion criterion : planModel.getExitCriteria()) {
ActivityDrawInstruction criterionInstruction = activityDrawInstructions.get(criterion.getClass());
criterionInstruction.draw(caseDiagramCanvas, cmmnModel, criterion);
}
for (PlanItem planItem : caseModel.getPlanModel().getPlanItems()) { for (PlanItem planItem : caseModel.getPlanModel().getPlanItems()) {
drawActivity(caseDiagramCanvas, cmmnModel, planItem, scaleFactor); drawActivity(caseDiagramCanvas, cmmnModel, planItem, scaleFactor);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div ng-controller="FlowableTransitionEventCtrl"> <div ng-controller="FlowableTransitionEventCtrl">
<select ng-model="property.value" ng-change="transitionEventChanged()"> <select ng-model="property.value" ng-change="transitionEventChanged()">
<option>complete</option> <option>complete</option>
<option>exit</option>
<option>occur</option> <option>occur</option>
<option>start</option> <option>start</option>
<option>terminate</option> <option>terminate</option>
......
...@@ -86,6 +86,8 @@ public class CmmnDisplayJsonConverter { ...@@ -86,6 +86,8 @@ public class CmmnDisplayJsonConverter {
elementNode.put("type", "PlanModel"); elementNode.put("type", "PlanModel");
elementArray.add(elementNode); elementArray.add(elementNode);
processCriteria(caseObject.getPlanModel().getExitCriteria(), "ExitCriterion", pojoModel, elementArray);
processElements(caseObject.getPlanModel().getPlanItems(), pojoModel, elementArray, flowArray, diagramInfo); processElements(caseObject.getPlanModel().getPlanItems(), pojoModel, elementArray, flowArray, diagramInfo);
} }
......
...@@ -161,6 +161,11 @@ public class ModelImageService { ...@@ -161,6 +161,11 @@ public class ModelImageService {
org.flowable.cmmn.model.GraphicInfo graphicInfo = cmmnModel.getGraphicInfo(caseModel.getPlanModel().getId()); org.flowable.cmmn.model.GraphicInfo graphicInfo = cmmnModel.getGraphicInfo(caseModel.getPlanModel().getId());
scaleCmmnGraphicInfo(graphicInfo, scaleFactor); scaleCmmnGraphicInfo(graphicInfo, scaleFactor);
for (Criterion criterion : caseModel.getPlanModel().getExitCriteria()) {
org.flowable.cmmn.model.GraphicInfo criterionGraphicInfo = cmmnModel.getGraphicInfo(criterion.getId());
scaleCmmnGraphicInfo(criterionGraphicInfo, scaleFactor);
}
scalePlanItems(caseModel.getPlanModel().getPlanItems(), cmmnModel, scaleFactor); scalePlanItems(caseModel.getPlanModel().getPlanItems(), cmmnModel, scaleFactor);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册