From 6b409294e453ecc6a8dbc13a7fb7a17529166522 Mon Sep 17 00:00:00 2001
From: Mike Phares <mike.phares@infineon.com>
Date: Wed, 3 May 2023 09:50:44 -0700
Subject: [PATCH] Task 353201

---
 Server/wwwroot/js/common.js   |  2 +-
 Server/wwwroot/js/site.js     | 55 ++++++++++++++++++-----------------
 View/OI.Metrology.View.csproj |  2 +-
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Server/wwwroot/js/common.js b/Server/wwwroot/js/common.js
index 5fc2627..0e3d046 100644
--- a/Server/wwwroot/js/common.js
+++ b/Server/wwwroot/js/common.js
@@ -128,7 +128,7 @@ function ConstructMessageDialog() {
         '        <div class="modal-footer"> ' +
         '           <div class="row" style="margin-top: 10px; margin-bottom: 20px;"> ' +
         '               <div class="col-xs-1"> ' +
-        '                   <button type="button" data-dismiss="modal" onclick="copy()">Copy</button> ' +
+        '                   <button type="button" data-dismiss="modal" onclick=' + "'" + 'copy(document.getElementById("textareaClipboard"))' + "'" + '>Copy</button> ' +
         '               </div> ' +
         '               <div class="col-xs-1"> ' +
         '                   <button type="button" data-dismiss="modal">OK</button> ' +
diff --git a/Server/wwwroot/js/site.js b/Server/wwwroot/js/site.js
index a700301..7965bc8 100644
--- a/Server/wwwroot/js/site.js
+++ b/Server/wwwroot/js/site.js
@@ -496,19 +496,19 @@ function recipeParametersButtonRunInfo() {
     $.getJSON('https://oi-prod-ec-api.mes.infineon.com/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) {
       $("#RecipeParametersButton").prop("disabled", false);
       var text = "";
+      var seperator = '\t';
       for (var i = 0; i < data.rds.rdsLayers.length; i++) {
         text = text
           + data.rds.rdsLayers[i].EpiTime
-          + "\t" + data.rds.rdsLayers[i].EpiH2Flow
-          + "\t" + data.rds.rdsLayers[i].TCSFlow
-          + "\t" + data.rds.rdsLayers[i].DiluentAdjParam
-          + "\t" + data.rds.rdsLayers[i].EpiH2Flow
-          + "\t" + data.rds.rdsLayers[i].DopantFlow
-          + "\t" + data.rds.rdsLayers[i].FOffset
-          + "\t" + data.rds.rdsLayers[i].SOffset
-          + "\t" + data.rds.rdsLayers[i].ROffset
-          + "\t" + data.rds.rdsLayers[i].SuscEtch
-          + "\r"
+          + seperator + data.rds.rdsLayers[i].EpiH2Flow
+          + seperator + data.rds.rdsLayers[i].TCSFlow
+          + seperator + data.rds.rdsLayers[i].DiluentAdjParam
+          + seperator + data.rds.rdsLayers[i].EpiH2Flow
+          + seperator + data.rds.rdsLayers[i].DopantFlow
+          + seperator + data.rds.rdsLayers[i].FOffset
+          + seperator + data.rds.rdsLayers[i].SOffset
+          + seperator + data.rds.rdsLayers[i].ROffset
+          + seperator + data.rds.rdsLayers[i].SuscEtch;
       }
       $("#textareaClipboard").val(text);
       $("#ModalBodyGrid").igGrid({
@@ -569,18 +569,21 @@ function viewButtonRunInfo() {
     $.getJSON(detailsURL, function (data) {
       var obj = {};
       var text = "";
-      for (var i = 0; i < data.Results.length && i < 9; i++) {
+      var seperator = jsonObject.RDS.length < 6 ? '\r' : '\t';
+      for (var i = 0; i < data.Results.length && (jsonObject.RDS.length < 6 || i < 9); i++) {
         if (data.Results[i].Thickness) {
-          text = text + data.Results[i].Thickness + "\t";
+          text = text + data.Results[i].Thickness + seperator;
           obj['Point' + (i + 1)] = data.Results[i].Thickness;
         }
         else if (data.Results[i].Rs) {
-          text = text + data.Results[i].Rs + "\t";
+          text = text + data.Results[i].Rs + seperator;
           obj['Point' + (i + 1)] = data.Results[i].Rs;
         }
       }
-      text = text + "\r";
-      $("#textareaClipboard").val(text);
+      if (text.length === 0)
+        $("#textareaClipboard").val(text);
+      else
+        $("#textareaClipboard").val(text.substring(0, text.length - 1));
       $("#ModalBodyGrid").igGrid({
         dataSource: obj,
         dataSourceType: 'json',
@@ -645,18 +648,18 @@ function pinButtonRunInfo() {
             responseDataKey: "Results",
           });
           var text = "";
+          var seperator = '\t';
           for (var i = 0; i < data.Results.length; i++) {
             text = text
               + data.Results[i].Point1
-              + "\t" + data.Results[i].Point2
-              + "\t" + data.Results[i].Point3
-              + "\t" + data.Results[i].Point4
-              + "\t" + data.Results[i].Point5
-              + "\t" + data.Results[i].Point6
-              + "\t" + data.Results[i].Point7
-              + "\t" + data.Results[i].Point8
-              + "\t" + data.Results[i].Point9
-              + "\r";
+              + seperator + data.Results[i].Point2
+              + seperator + data.Results[i].Point3
+              + seperator + data.Results[i].Point4
+              + seperator + data.Results[i].Point5
+              + seperator + data.Results[i].Point6
+              + seperator + data.Results[i].Point7
+              + seperator + data.Results[i].Point8
+              + seperator + data.Results[i].Point9;
           }
           $("#textareaClipboard").val(text);
           $("#ModalBodyGrid").igGrid({
@@ -786,9 +789,7 @@ function triggerFileDownload(fileName, url) {
 function initIndex() {
 }
 
-function copy() {
-  var copyText = document.getElementById("textareaClipboard");
-
+function copy(copyText) {
   // Select the text field
   copyText.select();
   copyText.setSelectionRange(0, 99999); // For mobile devices
diff --git a/View/OI.Metrology.View.csproj b/View/OI.Metrology.View.csproj
index 5b083bc..2b0e2f2 100644
--- a/View/OI.Metrology.View.csproj
+++ b/View/OI.Metrology.View.csproj
@@ -8,7 +8,7 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="MudBlazor" Version="6.2.0" />
+		<PackageReference Include="MudBlazor" Version="6.2.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.5" />
 		<PackageReference Include="IgniteUI.Blazor" Version="22.2.24" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />