diff --git a/attendance/static/dashboard/attendanceChart.js b/attendance/static/dashboard/attendanceChart.js index aaddce2bf..b25b885b5 100644 --- a/attendance/static/dashboard/attendanceChart.js +++ b/attendance/static/dashboard/attendanceChart.js @@ -9,7 +9,21 @@ $(document).ready(function () { dataSet = response.dataSet; labels = response.labels; - createAttendanceChart(dataSet, labels); + if (isChartEmpty(response.dataSet)) { + $("#dailyAnalytic").parent().html( + `
+
+ +

${response.message}

+
+
` + ); + } else { + $("#chart_input").html( + '' + ); + createAttendanceChart(response.dataSet, response.labels); + } }, }); }); @@ -132,14 +146,14 @@ function changeMonth() { }, success: function (response) { if (isChartEmpty(response.dataSet)) { - $("#chart_input").html( - `
-
- -

${response.message}

-
-
` - ); + $("#dailyAnalytic").parent().html( + `
+
+ +

${response.message}

+
+
` + ); } else { $("#chart_input").html( '' diff --git a/attendance/views/dashboard.py b/attendance/views/dashboard.py index 131948799..52820a63c 100644 --- a/attendance/views/dashboard.py +++ b/attendance/views/dashboard.py @@ -263,5 +263,5 @@ def dashboard_attendance(request): departments = Department.objects.all() for dept in departments: data_set.append(generate_data_set(request, start_date, type, end_date, dept)) - message = "No data exist" + message = _("No data Found...") return JsonResponse({"dataSet": data_set, "labels": labels, "message": message})