Erste Release version!

GreenTree.Nachtragsmanagement.Core/AppendixVersion.cs

@@ -15,7 +15,7 @@ namespace GreenTree.Nachtragsmanagement.Core
         {
             get
             {
-                return "0.9.1.3";
+                return "0.9.2.0";
             }
         }
     }

GreenTree.Nachtragsmanagement.Core/GreenTree.Nachtragsmanagement.Core.csproj

@@ -117,6 +117,7 @@
     <Compile Include="Domain\User\Function.cs" />
     <Compile Include="Domain\User\Role.cs" />
     <Compile Include="Domain\User\User.cs" />
+    <Compile Include="Helper\MiscHelper.cs" />
     <Compile Include="ITypeFinder.cs" />
     <Compile Include="IWebHelper.cs" />
     <Compile Include="Plugins\BasePlugin.cs" />

GreenTree.Nachtragsmanagement.Core/Helper/MiscHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GreenTree.Nachtragsmanagement.Core.Helper
+{
+    public static class MiscHelper
+    {
+        /// <summary>
+        /// Trys to parse a string to valid integer and returns NULL if it fails
+        /// </summary>
+        /// <param name="item">String value.</param>
+        /// <returns>Parsed string.</returns>
+        public static int? TryGetInt(this string item)
+        {
+            if (String.IsNullOrEmpty(item)) return null;
+
+            int i;
+
+            var success = int.TryParse(item, out i);
+
+            return success ? (int?)i : (int?)null;
+        }
+    }
+}

GreenTree.Nachtragsmanagement.Core/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.1")]
-[assembly: AssemblyFileVersion("0.9.0.1")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]

GreenTree.Nachtragsmanagement.Web.Framework/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
 [assembly: AssemblyTitle("Nachtragsmanagement 2.0 Web Framework")]
-[assembly: AssemblyDescription("Framework Bibliothek für die eigentlich Web GUI Anwendung")]
+[assembly: AssemblyDescription("Framework Bibliothek für die eigentliche Web GUI Anwendung")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("GreenTree Studios")]
 [assembly: AssemblyProduct("Schweerbau Nachtragsmanagement 2.0 Web Framework")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.1")]
-[assembly: AssemblyFileVersion("0.9.0.1")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]

GreenTree.Nachtragsmanagement.Web/Implementations/AppendixNotificationPlugin.cs

@@ -15,6 +15,7 @@ using Quartz;
 using GreenTree.Nachtragsmanagement.Services.Logging;
 using Autofac;
 using GreenTree.Nachtragsmanagement.Core;
+using GreenTree.Nachtragsmanagement.Core.Helper;
 
 namespace GreenTree.Nachtragsmanagement.Web.Implementations
 {
@@ -249,9 +250,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
                 .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
                             (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
                 .OrderBy(a => a.Site == null
-                    ? String.Empty
-                    : a.Site.CustomNumber)
-                .ThenBy(a => a.CustomNumber)
+                    ? null
+                    : a.Site.CustomNumber.TryGetInt())
+                .ThenBy(a => a.CustomNumber.TryGetInt())
                 .ToList();
 
             if (appendices.Any())
@@ -300,9 +301,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
                 .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
                             (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
                 .OrderBy(a => a.Site == null
-                    ? String.Empty
-                    : a.Site.CustomNumber)
-                .ThenBy(a => a.CustomNumber)
+                    ? null
+                    : a.Site.CustomNumber.TryGetInt())
+                .ThenBy(a => a.CustomNumber.TryGetInt())
                 .ToList();
 
             if (appendices.Any())
@@ -344,9 +345,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
                 .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
                             (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
                 .OrderBy(a => a.Site == null
-                    ? String.Empty
-                    : a.Site.CustomNumber)
-                .ThenBy(a => a.CustomNumber)
+                    ? null
+                    : a.Site.CustomNumber.TryGetInt())
+                .ThenBy(a => a.CustomNumber.TryGetInt())
                 .ToList();
 
             if (appendices.Any())

GreenTree.Nachtragsmanagement.Web/Implementations/DeviationNotificationPlugin.cs

@@ -15,6 +15,7 @@ using GreenTree.Nachtragsmanagement.Services.Deviation;
 using GreenTree.Nachtragsmanagement.Core.Domain.Deviation;
 using Quartz;
 using GreenTree.Nachtragsmanagement.Services.Logging;
+using GreenTree.Nachtragsmanagement.Core.Helper;
 
 namespace GreenTree.Nachtragsmanagement.Web.Implementations
 {
@@ -203,9 +204,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
                 .Where(d => !d.AppendixId.HasValue &&
                             (DateTime.Now - d.ReceiptDate).Value.Days >= ageDaysLevel2)
                 .OrderBy(d => d.Site == null
-                    ? String.Empty
-                    : d.Site.CustomNumber)
-                .ThenBy(d => d.CustomNumber)
+                    ? null
+                    : d.Site.CustomNumber.TryGetInt())
+                .ThenBy(d => d.CustomNumber.TryGetInt())
                 .ToList();
 
             if (deviationsLevel1.Any() || deviationsLevel2.Any())

GreenTree.Nachtragsmanagement.Web/Models/Site/SiteTreeDataModel.cs

@@ -1,4 +1,5 @@
-using System;
+using GreenTree.Nachtragsmanagement.Core.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -47,7 +48,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Site
 
             var openDeviations = siteEntity.Deviations
                 .Where(d => d.Appendix == null)
-                .OrderBy(d => d.CustomNumber);
+                .OrderBy(d => d.CustomNumber.TryGetInt());
 
             var emptyAppendix = new SiteTreeDataModel
             {

GreenTree.Nachtragsmanagement.Web/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.0.1")]
-[assembly: AssemblyFileVersion("0.9.0.1")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]