[UPDT] ATTENDANCE: Updated attendance activity export method by addin…

…g validation for time format change
horilla-opensource · Mar 11, 2024 · 524419a · 524419a
1 parent 241b7d6
commit 524419a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/attendance/templates/requests/attendance/individual_view.html b/attendance/templates/requests/attendance/individual_view.html
@@ -135,7 +135,7 @@
       data-target="#editValidateAttendanceRequest"
       data-toggle="oh-modal-toggle"
       class="oh-btn oh-btn--info w-100"
-    >
+      >
       <ion-icon name="create-outline"></ion-icon>
       {% trans "Edit" %}
     </a>

diff --git a/attendance/templates/requests/attendance/request_lines.html b/attendance/templates/requests/attendance/request_lines.html
@@ -126,7 +126,7 @@
                       <div class="oh-btn-group">
                         <a
                           class="oh-btn oh-btn--light-bkg w-100"
-                          title="{% trans 'View and Edit' %}"
+                          title="{% trans 'View' %}"
 
                           ><ion-icon
                           name="eye-outline"

diff --git a/base/methods.py b/base/methods.py
@@ -479,7 +479,7 @@ def export_data(request, model, form_class, filter_class, file_name):
                     }
 
                     # Convert the string to a datetime.time object
-                    check_in_time = datetime.strptime(str(value), "%H:%M:%S").time()
+                    check_in_time = datetime.strptime(str(value).split('.')[0], "%H:%M:%S").time()
 
                     # Print the formatted time for each format
                     for format_name, format_string in time_formats.items():