Add Log in UI 83/85083/1
authorsebdet <sebastien.determe@intl.att.com>
Thu, 11 Apr 2019 15:55:47 +0000 (17:55 +0200)
committersebdet <sebastien.determe@intl.att.com>
Thu, 11 Apr 2019 15:55:47 +0000 (17:55 +0200)
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 <sebastien.determe@intl.att.com>
src/main/resources/META-INF/resources/designer/modeler/dist/index.html
src/main/resources/META-INF/resources/designer/partials/portfolios/clds_modelling.html
src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
src/main/resources/META-INF/resources/designer/scripts/app.js
src/main/resources/META-INF/resources/designer/scripts/propertyController.js

index 6b8efed..ead478a 100644 (file)
 
 <html>
 <head>
-    <title>Svg model display</title>
-    <link rel="stylesheet" href="css/diagram-js.css"/>
-    <link rel="stylesheet" href="css/app.css"/>
-    <script type="text/javascript" src="./scripts/app.js"></script>
+<title>Svg model display</title>
+<link rel="stylesheet" href="css/diagram-js.css" />
+<link rel="stylesheet" href="css/app.css" />
+<script type="text/javascript" src="./scripts/app.js"></script>
 </head>
+
 <body>
 
-<div class="content" id="js-drop-zone" id="div_content" ng-app="clds-app" ng-controller="MenuCtrl">
-    <div class="message error">
-        <div class="note">
-            <p>Ooops, we could not display the Closed Loop Model.</p>
-            <div class="details">
-                <span>cause of the problem</span>
-                <pre></pre>
-            </div>
-        </div>
-    </div>
+       <div class="content" id="js-drop-zone" id="div_content"
+               ng-app="clds-app" ng-controller="MenuCtrl">
+               <div class="message error">
+                       <div class="note">
+                               <p>Ooops, we could not display the Closed Loop Model.</p>
+                               <div class="details">
+                                       <span>cause of the problem</span>
+                                       <pre></pre>
+                               </div>
+                       </div>
+               </div>
+
+               <div class="canvas" id="js-canvas" style="margin-top: 100px">
+                       <label for="loop-log-div" class="col-sm-4 control-label">Loop Logs</label>
+                       <div id="loop-log-div" style="border: 2px solid gray;height: 20vh">
+                               <div id="loop-log-table-scroll" style="width: 100%;height: 87%;overflow: auto;margin-top: 20px;">
+                                       <table id="loop-log-table" style="width: 100%">
+                                               <thead>
+                                                       <tr>
+                                                               <th><span align="left" class="text">Date</span></th>
+                                                               <th><span align="center" class="text">Type</span></th>
+                                                               <th><span align="right" class="text">Log</span></th>
+                                                       </tr>
+                                               </thead>
+                                               <tbody>
+                                                       <tr ng-repeat="log in loop_logs" ng-class="{reverse: reverse}">
+                                                               <td>{{log.logInstant}}</td>
+                                                               <td>{{log.logType}}</td>
+                                                               <td>{{log.message}}</td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               </div>
+                       </div>
+               </div>
 
-    <div class="canvas" id="js-canvas" style="margin-top:100px"></div>
-</div>
+       </div>
 </body>
 
 </html>
index 3b2e312..6915932 100644 (file)
 .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;
 }
 
