Merge branch 'main' of https://github.com/ReggaeUlli/Masterarbeit-code

rwth-iat · Oct 8, 2023 · 32f63e8 · 32f63e8
2 parents 0660d63 + 64088c6
commit 32f63e8
Show file tree

Hide file tree

Showing 13 changed files with 319 additions and 128 deletions.
diff --git a/.github/workflows/node.js.yml → .github/workflows/client-test.yml b/.github/workflows/node.js.yml → .github/workflows/client-test.yml
@@ -1,7 +1,7 @@
 # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
 
-name: Node.js CI
+name: Client Test
 
 on:
   push:

diff --git a/.github/workflows/python-app.yml → .github/workflows/server-test.yml b/.github/workflows/python-app.yml → .github/workflows/server-test.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
 
-name: Python application
+name: Server Test
 
 on:
   push:

diff --git a/ReadMe.md b/ReadMe.md
@@ -3,7 +3,7 @@ This is the Project of my Master Thesis. It is a Grpahicl Editor for General Rec
 
 These Badges show the Test results of the current Code.
 
-[![Python application](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/python-app.yml/badge.svg)](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/python-app.yml) [![Node.js CI](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/node.js.yml/badge.svg)](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/node.js.yml)
+[![Server Test](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/server-test.yml/badge.svg)](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/server-test.yml) [![Client Test](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/client-test.yml/badge.svg)](https://github.com/ReggaeUlli/Masterarbeit-code/actions/workflows/client-test.yml)
 
 ## Running the Server
 To run the server Python (3.10 at best) needs to be installed.
@@ -35,21 +35,20 @@ After that the server is running under:
 - [X] delete elements
 - [X] open macro steps in new workspace
 - [X] add Ressource Constraints
-
-## under development
-- [ ] change element styles to oficial Chart elements
-- [ ] add creation of macro Steps 
+- [X] add parallel process logic
+- [X] change element styles to oficial Chart elements
+- [X] add creation of macro Steps
+
+## under development 
 - [ ] add macro processParameters (only simple ones possible yet)
 - [ ] add possibillity to save current workspace
 - [ ] multiple workspace tabs (one for main process, others for opened subprocesses)
 - [ ] extend generated BatchML
 - [ ] Capability Matching
-- [ ] add parallel process logic
 
 ## Outlook
 - [ ] extend capability matching
 - [ ] extend BatchML creation
-- [ ] add chartelements
 - [ ] import material library
 - [ ] import BatchML into workspace
 

diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "private": true,
   "scripts": {
     "dev": "vite",

diff --git a/client/src/components/SideBar.vue b/client/src/components/SideBar.vue
@@ -18,7 +18,8 @@
 			<elementWindow element_type="Materials"/>
 			<div class="element_spacer"></div>
 			<elementWindow element_type="Processes"/>
-		</div>
+			<div class="element_spacer"></div>
+			<elementWindow element_type="ChartElements"/></div>
 	</aside>
 </template>
 
@@ -40,6 +41,9 @@
 
 
 <style lang="scss" scoped>
+.element_spacer{
+	height: 10px;
+}
 aside {
 	z-index: 2;
 	display: flex;

diff --git a/client/src/components/SidebarComponents/elementWindow.vue b/client/src/components/SidebarComponents/elementWindow.vue
@@ -18,70 +18,48 @@
     let element_class = "" 
     if(element_type.value === "Processes"){
         element_class = "process_element sidebar_element"
-        element_packages.value = [{
-                                    name: "GeneralCapabilityEffecting",
-                                    type:"process",
-                                    children:[{
-                                            name: "Draining",
-                                            type:"process",
-                                            otherInformation:[{
-                                                            otherInfoID:"testOtherInfoID",
-                                                            description:["testDescription"],
-                                                            otherValue:[{
-                                                                valueString:"test value string",
-                                                                dataType:"Text",
-                                                                unitOfMeasure:"KG",
-                                                                key:"testkey"
-                                                            }]
-                                            }],
-                                            children:[
-                                                {
-                                                type:"process",
-                                                name:"test1",
-                                                otherInformation:[{
-                                                    otherInfoID:"testOtherInfoID",
-                                                    description:["testDescription"],
-                                                    otherValue:[{
-                                                        valueString:"test value string",
-                                                        dataType:"Text",
-                                                        unitOfMeasure:"KG",
-                                                        key:"testkey"
-                                                    }]
-                                                }],
-                                                children:[
-                                                    {
-                                                        name:"test2",
-                                                        type:"process",
-                                                        otherInformation:[{
-                                                            otherInfoID:"testOtherInfoID",
-                                                            description:["testDescription"],
-                                                            otherValue:[{
-                                                                valueString:"test value string",
-                                                                dataType:"Text",
-                                                                unitOfMeasure:"KG",
-                                                                key:"testkey"
-                                                            }]
-                                                        }]
-                                                    }
-                                                ]}
-                                                ]
-                                            },
-                                            {
-                                                type: "process",
-                                                name: "Pumping",
-                                                otherInformation:[{
-                                                            otherInfoID:"testOtherInfoID",
-                                                            description:["testDescription"],
-                                                            otherValue:[{
-                                                                valueString:"test value string",
-                                                                dataType:"Text",
-                                                                unitOfMeasure:"KG",
-                                                                key:"testkey"
-                                                            }]
-                                                }]
-                                            }
-                                        ]
-                                }]
+        element_packages.value = [
+                                {
+                                    name: "Dosage Prep Stage:",
+                                    type: "process",
+                                    processElementType: "Process Stage"
+                                },
+                                {
+                                    name: "Packaging Stage:",
+                                    type: "process",
+                                    processElementType: "Process Stage"
+                                },
+                                {
+                                    name: "Wet Mixing Operation:",
+                                    type: "process",
+                                    processElementType: "Process Operation"
+                                },
+                                {
+                                    name: "Dry Mixing Operation:",
+                                    type: "process",
+                                    processElementType: "Process Operation"
+                                },
+                                {
+                                    name: "Tableting Operation:",
+                                    type: "process",
+                                    processElementType: "Process Operation"
+                                },
+                                {
+                                    name: "Charge:",
+                                    type: "process",
+                                    processElementType: "Process Action"
+                                },
+                                {
+                                    name: "Charge with Agitation:",
+                                    type: "process",
+                                    processElementType: "Process Action"
+                                },
+                                {
+                                    name: "Charge to adjust pH:",
+                                    type: "process",
+                                    processElementType: "Process Action"
+                                }
+                            ]
     }else if (element_type.value ==="Materials"){
         element_class = "material_element sidebar_element"
         element_packages.value = [{
@@ -102,6 +80,54 @@
                                 }
                             ]
                         }]
+    }else if (element_type.value ==="ChartElements"){
+        element_class = "chart_element sidebar_element"
+        element_packages.value = [{
+                            name:"Basic",
+                            type: "chart_element",
+                            children:[
+                                {
+                                    type: "chart_element",
+                                    name: "Previous Operation Indicator",
+                                    procedureChartElementType: "Previous Operation Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "Next Operation Indicator",
+                                    procedureChartElementType: "Next Operation Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "Start Parallel Indicator",
+                                    procedureChartElementType: "Start Parallel Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "End Parallel Indicator",
+                                    procedureChartElementType: "End Parallel Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "Start Optional Parallel Indicator",
+                                    procedureChartElementType: "Start Optional Parallel Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "End Optional Parallel Indicator",
+                                    procedureChartElementType: "End Optional Parallel Indicator"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "Annotation",
+                                    procedureChartElementType: "Annotation"
+                                },
+                                {
+                                    type: "chart_element",
+                                    name: "Other",
+                                    procedureChartElementType: "Other"
+                                }
+                            ]
+                        }]
     }else{
         console.log("unknown element type: " + element_type.value)
     }