update amplifer, ILA icons and trasnceiver / service conditions

TelecomInfraProject/Pages/homepage.cshtml

@@ -258,7 +258,7 @@
                                 <div class="group-node mt-2">
                                     <div class="create-back" id="btnAddILA">
                                         <div class="card icon-group hover-show">
-                                            <img src="./Assets/img/amp3.svg"
+                                            <img src="./Assets/img/ILA.svg"
                                                  class="mx-auto icon-name justify-content-center align-items-center w-100 h-100" data-toggle="tooltip" data-placement="top"
                                                  title="ILA" />
                                         </div><span class="sidebar-text1">ILA</span>
@@ -1052,7 +1052,7 @@
                 <a class="dropdown-item" id="rcDualInsertROADM" href="#"><img src="~/Assets/img/newroadm.svg" alt="" class="mr-2 middleNode"> <span>ROADM</span></a>
                 <a class="dropdown-item" id="rcDualInsertAttenuator" href="#"><img src="~/Assets/img/newattenuator.svg" alt="" class="mr-2 middleNode"> <span>Attenuator</span></a>
                 @*<a class="dropdown-item" id="rcDualInsertTransceiver" href="#"><img src="~/Assets/img/transceiver.svg" alt="" class="mr-2 middleNode"> <span>Transceiver</span></a>*@
-                <a class="dropdown-item" id="rcDualInsertILA" href="#"><img src="~/Assets/img/amp3.svg" alt="" class="mr-2 middleNode"> <span>ILA</span></a>
+                <a class="dropdown-item" id="rcDualInsertILA" href="#"><img src="~/Assets/img/ILA.svg" alt="" class="mr-2 middleNode"> <span>ILA</span></a>
             </div>
         </div>
 
@@ -1071,7 +1071,7 @@
                 <a class="dropdown-item" id="rcSingleInsertROADM" href="#"><img src="~/Assets/img/newroadm.svg" alt="" class="mr-2 middleNode"> <span>ROADM</span></a>
                 <a class="dropdown-item" id="rcSingleInsertAttenuator" href="#"><img src="~/Assets/img/newtransceiver.svg" alt="" class="mr-2 middleNode"> <span>Attenuator</span></a>
                 @*<a class="dropdown-item" id="rcSingleInsertTransceiver" href="#"><img src="~/Assets/img/transceiver.svg" alt="" class="mr-2 middleNode"> <span>Transceiver</span></a>*@
-                <a class="dropdown-item" id="rcSingleInsertAmplifier" href="#"><img src="~/Assets/img/amp.svg" alt="" class="mr-2 middleNode"> <span>Amplifier</span></a>
+                <a class="dropdown-item" id="rcSingleInsertAmplifier" href="#"><img src="~/Assets/img/newamp.svg" alt="" class="mr-2 middleNode"> <span>Amplifier</span></a>
             </div>
         </div>
     </div>

TelecomInfraProject/wwwroot/Data/StyleData.json

