update 1910021012

This commit is contained in:
vkservicesllc
2019-10-02 10:12:31 -04:00
parent 647651addd
commit 5bcd017bad
13 changed files with 572 additions and 519 deletions

Binary file not shown.

4
app-new/functions-min.js vendored Normal file
View File

@@ -0,0 +1,4 @@
$(document).ready(()=>{const ss=weeklySpreadsheets;var list='',uno='<th>CAROLINA LOGISTIC &nbsp<span>70830515178332</span></th>',dos='<th>CAROLINA TRANSPORTATION &nbsp<span>70830515178290</span></th>',tres='<th>DELTA EXPRESS &nbsp<span>70830515177576</span></th>',keys=Object.keys(monthlySpreadsheets);for(var i=2;i<9;i++){if(!ss.length||i==ss.length)break;list+='<li><a class="h" target="_blank" href="';list+='https://docs.google.com/spreadsheets/d/'+ss[i].key;list+='/edit#gid=1250765514">'+ss[i].setTitle()+'</a></li>'}
list=list.concat('<li><a class="h" target="_blank" '+'title="Open Google Drive folder'+String.fromCharCode(10)+'containing all weeks'+String.fromCharCode(10)+'starting Dec 10, 2017" '+' href="https://drive.google.com/drive/folders/1MfNPealueJQJKTeV_J9iu9vCQr6qGPn1">'+'<span>... Entire History</span></a></li>');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='<span>Helen</span>',user2='<span>Joyce</span>';const dropCardAnchor=(cardArr,mon,shouldUseActive)=>{if(cardArr[0]){let anchorHtml='<a class="h" target="_blank" title="'+title+'" href="https://docs.google.com/spreadsheets/d/'+cardArr[0];row+='<em>'+anchorHtml+'/edit#gid=686342087">';row+=(((shouldUseActive)?active:!0)&&cardArr[1])?mon+'</a>':'</a>'+mon;row+='</em>&nbsp;&nbsp;&nbsp;';row+=anchorHtml+'/edit#gid=1995296890">';row+=(((shouldUseActive)?active:!0)&&cardArr[2])?user1+'</a>':'</a>'+user1;row+='&nbsp;';row+=anchorHtml+'/edit#gid=2117669368">';row+=(((shouldUseActive)?active:!0)&&cardArr[3])?user2+'</a>':'</a>'+user2}};const dropMcAnchor=(mcArr,mon,shouldUseActive)=>{if(mcArr[0]){row+='<a class="h" target="_blank" title="'+title;row+='" href="https://docs.google.com/spreadsheets/d/'+mcArr[0];row+='/edit#gid=1165085359">';row+=(((shouldUseActive)?active:!0)&&mcArr[1])?mon+'</a>':'</a>'+mon}}
row+='<td>';dropCardAnchor(obj1.cards[key],mon1);row+='</td>';row+='<td>';dropCardAnchor(obj2.cards[key],mon2,!0);row+='</td>';row+='<td>';dropMcAnchor(obj1.money_codes[key],mon1);row+='</td>';row+='<td>';dropMcAnchor(obj2.money_codes[key],mon2,!0);row+='</td>';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='<span>'+((showNew)?mon1:mon2)+'<span>';if(id)el='<a class="h" target="_blank" href="https://docs.google.com/spreadsheets/d/'+'1b2g3BARa4ibqdqtTj5_IQoBSI8hp6A4R5A3bSbrfA58/edit?pli=1#gid='+id+'">'+el+' '+mon+'</a>';return el}})

View File

