Skip to content

Commit cdd860e

Browse files
aduguidaduguid
committed
Updated DAX formatting
1 parent 3d9ceda commit cdd860e

File tree

3 files changed

+45
-41
lines changed

3 files changed

+45
-41
lines changed

‎Miscellaneous/Scripts/DAX/Calendar.dax‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
Calendar =
2-
VAR _today_date = TODAY() //'Properties'[Today Date]
3-
VAR _fiscal_year = YEAR(EDATE( _today_date, 6))
2+
VAR _today_date = 'Properties'[Today Date]
3+
VAR _fiscal_year = YEAR(EDATE( _today_date, 6))
44
VAR _fiscal_year_start = DATE ( _fiscal_year - 1, 07, 01)
5-
VAR _fiscal_year_end = DATE ( _fiscal_year, 06, 30)
5+
VAR _fiscal_year_end = DATE ( _fiscal_year, 06, 30)
66

77
VAR _result =
88
ADDCOLUMNS
99
(
1010
CALENDAR(_fiscal_year_start, _fiscal_year_end)
11+
, "Calendar Year Period End", FORMAT([Date], "yyyy12")
12+
, "Calendar Year Period Start", FORMAT([Date], "yyyy01")
13+
, "Calendar Year Period", FORMAT([Date], "yyyyMM")
14+
, "Calendar Year Quarter Nbr", QUARTER([Date])
15+
, "Calendar Year Quarter", FORMAT([Date], "\C\Yyyyy \Qq")
1116
, "Calendar Year", YEAR([Date])
12-
, "Calendar Quarter", FORMAT([Date], "\C\Yyyyy \Qq")
13-
, "Calendar Quarter Nbr", QUARTER([Date])
14-
, "Month", MONTH([Date])
15-
, "Month Name", FORMAT([Date], "MMMM")
16-
, "Month Name Short", FORMAT([Date], "MMM")
17-
, "Day", Day([Date])
18-
, "Day Name", FORMAT([Date], "DDDD")
1917
, "Day Name Short", FORMAT([Date], "DDD")
20-
, "Fiscal Year", YEAR(EDATE([Date], 6))
21-
, "Fiscal Year Period Start", FORMAT(EDATE([Date], 6), "yyyy01")
18+
, "Day Name", FORMAT([Date], "DDDD")
19+
, "Day", Day([Date])
2220
, "Fiscal Year Period End", FORMAT(EDATE([Date], 6), "yyyy12")
23-
, "Fiscal Year Quarter", FORMAT(EDATE([Date], 6), "\F\Yyyyy \Qq")
21+
, "Fiscal Year Period Start", FORMAT(EDATE([Date], 6), "yyyy01")
22+
, "Fiscal Year Period", FORMAT(EDATE([Date], 6), "yyyyMM")
2423
, "Fiscal Year Quarter Nbr", FORMAT(EDATE([Date], 6), "q")
25-
, "Period", FORMAT(EDATE([Date], 6), "yyyyMM")
26-
, "Month Start", DATE(YEAR([Date]), MONTH([Date]), 1)
24+
, "Fiscal Year Quarter", FORMAT(EDATE([Date], 6), "\F\Yyyyy \Qq")
25+
, "Fiscal Year", YEAR(EDATE([Date], 6))
26+
, "Is Current FY", IF(YEAR(EDATE([Date], 6)) = _fiscal_year, 1, 0)
27+
, "Is Future", IF([Date] > _today_date, 1, 0)
2728
, "Month End", EOMONTH([Date], 0)
28-
, "Week Starting", [Date] - WEEKDAY([Date], 2) // Sunday
29+
, "Month Name Short", FORMAT([Date], "MMM")
30+
, "Month Name", FORMAT([Date], "MMMM")
31+
, "Month Start", DATE(YEAR([Date]), MONTH([Date]), 1)
32+
, "Month", MONTH([Date])
2933
, "Week Ending", [Date] + 7 - WEEKDAY([Date], 1) // Saturday
30-
, "Is Future", IF([Date] > _today_date, 1, 0)
31-
, "Is Current FY", IF(YEAR(EDATE([Date], 6)) = _fiscal_year, 1, 0)
34+
, "Week Starting", [Date] - WEEKDAY([Date], 2) // Sunday
3235
)
3336

3437
RETURN

‎Miscellaneous/Scripts/DAX/Calendar_Ageing.dax‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ VAR _future_date = IF(_min_date1 < _min_date2, _min_date1, _min_date2)
77

88
VAR _result =
99
UNION (
10-
ADDCOLUMNS (CALENDAR ( _today_date - 30, _today_date), "Ageing Days", "0 to 30", "Ageing Days Order", 1),
11-
ADDCOLUMNS (CALENDAR ( _today_date - 60, _today_date - 31 ), "Ageing Days", "31 to 60", "Ageing Days Order", 2),
12-
ADDCOLUMNS (CALENDAR ( _today_date - 90, _today_date - 61 ), "Ageing Days", "61 to 90", "Ageing Days Order", 3),
13-
ADDCOLUMNS (CALENDAR ( _today_date - 120, _today_date - 91 ), "Ageing Days", "91 to 120", "Ageing Days Order", 4),
14-
ADDCOLUMNS (CALENDAR ( _future_date, _today_date - 121), "Ageing Days", "120+", "Ageing Days Order", 5)
10+
ADDCOLUMNS (CALENDAR ( _today_date - 30, _today_date), "Ageing Days", "0 to 30", "Ageing Days Order", 1)
11+
, ADDCOLUMNS (CALENDAR ( _today_date - 60, _today_date - 31 ), "Ageing Days", "31 to 60", "Ageing Days Order", 2)
12+
, ADDCOLUMNS (CALENDAR ( _today_date - 90, _today_date - 61 ), "Ageing Days", "61 to 90", "Ageing Days Order", 3)
13+
, ADDCOLUMNS (CALENDAR ( _today_date - 120, _today_date - 91 ), "Ageing Days", "91 to 120", "Ageing Days Order", 4)
14+
, ADDCOLUMNS (CALENDAR ( _future_date, _today_date - 121), "Ageing Days", "120+", "Ageing Days Order", 5)
1515
)
16+
1617
RETURN
17-
_result
18+
_result

