Updated week calculation. Signed commit. Fixes #85

timrettop · timrettop · commit 85459d6eaace · 2022-11-04T16:23:07.000-07:00
diff --git a/src/components/contracts/FilterPanel.vue b/src/components/contracts/FilterPanel.vue
@@ -181,11 +181,12 @@ export default {
 				break;
 			case 'week': {
 				const curr = start.getDay(),
-					diff = start.getDate() - curr + (curr === 0 ? -6 : 1);
+					diffB = start.getDate() - curr + (curr === 0 ? -6 : 1),
+					diffE = start.getDate() + 6 - (curr === 0 ? 7 : curr);
 
-				start.setDate(diff);
+				start.setDate(diffB);
 				start.setHours(0, 0, 0, 0);
-				end.setDate(start.getDate() + 7);
+				end.setDate(diffE);
 				end.setHours(23, 59, 59, 999);
 
 				break;
@@ -403,4 +404,4 @@ body.win32 {
 		}
 	}
 }
-</style>
+</style>

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,12 @@ export default {`
`181`	`181`	`break;`
`182`	`182`	`case 'week': {`
`183`	`183`	`const curr = start.getDay(),`
`184`		`- diff = start.getDate() - curr + (curr === 0 ? -6 : 1);`
	`184`	`+ diffB = start.getDate() - curr + (curr === 0 ? -6 : 1),`
	`185`	`+ diffE = start.getDate() + 6 - (curr === 0 ? 7 : curr);`
`185`	`186`
`186`		`- start.setDate(diff);`
	`187`	`+ start.setDate(diffB);`
`187`	`188`	`start.setHours(0, 0, 0, 0);`
`188`		`- end.setDate(start.getDate() + 7);`
	`189`	`+ end.setDate(diffE);`
`189`	`190`	`end.setHours(23, 59, 59, 999);`
`190`	`191`
`191`	`192`	`break;`
`@@ -403,4 +404,4 @@ body.win32 {`
`403`	`404`	`}`
`404`	`405`	`}`
`405`	`406`	`}`
`406`		`-</style>`
	`407`	`+</style>`