diff --git a/Adaptation/FileHandlers/ConvertExcelToJson/FIBacklogMesa.cs b/Adaptation/FileHandlers/ConvertExcelToJson/FIBacklogMesa.cs index a32635a..3b7128e 100644 --- a/Adaptation/FileHandlers/ConvertExcelToJson/FIBacklogMesa.cs +++ b/Adaptation/FileHandlers/ConvertExcelToJson/FIBacklogMesa.cs @@ -11,8 +11,6 @@ public class FIBacklogMesa string assignedTo, string secondResource, string subject, - string epiLine, - string area, string systemS, string priority, string status, @@ -44,8 +42,6 @@ public class FIBacklogMesa AssignedTo = assignedTo; SecondResource = secondResource; Subject = subject; - EpiLine = epiLine; - Area = area; SystemS = systemS; Priority = priority; Status = status; @@ -85,10 +81,6 @@ public class FIBacklogMesa [JsonPropertyName("Subject - from Requestor")] public string Subject { get; set; } // { init; get; } - [JsonPropertyName("Epi Line")] - public string EpiLine { get; set; } // { init; get; } - public string Area { get; set; } // { init; get; } - [JsonPropertyName("System(s)")] public string SystemS { get; set; } // { init; get; } @@ -111,7 +103,7 @@ public class FIBacklogMesa [JsonPropertyName("UAT as of")] public string UATAsOf { get; set; } // { init; get; } - [JsonPropertyName("CMP _Date")] + [JsonPropertyName("CMP_Date")] public string CMPDate { get; set; } // { init; get; } public string F20 { get; set; } // { init; get; } public string F21 { get; set; } // { init; get; } diff --git a/Adaptation/FileHandlers/ConvertExcelToJson/FileRead.cs b/Adaptation/FileHandlers/ConvertExcelToJson/FileRead.cs index c0f16c3..146378c 100644 --- a/Adaptation/FileHandlers/ConvertExcelToJson/FileRead.cs +++ b/Adaptation/FileHandlers/ConvertExcelToJson/FileRead.cs @@ -121,6 +121,7 @@ public class FileRead : Shared.FileRead, IFileRead } if (_IsEAFHosted) File.WriteAllText(fileName, json); + File.WriteAllText("D:/Web-sites/Backlog/json/data.json", json); results = iProcessData.GetResults(this, _Logistics, results.Item4); } return results; diff --git a/Adaptation/FileHandlers/json/FileRead.cs b/Adaptation/FileHandlers/json/FileRead.cs index 992e3d0..f746d98 100644 --- a/Adaptation/FileHandlers/json/FileRead.cs +++ b/Adaptation/FileHandlers/json/FileRead.cs @@ -14,8 +14,8 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text; using System.Text.Json; -using System.Web.Http; -using System.Web.Http.SelfHost; +//using System.Web.Http; +//using System.Web.Http.SelfHost; namespace Adaptation.FileHandlers.json; @@ -29,7 +29,7 @@ public class FileRead : Shared.FileRead, IFileRead private readonly string _Project; private readonly string _BasePage; private readonly HttpClient _HttpClient; - private readonly HttpSelfHostServer _HttpSelfHostServer; + //private readonly HttpSelfHostServer _HttpSelfHostServer; private readonly WorkItemTrackingHttpClient _WorkItemTrackingHttpClient; public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : @@ -62,11 +62,11 @@ public class FileRead : Shared.FileRead, IFileRead VssConnection connection = new(new(string.Concat(baseAddress, basePage)), credential); _WorkItemTrackingHttpClient = connection.GetClient(); _BasePage = basePage; - string httpSelfHostConfigurationBaseAddress = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".HttpSelfHostConfiguration.BaseAddress")); - HttpSelfHostConfiguration config = new(httpSelfHostConfigurationBaseAddress); - _ = config.Routes.MapHttpRoute("API Default", "api/{controller}/{id}", new { id = RouteParameter.Optional }); - _HttpSelfHostServer = new(config); - _HttpSelfHostServer.OpenAsync().Wait(); + //string httpSelfHostConfigurationBaseAddress = "http://localhost:5159"; // GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".HttpSelfHostConfiguration.BaseAddress")); + //HttpSelfHostConfiguration config = new(httpSelfHostConfigurationBaseAddress); + //_ = config.Routes.MapHttpRoute("API Default", "api/{controller}/{id}", new { id = RouteParameter.Optional }); + //_HttpSelfHostServer = new(config); + //_HttpSelfHostServer.OpenAsync().Wait(); } void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); diff --git a/Adaptation/FileHandlers/json/StaticSite/index.html b/Adaptation/FileHandlers/json/StaticSite/index.html index eeeed8d..94d478e 100644 --- a/Adaptation/FileHandlers/json/StaticSite/index.html +++ b/Adaptation/FileHandlers/json/StaticSite/index.html @@ -5,14 +5,14 @@ FI Backlog Mesa - - - - - - - - + + + + + + + +

FI Backlog Mesa

diff --git a/Adaptation/FileHandlers/json/StaticSite/js/site.js b/Adaptation/FileHandlers/json/StaticSite/js/site.js index 702ed07..0bd2680 100644 --- a/Adaptation/FileHandlers/json/StaticSite/js/site.js +++ b/Adaptation/FileHandlers/json/StaticSite/js/site.js @@ -1,10 +1,12 @@ function compareFunction(a, b) { - return a['Priority'][0] - b['Priority'][0] || a['Req '].length - b['Req '].length || a['Req '] - b['Req ']; + return a.Priority[0] - b.Priority[0] || a.Req.length - b.Req.length || a.Req - b.Req; } function initIndex(url) { $.getJSON(url, function (data) { for (var i = data.length - 1; i > -1; i--) { + if (data[i]['Subject - from Requestor'].length > 255) + data[i]['Subject - from Requestor'] = data[i]['Subject - from Requestor'].substring(0, 255) + '...'; if (data[i].Submitted !== '') continue; data.splice(i, 1); @@ -21,8 +23,7 @@ function initIndex(url) { { key: "Requestor", dataType: "string" }, { key: "Assigned To", dataType: "string" }, { key: "Second Resource", dataType: "string" }, - { key: "Subject - from Requestor", dataType: "string" }, - { key: "System(s)", dataType: "string" }, + { key: "Subject - from Requestor", dataType: "string", width: "30%" }, { key: "Priority", dataType: "string" }, ], features: [ diff --git a/MESAFIBACKLOG.csproj b/MESAFIBACKLOG.csproj index ab29d35..75488cb 100644 --- a/MESAFIBACKLOG.csproj +++ b/MESAFIBACKLOG.csproj @@ -182,9 +182,6 @@ 16.205.1 - - 5.2.7 - 6.0.3