Merge branch 'dev' of github.com:fleetside72/forecast_api into dev

2019-03-18 23:19:39 -05:00 · 2019-03-18 23:19:39 -05:00 · c2cf766860
commit c2cf766860
parent d01a2f9f74 b7b3b05e2c
2 changed files with 3 additions and 4 deletions
--- a/msauth.html
+++ b/msauth.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Quickstart for MSAL JS</title>
+    <title>Microsoft Authentication</title>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js"></script>
    <script src="https://secure.aadcdn.microsoftonline-p.com/lib/0.2.3/js/msal.js"></script>
    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
--- a/route_sql/scenario_package.sql
+++ b/route_sql/scenario_package.sql
@ -50,8 +50,7 @@ GROUP BY
        part_descr
        ,bill_cust_descr
        ,ship_cust_descr
-        ,SUM(units) units
-        ,SUM(value_usd) value_usd
+        ,SUM(value_usd)/(SELECT SUM(value_usd) FROM baseline) mix
    FROM
        base
    GROUP BY
@ -59,7 +58,7 @@ GROUP BY
        ,bill_cust_descr
        ,ship_cust_descr
    ORDER BY
-        value_usd desc
+        mix desc
 )
 ,months AS (
    SELECT