Forráskód Böngészése

Teilung durch 0 bei CustomSummaries beseitigt!

Arne Diekmann 8 éve
szülő
commit
f1718fb0ef

+ 0 - 31
GreenTree.Nachtragsmanagement.Core/Converter/UserJsonConverter.cs

@@ -1,31 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GreenTree.Nachtragsmanagement.Core.Converter
-{
-    public class UserJsonConverter<User> : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            if (objectType != typeof(User)) return false;
-
-            return true;
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            if (objectType != typeof(User)) return null;
-
-            return existingValue;
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-
-        }
-    }
-}

+ 0 - 2
GreenTree.Nachtragsmanagement.Core/Domain/User/User.cs

@@ -3,14 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using GreenTree.Nachtragsmanagement.Core.Converter;
 using GreenTree.Nachtragsmanagement.Core.Domain.Config;
 using GreenTree.Nachtragsmanagement.Core.Domain.Misc;
 using Newtonsoft.Json;
 
 namespace GreenTree.Nachtragsmanagement.Core.Domain.User
 {
-    //[JsonConverter(typeof(UserJsonConverter<>))]
     public class User : BaseEntity
     {
         #region Fields

+ 0 - 1
GreenTree.Nachtragsmanagement.Core/GreenTree.Nachtragsmanagement.Core.csproj

@@ -86,7 +86,6 @@
     <Compile Include="Configuration\AppendixConfigurationSection.cs" />
     <Compile Include="Configuration\LdapServerElement.cs" />
     <Compile Include="Configuration\MailServerElement.cs" />
-    <Compile Include="Converter\UserJsonConverter.cs" />
     <Compile Include="Data\IRepository.cs" />
     <Compile Include="Domain\Appendix\Appendix.cs" />
     <Compile Include="Domain\Appendix\Category.cs" />

+ 10 - 2
GreenTree.Nachtragsmanagement.Web/Extensions/GridViewSettingsHelper.cs

@@ -1208,11 +1208,19 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
                         if (totalRelationOfferingToDeviationsSum == 0 || totalRelationOfferingToDeviationsCount == 0)
                             e.TotalValue = 0;
                         else
-                            e.TotalValue = totalRelationOfferingToDeviationsSum / totalRelationOfferingToDeviationsCount;
+                            e.TotalValue = 
+                                totalRelationOfferingToDeviationsSum / 
+                                    (totalRelationOfferingToDeviationsCount == 0
+                                        ? 1
+                                        : totalRelationOfferingToDeviationsCount);
                     }
 
                     if (summaryItem.FieldName == "RelationOfferingToNegotiation")
-                        e.TotalValue = totalNegotiationValueSum / totalPercentageValueSum;
+                        e.TotalValue = 
+                            totalNegotiationValueSum / 
+                                (totalPercentageValueSum == 0 
+                                    ? 1 
+                                    : totalPercentageValueSum);
                 }
             };