release 0.12.0

AccelerateX-org · Nov 25, 2024 · 15add44 · 15add44
1 parent b901b5a
commit 15add44
Show file tree

Hide file tree

Showing 40 changed files with 952 additions and 1,141 deletions.
diff --git a/Sources/SolutionInfo.cs b/Sources/SolutionInfo.cs
@@ -20,6 +20,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.10.2.0")]
-[assembly: AssemblyFileVersion("0.10.2.0")]
-[assembly: AssemblyInformationalVersion("0.10.2")]
+[assembly: AssemblyVersion("0.12.0.0")]
+[assembly: AssemblyFileVersion("0.12.0.0")]
+[assembly: AssemblyInformationalVersion("0.12.0")]
diff --git a/Sources/TimeTable/MyStik.TimeTable.Data/ExaminationUnit.cs b/Sources/TimeTable/MyStik.TimeTable.Data/ExaminationUnit.cs
@@ -98,7 +98,7 @@ public string OptionName
                 {
                     foreach (var fraction in Fractions)
                     {
-                        if (Fractions != Fractions.Last())
+                        if (fraction != Fractions.Last())
                         {
                             sb.AppendFormat("{0} {1:P0} und ", fraction.Form.ShortName, fraction.Weight);
                         }

diff --git a/Sources/TimeTable/MyStik.TimeTable.Data/ModuleSubject.cs b/Sources/TimeTable/MyStik.TimeTable.Data/ModuleSubject.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
 
 namespace MyStik.TimeTable.Data
 {
@@ -62,6 +63,40 @@ public ModuleSubject()
 
         public string FullTag => $"{Module.FullTag}#{Tag}";
 
+        public string FullName
+        {
+            get
+            {
+                var sb = new StringBuilder();
+
+                if (TeachingFormat != null)
+                {
+                    if (!string.IsNullOrEmpty(Name))
+                    {
+                        sb.AppendFormat("{0} | {1} | {2} SWS", Name, TeachingFormat.Tag, SWS);
+                    }
+                    else
+                    {
+                        sb.AppendFormat("{0} | {1} SWS", TeachingFormat.Tag, SWS);
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(Name))
+                    {
+                        sb.AppendFormat("{0} | {1} SWS", Name, SWS);
+                    }
+                    else
+                    {
+                        sb.AppendFormat("LV | {0} SWS", SWS);
+                    }
+                }
+
+                return sb.ToString();
+
+            }
+        }
+
         /// <summary>
         /// Das zugehörige Modul
         /// </summary>

diff --git a/Sources/TimeTable/MyStik.TimeTable.Data/Occurrence.cs b/Sources/TimeTable/MyStik.TimeTable.Data/Occurrence.cs
@@ -183,6 +183,8 @@ public string Summary
                 {
                     foreach (var fraction in Fractions)
                     {
+                        sb.Append(fraction.FullName);
+                        /*
                         if (fraction.Curriculum != null)
                         {
                             sb.Append(fraction.Curriculum.ShortName);
@@ -191,6 +193,7 @@ public string Summary
                         {
                             sb.Append("offen für alle Studiengänge");
                         }
+                        */
                         if (fraction != Fractions.Last())
                         {
                             sb.Append(" oder ");
@@ -234,6 +237,41 @@ public class SeatQuotaFraction
         /// Und Verknüpfung
         /// </summary>
         public virtual ItemLabelSet ItemLabelSet { get; set; }
+
+        public string FullName
+        {
+            get
+            {
+                var sb = new StringBuilder();
+
+                if (Curriculum != null)
+                {
+                    sb.Append(Curriculum.ShortName);
+                }
+                else
+                {
+                    sb.Append("Offen für alle Studiengänge");
+                }
+
+                if (ItemLabelSet?.ItemLabels != null && ItemLabelSet.ItemLabels.Any())
+                {
+                    sb.Append(" mit Kohorte(n): ");
+                    foreach (var label in ItemLabelSet.ItemLabels)
+                    {
+                        if (label != ItemLabelSet.ItemLabels.Last())
+                        {
+                            sb.AppendFormat("{0}, ", label.Name);
+                        }
+                        else
+                        {
+                            sb.AppendFormat("{0}", label.Name);
+                        }
+                    }
+                }
+
+                return sb.ToString();
+            }
+        }
     }
 
 }
diff --git a/Sources/TimeTable/MyStik.TimeTable.DataServices/Booking/QuotaService.cs b/Sources/TimeTable/MyStik.TimeTable.DataServices/Booking/QuotaService.cs
@@ -103,9 +103,6 @@ public QuotaCheckResponse IsAvailable(SeatQuota quota, Curriculum curr, ICollect
                     return checkLabelSet;
                 }
             }
-
-            result.Remark = "Fehlerhaftes Kontingent";
-            return result;
         }
 
         private QuotaCheckResponse CheckLabelSet(ItemLabelSet labelSet, ICollection<ItemLabel> labels)