phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update footer copyright year to 2025 in multiple HTML files and adjust file retrieval logic in FileShareRepository

Browse Source
This commit is contained in:
Mike Phares
2025-09-23 06:50:03 -07:00
parent b1b20e1bb0
commit 5ff031178f
15 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Static/AwaitingDispo/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Export/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Metrology/AwaitingDispo/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Metrology/Export/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Metrology/RunHeaders/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Metrology/RunInfo/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/Metrology/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/RunHeaders/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/RunInfo/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/awaiting-disposition.html
View File

@ -74,7 +74,7 @@
</div> </div>
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/files.html
View File

@ -115,7 +115,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

2
Static/index.html
View File

@ -147,7 +147,7 @@
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

7
Static/js/site-server.js
View File

@ -919,17 +919,18 @@ function requestHeaderDataFiles() {
var startTime = $("#StartTime").igTimePicker("value"); var startTime = $("#StartTime").igTimePicker("value");
var endDate = $("#EndDate").igDatePicker("value"); var endDate = $("#EndDate").igDatePicker("value");
var endTime = $("#EndTime").igTimePicker("value"); var endTime = $("#EndTime").igTimePicker("value");
var segments = toolTypeName.split('-');
var params = { var params = {
area: null, area: segments.length === 2 ? segments[0] : null,
'end-time': new Date( 'end-time': new Date(
endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), endDate.getFullYear(), endDate.getMonth(), endDate.getDate(),
endTime.getHours(), endTime.getMinutes(), endTime.getSeconds()).toISOString(), endTime.getHours(), endTime.getMinutes(), endTime.getSeconds()).toISOString(),
'equipment-id': toolTypeName, 'equipment-id': toolTypeName,
'search-pattern': '*.wc', 'search-pattern': segments.length === 2 ? '*.pdsf' : '*.json',
'start-time': new Date( 'start-time': new Date(
startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), startDate.getFullYear(), startDate.getMonth(), startDate.getDate(),
startTime.getHours(), startTime.getMinutes(), startTime.getSeconds()).toISOString(), startTime.getHours(), startTime.getMinutes(), startTime.getSeconds()).toISOString(),
'wafer-size': null, 'wafer-size': segments.length === 2 ? segments[1] : null,
} }
var headerURL = _apiUrl + "/v1/file-share/archive-data/?" + $.param(params); var headerURL = _apiUrl + "/v1/file-share/archive-data/?" + $.param(params);
var gridColumns = [ var gridColumns = [

2
Static/run-headers.html
View File

@ -84,7 +84,7 @@
</table> </table>
<hr /> <hr />
<footer> <footer>
<p>&copy; 2024 - Infineon Technologies</p> <p>&copy; 2025 - Infineon Technologies</p>
</footer> </footer>
</div> </div>

35
Wafer-Counter/Repositories/FileShareRepository.cs
View File

@ -122,36 +122,30 @@ public class FileShareRepository : IFileShareRepository
return new(results); return new(results);
} }
private static ReadOnlyCollection<string> GetFiles(CharacterizationParameters characterizationParameters, string equipmentDirectory, string searchPattern, DateTime startDateTime, DateTime endDateTime, ReadOnlyCollection<string> validDirectories) private static ReadOnlyCollection<string> GetFiles(CharacterizationParameters characterizationParameters, string equipmentDirectory, DateTime startDateTime, DateTime endDateTime, ReadOnlyCollection<string> validDirectories)
{ {
List<string> results = []; List<string> results = [];
string[] directories; string[] directories;
SearchOption searchOption;
string startDateTimeTicks = startDateTime.Ticks.ToString(); string startDateTimeTicks = startDateTime.Ticks.ToString();
string delta = (endDateTime.Ticks - startDateTime.Ticks).ToString(); string delta = (endDateTime.Ticks - startDateTime.Ticks).ToString();
string ticksSearchPattern = $"{startDateTime.Ticks.ToString()[..(startDateTimeTicks.Length - delta.Length - 1)]}*"; string ticksSearchPattern = $"{startDateTime.Ticks.ToString()[..(startDateTimeTicks.Length - delta.Length - 1)]}*";
bool check = characterizationParameters.SearchPattern is null || searchPattern == characterizationParameters.SearchPattern;
if (check)
results.AddRange(Directory.GetFiles(equipmentDirectory, searchPattern, SearchOption.AllDirectories));
foreach (string validDirectory in validDirectories) foreach (string validDirectory in validDirectories)
{ {
if (string.IsNullOrEmpty(validDirectory) || !Directory.Exists(validDirectory)) if (string.IsNullOrEmpty(characterizationParameters.SearchPattern) || string.IsNullOrEmpty(validDirectory) || !Directory.Exists(validDirectory))
continue; continue;
if (check) searchOption = validDirectory == equipmentDirectory ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories;
results.AddRange(Directory.GetFiles(validDirectory, searchPattern, SearchOption.AllDirectories)); directories = Directory.GetDirectories(validDirectory, ticksSearchPattern, searchOption);
else foreach (string directory in directories)
{ results.AddRange(Directory.GetFiles(directory, characterizationParameters.SearchPattern, SearchOption.TopDirectoryOnly));
directories = Directory.GetDirectories(validDirectory, ticksSearchPattern, SearchOption.AllDirectories);
foreach (string directory in directories)
results.AddRange(Directory.GetFiles(directory, searchPattern, SearchOption.TopDirectoryOnly));
}
} }
return new(results); return new(results);
} }
private static ReadOnlyCollection<FileInfo> GetCollection(CharacterizationParameters characterizationParameters, string equipmentDirectory, string searchPattern, DateTime startDateTime, DateTime endDateTime, ReadOnlyCollection<string> validDirectories) private static ReadOnlyCollection<FileInfo> GetCollection(CharacterizationParameters characterizationParameters, string equipmentDirectory, DateTime startDateTime, DateTime endDateTime, ReadOnlyCollection<string> validDirectories)
{ {
FileInfo[] results; FileInfo[] results;
ReadOnlyCollection<string> files = GetFiles(characterizationParameters, equipmentDirectory, searchPattern, startDateTime, endDateTime, validDirectories); ReadOnlyCollection<string> files = GetFiles(characterizationParameters, equipmentDirectory, startDateTime, endDateTime, validDirectories);
FileInfo[] collection = files.Select(l => new FileInfo(l)).ToArray(); FileInfo[] collection = files.Select(l => new FileInfo(l)).ToArray();
results = (from l in collection where l.LastWriteTime >= startDateTime && l.LastWriteTime <= endDateTime orderby l.LastWriteTime descending select l).ToArray(); results = (from l in collection where l.LastWriteTime >= startDateTime && l.LastWriteTime <= endDateTime orderby l.LastWriteTime descending select l).ToArray();
return new(results); return new(results);
@ -193,7 +187,7 @@ public class FileShareRepository : IFileShareRepository
return new(results); return new(results);
} }
private static ReadOnlyCollection<CharacterizationInfo> GetCharacterizationData(CharacterizationParameters characterizationParameters, string equipmentDirectory, string searchPattern) private static ReadOnlyCollection<CharacterizationInfo> GetCharacterizationData(CharacterizationParameters characterizationParameters, string equipmentDirectory)
{ {
List<CharacterizationInfo> results = []; List<CharacterizationInfo> results = [];
string[] lines; string[] lines;
@ -204,7 +198,7 @@ public class FileShareRepository : IFileShareRepository
DateTime endDateTime = characterizationParameters.EndTime is null ? DateTime.Now : DateTime.Parse(characterizationParameters.EndTime).ToLocalTime(); DateTime endDateTime = characterizationParameters.EndTime is null ? DateTime.Now : DateTime.Parse(characterizationParameters.EndTime).ToLocalTime();
DateTime startDateTime = characterizationParameters.StartTime is null ? DateTime.Now.AddHours(-6) : DateTime.Parse(characterizationParameters.StartTime).ToLocalTime(); DateTime startDateTime = characterizationParameters.StartTime is null ? DateTime.Now.AddHours(-6) : DateTime.Parse(characterizationParameters.StartTime).ToLocalTime();
ReadOnlyCollection<string> validDirectories = GetValidDirectories(equipmentDirectory, startDateTime, endDateTime); ReadOnlyCollection<string> validDirectories = GetValidDirectories(equipmentDirectory, startDateTime, endDateTime);
ReadOnlyCollection<FileInfo> collection = GetCollection(characterizationParameters, equipmentDirectory, searchPattern, startDateTime, endDateTime, validDirectories); ReadOnlyCollection<FileInfo> collection = GetCollection(characterizationParameters, equipmentDirectory, startDateTime, endDateTime, validDirectories);
foreach (FileInfo fileInfo in collection) foreach (FileInfo fileInfo in collection)
{ {
if (string.IsNullOrEmpty(fileInfo.DirectoryName)) if (string.IsNullOrEmpty(fileInfo.DirectoryName))
@ -232,21 +226,18 @@ public class FileShareRepository : IFileShareRepository
ReadOnlyCollection<CharacterizationInfo> IFileShareRepository.GetArchiveData(CharacterizationParameters characterizationParameters) ReadOnlyCollection<CharacterizationInfo> IFileShareRepository.GetArchiveData(CharacterizationParameters characterizationParameters)
{ {
List<CharacterizationInfo> results = []; List<CharacterizationInfo> results = [];
string searchPattern;
string equipmentDirectory; string equipmentDirectory;
if (!string.IsNullOrEmpty(characterizationParameters.Area) && !string.IsNullOrEmpty(characterizationParameters.WaferSize)) if (!string.IsNullOrEmpty(characterizationParameters.Area) && !string.IsNullOrEmpty(characterizationParameters.WaferSize))
{ {
searchPattern = characterizationParameters.SearchPattern is null ? "*" : characterizationParameters.SearchPattern;
equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "WaferCounter", characterizationParameters.Area, characterizationParameters.WaferSize); equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "WaferCounter", characterizationParameters.Area, characterizationParameters.WaferSize);
if (Directory.Exists(equipmentDirectory)) if (Directory.Exists(equipmentDirectory))
results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory, searchPattern)); results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory));
} }
if (!string.IsNullOrEmpty(characterizationParameters.EquipmentId)) if (!string.IsNullOrEmpty(characterizationParameters.EquipmentId))
{ {
searchPattern = "*.json";
equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", characterizationParameters.EquipmentId); equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", characterizationParameters.EquipmentId);
if (Directory.Exists(equipmentDirectory)) if (Directory.Exists(equipmentDirectory))
results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory, searchPattern)); results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory));
} }
return new(results); return new(results);
} }