From d79e157fe5efbc05c0a027ac35bcd772bbab0d26 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 13 Aug 2016 23:46:32 -0400 Subject: [PATCH 1/2] Added date picker, and changed work colors --- hourglass/client/main/main.css | 8 ++++++ hourglass/client/main/main.html | 2 +- hourglass/client/main/main.js | 51 +++++++++++++++++++++------------ 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index d0107e5..86c4259 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -442,6 +442,14 @@ input, textarea { margin-bottom: 5%; } +.datepicker { + box-shadow: 2px 2px 5px 3px #666; + background-color: rgba(255,255,255,0.7); + position: absolute; + top: 27% !important; + left: 45% !important; +} + .inputRadio { margin-bottom: 0 !important; } diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index cfb63d6..87c3df5 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -68,7 +68,7 @@
Due Date: - {{work 'dueDate'}} + {{work 'dueDate'}}
Description:
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index db4c567..91d2183 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -28,10 +28,11 @@ var themeColors = { }; var workColors = { - "test": "red", - "project": "blue", - "normal": "green", - "quiz": "black" + "normal": "#2E4F74", + "quiz": "#409333", + "test": "#AD3C44", + "project": "#E6E619", + "other": "#852E6D" }; Session.set("calendarclasses", null); @@ -333,6 +334,9 @@ Template.main.events({ } else { input.select(); } + if(ele.id === "workDate") { + input.className += " form-control"; + } input.focus(); if (ele.getAttribute("restrict") !== null) { var span = document.createElement("span"); @@ -345,6 +349,7 @@ Template.main.events({ span.appendChild(document.createTextNode(num.toString() + " characters left")); ele.parentNode.appendChild(span); } + }, 'click .radio' (event) { var op = event.target; @@ -426,6 +431,12 @@ Template.main.events({ var thisReadWork = formReadable(thisWork); Session.set("currentReadableWork",thisReadWork); openDivFade(document.getElementsByClassName("overlay")[0]); + }, + 'focus #workDatea' () { + $('#workDatea').datepicker({ + format: 'DD, MM d, yyyy', + startDate: 'd' + }); } }); @@ -476,17 +487,10 @@ function getHomeworkFormData() { var stop; for(var i = 0; i < inputs.length; i++) { var value = inputs[i].childNodes[0].nodeValue; - if(i === 2) { - if(Date.parse(inputs[i]) === NaN) { // Implement moment. - value = "Invalid date"; - stop = true; - } - } else { - if(value.includes("Click here to edit")) { - inputs[i].childNodes[0].nodeValue = "Missing field"; - inputs[i].style.color = "#FF1A1A"; - stop = true; - } + if(value.includes("Click here to edit")) { + inputs[i].childNodes[0].nodeValue = "Missing field"; + inputs[i].style.color = "#FF1A1A"; + stop = true; } } var desc = document.getElementById("workDesc"); @@ -499,7 +503,7 @@ function getHomeworkFormData() { var data = Session.get("currentWork"); data.name = document.getElementById("workName").childNodes[0].nodeValue; - data.dueDate = new Date(document.getElementById("workDate").childNodes[0].nodeValue); + data.dueDate = toDate(document.getElementById("workDate").childNodes[0].nodeValue); data.description = document.getElementById("workDesc").childNodes[0].nodeValue; data.type = document.getElementById("workType").childNodes[0].nodeValue.toLowerCase(); @@ -508,14 +512,23 @@ function getHomeworkFormData() { Session.set("currentReadableWork", readableData); } +var days = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]; +var months = ["January","February","March","April","May","June","July","August","September","October","November","December"]; + function getReadableDate(date) { - var days = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"]; - var months = ["January","February","March","April","May","June","July","August","September","October","November","December"]; return days[date.getDay()]+", "+months[date.getMonth()]+" "+date.getDate()+", "+date.getFullYear(); } +function toDate(date) { + date = date.substring(date.search(",")+2,date.length); + month = months.indexOf(date.substring(0,date.search(" "))); + day = date.substring(date.search(" ")+1,date.search(",")); + year = date.substring(date.search(",")+2,date.length); + return new Date(year,month,day,11,59,59); +} + function formReadable(input) { - input.dueDate = input.dueDate.getFullYear()+"-"+input.dueDate.getMonth()+"-"+input.dueDate.getDate(); + input.dueDate = getReadableDate(input.dueDate); input.type = input.type[0].toUpperCase() + input.type.slice(1); return input; } \ No newline at end of file From 353d9357d7ddbbb4d7aa91d4b291181e266de266 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 13 Aug 2016 23:49:53 -0400 Subject: [PATCH 2/2] CSS display fix --- hourglass/client/main/main.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index 86c4259..b03d5cd 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -446,8 +446,6 @@ input, textarea { box-shadow: 2px 2px 5px 3px #666; background-color: rgba(255,255,255,0.7); position: absolute; - top: 27% !important; - left: 45% !important; } .inputRadio {