Random stuff, mostly making code more readable.

Author: lieuwex

bin/MataSharp.XML

@@ -104,7 +104,7 @@ internal partial struct AssignmentFolderItem
     {
         public uint? Beoordeling { get; set; }
         public Attachment[] Bijlagen { get; set; }
-        public MagisterStylePerson[] Docenten { get; set; }
+        public List<MagisterStylePerson> Docenten { get; set; }
         public int Id { get; set; }
         public string IngeleverdOp { get; set; }
         public string InleverenVoor { get; set; }
@@ -133,7 +133,7 @@ public Assignment toAssignment()
             {
                 Grade = this.Beoordeling,
                 Attachments = this.Bijlagen.ToList(AttachmentType.Assignment_teacher),
-                Teachers = this.Docenten.ToList().ConvertAll(p => p.ToPerson(true)),
+                Teachers = this.Docenten.ConvertAll(p => p.ToPerson(true)),
                 ID = this.Id,
                 HandInTime = this.IngeleverdOp.ToDateTime(),
                 DeadLine = this.InleverenVoor.ToDateTime(),

bin/MataSharp.dll

@@ -63,7 +63,8 @@ public string Download(bool AddUserID, string Directory = "")
 
         public int CompareTo(Attachment other)
         {
-            return this.Name.CompareTo(other.Name);
+            var nameCompared = this.Name.CompareTo(other.Name);
+            return (nameCompared != 0) ? nameCompared : this.Date.CompareTo(other.Date);
         }
     }
 

src/MataSharp/Assignment.cs

@@ -26,5 +26,33 @@ public static List<Attachment> ToList(this Attachment[] currentArray, Attachment
             tmpList.ForEach(a => a.Type = AttachmentType);
             return tmpList;
         }
+
+        /// <summary>
+        /// Converts the current DateTime instance to a string.
+        /// </summary>
+        /// <returns>The current DateTime instance as string.</returns>
+        public static string ToUTCString(this DateTime original) 
+        { 
+            return original.ToString("yyyy-MM-ddTHH:mm:ss.0000000Z");
+        }
+
+        /// <summary>
+        /// Gets the DayOfWeek from the current DateTime instance in Dutch.
+        /// </summary>
+        /// <returns>Dutch day of week that represents the day of the current DateTime instance.</returns>
+        public static string DayOfWeekDutch(this DateTime Date)
+        {
+            switch(Date.DayOfWeek)
+            {
+                case DayOfWeek.Monday: return "maandag";
+                case DayOfWeek.Tuesday: return "dinsdag";
+                case DayOfWeek.Wednesday: return "woensdag";
+                case DayOfWeek.Thursday: return "donderdag";
+                case DayOfWeek.Friday: return "vrijdag";
+                case DayOfWeek.Saturday: return "zaterdag";
+                case DayOfWeek.Sunday: return "zondag";
+                default: return "";
+            }
+        }
     }
 }

src/MataSharp/Attachment.cs

@@ -46,9 +46,9 @@ internal Huiswerk ToMagisterStyle()
                 AantekeningLeerling = this.Notes,
                 Afgerond  = this.Done,
                 Id = this.ID,
-                Docenten = this.Teachers.ConvertAll(p => p.ToMagisterStyle()).ToArray(),
-                Einde = this.End.ToString("yyyy-MM-ddTHH:mm:ss.0000000Z"),
-                Start = this.Start.ToString("yyyy-MM-ddTHH:mm:ss.0000000Z"),
+                Docenten = this.Teachers.ConvertAll(p => p.ToMagisterStyle()),
+                Einde = this.End.ToUTCString(),
+                Start = this.Start.ToUTCString(),
                 InfoType = this.InfoType,
                 Inhoud = this.Content,
                 LesuurTM = this.EndBySchoolHour,
@@ -60,6 +60,11 @@ internal Huiswerk ToMagisterStyle()
             };
         }
 
