Error in DimDate Table - Start week on Monday and End on Sunday

[Anonymous]

Hi Experts

Please ref to Dimdate Table in Sample Data. I want to start my week on Monday and End on Sunday...All my calculation are correct upto WeekNo Column there after they need tweeking. 

Week Commencing 

Week_Number_Commencing

WeeksInMonth

The other should correct themselves

As per calander 1 Jan 2020 was on a Wed and 5 Jan 2020 was on sunday...  currently my Dimdate show sunday in week 2. should be week 1.

sample file

https://www.dropbox.com/s/0uyn8c6feqra1bs/Test_.pbix?dl=0 

[amitchandak · Accepted solution]

@Anonymous , refer these columns, if they can help

Week Start date = 'Date'[Date]+-1*WEEKDAY('Date'[Date],2)+1
Week End date = 'Date'[Date]+ 7-1*WEEKDAY('Date'[Date],2)

min week start of year = minx(filter('Date',year([Week Start date])=earlier(year(Week Start date]))),[Week Start date])

week No = quotient(datediff([min week start of year],[date],day),7)+1

Start Month = STARTOMONTH('Date'[Date])

Month Week = QUOTIENT(DATEDIFF(Minx(FILTER('Date',[Start Month]=EARLIER([Start Month])),'Date'[Start of Week]),[Date],DAY),7)+1