-</style>
-<div attribute-test="cldsmodelling" class="container-fluid" ng-controller="ActivityModellingCtrl" style="height: 90vh;margin:0;padding:0;overflow: hidden;">
-       <div id="utm-splitter" class="k-content"  style="height: 90vh;overflow: hidden;">
-       <div attribute-test="cldsmodelling2" id="UTMdashboard" style="height: 90vh;overflow: hidden;margin-left: 2px;margin-right: 2px;">
-               <div style="display: none;" id="projectExplorer">
-               <!-- clds: remove project explorer - use display: none -->
-               <!-- div style="width: 30%; height: 90vh;overflow: hidden;" id="projectExplorer" -->
-                       <div class="panel panel-primary">
-                               <div class="panel-heading">
-                                       <div style="color: white;">
-
-                                               <span class="pull-left"> <span>Project Explorer</span>
-                                               </span> <span class="pull-right" ng-click="showUTMView=!showUTMView"><i
-                                                       ng-class="showUTMView == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i></span>
-                                       </div>
-
-                                       <div class="clearfix"></div>
-                               </div>
-                               <div ng-class="{hidden:showUTMView,chaldean:showUTMView}">
-                                       <div class="panel-body" style="height: 79vh; overflow: auto;">
-                                               <div ng-if="projectName != null" >
-                                                       <div>
-                                                               <h6>
-                                                                       <span class="pull-left"
-                                                                               ng-click="showUTMViewMain=!showUTMViewMain"> <i
-                                                                               ng-class="showUTMViewMain == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i>
-                                                                       </span> <b>{{projectName}} </b>
-                                                               </h6>
+.contextmenu-item:hover {
+       background-color: #3c8dbc;
+       cursor: default;
+       color: #fff;
+}
 
 
-                                                       </div>
-                                                       <div style="margin-left: 5px"
-                                                               ng-class="{hidden:showUTMViewMain,chaldean:showUTMViewMain}">
+</style>
+<div attribute-test="cldsmodelling" class="container-fluid"
+       ng-controller="ActivityModellingCtrl"
+       style="height: 90vh; margin: 0; padding: 0; overflow: hidden;">
+       <div id="utm-splitter" class="k-content"
+               style="height: 90vh; overflow: hidden;">
+               <div attribute-test="cldsmodelling2" id="UTMdashboard"
+                       style="height: 90vh; overflow: hidden; margin-left: 2px; margin-right: 2px;">
+                       <div style="display: none;" id="projectExplorer">
+                               <!-- clds: remove project explorer - use display: none -->
+                               <!-- div style="width: 30%; height: 90vh;overflow: hidden;" id="projectExplorer" -->
+                               <div class="panel panel-primary">
+                                       <div class="panel-heading">
+                                               <div style="color: white;">
+
+                                                       <span class="pull-left"> <span>Project Explorer</span>
+                                                       </span> <span class="pull-right" ng-click="showUTMView=!showUTMView"><i
+                                                               ng-class="showUTMView == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i></span>
+                                               </div>
 
+                                               <div class="clearfix"></div>
+                                       </div>
+                                       <div ng-class="{hidden:showUTMView,chaldean:showUTMView}">
+                                               <div class="panel-body" style="height: 79vh; overflow: auto;">
+                                                       <div ng-if="projectName != null">
                                                                <div>
                                                                        <h6>
                                                                                <span class="pull-left"
-                                                                                       ng-click="showUTMViewModel=!showUTMViewModel"> <i
-                                                                                       ng-class="showUTMViewModel == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
-                                                                               </i>
-                                                                               </span><b>Model</b>
+                                                                                       ng-click="showUTMViewMain=!showUTMViewMain"> <i
+                                                                                       ng-class="showUTMViewMain == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i>
+                                                                               </span> <b>{{projectName}} </b>
                                                                        </h6>
+
+
                                                                </div>
-                                                               <div style="margin-left: 15px"
-                                                                       ng-class="{hidden:showUTMViewModel,chaldean:showUTMViewModel}">                                                                 
-                                                                       
-                                                                       <div id="div_models" ng-include="'model_renderer.html'">
-                                                                               
+                                                               <div style="margin-left: 5px"
+                                                                       ng-class="{hidden:showUTMViewMain,chaldean:showUTMViewMain}">
+
+                                                                       <div>
+                                                                               <h6>
+                                                                                       <span class="pull-left"
+                                                                                               ng-click="showUTMViewModel=!showUTMViewModel"> <i
+                                                                                               ng-class="showUTMViewModel == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
+                                                                                       </i>
+                                                                                       </span><b>Model</b>
+                                                                               </h6>
                                                                        </div>
-                                                               </div>
+                                                                       <div style="margin-left: 15px"
+                                                                               ng-class="{hidden:showUTMViewModel,chaldean:showUTMViewModel}">
 
-                                                               <div>
-                                                                       <h6>
-                                                                               <span class="pull-left"
-                                                                                       ng-click="showUTMViewService=!showUTMViewService"> <i
-                                                                                       ng-class="showUTMViewService == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
-                                                                               </i>
-                                                                               </span><b>Service</b>
-                                                                       </h6>
-                                                               </div>
+                                                                               <div id="div_models" ng-include="'model_renderer.html'">
 
