From 450bfd1b175555737bb3ee3b704866027db99d64 Mon Sep 17 00:00:00 2001 From: Kameron Kenny Date: Thu, 27 Jun 2019 17:08:56 -0400 Subject: [PATCH] fixed --- punch_list/backlogManage.js | 32 +++++++++++++++++------------- punch_list/css/custom.css | 39 ++++++++++++++++++++++++++----------- punch_list/metadata.js | 2 +- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/punch_list/backlogManage.js b/punch_list/backlogManage.js index 81ee6f4..6ea8375 100644 --- a/punch_list/backlogManage.js +++ b/punch_list/backlogManage.js @@ -111,7 +111,7 @@ function genList(punchList, element) { list += '
'; list += '
'; list += '
' +punchList[i].priority + '
' + punchList[i].subject + '
'; - list += '
' + punchList[i].progress + '
'; + list += '
' + punchList[i].progress + '
'; // status dropdown list += '
'; list += ''; @@ -130,18 +130,18 @@ function genList(punchList, element) { } */ if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) { - list += '
' + punchList[i].nDate + '
'; + list += '
' + punchList[i].nDate + '
'; } else { list += '
 
'; } if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) { console.log('overdue'); - list += '
OVER DUE
'; + list += '
OVER DUE
'; } else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) { console.log('due soon'); - list += '
DUE SOON
'; + list += '
DUE SOON
'; } else { - list += '
 
'; + list += '
 
'; } if ( punchList[i].tags != undefined ) { list += '
'; @@ -176,9 +176,9 @@ function genList(punchList, element) { list += '
'; list += '
'; list += '
' + punchList[i].priority + '
' + punchList[i].subject + '
'; - list += '
' + punchList[i].progress + '
'; + list += '
' + punchList[i].progress + '
'; // status dropdown - list += '
'; + list += '
'; list += ''; list += '
'; list += 'New'; @@ -195,18 +195,18 @@ function genList(punchList, element) { } */ if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) { - list += '
' + punchList[i].nDate + '
'; + list += '
' + punchList[i].nDate + '
'; } else { list += '
 
'; } if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) { console.log('overdue'); - list += '
OVER DUE
'; + list += '
OVER DUE
'; } else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) { console.log('due soon'); - list += '
DUE SOON
'; + list += '
DUE SOON
'; } else { - list += '
 
'; + list += '
 
'; } if ( punchList[i].tags != undefined ) { list += '
'; @@ -325,6 +325,7 @@ function mkSortable() { $( "#sortable" ).sortable({ cancel: ".portlet-toggle", placeholder: "portlet-placeholder ui-corner-all", + revert: true, start: function(event, ui) { window.sortObjectUUID = punchList[ui.item.index()].uuid; console.log(`Start Position: ${ui.item.index()}`); @@ -381,6 +382,7 @@ function startPunch(uuid) { } punchList[item].progress = "In Progress"; + punchList[item].priority = 0; jsonStr = JSON.stringify(punchList); putJson(jsonStr); @@ -461,8 +463,9 @@ getJson(); var notesField = document.getElementById("newNotes").value; var newTag = document.getElementById("tagsCreate").value.toLowerCase(); - var stripLeadingSpace = newTag.replace(', ', ','); - var newTags = stripLeadingSpace.split(","); + var stripLeadingSpace = newTag.replace(/, /g, ','); + var noSpaces = stripLeadingSpace.replace(/ /g, '_'); + var newTags = noSpaces.split(","); // make sure tags object exists /* @@ -645,7 +648,8 @@ function addTag(uuid) { // var item = document.getElementById("addTag-" + uuid).value; var newTag = document.getElementById("addTag-" + uuid).value.toLowerCase(); var stripLeadingSpace = newTag.replace(', ', ','); - var newTags = stripLeadingSpace.split(","); + var noSpaces = stripLeadingSpace.replace(' ', '_'); + var newTags = noSpaces.split(","); // make sure tags object exists if (punchList[item].tags === undefined) { diff --git a/punch_list/css/custom.css b/punch_list/css/custom.css index 43d3f1c..beb951a 100644 --- a/punch_list/css/custom.css +++ b/punch_list/css/custom.css @@ -1,6 +1,14 @@ -.column-left { display: hidden; } -.column-right { display: hidden; } -.column-middle { width: 50%; overflow: hidden; float: left;} +#neededBy { display: none; } +.subject { + overflow: hidden; + width: 89%; + float: left; + color: #FFF; + font-size: 1.5rem; + font-weight: 900; } +.column-left { display: none; } +.column-right { display: none; } +.column-middle { width: 100%; overflow: auto; float: left;} #mainMenuWrapper:after { content: ""; clear: both; } #sortable { list-style-type: none; margin: 0; padding: 0; width: 100%; } #sortable li { font-size: 1.4em; color: #AAA;} @@ -159,7 +167,7 @@ textarea { /* Dropdown Content (Hidden by Default) */ .dropdown-content { display: none; - position: absolute; + position: relative; background-color: #f1f1f1; min-width: 160px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); @@ -186,13 +194,6 @@ textarea { .current { color: orange; } .punches-current { background: #555; } -.subject { - overflow: hidden; - width: 89%; - float: left; - color: #FFF; - font-size: 2rem; - font-weight: 900; } .countdown { float: right; font-size: 2rem; @@ -261,6 +262,14 @@ textarea { /* Larger than phone */ @media (min-width: 550px) { +#neededBy { display: block; } +.subject { + overflow: hidden; + width: 89%; + float: left; + color: #FFF; + font-size: 2rem; + font-weight: 900; } .button { padding: 0px; text-align: center; @@ -305,6 +314,14 @@ textarea { /* Larger than tablet */ @media (min-width: 750px) { + #neededBy { display: block; } +.subject { + overflow: hidden; + width: 89%; + float: left; + color: #FFF; + font-size: 2rem; + font-weight: 900; } body { margin-left: auto; margin-right: auto; width: 90%; } diff --git a/punch_list/metadata.js b/punch_list/metadata.js index 6ad1bad..6389a73 100644 --- a/punch_list/metadata.js +++ b/punch_list/metadata.js @@ -1,4 +1,4 @@ -var version = "0.8.032", +var version = "0.8.126", debug = false, jsonUrl = "https://api.myjson.com/bins/1dodsj", showDone = false,