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

Merge branch 'master' of github.com:kkenny/thelinuxpro

This commit is contained in:
Kameron Kenny 2019-07-15 13:24:28 -04:00
parent 2cc77fa691 b5b22b87f5
commit a14a0c8e9a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
punch_list/backlogManage.js
View File

@ -54,13 +54,13 @@ function findArrayId(uid) {
} }
function tagFilter(tagItem) { function tagFilter(tagItem) {
console.log(`In tagFilter function`); //console.log(`In tagFilter function`);
window.tagFilterItem = tagItem; window.tagFilterItem = tagItem;
getJson(); getJson();
} }
function clearTagFilter() { function clearTagFilter() {
console.log(`Clear Tags`); //console.log(`Clear Tags`);
window.tagFilterItem = undefined; window.tagFilterItem = undefined;
getJson(); getJson();
} }
@ -101,7 +101,7 @@ function genList(punchList, element) {
else { var style = "punch-default"; countDone++ } else { var style = "punch-default"; countDone++ }
if (window.tagFilterItem != undefined) { if (window.tagFilterItem != undefined) {
console.log('in tags filter'); //console.log('in tags filter');
if (punchList[i].tags != undefined && punchList[i].tags.includes(window.tagFilterItem)) { if (punchList[i].tags != undefined && punchList[i].tags.includes(window.tagFilterItem)) {
if (punchList[i].progress.toLowerCase() === "in progress") { var style = "inProgress" } else { var style = "punch-default" } if (punchList[i].progress.toLowerCase() === "in progress") { var style = "inProgress" } else { var style = "punch-default" }
if (punchList[i].progress.toLowerCase() === "done" && punchList[i].priority != 99999) { if (punchList[i].progress.toLowerCase() === "done" && punchList[i].priority != 99999) {
@ -135,10 +135,10 @@ function genList(punchList, element) {
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 id="neededBy" 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 id="neededBy" 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 id="neededBy" class="two columns punch-default">&nbsp;</div>'; list += '<div id="neededBy" class="two columns punch-default">&nbsp;</div>';
@ -167,7 +167,7 @@ function genList(punchList, element) {
} }
} }
} else { } else {
console.log('in no tags filter'); //console.log('in no tags filter');
if (punchList[i].progress.toLowerCase() === "done" && punchList[i].priority != 99999) { if (punchList[i].progress.toLowerCase() === "done" && punchList[i].priority != 99999) {
setPriority(punchList[i].uuid, 99999); setPriority(punchList[i].uuid, 99999);
@ -200,10 +200,10 @@ function genList(punchList, element) {
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 id="neededBy" 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 id="neededBy" 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 id="neededBy" class="two columns punch-default">&nbsp;</div>'; list += '<div id="neededBy" class="two columns punch-default">&nbsp;</div>';
@ -248,6 +248,7 @@ enableDrop();
} }
var x = setInterval(function() { var x = setInterval(function() {
//console.log("Inside interval, window.punches = " + window.punches);
punchList = window.punches; punchList = window.punches;
for ( i = 0; i < punchList.length; i++ ) { for ( i = 0; i < punchList.length; i++ ) {
if ( punchList[i].progress.toLowerCase() != "done" && punchList[i].startTime != undefined ) { if ( punchList[i].progress.toLowerCase() != "done" && punchList[i].startTime != undefined ) {

4
punch_list/metadata.js
View File

@ -1,7 +1,7 @@
var version = "0.10.001", var version = "0.10.001",
debug = false, debug = false,
// jsonUrl = "https://api.myjson.com/bins/1dodsj", jsonUrl = "https://api.myjson.com/bins/1dodsj",
jsonUrl = 'https://punchlist-1561043639952.firebaseio.com/', // jsonUrl = 'https://punchlist-1561043639952.firebaseio.com/',
btJsonUrl = "https://api.myjson.com/bins/k0abr", btJsonUrl = "https://api.myjson.com/bins/k0abr",
showDone = false, showDone = false,
items, items,