8 Commits

Author SHA1 Message Date
b7f564cb21 chore(release): 6.14.3 [skip ci]
## [6.14.3](https://git.datacontroller.io/dc/dc/compare/v6.14.2...v6.14.3) (2025-03-15)

### Bug Fixes

* NLDAT & NLDATM formats are now being staged ([3f5cb1e](3f5cb1e2de))
2025-03-15 23:06:45 +00:00
3f5cb1e2de fix: NLDAT & NLDATM formats are now being staged
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 3m54s
Release / Build-and-test-development (push) Successful in 8m17s
Release / release (push) Successful in 8m34s
2025-03-15 22:50:42 +00:00
7d8c0472f0 chore(release): 6.14.2 [skip ci]
## [6.14.2](https://git.datacontroller.io/dc/dc/compare/v6.14.1...v6.14.2) (2025-03-10)

### Bug Fixes

* improving instructions for setup ([83b3d77](83b3d775b6))
2025-03-10 16:13:24 +00:00
b8b516ba77 Merge pull request 'fix: improving instructions for setup' (#146) from intro into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 5m4s
Release / Build-and-test-development (push) Successful in 9m56s
Release / release (push) Successful in 10m43s
Reviewed-on: #146
2025-03-10 15:53:45 +00:00
83b3d775b6 fix: improving instructions for setup
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 5m14s
Build / Build-and-test-development (pull_request) Successful in 9m48s
2025-03-07 14:44:12 +00:00
aea252ccc6 chore(release): 6.14.1 [skip ci]
## [6.14.1](https://git.datacontroller.io/dc/dc/compare/v6.14.0...v6.14.1) (2025-03-05)

### Bug Fixes

* handle national language datetime formats ([149e318](149e318a87))
* updating logic to use NLDAT formats ([95289aa](95289aa952))
2025-03-05 15:28:45 +00:00
d8908f9c7f Merge pull request 'fix: handle national language datetime formats' (#144) from fix-nldatm into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m48s
Release / Build-and-test-development (push) Successful in 9m38s
Release / release (push) Successful in 10m26s
Reviewed-on: #144
2025-03-05 14:50:58 +00:00
95289aa952 fix: updating logic to use NLDAT formats
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 5m3s
Build / Build-and-test-development (pull_request) Successful in 9m47s
2025-03-05 14:49:56 +00:00
7 changed files with 39 additions and 22 deletions

View File

@ -1,3 +1,25 @@
## [6.14.3](https://git.datacontroller.io/dc/dc/compare/v6.14.2...v6.14.3) (2025-03-15)
### Bug Fixes
* NLDAT & NLDATM formats are now being staged ([3f5cb1e](https://git.datacontroller.io/dc/dc/commit/3f5cb1e2defe390220e904e4bf04a165cb31fec4))
## [6.14.2](https://git.datacontroller.io/dc/dc/compare/v6.14.1...v6.14.2) (2025-03-10)
### Bug Fixes
* improving instructions for setup ([83b3d77](https://git.datacontroller.io/dc/dc/commit/83b3d775b6e33653b087ca9f4eb3ad5b0dbbd479))
## [6.14.1](https://git.datacontroller.io/dc/dc/compare/v6.14.0...v6.14.1) (2025-03-05)
### Bug Fixes
* handle national language datetime formats ([149e318](https://git.datacontroller.io/dc/dc/commit/149e318a8787be0109f25aeec3a1270ea75a97b2))
* updating logic to use NLDAT formats ([95289aa](https://git.datacontroller.io/dc/dc/commit/95289aa9524d3cb2b1c248cfb84f6b0d0a490c32))
# [6.14.0](https://git.datacontroller.io/dc/dc/compare/v6.13.2...v6.14.0) (2025-02-26) # [6.14.0](https://git.datacontroller.io/dc/dc/compare/v6.13.2...v6.14.0) (2025-02-26)

View File

@ -10,11 +10,13 @@
</p> </p>
<p class="m-0 mt-10"> <p class="m-0 mt-10">
Please specify a physical directory below, to which user Please specify a physical directory (on the
<strong>{{ SYSUSERID }}</strong> can write, on behalf of Data Controller: <strong> {{ SYSHOSTNAME }}</strong>
compute server) below, to which user
<strong>{{ SYSUSERID }}</strong> can write, on behalf of Data Controller.
</p> </p>
<label class="mt-20 clr-control-label">DC Directory</label> <label class="mt-20 clr-control-label">DC Staging Directory</label>
<div class="mb-10 clr-control-container"> <div class="mb-10 clr-control-container">
<div class="clr-input-wrapper"> <div class="clr-input-wrapper">
<input <input

View File

@ -1,6 +1,6 @@
{ {
"name": "dcfrontend", "name": "dcfrontend",
"version": "6.14.0", "version": "6.14.3",
"description": "Data Controller", "description": "Data Controller",
"devDependencies": { "devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0", "@saithodev/semantic-release-gitea": "^2.1.0",

8
sas/package-lock.json generated
View File

@ -7,7 +7,7 @@
"name": "dc-sas", "name": "dc-sas",
"dependencies": { "dependencies": {
"@sasjs/cli": "^4.11.1", "@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.54.0" "@sasjs/core": "^4.55.0"
} }
}, },
"node_modules/@coolaj86/urequest": { "node_modules/@coolaj86/urequest": {
@ -116,9 +116,9 @@
"integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw==" "integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
}, },
"node_modules/@sasjs/core": { "node_modules/@sasjs/core": {
"version": "4.54.0", "version": "4.55.0",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.54.0.tgz", "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.55.0.tgz",
"integrity": "sha512-nuPXEsuxZnHiaSmkLf92v5B0tVybbPaU70EM0nU15BXUYO+PNZSZe9ofp5/+L2qi03UB0+WJHuPU6Xx+CwWr9A==", "integrity": "sha512-M+OTbNzQZIpGiQUUAR3RLYAomM32TAjzj9B/OiEqHbz18IsBz2Vufv669SCrWWft2E/MnHlXGVfqQGJOGQYI6w==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@sasjs/lint": { "node_modules/@sasjs/lint": {

View File

@ -29,6 +29,6 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@sasjs/cli": "^4.11.1", "@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.54.0" "@sasjs/core": "^4.55.0"
} }
} }

View File

@ -249,26 +249,18 @@ data vars(keep=name type length varnum format);
end; end;
else do; else do;
if format2='' then format=cats(length,'.'); if format2='' then format=cats(length,'.');
else if format2=:'DATETIME' or format2=:'E8601DT' then do; else if format2=:'DATETIME' or format2=:'E8601DT' or format2=:'NLDATM'
then do;
format='DATETIME19.'; format='DATETIME19.';
end; end;
else if format2=:'DATE' or format2=:'DDMMYY' else if format2=:'DATE' or format2=:'DDMMYY'
or format2=:'MMDDYY' or format2=:'YYMMDD' or format2=:'MMDDYY' or format2=:'YYMMDD'
or format2=:'E8601DA' or format2=:'B8601DA' or format2=:'E8601DA' or format2=:'B8601DA'
or format2=:'NLDATE'
then do; then do;
format='DATE9.'; format='DATE9.';
end; end;
else if format2='BEST' & formatl=0 then format=cats('BEST',length,'.'); 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; else do;
if formatl=0 then formatl=length; if formatl=0 then formatl=length;
format=cats(format2,formatl,'.',formatd); format=cats(format2,formatl,'.',formatd);

View File

@ -340,7 +340,8 @@ select upcase(loadtype)
if ctrlOptions ne '' then if ctrlOptions ne '' then
colType=cats(coltype,',"type":"dropdown","source":',ctrlOptions,"}"); colType=cats(coltype,',"type":"dropdown","source":',ctrlOptions,"}");
else if type='num' then do; 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 colType=cats(coltype
,',"type":"date","dateFormat":"YYYY-MM-DD HH:mm:ss"' ,',"type":"date","dateFormat":"YYYY-MM-DD HH:mm:ss"'
,',"correctFormat":"true"}'); ,',"correctFormat":"true"}');
@ -349,7 +350,7 @@ select upcase(loadtype)
end; end;
else if format=:'DATE' or format=:'DDMMYY' or format=:'MMDDYY' else if format=:'DATE' or format=:'DDMMYY' or format=:'MMDDYY'
or format=:'YYMMDD' or format=:'E8601DA' or format=:'B8601DA' or format=:'YYMMDD' or format=:'E8601DA' or format=:'B8601DA'
or format=:'MONYY' or format=:'MONYY' or format=:'NLDATE'
then do; then do;
/* see bottom of file for more date formats!! */ /* see bottom of file for more date formats!! */
/* also when updating, update stagedata.sas and mp_getcols.sas /* also when updating, update stagedata.sas and mp_getcols.sas