@@ -1,3 +1,5 @@
$(document).ready( () => {
const ss = weeklySpreadsheets; const ss = weeklySpreadsheets;
var list = '', var list = '',
uno = '<th>CAROLINA LOGISTIC &nbsp<span>70830515178332</span></th>', uno = '<th>CAROLINA LOGISTIC &nbsp<span>70830515178332</span></th>',
@@ -6,7 +8,7 @@ var list = '',
keys = Object.keys(monthlySpreadsheets); 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;
@@ -30,21 +32,21 @@ dos = extend(dos, 'CT', 'Carolina Transportation, Inc');
tres = extend(tres, 'DE', 'Delta Express, Inc'); tres = extend(tres, 'DE', 'Delta Express, Inc');
document.getElementById('tH').innerHTML = ss[0].setTitle(); $('#tH').html(ss[0].setTitle());
document.getElementById('tC').innerHTML = ss[0].createAnchor('expense'); $('#tC').html(ss[0].createAnchor('expense'));
document.getElementById('tL').innerHTML = ss[0].createAnchor('payroll'); $('#tL').html(ss[0].createAnchor('payroll'));
document.getElementById('bH').innerHTML = ss[1].setTitle(); $('#bH').html(ss[1].setTitle());
document.getElementById('bC').innerHTML = ss[1].createAnchor('expense'); $('#bC').html(ss[1].createAnchor('expense'));
document.getElementById('bL').innerHTML = ss[1].createAnchor('payroll'); $('#bL').html(ss[1].createAnchor('payroll'));
document.getElementById('hist').innerHTML = list; $('#hist').html(list);
document.getElementById('uno').innerHTML = uno; $('#uno').html(uno);
document.getElementById('dos').innerHTML = dos; $('#dos').html(dos);
document.getElementById('tres').innerHTML = tres; $('#tres').html(tres);
document.getElementById('repD').innerHTML = createRepD(); $('#repD').html(createRepD());
function extend(row, key, title) { function extend(row, key, title) {
@@ -124,3 +126,5 @@ function createRepD() {
return el; return el;
} }
});

4
app-new/mc-owners-func-min.js vendored Normal file
View File

@@ -0,0 +1,4 @@
$(document).ready(()=>{const companies=getCompanies();const pad='style="padding: 12px 54px;">',hPad='<th '+pad,dPad='<td '+pad;let table='<tr id="hdr">'+hPad+'Company</th>'+hPad+'Period 1</th>'+hPad+'Period 2</th></tr>';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<compKeys.length;i++){let sideHeader=hPad+companies[compKeys[i]]+'</th>',data1=period1[compKeys[i]],data2=period2[compKeys[i]];let anchor1='<td></td>',anchor2='<td></td>';let title=sideHeader.split('>')[1].split('<')[0].trim();if(data1&&data1[0]){let monYr=mKeys[1].split('-')[1]+' '+mKeys[1].split('-')[0];anchor1=dPad+'<a class="h" target="_blank" href="https://docs.google.com/spreadsheets/d/';anchor1+=data1[0]+'/edit#gid=1165085359" title="'+title+'">';anchor1+=(data1[1])?monYr+'</a>':'</a>'+monYr;anchor1+='</td>'}
if(data2&&data2[0]){let monYr=lastMonth+' '+lastYear;anchor2=dPad+'<a class="h" target="_blank" href="https://docs.google.com/spreadsheets/d/';anchor2+=data2[0]+'/edit#gid=1165085359" title="'+title+'">';anchor2+=(data2[1]&&active)?monYr+'</a>':'</a>'+monYr;anchor2+='</td>'}
if(anchor1=='<td></td>'&&anchor2=='<td></td>')sideHeader=sideHeader.replace('<th ','<th class="redundant" ');table+='<tr>'+sideHeader+anchor1+anchor2+'</tr>'}
$('#omcMon').html(table)})

View File

@@ -1,15 +1,6 @@
const companies = { $(document).ready( () => {
'CLs': 'CAROLINA LOGISTICS, Inc &nbsp;<span>70830516181943</span>', const companies = getCompanies();
'DE': 'DELTA EXPRESS, Inc &nbsp;<span>70830515177576</span>',
'DL': 'DELTA LOGISTICS, Inc &nbsp;<span>70830517302592</span>',
'OT': 'ONTRACK TRANSPORTATION, Inc &nbsp;<span>70830517305886</span>',
'PT': 'PRECISE TRANSPORTATION, Inc &nbsp;<span>70830517302433</span>',
'DES': 'DELTA EXPRESS SERVICES, Inc &nbsp;<span></span>',
'RT': 'RAINIER TRANSPORTATION, Inc &nbsp;<span>70830517307425</span>',
};
const pad = 'style="padding: 12px 54px;">', const pad = 'style="padding: 12px 54px;">',
hPad = '<th ' + pad, dPad = '<td ' + pad; hPad = '<th ' + pad, dPad = '<td ' + pad;
@@ -62,4 +53,6 @@ for (let i = 0; i < compKeys.length; i++) {
} }
document.getElementById('omcMon').innerHTML = table; $('#omcMon').html(table);
});

View File

@@ -55,3 +55,25 @@ const monthlySpreadsheets = {
}, },
}; };
const getCompanies = () => {
return {
'CLs': 'CAROLINA LOGISTICS, Inc &nbsp;<span>70830516181943</span>',
'DE': 'DELTA EXPRESS, Inc &nbsp;<span>70830515177576</span>',
'DL': 'DELTA LOGISTICS, Inc &nbsp;<span>70830517302592</span>',
'OT': 'ONTRACK TRANSPORTATION, Inc &nbsp;<span>70830517305886</span>',
'PT': 'PRECISE TRANSPORTATION, Inc &nbsp;<span>70830517302433</span>',
'DES': 'DELTA EXPRESS SERVICES, Inc &nbsp;<span></span>',
'RT': 'RAINIER TRANSPORTATION, Inc &nbsp;<span>70830517307425</span>',
// 'AE': 'ALPHA EXPRESS, Inc &nbsp;<span></span>',
// 'HH': 'HUGO HUNTER, Inc &nbsp;<span></span>',
// 'CDT': 'CAROLINA DUMP TRUCKING, Inc &nbsp;<span></span>',
};
};

