react-weekly-planning 1.0.7 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/utils.js +3 -2
- package/lib/utils.ts +6 -5
- package/package.json +1 -1
package/lib/utils.js
CHANGED
|
@@ -357,7 +357,7 @@ function getWeekNumber(date) {
|
|
|
357
357
|
// Thursday in current week decides the year
|
|
358
358
|
tempDate.setDate(tempDate.getDate() + 4 - (tempDate.getDay() || 7));
|
|
359
359
|
const yearStart = new Date(tempDate.getFullYear(), 0, 1);
|
|
360
|
-
const weekNumber = Math.ceil(((
|
|
360
|
+
const weekNumber = Math.ceil(((tempDate.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
|
|
361
361
|
return weekNumber;
|
|
362
362
|
}
|
|
363
363
|
/**
|
|
@@ -398,7 +398,8 @@ function calculerEcartSemaine(dateSelectionnee) {
|
|
|
398
398
|
* @returns The number of weeks since the origin date.
|
|
399
399
|
*/
|
|
400
400
|
function semainesDepuisOrigine(annee, numeroSemaine) {
|
|
401
|
-
const
|
|
401
|
+
const dateActuelle = new Date();
|
|
402
|
+
const dateOrigine = new Date(dateActuelle.getFullYear() - 2, 0, 1);
|
|
402
403
|
const anneeOrigine = dateOrigine.getFullYear();
|
|
403
404
|
const numeroSemaineOrigine = getWeekNumber(dateOrigine);
|
|
404
405
|
let nombreSemaines = 0;
|
package/lib/utils.ts
CHANGED
|
@@ -456,7 +456,7 @@ function getWeekNumber(date: Date): number {
|
|
|
456
456
|
tempDate.setDate(tempDate.getDate() + 4 - (tempDate.getDay() || 7));
|
|
457
457
|
const yearStart = new Date(tempDate.getFullYear(), 0, 1);
|
|
458
458
|
const weekNumber = Math.ceil(
|
|
459
|
-
((
|
|
459
|
+
((tempDate.getTime() - yearStart.getTime()) / 86400000 + 1) / 7
|
|
460
460
|
);
|
|
461
461
|
return weekNumber;
|
|
462
462
|
}
|
|
@@ -483,7 +483,8 @@ function calculerEcartSemaine(dateSelectionnee: Date): number {
|
|
|
483
483
|
if (!dateSelectionnee) {
|
|
484
484
|
return 0;
|
|
485
485
|
}
|
|
486
|
-
const selectedDateUpdated =
|
|
486
|
+
const selectedDateUpdated =
|
|
487
|
+
updateSelectedDateForEcartSemaine(dateSelectionnee);
|
|
487
488
|
|
|
488
489
|
const dateActuelle = new Date();
|
|
489
490
|
const anneeActuelle = dateActuelle.getFullYear();
|
|
@@ -492,7 +493,7 @@ function calculerEcartSemaine(dateSelectionnee: Date): number {
|
|
|
492
493
|
const anneeSelectionnee = selectedDateUpdated.getFullYear();
|
|
493
494
|
const numeroSemaineSelectionnee = getWeekNumber(selectedDateUpdated);
|
|
494
495
|
|
|
495
|
-
const ecartSemaine =
|
|
496
|
+
const ecartSemaine =
|
|
496
497
|
semainesDepuisOrigine(anneeSelectionnee, numeroSemaineSelectionnee) -
|
|
497
498
|
semainesDepuisOrigine(anneeActuelle, numeroSemaineActuelle);
|
|
498
499
|
|
|
@@ -506,7 +507,8 @@ function calculerEcartSemaine(dateSelectionnee: Date): number {
|
|
|
506
507
|
* @returns The number of weeks since the origin date.
|
|
507
508
|
*/
|
|
508
509
|
function semainesDepuisOrigine(annee: number, numeroSemaine: number): number {
|
|
509
|
-
const
|
|
510
|
+
const dateActuelle = new Date();
|
|
511
|
+
const dateOrigine = new Date(dateActuelle.getFullYear() - 2, 0, 1);
|
|
510
512
|
const anneeOrigine = dateOrigine.getFullYear();
|
|
511
513
|
const numeroSemaineOrigine = getWeekNumber(dateOrigine);
|
|
512
514
|
|
|
@@ -519,7 +521,6 @@ function semainesDepuisOrigine(annee: number, numeroSemaine: number): number {
|
|
|
519
521
|
return nombreSemaines;
|
|
520
522
|
}
|
|
521
523
|
|
|
522
|
-
|
|
523
524
|
function getSessionStorageRecordForDragAndDrop(
|
|
524
525
|
tasks: TasksType,
|
|
525
526
|
positionDay: number,
|