-                                                               <div style="margin-left: 10px"
-                                                                       ng-class="{hidden:showUTMViewService,chaldean:showUTMViewService}">
+                                                                               </div>
+                                                                       </div>
 
-                                                                       <div style="width: 190px;">
+                                                                       <div>
                                                                                <h6>
                                                                                        <span class="pull-left"
-                                                                                               ng-click="showUTMViewDtl=!showUTMViewDtl"> <i
-                                                                                               ng-class="showUTMViewDtl == true ?'fa fa-minus-circle':'fa fa-plus-circle'">
+                                                                                               ng-click="showUTMViewService=!showUTMViewService"> <i
+                                                                                               ng-class="showUTMViewService == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
                                                                                        </i>
-                                                                                       </span><b>Service Details</b>
+                                                                                       </span><b>Service</b>
                                                                                </h6>
                                                                        </div>
 
-                                                                       <table class="table-tree">
-                                                                               <tr>
-                                                                                       <td class="td-label-tree" style="margin-top: 30px;">
-                                                                                           <table>
-                                                                                              <tr>
-                                                                                                   <td>   </td>
-                                                                                              </tr>
-                                                                                              <tr>
-                                                                                                   <td>   </td>
-                                                                                              </tr>
-                                                                                              <tr>
-                                                                                                  <td>
-                                                                                                      <h6>
-                                                                                                                          <span class="pull-left"      ng-click="showUTMViewInput=!showUTMViewInput"> 
-                                                                                                                                       <i ng-class="showUTMViewInput == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
-                                                                                                                                       </i>
-                                                                                                                         </span>
-                                                                                                                         <b>Service Input</b>
-                                                                                                                 </h6>
-                                                                                                  </td>
-                                                                                              </tr>                                                                                        
-                                                                                           </table>
-                                                                                       </td>
-                                                                                       
-                                                                                       <td class="td-default_value-tree" >
-                                                                                           <table  style="margin-top: 30px;">
-                                                                                              <tr>
-                                                                                                  <td></td>
-                                                                                              </tr>
-                                                                                              <tr>
-                                                                                                  <td></td>
-                                                                                              </tr>
-                                                                                              
-                                                                                              <tr>
-                                                                                                  <td class="td-blank"></td>   
-                                                                                              </tr>
-                                                                                           </table>
-                                                                                       </td>
-                                                                                       
-                                                                                       <td>
-                                                                                               <div ng-show="isModel">
-                                                                                                       <table style="margin-top: -10px;width: 260px;margin-left: -116px;">
+                                                                       <div style="margin-left: 10px"
+                                                                               ng-class="{hidden:showUTMViewService,chaldean:showUTMViewService}">
+
+                                                                               <div style="width: 190px;">
+                                                                                       <h6>
+                                                                                               <span class="pull-left"
+                                                                                                       ng-click="showUTMViewDtl=!showUTMViewDtl"> <i
+                                                                                                       ng-class="showUTMViewDtl == true ?'fa fa-minus-circle':'fa fa-plus-circle'">
+                                                                                               </i>
+                                                                                               </span><b>Service Details</b>
+                                                                                       </h6>
+                                                                               </div>
+
+                                                                               <table class="table-tree">
+                                                                                       <tr>
+                                                                                               <td class="td-label-tree" style="margin-top: 30px;">
+                                                                                                       <table>
                                                                                                                <tr>
-                                                                                                                       <td class="td-default_value-tree">
-                                                                                                                               <input type="radio" ng-model="utmModelSchemaExtension.radioSelection"
-                                                                                                                                               ng-click="requiredOnly()"
-                                                                                                                                               value="Required Only"><b>Required Only</b>
-                                                                                                                       </td>                                                                   
-                                                                                                                       
-                                                                                                                       
-                                                                                                                       <!-- <td class="td-default_value-tree">
-                                                                                                                           <h6> <b>Default Value</b></h6>                      
-                                                                                                                       </td> -->
-                                                                                                                       
+                                                                                                                       <td></td>
                                                                                                                </tr>
                                                                                                                <tr>
