luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extra alamr checks

Browse source
This commit is contained in:
Luc Vandenbroucke 2022-04-15 11:39:11 +02:00
parent 0cf76ba94a
commit cbc0e6e2d2
7 changed files with 170 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
eDosLocal/UpdateLocal.sql
View file

@ -18,6 +18,14 @@ ALTER TABLE [dbo].[Visit] ADD eDosRate10Warning BIT null;
ALTER TABLE [dbo].[Visit] ADD eDosRate10Alarm BIT null;
END
GO
IF OBJECT_ID('dbo.PersonAlarms') IS NULL BEGIN
CREATE TABLE [dbo].[PersonAlarms] ([PersID] INT NOT NULL,
[VisitTime] DATETIME NOT NULL,
[ID_Station] INT NOT NULL,
[ID_Visit] INT NOT NULL,
PRIMARY KEY NONCLUSTERED([PersID], [VisitTime]));
END;
GO
ALTER PROCEDURE [dbo].[VisitExit] @EPDVisitID INT,
@HP07 FLOAT,
@HP10 FLOAT,
@ -54,96 +62,111 @@ ALTER PROCEDURE [dbo].[VisitExit] @EPDVisitID INT,
@eDosDose10Alarm BIT = NULL,
@eDosRate10Warning BIT = NULL,
@eDosRate10Alarm BIT = NULL
AS
DECLARE
@ID_Visit INT,
@ID_Station INT,
@ID_Station_Return INT;
AS BEGIN
DECLARE
@ID_Visit INT,
@ID_Station INT,
@ID_Station_Return INT;
SET @ID_Station = @EPDVisitID % 100;
SET @ID_Visit = @EPDVisitID / 100;
SET @ID_Station = @EPDVisitID % 100;
SET @ID_Visit = @EPDVisitID / 100;
IF @ID_Station_Return IS NULL
SELECT
@ID_Station_Return = [ID_Station]
FROM [dbo].[StationSettings]
WHERE [PCNr] = HOST_NAME();
DECLARE @isAlarm BIT = CASE WHEN ISNULL(@alarmStatus, 0) <> 0
OR ISNULL(@eDosDose07Alarm, 0) <> 0
OR ISNULL(@eDosRate07Alarm, 0) <> 0
OR ISNULL(@eDosDose10Alarm, 0) <> 0
OR ISNULL(@eDosRate10Alarm, 0) <> 0 THEN 1 ELSE 0 END;
DECLARE @Now DATETIME = GETDATE();
DECLARE @isComplete BIT = 1;
IF @ID_Station_Return IS NULL
SELECT
@ID_Station_Return = [ID_Station]
FROM [dbo].[StationSettings]
WHERE [PCNr] = HOST_NAME();
IF NOT EXISTS (SELECT
*
FROM [dbo].[Visit]
WHERE [ID_Visit] = @ID_Visit
AND [ID_Station] = @ID_Station)BEGIN
SET @isComplete = 0;
DECLARE @isComplete BIT = 1;
INSERT [dbo].[Visit]([ID_Station], [ID_Visit], [Inst_CODE], [isManualExit], [isDeleted], [ID_Station_Return], [isComplete], [ENTRY_EPD_CLOCK], [PersID])
VALUES(@ID_Station, @ID_Visit, 0, 0, 0, @ID_Station_Return, 0, @ENTRY_EPD_CLOCK, @PersID);
END;
IF NOT EXISTS (SELECT
*
FROM [dbo].[Visit]
WHERE [ID_Visit] = @ID_Visit
AND [ID_Station] = @ID_Station)BEGIN
SET @isComplete = 0;
UPDATE
[dbo].[Visit]
SET
[Hp07Dose] = @HP07,
[Hp10Dose] = @HP10,
[isComplete] = @isComplete,
[ReturnTime] = GETDATE(),
[Hp07Peak] = @HP07Peak,
[Hp10Peak] = @HP10Peak,
[Hp07Time] = @HP07PeakTime,
[Hp10Time] = @HP10PeakTime,
[Hp07Total] = @HP07Total,
[Hp10Total] = @HP10Total,
[K1] = @K1,
[K2] = @K2,
[K3] = @K3,
[K4] = @K4,
[K5] = @K5,
[K6] = @K6,
[SG] = @SG,
[BC] = @BC,
[FB] = @FB,
[HG] = @HG,
[QualityData] = @QualityData,
[alarmStatus] = @alarmStatus,
[otherAlarms] = @otherAlarms,
[errorStatus] = @errorStatus,
[operatingStatus] = @operatingStatus,
--[D1] = @D1, [D2] = @D2, [D3] = @D3, [D4] = @D4,
[isAlarm] = CASE WHEN ISNULL(@alarmStatus, 0) <> 0 THEN 1 ELSE 0 END,
[isManualExit] = 0,
[ID_Station_Return] = @ID_Station_Return,
[ENTRY_EPD_CLOCK] = @ENTRY_EPD_CLOCK,
[EXIT_EPD_CLOCK] = @EXIT_EPD_CLOCK,
[PersID] = CASE WHEN [PersID] IS NULL THEN @PersID ELSE [PersID] END,
[eDosBatteryWarning] = @eDosBatteryWarning,
[eDosDose07Warning] = @eDosDose07Warning,
[eDosDose07Alarm] = @eDosDose07Alarm,
[eDosRate07Warning] = @eDosRate07Warning,
[eDosRate07Alarm] = @eDosRate07Alarm,
[eDosDose10Warning] = @eDosDose10Warning,
[eDosDose10Alarm] = @eDosDose10Alarm,
[eDosRate10Warning] = @eDosRate10Warning,
[eDosRate10Alarm] = @eDosRate10Alarm
WHERE [ID_Visit] = @ID_Visit
AND [ID_Station] = @ID_Station;
INSERT [dbo].[Visit]([ID_Station], [ID_Visit], [Inst_CODE], [isManualExit], [isDeleted], [ID_Station_Return], [isComplete], [ENTRY_EPD_CLOCK], [PersID])
VALUES(@ID_Station, @ID_Visit, 0, 0, 0, @ID_Station_Return, 0, @ENTRY_EPD_CLOCK, @PersID);
END;
-- local- >PersonInfoSnapshot
IF ISNULL(@alarmStatus, 0) <> 0
OR ISNULL(@eDosDose07Alarm, 0) <> 0
OR ISNULL(@eDosRate07Alarm, 0) <> 0
OR ISNULL(@eDosDose10Alarm, 0) <> 0
OR ISNULL(@eDosRate10Alarm, 0) <> 0 BEGIN
UPDATE
[dbo].[PersonInfoSnapshot]
[dbo].[Visit]
SET
[VisitIDLocked] = @ID_Visit * 100 + @ID_Station
WHERE [PersID] = (SELECT
[PersID]
FROM [dbo].[Visit]
WHERE [ID_Visit] = @ID_Visit
AND @ID_Station = @ID_Station);
[Hp07Dose] = @HP07,
[Hp10Dose] = @HP10,
[isComplete] = @isComplete,
[ReturnTime] = @Now,
[Hp07Peak] = @HP07Peak,
[Hp10Peak] = @HP10Peak,
[Hp07Time] = @HP07PeakTime,
[Hp10Time] = @HP10PeakTime,
[Hp07Total] = @HP07Total,
[Hp10Total] = @HP10Total,
[K1] = @K1,
[K2] = @K2,
[K3] = @K3,
[K4] = @K4,
[K5] = @K5,
[K6] = @K6,
[SG] = @SG,
[BC] = @BC,
[FB] = @FB,
[HG] = @HG,
[QualityData] = @QualityData,
[alarmStatus] = @alarmStatus,
[otherAlarms] = @otherAlarms,
[errorStatus] = @errorStatus,
[operatingStatus] = @operatingStatus,
--[D1] = @D1, [D2] = @D2, [D3] = @D3, [D4] = @D4,
[isAlarm] = @isAlarm,
[isManualExit] = 0,
[ID_Station_Return] = @ID_Station_Return,
[ENTRY_EPD_CLOCK] = @ENTRY_EPD_CLOCK,
[EXIT_EPD_CLOCK] = @EXIT_EPD_CLOCK,
[PersID] = CASE WHEN [PersID] IS NULL THEN @PersID ELSE [PersID] END,
[eDosBatteryWarning] = @eDosBatteryWarning,
[eDosDose07Warning] = @eDosDose07Warning,
[eDosDose07Alarm] = @eDosDose07Alarm,
[eDosRate07Warning] = @eDosRate07Warning,
[eDosRate07Alarm] = @eDosRate07Alarm,
[eDosDose10Warning] = @eDosDose10Warning,
[eDosDose10Alarm] = @eDosDose10Alarm,
[eDosRate10Warning] = @eDosRate10Warning,
[eDosRate10Alarm] = @eDosRate10Alarm
WHERE [ID_Visit] = @ID_Visit
AND [ID_Station] = @ID_Station;
-- local- >PersonInfoSnapshot
IF @isAlarm = 1 BEGIN
IF @PersID IS NULL
SELECT
@PersID = [PersID]
FROM [dbo].[Visit]
WHERE [ID_Visit] = @ID_Visit
AND [ID_Station] = @ID_Station;
UPDATE
[dbo].[PersonInfoSnapshot]
SET
[VisitIDLocked] = @ID_Visit * 100 + @ID_Station
WHERE [PersID] = @PersID;
IF NOT EXISTS (SELECT
*
FROM [dbo].[PersonAlarms]
WHERE [PersID] = @PersID
AND [VisitTime] = @Now)
INSERT [dbo].[PersonAlarms]([PersID], [VisitTime], [ID_Station], [ID_Visit])
VALUES(@PersID, @Now, @ID_Station, @ID_Visit);
END;
END;
GO
ALTER PROCEDURE [export].[VisitsSelect]