View File

@@ -21,7 +21,7 @@ const date_time = id => {
year + '&nbsp&nbsp&nbsp' + h + ':' + m + ':' + s + year + '&nbsp&nbsp&nbsp' + h + ':' + m + ':' + s +
'<span style="font-style: oblique;">US Eastern Standard Time</span>'; '<span style="font-style: oblique;">US Eastern Standard Time</span>';
document.getElementById(id).innerHTML = result; $(`#${id}`).html(result);
setTimeout('date_time("' + id + '");', 1000); setTimeout('date_time("' + id + '");', 1000);

View File

@@ -1,3 +1,5 @@
$( () => {
const shortcuts = const shortcuts =
`<legend>Shortcuts</legend> `<legend>Shortcuts</legend>
<table class="shcuts1"> <table class="shcuts1">
@@ -118,6 +120,8 @@ setInnerHtml('additional', additional);
setInnerHtml('shortcuts2', shortcuts2); setInnerHtml('shortcuts2', shortcuts2);
function setInnerHtml(id, content) { function setInnerHtml(id, content) {
var el = document.getElementById(id); var $el = $(`#${id}`);
if (el) el.innerHTML = content; if ($el) $el.html(content);
} }
});

View File

@@ -1,18 +1,21 @@
document.getElementById('top').innerHTML = $( () => {
`<ul class="sub1">
<li><a target="_blank" class="bl h" const efs = `<li><a target="_blank" class="bl h"
href="https://www.tch.com/security/logon.jsp"> href="https://www.tch.com/security/logon.jsp">
EFS</a> EFS</a>
</li> </li>`,
<li><a target="_blank" class="h"
dropbox = `<li><a target="_blank" class="h"
href="https://www.dropbox.com/home"> href="https://www.dropbox.com/home">
Dropbox</a> Dropbox</a>
</li> </li>`,
<li><a target="_blank" class="h"
drive = `<li><a target="_blank" class="h"
href="https://drive.google.com/drive/my-drive"> href="https://drive.google.com/drive/my-drive">
G-Drive</a> G-Drive</a>
</li> </li>`,
<li><a target="_blank" class="h"
mail = `<li><a target="_blank" class="h"
href="https://mail.google.com/mail/u/0/#inbox"> href="https://mail.google.com/mail/u/0/#inbox">
Gmail <em>Prim</em></a> Gmail <em>Prim</em></a>
<ul class="sub2"> <ul class="sub2">
@@ -23,8 +26,9 @@ document.getElementById('top').innerHTML =
href="https://mail.google.com/mail/u/2/#inbox"> href="https://mail.google.com/mail/u/2/#inbox">
Gmail <em>Ter</em></a></li> Gmail <em>Ter</em></a></li>
</ul> </ul>
</li> </li>`,
<li><a target="_blank" class="h"
hangouts = `<li><a target="_blank" class="h"
href="https://hangouts.google.com/"> href="https://hangouts.google.com/">
Hangouts <em>Prim</em></a> Hangouts <em>Prim</em></a>
<ul class="sub2"> <ul class="sub2">
@@ -35,12 +39,14 @@ document.getElementById('top').innerHTML =
href="https://hangouts.google.com/?authuser=2"> href="https://hangouts.google.com/?authuser=2">
Hangouts <em>Ter</em></a></li> Hangouts <em>Ter</em></a></li>
</ul> </ul>
</li> </li>`,
<li><a target="_blank" class="h"
map = `<li><a target="_blank" class="h"
href="https://www.google.com/maps/@35.5710764,-82.5803167,12z"> href="https://www.google.com/maps/@35.5710764,-82.5803167,12z">
G-Maps</a> G-Maps</a>
</li> </li>`,
<li><a class="dropdown"
tracking = `<li><a class="dropdown"
href=""> href="">
Tracking Apps &#9662;</a> Tracking Apps &#9662;</a>
<ul class="sub2"> <ul class="sub2">
@@ -54,8 +60,9 @@ document.getElementById('top').innerHTML =
href="https://track.rpmdispatch.com/user/login#!/login"> href="https://track.rpmdispatch.com/user/login#!/login">
<em>Old</em></a></li> <em>Old</em></a></li>
</ul> </ul>
</li> </li>`,
<li><a class="dropdown"
rpm = `<li><a class="dropdown"
href=""> href="">
RPM &#9662;</a> RPM &#9662;</a>
<ul class="sub2"> <ul class="sub2">
@@ -72,8 +79,9 @@ document.getElementById('top').innerHTML =
href="http://dispatchdelta.com/default.aspx"> href="http://dispatchdelta.com/default.aspx">
DE</a></li> DE</a></li>
</ul> </ul>
</li> </li>`,
<li><a class="dropdown"
add = `<li><a class="dropdown"
href=""> href="">
+ New &#9662;</a> + New &#9662;</a>
<ul class="sub2"> <ul class="sub2">
@@ -87,8 +95,9 @@ document.getElementById('top').innerHTML =
href="https://drive.google.com/drive/folders/1S01wzvFY7Qb2AWeJDa5iB0L5Gdydjqh6"> href="https://drive.google.com/drive/folders/1S01wzvFY7Qb2AWeJDa5iB0L5Gdydjqh6">
MC(M)</a></li> MC(M)</a></li>
</ul> </ul>
</li> </li>`,
<li><a class="dropdown"
database = `<li><a class="dropdown"
href=""> href="">
Database &#9662;</a> Database &#9662;</a>
<ul class="sub2 right"> <ul class="sub2 right">
@@ -168,8 +177,9 @@ document.getElementById('top').innerHTML =
href="https://docs.google.com/spreadsheets/d/1h-PLcbXzbKPtgrGN6cMFit6ML6hVzXrxec48ekCpsVE/edit#gid=578326070"> href="https://docs.google.com/spreadsheets/d/1h-PLcbXzbKPtgrGN6cMFit6ML6hVzXrxec48ekCpsVE/edit#gid=578326070">
Methods</a></li> Methods</a></li>
</ul> </ul>
</li> </li>`,
<li><a class="dropdown"
misc = `<li><a class="dropdown"
href=""> href="">
Other <span>&</span> Misc &#9662;</a> Other <span>&</span> Misc &#9662;</a>
<ul class="sub2"> <ul class="sub2">
@@ -219,5 +229,21 @@ document.getElementById('top').innerHTML =
href="https://drive.google.com/drive/folders/0BwZYC9bOkSa5S2taNmNkVUJXX3M"> href="https://drive.google.com/drive/folders/0BwZYC9bOkSa5S2taNmNkVUJXX3M">
Tools <em>Backup</em></a></li> Tools <em>Backup</em></a></li>
</ul> </ul>
</li> </li>`;
</ul>`;
$('#top').html(`<ul class="sub1">
${efs}
${dropbox}
${drive}
${mail}
${hangouts}
${map}
${tracking}
${rpm}
${add}
${database}
${misc}
</ul>`);
});

BIN
rpm/# go to git 'rpm'.lnk Normal file

Binary file not shown.

BIN
rpm/# go to this 'app'.lnk Normal file

Binary file not shown.

View File

@@ -14,7 +14,14 @@
<link rel="stylesheet" href="../css/styles.css"> <link rel="stylesheet" href="../css/styles.css">
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="../js/date-time.js"></script> <script src="../js/date-time.js"></script>
<script src="../js/nav.js"></script>
<script src="../js/misc.js"></script>
<script src="../app-new/objects.js"></script>
<script src="../app-new/weeks.js"></script>
<script src="../app-new/months.js"></script>
<script src="../app-new/functions-min.js"></script>
</head> </head>
@@ -66,16 +73,6 @@
<fieldset class="favs" id="additional"></fieldset> <fieldset class="favs" id="additional"></fieldset>
<script src="../js/nav.js"></script>
<script src="../js/misc.js"></script>
<script src="../app-new/objects.js"></script>
<script src="../app-new/weeks.js"></script>
<script src="../app-new/months.js"></script>
<script src="../app-new/functions.js"></script>
</body> </body>
</html> </html>

View File

@@ -14,7 +14,12 @@
<link rel="stylesheet" href="../css/styles.css"> <link rel="stylesheet" href="../css/styles.css">
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="../js/date-time.js"></script> <script src="../js/date-time.js"></script>
<script src="../js/nav.js"></script>
<script src="../js/misc.js"></script>
<script src="../app-new/mc-owners-ss.js"></script>
<script src="../app-new/mc-owners-func-min.js"></script>
</head> </head>
@@ -34,12 +39,6 @@
<table id="omcMon" class="monit"></table> <table id="omcMon" class="monit"></table>
</fieldset> </fieldset>
<script src="../js/nav.js"></script>
<script src="../js/misc.js"></script>
<script src="../app-new/mc-owners-ss.js"></script>
<script src="../app-new/mc-owners-func.js"></script>
</body> </body>
</html> </html>