Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(update): update cal lib and date adapter (DSP-1758) #309

Merged
merged 2 commits into from Jun 23, 2021
Merged

chore(update): update cal lib and date adapter (DSP-1758) #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6f53b2
chore(update): update cal lib and date adapter
Jun 22, 2021
880e7b6
test(viewer): adapt expectations for cal conv.
Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -47,8 +47,8 @@
"@ckeditor/ckeditor5-angular": "^1.2.3",
"@dasch-swiss/dsp-js": "^2.2.0",
"ckeditor5-custom-build": "github:dasch-swiss/ckeditor_custom_build",
"jdnconvertiblecalendar": "^0.0.6",
"jdnconvertiblecalendardateadapter": "^0.0.16",
"jdnconvertiblecalendar": "^0.0.7",
"jdnconvertiblecalendardateadapter": "^0.0.17",
"ngx-color-picker": "^11.0.0",
"openseadragon": "^2.4.2",
"rxjs": "~6.5.5",
Expand Down
4 changes: 2 additions & 2 deletions projects/dsp-ui/package.json
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@
"@angular/material": "^11.2.5",
"@angular/cdk": "^11.2.5",
"@dasch-swiss/dsp-js": "^2.2.0",
"jdnconvertiblecalendar": "^0.0.6",
"jdnconvertiblecalendardateadapter": "^0.0.16",
"jdnconvertiblecalendar": "^0.0.7",
"jdnconvertiblecalendardateadapter": "^0.0.17",
"ngx-color-picker": "^11.0.0",
"openseadragon": "^2.4.2",
"svg-overlay": "github:openseadragon/svg-overlay",
Expand Down
4 changes: 2 additions & 2 deletions projects/dsp-ui/src/lib/viewer/services/value.service.spec.ts
View file
Open in desktop
Expand Up @@ -262,8 +262,8 @@ describe('ValueService', () => {

const period = calDateJDN.toJDNPeriod();

expect(period.periodStart).toEqual(1721060);
expect(period.periodEnd).toEqual(1721060);
expect(period.periodStart).toEqual(1721058);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gautschr I had to adapt these expectations.

The Gregorian calendar date of January 1st 1 BCE used to be 1721060 in JDN, now it is 1721058.
Since the date is before 1582, it was calculated like a Julian calendar date, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

expect(period.periodEnd).toEqual(1721058);

});

Expand Down