diff --git a/app-new/# go to git 'app-new'.lnk b/app-new/# go to git 'app-new'.lnk new file mode 100644 index 0000000..e88d32e Binary files /dev/null and b/app-new/# go to git 'app-new'.lnk differ diff --git a/app-new/functions-min.js b/app-new/functions-min.js new file mode 100644 index 0000000..4300d8d --- /dev/null +++ b/app-new/functions-min.js @@ -0,0 +1,4 @@ +$(document).ready(()=>{const ss=weeklySpreadsheets;var list='',uno='CAROLINA LOGISTIC  70830515178332',dos='CAROLINA TRANSPORTATION  70830515178290',tres='DELTA EXPRESS  70830515177576',keys=Object.keys(monthlySpreadsheets);for(var i=2;i<9;i++){if(!ss.length||i==ss.length)break;list+='
  • '+ss[i].setTitle()+'
    • '} +list=list.concat('
  • '+'... Entire History
    • ');uno=extend(uno,'CL','Carolina Logistic, Inc');dos=extend(dos,'CT','Carolina Transportation, Inc');tres=extend(tres,'DE','Delta Express, Inc');$('#tH').html(ss[0].setTitle());$('#tC').html(ss[0].createAnchor('expense'));$('#tL').html(ss[0].createAnchor('payroll'));$('#bH').html(ss[1].setTitle());$('#bC').html(ss[1].createAnchor('expense'));$('#bL').html(ss[1].createAnchor('payroll'));$('#hist').html(list);$('#uno').html(uno);$('#dos').html(dos);$('#tres').html(tres);$('#repD').html(createRepD());function extend(row,key,title){var obj1=monthlySpreadsheets[keys[1]],obj2=monthlySpreadsheets[keys[0]],mon1=keys[1].split('-')[1],mon2=keys[0].split('-')[1],now=new Date,date=new Date(mon2+' 1, '+keys[1].split('-')[0]),active=now>=date,user1='Helen',user2='Joyce';const dropCardAnchor=(cardArr,mon,shouldUseActive)=>{if(cardArr[0]){let anchorHtml='';row+=(((shouldUseActive)?active:!0)&&cardArr[1])?mon+'':''+mon;row+='   ';row+=anchorHtml+'/edit#gid=1995296890">';row+=(((shouldUseActive)?active:!0)&&cardArr[2])?user1+'':''+user1;row+=' ';row+=anchorHtml+'/edit#gid=2117669368">';row+=(((shouldUseActive)?active:!0)&&cardArr[3])?user2+'':''+user2}};const dropMcAnchor=(mcArr,mon,shouldUseActive)=>{if(mcArr[0]){row+='';row+=(((shouldUseActive)?active:!0)&&mcArr[1])?mon+'':''+mon}} +row+='';dropCardAnchor(obj1.cards[key],mon1);row+='';row+='';dropCardAnchor(obj2.cards[key],mon2,!0);row+='';row+='';dropMcAnchor(obj1.money_codes[key],mon1);row+='';row+='';dropMcAnchor(obj2.money_codes[key],mon2,!0);row+='';return row} +function createRepD(){var el='Reporting Drivers',mon1=keys[0].split('-')[1],mon2=keys[1].split('-')[1],now=new Date,date=new Date(mon1+' 1, '+keys[1].split('-')[0]),showNew=now>=date,id=(showNew)?monthlySpreadsheets[keys[0]].repTabId:monthlySpreadsheets[keys[1]].repTabId,mon=''+((showNew)?mon1:mon2)+'';if(id)el=''+el+' '+mon+'';return el}}) diff --git a/app-new/functions.js b/app-new/functions.js index 0bca8a6..4e73934 100644 --- a/app-new/functions.js +++ b/app-new/functions.js @@ -1,126 +1,130 @@ -const ss = weeklySpreadsheets; -var list = '', - uno = 'CAROLINA LOGISTIC  70830515178332', - dos = 'CAROLINA TRANSPORTATION  70830515178290', - tres = 'DELTA EXPRESS  70830515177576', - keys = Object.keys(monthlySpreadsheets); +$(document).ready( () => { + + const ss = weeklySpreadsheets; + var list = '', + uno = 'CAROLINA LOGISTIC  70830515178332', + dos = 'CAROLINA TRANSPORTATION  70830515178290', + tres = 'DELTA EXPRESS  70830515177576', + keys = Object.keys(monthlySpreadsheets); -for (var i = 2; i < 14; i++) { + for (var i = 2; i < 9; i++) { - if (!ss.length || i == ss.length) break; + if (!ss.length || i == ss.length) break; - list += '
  • ' + ss[i].setTitle() + '
    • ' - -} - -list = list.concat( - '
  • ' + - '... Entire History
    • ' -); - -uno = extend(uno, 'CL', 'Carolina Logistic, Inc'); -dos = extend(dos, 'CT', 'Carolina Transportation, Inc'); -tres = extend(tres, 'DE', 'Delta Express, Inc'); - - -document.getElementById('tH').innerHTML = ss[0].setTitle(); -document.getElementById('tC').innerHTML = ss[0].createAnchor('expense'); -document.getElementById('tL').innerHTML = ss[0].createAnchor('payroll'); - -document.getElementById('bH').innerHTML = ss[1].setTitle(); -document.getElementById('bC').innerHTML = ss[1].createAnchor('expense'); -document.getElementById('bL').innerHTML = ss[1].createAnchor('payroll'); - -document.getElementById('hist').innerHTML = list; - -document.getElementById('uno').innerHTML = uno; -document.getElementById('dos').innerHTML = dos; -document.getElementById('tres').innerHTML = tres; - -document.getElementById('repD').innerHTML = createRepD(); - - -function extend(row, key, title) { - - var obj1 = monthlySpreadsheets[keys[1]], - obj2 = monthlySpreadsheets[keys[0]], - mon1 = keys[1].split('-')[1], - mon2 = keys[0].split('-')[1], - now = new Date, - date = new Date(mon2 + ' 1, ' + keys[1].split('-')[0]), - active = now >= date, - user1 = 'Helen', - user2 = 'Joyce'; - - const dropCardAnchor = (cardArr, mon, shouldUseActive) => { - - if (cardArr[0]) { - - let anchorHtml = ''; - row += (((shouldUseActive) ? active : true) && cardArr[1]) ? mon + '' : '' + mon; - row += '   '; - - row += anchorHtml + '/edit#gid=1995296890">'; - row += (((shouldUseActive) ? active : true) && cardArr[2]) ? user1 + '' : '' + user1; - - row += ' '; - - row += anchorHtml + '/edit#gid=2117669368">'; - row += (((shouldUseActive) ? active : true) && cardArr[3]) ? user2 + '' : '' + user2; - - } - - }; - - const dropMcAnchor = (mcArr, mon, shouldUseActive) => { - - if (mcArr[0]) { - - row += ''; - - row += (((shouldUseActive) ? active : true) && mcArr[1]) ? mon + '' : '' + mon; - - } + list += '
  • ' + ss[i].setTitle() + '
    • ' } - row += ''; dropCardAnchor(obj1.cards[key], mon1); row += ''; - row += ''; dropCardAnchor(obj2.cards[key], mon2, true); row += ''; + list = list.concat( + '
  • ' + + '... Entire History
    • ' + ); - row += ''; dropMcAnchor(obj1.money_codes[key], mon1); row += ''; - row += ''; dropMcAnchor(obj2.money_codes[key], mon2, true); row += ''; + uno = extend(uno, 'CL', 'Carolina Logistic, Inc'); + dos = extend(dos, 'CT', 'Carolina Transportation, Inc'); + tres = extend(tres, 'DE', 'Delta Express, Inc'); - return row; -} + $('#tH').html(ss[0].setTitle()); + $('#tC').html(ss[0].createAnchor('expense')); + $('#tL').html(ss[0].createAnchor('payroll')); -function createRepD() { + $('#bH').html(ss[1].setTitle()); + $('#bC').html(ss[1].createAnchor('expense')); + $('#bL').html(ss[1].createAnchor('payroll')); - var el = 'Reporting Drivers', - mon1 = keys[0].split('-')[1], - mon2 = keys[1].split('-')[1], - now = new Date, - date = new Date(mon1 + ' 1, ' + keys[1].split('-')[0]), - showNew = now >= date, - id = (showNew) ? monthlySpreadsheets[keys[0]].repTabId : monthlySpreadsheets[keys[1]].repTabId, - mon = '' + ((showNew) ? mon1 : mon2) + ''; + $('#hist').html(list); - if (id) el = '' + - el + ' ' + mon + ''; + $('#uno').html(uno); + $('#dos').html(dos); + $('#tres').html(tres); - return el; + $('#repD').html(createRepD()); -} + + function extend(row, key, title) { + + var obj1 = monthlySpreadsheets[keys[1]], + obj2 = monthlySpreadsheets[keys[0]], + mon1 = keys[1].split('-')[1], + mon2 = keys[0].split('-')[1], + now = new Date, + date = new Date(mon2 + ' 1, ' + keys[1].split('-')[0]), + active = now >= date, + user1 = 'Helen', + user2 = 'Joyce'; + + const dropCardAnchor = (cardArr, mon, shouldUseActive) => { + + if (cardArr[0]) { + + let anchorHtml = ''; + row += (((shouldUseActive) ? active : true) && cardArr[1]) ? mon + '' : '' + mon; + row += '   '; + + row += anchorHtml + '/edit#gid=1995296890">'; + row += (((shouldUseActive) ? active : true) && cardArr[2]) ? user1 + '' : '' + user1; + + row += ' '; + + row += anchorHtml + '/edit#gid=2117669368">'; + row += (((shouldUseActive) ? active : true) && cardArr[3]) ? user2 + '' : '' + user2; + + } + + }; + + const dropMcAnchor = (mcArr, mon, shouldUseActive) => { + + if (mcArr[0]) { + + row += ''; + + row += (((shouldUseActive) ? active : true) && mcArr[1]) ? mon + '' : '' + mon; + + } + + } + + row += ''; dropCardAnchor(obj1.cards[key], mon1); row += ''; + row += ''; dropCardAnchor(obj2.cards[key], mon2, true); row += ''; + + row += ''; dropMcAnchor(obj1.money_codes[key], mon1); row += ''; + row += ''; dropMcAnchor(obj2.money_codes[key], mon2, true); row += ''; + + return row; + + } + + function createRepD() { + + var el = 'Reporting Drivers', + mon1 = keys[0].split('-')[1], + mon2 = keys[1].split('-')[1], + now = new Date, + date = new Date(mon1 + ' 1, ' + keys[1].split('-')[0]), + showNew = now >= date, + id = (showNew) ? monthlySpreadsheets[keys[0]].repTabId : monthlySpreadsheets[keys[1]].repTabId, + mon = '' + ((showNew) ? mon1 : mon2) + ''; + + if (id) el = '' + + el + ' ' + mon + ''; + + return el; + + } + +}); diff --git a/app-new/mc-owners-func-min.js b/app-new/mc-owners-func-min.js new file mode 100644 index 0000000..2e82869 --- /dev/null +++ b/app-new/mc-owners-func-min.js @@ -0,0 +1,4 @@ +$(document).ready(()=>{const companies=getCompanies();const pad='style="padding: 12px 54px;">',hPad=''+hPad+'Period 1'+hPad+'Period 2';let compKeys=Object.keys(companies),mKeys=Object.keys(monthlySpreadsheets),lastPeriod=mKeys[0],lastMonth=lastPeriod.split('-')[1],lastYear=lastPeriod.split('-')[0],active=new Date>=new Date(lastMonth+' 1, '+lastYear),period1=monthlySpreadsheets[mKeys[1]],period2=monthlySpreadsheets[lastPeriod];for(let i=0;i',data1=period1[compKeys[i]],data2=period2[compKeys[i]];let anchor1='',anchor2='';let title=sideHeader.split('>')[1].split('<')[0].trim();if(data1&&data1[0]){let monYr=mKeys[1].split('-')[1]+' '+mKeys[1].split('-')[0];anchor1=dPad+'';anchor1+=(data1[1])?monYr+'':''+monYr;anchor1+=''} +if(data2&&data2[0]){let monYr=lastMonth+' '+lastYear;anchor2=dPad+'';anchor2+=(data2[1]&&active)?monYr+'':''+monYr;anchor2+=''} +if(anchor1==''&&anchor2=='')sideHeader=sideHeader.replace(''} +$('#omcMon').html(table)}) diff --git a/app-new/mc-owners-func.js b/app-new/mc-owners-func.js index 32f1010..8988e51 100644 --- a/app-new/mc-owners-func.js +++ b/app-new/mc-owners-func.js @@ -1,65 +1,58 @@ -const companies = { +$(document).ready( () => { - 'CLs': 'CAROLINA LOGISTICS, Inc  70830516181943', - 'DE': 'DELTA EXPRESS, Inc  70830515177576', - 'DL': 'DELTA LOGISTICS, Inc  70830517302592', - 'OT': 'ONTRACK TRANSPORTATION, Inc  70830517305886', - 'PT': 'PRECISE TRANSPORTATION, Inc  70830517302433', + const companies = getCompanies(); - 'DES': 'DELTA EXPRESS SERVICES, Inc  ', - 'RT': 'RAINIER TRANSPORTATION, Inc  70830517307425', + const pad = 'style="padding: 12px 54px;">', + hPad = '' + hPad + 'Period 1' + hPad + 'Period 2'; -}; + let compKeys = Object.keys(companies), + mKeys = Object.keys(monthlySpreadsheets), + lastPeriod = mKeys[0], + lastMonth = lastPeriod.split('-')[1], + lastYear = lastPeriod.split('-')[0], + active = new Date >= new Date(lastMonth + ' 1, ' + lastYear), + period1 = monthlySpreadsheets[mKeys[1]], + period2 = monthlySpreadsheets[lastPeriod]; -const pad = 'style="padding: 12px 54px;">', - hPad = '' + hPad + 'Period 1' + hPad + 'Period 2'; + for (let i = 0; i < compKeys.length; i++) { -let compKeys = Object.keys(companies), - mKeys = Object.keys(monthlySpreadsheets), - lastPeriod = mKeys[0], - lastMonth = lastPeriod.split('-')[1], - lastYear = lastPeriod.split('-')[0], - active = new Date >= new Date(lastMonth + ' 1, ' + lastYear), - period1 = monthlySpreadsheets[mKeys[1]], - period2 = monthlySpreadsheets[lastPeriod]; + let sideHeader = hPad + companies[compKeys[i]] + '', + data1 = period1[compKeys[i]], + data2 = period2[compKeys[i]]; -for (let i = 0; i < compKeys.length; i++) { + let anchor1 = '', anchor2 = ''; - let sideHeader = hPad + companies[compKeys[i]] + '', - data1 = period1[compKeys[i]], - data2 = period2[compKeys[i]]; + let title = sideHeader.split('>')[1].split('<')[0].trim(); - let anchor1 = '', anchor2 = ''; + if (data1 && data1[0]) { - let title = sideHeader.split('>')[1].split('<')[0].trim(); + let monYr = mKeys[1].split('-')[1] + ' ' + mKeys[1].split('-')[0]; - if (data1 && data1[0]) { + anchor1 = dPad + ''; + anchor1 += (data1[1]) ? monYr + '' : '' + monYr; + anchor1 += ''; - let monYr = mKeys[1].split('-')[1] + ' ' + mKeys[1].split('-')[0]; + } - anchor1 = dPad + ''; - anchor1 += (data1[1]) ? monYr + '' : '' + monYr; - anchor1 += ''; + if (data2 && data2[0]) { + + let monYr = lastMonth + ' ' + lastYear; + + anchor2 = dPad + ''; + anchor2 += (data2[1] && active) ? monYr + '' : '' + monYr; + anchor2 += ''; + + } + + if (anchor1 == '' && anchor2 == '') sideHeader = sideHeader.replace('' } - if (data2 && data2[0]) { + $('#omcMon').html(table); - let monYr = lastMonth + ' ' + lastYear; - - anchor2 = dPad + ''; - anchor2 += (data2[1] && active) ? monYr + '' : '' + monYr; - anchor2 += ''; - - } - - if (anchor1 == '' && anchor2 == '') sideHeader = sideHeader.replace('' - -} - -document.getElementById('omcMon').innerHTML = table; +}); diff --git a/app-new/mc-owners-ss.js b/app-new/mc-owners-ss.js index 79e0a10..fcd1a86 100644 --- a/app-new/mc-owners-ss.js +++ b/app-new/mc-owners-ss.js @@ -55,3 +55,25 @@ const monthlySpreadsheets = { }, }; + + +const getCompanies = () => { + + return { + + 'CLs': 'CAROLINA LOGISTICS, Inc  70830516181943', + 'DE': 'DELTA EXPRESS, Inc  70830515177576', + 'DL': 'DELTA LOGISTICS, Inc  70830517302592', + 'OT': 'ONTRACK TRANSPORTATION, Inc  70830517305886', + 'PT': 'PRECISE TRANSPORTATION, Inc  70830517302433', + + 'DES': 'DELTA EXPRESS SERVICES, Inc  ', + 'RT': 'RAINIER TRANSPORTATION, Inc  70830517307425', + + // 'AE': 'ALPHA EXPRESS, Inc  ', + // 'HH': 'HUGO HUNTER, Inc  ', + // 'CDT': 'CAROLINA DUMP TRUCKING, Inc  ', + + }; + +}; diff --git a/js/date-time.js b/js/date-time.js index ac066ad..5b30752 100644 --- a/js/date-time.js +++ b/js/date-time.js @@ -21,7 +21,7 @@ const date_time = id => { year + '   ' + h + ':' + m + ':' + s + 'US Eastern Standard Time'; - document.getElementById(id).innerHTML = result; + $(`#${id}`).html(result); setTimeout('date_time("' + id + '");', 1000); diff --git a/js/misc.js b/js/misc.js index ff4608f..c660722 100644 --- a/js/misc.js +++ b/js/misc.js @@ -1,123 +1,127 @@ -const shortcuts = -`Shortcuts - - - - - - - - - -
    - - + Add WORKSHEET - - - Scans - - - Expense - - - Document Submission - - - Payroll List - - - Students -
    - - - - - - - - - -
    - - Truck/Trailer Breakdown - - - DEF Tracker - - - Rate List - - - Towing - - - Phone List -
    `; +$( () => { -const additional = -`Additional Tools (West Coast Only) - - - - - - -
    - Detention Board - West Coast Board - West Coast AVG Rates
    `; + const shortcuts = + `Shortcuts + + + + + + + + + +
    + + + Add WORKSHEET + + + Scans + + + Expense + + + Document Submission + + + Payroll List + + + Students +
    + + + + + + + + + +
    + + Truck/Trailer Breakdown + + + DEF Tracker + + + Rate List + + + Towing + + + Phone List +
    `; -const shortcuts2 = -`Shortcuts - - - - - - - - -
    - - Phone List - - - Global Board 1 - - - Global Board 2 - - - Global Board 3 - - - Money Codes CL/CT -
    `; + const additional = + `Additional Tools (West Coast Only) + + + + + + +
    + Detention Board + West Coast Board + West Coast AVG Rates
    `; -setInnerHtml('shortcuts', shortcuts); -setInnerHtml('additional', additional); -setInnerHtml('shortcuts2', shortcuts2); + const shortcuts2 = + `Shortcuts + + + + + + + + +
    + + Phone List + + + Global Board 1 + + + Global Board 2 + + + Global Board 3 + + + Money Codes CL/CT +
    `; -function setInnerHtml(id, content) { - var el = document.getElementById(id); - if (el) el.innerHTML = content; -} + setInnerHtml('shortcuts', shortcuts); + setInnerHtml('additional', additional); + setInnerHtml('shortcuts2', shortcuts2); + + function setInnerHtml(id, content) { + var $el = $(`#${id}`); + if ($el) $el.html(content); + } + +}); diff --git a/js/nav.js b/js/nav.js index 8c58acb..a088ffc 100644 --- a/js/nav.js +++ b/js/nav.js @@ -1,223 +1,249 @@ -document.getElementById('top').innerHTML = -``; +$( () => { + + const efs = `
  • + EFS +
    • `, + + dropbox = `
  • + Dropbox +
    • `, + + drive = `
  • + G-Drive +
    • `, + + mail = `
  • + Gmail Prim + +
    • `, + + hangouts = `
  • + Hangouts Prim + +
    • `, + + map = `
  • + G-Maps +
    • `, + + tracking = `
  • + Tracking Apps ▾ + +
    • `, + + rpm = `
  • + RPM ▾ + +
    • `, + + add = `
  • + + New ▾ + +
    • `, + + database = `
  • + Database ▾ + +
    • `, + + misc = `
  • + Other & Misc ▾ + +
    • `; + + + $('#top').html(`
      + ${efs} + ${dropbox} + ${drive} + ${mail} + ${hangouts} + ${map} + ${tracking} + ${rpm} + ${add} + ${database} + ${misc} +
    `); + +}); diff --git a/rpm/# go to git 'rpm'.lnk b/rpm/# go to git 'rpm'.lnk new file mode 100644 index 0000000..52232fe Binary files /dev/null and b/rpm/# go to git 'rpm'.lnk differ diff --git a/rpm/# go to this 'app'.lnk b/rpm/# go to this 'app'.lnk new file mode 100644 index 0000000..eb49a8b Binary files /dev/null and b/rpm/# go to this 'app'.lnk differ diff --git a/rpm/board-cd.html b/rpm/board-cd.html index 6ae7aba..4c55132 100644 --- a/rpm/board-cd.html +++ b/rpm/board-cd.html @@ -14,7 +14,14 @@ + + + + + + + @@ -66,16 +73,6 @@
    - - - - - - - - - - diff --git a/rpm/board-oo.html b/rpm/board-oo.html index 24a7641..705dfe2 100644 --- a/rpm/board-oo.html +++ b/rpm/board-oo.html @@ -14,7 +14,12 @@ + + + + + @@ -34,12 +39,6 @@
    - - - - - -