‎Miscellaneous/Scripts/DAX/Calendar_Timeframe.dax‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ VAR _calendar_year_start = DATE( _calendar_year , 01, 01)
2020
VAR _calendar_year_end = DATE( _calendar_year, 12, 31)
2121

2222
VAR _result =
23-
UNION (
24-
ADDCOLUMNS (CALENDAR ( _today_date, _today_date), "Timeframe", "Today", "Timeframe Order", 1 ),
25-
ADDCOLUMNS (CALENDAR ( _yesterday_date, _yesterday_date), "Timeframe", "Yesterday", "Timeframe Order", 2 ),
26-
ADDCOLUMNS (CALENDAR ( _week_start - 7, _week_end - 7 ), "Timeframe", "Previous Week", "Timeframe Order", 3 ),
27-
ADDCOLUMNS (CALENDAR ( _week_start, _today_date ), "Timeframe", "WTD", "Timeframe Order", 4 ),
28-
ADDCOLUMNS (CALENDAR ( _previous_month_start, _previous_month_end ), "Timeframe", "Previous Month", "Timeframe Order", 5 ),
29-
ADDCOLUMNS (CALENDAR ( _month_start, _today_date ), "Timeframe", "MTD", "Timeframe Order", 6 ),
30-
ADDCOLUMNS (CALENDAR ( _previous_quarter_start, _previous_quarter_end ), "Timeframe", "Previous Qtr", "Timeframe Order", 7 ),
31-
ADDCOLUMNS (CALENDAR ( _quarter_start, _today_date ), "Timeframe", "QTD", "Timeframe Order", 8 ),
32-
ADDCOLUMNS (CALENDAR ( _previous_fiscal_year_start, _previous_fiscal_year_end ), "Timeframe", "Previous Year", "Timeframe Order", 9),
33-
ADDCOLUMNS (CALENDAR ( _fiscal_year_start, _today_date ), "Timeframe", "YTD", "Timeframe Order", 10 ),
34-
ADDCOLUMNS (CALENDAR ( _tomorrow_date, _fiscal_year_end ), "Timeframe", "Rest of Year", "Timeframe Order", 11 ),
35-
ADDCOLUMNS (CALENDAR ( _fiscal_year_start, _fiscal_year_end ), "Timeframe", "Full Year", "Timeframe Order", 12 ),
36-
ADDCOLUMNS (CALENDAR ( _calendar_year_start, _today_date ), "Timeframe", "Calendar YTD", "Timeframe Order", 13 ),
37-
ADDCOLUMNS (CALENDAR ( _calendar_year_start, _calendar_year_end ), "Timeframe", "Full Calendar Year", "Timeframe Order", 14 )
38-
)
23+
UNION (
24+
ADDCOLUMNS (CALENDAR ( _today_date, _today_date), "Timeframe", "Today", "Timeframe Order", 1 )
25+
, ADDCOLUMNS (CALENDAR ( _yesterday_date, _yesterday_date), "Timeframe", "Yesterday", "Timeframe Order", 2 )
26+
, ADDCOLUMNS (CALENDAR ( _week_start - 7, _week_end - 7 ), "Timeframe", "Previous Week", "Timeframe Order", 3 )
27+
, ADDCOLUMNS (CALENDAR ( _week_start, _today_date ), "Timeframe", "WTD", "Timeframe Order", 4 )
28+
, ADDCOLUMNS (CALENDAR ( _previous_month_start, _previous_month_end ), "Timeframe", "Previous Month", "Timeframe Order", 5 )
29+
, ADDCOLUMNS (CALENDAR ( _month_start, _today_date ), "Timeframe", "MTD", "Timeframe Order", 6 )
30+
, ADDCOLUMNS (CALENDAR ( _previous_quarter_start, _previous_quarter_end ), "Timeframe", "Previous Qtr", "Timeframe Order", 7 )
31+
, ADDCOLUMNS (CALENDAR ( _quarter_start, _today_date ), "Timeframe", "QTD", "Timeframe Order", 8 )
32+
, ADDCOLUMNS (CALENDAR ( _previous_fiscal_year_start, _previous_fiscal_year_end ), "Timeframe", "Previous Year", "Timeframe Order", 9 )
33+
, ADDCOLUMNS (CALENDAR ( _fiscal_year_start, _today_date ), "Timeframe", "YTD", "Timeframe Order", 10 )
34+
, ADDCOLUMNS (CALENDAR ( _tomorrow_date, _fiscal_year_end ), "Timeframe", "Rest of Year", "Timeframe Order", 11 )
35+
, ADDCOLUMNS (CALENDAR ( _fiscal_year_start, _fiscal_year_end ), "Timeframe", "Full Year", "Timeframe Order", 12 )
36+
, ADDCOLUMNS (CALENDAR ( _calendar_year_start, _today_date ), "Timeframe", "Calendar YTD", "Timeframe Order", 13 )
37+
, ADDCOLUMNS (CALENDAR ( _calendar_year_start, _calendar_year_end ), "Timeframe", "Full Calendar Year", "Timeframe Order", 14 )
38+
)
3939

4040
RETURN
41-
_result
41+
_result

0 commit comments

Comments
 (0)