@@ -48,9 +48,9 @@
 
   },
   "ILA": {
-    "shape": "circularImage",
+    "shape": "image",
     "size": 14,
-    "image": "amp3.svg",
+    "image": "ILA.svg",
     "node_type": "Amplifier",
     "amp_category": "ILA",
     "component_type": "node",

TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js

@@ -437,7 +437,7 @@ $(document).ready(function () {
         data.nodes.off("*", change_history_back);
         data.edges.off("*", change_history_back);
         expandAndCollapseView(false);
-        
+
     });
     $("#expandView").click(function () {
         isExpandedView = true;
@@ -448,7 +448,7 @@ $(document).ready(function () {
         data.nodes.off("*", change_history_back);
         data.edges.off("*", change_history_back);
         expandAndCollapseView(true);
-        
+
     });
 });
 
@@ -2301,14 +2301,20 @@ function addService() {
 
     var fromDetails = network.body.data.nodes.get(addServiceData.from);
     var toDetails = network.body.data.nodes.get(addServiceData.to);
-    if (fromDetails.node_type == transceiverJSON.node_type && toDetails.node_type == transceiverJSON.node_type && fromDetails.transceiver_type == toDetails.transceiver_type) {
-        var labelvalue = serviceJSON.component_type + ' ' + network.body.data.nodes.get(addServiceData.from).number + ' - ' + network.body.data.nodes.get(addServiceData.to).number;
-        //if (checkNodeConnection(addServiceData.from, addServiceData.to))
-        //2 transceiver must have fiber/patch connection
-        if (network.getConnectedEdges(addServiceData.from).length > 0 && network.getConnectedEdges(addServiceData.to).length > 0)
-            addServiceComponent(1, addServiceData.from, addServiceData.to, labelvalue);
+    if (fromDetails.node_type == transceiverJSON.node_type && toDetails.node_type == transceiverJSON.node_type) {
+
+        if ((fromDetails.transceiver_type != "" && toDetails.transceiver_type != "") && (fromDetails.transceiver_type == toDetails.transceiver_type)) {
+            var labelvalue = serviceJSON.component_type + ' ' + network.body.data.nodes.get(addServiceData.from).number + ' - ' + network.body.data.nodes.get(addServiceData.to).number;
+            //if (checkNodeConnection(addServiceData.from, addServiceData.to))
+            //2 transceiver must have fiber/patch connection
+            if (network.getConnectedEdges(addServiceData.from).length > 0 && network.getConnectedEdges(addServiceData.to).length > 0)
+                addServiceComponent(1, addServiceData.from, addServiceData.to, labelvalue);
+            else
+                alert("source " + roadmJSON.component_type + " : " + fromDetails.label + " ,destination " + roadmJSON.component_type + " : " + toDetails.label + " should have " + dualFiberJSON.component_type + "/" + patchJSON.component_type + " connection");
+        }
         else
-            alert("source " + roadmJSON.component_type + " : " + fromDetails.label + " ,destination " + roadmJSON.component_type + " : " + toDetails.label + " should have " + dualFiberJSON.component_type + "/" + patchJSON.component_type + " connection");
+            alert(serviceJSON.component_type + " can be created only between " + transceiverJSON.node_type + " of same type");
+
     }
     else {
         alert("The " + serviceJSON.component_type + " should be between 2 " + transceiverJSON.node_type + " sites");
@@ -3838,15 +3844,51 @@ function updateTransceiver(nodeID) {
 
     var id = nodeID;
     var label = $("#txtTransceiverName").val().trim();
-    var node_type = network.body.data.nodes.get(nodeID).node_type
+    var nodeDetails = network.body.data.nodes.get(nodeID);
+    var transceiverType = $("#ddlTransceiverType").val();
+    if (transceiverType == null || transceiverType == "") {
+        alert('Please select transceiver type');
+        return;
+    }
 
     if (nameLengthValidation("txtTransceiverName")) {
 
-        if (node_type == transceiverJSON.node_type) {
-            network.body.data.nodes.update({
-                id: id, label: label, transceiver_type: $("#ddlTransceiverType").val()
-            });
-            clearTransceiver();
+        var connectedEdges = network.getConnectedEdges(nodeID);
+        var fromTransType = "";
+        var toTransType = "";
+        var isOk = true;
+        $.each(connectedEdges, function (index, item) {
+
+            if (!isOk)
+                return;
+            var edgeDetails = network.body.data.edges.get(item);
+            if (edgeDetails.component_type == serviceJSON.component_type) {
+                if (edgeDetails.from == nodeID) {
+
+                    fromTransType = transceiverType;
+                    toTransType = network.body.data.nodes.get(edgeDetails.to).transceiver_type;
+                }
+                else if (edgeDetails.to == nodeID) {
+                    toTransType = transceiverType;
+                    fromTransType = network.body.data.nodes.get(edgeDetails.from).transceiver_type;
+                }
+
+                if (toTransType != fromTransType) {
+                    isOk = false;
+                    alert(serviceJSON.component_type + " can be created/updated only between " + transceiverJSON.node_type + " of same type");
+                    return;
+                }
+            }
+
+        });
+
+        if (isOk) {
+            if (nodeDetails.node_type == transceiverJSON.node_type) {
+                network.body.data.nodes.update({
+                    id: id, label: label, transceiver_type: transceiverType
+                });
+                clearTransceiver();
+            }
         }
 
     }