From 0d6167d437fd2216820b9bdb300e321afff61bd6 Mon Sep 17 00:00:00 2001 From: Val <35149642+vkservicesllc@users.noreply.github.com> Date: Fri, 1 May 2020 21:33:59 -0400 Subject: [PATCH] update 2005012133 --- app-new/functions.js | 293 ++++++++++++++++++++++--------------------- app-new/weeks.js | 94 +++++++------- rpm/board-cd.html | 1 - 3 files changed, 199 insertions(+), 189 deletions(-) diff --git a/app-new/functions.js b/app-new/functions.js index a5a4507..3b8d76a 100644 --- a/app-new/functions.js +++ b/app-new/functions.js @@ -1,151 +1,162 @@ $(document).ready( () => { - const ss = weeklySpreadsheets; - var list = '', - uno = 'CAROLINA LOGISTIC  70830515178332', - dos = 'CAROLINA TRANSPORTATION  70830515178290', - tres = 'DELTA EXPRESS  70830515177576', - cuatro = 'ALLIANCE CARGO  ', - cinco = 'AMBU FREIGHT  ', - seis = 'ECHO EXPRESS  ', - siete = 'SELECT LOGISTICS  ', - ocho = 'SOUND TRANSPORTATION  ', - keys = Object.keys(monthlySpreadsheets); + let url = 'https://raw.githubusercontent.com/CarolinaLogistic/linkboard/master/json/ss_payroll-weeks.json'; + const data = $.ajax({ + url, + success: function(data) { + data = JSON.parse(data); + const ss = []; + for (let i in data) + ss.push(new WeeklySpreadsheet(i, data[i])); - for (var i = 2; i < 9; i++) { + var list = '', + uno = 'CAROLINA LOGISTIC  70830515178332', + dos = 'CAROLINA TRANSPORTATION  70830515178290', + tres = 'DELTA EXPRESS  70830515177576', + cuatro = 'ALLIANCE CARGO  ', + cinco = 'AMBU FREIGHT  ', + seis = 'ECHO EXPRESS  ', + siete = 'SELECT LOGISTICS  ', + ocho = 'SOUND TRANSPORTATION  ', + keys = Object.keys(monthlySpreadsheets); - if (!ss.length || i == ss.length) break; + for (var i = 2; i < 9; i++) { - list += '
  • ' + ss[i].setTitle() + '
    • ' + 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'); + cuatro = extend(cuatro, 'AC', 'Aliance Cargo, Inc'); + cinco = extend(cinco, 'AF', 'Ambu Freight, Inc'); + seis = extend(seis, 'EE', 'Echo Express, Inc'); + siete = extend(siete, 'SL', 'Select Express, Inc'); + ocho = extend(ocho, 'ST', 'Sound Transportation, 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); + + $('#cuatro').html(cuatro); + $('#cinco').html(cinco); + $('#seis').html(seis); + $('#siete').html(siete); + + $('#ocho').html(ocho); + + $('#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[0].split('-')[0]), + active = now >= date, + user1 = 'Helen', + user2 = 'Madison'; + + const dropCardAnchor = (cardArr, mon, shouldUseActive) => { + + if (cardArr[0]) { + + let anchorHtml = ''; + row += (((shouldUseActive) ? active : true) && cardArr[1]) ? mon + '' : '' + mon; + row += '   '; + + row += anchorHtml + '/edit#gid='+ ((!cardArr[4]) ? '763947205' : '1995296890') +'">'; + row += (((shouldUseActive) ? active : true) && cardArr[2]) ? user1 + '' : '' + user1; + + row += ' '; + + row += anchorHtml + '/edit#gid='+ ((!cardArr[4]) ? '823013097' : '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; + + } + + $('legend').click(function() { + $(this).siblings('table').fadeToggle(900); + }); - } - - 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'); - cuatro = extend(cuatro, 'AC', 'Aliance Cargo, Inc'); - cinco = extend(cinco, 'AF', 'Ambu Freight, Inc'); - seis = extend(seis, 'EE', 'Echo Express, Inc'); - siete = extend(siete, 'SL', 'Select Express, Inc'); - ocho = extend(ocho, 'ST', 'Sound Transportation, 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); - - $('#cuatro').html(cuatro); - $('#cinco').html(cinco); - $('#seis').html(seis); - $('#siete').html(siete); - - $('#ocho').html(ocho); - - $('#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[0].split('-')[0]), - active = now >= date, - user1 = 'Helen', - user2 = 'Madison'; - - const dropCardAnchor = (cardArr, mon, shouldUseActive) => { - - if (cardArr[0]) { - - let anchorHtml = ''; - row += (((shouldUseActive) ? active : true) && cardArr[1]) ? mon + '' : '' + mon; - row += '   '; - - row += anchorHtml + '/edit#gid='+ ((!cardArr[4]) ? '763947205' : '1995296890') +'">'; - row += (((shouldUseActive) ? active : true) && cardArr[2]) ? user1 + '' : '' + user1; - - row += ' '; - - row += anchorHtml + '/edit#gid='+ ((!cardArr[4]) ? '823013097' : '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; - - } - - $('legend').click(function() { - $(this).siblings('table').fadeToggle(900); + }, }); }); diff --git a/app-new/weeks.js b/app-new/weeks.js index 7af7088..e5ec014 100644 --- a/app-new/weeks.js +++ b/app-new/weeks.js @@ -1,51 +1,51 @@ -const weeklySpreadsheets = [ +// const weeklySpreadsheets = [ - // new WeeklySpreadsheet(start, key), +// // new WeeklySpreadsheet(start, key), - new WeeklySpreadsheet('04/26/2020', '1D0rmX4fCgGz7K471qgjphDX_KCqUTn4ozfE1cZKpyxk'), +// new WeeklySpreadsheet('04/26/2020', '1D0rmX4fCgGz7K471qgjphDX_KCqUTn4ozfE1cZKpyxk'), - new WeeklySpreadsheet('04/19/2020', '1KGwIL_AmtMSbhypa9sD8F5UZ5LvIwSoLI8uhwjbE9tM'), - new WeeklySpreadsheet('04/12/2020', '1rDXNHz4CiC4JFffAgB5yAWOS9JQR7Pya7XBerPXffc4'), - new WeeklySpreadsheet('04/05/2020', '1jPUe5h_LWtG2GcKwNF-byVas60F1LZDjl5T57XItGLU'), - new WeeklySpreadsheet('03/29/2020', '1-fhWI6_XVWw9UTegBOrmLc-g9IqZ7Wibw8_S4Ui6c_k'), - new WeeklySpreadsheet('03/22/2020', '1mJppfM7vMfTjuEJzYYVtfz4khNsLk46bbMMneoLkzLs'), - new WeeklySpreadsheet('03/15/2020', '1dutDkQYTAmbRD8PdG1CFBOV1Pg6wOKRazORaFkRUdqk'), - new WeeklySpreadsheet('03/08/2020', '1aRuZ-063xSythocV7qXDIKIJ7lYPUmzZzKEOCLGSVGY'), - new WeeklySpreadsheet('03/01/2020', '1tnG1AEd5yUnaLJvzmWRUX4wJzymPyEv-PbGMK5-Yn2k'), - new WeeklySpreadsheet('02/23/2020', '1uik2F8RSpEkaU9m2x1RNr_ky3vYvc2Ppcb8KXURQNzQ'), - new WeeklySpreadsheet('02/16/2020', '1XJDT_xLPiARa2WGsV5lc7HCyGhXs-M5a7hDNVY_tmkU'), - new WeeklySpreadsheet('02/09/2020', '1l_UMhQPBhTc3EwaXQBRmeTKgqR3oOTJEyW2B6q2n0NU'), - new WeeklySpreadsheet('02/02/2020', '1mRr8JgKw7T0fr_BqY0rb-MmAQu9n-MEQ9bW3nbGU9Y4'), - new WeeklySpreadsheet('01/26/2020', '1RSo9s7ohQZrOd4ImZ1knIRA6TkDsDdeNm06697iQPYY'), - new WeeklySpreadsheet('01/19/2020', '1oLhMfYvA9BZHhPw94Kh85V8lZbTWhP_iJRrXAGgvqPM'), - new WeeklySpreadsheet('01/12/2020', '1MQUlvgGvTG5vR5dkLYECuWDzTfvhRub4YcazAdBk50c'), - new WeeklySpreadsheet('01/05/2020', '1WR48NAf6lwO_IhjHULjn5sKDDm4H2gC0xZJjbHLwjx0'), - new WeeklySpreadsheet('12/29/2019', '1xPd0RXX2E5BtMU8XyQ7WlAxn97vtTwkF_57UUaSsP6M'), - new WeeklySpreadsheet('12/22/2019', '1uKisp1_FuR3JzKQI-JwICY4JtTUczNl8bebNkOxcY3I'), - new WeeklySpreadsheet('12/15/2019', '1vcITiyeYkAe6THv8gxjjw9pxrCypmhYwCEcjGNAoOmI'), - new WeeklySpreadsheet('12/08/2019', '1ohjvTnXOXZu0jWRND4KnU_n5dwSaA4Qqm5utS2Jsr_8'), - new WeeklySpreadsheet('12/01/2019', '1_x0nvXoHQn2oVW1b0qZnxqy1sRi-B44j22tYT_sspF8'), - new WeeklySpreadsheet('11/24/2019', '103FmYYOk8pirtRsTbRuTW8y_-zeIoJEHrww5czUJkH0'), - new WeeklySpreadsheet('11/17/2019', '14vNTpl2wKfINiCLbW3Q75-IoM81aKCMU0r7uyruckdQ'), - new WeeklySpreadsheet('11/10/2019', '1KfI6PZ8-JF2XOw9SVGOb4mWzIBmFiLQZ1--qeccV4Nc'), - new WeeklySpreadsheet('11/03/2019', '1gxIkBdpSBJCSGcFzhGPPpeGWV25cR_MX3UqXw98vr0U'), - new WeeklySpreadsheet('10/27/2019', '1jkCxR8i9ai5ybw5ZRbct0MN_w93uRjYbaFdHahpH9x0'), - new WeeklySpreadsheet('10/20/2019', '1o3YfN_KKn-l0AO_2ATVY9XMJ_p4uWI7CH_wdH4CLGbs'), - new WeeklySpreadsheet('10/13/2019', '1koTXjHuFbVvEMJZxz5cgsHcVI5dk-cIO_T9rcNO6Ezc'), - new WeeklySpreadsheet('10/06/2019', '1GKC_O72a7Unw4U80skOnIhq0ERz47nUCnH7PdWsyy7s'), - new WeeklySpreadsheet('09/30/2019', '1CwJC2mCwxHrzU2hhlxihKTZGID1zD6UEIR_j0hy2AoQ'), - new WeeklySpreadsheet('09/22/2019', '1Et0CEPotxdXH-q8Peo2_W5hTMqBKJCK_w7CI_jBIWZk'), - new WeeklySpreadsheet('09/15/2019', '1APueCZtbyqDuQ9PQyNaJmRSjMhL-IEZjZ4Vf6T4Tpzc'), - new WeeklySpreadsheet('09/08/2019', '1TIW-MK0WbnOo9Q96GuDx8mx8bk4uE04lIcb2CHkFNGg'), - new WeeklySpreadsheet('09/01/2019', '1wyuVRgEs4l99TL68z7DFtDn3I8iSLj9ysexsMJfupo4'), - new WeeklySpreadsheet('08/25/2019', '1fswDS1KHG2tsNJAmfFOE8de2roud4Voc5hTKOsrzNzw'), - new WeeklySpreadsheet('08/18/2019', '10pE4i21Vlc8BMWp5-VH-txto-TRyu3XseSftX2TPPNo'), - new WeeklySpreadsheet('08/11/2019', '1BilCh60T3GrkAm4VxK0uGGq9fzuprVTIKPnf18_k_ws'), - new WeeklySpreadsheet('08/04/2019', '1JjKOJLGLIGJuq8a51pUu_4EMPkeSAVEYFpL8_rhhOdk'), - new WeeklySpreadsheet('07/28/2019', '1XpaNJI3VsTRWB6NLFcfTUHAXa6M0yDihjWKElVmCick'), - new WeeklySpreadsheet('07/21/2019', '1GF3bHikV1W21xKVSCi9yrfNDlZOSw90ibmN5UuD-r_c'), - new WeeklySpreadsheet('07/14/2019', '1OSvqOCv-f0JeIQZsagAaHgQZtuO1DRp3lgkGowc7tWU'), - new WeeklySpreadsheet('07/07/2019', '1tLQhHkQ7ZsID96BKf2AGma_FVVLW9bJoEFdeIe7KaBE'), - new WeeklySpreadsheet('06/30/2019', '1E87lbH7CaQn9V_S0YLBB1MJrHJTcB2o_taDd_gWhkBs') +// new WeeklySpreadsheet('04/19/2020', '1KGwIL_AmtMSbhypa9sD8F5UZ5LvIwSoLI8uhwjbE9tM'), +// new WeeklySpreadsheet('04/12/2020', '1rDXNHz4CiC4JFffAgB5yAWOS9JQR7Pya7XBerPXffc4'), +// new WeeklySpreadsheet('04/05/2020', '1jPUe5h_LWtG2GcKwNF-byVas60F1LZDjl5T57XItGLU'), +// new WeeklySpreadsheet('03/29/2020', '1-fhWI6_XVWw9UTegBOrmLc-g9IqZ7Wibw8_S4Ui6c_k'), +// new WeeklySpreadsheet('03/22/2020', '1mJppfM7vMfTjuEJzYYVtfz4khNsLk46bbMMneoLkzLs'), +// new WeeklySpreadsheet('03/15/2020', '1dutDkQYTAmbRD8PdG1CFBOV1Pg6wOKRazORaFkRUdqk'), +// new WeeklySpreadsheet('03/08/2020', '1aRuZ-063xSythocV7qXDIKIJ7lYPUmzZzKEOCLGSVGY'), +// new WeeklySpreadsheet('03/01/2020', '1tnG1AEd5yUnaLJvzmWRUX4wJzymPyEv-PbGMK5-Yn2k'), +// new WeeklySpreadsheet('02/23/2020', '1uik2F8RSpEkaU9m2x1RNr_ky3vYvc2Ppcb8KXURQNzQ'), +// new WeeklySpreadsheet('02/16/2020', '1XJDT_xLPiARa2WGsV5lc7HCyGhXs-M5a7hDNVY_tmkU'), +// new WeeklySpreadsheet('02/09/2020', '1l_UMhQPBhTc3EwaXQBRmeTKgqR3oOTJEyW2B6q2n0NU'), +// new WeeklySpreadsheet('02/02/2020', '1mRr8JgKw7T0fr_BqY0rb-MmAQu9n-MEQ9bW3nbGU9Y4'), +// new WeeklySpreadsheet('01/26/2020', '1RSo9s7ohQZrOd4ImZ1knIRA6TkDsDdeNm06697iQPYY'), +// new WeeklySpreadsheet('01/19/2020', '1oLhMfYvA9BZHhPw94Kh85V8lZbTWhP_iJRrXAGgvqPM'), +// new WeeklySpreadsheet('01/12/2020', '1MQUlvgGvTG5vR5dkLYECuWDzTfvhRub4YcazAdBk50c'), +// new WeeklySpreadsheet('01/05/2020', '1WR48NAf6lwO_IhjHULjn5sKDDm4H2gC0xZJjbHLwjx0'), +// new WeeklySpreadsheet('12/29/2019', '1xPd0RXX2E5BtMU8XyQ7WlAxn97vtTwkF_57UUaSsP6M'), +// new WeeklySpreadsheet('12/22/2019', '1uKisp1_FuR3JzKQI-JwICY4JtTUczNl8bebNkOxcY3I'), +// new WeeklySpreadsheet('12/15/2019', '1vcITiyeYkAe6THv8gxjjw9pxrCypmhYwCEcjGNAoOmI'), +// new WeeklySpreadsheet('12/08/2019', '1ohjvTnXOXZu0jWRND4KnU_n5dwSaA4Qqm5utS2Jsr_8'), +// new WeeklySpreadsheet('12/01/2019', '1_x0nvXoHQn2oVW1b0qZnxqy1sRi-B44j22tYT_sspF8'), +// new WeeklySpreadsheet('11/24/2019', '103FmYYOk8pirtRsTbRuTW8y_-zeIoJEHrww5czUJkH0'), +// new WeeklySpreadsheet('11/17/2019', '14vNTpl2wKfINiCLbW3Q75-IoM81aKCMU0r7uyruckdQ'), +// new WeeklySpreadsheet('11/10/2019', '1KfI6PZ8-JF2XOw9SVGOb4mWzIBmFiLQZ1--qeccV4Nc'), +// new WeeklySpreadsheet('11/03/2019', '1gxIkBdpSBJCSGcFzhGPPpeGWV25cR_MX3UqXw98vr0U'), +// new WeeklySpreadsheet('10/27/2019', '1jkCxR8i9ai5ybw5ZRbct0MN_w93uRjYbaFdHahpH9x0'), +// new WeeklySpreadsheet('10/20/2019', '1o3YfN_KKn-l0AO_2ATVY9XMJ_p4uWI7CH_wdH4CLGbs'), +// new WeeklySpreadsheet('10/13/2019', '1koTXjHuFbVvEMJZxz5cgsHcVI5dk-cIO_T9rcNO6Ezc'), +// new WeeklySpreadsheet('10/06/2019', '1GKC_O72a7Unw4U80skOnIhq0ERz47nUCnH7PdWsyy7s'), +// new WeeklySpreadsheet('09/30/2019', '1CwJC2mCwxHrzU2hhlxihKTZGID1zD6UEIR_j0hy2AoQ'), +// new WeeklySpreadsheet('09/22/2019', '1Et0CEPotxdXH-q8Peo2_W5hTMqBKJCK_w7CI_jBIWZk'), +// new WeeklySpreadsheet('09/15/2019', '1APueCZtbyqDuQ9PQyNaJmRSjMhL-IEZjZ4Vf6T4Tpzc'), +// new WeeklySpreadsheet('09/08/2019', '1TIW-MK0WbnOo9Q96GuDx8mx8bk4uE04lIcb2CHkFNGg'), +// new WeeklySpreadsheet('09/01/2019', '1wyuVRgEs4l99TL68z7DFtDn3I8iSLj9ysexsMJfupo4'), +// new WeeklySpreadsheet('08/25/2019', '1fswDS1KHG2tsNJAmfFOE8de2roud4Voc5hTKOsrzNzw'), +// new WeeklySpreadsheet('08/18/2019', '10pE4i21Vlc8BMWp5-VH-txto-TRyu3XseSftX2TPPNo'), +// new WeeklySpreadsheet('08/11/2019', '1BilCh60T3GrkAm4VxK0uGGq9fzuprVTIKPnf18_k_ws'), +// new WeeklySpreadsheet('08/04/2019', '1JjKOJLGLIGJuq8a51pUu_4EMPkeSAVEYFpL8_rhhOdk'), +// new WeeklySpreadsheet('07/28/2019', '1XpaNJI3VsTRWB6NLFcfTUHAXa6M0yDihjWKElVmCick'), +// new WeeklySpreadsheet('07/21/2019', '1GF3bHikV1W21xKVSCi9yrfNDlZOSw90ibmN5UuD-r_c'), +// new WeeklySpreadsheet('07/14/2019', '1OSvqOCv-f0JeIQZsagAaHgQZtuO1DRp3lgkGowc7tWU'), +// new WeeklySpreadsheet('07/07/2019', '1tLQhHkQ7ZsID96BKf2AGma_FVVLW9bJoEFdeIe7KaBE'), +// new WeeklySpreadsheet('06/30/2019', '1E87lbH7CaQn9V_S0YLBB1MJrHJTcB2o_taDd_gWhkBs') -]; +// ]; diff --git a/rpm/board-cd.html b/rpm/board-cd.html index 62c5870..8644b6a 100644 --- a/rpm/board-cd.html +++ b/rpm/board-cd.html @@ -21,7 +21,6 @@ -