@@ -170,34 +170,49 @@
| DateTime start |
- DateTime end |
- Machine ID |
- Alarm id |
- Alarm id rec |
+ Error |
+ Status |
Duration |
@foreach (var record in ListRecordsREC)
{
-
- |
- @record.DtStart.ToString("yyyy.MM.dd HH:mm:ss")
- |
-
- @record.DtEnd.ToString("yyyy.MM.dd HH:mm:ss")
- |
- @record.MachineId |
-
- @record.AlarmRecId
- |
-
- @record.AlarmId
- |
-
- @record.Duration
- |
-
+ @if (record.DtEnd == record.DtStart)
+ {
+
+ |
+ @record.DtStart.ToString("yyyy.MM.dd HH:mm:ss")
+ |
+
+ @record.AlarmListNav.FullValue
+ |
+
+ Fixing...
+ |
+
+
+ @TimeSpan.FromMinutes(@record.Duration)
+ |
+
+ }
+ else
+ {
+
+ |
+ @record.DtStart.ToString("yyyy.MM.dd HH:mm:ss")
+ |
+
+ @record.AlarmListNav.FullValue
+ |
+
+ FIXED
+ |
+
+ @TimeSpan.FromMinutes(@record.Duration)
+ |
+
+ }
}
diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs
index 15f10dd..d19ed13 100644
--- a/MP.MONO.UI/Pages/Alarms.razor.cs
+++ b/MP.MONO.UI/Pages/Alarms.razor.cs
@@ -15,11 +15,11 @@ namespace MP.MONO.UI.Pages
#region Protected Properties
public bool liveUpdate { get; set; } = true;
- public bool setRec { get; set; } = true;
+ public bool setLogRec { get; set; } = true;
public string lastUpdate { get; set; } = "-";
protected string currMode
{
- get => setRec ? "Alarm Log" : "Alarm Rec";
+ get => setLogRec ? "Alarm Log" : "Alarm Rec";
}
public void Dispose()
@@ -107,7 +107,7 @@ namespace MP.MONO.UI.Pages
protected override async Task OnInitializedAsync()
{
//StartTimer();
- if (!setRec)
+ if (setLogRec)
{
SearchRecords = await MMDataService.AlarmLogGetFilt(MachineId, 0, MaxRecord);
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
@@ -129,7 +129,7 @@ namespace MP.MONO.UI.Pages
{
//ListRecords = null;
//ListRecordsREC = null;
- if (!setRec)
+ if (setLogRec)
{
SearchRecords = await MMDataService.AlarmLogGetFilt(MachineId, 0, MaxRecord);
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
@@ -196,7 +196,7 @@ namespace MP.MONO.UI.Pages
}
protected async Task toggleRec()
{
- setRec = !setRec;
+ setLogRec = !setLogRec;
await Task.Delay(1);
await ReloadData(true);
}
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 3ce4f6b..2733d5e 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2209.2212
+
Version: 1.2.2209.2215
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 5989629..8960e4d 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2209.2212
+1.2.2209.2215
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index e5d9a4a..2be2e4f 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2209.2212
+ 1.2.2209.2215
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.UI/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json
index 7a26333..962a618 100644
--- a/MP.MONO.UI/temp/InfoData.json
+++ b/MP.MONO.UI/temp/InfoData.json
@@ -2,55 +2,55 @@
"AdapterType": "Ethernet 802.3",
"AddressWidth": "64",
"Architecture": "9",
- "BiosVersion": "ALASKA - 1072009",
- "BuildNumber": "19044",
- "Caption": "Microsoft Windows 10 Pro N",
- "ConfiguredClockSpeed": "3600",
+ "BiosVersion": "_ASUS_ - 1072009",
+ "BuildNumber": "19043",
+ "Caption": "Microsoft Windows 10 Pro",
+ "ConfiguredClockSpeed": "2400",
"ConfiguredVoltage": "1200",
"CpuVersion": "Modello 1, Stepping 0",
- "CurrentClockSpeed": "3501",
- "CurrentVoltage": "11",
+ "CurrentClockSpeed": "2200",
+ "CurrentVoltage": "12",
"DataWidth": "64",
- "Description": "AMD64 Family 23 Model 113 Stepping 0",
- "DeviceLocator": "DIMM 1",
+ "Description": "AMD64 Family 23 Model 17 Stepping 0",
+ "DeviceLocator": "ChannelA-DIMM0",
"ExtClock": "100",
"Family": "107",
- "FormFactor": "8",
- "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}",
- "L2CacheSize": "8192",
- "L3CacheSize": "65536",
+ "FormFactor": "12",
+ "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}",
+ "L2CacheSize": "2048",
+ "L3CacheSize": "4096",
"Level": "23",
- "LoadPercentage": "48",
- "MACAddress": "0C:9D:92:B8:FD:E8",
- "Manufacturer": "American Megatrends International, LLC.",
+ "LoadPercentage": "23",
+ "MACAddress": "4C:ED:FB:D9:78:83",
+ "Manufacturer": "American Megatrends Inc.",
"MaxNumberOfProcesses": "4294967295",
"MaxProcessMemorySize": "137438953344",
"MaxVoltage": "1200",
"MinVoltage": "1200",
- "Name": "ASUS XG-C100C 10G PCI-E Network Adapter",
- "NumberOfCores": "16",
- "NumberOfLogicalProcessors": "32",
+ "Name": "Realtek PCIe GbE Family Controller",
+ "NumberOfCores": "4",
+ "NumberOfLogicalProcessors": "8",
"OSArchitecture": "64 bit",
- "PartNumber": "CMK64GX4M2D3600C18",
+ "PartNumber": "8ATF1G64HZ-2G3E1 ",
"PhysicalAdapter": "True",
- "ProcessorId": "178BFBFF00870F10",
+ "ProcessorId": "178BFBFF00810F10",
"ProcessorType": "3",
- "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter",
- "ReleaseDate": "20210521000000.000000+000",
- "Revision": "28928",
+ "ProductName": "Realtek PCIe GbE Family Controller",
+ "ReleaseDate": "20190521000000.000000+000",
+ "Revision": "4352",
"Role": "CPU",
- "SerialNumber": "00332-00332-17209-AA940",
- "ServiceName": "aqnic650",
- "SMBIOSBIOSVersion": "F33",
+ "SerialNumber": "00330-80951-85780-AA242",
+ "ServiceName": "rt640x64",
+ "SMBIOSBIOSVersion": "X505ZA.311",
"SMBIOSMajorVersion": "3",
"SMBIOSMemoryType": "26",
- "SMBIOSMinorVersion": "3",
- "SocketDesignation": "AM4",
- "SoftwareElementID": "F33",
+ "SMBIOSMinorVersion": "1",
+ "SocketDesignation": "FP5",
+ "SoftwareElementID": "X505ZA.311",
"SoftwareElementState": "3",
- "Speed": "3600",
+ "Speed": "2400",
"SystemBiosMajorVersion": "5",
- "SystemBiosMinorVersion": "17",
- "SystemName": "WRKST-R9-SAM",
- "Version": "10.0.19044"
+ "SystemBiosMinorVersion": "13",
+ "SystemName": "EGALW-NB-004",
+ "Version": "10.0.19043"
}
\ No newline at end of file