From da3e839a48594347ab1528b06ad56a286783230d Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 17 Jun 2024 17:11:36 -0700 Subject: [PATCH] Host from Windows --- Server/ApiControllers/ExportController.cs | 24 ++- Server/ApiControllers/ToolTypesController.cs | 17 -- Server/Controllers/ExportController.cs | 160 ------------------ Server/Repositories/ExportRepository.cs | 84 +++++++++ Server/Repositories/ToolTypesRepository.cs | 93 ---------- Server/Views/Export/Index.cshtml | 96 ----------- Server/Views/Shared/_Layout.cshtml | 36 ++-- Server/wwwroot/index.html | 35 ++-- Shared/Models/Stateless/IExportRepository.cs | 3 + .../Models/Stateless/IToolTypesRepository.cs | 2 - Static/.vscode/tasks.json | 28 +++ Static/AwaitingDispo/index.html | 158 +++++++++++++++++ Static/Export/index.html | 158 +++++++++++++++++ Static/Metrology/AwaitingDispo/index.html | 158 +++++++++++++++++ Static/Metrology/Export/index.html | 158 +++++++++++++++++ Static/Metrology/RunHeaders/index.html | 158 +++++++++++++++++ Static/Metrology/RunInfo/index.html | 158 +++++++++++++++++ Static/Metrology/index.html | 158 +++++++++++++++++ Static/RunHeaders/index.html | 158 +++++++++++++++++ Static/RunInfo/index.html | 158 +++++++++++++++++ Static/awaiting-disposition.html | 42 ++--- Static/export.html | 93 ++++++++++ Static/index.html | 44 ++--- Static/js/FileSaver.min.js | 3 + Static/js/awaiting-disposition.js | 2 +- Static/js/export.js | 88 ++++++++++ Static/js/index.js | 2 +- Static/js/run-headers.js | 2 +- Static/js/site-server.js | 43 +---- Static/run-headers.html | 42 ++--- Static/styles/export.css | 4 + Static/wafer-counter.html | 8 +- Tests/.vscode/settings.json | 5 +- Tests/UnitTestExportController.cs | 58 +++++++ Tests/UnitTestToolTypesController.cs | 30 ---- Tests/UnitTestWaferCounterController.cs | 119 ------------- 36 files changed, 1918 insertions(+), 667 deletions(-) delete mode 100644 Server/Controllers/ExportController.cs delete mode 100644 Server/Views/Export/Index.cshtml create mode 100644 Static/.vscode/tasks.json create mode 100644 Static/AwaitingDispo/index.html create mode 100644 Static/Export/index.html create mode 100644 Static/Metrology/AwaitingDispo/index.html create mode 100644 Static/Metrology/Export/index.html create mode 100644 Static/Metrology/RunHeaders/index.html create mode 100644 Static/Metrology/RunInfo/index.html create mode 100644 Static/Metrology/index.html create mode 100644 Static/RunHeaders/index.html create mode 100644 Static/RunInfo/index.html create mode 100644 Static/export.html create mode 100644 Static/js/FileSaver.min.js create mode 100644 Static/js/export.js create mode 100644 Static/styles/export.css delete mode 100644 Tests/UnitTestWaferCounterController.cs diff --git a/Server/ApiControllers/ExportController.cs b/Server/ApiControllers/ExportController.cs index 9a678cf..f63ab16 100644 --- a/Server/ApiControllers/ExportController.cs +++ b/Server/ApiControllers/ExportController.cs @@ -4,6 +4,7 @@ namespace OI.Metrology.Server.ApiControllers; using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models.Stateless; +using System.Data; using System.Text.Json; [Route("api/[controller]")] @@ -11,9 +12,13 @@ public class ExportController : Controller, IExportController { private readonly IExportRepository _ExportRepository; + private readonly IMetrologyRepository _MetrologyRepository; - public ExportController(IExportRepository exportRepository) => + public ExportController(IExportRepository exportRepository, IMetrologyRepository metrologyRepository) + { _ExportRepository = exportRepository; + _MetrologyRepository = metrologyRepository; + } private static string? GetJson(Stream stream) { @@ -79,4 +84,21 @@ public class ExportController : Controller, IExportController public IActionResult PostProcessDataStandardFormat() => Content(_ExportRepository.GetProcessDataStandardFormat(GetHeaderCommon(Request.Body))); + [HttpGet] + [Route("{toolTypeId}/export")] + public IActionResult GetExportData(int toolTypeId, [FromQuery] string? datebegin, [FromQuery] string? dateend) + { + Result r = _ExportRepository.GetExportData(_MetrologyRepository, toolTypeId, datebegin, dateend); + string json = Newtonsoft.Json.JsonConvert.SerializeObject(r); + return Content(json); + } + + [HttpGet] + [Route("{toolTypeId}/csv")] + public IActionResult GetCSVExport(int toolTypeId, [FromQuery] string? datebegin, [FromQuery] string? dateend, [FromQuery] string? filename) + { + string r = _ExportRepository.GetCSVExport(_MetrologyRepository, toolTypeId, datebegin, dateend); + return File(r, "application/octet-stream", filename); + } + } \ No newline at end of file diff --git a/Server/ApiControllers/ToolTypesController.cs b/Server/ApiControllers/ToolTypesController.cs index a477214..ebe7819 100644 --- a/Server/ApiControllers/ToolTypesController.cs +++ b/Server/ApiControllers/ToolTypesController.cs @@ -66,23 +66,6 @@ public class ToolTypesController : Controller, IToolTypesController r = _ToolTypesRepository.GetExportData(_MetrologyRepo, toolTypeId, datebegin, dateend); - string json = JsonConvert.SerializeObject(r); - return Content(json); - } - - [HttpGet] - [Route("{toolTypeId}/csv")] - public IActionResult GetCSVExport(int toolTypeId, [FromQuery] string? datebegin, [FromQuery] string? dateend, [FromQuery] string? filename) - { - byte[] r = _ToolTypesRepository.GetCSVExport(_MetrologyRepo, toolTypeId, datebegin, dateend); - return File(r, "application/octet-stream", filename); - } - [HttpGet] [Route("{toolTypeId}/{tabletype}/files/{attachmentId}/{filename}")] public IActionResult GetAttachment(int toolTypeId, string tabletype, string attachmentId, string filename) diff --git a/Server/Controllers/ExportController.cs b/Server/Controllers/ExportController.cs deleted file mode 100644 index 856404d..0000000 --- a/Server/Controllers/ExportController.cs +++ /dev/null @@ -1,160 +0,0 @@ -using Infineon.Monitoring.MonA; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; -using OI.Metrology.Server.Models; -using OI.Metrology.Shared.DataModels; -using OI.Metrology.Shared.Models.Stateless; -using OI.Metrology.Shared.ViewModels; -using System.Text; - -namespace OI.Metrology.Server.Controllers; - -public class ExportController : Controller -{ - - private readonly ILogger _Logger; - private readonly AppSettings _AppSettings; - private readonly bool _IsTestDatabase; - private readonly IMetrologyRepository _MetrologyRepository; - - public ExportController(AppSettings appSettings, ILogger logger, IMetrologyRepository metrologyRepository) - { - _Logger = logger; - _AppSettings = appSettings; - _MetrologyRepository = metrologyRepository; - _IsTestDatabase = appSettings.ConnectionString.Contains("test", StringComparison.InvariantCultureIgnoreCase); - } - - public override void OnActionExecuted(ActionExecutedContext context) - { - base.OnActionExecuted(context); - ViewBag.IsTestDatabase = _IsTestDatabase; - } - - private string GetApiUrl() => string.IsNullOrEmpty(_AppSettings.ApiUrl) ? Url.Content("~/") : _AppSettings.ApiUrl[0] == '~' ? Url.Content(_AppSettings.ApiUrl) : _AppSettings.ApiUrl; - - [HttpGet] - [Route("/Export")] - public ActionResult Index() - { - Export model = new() - { - StartTime = DateTime.Now.AddMonths(-1), - EndTime = DateTime.Now - }; - MonIn monIn = MonIn.GetInstance(); - _ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Up); - ViewBag.ApiUrl = GetApiUrl(); - return View(model); - } - - [HttpPost] - [Route("/ExportData")] - public ActionResult ExportData(Export model) - { - ToolType? toolType = null; - if (string.IsNullOrEmpty(model.ToolType)) - ModelState.AddModelError("Exception", "Invalid selection"); - else - { - if (model.StartTime > model.EndTime) - ModelState.AddModelError("EndTime", "End time must be after start time"); - IEnumerable toolTypes = _MetrologyRepository.GetToolTypes(); - toolType = toolTypes.Where(tt => tt.ID.ToString() == model.ToolType).SingleOrDefault(); - if (toolType is null) - ModelState.AddModelError("ToolType", "Invalid selection"); - else if (string.IsNullOrWhiteSpace(toolType.ExportSPName)) - ModelState.AddModelError("ToolType", "Tool type is not exportable"); - } - if (ModelState.IsValid) - { - try - { - DateTime startDT = model.StartDate.Date.Add(model.StartTime.TimeOfDay); - DateTime endDT = model.EndDate.Date.Add(model.EndTime.TimeOfDay); - - return DoCSVExport(toolType?.ToolTypeName, toolType?.ExportSPName, startDT, endDT); - } - catch (Exception ex) - { - ModelState.AddModelError("Exception", "Error exporting data"); - ModelState.AddModelError("Exception", ex.Message); - string errorMessage = $"Error exporting: {ex}"; - _Logger.LogError(message: errorMessage); - MonIn monIn = MonIn.GetInstance(); - _ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Warning); - } - } - ViewBag.ApiUrl = GetApiUrl(); - return View("Index", model); - } - - protected ActionResult DoCSVExport(string? toolTypeName, string? spName, DateTime startTime, DateTime endTime) - { - string fileName = string.Format("Export_{0}_{1:yyyyMMddHHmm}_to_{2:yyyyMMddHHmm}.csv", toolTypeName, startTime, endTime); - StringBuilder sb = new(); - if (spName is null) - throw new NullReferenceException(nameof(spName)); - System.Data.DataTable dt = _MetrologyRepository.ExportData(spName, startTime, endTime); - _ = sb.AppendLine(GetColumnHeaders(dt)); - foreach (System.Data.DataRow dr in dt.Rows) - _ = sb.AppendLine(GetRowData(dr)); - byte[] contents = Encoding.UTF8.GetBytes(sb.ToString()); - return File(contents, "application/octet-stream", fileName); - } - - protected static string GetRowData(System.Data.DataRow dr) - { - StringBuilder r = new(); - for (int i = 0; i < dr.Table.Columns.Count; i++) - { - if (i > 0) - _ = r.Append(','); - object v = dr[i]; - if (!Convert.IsDBNull(v)) - { - string? c = Convert.ToString(v); - if (c is not null) - _ = r.Append(FormatForCSV(c)); - } - } - return r.ToString(); - } - - protected static string GetColumnHeaders(System.Data.DataTable dt) - { - StringBuilder r = new(); - for (int i = 0; i < dt.Columns.Count; i++) - { - if (i > 0) - _ = r.Append(','); - - _ = r.Append(FormatForCSV(dt.Columns[i].ColumnName.TrimEnd('_'))); - } - return r.ToString(); - } - - protected static string FormatForCSV(string v) - { - bool doubleQuoted = false; - StringBuilder r = new(v.Length + 2); - if (v.StartsWith(' ') || v.EndsWith(' ') || v.Contains(',') || v.Contains('"')) - { - _ = r.Append('"'); - doubleQuoted = true; - } - foreach (char c in v) - { - _ = c switch - { - '\r' or '\n' => r.Append(' '), - '"' => r.Append("\"\""), - _ => r.Append(c), - }; - } - if (doubleQuoted) - _ = r.Append('"'); - return r.ToString(); - } - -} \ No newline at end of file diff --git a/Server/Repositories/ExportRepository.cs b/Server/Repositories/ExportRepository.cs index 4b5c444..ad6eb62 100644 --- a/Server/Repositories/ExportRepository.cs +++ b/Server/Repositories/ExportRepository.cs @@ -2,7 +2,9 @@ using OI.Metrology.Server.Models; using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; +using System.Data; using System.Globalization; +using System.Text; using System.Text.Json; namespace OI.Metrology.Server.Repository; @@ -160,4 +162,86 @@ public class ExportRepository : IExportRepository return result; } + Result IExportRepository.GetExportData(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend) + { + Result? r; + DateTime dateEnd = dateend is null ? DateTime.Now : DateTime.Parse(dateend); + DateTime dateBegin = datebegin is null ? dateEnd.AddMonths(-1) : DateTime.Parse(datebegin); + ToolType tt = metrologyRepository.GetToolTypeByID(toolTypeId); + if (string.IsNullOrEmpty(tt.ExportSPName)) + throw new NullReferenceException(nameof(tt.ExportSPName)); + DataTable dataTable = metrologyRepository.ExportData(tt.ExportSPName, dateBegin, dateEnd); + r = new() + { + Results = dataTable, + TotalRows = dataTable.Rows.Count, + }; + return r; + } + + protected static string FormatForCSV(string v) + { + StringBuilder result = new(v.Length + 2); + bool doubleQuoted = false; + if (v.StartsWith(' ') || v.EndsWith(' ') || v.Contains(',') || v.Contains('"')) + { + _ = result.Append('"'); + doubleQuoted = true; + } + foreach (char c in v) + { + _ = c switch + { + '\r' or '\n' => result.Append(' '), + '"' => result.Append("\"\""), + _ => result.Append(c), + }; + } + if (doubleQuoted) + _ = result.Append('"'); + return result.ToString(); + } + + protected static string GetColumnHeaders(DataTable dataTable) + { + StringBuilder result = new(); + for (int i = 0; i < dataTable.Columns.Count; i++) + { + if (i > 0) + _ = result.Append(','); + _ = result.Append(FormatForCSV(dataTable.Columns[i].ColumnName.TrimEnd('_'))); + } + return result.ToString(); + } + + protected static string GetRowData(DataRow dr) + { + StringBuilder result = new(); + for (int i = 0; i < dr.Table.Columns.Count; i++) + { + if (i > 0) + _ = result.Append(','); + object v = dr[i]; + if (v is not null && !Convert.IsDBNull(v)) + _ = result.Append(FormatForCSV(string.Concat(Convert.ToString(v)))); + } + return result.ToString(); + } + + string IExportRepository.GetCSVExport(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend) + { + string results; + Result result; + IExportRepository repository = this; + result = repository.GetExportData(metrologyRepository, toolTypeId, datebegin, dateend); + if (result.Results is null) + throw new NullReferenceException(nameof(result.Results)); + StringBuilder stringBuilder = new(); + _ = stringBuilder.AppendLine(GetColumnHeaders(result.Results)); + foreach (DataRow dr in result.Results.Rows) + _ = stringBuilder.AppendLine(GetRowData(dr)); + results = stringBuilder.ToString(); + return results; + } + } \ No newline at end of file diff --git a/Server/Repositories/ToolTypesRepository.cs b/Server/Repositories/ToolTypesRepository.cs index 0ded8db..0720ef5 100644 --- a/Server/Repositories/ToolTypesRepository.cs +++ b/Server/Repositories/ToolTypesRepository.cs @@ -3,7 +3,6 @@ using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models.Stateless; using OI.Metrology.Shared.Services; using System.Data; -using System.Text; using System.Text.Json; namespace OI.Metrology.Server.Repository; @@ -237,96 +236,4 @@ public class ToolTypesRepository : IToolTypesRepository return result; } - Result IToolTypesRepository.GetExportData(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend) - { - Result? r; - if (!string.IsNullOrEmpty(_MockRoot)) - { - string json = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IToolTypesRepository.GetExportData)}.json")); - r = Newtonsoft.Json.JsonConvert.DeserializeObject>(json); - if (r is null) - throw new NullReferenceException(nameof(r)); - } - else - { - DateTime dateEnd = dateend is null ? DateTime.Now : DateTime.Parse(dateend); - DateTime dateBegin = datebegin is null ? dateEnd.AddMonths(-1) : DateTime.Parse(datebegin); - ToolType tt = metrologyRepository.GetToolTypeByID(toolTypeId); - if (string.IsNullOrEmpty(tt.ExportSPName)) - throw new NullReferenceException(nameof(tt.ExportSPName)); - DataTable dataTable = metrologyRepository.ExportData(tt.ExportSPName, dateBegin, dateEnd); - r = new() - { - Results = dataTable, - TotalRows = dataTable.Rows.Count, - }; - } - return r; - } - - protected static string FormatForCSV(string v) - { - StringBuilder result = new(v.Length + 2); - bool doubleQuoted = false; - if (v.StartsWith(' ') || v.EndsWith(' ') || v.Contains(',') || v.Contains('"')) - { - _ = result.Append('"'); - doubleQuoted = true; - } - foreach (char c in v) - { - _ = c switch - { - '\r' or '\n' => result.Append(' '), - '"' => result.Append("\"\""), - _ => result.Append(c), - }; - } - if (doubleQuoted) - _ = result.Append('"'); - return result.ToString(); - } - - protected static string GetColumnHeaders(DataTable dataTable) - { - StringBuilder result = new(); - for (int i = 0; i < dataTable.Columns.Count; i++) - { - if (i > 0) - _ = result.Append(','); - _ = result.Append(FormatForCSV(dataTable.Columns[i].ColumnName.TrimEnd('_'))); - } - return result.ToString(); - } - - protected static string GetRowData(DataRow dr) - { - StringBuilder result = new(); - for (int i = 0; i < dr.Table.Columns.Count; i++) - { - if (i > 0) - _ = result.Append(','); - object v = dr[i]; - if (v is not null && !Convert.IsDBNull(v)) - _ = result.Append(FormatForCSV(string.Concat(Convert.ToString(v)))); - } - return result.ToString(); - } - - byte[] IToolTypesRepository.GetCSVExport(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend) - { - byte[] results; - Result result; - IToolTypesRepository repository = this; - result = repository.GetExportData(metrologyRepository, toolTypeId, datebegin, dateend); - if (result.Results is null) - throw new NullReferenceException(nameof(result.Results)); - StringBuilder stringBuilder = new(); - _ = stringBuilder.AppendLine(GetColumnHeaders(result.Results)); - foreach (DataRow dr in result.Results.Rows) - _ = stringBuilder.AppendLine(GetRowData(dr)); - results = Encoding.UTF8.GetBytes(stringBuilder.ToString()); - return results; - } - } \ No newline at end of file diff --git a/Server/Views/Export/Index.cshtml b/Server/Views/Export/Index.cshtml deleted file mode 100644 index 1dd8b82..0000000 --- a/Server/Views/Export/Index.cshtml +++ /dev/null @@ -1,96 +0,0 @@ -@using OI.Metrology.Shared.ViewModels -@model OI.Metrology.Shared.ViewModels.Export -@{ - ViewData["Title"] = "Export Data"; -} - - - -

