RANK and order by ID and Date

[casperlow]

Hi Dax Gurus,

Needing a little help here.

I'm struggling to order this ranking by ID and Date.

Currently my dax is only ordering by ID.
See table below:

See query below:

CS RankOrder = --Continious shift rank order

VAR CShiftID =

CALCULATETABLE(

    VALUES('Fact Visit'[Continuous Shift ID]),

    ALLSELECTED()

)

VAR CurrentORder =

SELECTEDVALUE('Fact Visit'[Continuous Shift ID])

VAR Result =

    IF(

        HASONEVALUE('Fact Visit'[Continuous Shift ID]),

        RANKX (

            CShiftID,

            'Fact Visit'[Continuous Shift ID],

            CurrentORder,

            ASC

        )

    )

RETURN

Result

Looking for your help here!
many thanks

[wdx223_Daniel]

CS RankOrder = --Continious shift rank order

VAR CShiftID =

CALCULATETABLE(

    SUMMARIZE('Fact Visit','Fact Visit'[Continuous Shift ID],'Fact Visit'[Start Date]),

    ALLSELECTED()

)

VAR CurrentORder =

SELECTEDVALUE('Fact Visit'[Continuous Shift ID])&SELECTEDVALUE('Fact Visit'[Start Date])

VAR Result =

    IF(

        HASONEVALUE('Fact Visit'[Continuous Shift ID]),

        RANKX (

            CShiftID,

            'Fact Visit'[Continuous Shift ID]&'Fact Visit'[Start Date],

            CurrentORder,

            ASC

        )

    )

RETURN

Result

[casperlow]

Hi Daniel,
Apologies I might have ask the wrong question. but technically you did answer the question well.
I did a similar dax for this with date but it doesn't group it with the same continuous_shift_id.

Column CS TEST Rank is the dax formula you gave. See image below.

I guess do you have any suggestion on how do I tackle this?