Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.

Commit cefb8fe

Browse files
committed
fix: Correction du chevauchement Julien/Grégorien
Pas de correspondances juliennes pour la période du 5 au 14/10/1582
1 parent 618b5c8 commit cefb8fe

File tree

8 files changed

+22
-2
lines changed

8 files changed

+22
-2
lines changed

dist/acte-0.0.17-dist.zip

49 Bytes
Binary file not shown.

dist/acte.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/acte.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/private/functions/formatageDeJour.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const formatageDeJour = (format, erreur, rappel, df, dt, dd, dobj, pro) => {
2424
const tvg = dt;
2525
let resultat;
2626

27+
// Correspondances uniquement entre les années -8000 et 8000
2728
if (Math.abs(tvg[dd]) < 8000) {
2829
resultat = frmt.replace(/%[ADJMNSabcflmoprvz123]+/g,
2930

@@ -38,6 +39,11 @@ const formatageDeJour = (format, erreur, rappel, df, dt, dd, dobj, pro) => {
3839
if (typeof rappel === 'function') {
3940
resultat = rappel(resultat, dobj(tvg, pro));
4041
}
42+
43+
// Pas de correspondances juliennes du 4 au 15/10/1582
44+
if (pro === 'julien' && tvg.jj > 2299149.5 && tvg.jj < 2299160.5) {
45+
resultat = err;
46+
}
4147
} else {
4248
resultat = err;
4349
}

test/jasmine/acteSpec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,8 @@ describe('new acte.Jour().julien()', function () {
481481
expect(new acte.Jour('1/1/16000').julien('%A')).toEqual('Pas de correspondances.');
482482
expect(new acte.Jour('1/1/-16000').julien('%A')).toEqual('Pas de correspondances.');
483483
expect(new acte.Jour('1/1/16000', false).julien('%A')).toEqual('Pas de correspondances.');
484+
expect(new acte.Jour('5/10/1582').julien('%A')).toEqual('Pas de correspondances.');
485+
expect(new acte.Jour('14/10/1582').julien('%A')).toEqual('Pas de correspondances.');
484486
});
485487
it('new acte.Jour().julien(0, \'erreur\') = Message d\'erreur.', function () {
486488
expect(new acte.Jour('').julien('', 'Message d\'erreur.')).toEqual('Message d\'erreur.');

test/jasmine/lib/acte.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,6 +1911,7 @@ if (!Array.prototype.reduce) {
19111911
var tvg = dt;
19121912
var resultat = void 0;
19131913

1914+
// Correspondances uniquement entre les années -8000 et 8000
19141915
if (Math.abs(tvg[dd]) < 8000) {
19151916
resultat = frmt.replace(/%[ADJMNSabcflmoprvz123]+/g,
19161917

@@ -1924,6 +1925,11 @@ if (!Array.prototype.reduce) {
19241925
if (typeof rappel === 'function') {
19251926
resultat = rappel(resultat, dobj(tvg, pro));
19261927
}
1928+
1929+
// Pas de correspondances juliennes du 4 au 15/10/1582
1930+
if (pro === 'julien' && tvg.jj > 2299149.5 && tvg.jj < 2299160.5) {
1931+
resultat = err;
1932+
}
19271933
} else {
19281934
resultat = err;
19291935
}

test/jasmine/lib/acteSpec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ describe('new acte.Jour().julien()', function () {
480480
expect(new acte.Jour('1/1/16000').julien('%A')).toEqual('Pas de correspondances.');
481481
expect(new acte.Jour('1/1/-16000').julien('%A')).toEqual('Pas de correspondances.');
482482
expect(new acte.Jour('1/1/16000', false).julien('%A')).toEqual('Pas de correspondances.');
483+
expect(new acte.Jour('5/10/1582').julien('%A')).toEqual('Pas de correspondances.');
484+
expect(new acte.Jour('14/10/1582').julien('%A')).toEqual('Pas de correspondances.');
483485
});
484486
it('new acte.Jour().julien(0, \'erreur\') = Message d\'erreur.', function () {
485487
expect(new acte.Jour('').julien('', 'Message d\'erreur.')).toEqual('Message d\'erreur.');

test/spec-JourJulien.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ describe('new acte.Jour().julien()', () => {
177177
.toEqual('Pas de correspondances.');
178178
expect(new acte.Jour('1/1/16000', false).julien('%A'))
179179
.toEqual('Pas de correspondances.');
180+
expect(new acte.Jour('5/10/1582').julien('%A'))
181+
.toEqual('Pas de correspondances.');
182+
expect(new acte.Jour('14/10/1582').julien('%A'))
183+
.toEqual('Pas de correspondances.');
180184
});
181185
it(
182186
'new acte.Jour().julien(0, \'erreur\') = Message d\'erreur.',

0 commit comments

Comments
 (0)