dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version erhöht, zurückgestellt zur Testversion, Sortierung Waste / WAS_RCPT angepasst

Browse Source
This commit is contained in:
Daniel Schick 2023-07-09 12:19:18 +02:00
parent 0b2893ecde
commit 85cfe5155f
9 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/App.config
View File

@ -29,7 +29,7 @@
<value>http://192.168.2.24/LockingService/LockingService.svc</value>
</setting>
<setting name="ConnectionString" serializeAs="String">
<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
</setting>
</ENI2.Properties.Settings>
</applicationSettings>

BIN
ENI2/Resources/EUREPORT.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 41 KiB

2
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("7.12.0")]
[assembly: AssemblyInformationalVersion("7.13.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2023 schick Informatik")]
[assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("7.12.0.*")]
[assembly: AssemblyVersion("7.13.0.*")]

6
bsmd.database/TreatmentFacilityProvider.cs
View File

@ -12,11 +12,15 @@ namespace bsmd.database
public class TreatmentFacilityProvider : DatabaseEntity, ISublistElement
{
#region Construction
public TreatmentFacilityProvider()
{
this.tablename = "[dbo].[TreatmentFacilityProvider]";
}
#endregion
#region Properties
[JsonIgnore]
@ -107,6 +111,8 @@ namespace bsmd.database
if (this.Identifier == null) return 1;
if ((obj is null) || (((TreatmentFacilityProvider)obj).Identifier == null))
return 1;
if (Int32.TryParse(((TreatmentFacilityProvider)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
return i2.CompareTo(i1);
return this.Identifier.CompareTo(((TreatmentFacilityProvider)obj).Identifier);
}

2
bsmd.database/WAS.cs
View File

@ -582,5 +582,5 @@ namespace bsmd.database
#endregion
}
}
}

2
bsmd.database/WAS_RCPT.cs
View File

@ -424,6 +424,8 @@ namespace bsmd.database
if (this.Identifier == null) return 1;
if ((obj is null) || (((WAS_RCPT)obj).Identifier == null))
return 1;
if (Int32.TryParse(((WAS_RCPT)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
return i2.CompareTo(i1);
return this.Identifier.CompareTo(((WAS_RCPT)obj).Identifier);
}

2
bsmd.database/Waste.cs
View File

@ -282,6 +282,8 @@ namespace bsmd.database
if (this.Identifier == null) return 1;
if ((obj is null) || (((Waste)obj).Identifier == null))
return 1;
if (Int32.TryParse(((Waste)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
return i2.CompareTo(i1);
return this.Identifier.CompareTo(((Waste)obj).Identifier);
}

2
bsmd.database/WasteReceived.cs
View File

@ -149,6 +149,8 @@ namespace bsmd.database
if (this.Identifier == null) return 1;
if ((obj is null) || (((WasteReceived)obj).Identifier == null))
return 1;
if (Int32.TryParse(((WasteReceived)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
return i2.CompareTo(i1);
return this.Identifier.CompareTo(((WasteReceived)obj).Identifier);
}