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

This commit is contained in:
Paul Trowbridge 2019-03-18 23:19:39 -05:00
commit c2cf766860
2 changed files with 3 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <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://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://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> <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>

View File

@ -50,8 +50,7 @@ GROUP BY
part_descr part_descr
,bill_cust_descr ,bill_cust_descr
,ship_cust_descr ,ship_cust_descr
,SUM(units) units ,SUM(value_usd)/(SELECT SUM(value_usd) FROM baseline) mix
,SUM(value_usd) value_usd
FROM FROM
base base
GROUP BY GROUP BY
@ -59,7 +58,7 @@ GROUP BY
,bill_cust_descr ,bill_cust_descr
,ship_cust_descr ,ship_cust_descr
ORDER BY ORDER BY
value_usd desc mix desc
) )
,months AS ( ,months AS (
SELECT SELECT