From bfe17196d6b2d80dffb0e26d25acceda9ed8b409 Mon Sep 17 00:00:00 2001
From: yamanq <ybq987@gmail.com>
Date: Sun, 17 Sep 2017 07:39:08 -0400
Subject: [PATCH] fix graduation year

---
 hourglass/client/main/main.js       | 20 +++++++++++---------
 hourglass/client/profile/profile.js |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 235ff1d..1ce4fdd 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -212,7 +212,7 @@ Template.registerHelper('restrict', (input) => { // Returns characters left for
 Template.registerHelper('selectOptions', (val) => {
     if(val === "grade") {
         var grade = [];
-        for(var i = 0; i < 5; i++) {
+        for(var i = 1; i < 5; i++) {
             var year = (new Date()).getFullYear() + i;
             grade.push( { "val": year, "alias": year.toString() } );
         }
@@ -626,11 +626,11 @@ Template.main.events({
             Session.set("restrictText", {});
             $("#requestSubmit span:first-child").fadeOut(200, function() {
                 $("#requestSubmit span:nth-child(2)").velocity("fadeIn", 200);
-            })
+            });
             setTimeout(function() {
                 $("#requestSubmit span:nth-child(2)").fadeOut(200, function() {
                     $("#requestSubmit span:first-child").velocity("fadeIn", 200);
-                })
+                });
             }, 1250);
         });
     },
@@ -639,15 +639,17 @@ Template.main.events({
         var userClasses = Session.get("myClasses");
         var timestamp = new Date().toJSON().replace(/-|:|\./gi, "");
         for (var i = 0; i < userClasses.length; i++) {
-            var works = userClasses[i].thisClassWork;
+            var works = Session.get("myWork").filter(function(work) {
+                return userClasses[i]._id;
+            });
             for (var j = 0; j < works.length; j++) {
                 var work = works[j];
                 var workclass = classes.findOne({
                     _id: work.class
                 });
-                if (work.description == defaultWork.description) work.description = "";
-                if (work.dueDate == defaultWork.dueDate) continue;
-                if (work.name == defaultWork.name) work.name = "";
+                // if (work.description == defaultWork.description) work.description = "";
+                // if (work.dueDate == defaultWork.dueDate) continue;
+                // if (work.name == defaultWork.name) work.name = "";
                 if (workclass === undefined) workclass = {
                     name: "Personal"
                 };
@@ -850,11 +852,11 @@ Template.main.events({
         sendData("toggleWork");
     },
     'click .cWorkBottom .fa-thumbs-up' (event) {
-        serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "confirmations"]
+        serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "confirmations"];
         sendData("toggleWork");
     },
     'click .cWorkBottom .fa-exclamation-triangle' (event) {
-        serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "reports"]
+        serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "reports"];
         sendData("toggleWork");
     },
     'click #signout' () {
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 153cbe1..79312a9 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -3,7 +3,7 @@ import {
     Template
 } from 'meteor/templating';
 
-Session.set("sections", [0,0]) // [Completed, Viewing] 
+Session.set("sections", [0,0]); // [Completed, Viewing]
 Session.set("profile", {classes: []});
 Session.set("newClasses", []);
 Session.set("autocompleteDivs", null);