models are working

danielcjacobs · danielcjacobs · commit 0914e7a56fa8 · 2020-04-23T17:56:33.000-04:00
diff --git a/app/javascript/packs/myjs.js b/app/javascript/packs/myjs.js
@@ -1,7 +1,58 @@
 $(function(){
-	console.log("got here");
-	$.get("plans/1.json", function(data){
-		console.log(data);
+	$.get("plans.json", function(plans){
+		console.log(plans);
+        plan = false;
+        $(".dropdown-content").empty();
+        for (let i in plans){
+            if (plans[i].major === selectedMajor && plans[i].catalog.year === selectedCatalogYear){
+                plan = plans[i];
+            }
+            else{
+                // Put other plan options in dropdown menu on nav bar
+                $(".dropdown-content").append("<a onclick='changePlan(this.text)'>" + plans[i].major + ", " + plans[i].catalog.year + "</a>");
+            }
+        }
+        if (plan === false){
+            console.log("Error: did not find selected plan");
+        }
+		
+		currPlan = new Plan(plan.user.login, plan.plan_name, plan.major, plan.curr_year, plan.curr_term, plan.courses, plan.catalog.year);
+        currPlan.sortCourses();
+        currPlan.generateHTML();
+        $("#major").html(plan.major);
+        $("#catYear").html(plan.catalog.year);
+
+        $("#hrsCompleted").html("Hours Completed: " + currPlan.hrsCompleted);
+        $("#hrsCurrent").html("Current Hours: " + currPlan.hrsCurrent);
+        $("#hrsPlanned").html("Total Hours Planned: " + currPlan.hrsPlanned);
+
+		$("#catalogTable").DataTable( {
+           	"dom": '<"top"if>t',
+           	"data": plan.catalog.courses,
+           	"columns": [
+               		{ "data": "designator" },
+               		{ "data": "name" },
+               		{ "data": "description" },
+               		{ "data": "credits"}
+           	],
+           	"scrollY": "95px",
+           	"paging": false,
+           	"scrollCollapse": false 
+        	});
+        	$('.dataTables_scrollHeadInner').css('padding', '0');
+		
+        
+        var requirements = plan.requirements;
+
+        $('#accordion').empty();
+        for (let i in requirements){
+            let courses = requirements[i].courses;
+            let itemHtml = "";
+            for (let c in courses){
+                itemHtml += '<li>' + courses[c] + ': ' + plan.catalog.courses[courses[c]].name + '</li>';
+            }
+            $('#accordion').append('<h3><a href="#">' + requirements[i].name + '</a></h3><div>' + itemHtml + '</div>').accordion('refresh');
+        }
 	});
 });
 
@@ -10,8 +61,8 @@ class Course {
         this.term = term;
         this.year = year;
         this.id = desig;
-        this.name = catalog.courses[desig].name;
-        this.hours = catalog.courses[desig].credits;
+        this.name = plan.catalog.courses[desig].name;
+        this.hours = plan.catalog.courses[desig].credits;
     }
 }
 
@@ -178,75 +229,37 @@ class Year {
 }
 
 var currPlan = false;
-var catalog = false;
-var planRequest = false;
-var accordionRequest = false;
+var plan = false;
 var selectedMajor = "Comp. Sci.";
 var selectedCatalogYear = 2017;
 var catalogLoaded = false;
 
-function createRequest(){
-    let request = false;
-    if(window.XMLHttpRequest && !(window.ActiveXObject)){
-        try{
-            request = new XMLHttpRequest();
-        }
-        catch(e){
-            request = false;
-        }
-    }
-    else if(window.ActiveXObject){
-        try{
-             request = new ActiveXObject("Msxml2.XMLHTTP");
-        }
-        catch(e){
-            try{
-                 request = new ActiveXObject("Microsoft.XMLHTTP");
-            }
-            catch(e){
-                request = false;
-            }
-        }
-    }
-    return request;
-}
-
-function sendRequest(Method, URL, callback) {
-    request = createRequest();
-    if (request){
-        request.open(Method, URL, true);
-        request.onreadystatechange = callback;
-        request.send(null);
-    }
-    return request;
-}
-
 function planCallback(){
     if (planRequest.readyState == 4){
         var jsonResponse = JSON.parse(planRequest.responseText);
         var plans = jsonResponse.plan;
         catalog = jsonResponse.catalog;
-        var planObject = false;
+        var plan = false;
         $(".dropdown-content").empty();
         for (let i in plans){
             if (plans[i].major === selectedMajor && plans[i].catalog_year === selectedCatalogYear){
-                planObject = plans[i];
+                plan = plans[i];
             }
             else{
                 // Put other plan options in dropdown menu on nav bar
                 $(".dropdown-content").append("<a onclick='changePlan(this.text)'>" + plans[i].major + ", " + plans[i].catalog_year + "</a>");
             }
         }
-        if (planObject === false){
+        if (plan === false){
             console.log("Error: did not find selected plan");
         }
 
-        currPlan = new Plan(planObject.student, planObject.plan_name, planObject.major, planObject.currYear, planObject.currTerm, planObject.courses, planObject.catalog_year);
+        currPlan = new Plan(plan.student, plan.plan_name, plan.major, plan.currYear, plan.currTerm, plan.courses, plan.catalog_year);
         currPlan.sortCourses();
         currPlan.generateHTML();
-        $("#username").html(planObject.student);
-        $("#major").html(planObject.major);
-        $("#catYear").html(planObject.catalog_year);
+        $("#username").html(plan.student);
+        $("#major").html(plan.major);
+        $("#catYear").html(plan.catalog_year);
 
         $("#hrsCompleted").html("Hours Completed: " + currPlan.hrsCompleted);
         $("#hrsCurrent").html("Current Hours: " + currPlan.hrsCurrent);
@@ -257,7 +270,7 @@ function planCallback(){
             courses.push(catalog.courses[i]);
         }
 
-	if (!catalogLoaded) {
+		if (!catalogLoaded) {
         	$("#catalogTable").DataTable( {
            	"dom": '<"top"if>t',
            	"data": courses,
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -1,5 +1,5 @@
 class Category < ApplicationRecord
-  belongs_to :requirements
+  belongs_to :requirement
   has_many :category_courses
   has_many :courses, through: :category_courses
 end
diff --git a/app/models/requirement.rb b/app/models/requirement.rb
@@ -1,4 +1,5 @@
 class Requirement < ApplicationRecord
   belongs_to :major
   belongs_to :catalog
+  has_many :categories
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,10 +9,20 @@
 
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
-	<%= yield %>
+	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"/>
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script type="text/javascript" src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
+	<script>
+        $( function() {
+            $( "#accordion" ).accordion({collapsible: true, active: false});
+        });
+    </script>
   </head>
 
   <body>
+  	<%= yield %>
   </body>
   
 </html>
diff --git a/app/views/plans/_plan.json.jbuilder b/app/views/plans/_plan.json.jbuilder
@@ -1,2 +1,34 @@
-json.extract! plan, :id, :name, :created_at, :updated_at
-json.url plan_url(plan, format: :json)
+json.user do
+	json.id plan.user.id
+	json.login plan.user.login
+	json.role plan.user.role
+end
+json.plan_name plan.name
+json.major plan.major.name
+json.curr_year plan.curr_year
+json.curr_term plan.curr_term
+json.courses do
+	plan.plan_courses.each{ |planCourse| json.set! planCourse.course.designator do
+		json.year planCourse.year
+		json.term planCourse.term
+	end
+	}
+end
+
+json.catalog do
+	json.year plan.catalog.year
+	json.courses do 
+		plan.catalog.catalog_courses.each{ |catalogCourse| json.set! catalogCourse.course.designator do
+			json.name catalogCourse.course.name
+			json.description catalogCourse.course.description
+			json.credits catalogCourse.course.credits
+		end
+		}
+	end
+end
+
+json.requirements plan.major.requirements.where(catalog_id: plan.catalog.id)[0].categories do |category|
+	json.name category.name
+	json.courses category.category_courses.collect{ |cc| cc.course.designator}
+end
+	
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
@@ -1,21 +1,3 @@
-<html lang="en">
-<head>
-    <title>Project4</title>
-    <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"/>
-    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
-    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-    <script type="text/javascript" src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
-
-    <script>
-        $( function() {
-            $( "#accordion" ).accordion({collapsible: true, active: false});
-        });
-    </script>
-</head>
-<body>
-
 <nav id="header">
     <div>
 		<% if user_signed_in?%>
@@ -122,6 +104,4 @@
 
 <br>
 
-<%= link_to 'New Plan', new_plan_path %>
-
-</body>
+<%= link_to 'New Plan', new_plan_path %>
diff --git a/app/views/plans/show.json.jbuilder b/app/views/plans/show.json.jbuilder
@@ -1,8 +1 @@
-json.plan do
-    json.id @plan.id
-    json.courses @plan.plan_courses do |planCourse|
-        json.designator planCourse.course.designator
-		json.year planCourse.year
-		json.term planCourse.term
-  end
-end
+json.partial! "plans/plan", plan: @plan
diff --git a/db/migrate/20200423191646_create_categories.rb b/db/migrate/20200423191646_create_categories.rb
@@ -2,7 +2,7 @@ class CreateCategories < ActiveRecord::Migration[6.0]
   def change
     create_table :categories do |t|
       t.string :name
-      t.references :requirements, null: false, foreign_key: true
+      t.references :requirement, null: false, foreign_key: true
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_23_021526) do
+ActiveRecord::Schema.define(version: 2020_04_23_191646) do
 
   create_table "catalog_courses", force: :cascade do |t|
     t.integer "catalog_id", null: false
@@ -29,10 +29,10 @@
 
   create_table "categories", force: :cascade do |t|
     t.string "name"
-    t.integer "requirements_id", null: false
+    t.integer "requirement_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["requirements_id"], name: "index_categories_on_requirements_id"
+    t.index ["requirement_id"], name: "index_categories_on_requirement_id"
   end
 
   create_table "category_courses", force: :cascade do |t|
@@ -110,7 +110,7 @@
 
   add_foreign_key "catalog_courses", "catalogs"
   add_foreign_key "catalog_courses", "courses"
-  add_foreign_key "categories", "requirements", column: "requirements_id"
+  add_foreign_key "categories", "requirements"
   add_foreign_key "category_courses", "categories"
   add_foreign_key "category_courses", "courses"
   add_foreign_key "plan_courses", "courses"
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
