add a part list and log sql statements

This commit is contained in:
Trowbridge 2019-03-20 00:37:36 -04:00
parent b6464e51b9
commit 5245bfac74
3 changed files with 27 additions and 27 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ npm-debug.log
logs.html logs.html
stat.html stat.html
*.pem *.pem
node.log

View File

@ -162,7 +162,6 @@ server.post('/addmonth_v', bodyParser.json(), function (req, res) {
sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
//console.log(sql);
console.log(sql) console.log(sql)
Postgres.FirstRow(sql,[],res) Postgres.FirstRow(sql,[],res)
} }
@ -196,7 +195,7 @@ server.post('/addmonth_vp', bodyParser.json(), function (req, res) {
sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
//console.log(sql); console.log(sql);
Postgres.FirstRow(sql,[],res) Postgres.FirstRow(sql,[],res)
} }
@ -236,7 +235,7 @@ server.post('/scale_v', bodyParser.json(), function (req, res) {
sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
//console.log(sql); console.log(sql);
Postgres.FirstRow(sql,[],res) Postgres.FirstRow(sql,[],res)
} }
@ -276,7 +275,7 @@ server.post('/scale_p', bodyParser.json(), function (req, res) {
sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
//console.log(sql); console.log(sql);
Postgres.FirstRow(sql,[],res) Postgres.FirstRow(sql,[],res)
} }
@ -317,7 +316,7 @@ server.post('/scale_vp', bodyParser.json(), function (req, res) {
sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
//console.log(sql); console.log(sql);
Postgres.FirstRow(sql,[],res) Postgres.FirstRow(sql,[],res)
} }

View File

@ -1,23 +1,23 @@
WITH WITH
act As ( act As (
SELECT DISTINCT SELECT DISTINCT
v6part part v6part part
FROM FROM
lgdat.stka lgdat.stka
WHERE WHERE
v6stat = 'A' v6stat = 'A'
) )
,stkm AS ( ,stkm AS (
SELECT SELECT
act.part || ' - ' ||rtrim(COALESCE(m.avdes1,p.awdes1)) part act.part || ' - ' ||rtrim(COALESCE(m.avdes1,p.awdes1)) part
--,COALESCE(m.avgled, p.awgled) glec --,COALESCE(m.avgled, p.awgled) glec
FROM FROM
act act
LEFT OUTER JOIN lgdat.stkmm m ON LEFT OUTER JOIN lgdat.stkmm m ON
m.avpart = act.part m.avpart = act.part
LEFT OUTER JOIN lgdat.stkmp p ON LEFT OUTER JOIN lgdat.stkmp p ON
p.awpart = act.part p.awpart = act.part
WHERE WHERE
substr(COALESCE(m.avgled, p.awgled),1,1) <= '2' substr(COALESCE(m.avgled, p.awgled),1,1) <= '2'
) )
select part from stkm select part from stkm