From 9de18f3b4f564ffa4d3dca7fdeb6cb6210b4b7cb Mon Sep 17 00:00:00 2001
From: yamanq <ybq987@gmail.com>
Date: Mon, 11 Apr 2016 22:51:00 -0400
Subject: [PATCH] added A and B day feature

---
 scheduleac/client/client.css  | 16 +++++++++++-----
 scheduleac/client/client.html |  6 +++++-
 scheduleac/client/client.js   |  9 +++++----
 scheduleac/server/serve.js    |  7 ++++---
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css
index 987ef49..5222e16 100644
--- a/scheduleac/client/client.css
+++ b/scheduleac/client/client.css
@@ -39,14 +39,20 @@ h1 {
     padding-left:5%;
 }
 
-#post {
+.selection {
 	font-size: 150%;
-	float: right;
-	display: inline;
-	margin-top: -15.5%;
-	margin-right: 8%;
 	width: 35%;
 	min-height: 50%;
+	float: right;
+	margin-right: 8%;
+}
+
+#post {
+	margin-top: -18%;
+}
+
+#day {
+	margin-top: -4%;
 }
 
 #button {
diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html
index f00d22f..b533458 100644
--- a/scheduleac/client/client.html
+++ b/scheduleac/client/client.html
@@ -63,10 +63,14 @@
 		{{> loginButtons}}
 			{{#if allowed}}
 				<input type="text" class="form-control" id="date" placeholder="date">
-				<select id="post">
+				<select class='selection' id="post">
 				  <option value="AC">AC</option>
 				  <option value="Health">Health</option>
 				</select>
+				<select class='selection' id="day">
+				  <option value="A">A</option>
+				  <option value="B">B</option>
+				</select>
 				<input type="text" id="other" placeholder="comments">
 				<button id="button">Update!</button>
 			{{/if}}
diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js
index 0218271..207e067 100644
--- a/scheduleac/client/client.js
+++ b/scheduleac/client/client.js
@@ -25,9 +25,10 @@ Template.client.events({
 		pre = document.getElementById("date").value;
 		document.getElementById("date").value = "";
 		post = document.getElementById('post').value;
+		day = document.getElementById('day').value;
 		other = document.getElementById("other").value;
 		document.getElementById("other").value = "";
-		Meteor.call('add_button', this, pre, post, other);
+		Meteor.call('add_button', this, pre, post, day, other);
 	},
 
 	"keypress input": function(event) {
@@ -37,7 +38,7 @@ Template.client.events({
 			post = document.getElementById('post').value;
 			other = document.getElementById("other").value;
 			document.getElementById("other").value = "";
-			Meteor.call('add_button', this, pre, post, other);
+			Meteor.call('add_button', this, pre, post, day, other);
         }
     },
 
@@ -74,7 +75,7 @@ Template.day.helpers({
 		    lastWeek: '[Last] dddd',
 		    sameElse: 'MM/DD/YYYY'
 		});
-		return date;
+		return date + " (" + this.day + ")";
 	},
 
 	aftertext: function() {
@@ -122,7 +123,7 @@ Template.recent.helpers({
 		    lastWeek: '[Last] dddd',
 		    sameElse: 'MM/DD/YYYY'
 		});
-		return date
+		return date + " (" + this.day + ")"
 	},
 
 	aftertext: function() {
diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js
index eff8d2f..18fd171 100644
--- a/scheduleac/server/serve.js
+++ b/scheduleac/server/serve.js
@@ -16,7 +16,7 @@ SyncedCron.add({
 		var thedate = moment();
 		var today = thedate.format("X");
 
-		// Remove matchng Documents
+		// Remove matching Documents
 		schedule.remove({timestamp: {$lt: today}});
 		console.log(thedate.format());
 	}
@@ -27,7 +27,7 @@ SyncedCron.start();
 
 Meteor.methods({
 
-	add_button: function(chrome, pre, post, other) {
+	add_button: function(chrome, pre, post, day, other) {
 		if ((Meteor.user() != undefined) && (Meteor.user().services.google.email in allowed) && !(pre === "")) {
 			mymoment = moment(pre.replace("/", "-"), "MM-DD-YYYY");
 			thepretext = mymoment.toISOString().split("T")[0];
@@ -35,11 +35,12 @@ Meteor.methods({
 			previous = schedule.find({"pretext": thepretext}).fetch();
 			if (previous.length > 0) {
 				entry = previous[0]
-				schedule.update(entry._id, {"aftertext": post, "pretext": entry.pretext, "other": other, "timestamp": entry.timestamp});
+				schedule.update(entry._id, {"aftertext": post, "pretext": entry.pretext, "day": day, "other": other, "timestamp": entry.timestamp});
 			} else {
 				schedule.insert({
 			      "pretext": thepretext,
 			      "aftertext": post,
+			      "day": day,
 			      "other": other,
 			      "timestamp": time
 				});