From 16aad247f8867403270b045ef70332d06a1d3642 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Tue, 25 Apr 2017 03:07:56 -0400 Subject: [PATCH] minor fixes --- hourglass/client/main/main.js | 9 +++++---- hourglass/client/mobile/mobile.js | 8 +++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 510c579..db68385 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -394,7 +394,7 @@ Template.main.helpers({ date.startOf("day"); realDate = realDate._d; Session.set("newWork", true); - Session.set("currentWork", {dueDate: realDate}); + Session.set("currentWork", {dueDate: realDate, type: "normal"}); if(!Session.equals("sidebarMode", "create")) toggleToSidebar("create"); } }; @@ -1071,7 +1071,7 @@ updateWork = function(id, fields, type) { return work._id !== id; }); myWork.push(workObj); - if(!Session.equals("currentWork", null) && Session.get("currentWork")._id === id) { + /*if(!Session.equals("currentWork", null) && Session.get("currentWork")._id === id) { Notification beta, probably rework. Session.set("currentWork", workObj); if($(".overlay").css("display") !== "none") { // If currently viewing work. var message = Object.keys(fields)[0].replace("dueDate", "due date"); @@ -1082,7 +1082,7 @@ updateWork = function(id, fields, type) { }); workChanger = false; } - } + }*/ } Session.set("myWork", myWork); @@ -1102,7 +1102,8 @@ filterWork = function() { var notInTypeFilter = typeFilter.length !== 0 && !_.contains(typeFilter, workObj.type); var pastHideDate = hideTime !== 0 && (moment().subtract(hideTime, 'days'))._d > (moment(workObj.dueDate))._d; var markedDone = Session.get("user").preferences.done && !(Meteor.Device.isPhone() || Meteor.Device.isTablet()) && _.contains(workObj.done, Meteor.userId()); - var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports + var reported = false; // Temp, working on reporting. + //var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports if(notInClassFilter || notInTypeFilter || pastHideDate || markedDone || reported) { hideWork.push(workObj); diff --git a/hourglass/client/mobile/mobile.js b/hourglass/client/mobile/mobile.js index 33477b9..0484ead 100644 --- a/hourglass/client/mobile/mobile.js +++ b/hourglass/client/mobile/mobile.js @@ -431,7 +431,7 @@ Template.mobile.helpers({ }) : Session.get("myWork").filter(function(work) { return !_.contains(work.done, Meteor.userId()); - }) + }); }, showMode(mode) { return Session.equals("mobileMode", mode); @@ -481,6 +481,12 @@ Template.mobile.helpers({ } }); +Template.mobileClass.helpers({ + isDone() { + return Session.equals("mobileMode", "done"); + }, +}) + Template.mAddWork.rendered = function() { addMobileButton($('#dueDate'), 0.2, "brightness", function() { $('#dueDate').datepicker({