I hate these files

ishiikurisu · Feb 11, 2017 · 5db2a20 · 5db2a20
2 parents f72663a + f888062
commit 5db2a20
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 25 deletions.
diff --git a/Scalemate/.vs/Scalemate/v14/.suo b/Scalemate/.vs/Scalemate/v14/.suo
diff --git a/Scalemate/Scalemate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Scalemate/Scalemate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Scalemate/Scalemate/obj/Debug/Scalemate.csproj.FileListAbsolute.txt b/Scalemate/Scalemate/obj/Debug/Scalemate.csproj.FileListAbsolute.txt
diff --git a/Scalemate/Scalemate/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Scalemate/Scalemate/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Scalemate/Scalemate/obj/Release/Scalemate.csproj.FileListAbsolute.txt b/Scalemate/Scalemate/obj/Release/Scalemate.csproj.FileListAbsolute.txt
@@ -2,4 +2,12 @@ C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\Scalemate\bin\Release\Scalemate.pdb
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\Scalemate\obj\Release\Scalemate.dll
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\Scalemate\obj\Release\Scalemate.pdb
+<<<<<<< HEAD
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\Scalemate\obj\Release\Scalemate.csprojResolveAssemblyReference.cache
+=======
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\Scalemate\bin\Release\Scalemate.dll
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\Scalemate\bin\Release\Scalemate.pdb
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\Scalemate\obj\Release\Scalemate.csprojResolveAssemblyReference.cache
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\Scalemate\obj\Release\Scalemate.dll
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\Scalemate\obj\Release\Scalemate.pdb
+>>>>>>> f8880626bdf2c1fa9b0af51352124fc117668cab
diff --git a/Scalemate/ScalemateForms/View/FormData.Designer.cs b/Scalemate/ScalemateForms/View/FormData.Designer.cs
diff --git a/Scalemate/ScalemateForms/View/FormData.cs b/Scalemate/ScalemateForms/View/FormData.cs
@@ -7,13 +7,15 @@ namespace ScalemateForms.View
     public partial class FormData : Form
     {
         public bool Ended { get; set; }
+        public bool Completed { get; set; }
         public string[] Survey { get; private set; }
 
         public FormData()
         {
             InitializeComponent();
             WindowState = FormWindowState.Maximized;
             Ended = false;
+            Completed = false;
         }
 
         private void buttonContinue_Click(object sender, EventArgs e)
@@ -25,6 +27,7 @@ private void buttonContinue_Click(object sender, EventArgs e)
             if (everythingAnswered)
             {
                 Ended = true;
+                Completed = true;
                 Survey = answers.ToArray<string>();
             }
             else

diff --git a/Scalemate/ScalemateForms/View/FormInstructions.Designer.cs b/Scalemate/ScalemateForms/View/FormInstructions.Designer.cs
diff --git a/Scalemate/ScalemateForms/View/FormInstructions.cs b/Scalemate/ScalemateForms/View/FormInstructions.cs
@@ -13,6 +13,7 @@ namespace ScalemateForms.View
     public partial class FormInstructions : Form
     {
         public bool Ended = false;
+        public bool Completed = false;
 
         public FormInstructions()
         {
@@ -28,6 +29,7 @@ public void SetInstructions(string instructions)
         private void button1_Click(object sender, EventArgs e)
         {
             this.Ended = true;
+            this.Completed = true;
         }
     }
 }
diff --git a/Scalemate/ScalemateForms/View/FormInventory.Designer.cs b/Scalemate/ScalemateForms/View/FormInventory.Designer.cs
diff --git a/Scalemate/ScalemateForms/View/FormInventory.cs b/Scalemate/ScalemateForms/View/FormInventory.cs
@@ -65,6 +65,7 @@ private void buttonContinue_Click(object sender, EventArgs e)
             // Update form
             if (Mate.Ended)
             {
+                Mate.CalculateResults();
                 ShowResults();
             }
             else

diff --git a/Scalemate/ScalemateForms/View/FormMain.cs b/Scalemate/ScalemateForms/View/FormMain.cs
@@ -47,8 +47,22 @@ private async void buttonStart_Click(object sender, EventArgs e)
             FormInventory form = new FormInventory(mate);
             form.Mother = this;
 
-            await form.CollectInformation();
-            await form.Instruct();
+            // Conduct survey
+            bool ok = await form.CollectInformation();
+            if (!ok)
+            {
+                form.Close();
+                return;
+            }
+
+            // Instructing 
+            ok = await form.Instruct();
+            if (!ok)
+            {
+                form.Close();
+                return;
+            }
+
             form.Start();
         }
 

diff --git a/Scalemate/ScalemateForms/View/FormResult.cs b/Scalemate/ScalemateForms/View/FormResult.cs
@@ -26,6 +26,7 @@ public FormResult(Tester mate)
 
         private void buttonFinish_Click(object sender, EventArgs e)
         {
+            Mother.Show();
             this.Close();
         }
 

diff --git a/Scalemate/ScalemateForms/bin/Release/results/checkme_procast.csv b/Scalemate/ScalemateForms/bin/Release/results/checkme_procast.csv
@@ -0,0 +1,3 @@
+procast	checkme	40	Procrastinator	
+eqwrt	321	ç	adsf qwre	987	8	asdf qwer	
+0	0	4	4	0	4	0	4	0	0	4	0	4	4	4	0	0	4	0	4	
diff --git a/Scalemate/ScalemateForms/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Scalemate/ScalemateForms/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/Scalemate/ScalemateForms/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Scalemate/ScalemateForms/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csproj.FileListAbsolute.txt b/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csproj.FileListAbsolute.txt
@@ -14,3 +14,19 @@ C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.Properties.Resources.resources
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.exe
 C:\Users\cris\Documents\work\Lab\src\github.com\ishiikurisu\scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.pdb
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\bin\Debug\ScalemateForms.exe.config
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\bin\Debug\ScalemateForms.exe
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\bin\Debug\ScalemateForms.pdb
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\bin\Debug\Scalemate.dll
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\bin\Debug\Scalemate.pdb
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.csprojResolveAssemblyReference.cache
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormInventory.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormMain.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormData.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormInstructions.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.Properties.Resources.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormPreferences.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.View.FormResult.resources
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.csproj.GenerateResource.Cache
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.exe
+C:\Users\neuro\Documents\Lab\src\github.com\ishiikurisu\Scalemate\Scalemate\ScalemateForms\obj\Debug\ScalemateForms.pdb
diff --git a/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csproj.GenerateResource.Cache b/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csproj.GenerateResource.Cache
diff --git a/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csprojResolveAssemblyReference.cache b/Scalemate/ScalemateForms/obj/Debug/ScalemateForms.csprojResolveAssemblyReference.cache
diff --git a/Scalemate/ScalemateForms/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Scalemate/ScalemateForms/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Scalemate/ScalemateForms/obj/Release/ScalemateForms.csproj.FileListAbsolute.txt b/Scalemate/ScalemateForms/obj/Release/ScalemateForms.csproj.FileListAbsolute.txt
diff --git a/Scalemate/ScalemateForms/obj/Release/ScalemateForms.csproj.GenerateResource.Cache b/Scalemate/ScalemateForms/obj/Release/ScalemateForms.csproj.GenerateResource.Cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ public FormResult(Tester mate) @@
             private void buttonFinish_Click(object sender, EventArgs e)
             {
+                Mother.Show();
                 this.Close();
             }
@@ Expand Down @@