+        public override string ToString()
+        {
+            return "Class: " + this.ClassAbbreviation + "\nStart: " + this.Start.ToString() + "\nEnd: " + this.End.ToString() + "\nDone: " + this.Done + "\nContent: " + this.Content;
+        }
+
         public int CompareTo(Homework other)
         {
             return this.Start.CompareTo(other.Start);
@@ -108,7 +113,7 @@ internal partial class Huiswerk
     {
         public string AantekeningLeerling { get; set; }
         public bool Afgerond { get; set; }
-        public MagisterStylePerson[] Docenten { get; set; }
+        public List<MagisterStylePerson> Docenten { get; set; }
         public string Einde { get; set; }
         public int Id { get; set; }
         public int InfoType { get; set; }
@@ -127,7 +132,7 @@ public Homework ToHomework()
             {
                 Notes = this.AantekeningLeerling,
                 _Done = this.Afgerond,
-                Teachers = this.Docenten.ToList().ConvertAll(p => p.ToPerson(true)),
+                Teachers = this.Docenten.ConvertAll(p => p.ToPerson(true)),
                 End = this.Einde.ToDateTime(),
                 ID = this.Id,
                 InfoType = this.InfoType,

src/MataSharp/Conversions.cs

@@ -7,7 +7,7 @@
 
 namespace MataSharp
 {
-    public partial class MagisterMessage : IComparable<MagisterMessage>
+    public partial class MagisterMessage : IComparable<MagisterMessage>, ICloneable
     {
         #region Contents
         public int ID { get; set; }
@@ -123,21 +123,6 @@ public MagisterMessage(Mata Mata)
             this.CC = new List<MagisterPerson>();
         }
 
-        internal static string DayOfWeekToString(DayOfWeek dayOfWeek)
-        {
-            switch(dayOfWeek)
-            {
-                case DayOfWeek.Monday: return "maandag";
-                case DayOfWeek.Tuesday: return "dinsdag";
-                case DayOfWeek.Wednesday: return "woensdag";
-                case DayOfWeek.Thursday: return "donderdag";
-                case DayOfWeek.Friday: return "vrijdag";
-                case DayOfWeek.Saturday:return "zaterdag";
-                case DayOfWeek.Sunday: return "zondag";
-                default: return "";
-            }
-        }
-
         /// <summary>
         /// Creates new MagisterMessage that forwards the current message.
         /// </summary>
@@ -158,7 +143,7 @@ public MagisterMessage CreateForwardMessage()
                 IDKey = this.IDKey,
                 IDOrginalReceiver = null,
                 IDOriginal = null,
-                Body = this.Body,
+                Body = "<b>Van:</b> " + this.Sender.Name + "<br><b>Verzonden:</b> " + this.SentDate.DayOfWeekDutch() + " " + this.SentDate.ToString() + "<br><b>Aan:</b> " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "<br><b>Onderwerp:</b> " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
                 Deleted = false,
                 _IsRead = true,
                 Subject = tmpSubject,
@@ -190,7 +175,7 @@ public MagisterMessage CreateForwardMessage(string ContentAdd)
                 IDKey = this.IDKey,
                 IDOrginalReceiver = null,
                 IDOriginal = null,
-                Body = ContentAdd + "<br><br>---------------<br>Van: " + this.Sender.Name + "<br>Verzonden: " + DayOfWeekToString(this.SentDate.DayOfWeek) + " " + this.SentDate.ToString() + "<br>Aan: " + String.Join(", ",this.Recipients.Select(x=>x.Name)) + "<br>Onderwerp: " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
+                Body = ContentAdd + "<br><br>---------------<br><b>Van:</b> " + this.Sender.Name + "<br><b>Verzonden:</b> " + this.SentDate.DayOfWeekDutch() + " " + this.SentDate.ToString() + "<br><b>Aan:</b> " + String.Join(", ",this.Recipients.Select(x=>x.Name)) + "<br><b>Onderwerp:</b> " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
                 Deleted = false,
                 _IsRead = true,
                 Subject = tmpSubject,
@@ -227,7 +212,7 @@ public MagisterMessage CreateReplyToAllMessage(string ContentAdd)
                 IDKey = this.IDKey,
                 IDOrginalReceiver = null,
                 IDOriginal = null,
-                Body = ContentAdd + "<br><br>---------------<br>Van: " + this.Sender.Name + "<br>Verzonden: " + DayOfWeekToString(this.SentDate.DayOfWeek) + " " + this.SentDate.ToString() + "<br>Aan: " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "<br>Onderwerp: " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
+                Body = ContentAdd + "<br><br>---------------<br><b>Van:</b> " + this.Sender.Name + "<br><b>Verzonden:</b> " + this.SentDate.DayOfWeekDutch() + " " + this.SentDate.ToString() + "<br><b>Aan:</b> " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "<br><b>Onderwerp:</b> " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
                 Deleted = false,
                 _IsRead = true,
                 Subject = tmpSubject,
@@ -260,7 +245,7 @@ public MagisterMessage CreateReplyMessage(string ContentAdd)
                 IDKey = this.IDKey,
                 IDOrginalReceiver = null,
                 IDOriginal = null,
-                Body = ContentAdd + "<br><br>---------------<br>Van: " + this.Sender.Name + "<br>Verzonden: " + DayOfWeekToString(this.SentDate.DayOfWeek) + " " + this.SentDate.ToString() + "<br>Aan: " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "<br>Onderwerp: " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
+                Body = ContentAdd + "<br><br>---------------<br><b>Van:</b> " + this.Sender.Name + "<br><b>Verzonden:</b> " + this.SentDate.DayOfWeekDutch() + " " + this.SentDate.ToString() + "<br><b>Aan:</b> " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "<br><b>Onderwerp:</b> " + this.Subject + "<br><br>\"" + this.Body + "\"<br><br>",
                 Deleted = false,
                 _IsRead = true,
                 Subject = tmpSubject,
@@ -329,7 +314,7 @@ internal MagisterStyleMessage ToMagisterStyle()
                 Ontvangers = tmpReceivers,
                 KopieOntvangers = tmpCC,
                 CC = tmpCC,
-                VerstuurdOp = this.SentDate.ToString("yyyy-MM-ddTHH:mm:ss.0000000Z"),
+                VerstuurdOp = this.SentDate.ToUTCString(),
                 IsGelezen = this._IsRead,
                 Status = this.State,
                 HeeftPrioriteit = this.IsFlagged,
@@ -343,10 +328,25 @@ internal MagisterStyleMessage ToMagisterStyle()
             };
         }
 
+        public override string ToString()
+        {
+            return "From: " + this.Sender.Name + "\nSent: " + this.SentDate.DayOfWeek + " " + this.SentDate.ToString() + "\nTo: " + String.Join(", ", this.Recipients.Select(x => x.Name)) + "\nSubject: " + this.Subject + "\n\n\"" + this.Body + "\"";
+        }
+
         public int CompareTo(MagisterMessage other)
         {
             return this.SentDate.CompareTo(other.SentDate);
         }
+
+        public MagisterMessage Clone()
+        {
+            return (MagisterMessage)this.MemberwiseClone();
+        }
+
+        object ICloneable.Clone()
+        {
+            return this.Clone();
+        }
     }
 
     internal partial class MagisterStyleMessage

src/MataSharp/Homework.cs

@@ -6,7 +6,7 @@
 
 namespace MataSharp
 {
-    public partial class MagisterPerson : IComparable<MagisterPerson>
+    public partial class MagisterPerson : IComparable<MagisterPerson>, ICloneable
     {
         public uint ID { get; set; }
         public object Ref { get; set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.
@@ -22,6 +22,11 @@ public partial class MagisterPerson : IComparable<MagisterPerson>
 
         internal MagisterPerson Original { get; set; }
 
+        public override bool Equals(object obj)
+        {
+            return this.Equals((MagisterPerson)obj);
+        }
+
         public bool Equals(MagisterPerson Person)
         {
             return (this.ID == Person.ID && this.Initials == Person.Initials && this.SurName == Person.SurName &&
@@ -36,9 +41,8 @@ public bool Equals(MagisterPerson Person)
         /// <returns>A MagisterStylePerson instance.</returns>
         internal MagisterStylePerson ToMagisterStyle()
         {
-            var tmpPerson = (!this.Original.Equals(this)) ?
-                (_Session.Mata.GetPersons(this.Name).Count == 1) ? _Session.Mata.GetPersons(this.Name)[0] : this
-                : this;
+            var tmpPerson = (!this.Original.Equals(this)) ? this.Original : this;
+
             return new MagisterStylePerson()
                 {
                     Id = tmpPerson.ID,
@@ -63,12 +67,20 @@ public MagisterPerson Clone()
             return (MagisterPerson)this.MemberwiseClone();
         }
 
+        public override string ToString() { return this.Description; }
+
         public int CompareTo(MagisterPerson PersonB)
         {
             var surNameCompared = this.SurName.CompareTo(PersonB.SurName);
             return (surNameCompared != 0) ? surNameCompared : this.FirstName.CompareTo(PersonB.FirstName);
         }
+
+        object ICloneable.Clone()
+        {
+            return this.Clone();
+        }
     }
+
     internal partial struct MagisterStylePerson
     {
         public uint Id { get; set; }

src/MataSharp/MagisterMessage.cs

@@ -9,7 +9,7 @@ namespace MataSharp
     /// <summary>
     /// Type to represent a magister school.
     /// </summary>
-    public class MagisterSchool : IComparable<MagisterSchool>
+    public class MagisterSchool : IComparable<MagisterSchool>, ICloneable
     {
         [JsonProperty("Licentie")]
         public string Name { get; set; }
@@ -36,6 +36,11 @@ public MagisterSchool Clone()
             return (MagisterSchool)this.MemberwiseClone();
         }
 
+        public override bool Equals(object obj)
+        {
+            return this.Equals((MagisterSchool)obj);
+        }
+
         public bool Equals(MagisterSchool School)
         {
             return (School != null && this.Name == School.Name && this.URL == School.URL);
@@ -45,5 +50,15 @@ public int CompareTo(MagisterSchool other)
         {
             return this.Name.CompareTo(other.Name);
         }
+
+        public override string ToString()
+        {
+            return this.Name + " - " + this.URL;
+        }
+
+        object ICloneable.Clone()
+        {
+            return this.Clone();
+        }
     }
-}
+}

src/MataSharp/MagisterPerson.cs

@@ -27,7 +27,7 @@ internal static void Clean()
     /// <summary>
     /// Type to communicate with a Magister School's server.
     /// </summary>
-    public partial class Mata : IDisposable
+    public partial class Mata : IDisposable, ICloneable
     {
         public string Name { get; private set; }
         public uint UserID { get; private set; }
@@ -136,10 +136,10 @@ public List<MagisterMessageFolder> GetMessageFolders()
         /// <returns>List containing MagisterPerson instances</returns>
         public List<MagisterPerson> GetPersons(string SearchFilter)
         {
-            if (SearchFilter == null || !_Session.checkedPersons.ContainsKey(SearchFilter))
-            {
-                if (string.IsNullOrWhiteSpace(SearchFilter) || SearchFilter.Count() < 3) return new List<MagisterPerson>();
+            if (string.IsNullOrWhiteSpace(SearchFilter) || SearchFilter.Count() < 3) return new List<MagisterPerson>();
 
+            if (!_Session.checkedPersons.ContainsKey(SearchFilter))
+            {
                 string URL = "https://" + this.School.URL + "/api/personen/" + this.UserID + "/communicatie/contactpersonen?q=" + SearchFilter;
 
                 string personsRAW = _Session.HttpClient.DownloadString(URL);
@@ -329,6 +329,16 @@ public static bool Equals(Mata TargetA, Mata TargetB)
         {
             return (TargetA.UserName == TargetB.UserName && TargetA.UserID == TargetB.UserID && TargetA.SessionID == TargetB.SessionID && TargetA.Name == TargetB.Name);
         }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(this, (Mata)obj);
+        }
+
+        object ICloneable.Clone()
+        {
+            return this.Clone();
+        }
     }
 
     internal partial struct MagisterStyleMata