-                                                                                                                                                                                               
-                                                                                                                       <td style="text-align: left;" class="td-default_value-tree">
-                                                                                                                               <input type="radio" ng-model="utmModelSchemaExtension.radioSelection"
-                                                                                                                                                       ng-click="selectAll()"
-                                                                                                                                                       value="Select All"> <b>Select All</b>
-                                                                                                                       </td>
                                                                                                                        <td></td>
-                                                                                                                       
                                                                                                                </tr>
                                                                                                                <tr>
-                                                                                                                                                                                                       
-                                                                                                                       <td style="text-align: left;" class="td-default_value-tree">
-                                                                                                                               <input type="radio" ng-model="utmModelSchemaExtension.radioSelection"
-                                                                                                                                               ng-click="unSelectAll()"
-                                                                                                                                               value="Unselect All">  <b>Unselect All</b>
+                                                                                                                       <td>
+                                                                                                                               <h6>
+                                                                                                                                       <span class="pull-left"
+                                                                                                                                               ng-click="showUTMViewInput=!showUTMViewInput">
+                                                                                                                                               <i
+                                                                                                                                               ng-class="showUTMViewInput == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
+                                                                                                                                       </i>
+                                                                                                                                       </span> <b>Service Input</b>
+                                                                                                                               </h6>
                                                                                                                        </td>
-                                                                                                                       
-                                                                                                                       
+                                                                                                               </tr>
+                                                                                                       </table>
+                                                                                               </td>
+
+                                                                                               <td class="td-default_value-tree">
+                                                                                                       <table style="margin-top: 30px;">
+                                                                                                               <tr>
                                                                                                                        <td></td>
                                                                                                                </tr>
-                                                                                                       </table>                                                                                                                
-                                                                                               </div>
-                                                                                       </td>
-                                                                                       
-                                                                                       <!-- <td class="td-blank"></td>
-                                                                                       <td class="td-blank"></td> -->
-                                                                                       <td class="td-default_value-tree">
+                                                                                                               <tr>
+                                                                                                                       <td></td>
+                                                                                                               </tr>
+
+                                                                                                               <tr>
+                                                                                                                       <td class="td-blank"></td>
+                                                                                                               </tr>
+                                                                                                       </table>
+                                                                                               </td>
+
+                                                                                               <td>
+                                                                                                       <div ng-show="isModel">
+                                                                                                               <table
+                                                                                                                       style="margin-top: -10px; width: 260px; margin-left: -116px;">
+                                                                                                                       <tr>
+                                                                                                                               <td class="td-default_value-tree"><input
+                                                                                                                                       type="radio"
+                                                                                                                                       ng-model="utmModelSchemaExtension.radioSelection"
+                                                                                                                                       ng-click="requiredOnly()" value="Required Only"><b>Required
+                                                                                                                                               Only</b></td>
+
+
+                                                                                                                               <!-- <td class="td-default_value-tree">
                                                                                                                            <h6> <b>Default Value</b></h6>                      
-                                                                                                                       </td>
-                                                                                       
-                                                                                       
-                                                                                       
-                                                                                       
-                                                                                       
-                                                                               </tr>
-                                                                   </table>
-
-                                                                       <table class="table-tree" style="margin-top: -12px;>
+                                                                                                                       </td> -->
+
+                                                                                                                       </tr>
+                                                                                                                       <tr>
+
+                                                                                                                               <td style="text-align: left;"
+                                                                                                                                       class="td-default_value-tree"><input type="radio"
+                                                                                                                                       ng-model="utmModelSchemaExtension.radioSelection"
+                                                                                                                                       ng-click="selectAll()" value="Select All"> <b>Select
+                                                                                                                                               All</b></td>
+                                                                                                                               <td></td>
+
+                                                                                                                       </tr>
+                                                                                                                       <tr>
+
+                                                                                                                               <td style="text-align: left;"
+                                                                                                                                       class="td-default_value-tree"><input type="radio"
+                                                                                                                                       ng-model="utmModelSchemaExtension.radioSelection"
+                                                                                                                                       ng-click="unSelectAll()" value="Unselect All">
+                                                                                                                                       <b>Unselect All</b></td>
+
+
+                                                                                                                               <td></td>
+                                                                                                                       </tr>
+                                                                                                               </table>
+                                                                                                       </div>
+                                                                                               </td>
+
+                                                                                               <!-- <td class="td-blank"></td>
+                                                                                       <td class="td-blank"></td> -->
+                                                                                               <td class="td-default_value-tree">
+                                                                                                       <h6>
+                                                                                                               <b>Default Value</b>
+                                                                                                       </h6>
+                                                                                               </td>
+
+
+
+
+
+                                                                                       </tr>
+                                                                               </table>
+
+                                                                               <table class="table-tree"
+                                                                                       style="margin-top: -12px;>
                                                                                <tr>
                                                                                        <td class="td-label-tree">
