cpee 1.4.1 → 1.4.2

data/server/instances/19/properties.xml

@@ -1,7 +1,7 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>9f7215bc-9c27-4558-b29b-33cc0aabaff6</uuid>
-    <info/>
+    <uuid>dbeaca65-c78e-4fb3-be04-7fb753bc200c</uuid>
+    <info>Buersten 490</info>
     <modeltype>CPEE</modeltype>
     <theme>default</theme>
   </attributes>
@@ -12,16 +12,101 @@
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl/>
+  <dsl>call :a2, [:UI, :eingeben, :Raddetails], parameters: { :label =&gt; "", :method =&gt; :post, :arguments =&gt; nil }, update: &lt;&lt;-END
+  data.radscheibendaten_links = { hersteller =&gt; '' , material =&gt; '' , chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}
+  data.radscheibendaten_rechts = { hersteller =&gt; '', material =&gt; '', chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}
+END
+call :a1, nil, parameters: { :label =&gt; "", :method =&gt; :post, :arguments =&gt; nil }
+</dsl>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a2" endpoint="UI eingeben Raddetails">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result">data.radscheibendaten_links = { hersteller =&gt; '' , material =&gt; '' , chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}
+data.radscheibendaten_rechts = { hersteller =&gt; '', material =&gt; '', chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+      <call id="a1" endpoint="">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a2" endpoint="UI eingeben Raddetails">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result">data.radscheibendaten_links = { hersteller =&gt; '' , material =&gt; '' , chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}
+data.radscheibendaten_rechts = { hersteller =&gt; '', material =&gt; '', chargennummer =&gt; '', schmelznummer =&gt; '', herstellsdatum =&gt; ''}</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+      <call id="a1" endpoint="">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
   </description>
   <transformation>
     <description type="copy"/>

data/server/instances/2/properties.xml

@@ -1,31 +1,156 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info/>
+    <uuid>744492cb-54fa-418d-b55c-59a7d306f95a</uuid>
+    <info>IHS1</info>
     <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-    <uuid/>
+    <theme>labels</theme>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
   </endpoints>
-  <dsl/>
+  <dsl>call :a1, :bookAir, parameters: { :label =&gt; "Book Airline", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :from, :value =&gt; data.from), ⭐(:name =&gt; :to, :value =&gt; data.to), ⭐(:name =&gt; :persons, :value =&gt; data.persons)] }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+  data.costs += result.value('costs').to_f
+  status.update 1, 'Hotel'
+END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :label =&gt; "Book Hotel", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :to, :value =&gt; data.to)] }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+        data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative test{data.costs &gt; 700} do
+    call :a4, :approve, parameters: { :label =&gt; "Approve Hotel", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :costs, :value =&gt; data.costs)] }
+  end
+end
+</dsl>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <label>Book Airline</label>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label>Book Hotel</label>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <label>Approve Hotel</label>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <label>Book Airline</label>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label>Book Hotel</label>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <label>Approve Hotel</label>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/instances/20/properties.xml

@@ -1,191 +1,31 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>4b7b29c7-db72-4268-9b6d-5fa94d3ef499</uuid>
-    <info>Enter info hereaa</info>
+    <uuid>6580f903-b4d3-4d71-8bc9-4792f232b9f8</uuid>
+    <info>Testen</info>
     <modeltype>CPEE</modeltype>
-    <theme>labels</theme>
+    <theme>default</theme>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements>
-    <feedback>true</feedback>
-  </dataelements>
+  <dataelements/>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>parallel do
-  parallel_branch do
-    loop pre_test{data.feedback}  do
-      call :design, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
-      call :validate, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }
-      call :publish, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 1)] }
-    end
-  end
-  parallel_branch do
-    loop pre_test{data.feedback}  do
-      call :prepare, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
-      call :fab, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
-      call :evaluate, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
-    end
-  end
-end
-</dsl>
+  <dsl/>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <parallel>
-        <parallel_branch>
-          <loop mode="pre_test" condition="data.feedback">
-            <call id="design" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="validate" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>2</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="publish" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>1</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-          </loop>
-        </parallel_branch>
-        <parallel_branch>
-          <loop mode="pre_test" condition="data.feedback">
-            <call id="prepare" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="fab" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="evaluate" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-          </loop>
-        </parallel_branch>
-      </parallel>
-    </description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <parallel>
-        <parallel_branch>
-          <loop mode="pre_test" condition="data.feedback">
-            <call id="design" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="validate" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>2</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="publish" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>1</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-          </loop>
-        </parallel_branch>
-        <parallel_branch>
-          <loop mode="pre_test" condition="data.feedback">
-            <call id="prepare" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="fab" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-            <call id="evaluate" endpoint="timeout">
-              <parameters>
-                <!--{{{-->
-                <method>:post</method>
-                <arguments>
-                  <timeout>4</timeout>
-                </arguments>
-              </parameters>
-              <!--}}}-->
-            </call>
-          </loop>
-        </parallel_branch>
-      </parallel>
-    </description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
   </transformation>
 </properties>