From dcdb3f526a7d6c774956a2b1727d80c45d68b27f Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 25 Apr 2017 10:11:25 -0400
Subject: [PATCH 1/5] font size

---
 hourglass/client/main/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 34c0df6..0dc097b 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -670,7 +670,7 @@ textarea.clickModify {
 }
 
 .info {
-	font-size: 130%;
+	font-size: 110%;
 }
 
 .workTitle {

From 2076a9f562d864bf9b8c348fcf25bf0cf83baa71 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 25 Apr 2017 10:43:42 -0400
Subject: [PATCH 2/5] added unapproved classes viewing

---
 hourglass/client/main/main.css  | 11 +++++++++++
 hourglass/client/main/main.html | 23 ++++++++++++++++-------
 hourglass/client/main/main.js   |  1 +
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 0dc097b..c24370f 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -476,6 +476,16 @@ input {
 
 .mainClassTeacher {
 	font-size: 1.7vh;
+	width: 70%;
+	display: table-cell;
+	pointer-events: none;
+}
+
+.mainClassStatus {
+	font-size: 1.7vh;
+	font-weight: bold;
+	margin: 0;
+	display: table-cell;
 	pointer-events: none;
 }
 
@@ -1289,6 +1299,7 @@ textarea.clickModify {
 
 }
 #markDone, #markConfirm, #markReport {
+	font-size: 95%;
 	padding: 5%;
 	background-color: rgba(0,0,0,0.1);
 
diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index 2b96040..656de17 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -190,13 +190,22 @@
 </template>
 
 <template name="classesMode">
-    <div class="classWrapper">
-        <div class="mainClass" style="background-color:{{divColor 'classCardColor'}}">
-            <div class="classInfo"> <!-- class color -->
-                <h3 class="mainClassName">{{name}}</h3>
-                <p class="mainClassHour">{{hour}}</p>
-                <p class="mainClassTeacher">{{teacher}}</p>
-            </div>
+    <div class="classWrapper"> <!-- class color -->
+        <div class="mainClass" style="background-color:{{divColor 'classCardColor'}}"> 
+            {{#if status}}
+                <div class="classInfo"> 
+                    <h3 class="mainClassName">{{name}}</h3>
+                    <p class="mainClassHour">{{hour}}</p>
+                    <p class="mainClassTeacher">{{teacher}}</p>
+                </div>
+            {{else}}
+                <div class="classInfo" style="border-top:1vh solid #E64F4F;padding-top:2vh"> 
+                    <h3 class="mainClassName">{{name}}</h3>
+                    <p class="mainClassHour">{{hour}}</p>
+                    <p class="mainClassTeacher">{{teacher}}</p>
+                    <p class="mainClassStatus">Unapproved</p>
+                </div>
+            {{/if}}
             <div class="creWork" classid="{{_id}}">
                 <i class="fa fa-plus" aria-hidden="true"></i>
                 <h4>Add Work</h4>
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 60d77fc..caed146 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -971,6 +971,7 @@ getClasses = function(myClasses) {
             classObj.box = " owned";
             classObj.mine = false; // Actual value is reversed.
             classObj.subscribers = 1;
+            classObj.status = true;
             classObj.admin = Meteor.userId();
             classObj._id = Meteor.userId();
         } else {

From 970eb983eee40e38d09a871c3731107b2fe209ed Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 25 Apr 2017 22:00:56 -0400
Subject: [PATCH 3/5] calendar work highlight shows class

---
 hourglass/client/main/main.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index caed146..a831a24 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -373,6 +373,7 @@ Template.main.helpers({
                 sendData("editWork");
             },
             eventClick: function(event, jsEvent, view) { // On-click for work.
+                console.log(event);
                 Session.set("newWork", false);
                 Session.set("currentWork", work.findOne({_id: event.id}));
                 $(".overlay").velocity("fadeIn", 150);
@@ -383,9 +384,25 @@ Template.main.helpers({
                 });
             },
             eventMouseover: function(event, jsEvent, view) {
+                console.log(event);
+                var classid = work.findOne({_id: event.id})["class"];
+                var className = (classid === Meteor.userId()) ? "Personal" : classes.findOne({_id: classid}).name;
+                var span = this.children[0].children[0];
+                $(span).velocity("stop");
+                $(span).velocity({opacity:0}, 50, function() {
+                    span.childNodes[0].nodeValue = className;
+                    $(span).velocity({opacity:1}, 50);
+                });
                 this.style.boxShadow = "inset 0 0 0 99999px rgba(255,255,255,0.2)";
             },
             eventMouseout: function(event, jsEvent, view) {
+                var workName = work.findOne({_id: event.id}).name;
+                var span = this.children[0].children[0];
+                $(span).velocity("stop");
+                $(span).velocity({opacity:0}, 50, function() {
+                    span.childNodes[0].nodeValue = workName;
+                    $(span).velocity({opacity:1}, 50);
+                });
                 this.style.boxShadow = "";
             },
             dayClick: function(date, jsEvent, view) { // On-click for each day.

From 550d2e71fee8d6c208de31821b2dc46a2029272a Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 25 Apr 2017 22:09:03 -0400
Subject: [PATCH 4/5] updateWork fixes

---
 hourglass/client/main/main.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index a831a24..c0833ca 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -373,7 +373,6 @@ Template.main.helpers({
                 sendData("editWork");
             },
             eventClick: function(event, jsEvent, view) { // On-click for work.
-                console.log(event);
                 Session.set("newWork", false);
                 Session.set("currentWork", work.findOne({_id: event.id}));
                 $(".overlay").velocity("fadeIn", 150);
@@ -384,7 +383,6 @@ Template.main.helpers({
                 });
             },
             eventMouseover: function(event, jsEvent, view) {
-                console.log(event);
                 var classid = work.findOne({_id: event.id})["class"];
                 var className = (classid === Meteor.userId()) ? "Personal" : classes.findOne({_id: classid}).name;
                 var span = this.children[0].children[0];
@@ -1008,13 +1006,23 @@ getClasses = function(myClasses) {
 }
 
 updateWork = function(id, fields, type) {
+    if(type === "added") {
+        var allWork = Session.get("myWork").concat(Session.get("filterWork"));
+        if(allWork.filter(function(work) {
+            return work._id === id;
+        }).length !== 0) return;
+    }
+
     if(type === "remove" && Session.get("myWork").concat(Session.get("filterWork")).length === 0) return;
-    if(type === "remove" && Session.get("myWork").filter(function(work) { // Removed work and exists in user data.
+    if(type === "remove" && Session.get("myWork").concat(Session.get("filterWork")).filter(function(work) { // Removed work and exists in user data.
         return work._id === id;
     }).length !== 0) {
         Session.set("myWork", Session.get("myWork").filter(function(work) {
             return work._id !== id;
         }));
+        Session.set("filterWork", Session.get("filterWork").filter(function(work) {
+            return work._id !== id;
+        }));
         return;
     }
 

From e5963b8a6b261f60f86e424c0005b6ac8096008d Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 25 Apr 2017 22:27:30 -0400
Subject: [PATCH 5/5] log errors on client if error

---
 hourglass/client/main/main.js | 3 ++-
 hourglass/server/main.js      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index c0833ca..d2978f0 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -858,8 +858,9 @@ sendData = function(funcName) { // Call Meteor function, and do actions after fu
     if(funcName === "editProfile") filterWork();
     Meteor.call(funcName, serverData, function(error, result) {
         serverData = null;
-
         if (error !== undefined) {
+            console.log(funcName);
+            console.log(error);
             sAlert.error(error.error[1] || error.message, {
                 effect: 'stackslide',
                 position: 'top'
diff --git a/hourglass/server/main.js b/hourglass/server/main.js
index 3607477..16ffaab 100644
--- a/hourglass/server/main.js
+++ b/hourglass/server/main.js
@@ -515,7 +515,7 @@ Meteor.methods({
         var security = securityCheck([[[8, 9, true], 16, false], 10, 20, 11, 12, true],
                                      Object.assign({}, found || {}, input, {userId: Meteor.userId()}));
         if (!security) {
-            input = Object.assign({}, input, {confirmations: [Meteor.userId()], reports: [], done: [], numberdone: 0, comments: []});
+            input = Object.assign({}, input, {confirmations: [Meteor.userId()], reports: [], done: [], comments: []});
             work.insert(input);
         } else {
             throw new Meteor.Error(errors[security]);