-                                                                                               <h6>
-                                                                                                       <span class="pull-left"
-                                                                                                                       ng-click="showUTMViewOutput=!showUTMViewOutput"> 
-                                                                                                               <i
-                                                                                                                       ng-class="showUTMViewOutput == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
-                                                                                                               </i>
-                                                                                                       </span>
-                                                                                                       <b>Service Output</b>
-                                                                                               </h6>
-                                                                                       </td>
-                                                                                       
-                                                                                       <td class="td-default_value-tree">
-                                                                                       </td>
-                                                                                       <td class="td-tree">
+                                                                                       <h6>
+                                                                                               <span class="pull-left"
+                                                                                                       ng-click="showUTMViewOutput=!showUTMViewOutput"> <i
+                                                                                                       ng-class="showUTMViewOutput == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
+                                                                                               </i>
+                                                                                               </span> <b>Service Output</b>
+                                                                                       </h6>
                                                                                        </td>
-                                                                               </tr>
-                                                               </table>
 
-                                                               
-                                                                       <table class="table-tree" style="margin-top: -12px;">
-                                                                               <tr>
-                                                                                       <td class="td-label-tree" >
-                                                                                               <h6>
-                                                                                                       <span class="pull-left"
-                                                                                                               ng-click="showUTMViewFault=!showUTMViewFault"> 
-                                                                                                               <i ng-class="showUTMViewFault == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
+                                                                                       <td class="td-default_value-tree"></td>
+                                                                                       <td class="td-tree"></td>
+                                                                                       </tr>
+                                                                               </table>
+
+
+                                                                               <table class="table-tree" style="margin-top: -12px;">
+                                                                                       <tr>
+                                                                                               <td class="td-label-tree">
+                                                                                                       <h6>
+                                                                                                               <span class="pull-left"
+                                                                                                                       ng-click="showUTMViewFault=!showUTMViewFault"> <i
+                                                                                                                       ng-class="showUTMViewFault == true ?'fa fa-plus-circle':'fa fa-minus-circle'">
                                                                                                                </i>
-                                                                                                       </span>
-                                                                                                       <b>Service Fault</b>
-                                                                                               </h6>
-                                                                                       </td>
-                                                                                       <td class="td-default_value-tree">
-                                                                                       </td>
-                                                                                       <td class="td-tree">
-                                                                                       </td>
-                                                                               </tr>
-                                                               </table>
-                                                               </div>
-                                                               
-                                                       
-                                                               <div>
+                                                                                                               </span> <b>Service Fault</b>
+                                                                                                       </h6>
+                                                                                               </td>
+                                                                                               <td class="td-default_value-tree"></td>
+                                                                                               <td class="td-tree"></td>
+                                                                                       </tr>
+                                                                               </table>
+                                                                       </div>
+
+
                                                                        <div>
-                                                                               <h6>
-                                                                                       <span class="pull-left"
-                                                                                               ng-click="showUTMViewTestSet=!showUTMViewTestSet"> 
-                                                                                               <i
-                                                                                               ng-class="showUTMViewTestSet == true ?'fa fa-minus-circle':'fa fa-plus-circle'">
+                                                                               <div>
+                                                                                       <h6>
+                                                                                               <span class="pull-left"
+                                                                                                       ng-click="showUTMViewTestSet=!showUTMViewTestSet"> <i
+                                                                                                       ng-class="showUTMViewTestSet == true ?'fa fa-minus-circle':'fa fa-plus-circle'">
                                                                                                </i>
