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

ENI2/App.config

@@ -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>

bsmd.database/Properties/AssemblyProductInfo.cs

@@ -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("")]

bsmd.database/Properties/AssemblyProjectInfo.cs

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

bsmd.database/TreatmentFacilityProvider.cs

@@ -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);
         }
 

bsmd.database/WAS_RCPT.cs

@@ -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);
         }
 

bsmd.database/Waste.cs

@@ -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);
         }
 

bsmd.database/WasteReceived.cs

@@ -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);
         }