From 532e297bc4035157ddf65d5fce5c9a4f3668918a Mon Sep 17 00:00:00 2001 From: Kameron Kenny Date: Tue, 25 Jun 2019 21:44:53 -0400 Subject: [PATCH] changes --- punch_list/backlog.html | 25 ++++++++++++++-------- punch_list/backlogManage.js | 42 +++++++++++++++++++++++++++++++------ punch_list/css/custom.css | 5 ++++- punch_list/metadata.js | 2 +- 4 files changed, 57 insertions(+), 17 deletions(-) diff --git a/punch_list/backlog.html b/punch_list/backlog.html index b46bdba..1a2a852 100644 --- a/punch_list/backlog.html +++ b/punch_list/backlog.html @@ -3,7 +3,8 @@ - + + @@ -20,19 +21,14 @@ + + - -
- + @@ -48,6 +44,17 @@
+
+ + + + + Notes:
+ + + +
+
diff --git a/punch_list/backlogManage.js b/punch_list/backlogManage.js index efea542..1c69e7a 100644 --- a/punch_list/backlogManage.js +++ b/punch_list/backlogManage.js @@ -104,12 +104,27 @@ function genList(punchList, element) { } else if (style === "punch-default") { list += '
Start
'; } + //console.log("Need by " + new Date(punchList[i].nDate).getTime()); + //console.log("Now " + new Date().getTime()); + //console.log("gap " + (new Date(punchList[i].nDate).getTime() - new Date().getTime())); + list += '
' + punchList[i].nDate + '
'; + if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) { + list += '
OVERDUE
'; + } list += ''; - list += '
' + punchList[i].progress + '
'; - list += 'Created: ' + punchList[i].cDate + '
'; - list += 'Modified: ' + punchList[i].mDate + '
'; - list += 'Tags: ' + punchList[i].tags + '
'; - list += '
'; + list += '
'; +// list += punchList[i].progress + '
'; +// list += 'Created: ' + punchList[i].cDate + '
'; +// list += 'Modified: ' + punchList[i].mDate + '
'; + if ( punchList[i].nDate > "" ) { + list += '
Needed By:
' + punchList[i].nDate + '
'; + } + if ( punchList[i].tags != undefined && punchList[i].tags != [] ) { + list += '
Tags:
' + punchList[i].tags + '
'; + } + if ( punchList[i].notes != "" ) { + list += '
'; + } list += ''; list += '
'; } @@ -205,6 +220,17 @@ function enablePunchDetail(uuid) { document.getElementById("punchDetail").innerHTML = html; } +function genEventForm() { + + document.getElementById("newSubject").value = "subject"; + document.getElementById("newPriority").value = "priority"; + document.getElementById("timepickerCreate").value = "date"; + document.getElementById("newNotes").value = ''; + + disableElement('punchListAll'); + enableElement('newEvent'); +} + function createNewEvent() { /* Before doing this, Refresh the array, @@ -326,6 +352,10 @@ function editPunch(uuid) { punchList = window.punches; item = findArrayId(uuid); + if ( punchList[item].tags === undefined ) { + punchList[item].tags = []; + } + var id = item; var subject = punchList[id].subject; @@ -404,7 +434,7 @@ getJson(); } function clearDefault(a){ - if (a.defaultValue == a.value) { + if (a.defaultValue === a.value) { a.value=""; } } diff --git a/punch_list/css/custom.css b/punch_list/css/custom.css index f1da8ad..0c1733d 100644 --- a/punch_list/css/custom.css +++ b/punch_list/css/custom.css @@ -30,17 +30,20 @@ a.punch-default { color: #aaa; font-size: 12px; text-decoration: none;} a.punch-default:hover { color: #00FFFF; } .punch-default { border: 0px solid #AAA; color: #aaa; font-size: 12px; } .inProgress { color: orange; font-size: 12px; } +.overdue { color: red; } .hide { display: none; } .punch-list-backlog-details { font-size: 18px; color: #aaa; } .edit-row { padding-top: 5px; } -.edit-text-box { width: 100%; min-height: 200px; } +.edit-text-box { width: 100%; min-height: 200px; font-size: 12px; } +.ui-widget textarea { font-size: 12px; } body { background: #222; color: #AAA; } textarea { + font-size: 12px; background: #111; width:80%; height:50%; diff --git a/punch_list/metadata.js b/punch_list/metadata.js index 63e2b70..05603d7 100644 --- a/punch_list/metadata.js +++ b/punch_list/metadata.js @@ -1,4 +1,4 @@ -var version = "0.5.329", +var version = "0.5.332", debug = false, jsonUrl = "https://api.myjson.com/bins/1dodsj", showDone = false,