4
eDosLocal/Updates.sql
View file

@ -302,8 +302,8 @@ SET
[EXIT_EPD_CLOCK] = [c].[EXIT_EPD_CLOCK],
[eDosBatteryWarning] = CASE WHEN [v].[eDosBatteryWarning] IS NULL
OR [c].[eDosBatteryWarning] = 1 THEN [c].[eDosBatteryWarning] ELSE [v].[eDosBatteryWarning] END,
[eDosDose07Warning ] = CASE WHEN [v].[eDosDose07Warning ] IS NULL
OR [c].[eDosDose07Warning ] = 1 THEN [c].[eDosDose07Warning ] ELSE [v].[eDosDose07Warning ] END,
[eDosDose07Warning] = CASE WHEN [v].[eDosDose07Warning] IS NULL
OR [c].[eDosDose07Warning] = 1 THEN [c].[eDosDose07Warning] ELSE [v].[eDosDose07Warning] END,
[eDosDose07Alarm] = CASE WHEN [v].[eDosDose07Alarm] IS NULL
OR [c].[eDosDose07Alarm] = 1 THEN [c].[eDosDose07Alarm] ELSE [v].[eDosDose07Alarm] END,
[eDosRate07Warning] = CASE WHEN [v].[eDosRate07Warning] IS NULL

