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

index.js

@@ -33,6 +33,7 @@ Postgres.FirstRow = function (inSQL, args, inResponse) {
 
 server.get('/', (req, res) => res.send('node.js express is up and running'))
 
+server.get('/login', (req, res) => res.sendFile('//mnt/c/Users/PTrowbridge/Documents/forecast_api/msauth.html'))
 
 server.get('/logs', (req, res) => res.sendFile('//home/pt/forecast_api/logs.html'))
 

route_sql/scenario_package.sql

@@ -23,10 +23,10 @@ mseq AS (
 --select * from mseq
 ,base AS (
 SELECT
-    order_season
-    ,order_month
-    ,version
-    ,iter
+    --order_season
+    --,order_month
+    --,version
+    --,iter
     ,part_descr
     ,bill_cust_descr
     ,ship_cust_descr
@@ -37,10 +37,10 @@ FROM
 WHERE
     where_clause
 GROUP BY
-    order_season
-    ,order_month
-    ,version
-    ,iter
+    --order_season
+    --,order_month
+    --,version
+    --,iter
     ,part_descr
     ,bill_cust_descr
     ,ship_cust_descr