Merge Develop into Master

ACT/LibMC.xml

@@ -336,8 +336,33 @@
 		<error name="INVALIDEVENTCONTEXT" code="327" description="Invalid event sender" />
 		<error name="INVALIDLAYERINDEX" code="328" description="Invalid layer index" />
 		<error name="TEMPBASEPATHEMPTY" code="329" description="Empty base path for temporary files" />
-		<error name="PROFILENOTFOUND" code="330" description="Profile not found." />		
-
+		<error name="PROFILENOTFOUND" code="330" description="Profile not found." />				
+		<error name="INVALIDSERVICEHANDLER" code="331" description="Invalid service handler." />				
+		<error name="INVALIDMAXTHREADCOUNT" code="332" description="Invalid max thread count." />
+		<error name="INVALIDTOOLPATHSTREAMUUID" code="333" description="Invalid toolpath stream uuid" />		
+		<error name="MISSINGSECTIONHEIGHT" code="334" description="Missing section height" />
+		<error name="INVALIDSECTIONHEIGHT" code="335" description="Invalid section height" />		
+		<error name="MISSINGSECTIONWIDTH" code="336" description="Missing section width" />
+		<error name="INVALIDSECTIONWIDTH" code="337" description="Invalid section width" />		
+		<error name="TOOLPATHMETADATANOTFOUND" code="338" description="Toolpath metadata not found" />		
+
+		<error name="BUILDITEMHASNOUUID" code="339" description="Build item has no uuid" />		
+		<error name="OBJECTHASNOUUID" code="340" description="Object has no uuid" />		
+
+		<error name="COULDNOTPARSEEVENTPARAMETERS" code="341" description="Could not parse event parameters" />		
+		<error name="INVALIDEVENTPARAMETERS" code="342" description="Invalid event parameters" />		
+		<error name="INVALIDFORMVALUES" code="343" description="Invalid form values" />		
+		<error name="FORMNAMEMISSING" code="344" description="Form name is missing" />		
+		<error name="FORMENTITYNAMEMISSING" code="345" description="Form entity name is missing" />		
+		<error name="FORMNOTFOUND" code="346" description="Form not found" />		
+		<error name="FORMENTITYNOTFOUND" code="347" description="Form entity not found" />		
+		<error name="DUPLICATEENTITYNAME" code="348" description="Duplicate form entity name" />				
+		<error name="COULDNOTFINDEVENTSENDERPAGE" code="349" description="Could not find event sender page" />		
+		<error name="COULDNOTFINDEVENTSENDER" code="350" description="Could not find event sender" />
+		<error name="DUPLICATEFORMNAME" code="351" description="Duplicate form name" />
+
+
+
 	</errors>
 
 

CMakeLists.txt

@@ -298,6 +298,30 @@ set_target_properties(libmcdata
 )
 
 
+add_custom_target(configuration_xml ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Plugins/config.xml)
+
+set_property(TARGET configuration_xml APPEND PROPERTY SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Plugins/config.xml)
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E echo "creating output directory")
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E make_directory			
+			${CMAKE_CURRENT_BINARY_DIR}/Output)
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E echo "copying config.xml...")
+
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy
+			${CMAKE_CURRENT_SOURCE_DIR}/Plugins/config.xml
+			${PROJECT_BINARY_DIR}/Output/${GLOBALGITHASH}_config.xml)
+
 add_custom_target(copy_distribution_libraries ALL)
 add_dependencies(copy_distribution_libraries copy_framework)
 