Export Data

- -
- -
-
- -
- @Html.ValidationMessage("ToolType", new { @class = "text-danger" }) -
-
- -
-
- @Html.ValidationMessage("StartDate", new { @class = "text-danger" }) -
-
- -
-
- @Html.ValidationMessage("EndDate", new { @class = "text-danger" }) -
-
- -
- -
- @Html.ValidationMessage("Exception", new { @class = "text-danger" }) -
-
- -
- - \ No newline at end of file diff --git a/Server/Views/Shared/_Layout.cshtml b/Server/Views/Shared/_Layout.cshtml index 06da336..061b927 100644 --- a/Server/Views/Shared/_Layout.cshtml +++ b/Server/Views/Shared/_Layout.cshtml @@ -6,41 +6,41 @@ @ViewBag.Title - - - - - - - + - - @@ -63,8 +63,8 @@
- OI Metrology Viewer
@@ -99,9 +99,9 @@
- - @RenderSection("scripts", required: false) diff --git a/Server/wwwroot/index.html b/Server/wwwroot/index.html index a9f88d5..6c3658b 100644 --- a/Server/wwwroot/index.html +++ b/Server/wwwroot/index.html @@ -6,41 +6,41 @@ Run Information - - - - - - - - @@ -54,7 +54,8 @@
- OI Metrology Viewer
@@ -171,11 +172,11 @@
- - - diff --git a/Shared/Models/Stateless/IExportRepository.cs b/Shared/Models/Stateless/IExportRepository.cs index 3df9436..6b58691 100644 --- a/Shared/Models/Stateless/IExportRepository.cs +++ b/Shared/Models/Stateless/IExportRepository.cs @@ -1,4 +1,5 @@ using OI.Metrology.Shared.DataModels; +using System.Data; namespace OI.Metrology.Shared.Models.Stateless; @@ -9,5 +10,7 @@ public interface IExportRepository Result GetHeaders(HeaderCommon headerCommon); Result GetLogistics(HeaderCommon headerCommon); string GetProcessDataStandardFormat(HeaderCommon headerCommon); + string GetCSVExport(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend); + Result GetExportData(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend); } \ No newline at end of file diff --git a/Shared/Models/Stateless/IToolTypesRepository.cs b/Shared/Models/Stateless/IToolTypesRepository.cs index df91cb6..505d473 100644 --- a/Shared/Models/Stateless/IToolTypesRepository.cs +++ b/Shared/Models/Stateless/IToolTypesRepository.cs @@ -10,10 +10,8 @@ public interface IToolTypesRepository Result Index(IMetrologyRepository metrologyRepository); Result GetData(IMetrologyRepository metrologyRepository, int id, long headerid); Result GetHeaderFields(IMetrologyRepository metrologyRepository, int id, long headerid); - byte[] GetCSVExport(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend); Result GetHeaderTitles(IMetrologyRepository metrologyRepository, int id, int? page, int? pagesize); Result GetToolTypeMetadata(IMetrologyRepository metrologyRepository, int id, string sortby = ""); - Result GetExportData(IMetrologyRepository metrologyRepository, int toolTypeId, string? datebegin, string? dateend); string? OIExport(IMetrologyRepository metrologyRepository, IAttachmentsService attachmentsService, int toolTypeId, long headerid); Result GetHeaders(IMetrologyRepository metrologyRepository, int id, string? datebegin, string? dateend, int? page, int? pagesize, long? headerid); (string?, string?, Stream?) GetAttachment(IMetrologyRepository metrologyRepository, IAttachmentsService attachmentsService, int toolTypeId, string tabletype, string attachmentId, string filename); diff --git a/Static/.vscode/tasks.json b/Static/.vscode/tasks.json new file mode 100644 index 0000000..c3ef00e --- /dev/null +++ b/Static/.vscode/tasks.json @@ -0,0 +1,28 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "MakeDirctory", + "command": "mkdir", + "args": [ + "D:\\web-sites\\OI-Metrology\\pp-6737ddfb-_______-OI-Metrology-Release" + ], + }, + { + "type": "shell", + "label": "CopySite", + "command": "robocopy", + "args": [ + "L:\\DevOps\\Mesa_FI\\OI-Metrology\\Static", + "D:\\web-sites\\OI-Metrology\\pp-6737ddfb-_______-OI-Metrology-Release\\Static", + "/E", + "/MT:6", + "/NFL", + "/NDL", + "/NJH", + "/NJS" + ], + } + ] +} \ No newline at end of file diff --git a/Static/AwaitingDispo/index.html b/Static/AwaitingDispo/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/AwaitingDispo/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Export/index.html b/Static/Export/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Export/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Metrology/AwaitingDispo/index.html b/Static/Metrology/AwaitingDispo/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Metrology/AwaitingDispo/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Metrology/Export/index.html b/Static/Metrology/Export/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Metrology/Export/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Metrology/RunHeaders/index.html b/Static/Metrology/RunHeaders/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Metrology/RunHeaders/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Metrology/RunInfo/index.html b/Static/Metrology/RunInfo/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Metrology/RunInfo/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/Metrology/index.html b/Static/Metrology/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/Metrology/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/RunHeaders/index.html b/Static/RunHeaders/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/RunHeaders/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/RunInfo/index.html b/Static/RunInfo/index.html new file mode 100644 index 0000000..d20de07 --- /dev/null +++ b/Static/RunInfo/index.html @@ -0,0 +1,158 @@ + + + + + + + Run Information + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+ +