3
eDosStation/DataInterface.cs
View file

@ -186,7 +186,6 @@ namespace eDosStation
checkCon(LeaveOpen);
return localConnection;
}
public System.Data.SqlClient.SqlConnection getConCentral(bool LeaveOpen)
{
checkConCentral(LeaveOpen);
@ -343,12 +342,10 @@ namespace eDosStation
dt.Fill(dtCOE);
}
}
public DataSet1.CommentOnEventRow GetCommentOnEventRow(int id)
{
return dtCOE.FindByID_CommnentOnEvent(id);
}
public void FillTaskInfo(User _User, DataSet1 dataSet1)
{
const string taskName = "FillTaskInfo";

90
syncEdosLocal/DataSet1.Designer.cs generated
View file

@ -1484,6 +1484,8 @@ namespace syncEdosLocal {
private global::System.Data.DataColumn columnepdType;
private global::System.Data.DataColumn columnepdID;
private global::System.Data.DataColumn columneDosBatteryWarning;
private global::System.Data.DataColumn columneDosDose07Warning;
@ -1502,8 +1504,6 @@ namespace syncEdosLocal {
private global::System.Data.DataColumn columneDosRate10Alarm;
private global::System.Data.DataColumn columnepdID;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public CentralVisitsDataTable() {
@ -1897,6 +1897,14 @@ namespace syncEdosLocal {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn epdIDColumn {
get {
return this.columnepdID;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn eDosBatteryWarningColumn {
@ -1969,14 +1977,6 @@ namespace syncEdosLocal {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn epdIDColumn {
get {
return this.columnepdID;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@ -2060,6 +2060,7 @@ namespace syncEdosLocal {
bool syncedEntry,
bool syncedExit,
byte epdType,
int epdID,
bool eDosBatteryWarning,
bool eDosDose07Warning,
bool eDosDose07Alarm,
@ -2068,8 +2069,7 @@ namespace syncEdosLocal {
bool eDosDose10Warning,
bool eDosDose10Alarm,
bool eDosRate10Warning,
bool eDosRate10Alarm,
int epdID) {
bool eDosRate10Alarm) {
CentralVisitsRow rowCentralVisitsRow = ((CentralVisitsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ID_Station,
@ -2117,6 +2117,7 @@ namespace syncEdosLocal {
syncedEntry,
syncedExit,
epdType,
epdID,
eDosBatteryWarning,
eDosDose07Warning,
eDosDose07Alarm,
@ -2125,8 +2126,7 @@ namespace syncEdosLocal {
eDosDose10Warning,
eDosDose10Alarm,
eDosRate10Warning,
eDosRate10Alarm,
epdID};
eDosRate10Alarm};
rowCentralVisitsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowCentralVisitsRow);
return rowCentralVisitsRow;
@ -2202,6 +2202,7 @@ namespace syncEdosLocal {
this.columnsyncedEntry = base.Columns["syncedEntry"];
this.columnsyncedExit = base.Columns["syncedExit"];
this.columnepdType = base.Columns["epdType"];
this.columnepdID = base.Columns["epdID"];
this.columneDosBatteryWarning = base.Columns["eDosBatteryWarning"];
this.columneDosDose07Warning = base.Columns["eDosDose07Warning"];
this.columneDosDose07Alarm = base.Columns["eDosDose07Alarm"];
@ -2211,7 +2212,6 @@ namespace syncEdosLocal {
this.columneDosDose10Alarm = base.Columns["eDosDose10Alarm"];
this.columneDosRate10Warning = base.Columns["eDosRate10Warning"];
this.columneDosRate10Alarm = base.Columns["eDosRate10Alarm"];
this.columnepdID = base.Columns["epdID"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -2307,6 +2307,8 @@ namespace syncEdosLocal {
base.Columns.Add(this.columnsyncedExit);
this.columnepdType = new global::System.Data.DataColumn("epdType", typeof(byte), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnepdType);
this.columnepdID = new global::System.Data.DataColumn("epdID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnepdID);
this.columneDosBatteryWarning = new global::System.Data.DataColumn("eDosBatteryWarning", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columneDosBatteryWarning);
this.columneDosDose07Warning = new global::System.Data.DataColumn("eDosDose07Warning", typeof(bool), null, global::System.Data.MappingType.Element);
@ -2325,8 +2327,6 @@ namespace syncEdosLocal {
base.Columns.Add(this.columneDosRate10Warning);
this.columneDosRate10Alarm = new global::System.Data.DataColumn("eDosRate10Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columneDosRate10Alarm);
this.columnepdID = new global::System.Data.DataColumn("epdID", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnepdID);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnID_Station,
this.columnID_Visit}, true));
@ -4546,6 +4546,22 @@ namespace syncEdosLocal {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int epdID {
get {
try {
return ((int)(this[this.tableCentralVisits.epdIDColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'epdID\' in table \'CentralVisits\' is DBNull.", e);
}
}
set {
this[this.tableCentralVisits.epdIDColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool eDosBatteryWarning {
@ -4690,22 +4706,6 @@ namespace syncEdosLocal {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int epdID {
get {
try {
return ((int)(this[this.tableCentralVisits.epdIDColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'epdID\' in table \'CentralVisits\' is DBNull.", e);
}
}
set {
this[this.tableCentralVisits.epdIDColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPersIDNull() {
@ -5150,6 +5150,18 @@ namespace syncEdosLocal {
this[this.tableCentralVisits.epdTypeColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsepdIDNull() {
return this.IsNull(this.tableCentralVisits.epdIDColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetepdIDNull() {
this[this.tableCentralVisits.epdIDColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IseDosBatteryWarningNull() {
@ -5257,18 +5269,6 @@ namespace syncEdosLocal {
public void SeteDosRate10AlarmNull() {
this[this.tableCentralVisits.eDosRate10AlarmColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsepdIDNull() {
return this.IsNull(this.tableCentralVisits.epdIDColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetepdIDNull() {
this[this.tableCentralVisits.epdIDColumn] = global::System.Convert.DBNull;
}
}
/// <summary>

6
syncEdosLocal/DataSet1.xsd
View file

@ -296,7 +296,7 @@
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_RowClassName="LocalVisitsRow" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent">
<xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent" msprop:Generator_RowClassName="LocalVisitsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />
@ -357,7 +357,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_RowClassName="CentralVisitsRow" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent">
<xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent" msprop:Generator_RowClassName="CentralVisitsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />
@ -405,6 +405,7 @@
<xs:element name="syncedEntry" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsyncedEntry" msprop:Generator_ColumnPropNameInRow="syncedEntry" msprop:Generator_ColumnPropNameInTable="syncedEntryColumn" msprop:Generator_UserColumnName="syncedEntry" type="xs:boolean" minOccurs="0" />
<xs:element name="syncedExit" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsyncedExit" msprop:Generator_ColumnPropNameInRow="syncedExit" msprop:Generator_ColumnPropNameInTable="syncedExitColumn" msprop:Generator_UserColumnName="syncedExit" type="xs:boolean" minOccurs="0" />
<xs:element name="epdType" msprop:Generator_ColumnVarNameInTable="columnepdType" msprop:Generator_ColumnPropNameInRow="epdType" msprop:Generator_ColumnPropNameInTable="epdTypeColumn" msprop:Generator_UserColumnName="epdType" type="xs:unsignedByte" minOccurs="0" />
<xs:element name="epdID" msprop:Generator_ColumnVarNameInTable="columnepdID" msprop:Generator_ColumnPropNameInRow="epdID" msprop:Generator_ColumnPropNameInTable="epdIDColumn" msprop:Generator_UserColumnName="epdID" type="xs:int" minOccurs="0" />
<xs:element name="eDosBatteryWarning" msprop:Generator_ColumnVarNameInTable="columneDosBatteryWarning" msprop:Generator_ColumnPropNameInRow="eDosBatteryWarning" msprop:Generator_ColumnPropNameInTable="eDosBatteryWarningColumn" msprop:Generator_UserColumnName="eDosBatteryWarning" type="xs:boolean" minOccurs="0" />
<xs:element name="eDosDose07Warning" msprop:Generator_ColumnVarNameInTable="columneDosDose07Warning" msprop:Generator_ColumnPropNameInRow="eDosDose07Warning" msprop:Generator_ColumnPropNameInTable="eDosDose07WarningColumn" msprop:Generator_UserColumnName="eDosDose07Warning" type="xs:boolean" minOccurs="0" />
<xs:element name="eDosDose07Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose07Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose07Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose07AlarmColumn" msprop:Generator_UserColumnName="eDosDose07Alarm" type="xs:boolean" minOccurs="0" />
@ -414,7 +415,6 @@
<xs:element name="eDosDose10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose10Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose10Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose10AlarmColumn" msprop:Generator_UserColumnName="eDosDose10Alarm" type="xs:boolean" minOccurs="0" />
<xs:element name="eDosRate10Warning" msprop:Generator_ColumnVarNameInTable="columneDosRate10Warning" msprop:Generator_ColumnPropNameInRow="eDosRate10Warning" msprop:Generator_ColumnPropNameInTable="eDosRate10WarningColumn" msprop:Generator_UserColumnName="eDosRate10Warning" type="xs:boolean" minOccurs="0" />
<xs:element name="eDosRate10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosRate10Alarm" msprop:Generator_ColumnPropNameInRow="eDosRate10Alarm" msprop:Generator_ColumnPropNameInTable="eDosRate10AlarmColumn" msprop:Generator_UserColumnName="eDosRate10Alarm" type="xs:boolean" minOccurs="0" />
<xs:element name="epdID" msprop:Generator_ColumnVarNameInTable="columnepdID" msprop:Generator_ColumnPropNameInRow="epdID" msprop:Generator_ColumnPropNameInTable="epdIDColumn" msprop:Generator_UserColumnName="epdID" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

4
syncEdosLocal/DataSet1.xss
View file

@ -6,8 +6,8 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:LocalVisits" ZOrder="2" X="369" Y="19" Height="365" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:CentralVisits" ZOrder="1" X="630" Y="19" Height="419" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="351" />
<Shape ID="DesignTable:LocalVisits" ZOrder="2" X="369" Y="19" Height="471" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="403" />
<Shape ID="DesignTable:CentralVisits" ZOrder="1" X="760" Y="20" Height="1122" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="1071" />
</Shapes>
<Connectors />
</DiagramLayout>

18
syncEdosLocal/Program.cs
View file

@ -408,8 +408,10 @@ namespace syncEdosLocal
spLog.KvAdd(spl.skeys.recordsAffected, ds.LocalVisits.Rows.Count);
foreach (DataSet1.LocalVisitsRow lr in ds.LocalVisits.Rows)
{
Result.CheckVisitID(lr.ID_Visit);
tc.Fill(ds.CentralVisits, lr.ID_Station, lr.ID_Visit);
Result.CheckVisitID(lr.ID_Visit); //min max
cr = ds.CentralVisits.FindByID_StationID_Visit(lr.ID_Station, lr.ID_Visit);
if (cr==null)
tc.Fill(ds.CentralVisits, lr.ID_Station, lr.ID_Visit);
cr = ds.CentralVisits.FindByID_StationID_Visit(lr.ID_Station, lr.ID_Visit);
if (cr == null)
{
@ -434,8 +436,7 @@ namespace syncEdosLocal
{
error = true;
Result.ErrorMessage = ex.Message;
spLog.setErrorException(ex);
spLog.WriteSplunkLog(sStep, spLog.splunkSeverity, null, spLog.splunkError);
spLog.WriteException(null, sStep, ex);
}
}
private static void copyEntry(DataSet1.LocalVisitsRow lr, DataSet1.CentralVisitsRow cr)
@ -482,6 +483,15 @@ namespace syncEdosLocal
cr["ENTRY_EPD_CLOCK"] = lr["ENTRY_EPD_CLOCK"];
cr["EXIT_EPD_CLOCK"] = lr["EXIT_EPD_CLOCK"];
cr["TIME_LOST"] = lr["TIME_LOST"];
cr["eDosBatteryWarning"] = lr["eDosBatteryWarning"];
cr["eDosDose07Warning"] = lr["eDosDose07Warning"];
cr["eDosDose07Alarm"] = lr["eDosDose07Alarm"];
cr["eDosRate07Warning"] = lr["eDosRate07Warning"];
cr["eDosRate07Alarm"] = lr["eDosRate07Alarm"];
cr["eDosDose10Warning"] = lr["eDosDose10Warning"];
cr["eDosDose10Alarm"] = lr["eDosDose10Alarm"];
cr["eDosRate10Warning"] = lr["eDosRate10Warning"];
cr["eDosRate10Alarm"] = lr["eDosRate10Alarm"];
}
private static DataSet1.CentralVisitsRow copyrow(DataSet1.LocalVisitsRow lr, DataSet1.CentralVisitsDataTable centralVisits)
{