sites
/
thelinux.pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed

This commit is contained in:
Kameron Kenny 2019-06-27 17:08:56 -04:00
parent c0dd399b8e
commit 450bfd1b17
3 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
punch_list/backlogManage.js
View File

@ -111,7 +111,7 @@ function genList(punchList, element) {
list += '<div class="portlet">'; list += '<div class="portlet">';
list += '<div class="backlog-list-header">'; list += '<div class="backlog-list-header">';
list += '<div class="one column">' +punchList[i].priority + '</div><div class="ten columns subject">' + punchList[i].subject + '</div>'; list += '<div class="one column">' +punchList[i].priority + '</div><div class="ten columns subject">' + punchList[i].subject + '</div>';
list += '<div class="two columns"><div class="twelve columns ' + style + '">' + punchList[i].progress + '</div><div class="twelve columns punch-default" style="color: lime" id="timer-' + punchList[i].uuid + '"></div></div>'; list += '<div class="three columns"><div class="twelve columns ' + style + '">' + punchList[i].progress + '</div><div class="twelve columns punch-default" style="color: lime" id="timer-' + punchList[i].uuid + '"></div></div>';
// status dropdown // status dropdown
list += '<div class="dropdown one column">'; list += '<div class="dropdown one column">';
list += '<img class="top dropbtn" onclick=progressMenuDrop("' + punchList[i].uuid + '") src="images/down-carrot.png">'; list += '<img class="top dropbtn" onclick=progressMenuDrop("' + punchList[i].uuid + '") src="images/down-carrot.png">';
@ -130,18 +130,18 @@ function genList(punchList, element) {
} }
*/ */
if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) { if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) {
list += '<div class="three columns punch-default"><div class="twelve columns punch-default">' + punchList[i].nDate + '</div><div class="twelve columns punch-default" id="countdown-' + punchList[i].uuid + '"></div></div>'; list += '<div class="three columns punch-default"><div id="neededBy" class="twelve columns punch-default">' + punchList[i].nDate + '</div><div class="twelve columns punch-default" id="countdown-' + punchList[i].uuid + '"></div></div>';
} else { } else {
list += '<div class="three columns punch-default">&nbsp;</div>'; list += '<div class="three columns punch-default">&nbsp;</div>';
} }
if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) { if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) {
console.log('overdue'); console.log('overdue');
list += '<div class="two columns punch-default overdue">OVER DUE</div>'; list += '<div id="neededBy" class="two columns punch-default overdue">OVER DUE</div>';
} else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) { } else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) {
console.log('due soon'); console.log('due soon');
list += '<div class="two columns punch-default duesoon">DUE SOON</div>'; list += '<div id="neededBy" class="two columns punch-default duesoon">DUE SOON</div>';
} else { } else {
list += '<div class="two columns punch-default">&nbsp;</div>'; list += '<div id="neededBy" class="two columns punch-default">&nbsp;</div>';
} }
if ( punchList[i].tags != undefined ) { if ( punchList[i].tags != undefined ) {
list += '<div class="four columns punch-default">'; list += '<div class="four columns punch-default">';
@ -176,9 +176,9 @@ function genList(punchList, element) {
list += '<div class="portlet">'; list += '<div class="portlet">';
list += '<div class="backlog-list-header">'; list += '<div class="backlog-list-header">';
list += '<div class="one column">' + punchList[i].priority + '</div><div class=subject>' + punchList[i].subject + '</div>'; list += '<div class="one column">' + punchList[i].priority + '</div><div class=subject>' + punchList[i].subject + '</div>';
list += '<div class="two columns"><div class="twelve columns ' + style + '">' + punchList[i].progress + '</div><div class="twelve columns punch-default" style="color: lime" id="timer-' + punchList[i].uuid + '"></div></div>'; list += '<div class="three columns"><div class="twelve columns ' + style + '">' + punchList[i].progress + '</div><div class="twelve columns punch-default" style="color: lime" id="timer-' + punchList[i].uuid + '"></div></div>';
// status dropdown // status dropdown
list += '<div class="dropdown one column">'; list += '<div class="dropdown two columns">';
list += '<img class="top dropbtn" onclick=progressMenuDrop("' + punchList[i].uuid + '") src="images/down-carrot.png">'; list += '<img class="top dropbtn" onclick=progressMenuDrop("' + punchList[i].uuid + '") src="images/down-carrot.png">';
list += '<div id="progressDropdown-' + punchList[i].uuid + '" class="dropdown-content punch-default">'; list += '<div id="progressDropdown-' + punchList[i].uuid + '" class="dropdown-content punch-default">';
list += '<a href="#" onClick=mkPunchNew("' + punchList[i].uuid + '")>New</a>'; list += '<a href="#" onClick=mkPunchNew("' + punchList[i].uuid + '")>New</a>';
@ -195,18 +195,18 @@ function genList(punchList, element) {
} }
*/ */
if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) { if ( punchList[i].nDate != null && punchList[i].nDate != undefined && punchList[i].nDate != '' ) {
list += '<div class="three columns punch-default"><div class="twelve columns punch-default">' + punchList[i].nDate + '</div><div class="twelve columns punch-default" id="countdown-' + punchList[i].uuid + '"></div></div>'; list += '<div class="three columns punch-default"><div id="neededBy" class="twelve columns punch-default">' + punchList[i].nDate + '</div><div class="twelve columns punch-default" id="countdown-' + punchList[i].uuid + '"></div></div>';
} else { } else {
list += '<div class="three columns punch-default">&nbsp;</div>'; list += '<div class="three columns punch-default">&nbsp;</div>';
} }
if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) { if ( (new Date(punchList[i].nDate).getTime() - new Date().getTime()) <= 0 ) {
console.log('overdue'); console.log('overdue');
list += '<div class="two columns punch-default overdue">OVER DUE</div>'; list += '<div id="neededBy" class="two columns punch-default overdue">OVER DUE</div>';
} else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) { } else if ( ((new Date(punchList[i].nDate).getTime() - new Date().getTime()) / 1000) <= 259200 ) {
console.log('due soon'); console.log('due soon');
list += '<div class="two columns punch-default duesoon">DUE SOON</div>'; list += '<div id="neededBy" class="two columns punch-default duesoon">DUE SOON</div>';
} else { } else {
list += '<div class="two columns punch-default">&nbsp;</div>'; list += '<div id="neededBy" class="two columns punch-default">&nbsp;</div>';
} }
if ( punchList[i].tags != undefined ) { if ( punchList[i].tags != undefined ) {
list += '<div class="four columns punch-default">'; list += '<div class="four columns punch-default">';
@ -325,6 +325,7 @@ function mkSortable() {
$( "#sortable" ).sortable({ $( "#sortable" ).sortable({
cancel: ".portlet-toggle", cancel: ".portlet-toggle",
placeholder: "portlet-placeholder ui-corner-all", placeholder: "portlet-placeholder ui-corner-all",
revert: true,
start: function(event, ui) { start: function(event, ui) {
window.sortObjectUUID = punchList[ui.item.index()].uuid; window.sortObjectUUID = punchList[ui.item.index()].uuid;
console.log(`Start Position: ${ui.item.index()}`); console.log(`Start Position: ${ui.item.index()}`);
@ -381,6 +382,7 @@ function startPunch(uuid) {
} }
punchList[item].progress = "In Progress"; punchList[item].progress = "In Progress";
punchList[item].priority = 0;
jsonStr = JSON.stringify(punchList); jsonStr = JSON.stringify(punchList);
putJson(jsonStr); putJson(jsonStr);
@ -461,8 +463,9 @@ getJson();
var notesField = document.getElementById("newNotes").value; var notesField = document.getElementById("newNotes").value;
var newTag = document.getElementById("tagsCreate").value.toLowerCase(); var newTag = document.getElementById("tagsCreate").value.toLowerCase();
var stripLeadingSpace = newTag.replace(', ', ','); var stripLeadingSpace = newTag.replace(/, /g, ',');
var newTags = stripLeadingSpace.split(","); var noSpaces = stripLeadingSpace.replace(/ /g, '_');
var newTags = noSpaces.split(",");
// make sure tags object exists // make sure tags object exists
/* /*
@ -645,7 +648,8 @@ function addTag(uuid) {
// var item = document.getElementById("addTag-" + uuid).value; // var item = document.getElementById("addTag-" + uuid).value;
var newTag = document.getElementById("addTag-" + uuid).value.toLowerCase(); var newTag = document.getElementById("addTag-" + uuid).value.toLowerCase();
var stripLeadingSpace = newTag.replace(', ', ','); var stripLeadingSpace = newTag.replace(', ', ',');
var newTags = stripLeadingSpace.split(","); var noSpaces = stripLeadingSpace.replace(' ', '_');
var newTags = noSpaces.split(",");
// make sure tags object exists // make sure tags object exists
if (punchList[item].tags === undefined) { if (punchList[item].tags === undefined) {

39
punch_list/css/custom.css
View File

@ -1,6 +1,14 @@
.column-left { display: hidden; } #neededBy { display: none; }
.column-right { display: hidden; } .subject {
.column-middle { width: 50%; overflow: hidden; float: left;} 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; } #mainMenuWrapper:after { content: ""; clear: both; }
#sortable { list-style-type: none; margin: 0; padding: 0; width: 100%; } #sortable { list-style-type: none; margin: 0; padding: 0; width: 100%; }
#sortable li { font-size: 1.4em; color: #AAA;} #sortable li { font-size: 1.4em; color: #AAA;}
@ -159,7 +167,7 @@ textarea {
/* Dropdown Content (Hidden by Default) */ /* Dropdown Content (Hidden by Default) */
.dropdown-content { .dropdown-content {
display: none; display: none;
position: absolute; position: relative;
background-color: #f1f1f1; background-color: #f1f1f1;
min-width: 160px; min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
@ -186,13 +194,6 @@ textarea {
.current { color: orange; } .current { color: orange; }
.punches-current { .punches-current {
background: #555; } background: #555; }
.subject {
overflow: hidden;
width: 89%;
float: left;
color: #FFF;
font-size: 2rem;
font-weight: 900; }
.countdown { .countdown {
float: right; float: right;
font-size: 2rem; font-size: 2rem;
@ -261,6 +262,14 @@ textarea {
/* Larger than phone */ /* Larger than phone */
@media (min-width: 550px) { @media (min-width: 550px) {
#neededBy { display: block; }
.subject {
overflow: hidden;
width: 89%;
float: left;
color: #FFF;
font-size: 2rem;
font-weight: 900; }
.button { .button {
padding: 0px; padding: 0px;
text-align: center; text-align: center;
@ -305,6 +314,14 @@ textarea {
/* Larger than tablet */ /* Larger than tablet */
@media (min-width: 750px) { @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; body { margin-left: auto;
margin-right: auto; margin-right: auto;
width: 90%; } width: 90%; }

2
punch_list/metadata.js
View File

@ -1,4 +1,4 @@
var version = "0.8.032", var version = "0.8.126",
debug = false, debug = false,
jsonUrl = "https://api.myjson.com/bins/1dodsj", jsonUrl = "https://api.myjson.com/bins/1dodsj",
showDone = false, showDone = false,