Changes to UI -> AID

Author: harishpakala

config/VOR_V3.json

@@ -0,0 +1,3 @@
+property_name,type,readOnly,observable,updateFrequency,unit,submodelId,idShortPath,href,requestType
+Temperature_PADIM,Float,yes,True,subscribe,Celsius,ww.ovgu.de/submodel/test123,ser_1,opc.tcp://localhost:4851/ns=1;i=1023,
+Temperature,Float,yes,True,subscribe,Celsius,ww.ovgu.de/submodel/test123,ser_1,opc.tcp://localhost:4851/ns=1;i=1020,

config/aasx/files/ArcaAntrieb.png

@@ -278,7 +278,7 @@
                                                     },
                                                     "type": "href",
                                                     "valueType": "",
-                                                    "value": "opc.tcp://admin:[email protected]:4840/ns=4;s=|var|WAGO 750-8202 PFC200 CS 2ETH RS.Application.PLC_PRG.sPermission"
+                                                    "value": ""
                                                 }
                                             ]
                                         }

config/aasx/files/ArcaValve.png

@@ -7,7 +7,6 @@ function addSubmodeltoForm(exdomain){
 function addAASElementtoForm(event,exdomain,formId,aasIdentifier,submodelId,IdShortPath){
 	event.stopPropagation();
     event.preventDefault();
-    console.log(formId);
     aas_element_form = document.getElementById(formId);
     aas_element_form.innerHTML = '';
     aas_element_form.innerHTML = `<form onsubmit="createNewAASElement(event,'aas_element_form','`+aasIdentifier+`','`+submodelId+`','`+IdShortPath+`');return false;">
@@ -39,7 +38,10 @@ function addAASElementtoForm(event,exdomain,formId,aasIdentifier,submodelId,IdSh
     	_aas_elem = new Range();
     	_aas_elem.createDom(formId,exdomain);	
     }
-	
+    else if (aas_elem_type === "MultiLanguageProperty"){
+    	_aas_elem = new MultiLanguageProperty();
+    	_aas_elem.createDom(formId,exdomain);	
+    }
 }
 function createNewSubmodel1(event,element_form_id,aasIdentifier){
 	event.stopPropagation();
@@ -125,3 +127,24 @@ function saveSubmodel(event,submodelIdentifier,aasIdentifier){
 	httpGetRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
 	httpGetRequest.send(JSON.stringify(_submodel_New));
 }
+function delete_element(event,submodelIdentifier,aasIdentifier){
+	if (submodelIdentifier === event.target.alt){
+		var httpGetRequest = new XMLHttpRequest();
+		httpGetRequest.open('DELETE',"/submodels/"+btoa(submodelIdentifier));
+		httpGetRequest.onload = () => {
+			window.location.replace("/shells/"+aasIdentifier+"/webui");
+			
+		}
+		httpGetRequest.send();
+	}
+	else{
+		var httpGetRequest = new XMLHttpRequest();
+		
+		httpGetRequest.open('DELETE',"/shells/"+aasIdentifier+"/aas/submodels/"+btoa(submodelIdentifier)+"/submodel/submodel-elements/"+ event.target.alt);
+		httpGetRequest.onload = () => {
+			window.location.replace("/shells/"+aasIdentifier+"/aas/submodels/"+btoa(submodelIdentifier)+"/submodel/webui");
+			
+		}
+		httpGetRequest.send();
+	}
+}

config/aasx/files/aid_td_properties.csv

@@ -1111,4 +1111,6 @@ function getCFP(conversationId){
 		}
 	}
 	httpGetRequest.send();
-}	
+}		
+
+

config/templates/asset_interface_description.json

@@ -307,7 +307,7 @@ class ListCollection{
 	deserialize(data,parentId,exdomain){
 		this.exdomain = exdomain;
 		for (var i = 0; i < data.length; i++ ) {
-			console.log(data[i]);
+			
 			let _iuuid = crypto.randomUUID();
 			let _classObject = this.getclassObject(_iuuid);
 			let _objectDIv = this.getObjectDom(_iuuid);
@@ -987,7 +987,6 @@ class SubmodelElement extends Referable {
 	}
 	deserialize(data,parentId,exdomain){
 		if (data.hasOwnProperty('qualifiers')){
-			console.log(data["qualifiers"]);
 			this._Qualifiable.deserialize(data['qualifiers'],parentId,exdomain);
 		}
 		this._HasSemantics.deserialize(data,parentId,exdomain);
@@ -1069,7 +1068,7 @@ class MultiLanguageProperty extends DataElement{
 					checksum,kind,semanticId,supplementalSemanticIds,
 					qualifiers,embeddedDataSpecifications);
 			this.value = new ListCollection("value","LangString");
-			this.valueId =valueId;
+			this.valueId =new ComplexObject("valueId","Reference");
 			this.modelType = "MultiLanguageProperty";
 	}
 	serialize(){
@@ -1088,15 +1087,22 @@ class MultiLanguageProperty extends DataElement{
 		}
 	}
 	createDom(parentId,exdomain){
+		this.uuid = crypto.randomUUID();
+		this.exdomain = exdomain;
+		document.getElementById(parentId).insertAdjacentHTML(
+				 'afterbegin',
+				 `<div class="temp" id = "`+this.uuid+`">
+				 </div>`);
 		this.value.createDom(parentId,exdomain);
+		this.valueId.createDom(this.uuid,exdomain);
 		super.createDom(parentId,exdomain);
 	}
 }
 class Range extends DataElement{
 	constructor(extensions,category,idShort,displayName,description,
 			checksum,kind,semanticId,supplementalSemanticIds,
 			qualifiers,embeddedDataSpecifications,
-			valueType,
+			valueType="xs:string",
 			min,
 			max){
 			super(extensions,category,idShort,displayName,description,
@@ -1105,13 +1111,15 @@ class Range extends DataElement{
 			this.valueType = new SelectObject("valueType",DataTypeXSD,valueType);
 			this.min = new StringObject("min");
 			this.max =  new StringObject("max");
+			this.valueId = new ComplexObject("valueId","Reference");
 			this.modelType = "Range";
 	}
 	serialize(){
 		let jsonData =  super.serialize();
 		if (this.valueId._object != null){
 			jsonData["valueId"] = this.valueId.serialize();
 		}
+		jsonData["valueType"] = this.valueType.getSelectedItem();
 		jsonData["min"] = this.min.getString();
 		jsonData["max"] = this.max.getString();
 		jsonData["modelType"] = "Range";
@@ -1127,7 +1135,6 @@ class Range extends DataElement{
 		}
 	}
 	createDom(parentId,exdomain){
-		
 		this.uuid = crypto.randomUUID();
 		this.exdomain = exdomain;
 		document.getElementById(parentId).insertAdjacentHTML(
@@ -1136,6 +1143,8 @@ class Range extends DataElement{
 				 </div>`);
 		this.max.createDom(this.uuid,exdomain);
 		this.min.createDom(this.uuid,exdomain);
+		this.valueType.createDom(this.uuid,exdomain);
+		this.valueId.createDom(this.uuid,exdomain);
 		super.createDom(this.uuid,exdomain);
 
 	}
@@ -1469,7 +1478,7 @@ class Submodel extends Identifiable{
 	deserialize(data,parentId,exdomain){
 		super.deserialize(data,parentId,exdomain);
 		if (data.hasOwnProperty('qualifiers')){
-			console.log(data["qualifiers"]);
+			
 			this._Qualifiable.deserialize(data['qualifiers'],parentId,exdomain);
 		}
 	  if (data.hasOwnProperty('submodelElements')){