-                                                                                       </span>
-                                                                                       <b ng-click="selectActivityTestSet()">Test Set</b>
-                                                                               </h6>
-                                                                       </div>
-                                                                       <div style="margin-left: 15px;"
+                                                                                               </span> <b ng-click="selectActivityTestSet()">Test Set</b>
+                                                                                       </h6>
+                                                                               </div>
+                                                                               <div style="margin-left: 15px;"
                                                                                        ng-class="{hidden:!showUTMViewTestSet,chaldean:!showUTMViewTestSet}">
-                                                                               <div ng-show=" modeltestset.activityTestCases.length>0" style="width: 250px">
-                                                                                       <div ng-repeat="activityTestCase in modeltestset.activityTestCases">
-                                                                                       
-                                                                                               <div ng-if="activityTestCase.version ==null">
-                                                                                               <h6>
-                                                                                                       <div ng-mouseover="selectTC(activityTestCase)"><b id="{{activityTestCase.testCaseName}}" data-stuff='{{activityTestCase}}' data-model='{{utmModels}}' class="TCS" style="cursor:pointer;">{{activityTestCase.testCaseName}}</b></div>
-                                                                                       </h6>
-                                                                                       </div>
-                                                                                       <div ng-if="activityTestCase.version !=null">
-                                                                                               <h6>
-                                                                                                       <div ng-mouseover="selectTC(activityTestCase)"><b id="{{activityTestCase.testCaseName}}" data-stuff='{{activityTestCase}}' data-model='{{utmModels}}' class="TCS" style="cursor:pointer;">{{activityTestCase.testCaseName + "_" + activityTestCase.version}}</b></div>
-                                                                                       </h6>
-                                                                                       </div>
-                                                                                       </div>  
+                                                                                       <div ng-show=" modeltestset.activityTestCases.length>0"
+                                                                                               style="width: 250px">
+                                                                                               <div
+                                                                                                       ng-repeat="activityTestCase in modeltestset.activityTestCases">
+
+                                                                                                       <div ng-if="activityTestCase.version ==null">
+                                                                                                               <h6>
+                                                                                                                       <div ng-mouseover="selectTC(activityTestCase)">
+                                                                                                                               <b id="{{activityTestCase.testCaseName}}"
+                                                                                                                                       data-stuff='{{activityTestCase}}'
+                                                                                                                                       data-model='{{utmModels}}' class="TCS"
+                                                                                                                                       style="cursor: pointer;">{{activityTestCase.testCaseName}}</b>
+                                                                                                                       </div>
+                                                                                                               </h6>
+                                                                                                       </div>
+                                                                                                       <div ng-if="activityTestCase.version !=null">
+                                                                                                               <h6>
+                                                                                                                       <div ng-mouseover="selectTC(activityTestCase)">
+                                                                                                                               <b id="{{activityTestCase.testCaseName}}"
+                                                                                                                                       data-stuff='{{activityTestCase}}'
+                                                                                                                                       data-model='{{utmModels}}' class="TCS"
+                                                                                                                                       style="cursor: pointer;">{{activityTestCase.testCaseName
+                                                                                                                                       + "_" + activityTestCase.version}}</b>
+                                                                                                                       </div>
+                                                                                                               </h6>
+                                                                                                       </div>
+                                                                                               </div>
+                                                                                       </div>
                                                                                </div>
                                                                        </div>
                                                                </div>
@@ -483,50 +470,42 @@ width: 14px;
                                        </div>
                                </div>
                        </div>
-               </div>
-
 
-               <!-- clds: width 100 instead of 70 -->
-               <div style="width: 100%;height:90vh" id="activity_modeler">
-               <!-- div style="width: 70%;height:90vh" id="activity_modeler" -->
 
-                       <div class="panel panel-primary">
-                               <div class="panel-heading">
-                                       <div style="color: white;">
+                       <!-- clds: width 100 instead of 70 -->
+                       <div style="width: 100%; height: 90vh" id="activity_modeler">
+                               <!-- div style="width: 70%;height:90vh" id="activity_modeler" -->
 
