Update Calendar.dax

aduguid · web-flow · commit 2e501d3a4bf2 · 2024-01-23T11:16:17.000+11:00
diff --git a/Miscellaneous/Scripts/DAX/Calendar.dax b/Miscellaneous/Scripts/DAX/Calendar.dax
@@ -33,7 +33,7 @@ VAR _result =
         , "Month",                      MONTH([Date])
         , "Week Ending",                [Date] + 7 - WEEKDAY([Date], 1) // Saturday
         , "Week Starting",              [Date] - WEEKDAY([Date], 1) + 1 // Sunday
-        , "Week of Month",              ROUNDUP(DIVIDE(DAY([Date]), 7), 0)
+        , "Week of Month",              1 + WEEKNUM([Date]) - WEEKNUM( EOMONTH([Date], -1 ) + 1 )
         , "Week of Year",               WEEKNUM([Date])
     )
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ VAR _result =`
`33`	`33`	`, "Month", MONTH([Date])`
`34`	`34`	`, "Week Ending", [Date] + 7 - WEEKDAY([Date], 1) // Saturday`
`35`	`35`	`, "Week Starting", [Date] - WEEKDAY([Date], 1) + 1 // Sunday`
`36`		`- , "Week of Month", ROUNDUP(DIVIDE(DAY([Date]), 7), 0)`
	`36`	`+ , "Week of Month", 1 + WEEKNUM([Date]) - WEEKNUM( EOMONTH([Date], -1 ) + 1 )`
`37`	`37`	`, "Week of Year", WEEKNUM([Date])`
`38`	`38`	`)`
`39`	`39`