diff --git a/punch_list/public/js/myFirebase.js b/punch_list/public/js/myFirebase.js index 3a57f8d..4dc91b4 100644 --- a/punch_list/public/js/myFirebase.js +++ b/punch_list/public/js/myFirebase.js @@ -8,19 +8,27 @@ var config = { appId: "1:999467953896:web:a4ded59b12ccb9ff" }; +var logging = false; + +function consoleLog(logMessage) { + if ( logging === true ) { + console.log(logMessage); + } +} + //firebase.initializeApp(firebaseConfig); if (!firebase.apps.length) { firebase.initializeApp(config); } function initApp() { - console.log("function: initApp()"); + consoleLog("function: initApp()"); // Auth state changes. // [START authstatelistener] firebase.auth().onAuthStateChanged(function(user){ - console.log(`in onAuthStateChanged`); + consoleLog(`in onAuthStateChanged`); if (user) { - console.log(`${user.displayName}`); + consoleLog(`${user.displayName}`); // User is signed in. var displayName = user.displayName; var email = user.email; @@ -56,7 +64,7 @@ function initApp() { // AUTH // // [START googlecallback] function onSignIn(googleUser) { - console.log('Google Auth Response', googleUser); + consoleLog('Google Auth Response', googleUser); // We need to register an Observer on Firebase Auth to make sure auth is initialized. var unsubscribe = firebase.auth().onAuthStateChanged(function(firebaseUser) { unsubscribe(); @@ -90,7 +98,7 @@ function onSignIn(googleUser) { // [END authwithcred] } else { var user = googleUser; - console.log('User already signed-in Firebase.'); + consoleLog('User already signed-in Firebase.'); var displayName = user.displayName; var email = user.email; var emailVerified = user.emailVerified; @@ -136,7 +144,7 @@ function handleSignOut() { } function writeUserData(userId, name, email, imageUrl) { - console.log("function: writeUserData(" + userId + ", " + name + ", " + email + ", " + imageUrl + ")"); + consoleLog("function: writeUserData(" + userId + ", " + name + ", " + email + ", " + imageUrl + ")"); firebase.database().ref('users/' + userId).update({ username: name, email: email, @@ -150,7 +158,7 @@ function writeUserData(userId, name, email, imageUrl) { //}); function newPunch(uid, subject, priority, progress, needBy, notes, tags) { - console.log("function: newPunch(" + uid + ", " + subject + ", " + priority + ", " + progress + ", " + needBy + ", " + notes + ", " + tags + ")"); + consoleLog("function: newPunch(" + uid + ", " + subject + ", " + priority + ", " + progress + ", " + needBy + ", " + notes + ", " + tags + ")"); var punchData = { uid: uid, subject: subject, @@ -172,10 +180,10 @@ function newPunch(uid, subject, priority, progress, needBy, notes, tags) { } function genDaily() { - console.log("function: genDaily()"); + consoleLog("function: genDaily()"); var daily = [ "Check Workday", "Check Expenses", "Check Change Cases", "Check TD's", "Check at-mentions" ]; - console.log(`${daily[1]}`); + consoleLog(`${daily[1]}`); priority = parseInt("3"); var d = new Date(); @@ -192,12 +200,12 @@ function genDaily() { } function genWeekly() { - console.log("function: genWeekly()"); + consoleLog("function: genWeekly()"); //get next monday: // var d = new Date(); // d.setDate(d.getDate() + (1 + 7 - d.getDay()) % 7); - // console.log(d) + // consoleLog(d) // }; var weekly = [ "Update ORB Notes", "Prep Weekly Meeting", "Build out Broadcast Timer" ]; @@ -217,7 +225,7 @@ function genWeekly() { // standard functions function setPriority(sortObject, newPosition) { - console.log("function: setPriority(" + sortObject + ", " + newPosition + ")"); + consoleLog("function: setPriority(" + sortObject + ", " + newPosition + ")"); var priority = {}; @@ -229,109 +237,113 @@ function setPriority(sortObject, newPosition) { } function startPunch(reference) { - console.log("function: startPunch(" + reference + ")"); + consoleLog("function: startPunch(" + reference + ")"); - var start = new Date().getTime(); - - // Write the new punch data - var progress = {}; - var startTime = {}; - - progress['users/' + window.uid + '/punches/' + reference + '/progress'] = "in progress"; - startTime['users/' + window.uid + '/punches/' + reference + '/startTime'] = start; - - firebase.database().ref().update(progress); - firebase.database().ref().update(startTime); - - $( "#" + reference ) - .removeClass( "waiting" ) - $( "#" + reference ) - .removeClass( "punch-default" ) - $( "#" + reference ) - .addClass( "inProgress" ); - $( "#progress" + reference ) - .removeClass( "waiting" ) - $( "#progress" + reference ) - .removeClass( "punch-default" ) - $( "#progress" + reference ) - .addClass( "inProgress" ); var exists = document.getElementById("timer" + reference); if ( exists === null ) { - console.log("Generate Element: timer" + reference); + consoleLog("Generate Element: timer" + reference); genPunchListItem('
', '#details-col-one' + reference); } var timerExists = exists.innerHTML; - console.log(timerExists); + consoleLog(timerExists); if (timerExists === null || timerExists === '') { - console.log("createTimer(" + reference + ", " + time + ")"); + consoleLog("createTimer(" + reference + ", " + time + ")"); var time = new Date(start).getTime(); createTimer("timer" + reference, time); } } function completePunch(reference) { - console.log("function: completePunch(" + reference + ")"); - var end = new Date().getTime(); - // Write the new punch data - var progress = {}; - var endTime = {}; - - progress['users/' + window.uid + '/punches/' + reference + '/progress'] = "done"; - endTime['users/' + window.uid + '/punches/' + reference + '/endTime'] = end; - - firebase.database().ref().update(progress); - firebase.database().ref().update(endTime); + consoleLog("function: completePunch(" + reference + ")"); deletePunchElement(reference); -// loadPunches(window.uid); } -function waitingPunch(reference) { - console.log("function: waitingPunch(" + reference + ")"); +function setPunchProgress(reference, p) { + + consoleLog("function: setPunchProgress(" + reference + ", " + p + ")"); + var progress = {}; - progress['users/' + window.uid + '/punches/' + reference + '/progress'] = "waiting"; + progress['users/' + window.uid + '/punches/' + reference + '/progress'] = p; firebase.database().ref().update(progress); - $( "#" + reference ) - .removeClass( "punch-default" ) - $( "#" + reference ) - .removeClass( "inProgress" ) - $( "#" + reference ) - .addClass( "waiting" ); - $( "#progress" + reference ) - .removeClass( "inProgress" ) - $( "#progress" + reference ) - .removeClass( "punch-default" ) - $( "#progress" + reference ) - .addClass( "waiting" ); + switch(p.toLowerCase()) { + case "in progress": + // execute + var refClass = "inProgress"; + var rmClass = [ "punch-default", "waiting" ]; -// loadPunches(window.uid); + var start = new Date().getTime(); + var startTime = {}; + startTime['users/' + window.uid + '/punches/' + reference + '/startTime'] = start; + + firebase.database().ref().update(startTime); + //startPunch(reference); + break; + case "waiting": + // execute + var refClass = "waiting"; + var rmClass = [ "punch-default", "inProgress" ]; + break; + case "done": + var end = new Date().getTime(); + var endTime = {}; + endTime['users/' + window.uid + '/punches/' + reference + '/endTime'] = end; + + firebase.database().ref().update(endTime); + positionLoop(); + //completePunch(reference); + break; + default: + consoleLog("function: setStyle(" + reference + ", " + progress + "), did not match a condition. :("); + } +// setStyle(reference, p); } -function mkPunchNew(reference) { - console.log("function: mkPunchNew(" + reference + ")"); - var progress = {}; - progress['users/' + window.uid + '/punches/' + reference + '/progress'] = "new"; - firebase.database().ref().update(progress); +function setStyle(reference, progress) { - console.log("setting classes"); - $( "#" + reference ) - .removeClass( "waiting" ) - $( "#" + reference ) - .removeClass( "inProgress" ) - $( "#" + reference ) - .addClass( "punch-default" ); - $( "#progress" + reference ) - .removeClass( "waiting" ) - $( "#progress" + reference ) - .removeClass( "inProgress" ) - $( "#progress" + reference ) - .addClass( "punch-default" ); -// loadPunches(window.uid); + switch(progress.toLowerCase()) { + case "new": + // execute + var refClass = "punch-default"; + var rmClass = [ "waiting", "inProgress" ]; + break; + case "in progress": + // execute + var refClass = "inProgress"; + var rmClass = [ "punch-default", "waiting" ]; + startPunch(reference); + break; + case "waiting": + // execute + var refClass = "waiting"; + var rmClass = [ "punch-default", "inProgress" ]; + break; + case "done": + completePunch(reference); + break; + default: + consoleLog("function: setStyle(" + reference + ", " + progress + "), did not match a condition. :("); + } + + elementIds = [ '#' + reference, '#progress' + reference ]; + + var c; + var i; + + consoleLog("Element Ids: " + elementIds); + for (i in elementIds) { + for (c in rmClass) { + consoleLog("Removing: " + rmClass[c] + ", from: " + elementIds[i]); + $( elementIds[i] ).removeClass( rmClass[c] ); + } + consoleLog("Adding: " + refClass + ", to: " + elementIds[i]); + $( elementIds[i] ).addClass( refClass ); + } } function clearDefault(a){ @@ -348,16 +360,16 @@ function positionLoop() { var nPriority = i; if ( parseInt(cPriority) < 100 ) { - console.log("Updating: " + l.id + " priority, from: " + cPriority + ", to: " + nPriority); + consoleLog("Updating: " + l.id + " priority, from: " + cPriority + ", to: " + nPriority); setPriority(l.id, nPriority); } }); - //console.log("i: " + i + " l: " + l.id); + //consoleLog("i: " + i + " l: " + l.id); }); } function mkSortable(){ - console.log("function: mkSortable()"); + consoleLog("function: mkSortable()"); $( function() { $( "#sortable" ).sortable({ cancel: ".portlet-toggle", @@ -365,15 +377,15 @@ function mkSortable(){ revert: true, distance: 50, start: function(event, ui) { - //console.log($( this ).( "li" )); - console.log(ui.item.context.id); - console.log(`Start Position: ${ui.item.index()}`); + //consoleLog($( this ).( "li" )); + consoleLog(ui.item.context.id); + consoleLog(`Start Position: ${ui.item.index()}`); }, stop: function(event, ui) { // setPriority(window.sortObjectUUID, ui.item.index()); - console.log(event, ui); + consoleLog(event, ui); setPriority(ui.item.context.id, ui.item.index()); - console.log(`New Position: ${ui.item.index()}`); + consoleLog(`New Position: ${ui.item.index()}`); positionLoop(); } }); @@ -381,7 +393,7 @@ function mkSortable(){ } function enableDetail(){ - console.log("function: enableDetail()"); + consoleLog("function: enableDetail()"); $(function() { $( ".portlet" ) .addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" ) @@ -406,12 +418,12 @@ function enableDetail(){ // some element functions... function enableElement(element) { - console.log(`enabling ${element}`); + consoleLog(`enabling ${element}`); document.getElementById(element).style.display = "block"; } function disableElement(element) { - console.log(`disabling ${element}`); + consoleLog(`disabling ${element}`); document.getElementById(element).style.display = "none"; } @@ -452,7 +464,7 @@ function editPunch(uuid) { punchRef.once('value').then(function(snapshot) { var data = snapshot.val(); - console.log(data); + consoleLog(data); var nDate = new Date(data.needByDate); var notes = data.notes; @@ -531,13 +543,13 @@ function createTimer(element,timeTo) { if (seconds < 0) { seconds = -(seconds); } if (seconds < 10) { seconds = ('0' + seconds); } - //console.log("Setting Timer on element:" + element); + //consoleLog("Setting Timer on element:" + element); var exists = document.getElementById(element); if (exists != null) { document.getElementById(element).innerHTML = days + "day(s), " + hours + ":" + minutes + ":" + seconds; } else { -// console.log("Could not update: " + element + ", because: " + exists); +// consoleLog("Could not update: " + element + ", because: " + exists); } }, 1000); } @@ -571,27 +583,28 @@ function updateElementData(element, d) { var e = document.getElementById(element).innerHTML; if ( d != e ) { - console.log("updating: " + element + ", with: " + d + ", was: " + e); + consoleLog("updating: " + element + ", with: " + d + ", was: " + e); document.getElementById(element).innerHTML = d; } else if ( d === e ) { - console.log("Not Updating: " + element + ", because: " + d + " === " + e); + consoleLog("Not Updating: " + element + ", because: " + d + " === " + e); } else { - console.log("Not updating: " + element + ", because: Something weird happened with: " + d + " & " + e); + consoleLog("Not updating: " + element + ", because: Something weird happened with: " + d + " & " + e); } } else { - console.log("add new element"); + consoleLog("add new element"); } } function updatePunchElement(childKey, childData) { - updateElementData("priority" + childKey, childData.priority); - updateElementData("subject" + childKey, childData.subject); - updateElementData("progress" + childKey, childData.progress); - updateElementData("neededby-data" + childKey, childData.needByDate); - - //tags + setStyle(childKey, childData.progress); + if (childData.progress.toLowerCase != "done") { + updateElementData("priority" + childKey, childData.priority); + updateElementData("subject" + childKey, childData.subject); + updateElementData("progress" + childKey, childData.progress); + updateElementData("neededby-data" + childKey, childData.needByDate); + } } @@ -616,10 +629,10 @@ function addPunchElement(childKey, childData) { genPunchListItem('', '#details-container' + childKey); genPunchListItem('subject: " + punchList[item].subject + "
Created: " + punchList[item].cDate + "
Modified Date: " + punchList[item].mDate + "
Priority: " + punchList[item].priority + "
Progress: " + punchList[item].progress + "