-                                               <span class="pull-left"> 
-                                                       <span id="modeler_name">Closed Loop Modeler</span>
-                                               </span> 
-                                               <span class="pull-right" >
-                                                       <span id="loop_name">No LOOP loaded yet</span>
-                                                       &nbsp;
-                                                       <i ng-click="showTDRView=!showTDRView" ng-class="showTDRView == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i>
-                                               </span>
-                                       </div>
+                               <div class="panel panel-primary">
+                                       <div class="panel-heading">
+                                               <div style="color: white;">
 
-                                       <div class="clearfix"></div>
-                               </div>
-                               <div ng-class="{hidden:showTDRView,chaldean:showTDRView}">
-                                       <div style="height: 83.5vh; width: 100%;">
-                                               <div class="panel-body" style="height: 83.5vh;padding: 0px;">
-                                                       <div  id="paletteDiv" style="width: 100%;height: 83.5vh;"
-                                                               ng-show="isPalette" ng-include="'./modeler/dist/index.html'">
+                                                       <span class="pull-left"> <span id="modeler_name">Closed
+                                                                       Loop Modeler</span>
+                                                       </span> <span class="pull-right"> <span id="loop_name">No
+                                                                       LOOP loaded yet</span> &nbsp; <i ng-click="showTDRView=!showTDRView"
+                                                               ng-class="showTDRView == true ?'fa fa-plus-circle':'fa fa-minus-circle'"></i>
+                                                       </span>
+                                               </div>
 
+                                               <div class="clearfix"></div>
+                                       </div>
+                                       <div ng-class="{hidden:showTDRView,chaldean:showTDRView}">
+                                               <div style="height: 83.5vh; width: 100%;">
+                                                       <div class="panel-body" style="height: 83.5vh; padding: 0px;">
+                                                               <div id="paletteDiv" style="width: 100%; height: 83.5vh;"
+                                                                       ng-show="isPalette" ng-include="'./modeler/dist/index.html'">
+                                                               </div>
                                                        </div>
-                        
-
-                                 </div>
-                        
+                                               </div>
                                        </div>
-
                                </div>
                        </div>
 
                </div>
-  </div>                                                               
-</div>
-<div ng-show ="isResult">      </div>
-<script type="text/ng-template"  id="service_tree_element_renderer.html">
+       </div>
+       <div ng-show="isResult"></div>
+       <script type="text/ng-template" id="service_tree_element_renderer.html">
    
 
 
@@ -636,7 +615,7 @@ width: 14px;
        
 </script>
 
-<script type="text/ng-template" id="model_renderer.html">
+       <script type="text/ng-template" id="model_renderer.html">
 
 <div ng-show="utmModels != null && utmModels.name != null">
       <div>            
@@ -665,4 +644,4 @@ width: 14px;
                                </div>
                </div>
                </div>
-</script>
+</script>
\ No newline at end of file
index b0977be..34e90e6 100644 (file)
@@ -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
                    '<span id="status_clds" style="position: absolute;  left: 61%;top: 151px; font-size:20px;">Status: '
                    + statusMsg + '</span>');
            }