Run Information

+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
   +
+ +
   +
+ + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+

© 2024 - Infineon Technologies

+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/Static/awaiting-disposition.html b/Static/awaiting-disposition.html index 4a6201d..889e8e7 100644 --- a/Static/awaiting-disposition.html +++ b/Static/awaiting-disposition.html @@ -6,24 +6,24 @@ Awaiting Disposition - + - - + - - + + - - - - - + + + + + - + - - + + @@ -36,16 +36,16 @@
- + OI Metrology Viewer

@@ -77,9 +77,9 @@

- - - + + + \ No newline at end of file diff --git a/Static/export.html b/Static/export.html new file mode 100644 index 0000000..30b0efd --- /dev/null +++ b/Static/export.html @@ -0,0 +1,93 @@ + + + + + + + Export Data + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + OI Metrology Viewer +
+
+
+ +

+   +

+
+
+
+
+

Export Data

+ +
+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/Static/index.html b/Static/index.html index 314c166..d20de07 100644 --- a/Static/index.html +++ b/Static/index.html @@ -6,25 +6,25 @@ Run Information - + - - + - - - + + + - - - - - + + + + + - + - - + + @@ -37,16 +37,16 @@
- + OI Metrology Viewer

@@ -150,9 +150,9 @@

- - - + + + \ No newline at end of file diff --git a/Static/js/FileSaver.min.js b/Static/js/FileSaver.min.js new file mode 100644 index 0000000..66e1e3e --- /dev/null +++ b/Static/js/FileSaver.min.js @@ -0,0 +1,3 @@ +(function(a,b){if("function"==typeof define&&define.amd)define([],b);else if("undefined"!=typeof exports)b();else{b(),a.FileSaver={exports:{}}.exports}})(this,function(){"use strict";function b(a,b){return"undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Depricated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(b,c,d){var e=new XMLHttpRequest;e.open("GET",b),e.responseType="blob",e.onload=function(){a(e.response,c,d)},e.onerror=function(){console.error("could not download file")},e.send()}function d(a){var b=new XMLHttpRequest;return b.open("HEAD",a,!1),b.send(),200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"))}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b)}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof global&&global.global===global?global:void 0,a=f.saveAs||"object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href)},4E4),setTimeout(function(){e(j)},0))}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else{var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i)})}}:function(a,b,d,e){if(e=e||open("","_blank"),e&&(e.document.title=e.document.body.innerText="downloading..."),"string"==typeof a)return c(a,b,d);var g="application/octet-stream"===a.type,h=/constructor/i.test(f.HTMLElement)||f.safari,i=/CriOS\/[\d]+/.test(navigator.userAgent);if((i||g&&h)&&"object"==typeof FileReader){var j=new FileReader;j.onloadend=function(){var a=j.result;a=i?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),e?e.location.href=a:location=a,e=null},j.readAsDataURL(a)}else{var k=f.URL||f.webkitURL,l=k.createObjectURL(a);e?e.location=l:location.href=l,e=null,setTimeout(function(){k.revokeObjectURL(l)},4E4)}};f.saveAs=a.saveAs=a,"undefined"!=typeof module&&(module.exports=a)}); + +//# sourceMappingURL=FileSaver.min.js.map \ No newline at end of file diff --git a/Static/js/awaiting-disposition.js b/Static/js/awaiting-disposition.js index ec30fa9..ce0e1e7 100644 --- a/Static/js/awaiting-disposition.js +++ b/Static/js/awaiting-disposition.js @@ -1,5 +1,5 @@ $(document).ready(function () { - initAwaitingDisposition("https://oi-metrology-viewer-prod.mes.infineon.com/api", "https://metrology-viewer-prod.mes.infineon.com"); + initAwaitingDisposition("https://oi-metrology-viewer-prod.mes.infineon.com:4433/api", "https://oi-metrology-viewer-prod.mes.infineon.com"); }); \ No newline at end of file diff --git a/Static/js/export.js b/Static/js/export.js new file mode 100644 index 0000000..7bab9b9 --- /dev/null +++ b/Static/js/export.js @@ -0,0 +1,88 @@ +var _apiUrl = null; +var _StaticUrl = null; + +function getParams() { + var endDate = $("#EndDate").igDatePicker("value"); + var endTime = $("#EndTime").igTimePicker("value"); + var startDate = $("#StartDate").igDatePicker("value"); + var startTime = $("#StartTime").igTimePicker("value"); + var result = { + datebegin: new Date( + startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), + startTime.getHours(), startTime.getMinutes(), startTime.getSeconds()).toISOString(), + dateend: new Date( + endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), + endTime.getHours(), endTime.getMinutes(), endTime.getSeconds()).toISOString(), + } + return result; +} + +function postExport() { + parms = getParams(); + var toolTypeID = $("#ToolType").igCombo("value"); + var url = _apiUrl + "/Export/" + toolTypeID + "/csv"; + // var url = _apiUrl + "/ToolTypes/" + toolTypeID + "/csv"; + $.get(url, parms, function (data) { + var blob = new Blob([data], { + type: "text/plain;charset=utf-8", + }); + parms = getParams(); + var toolType = $("#ToolType").igCombo("text"); + saveAs(blob, "Export_" + toolType + "_" + parms.datebegin + "_to_" + parms.dateend + ".csv"); + }).fail(function () { + ShowErrorMessage("Error"); + }); +} + +function initExport(apiUrl, staticUrl, startTimeValue, endTimeValue) { + _apiUrl = apiUrl; + _StaticUrl = staticUrl; + var endTime = new Date(endTimeValue); + var startTime = new Date(startTimeValue); + $.getJSON(_apiUrl + '/tooltypes', function (data) { + $("#ToolType").igCombo({ + dataSource: data, + responseDataKey: "Results", + textKey: "ToolTypeName", + valueKey: "ID", + mode: "dropdown", + width: 150 + }); + }); + $("#StartDate").igDatePicker({ + dateInputFormat: "date", + value: startTime, + width: 125, + inputName: "StartDate", + }); + $("#StartTime").igTimePicker({ + dateInputFormat: "time", + value: startTime, + width: 110, + inputName: "StartTime", + }); + $("#EndDate").igDatePicker({ + dateInputFormat: "date", + value: endTime, + width: 125, + inputName: "EndDate", + }); + $("#EndTime").igTimePicker({ + dateInputFormat: "time", + value: endTime, + width: 110, + inputName: "EndTime", + }); + $("#ExportButton").click(postExport); +}; + +$(document).ready(function () { + + var endTimeValue = Date.now(); + var startTimeValue = new Date(); + // startTimeValue.setDate(startTimeValue.getDate() - 1); + startTimeValue.setMonth(startTimeValue.getMonth() - 1); + initExport("https://oi-metrology-viewer-prod.mes.infineon.com:4433/api", "https://oi-metrology-viewer-prod.mes.infineon.com", startTimeValue, endTimeValue); + +}); +// string fileName = string.Format("Export_{0}_{1:yyyyMMddHHmm}_to_{2:yyyyMMddHHmm}.csv", export.ToolType, export.StartTime, export.EndTime); \ No newline at end of file diff --git a/Static/js/index.js b/Static/js/index.js index 6cc3bda..45e5ba9 100644 --- a/Static/js/index.js +++ b/Static/js/index.js @@ -5,6 +5,6 @@ $(document).ready(function () { const urlParams = new URLSearchParams(queryString); const initialHeaderId = urlParams.get('headerid'); const initialToolTypeID = urlParams.get('tooltypeid'); - initRunInfo("https://oi-metrology-viewer-prod.mes.infineon.com/api", "https://metrology-viewer-prod.mes.infineon.com", initialToolTypeID, initialHeaderId, initialHeaderAttachmentId); + initRunInfo("https://oi-metrology-viewer-prod.mes.infineon.com:4433/api", "https://oi-metrology-viewer-prod.mes.infineon.com", initialToolTypeID, initialHeaderId, initialHeaderAttachmentId); }); \ No newline at end of file diff --git a/Static/js/run-headers.js b/Static/js/run-headers.js index 8bc8376..5d7a543 100644 --- a/Static/js/run-headers.js +++ b/Static/js/run-headers.js @@ -1,5 +1,5 @@ $(document).ready(function () { - initRunHeaders("https://oi-metrology-viewer-prod.mes.infineon.com/api", "https://metrology-viewer-prod.mes.infineon.com"); + initRunHeaders("https://oi-metrology-viewer-prod.mes.infineon.com:4433/api", "https://oi-metrology-viewer-prod.mes.infineon.com"); }); \ No newline at end of file diff --git a/Static/js/site-server.js b/Static/js/site-server.js index ade935e..061283d 100644 --- a/Static/js/site-server.js +++ b/Static/js/site-server.js @@ -58,47 +58,6 @@ function initAwaitingDisposition(apiUrl, staticUrl) { $("#grid").on("dblclick", "tr", loadRunInfoAwaitingDisposition); }; -function initExport(apiUrl, staticUrl, startTimeValue, endTimeValue) { - _apiUrl = apiUrl; - _StaticUrl = staticUrl; - var endTime = new Date(endTimeValue); - var startTime = new Date(startTimeValue); - $.getJSON(_apiUrl + '/tooltypes', function (data) { - $("#ToolType").igCombo({ - dataSource: data, - responseDataKey: "Results", - textKey: "ToolTypeName", - valueKey: "ID", - mode: "dropdown", - width: 150 - }); - }); - $("#StartDateControl").igDatePicker({ - dateInputFormat: "date", - value: startTime, - width: 125, - inputName: "StartDate", - }); - $("#StartTimeControl").igTimePicker({ - dateInputFormat: "time", - value: startTime, - width: 110, - inputName: "StartTime", - }); - $("#EndDateControl").igDatePicker({ - dateInputFormat: "date", - value: endTime, - width: 125, - inputName: "EndDate", - }); - $("#EndTimeControl").igTimePicker({ - dateInputFormat: "time", - value: endTime, - width: 110, - inputName: "EndTime", - }); -}; - function loadHeaderGridRunHeaders() { var toolTypeID = -1; // $("#ToolType").igCombo("value"); var gridCreated = $("#HeaderGrid").data("igGrid"); @@ -853,7 +812,7 @@ function recipeParametersButtonRunInfo() { var gridCreated = $("#ModalBodyGrid").data("igGrid"); if (gridCreated) $("#ModalBodyGrid").igGrid("destroy"); - $.getJSON('https://oi-prod-ec-api.mes.infineon.com/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) { + $.getJSON('https://oi-prod-ec-api.mes.infineon.com:4433/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) { $("#RecipeParametersButton").prop("disabled", false); var text = ""; var seperator = '\t'; diff --git a/Static/run-headers.html b/Static/run-headers.html index 7c75e8b..0a91344 100644 --- a/Static/run-headers.html +++ b/Static/run-headers.html @@ -6,25 +6,25 @@ Run Headers - + - - + - - - + + + - - - - - + + + + + - + - - + + @@ -37,15 +37,15 @@
- + OI Metrology Viewer
@@ -87,9 +87,9 @@
- - - + + + \ No newline at end of file diff --git a/Static/styles/export.css b/Static/styles/export.css new file mode 100644 index 0000000..464cf53 --- /dev/null +++ b/Static/styles/export.css @@ -0,0 +1,4 @@ +td { + padding-bottom: 2em; + padding-right: 1em; +} \ No newline at end of file diff --git a/Static/wafer-counter.html b/Static/wafer-counter.html index 6f0ab53..d09d331 100644 --- a/Static/wafer-counter.html +++ b/Static/wafer-counter.html @@ -6,12 +6,12 @@ Wafer Counter - - - + + + + src="/package/dist/infineon-design-system-stencil/infineon-design-system-stencil.esm.js">