Improved e-mail layout

TomWija · Aug 20, 2017 · 4947e84 · 4947e84
1 parent e717147
commit 4947e84
Show file tree

Hide file tree

Showing 14 changed files with 295 additions and 108 deletions.
diff --git a/app/Http/Controllers/SubjectController.php b/app/Http/Controllers/SubjectController.php
@@ -86,17 +86,23 @@ public function destroy(Subject $subject)
     /**
      * Find the levels for a given subject encoded in Json
      *
-     * @param int $subjectId
+     * @param string $name optional, if given, find by subject name instead of ID
      */
-    public function getSubjectLevelsAsJson($subjectId = 1)
+    public function getSubjectLevelsAsJson($subjectName = null)
     {
-        $subject = Subject::find($subjectId);
+        $subjectName = urldecode($subjectName);
+        $subject = Subject::where('name', $subjectName)->get()->first();
         $levels = $subject->getAttributes();
         unset($levels['id'], $levels['created_at'], $levels['updated_at'], $levels['name']);
-        return response()->json($levels);
-    }
-
 
+        $parsedSubjects = array();
+        foreach($levels as $level => $available) {
+            if ($available) {
+                $parsedSubjects[] = $this->parseSubject($level);
+            }
+        }
+        return response()->json($parsedSubjects);
+    }
 
     /**
      * Find the levels for a given subject encoded in Json
@@ -108,4 +114,26 @@ public function getSubjectsJson()
         $subjects = Subject::all();
         return response()->json($subjects);
     }
+
+    private function parseSubject($subject)
+    {
+        switch ($subject) {
+            case "primary":
+                return "Primary";
+            case "secondary":
+                return "Secondary";
+            case "gcse":
+                return "GCSE";
+            case "alevel":
+                return "A-Level";
+            case "university_bachelors":
+                return "University - Bachelor's";
+            case "university_masters":
+                return "University - Master's";
+            case "adult_casual":
+                return "Adult/Casual Learner";
+            default:
+                break;
+        }
+    }
 }