+           
            function manageCLImage(modelName) {
                getModelImage(modelName).then(function(pars) {
-                       //var svg='<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/2000/svg"> <defs> <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" orient="auto" refX="11" refY="10" id="markerSjdype4kmnw"> <path d="M 1 5 L 11 10 L 1 15 Z" style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" fill="#000000" /> </marker> <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" orient="auto" refX="6" refY="6" id="markerSjdype4kmny"> <circle cx="6" cy="6" r="3.5" style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" fill="#ffffff" stroke="#000000" /> </marker> <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0"> <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" fill="#ffffff" stroke="#000000" /> </marker> <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" orient="auto" refX="11" refY="10" id="markerSjdype4kmo2"> <path d="M 1 5 L 11 10 L 1 15" style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" fill="#ffffff" stroke="#000000" /> </marker> <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4"> <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" fill="#ffffff" stroke="#000000" /> </marker> <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6"> <path d="M 1 4 L 5 16" style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" fill="#000000" stroke="#000000" /> </marker> </defs><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="start-circle" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"> <circle fill="none" r="17" cx="34" cy="41"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="Arrow_d0b22360-770d-4b05-b81c-cf148b121341" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"> <line y2="41" fill="none" x1="51" x2="170" y1="41"/> <polygon fill="none" points=" 166 38 166 44 172 41"/>             <polygon points=" 166 38 166 44 172 41" stroke="none"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="VES" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"> <rect fill="none" x="174" width="123" y="1" height="82"/> </g> <g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"> <rect x="174" width="123" y="1" height="82" stroke="none"/> </g> <g font-family="sans-serif" shape-rendering="geometricPrecision" text-rendering="optimizeQuality"> <text x="223" xml:space="preserve" y="42" stroke="none">VES</text> <line y2="83" fill="none" stroke-width="2" x1="194" x2="194" y1="1"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="Arrow_d4351927-d77a-4e04-82d1-cd8f2b008137" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"> <line y2="41" fill="none" x1="297" x2="416" y1="41"/> <polygon fill="none" points=" 412 38 412 44 418 41"/> <polygon points=" 412 38 412 44 418 41" stroke="none"/> </g> </g> </g>    <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="TCA" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"> <rect fill="none" x="420" width="123" y="1" height="82"/> </g> <g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" font-family="sans-serif" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"> <rect x="420" width="123" y="1" height="82" stroke="none"/> </g> <g font-family="sans-serif" shape-rendering="geometricPrecision" text-rendering="optimizeQuality"> <text x="470" xml:space="preserve" y="42" stroke="none">TCA</text> <line y2="62" fill="none" stroke-width="2" x1="420" x2="543" y1="62"/> </g> </g> </g>   <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="Arrow_5ae2966f-f971-4c3b-8237-efa551beb531" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"> <line y2="41" fill="none" x1="543" x2="662" y1="41"/> <polygon fill="none" points=" 658 38 658 44 664 41"/> <polygon points=" 658 38 658 44 664 41" stroke="none"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="Policy" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"> <rect fill="none" x="666" width="123" y="1" height="82"/> </g> <g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" font-family="sans-serif" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"> <rect x="666" width="123" y="1" height="82" stroke="none"/> </g> <g font-family="sans-serif" shape-rendering="geometricPrecision" text-rendering="optimizeQuality"> <text x="710" xml:space="preserve" y="42" stroke="none">Policy</text> <line y2="1" fill="none" stroke-width="2" x1="666" x2="727" y1="42"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="Arrow_ed5ccaed-6d8c-44e9-8245-85f66523cb44" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"> <line y2="41" fill="none" x1="789" x2="908" y1="41"/> <polygon fill="none" points=" 904 38 904 44 910 41"/> <polygon points=" 904 38 904 44 910 41" stroke="none"/> </g> </g> </g> <g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="&apos;Dialog&apos;" font-style="normal" data-element-id="circle_stop" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--> <defs id="genericDefs"/> <g> <g text-rendering="optimizeQuality" stroke-width="4" shape-rendering="geometricPrecision" font-family="sans-serif"> <circle fill="none" r="17" cx="929" cy="41"/> </g> </g> </g> </svg>';
                        var svg = pars;
                            if ($("#svgContainer").length > 0)
                                    $("#svgContainer").remove();
index 16b7d87..3fa37e8 100644 (file)
@@ -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) {
index 2a2994a..323cffc 100644 (file)
@@ -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<newLogArray.length;i++) {
+                       $rootScope.loop_logs.push(newLogArray[i]);
+               }
+           }
            $scope.extraUserInfo = function() {
 
                    var dlg = dialogs.create(
@@ -496,6 +505,7 @@ function($scope, $rootScope, $timeout, dialogs) {
 
                    cldsModelService.processAction(uiAction, modelName).then(function(pars) {
                            console.log("cldsPerformAction: pars=" + pars);
+                           $rootScope.refreshLoopLog();
                    }, function(data) {
 
                    });
index 75c64f3..916de67 100644 (file)
@@ -122,4 +122,8 @@ function getResourceDetailsVfcProperty() {
        return cl_props["modelPropertiesJson"]["resourceDetails"]["VFC"];
 }
 
+function getLoopLogsArray() {
+       return cl_props.loopLogs;
+}
+
 module.exports = { getOperationalPolicyProperty,getGlobalProperty,getMsProperty,getMsUI,getLastUpdatedStatus,getDeploymentID,getDeploymentStatusURL,getResourceDetailsProperty,getResourceDetailsVfcProperty };
\ No newline at end of file