diff --git a/Server/Repositories/ExportRepository.cs b/Server/Repositories/ExportRepository.cs index ad6eb62..86ef7bc 100644 --- a/Server/Repositories/ExportRepository.cs +++ b/Server/Repositories/ExportRepository.cs @@ -2,6 +2,7 @@ using OI.Metrology.Server.Models; using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; +using System.Collections.ObjectModel; using System.Data; using System.Globalization; using System.Text; @@ -44,15 +45,15 @@ public class ExportRepository : IExportRepository List results = new(); Uri uri; string[] weeks = Get(); - List nginxFileSystemSortableCollection; + ReadOnlyCollection collection; foreach (string weekYear in weeks) { if (headerCommon.ID < 1) uri = _FileShareRepository.Append(new Uri(_AppSettings.EcMesaFileShareMetrologySi), "Archive", "API", weekYear, $"-{headerCommon.PSN}", $"-{headerCommon.Reactor}", $"-{headerCommon.RDS}"); else uri = _FileShareRepository.Append(new Uri(_AppSettings.EcMesaFileShareMetrologySi), "Archive", "API", weekYear, $"-{headerCommon.PSN}", $"-{headerCommon.Reactor}", $"-{headerCommon.RDS}", $"-{headerCommon.ID}"); - nginxFileSystemSortableCollection = _FileShareRepository.GetNginxFileSystemSortableCollection(httpClient, uri, endsWith); - results.AddRange(nginxFileSystemSortableCollection); + collection = _FileShareRepository.GetNginxFileSystemSortableCollection(httpClient, uri, endsWith); + results.AddRange(collection); } return results.OrderByDescending(l => l.DateTime).ToArray(); } diff --git a/Server/Repositories/FileShareRepository.cs b/Server/Repositories/FileShareRepository.cs index cd3bcf5..ec48542 100644 --- a/Server/Repositories/FileShareRepository.cs +++ b/Server/Repositories/FileShareRepository.cs @@ -1,5 +1,7 @@ +using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; +using System.Collections.ObjectModel; using System.Text.Json; using System.Web; @@ -78,7 +80,7 @@ public class FileShareRepository : IFileShareRepository return result; } - List IFileShareRepository.GetNginxFileSystemSortableCollection(HttpClient httpClient, Uri uri, string? endsWith) + ReadOnlyCollection IFileShareRepository.GetNginxFileSystemSortableCollection(HttpClient httpClient, Uri uri, string? endsWith) { List results = new(); Task httpResponseMessage = httpClient.GetAsync(uri); @@ -97,10 +99,13 @@ public class FileShareRepository : IFileShareRepository results.Add(nginxFileSystemSortable); } } - return results; + return new(results); } - List IFileShareRepository.GetArchiveData(CharacterizationParameters archiveParameters) => + ReadOnlyCollection IFileShareRepository.GetArchiveData(CharacterizationParameters archiveParameters) => + throw new NotImplementedException(); + + ReadOnlyCollection IFileShareRepository.GetEquipmentIds() => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Shared/DataModels/WaferCounterArchive.cs b/Shared/DataModels/WaferCounterArchive.cs new file mode 100644 index 0000000..df3e5e3 --- /dev/null +++ b/Shared/DataModels/WaferCounterArchive.cs @@ -0,0 +1,28 @@ +namespace OI.Metrology.Shared.DataModels; + +public class WaferCounterArchive +{ + + public long ID { get; set; } + public DateTime InsertDate { get; set; } + public Guid AttachmentID { get; set; } + public string? Title { get; set; } + public DateTime Date { get; set; } + public long ToolTypeID { get; set; } + public string? ToolTypeName { get; set; } + + public string? MesEntity { get; set; } + + public string? Employee { get; set; } + public string? Layer { get; set; } + public string? PSN { get; set; } + public string? RDS { get; set; } + public string? Reactor { get; set; } + public string? Recipe { get; set; } + public string? Zone { get; set; } + + public string? SlotMap { get; set; } + public string? Text { get; set; } + public int? Total { get; set; } + +} \ No newline at end of file diff --git a/Shared/Models/Stateless/IFileShareRepository.cs b/Shared/Models/Stateless/IFileShareRepository.cs index b92546c..1e4e731 100644 --- a/Shared/Models/Stateless/IFileShareRepository.cs +++ b/Shared/Models/Stateless/IFileShareRepository.cs @@ -1,3 +1,6 @@ +using OI.Metrology.Shared.DataModels; +using System.Collections.ObjectModel; + namespace OI.Metrology.Shared.Models.Stateless; public interface IFileShareRepository @@ -7,9 +10,10 @@ public interface IFileShareRepository void MoveFile(string from, string to); Uri Append(Uri uri, params string[] paths); void FileWrite(string path, string contents); + ReadOnlyCollection GetEquipmentIds(); HttpResponseMessage ReadFile(HttpClient httpClient, Uri uri); void CopyFile(HttpClient httpClient, string from, string to); void MoveFile(HttpClient httpClient, string from, string to); - List GetArchiveData(CharacterizationParameters characterizationParameters); - List GetNginxFileSystemSortableCollection(HttpClient httpClient, Uri uri, string? endsWith); + ReadOnlyCollection GetArchiveData(CharacterizationParameters characterizationParameters); + ReadOnlyCollection GetNginxFileSystemSortableCollection(HttpClient httpClient, Uri uri, string? endsWith); } \ No newline at end of file diff --git a/Static/files.html b/Static/files.html index 68bfeb1..4b9adf3 100644 --- a/Static/files.html +++ b/Static/files.html @@ -6,25 +6,25 @@ File(s) - + - - + - - - + + + - - - - - + + + + + - - + + @@ -99,52 +99,6 @@
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - -