diff --git a/base/templates/base/rotating_shift/rotating_shift_assign_view.html b/base/templates/base/rotating_shift/rotating_shift_assign_view.html index 21582dcb4..89d02ea40 100644 --- a/base/templates/base/rotating_shift/rotating_shift_assign_view.html +++ b/base/templates/base/rotating_shift/rotating_shift_assign_view.html @@ -64,6 +64,24 @@
{{rshift.rotating_shift_id}}
{{rshift.get_based_on_display }}
+
+ {% if rshift.based_on == 'after' %} + Rotate after {{rshift.rotate_after_day}} days + {% elif rshift.based_on == "weekly" %} + {% elif rshift.based_on == "monthly" %} + {% if rshift.rotate_every == "1" %} + Rotate every {{rshift.rotate_every}}st day of month + {% elif rshift.rotate_every == "2" %} + Rotate every {{rshift.rotate_every}}nd day of month + {% elif rshift.rotate_every == "3" %} + Rotate every {{rshift.rotate_every}}rd day of month + {% elif rshift.rotate_every == "last" %} + Rotate every last day of month + {% else %} + Rotate every {{rshift.rotate_every}}th day of month + {% endif %} + {% endif %} +
{{rshift.start_date}}
{{rshift.current_shift}}
{{rshift.next_change_date}}
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html index 8243b3ec8..37bca4535 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html @@ -64,7 +64,24 @@ {{rwork_type.rotating_work_type_id}}
{{rwork_type.get_based_on_display}}
-
{{rwork_type.start_date}}
+
+ {% if rwork_type.based_on == 'after' %} + Rotate after {{rwork_type.rotate_after_day}} days + {% elif rwork_type.based_on == "weekly" %} + {% elif rwork_type.based_on == "monthly" %} + {% if rwork_type.rotate_every == "1" %} + Rotate every {{rwork_type.rotate_every}}st day of month + {% elif rwork_type.rotate_every == "2" %} + Rotate every {{rwork_type.rotate_every}}nd day of month + {% elif rwork_type.rotate_every == "3" %} + Rotate every {{rwork_type.rotate_every}}rd day of month + {% elif rwork_type.rotate_every == "last" %} + Rotate every last day of month + {% else %} + Rotate every {{rwork_type.rotate_every}}th day of month + {% endif %} + {% endif %} +
{{rwork_type.start_date}}
{{rwork_type.current_work_type}}
{{rwork_type.next_change_date}}