fix: updating logic to use NLDAT formats
This commit is contained in:
parent
149e318a87
commit
95289aa952
8
sas/package-lock.json
generated
8
sas/package-lock.json
generated
@ -7,7 +7,7 @@
|
||||
"name": "dc-sas",
|
||||
"dependencies": {
|
||||
"@sasjs/cli": "^4.11.1",
|
||||
"@sasjs/core": "^4.54.0"
|
||||
"@sasjs/core": "^4.55.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@coolaj86/urequest": {
|
||||
@ -116,9 +116,9 @@
|
||||
"integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
|
||||
},
|
||||
"node_modules/@sasjs/core": {
|
||||
"version": "4.54.0",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.54.0.tgz",
|
||||
"integrity": "sha512-nuPXEsuxZnHiaSmkLf92v5B0tVybbPaU70EM0nU15BXUYO+PNZSZe9ofp5/+L2qi03UB0+WJHuPU6Xx+CwWr9A==",
|
||||
"version": "4.55.0",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.55.0.tgz",
|
||||
"integrity": "sha512-M+OTbNzQZIpGiQUUAR3RLYAomM32TAjzj9B/OiEqHbz18IsBz2Vufv669SCrWWft2E/MnHlXGVfqQGJOGQYI6w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@sasjs/lint": {
|
||||
|
@ -29,6 +29,6 @@
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@sasjs/cli": "^4.11.1",
|
||||
"@sasjs/core": "^4.54.0"
|
||||
"@sasjs/core": "^4.55.0"
|
||||
}
|
||||
}
|
||||
|
@ -249,26 +249,18 @@ data vars(keep=name type length varnum format);
|
||||
end;
|
||||
else do;
|
||||
if format2='' then format=cats(length,'.');
|
||||
else if format2=:'DATETIME' or format2=:'E8601DT' then do;
|
||||
else if format2=:'DATETIME' or format2=:'E8601DT' or format=:'NLDATM'
|
||||
then do;
|
||||
format='DATETIME19.';
|
||||
end;
|
||||
else if format2=:'DATE' or format2=:'DDMMYY'
|
||||
or format2=:'MMDDYY' or format2=:'YYMMDD'
|
||||
or format2=:'E8601DA' or format2=:'B8601DA'
|
||||
or format=:'NLDATE'
|
||||
then do;
|
||||
format='DATE9.';
|
||||
end;
|
||||
else if format2='BEST' & formatl=0 then format=cats('BEST',length,'.');
|
||||
/*
|
||||
else if format2=:'DATETIME' or format2=:'DATE' or format2=:'DDMMYY'
|
||||
or format2=:'MMDDYY' or format2=:'YYMMDD' then do;
|
||||
*date or datetime format so use original ;
|
||||
dsid=open("&libref..&ds");
|
||||
vnum=varnum(dsid,name);
|
||||
format=varfmt(dsid,vnum);
|
||||
dsid=close(dsid);
|
||||
end;
|
||||
*/
|
||||
else do;
|
||||
if formatl=0 then formatl=length;
|
||||
format=cats(format2,formatl,'.',formatd);
|
||||
|
@ -340,7 +340,8 @@ select upcase(loadtype)
|
||||
if ctrlOptions ne '' then
|
||||
colType=cats(coltype,',"type":"dropdown","source":',ctrlOptions,"}");
|
||||
else if type='num' then do;
|
||||
if format=:'DATETIME' or format=:'E8601DT' or format=:'NLDAT' then do;
|
||||
if format=:'DATETIME' or format=:'E8601DT' or format=:'NLDATM'
|
||||
then do;
|
||||
colType=cats(coltype
|
||||
,',"type":"date","dateFormat":"YYYY-MM-DD HH:mm:ss"'
|
||||
,',"correctFormat":"true"}');
|
||||
@ -349,7 +350,7 @@ select upcase(loadtype)
|
||||
end;
|
||||
else if format=:'DATE' or format=:'DDMMYY' or format=:'MMDDYY'
|
||||
or format=:'YYMMDD' or format=:'E8601DA' or format=:'B8601DA'
|
||||
or format=:'MONYY'
|
||||
or format=:'MONYY' or format=:'NLDATE'
|
||||
then do;
|
||||
/* see bottom of file for more date formats!! */
|
||||
/* also when updating, update stagedata.sas and mp_getcols.sas
|
||||
|
Loading…
x
Reference in New Issue
Block a user