cpee 2.1.51 → 2.1.53

data/cockpit/themes/default/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/default/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/default/rngs/parallel.rng

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/default/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/default/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,14 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      // only after setting content can we set the focus and position. It might loose some stuff nonetheless.
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1444,7 +1455,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/extended/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/extended/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/extended/rngs/parallel.rng

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/extended/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/extended/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,14 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      // only after setting content can we set the focus and position. It might loose some stuff nonetheless.
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1482,7 +1493,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/felix/rngs/alternative.rng

@@ -0,0 +1,25 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label="Min in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label="Max in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

data/cockpit/themes/felix/rngs/call.rng

@@ -0,0 +1,229 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="endpoint" rngui:label="Endpoint">
+    <data type="string"/>
+  </attribute>
+  <element name="parameters" rngui:header="Properties">
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
+    </element>
+    <element name="method" rngui:label="Method">
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="arguments" rngui:header="Arguments">
+      <zeroOrMore rngui:label="Create Argument Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
+        <data type="float" rngui:label="[0,1]"/>
+      </element>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+    </element>
+    <element name="_shifting" rngui:header="Log Time Shifting" rngui:fold="closed_conditional">
+      <element name="_shifting_type" rngui:label="Type">
+        <choice>
+          <value>Duration</value>
+          <value>Ends</value>
+        </choice>
+      </element>
+      <optional>
+        <element name="_shifting_expression" rngui:label="Expression">
+          <data type="string" rngui:label="e.g.: same day, 16:00; 2 and a half weeks"/>
+        </element>
+      </optional>
+    </element>
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
+            </element>
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='intrinsic'>Intrinsic</value>
+                <value id='extrinsic'>Extrinsic</value>
+                <value id='separate'>Separate</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="extractor_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+    </element>
+    <element name="report" rngui:header="Reporting" rngui:fold="closed">
+      <element name="url" rngui:label='HTML Snippet'>
+        <data type="string" rngui:label="url to report snippet"/>
+      </element>
+    </element>
+    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
+    </element>
+  </element>
+
+  <element name="documentation" rngui:header="Documentation">
+    <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Argument">
+        <element name="item" rngui:label="Description">
+          <attribute name="label" rngui:label="Name">
+            <data type="string"/>
+          </attribute>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="output" rngui:header="Output Elements" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Element">
+        <element name="item" rngui:label="Description">
+          <attribute name="label" rngui:label="Name">
+            <data type="string"/>
+          </attribute>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="implementation" rngui:header="Implementation" rngui:fold="closed">
+      <element name="description" rngui:label="Description">
+        <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
+      </element>
+    </element>
+  </element>
+  <element name="resources" rngui:header="Resources">
+    <zeroOrMore rngui:label="Create Resources">
+      <element name='resource' rngui:label="Resource" rngui:labeltype="xml">
+        <data type="string" rngui:label="Name"/>
+      </element>
+    </zeroOrMore>
+     <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+
+  </element>
+</element>