From 35bac59bc3fc6714a2535ce1ca7e2fc3cd0e3620 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Fri, 1 Sep 2023 11:41:38 +0530
Subject: [PATCH] [FIX]rotating work type and shift assign table missing column

---
 .../rotating_shift_assign_view.html           | 18 ++++++++++++++++++
 .../rotating_work_type_assign_view.html       | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

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 @@
             </div>
             <div class="oh-sticky-table__td">{{rshift.rotating_shift_id}}</div>
             <div class="oh-sticky-table__td">{{rshift.get_based_on_display }}</div>
+            <div class="oh-sticky-table__td">
+              {% 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 %}
+            </div>
             <div class="oh-sticky-table__td">{{rshift.start_date}}</div>
             <div class="oh-sticky-table__td">{{rshift.current_shift}}</div>
             <div class="oh-sticky-table__td">{{rshift.next_change_date}}</div>
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}}
         </div>
         <div class="oh-sticky-table__td">{{rwork_type.get_based_on_display}}</div>
-        <div class="oh-sticky-table__td">{{rwork_type.start_date}}</div>
+        <div class="oh-sticky-table__td">
+          {% 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 %}
+        </div>
         <div class="oh-sticky-table__td">{{rwork_type.start_date}}</div>
         <div class="oh-sticky-table__td">{{rwork_type.current_work_type}}</div>
         <div class="oh-sticky-table__td">{{rwork_type.next_change_date}}</div>