Added date picker, and changed work colors

This commit is contained in:
Kenneth Jao 2016-08-13 23:46:32 -04:00
parent ddab8b86c2
commit d79e157fe5
3 changed files with 41 additions and 20 deletions

View File

@ -442,6 +442,14 @@ input, textarea {
margin-bottom: 5%; 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 { .inputRadio {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }

View File

@ -68,7 +68,7 @@
<div id="workInfoNmCont"> <div id="workInfoNmCont">
<div> <div>
<span class="workTitle">Due Date:</span> <span class="workTitle">Due Date:</span>
<span class="change req" id="workDate">{{work 'dueDate'}}</span> <span class="change req" re="readonly" id="workDate">{{work 'dueDate'}}</span>
</div> </div>
<div> <div>
<span class="workTitle">Description:</span><br> <span class="workTitle">Description:</span><br>

View File

@ -28,10 +28,11 @@ var themeColors = {
}; };
var workColors = { var workColors = {
"test": "red", "normal": "#2E4F74",
"project": "blue", "quiz": "#409333",
"normal": "green", "test": "#AD3C44",
"quiz": "black" "project": "#E6E619",
"other": "#852E6D"
}; };
Session.set("calendarclasses", null); Session.set("calendarclasses", null);
@ -333,6 +334,9 @@ Template.main.events({
} else { } else {
input.select(); input.select();
} }
if(ele.id === "workDate") {
input.className += " form-control";
}
input.focus(); input.focus();
if (ele.getAttribute("restrict") !== null) { if (ele.getAttribute("restrict") !== null) {
var span = document.createElement("span"); var span = document.createElement("span");
@ -345,6 +349,7 @@ Template.main.events({
span.appendChild(document.createTextNode(num.toString() + " characters left")); span.appendChild(document.createTextNode(num.toString() + " characters left"));
ele.parentNode.appendChild(span); ele.parentNode.appendChild(span);
} }
}, },
'click .radio' (event) { 'click .radio' (event) {
var op = event.target; var op = event.target;
@ -426,6 +431,12 @@ Template.main.events({
var thisReadWork = formReadable(thisWork); var thisReadWork = formReadable(thisWork);
Session.set("currentReadableWork",thisReadWork); Session.set("currentReadableWork",thisReadWork);
openDivFade(document.getElementsByClassName("overlay")[0]); openDivFade(document.getElementsByClassName("overlay")[0]);
},
'focus #workDatea' () {
$('#workDatea').datepicker({
format: 'DD, MM d, yyyy',
startDate: 'd'
});
} }
}); });
@ -476,17 +487,10 @@ function getHomeworkFormData() {
var stop; var stop;
for(var i = 0; i < inputs.length; i++) { for(var i = 0; i < inputs.length; i++) {
var value = inputs[i].childNodes[0].nodeValue; var value = inputs[i].childNodes[0].nodeValue;
if(i === 2) { if(value.includes("Click here to edit")) {
if(Date.parse(inputs[i]) === NaN) { // Implement moment. inputs[i].childNodes[0].nodeValue = "Missing field";
value = "Invalid date"; inputs[i].style.color = "#FF1A1A";
stop = true; stop = true;
}
} else {
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"); var desc = document.getElementById("workDesc");
@ -499,7 +503,7 @@ function getHomeworkFormData() {
var data = Session.get("currentWork"); var data = Session.get("currentWork");
data.name = document.getElementById("workName").childNodes[0].nodeValue; 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.description = document.getElementById("workDesc").childNodes[0].nodeValue;
data.type = document.getElementById("workType").childNodes[0].nodeValue.toLowerCase(); data.type = document.getElementById("workType").childNodes[0].nodeValue.toLowerCase();
@ -508,14 +512,23 @@ function getHomeworkFormData() {
Session.set("currentReadableWork", readableData); 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) { 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(); 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) { 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); input.type = input.type[0].toUpperCase() + input.type.slice(1);
return input; return input;
} }