diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 1cf88a3..3828db4 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -934,14 +934,29 @@ namespace EduNetworkBuilder
}
else
{
- //It was homework. Ask if we want to submit it.
- DialogResult answer = MessageBox.Show(NB.Translate("N_PromptToSubmit"), NB.Translate("_Solved"), MessageBoxButtons.YesNo);
-
- if (answer == DialogResult.Yes)
+ if (!WhatFrom.IsGraded)
{
- KillAllExtraWindows(true);
- BuilderWindow BW = NB.GetBuilderWin();
- BW.SubmitHomework();
+ //It was homework. Ask if we want to submit it.
+ DialogResult answer = MessageBox.Show(NB.Translate("N_PromptToSubmit"), NB.Translate("_Solved"), MessageBoxButtons.YesNo);
+
+ if (answer == DialogResult.Yes)
+ {
+ KillAllExtraWindows(true);
+ BuilderWindow BW = NB.GetBuilderWin();
+ BW.SubmitHomework();
+ }
+ }
+ else
+ {
+ //It was homework. Ask if we want to submit it.
+ DialogResult answer = MessageBox.Show(NB.Translate("N_SolvedAlreadyGraded"), NB.Translate("_Solved"), MessageBoxButtons.YesNo);
+ if (answer == DialogResult.Yes)
+ {
+ KillAllExtraWindows(true);
+ BuilderWindow BW = NB.GetBuilderWin();
+ BW.ReturnToProfile();
+ }
+
}
}
}
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 173eed1..e2e5fcd 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -2098,9 +2098,7 @@ namespace EduNetworkBuilder
myNetwork.WhatFrom.IsGraded = true;
- PersonProfileForm PPF = new PersonProfileForm(CurrentUser);
- PPF.Edit();
- UpdateMenu();
+ ReturnToProfile();
}
private void markAsGradedToolStripMenuItem_Click(object sender, EventArgs e)
@@ -2108,6 +2106,14 @@ namespace EduNetworkBuilder
MarkAsGraded();
}
+ public void ReturnToProfile()
+ {
+ if (CurrentUser == null) return; //We need to have a user or we will blow up
+ PersonProfileForm PPF = new PersonProfileForm(CurrentUser);
+ PPF.Edit();
+ UpdateMenu();
+ }
+
private void logoutToolStripMenuItem_Click(object sender, EventArgs e)
{
if (CurrentUser == null) return; //Nobody to logout
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx
index 2b0443a..cc7c255 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.resx
@@ -1909,4 +1909,8 @@
You have completed the homework. Would you like to submit it? If you want to clean it up and submit later, click No. Go to "Edit" -> "Submit" when you want to submit it.
N_PromptToSubmit = You have completed the homework. Would you like to submit it? If you want to clean it up and submit later, click No. Go to "Edit" -> "Submit" when you want to submit it.
+
+ The homework passed all the tests, but is already graded. Would you like to return to the Profile?
+ N_SolvedAlreadyGraded = The homework passed all the tests, but is already graded. Would you like to return to the Profile?
+
\ No newline at end of file