Svg model display

From 704306ca20ae5b96bfddedd3e8410b3f62cd81d5 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 11 Apr 2019 17:55:47 +0200 Subject: Add Log in UI Add log in UI from Loop logs table so that user see what has been done Issue-ID: CLAMP-313 Change-Id: I673a46e7b867852179b32d163241de67b300b07c Signed-off-by: sebdet --- .../resources/designer/modeler/dist/index.html | 57 +- .../partials/portfolios/clds_modelling.html | 705 ++++++++++----------- .../resources/designer/scripts/CldsModelService.js | 5 +- .../designer/scripts/CldsOpenModelCtrl.js | 1 + .../META-INF/resources/designer/scripts/app.js | 16 +- .../designer/scripts/propertyController.js | 4 + 6 files changed, 403 insertions(+), 385 deletions(-) diff --git a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html index 6b8efedfd..ead478a4e 100644 --- a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html +++ b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html @@ -23,26 +23,51 @@ - Svg model display - - - +Svg model display + + + + -

Ooops, we could not display the Closed Loop Model.

- cause of the problem -

Ooops, we could not display the Closed Loop Model.

+ cause of the problem +

+ +

+ Loop Logs +

+ + + + + + + + + + + + + + + +

Date	Type	Log
{{log.logInstant}}	{{log.logType}}	{{log.message}}

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/clds_modelling.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/clds_modelling.html index 3b2e31233..691593211 100644 --- a/src/main/resources/META-INF/resources/designer/partials/portfolios/clds_modelling.html +++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/clds_modelling.html @@ -32,449 +32,436 @@ .Column1 { display: table-cell; } -.visible -{ -display:none; + +.visible { + display: none; } -.table-tree{ +.table-tree { border: 0px solid black; - table-layout: fixed; + table-layout: fixed; width: 600px; } -.selectedFile{ -background-color: #337ab7; -color: #fff; + +.selectedFile { + background-color: #337ab7; + color: #fff; } -.selectedcolor{ -color:#0000FF; +.selectedcolor { + color: #0000FF; } + .td-label-tree { border: 0px solid black; - overflow: hidden; - width: 250px; - vertical-align: bottom; + overflow: hidden; + width: 250px; + vertical-align: bottom; } -.table-level1-tree{ +.table-level1-tree { border: 0px solid black; - table-layout: fixed; - width: 580px; + table-layout: fixed; + width: 580px; } .td-level1-label-tree { - overflow: hidden; - width: 230px; + overflow: hidden; + width: 230px; } -.table-level2-tree{ - table-layout: fixed; - width: 560px; +.table-level2-tree { + table-layout: fixed; + width: 560px; } .td-level2-label-tree { - overflow: hidden; - width: 210px; + overflow: hidden; + width: 210px; } -.table-level3-tree{ - table-layout: fixed; - width: 540px; +.table-level3-tree { + table-layout: fixed; + width: 540px; } .td-level3-label-tree { - overflow: hidden; - width: 190px; + overflow: hidden; + width: 190px; } -.table-level4-tree{ - table-layout: fixed; - width: 520px; +.table-level4-tree { + table-layout: fixed; + width: 520px; } .td-level4-label-tree { - overflow: hidden; - width: 170px; + overflow: hidden; + width: 170px; } -.table-level5-tree{ - table-layout: fixed; - width: 500px; +.table-level5-tree { + table-layout: fixed; + width: 500px; } .td-level5-label-tree { - overflow: hidden; - width: 150px; + overflow: hidden; + width: 150px; } -.table-level6-tree{ - table-layout: fixed; - width: 480px; +.table-level6-tree { + table-layout: fixed; + width: 480px; } .td-level6-label-tree { - overflow: hidden; - width: 130px; + overflow: hidden; + width: 130px; } -.table-level7-tree{ - table-layout: fixed; - width: 460px; +.table-level7-tree { + table-layout: fixed; + width: 460px; } .td-level7-label-tree { - overflow: hidden; - width: 110px; + overflow: hidden; + width: 110px; } -.table-level8-tree{ - table-layout: fixed; - width: 440px; +.table-level8-tree { + table-layout: fixed; + width: 440px; } .td-level8-label-tree { - overflow: hidden; - width: 90px; + overflow: hidden; + width: 90px; } - -.table-level9-tree{ - table-layout: fixed; - width: 420px; +.table-level9-tree { + table-layout: fixed; + width: 420px; } .td-level9-label-tree { - overflow: hidden; - width: 70px; + overflow: hidden; + width: 70px; } - -.table-level10-tree{ - table-layout: fixed; - width: 400px; +.table-level10-tree { + table-layout: fixed; + width: 400px; } .td-level10-label-tree { - overflow: hidden; - width: 50px; + overflow: hidden; + width: 50px; } - .td-default_value-tree { border: 0px solid black; - overflow: hidden; - width: 180px !important; - vertical-align: bottom; - text-align: left !important; + overflow: hidden; + width: 180px !important; + vertical-align: bottom; + text-align: left !important; } -.td-blank{ -width: 30px; - +.td-blank { + width: 30px; } -.td-button{ -width: 14px; +.td-button { + width: 14px; } .td-tree { border: 0px solid black; - overflow: hidden; - width: 100px; - vertical-align: top; - text-align: center !important; -} - -/* #contextmenu-node{ - position: absolute; - background-color: white; - border: solid #CCCCCC 1px; - margin-left:60px; -} - -.contextmenu-item{ - margin: 0.5em; - padding-left: 0.5em; - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 1.42857143; - color: #333; - white-space: nowrap; -} - -.contextmenu-item:hover{ - background-color: #3c8dbc; - cursor: default; - color:#fff; -} - */ - #contextmenu-node{ - position: absolute; - background-color: white; - border: solid #CCCCCC 1px; - margin-top:-60px; - + overflow: hidden; + width: 100px; + vertical-align: top; + text-align: center !important; } -.contextmenu-item{ - margin: 0.5em; - padding-left: 0.5em; - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 1.42857143; - color: #333; - white-space: nowrap; +#contextmenu-node { + position: absolute; + background-color: white; + border: solid #CCCCCC 1px; + margin-top: -60px; } -.contextmenu-item:hover{ - background-color: #3c8dbc; - cursor: default; - color:#fff; +.contextmenu-item { + margin: 0.5em; + padding-left: 0.5em; + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.42857143; + color: #333; + white-space: nowrap; } - -

- - -

- - Project Explorer - -

- -

- - {{projectName}} -

+.contextmenu-item:hover { + background-color: #3c8dbc; + cursor: default; + color: #fff; +} -

+ +

+ + +

+ + Project Explorer + +

- - Model + ng-click="showUTMViewMain=!showUTMViewMain"> + {{projectName}}

+ +

- -

- +

+ +

+ + + Model +

- - - Service -

+ ng-click="showUTMViewService=!showUTMViewService"> - Service Details + Service

- - - - - - - + + + + + + + + + + + +
- - - - - - - - - - -

-
- - - - - Service Input -
-
- - - - - - - - - - - - -
- -
- +
+ +
+
+ + + Service Details +
+
+ +
+ + + + - - - + + + + + + +
+ - - - - - + - - - - - - - + +

- Required Only -

- Select All -

- Unselect All + +
+ + + + Service Input +

+ + + -

- - +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
Required + Only
Select + All
+ Unselect All
+
+ +
+ Default Value +
+
+ + -
- - - - - Service Output -
- - - - - -
- +
+ + + Service Output +

- - - - + + +
-
- - +
+ + + + + - - - -
+
+ - - Service Fault -
- - -
-

- - -
+ Service Fault + + + + + + +
+ +
-
- - +
+
+ - - Test Set -
-
-
Test Set +
+
+
-
-
- -
-
-
{{activityTestCase.testCaseName}}
-
-
-
-
-
{{activityTestCase.testCaseName + "_" + activityTestCase.version}}
-
-
-
+
+
+ +
+
+
+ {{activityTestCase.testCaseName}} +
+
+
+
+
+
+ {{activityTestCase.testCaseName + + "_" + activityTestCase.version}} +
+
+
+
+

@@ -483,50 +470,42 @@ width: 14px;

- - -
- -
-
-
+ +
+ - - Closed Loop Modeler - - - No LOOP loaded yet - - - -
+
+
+
-
-
-
-
-
-
+ Closed + Loop Modeler + No + LOOP loaded yet + +
+
+
+
+
+
+
+

- - -
- +

-

-
-
-

- - + \ No newline at end of file diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index b0977be02..34e90e632 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -70,7 +70,6 @@ app var svcUrl = "/restservices/clds/v2/loop/" + modelName; $http.get(svcUrl).success(function(data) { cl_props = data; - $("#loop_name").text(getLoopName()); def.resolve(data); }).error(function(data) { def.reject("Open Model not successful"); @@ -139,7 +138,7 @@ app }; this.processActionResponse = function(modelName) { // populate control name (prefix and uuid here) - var headerText = "Closed Loop Modeler - " + modelName; + $("#loop_name").text(getLoopName()); setStatus(); manageCLImage(modelName); enableDisableMenuOptions(); @@ -181,9 +180,9 @@ app 'Status: ' + statusMsg + ''); } + function manageCLImage(modelName) { getModelImage(modelName).then(function(pars) { - //var svg=''; var svg = pars; if ($("#svgContainer").length > 0) $("#svgContainer").remove(); diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js index 16b7d87fe..3fa37e827 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js @@ -133,6 +133,7 @@ function($scope, $rootScope, $modalInstance, $window, $uibModalInstance, cldsMod // deserialize model properties selected_model = modelName; cldsModelService.processActionResponse(modelName); + $rootScope.refreshLoopLog(); // set model bpmn and open diagram $rootScope.isPalette = true; }, function(data) { diff --git a/src/main/resources/META-INF/resources/designer/scripts/app.js b/src/main/resources/META-INF/resources/designer/scripts/app.js index 2a2994ab4..323cffc1e 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/app.js +++ b/src/main/resources/META-INF/resources/designer/scripts/app.js @@ -214,8 +214,8 @@ function($scope, $rootScope, $timeout, dialogs) { console.log("MenuCtrl"); $rootScope.screenName = "Universal Test Modeler"; + $rootScope.loop_logs = []; $rootScope.testSet = null; - var testingType = ""; $rootScope.contactUs = function() { console.log("contactUs"); @@ -466,11 +466,20 @@ function($scope, $rootScope, $timeout, dialogs) { windowClass : 'my-class' }); dlg.result.then(function(name) { - + }, function() { - }); }; + $rootScope.refreshLoopLog = function() { + var newLogArray = []; + if (getLoopLogsArray() != undefined) { + newLogArray=getLoopLogsArray(); + } + $rootScope.loop_logs.splice(0, $rootScope.loop_logs.length); + for (var i=0;i

- - {{projectName}} -

- - Model + ng-click="showUTMViewMain=!showUTMViewMain"> + {{projectName}}

+ + + Model +

- - - Service -

+ ng-click="showUTMViewService=!showUTMViewService"> - Service Details + Service

- - - - - Service Input -

+ + + Service Details +

+ + + + Service Input +

+ Default Value +

- - - - - Service Output -

+ + + Service Output +

- - +

+ - - Service Fault -

- - +
+
+ - - Test Set -
-
-
Test Set +

+ - - Test Set -

-
{{activityTestCase.testCaseName}}
-

-
{{activityTestCase.testCaseName + "_" + activityTestCase.version}}
-

+
+ {{activityTestCase.testCaseName}} +
+

+
+ {{activityTestCase.testCaseName + + "_" + activityTestCase.version}} +
+

- - {{projectName}} -

- - Model + ng-click="showUTMViewMain=!showUTMViewMain"> + {{projectName}}

+ + + Model +

- - - Service -

+ ng-click="showUTMViewService=!showUTMViewService"> - Service Details + Service

- - - - - Service Input -

+ + + Service Details +

+ + + + Service Input +

+ Default Value +

- - - - - Service Output -

+ + + Service Output +

- - +

+ - - Service Fault -

- - + + + - - Test Set - - - Test Set +

+ - - Test Set -

- {{activityTestCase.testCaseName}} -

- {{activityTestCase.testCaseName + "_" + activityTestCase.version}} -

+ + {{activityTestCase.testCaseName}} + +

+ + {{activityTestCase.testCaseName + + "_" + activityTestCase.version}} + +

- - +
+
+ - - Test Set -
-
-
Test Set +

-
{{activityTestCase.testCaseName}}
-

-
{{activityTestCase.testCaseName + "_" + activityTestCase.version}}
-

+
+ {{activityTestCase.testCaseName}} +
+

+
+ {{activityTestCase.testCaseName + + "_" + activityTestCase.version}} +
+