@@ -322,11 +346,6 @@ add_custom_command(
 endif()
 
 
-add_custom_command(
-	TARGET copy_distribution_libraries POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy
-			${CMAKE_CURRENT_SOURCE_DIR}/Plugins/config.xml
-			${PROJECT_BINARY_DIR}/Output/${GLOBALGITHASH}_config.xml)
 
 
 add_custom_target(create_core_resources ALL)

Client/src/App.vue

@@ -68,23 +68,18 @@
 			<Dialog_Error :Application="Application" />
         </v-container>		
 
-        <v-container fluid v-if="appIsReady">
-
-				<template v-for="uiPage in Application.AppContent.Pages">
-
-					<v-row align="start" justify="center" :key="uiPage.name" v-if="(Application.AppState.activePage == uiPage.name)">
-
-						<template v-for="uiModule in uiPage.modules">
-
-							<Module_Content :key="uiModule.name" v-if="(uiModule.type == 'content')" :module="uiModule" :Application="Application" />					
-
-						</template>										
-
-					</v-row>
-				</template>
-
+		<template v-for="uiPage in Application.AppContent.Pages">
+			<v-container :key="uiPage.name" v-if="appIsReady && (Application.AppState.activePage == uiPage.name)" style="width:100%; height:85vh; display:block">
 
-        </v-container>		
+				<template v-for="uiModule in uiPage.modules">
+					<Module_Content :key="uiModule.name" v-if="(uiModule.type == 'content')" :module="uiModule" :Application="Application" />					
+					<Module_Tabs :key="uiModule.name" v-if="(uiModule.type == 'tabs')" :module="uiModule" :Application="Application" />							
+					<Module_VerticalSplit :key="uiModule.name" v-if="(uiModule.type == 'verticalsplit')" :module="uiModule" :Application="Application" />							
+					<Module_HorizontalSplit :key="uiModule.name" v-if="(uiModule.type == 'horizontalsplit')" :module="uiModule" :Application="Application" />							
+				</template>										
+
+			</v-container>		
+		</template>
 
     </v-main>
 
@@ -102,9 +97,12 @@
 
 	import Dialog_Login from "./Dialog_Login.vue";
 	import Dialog_Error from "./Dialog_Error.vue";
+
 	import Module_Content from "./Module_Content.vue";
+	import Module_Tabs from "./Module_Tabs.vue";
+	import Module_VerticalSplit from "./Module_VerticalSplit.vue";
+	import Module_HorizontalSplit from "./Module_HorizontalSplit.vue";
 
-
 	export default {
 
 		created() {
@@ -179,9 +177,12 @@
 		},
 
 		components: {
-			Module_Content,
 			Dialog_Login,
-			Dialog_Error
+			Dialog_Error,
+			Module_Content,
+			Module_Tabs,
+			Module_VerticalSplit,
+			Module_HorizontalSplit
 		},	
 
 		methods: {

Client/src/Application.js

@@ -13,7 +13,8 @@ export default class AMCApplication {
 	{
 		this.API = {
 			baseURL : apiBaseURL,
-			authToken: nullToken			
+			authToken: nullToken,
+			unsuccessfulUpdateCounter: 0
 		}
 
 		this.AppState = {
@@ -35,7 +36,8 @@ export default class AMCApplication {
             MenuItems: [],
             ToolbarItems: [],
 			ContentItems: [],					
-			Pages: []
+			Pages: [],
+			FormEntities: []
 		}
 
 
@@ -123,7 +125,14 @@ export default class AMCApplication {
 			.catch(err => {
 				this.setStatusToError (err.response.data.message);
 			});
-	}				
+	}			
+
+
+	performLogout ()
+	{
+		this.authToken = nullToken;		
+		this.unsuccessfulUpdateCounter = 0;
+	}
 
 	requestLogin (userName, userPassword) 
 	{
@@ -169,6 +178,79 @@ export default class AMCApplication {
 	}
 
 
+	prepareModuleItem (item) 
+	{
+		if (item.type === "parameterlist") {
+
+			this.AppContent.ContentItems[item.uuid] = { uuid: item.uuid, entries: [], refresh: true };
+			item.entries = this.AppContent.ContentItems[item.uuid].entries;
+
+		}
+
+		if (item.type === "buildlist") {
+
+			this.AppContent.ContentItems[item.uuid] = { uuid: item.uuid, entries: [], refresh: true };
+			item.entries = this.AppContent.ContentItems[item.uuid].entries;
+
+		}
+
+		if (item.type === "upload") {
+			item.state = { uploadid: 0, chosenFile: null, idcounter: 0, messages: [] }
+
+		}
+
+		if (item.type === "form") {
+
+			for (var entity of item.entities) {
+
+				this.AppContent.FormEntities[entity.uuid] = 
+					{ uuid: entity.uuid, 
+					  value: entity.defaultvalue, 
+					  remotevalue: entity.defaultvalue, 
+					  disabled: entity.disabled, 
+					  readonly: entity.readonly
+					  };
+				entity.dataObject = this.AppContent.FormEntities[entity.uuid];
+			}
+
+
+
+		}
+
+	}
+
+
+	prepareModule (module) 
+	{
+		var item, tab, section;
+
+		if (module.type === "content") {
+			for (item of module.items) {
+				this.prepareModuleItem (item)
+			}
+
+		}
+
+		if (module.type === "tabs") {
+			for (tab of module.tabs) {
+				this.prepareModule (tab)
+			}			
+		}
+
+		if (module.type === "verticalsplit") {
+			for (section of module.sections) {
+				this.prepareModule (section)
+			}			
+		}
+
+		if (module.type === "horizontalsplit") {
+			for (section of module.sections) {
+				this.prepareModule (section)
+			}			
+		}
+	}
+
+
 	retrieveStateUpdate () {
 
 		this.axiosGetRequest ("/ui/state")		
@@ -177,32 +259,10 @@ export default class AMCApplication {
                     this.AppContent.MenuItems = resultJSON.data.menuitems;
                     this.AppContent.ToolbarItems = resultJSON.data.toolbaritems;
 
-					var page, module, item;
+					var page, module;
 					for (page of resultJSON.data.pages) {
 						for (module of page.modules) {
-							if (module.type === "content") {
-								for (item of module.items) {
-									if (item.type === "parameterlist") {
-
-										this.AppContent.ContentItems[item.uuid] = { uuid: item.uuid, entries: [], refresh: true };
-										item.entries = this.AppContent.ContentItems[item.uuid].entries;
-
-									}
-
-									if (item.type === "buildlist") {
-
-										this.AppContent.ContentItems[item.uuid] = { uuid: item.uuid, entries: [], refresh: true };
-										item.entries = this.AppContent.ContentItems[item.uuid].entries;
-
-									}
-
-									if (item.type === "upload") {
-										item.state = { uploadid: 0, chosenFile: null, idcounter: 0, messages: [] }
-
-									}
-								}
-
-							}
+							this.prepareModule (module)
 						}						
 
 					}
@@ -219,13 +279,22 @@ export default class AMCApplication {
 		updateContentItem (uuid) {
 
 			this.AppContent.ContentItems[uuid].refresh = false;
+
+			var headers = {}
+			var authToken = this.API.authToken; 
+
+			if (authToken != nullToken)
+				headers.Authorization = "Bearer " + authToken;
 
             var url = this.API.baseURL + "/ui/contentitem/" + uuid;
             Axios({
                     method: "GET",
+					"headers": headers,
                     url: url
                 })
                 .then(resultJSON => {					
+
+					this.unsuccessfulUpdateCounter = 0;
 
 					var oldentrycount = this.AppContent.ContentItems[uuid].entries.length;					
 					for (var i = 0; i < oldentrycount; i++) {
@@ -238,8 +307,14 @@ export default class AMCApplication {
 					this.AppContent.ContentItems[uuid].refresh = true;
                 })
                 .catch(err => {
-					err;
-                    this.AppContent.ContentItems[uuid].refresh = true;                    
+
+					this.unsuccessfulUpdateCounter = this.unsuccessfulUpdateCounter + 1;
+					if (this.unsuccessfulUpdateCounter > 5) {
+						this.setStatusToError (err.message);
+					} else {
+						this.AppContent.ContentItems[uuid].refresh = true;
+					}
+
                 });
 
 		}
@@ -383,12 +458,13 @@ export default class AMCApplication {
 		}
 
 
-		triggerUIEvent (eventname, senderuuid, contextuuid) {
+		triggerUIEvent (eventname, senderuuid, contextuuid, formvalues) {
 
             this.axiosPostRequest("/ui/event", {
 				"eventname": eventname,
 				"senderuuid": senderuuid,
-				"contextuuid": contextuuid						
+				"contextuuid": contextuuid,
+				"formvalues": formvalues
 			})
 				.then(resultHandleEvent => {
 					resultHandleEvent;
@@ -398,6 +474,20 @@ export default class AMCApplication {
 					alert (err);
                 });				
 		}
+
+
+		assembleFormValues (formValueUUIDList)
+		{
+			var resultObject = {}
+
+			for (var entityuuid of formValueUUIDList) {
+				var formValue = this.AppContent.FormEntities[entityuuid].value;
+				resultObject[entityuuid] = formValue;				
+			}
+
+			return resultObject;
+
+		}
 
 }
 

Client/src/ContentItem_ButtonGroup.vue

@@ -28,9 +28,10 @@
 		uiModuleButtonClick: function (button) {
 
 			var contextuuid = this.Application.AppState.activeObject;
+			var formvalues = this.Application.assembleFormValues (button.eventformvalues);
 
 			if (button.event != "") {		
-				this.Application.triggerUIEvent (button.event, button.uuid, contextuuid);
+				this.Application.triggerUIEvent (button.event, button.uuid, contextuuid, formvalues);
 			}
 
 			if (button.targetpage != "") {