update 1910021012

2019-10-02 10:12:31 -04:00
parent 647651addd
commit 5bcd017bad
13 changed files with 572 additions and 519 deletions
--- a/'app-new'.lnk
+++ b/'app-new'.lnk
--- a/app-new/functions-min.js
+++ b/app-new/functions-min.js
@@ -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}})
--- a/app-new/functions.js
+++ b/app-new/functions.js
@@ -1,12 +1,14 @@
-const ss = weeklySpreadsheets;
-var list = '',
+$(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 < 14; i++) {
+  for (var i = 2; i < 9; i++) {

    if (!ss.length || i == ss.length) break;

@@ -14,40 +16,40 @@ for (var i = 2; i < 14; i++) {
    list += 'https://docs.google.com/spreadsheets/d/' + ss[i].key;
    list += '/edit#gid=1250765514">' + ss[i].setTitle() + '</a></li>'

-}
+  }

-list = list.concat(
+  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');
+  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');
+  $('#tH').html(ss[0].setTitle());
+  $('#tC').html(ss[0].createAnchor('expense'));
+  $('#tL').html(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');
+  $('#bH').html(ss[1].setTitle());
+  $('#bC').html(ss[1].createAnchor('expense'));
+  $('#bL').html(ss[1].createAnchor('payroll'));

-document.getElementById('hist').innerHTML = list;
+  $('#hist').html(list);

-document.getElementById('uno').innerHTML = uno;
-document.getElementById('dos').innerHTML = dos;
-document.getElementById('tres').innerHTML = tres;
+  $('#uno').html(uno);
+  $('#dos').html(dos);
+  $('#tres').html(tres);

-document.getElementById('repD').innerHTML = createRepD();
+  $('#repD').html(createRepD());


-function extend(row, key, title) {
+  function extend(row, key, title) {

    var obj1 = monthlySpreadsheets[keys[1]],
        obj2 = monthlySpreadsheets[keys[0]],
@@ -104,9 +106,9 @@ function extend(row, key, title) {

    return row;

-}
+  }

-function createRepD() {
+  function createRepD() {

    var el = 'Reporting Drivers',
        mon1 = keys[0].split('-')[1],
@@ -123,4 +125,6 @@ function createRepD() {

    return el;

-}
+  }
+
+});
--- a/app-new/mc-owners-func-min.js
+++ b/app-new/mc-owners-func-min.js
@@ -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)})
--- a/app-new/mc-owners-func.js
+++ b/app-new/mc-owners-func.js
@@ -1,21 +1,12 @@
-const companies = {
+$(document).ready( () => {

-  '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>',
+  const companies = getCompanies();

-  '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;
-let table = '<tr id="hdr">' + hPad + 'Company</th>' + hPad + 'Period 1</th>' + hPad + 'Period 2</th></tr>';
+  let table = '<tr id="hdr">' + hPad + 'Company</th>' + hPad + 'Period 1</th>' + hPad + 'Period 2</th></tr>';

-let compKeys = Object.keys(companies),
+  let compKeys = Object.keys(companies),
      mKeys = Object.keys(monthlySpreadsheets),
      lastPeriod = mKeys[0],
      lastMonth = lastPeriod.split('-')[1],
@@ -24,7 +15,7 @@ let compKeys = Object.keys(companies),
      period1 = monthlySpreadsheets[mKeys[1]],
      period2 = monthlySpreadsheets[lastPeriod];

-for (let i = 0; i < compKeys.length; i++) {
+  for (let i = 0; i < compKeys.length; i++) {

    let sideHeader = hPad + companies[compKeys[i]] + '</th>',
        data1 = period1[compKeys[i]],
@@ -60,6 +51,8 @@ for (let i = 0; i < compKeys.length; i++) {

    table += '<tr>' + sideHeader + anchor1 + anchor2 + '</tr>'

-}
+  }

-document.getElementById('omcMon').innerHTML = table;
+  $('#omcMon').html(table);
+
+});
--- 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 &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>',
+
+  };
+
+};
--- a/js/date-time.js
+++ b/js/date-time.js
@@ -21,7 +21,7 @@ const date_time = id => {
           year + '&nbsp&nbsp&nbsp' + h + ':' + m + ':' + s +
           '<span style="font-style: oblique;">US Eastern Standard Time</span>';

-  document.getElementById(id).innerHTML = result;
+  $(`#${id}`).html(result);

  setTimeout('date_time("' + id + '");', 1000);

--- a/js/misc.js
+++ b/js/misc.js
@@ -1,6 +1,8 @@
-const shortcuts =
-`<legend>Shortcuts</legend>
-<table class="shcuts1">
+$( () => {
+
+  const shortcuts =
+  `<legend>Shortcuts</legend>
+  <table class="shcuts1">
    <tr>
      <td>
        <a class="h" target="_blank"
@@ -33,8 +35,8 @@ const shortcuts =
        Students</a>
      </td>
    </tr>
-</table>
-<table class="shcuts2">
+  </table>
+  <table class="shcuts2">
    <tr>
      <td id='repD'></td>
      <td>
@@ -63,11 +65,11 @@ const shortcuts =
        Phone List</a>
      </td>
    </tr>
-</table>`;
+  </table>`;

-const additional =
-`<legend>Additional Tools (West Coast Only)</legend>
-<table class="tools">
+  const additional =
+  `<legend>Additional Tools (West Coast Only)</legend>
+  <table class="tools">
    <tr>
      <td><a class="h" target="_blank"
        href="https://docs.google.com/spreadsheets/d/1AoyXGtUIOiGq9siawF-WnBP4XgVgur-wWRgyilM0j2A/edit?ts=5a673d3b#gid=1558692306">
@@ -79,11 +81,11 @@ const additional =
        href="https://docs.google.com/spreadsheets/d/1y82rNeg66Hh9DIduNXj0fTeIErlJn7B0Xe4-s59RHq4/edit?ts=5a673d99#gid=1275085378">
        West Coast AVG Rates</a></td>
    </tr>
-</table>`;
+  </table>`;

-const shortcuts2 =
-`<legend>Shortcuts</legend>
-<table class="shcuts1">
+  const shortcuts2 =
+  `<legend>Shortcuts</legend>
+  <table class="shcuts1">
    <tr>
      <td>
        <a class="h" target="_blank"
@@ -111,13 +113,15 @@ const shortcuts2 =
        Money Codes <span>CL/CT</span></a>
      </td>
    </tr>
-</table>`;
+  </table>`;

-setInnerHtml('shortcuts', shortcuts);
-setInnerHtml('additional', additional);
-setInnerHtml('shortcuts2', shortcuts2);
+  setInnerHtml('shortcuts', shortcuts);
+  setInnerHtml('additional', additional);
+  setInnerHtml('shortcuts2', shortcuts2);

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

    <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/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>

@@ -66,16 +73,6 @@

    <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>

 </html>
--- a/rpm/board-oo.html
+++ b/rpm/board-oo.html
@@ -14,7 +14,12 @@

    <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/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>

@@ -34,12 +39,6 @@
      <table id="omcMon" class="monit"></table>
    </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>

 </html>