From eac09a2d80b3e069b30b64e6f7a5699be30c44e0 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Mon, 14 Aug 2017 16:17:50 -0500
Subject: [PATCH] Move homework test status to schoolwork class

---
 EduNetworkBuilder/Network.cs           | 7 -------
 EduNetworkBuilder/PersonProfileForm.cs | 2 +-
 EduNetworkBuilder/SchoolworkClass.cs   | 8 ++++++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 88a5b4e..40d588b 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -66,8 +66,6 @@ namespace EduNetworkBuilder
         private List<Image> PacketImages = new List<Image>();
         private List<PingTestStatus> PingTestStats = new List<PingTestStatus>();
 
-        public HomeworkSolvedStatus HomeworkStatus = HomeworkSolvedStatus.NeverChecked;
-
         /// <summary>
         /// WhatFrom: If we are launched from a homework, we remember it here.
         /// </summary>
@@ -245,9 +243,6 @@ namespace EduNetworkBuilder
                         case "sortorder":
                             double.TryParse(Individual.InnerText, out SortOrder);
                             break;
-                        case "homeworkstatus":
-                            HomeworkStatus = NB.ParseEnum<HomeworkSolvedStatus>(Individual.InnerText);
-                            break;
                         case "startinghelplevel":
                            StartingHelpLevel = NB.ParseEnum<NetTestVerbosity>(Individual.InnerText);
                            HintsToDisplay = StartingHelpLevel;
@@ -362,8 +357,6 @@ namespace EduNetworkBuilder
             writer.WriteElementString("startinghelplevel", StartingHelpLevel.ToString());
             writer.WriteElementString("vlansenabled", VLANsEnabled.ToString());
             writer.WriteElementString("VLANPacketColors", VLANPacketColors.ToString());
-            if(HomeworkStatus != HomeworkSolvedStatus.NeverChecked)
-                writer.WriteElementString("HomeworkStatus", HomeworkStatus.ToString());
             if (!StraightToFile)
                 writer.WriteElementString("PuzzleName", PuzzleName);
             //Save all the devices
diff --git a/EduNetworkBuilder/PersonProfileForm.cs b/EduNetworkBuilder/PersonProfileForm.cs
index f070ef5..e63cb8c 100644
--- a/EduNetworkBuilder/PersonProfileForm.cs
+++ b/EduNetworkBuilder/PersonProfileForm.cs
@@ -998,7 +998,7 @@ namespace EduNetworkBuilder
             {
                 foreach(SchoolworkClass homework in student.Projects)
                 {
-                    if(homework.IsSumbitted && !homework.IsGraded)
+                    if(homework.IsSumbitted && !homework.IsGraded && homework.theProject.HomeworkStatus == HomeworkSolvedStatus.NeverChecked)
                     {
                         //We only need to test homework that is submitted and not graded.
 
diff --git a/EduNetworkBuilder/SchoolworkClass.cs b/EduNetworkBuilder/SchoolworkClass.cs
index 3fb660d..8294116 100644
--- a/EduNetworkBuilder/SchoolworkClass.cs
+++ b/EduNetworkBuilder/SchoolworkClass.cs
@@ -45,6 +45,9 @@ namespace EduNetworkBuilder
         public DateTime SaveDate; //The date this file was saved.
         public UInt64 ThisID { get; protected set; }
 
+        public HomeworkSolvedStatus HomeworkStatus = HomeworkSolvedStatus.NeverChecked;
+
+
         protected SchoolworkClass() { }
 
         public SchoolworkClass(XmlNode TheNode)
@@ -177,6 +180,9 @@ namespace EduNetworkBuilder
                         case "savedate":
                             DateTime.TryParse(Individual.InnerText, out currentOne.SaveDate);
                             break;
+                        case "homeworkstatus":
+                            currentOne.HomeworkStatus = NB.ParseEnum<HomeworkSolvedStatus>(Individual.InnerText);
+                            break;
                         case "ismaster":
                             bool.TryParse(Individual.InnerText, out currentOne.isMaster);
                             break;
@@ -257,6 +263,8 @@ namespace EduNetworkBuilder
             writer.WriteElementString("SaveDate", SaveDate.ToString());
             writer.WriteElementString("IsMaster", isMaster.ToString());
             writer.WriteElementString("IsGraded", IsGraded.ToString());
+            if (HomeworkStatus != HomeworkSolvedStatus.NeverChecked)
+                writer.WriteElementString("HomeworkStatus", HomeworkStatus.ToString());
             writer.WriteElementString("IsSubmitted", IsSumbitted.ToString());
             if (theProject != null) theProject.Save(writer);
             writer.WriteEndElement();