From d89fd76aa4e9cbda346f7621fb3d79fb168df4e4 Mon Sep 17 00:00:00 2001 From: Horilla Date: Wed, 16 Aug 2023 17:07:54 +0530 Subject: [PATCH] [FIX]incorrect leave information in dashboard --- leave/models.py | 26 +++++++++---------- leave/static/dashboard/leaveChart.js | 2 +- .../leave/company_leave/company-leave.html | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/leave/models.py b/leave/models.py index a976b58ae..dcbb35535 100644 --- a/leave/models.py +++ b/leave/models.py @@ -22,22 +22,22 @@ RESET_BASED = [ ("weekly", _("Weekly")), ] MONTHS = [ - ("1", "Jan"), - ("2", "Feb"), - ("3", "Mar"), - ("4", "Apr"), - ("5", "May"), - ("6", "Jun"), - ("7", "Jul"), - ("8", "Aug"), - ("9", "Sep"), - ("10", "Oct"), - ("11", "Nov"), - ("12", "Dec"), + ("1", _("Jan")), + ("2", _("Feb")), + ("3", _("Mar")), + ("4", _("Apr")), + ("5", _("May")), + ("6", _("Jun")), + ("7", _("Jul")), + ("8", _("Aug")), + ("9", _("Sep")), + ("10", _("Oct")), + ("11", _("Nov")), + ("12", _("Dec")), ] DAYS = [ - ("last day", "Last Day"), + ("last day", _("Last Day")), ("1", "1st"), ("2", "2nd"), ("3", "3rd"), diff --git a/leave/static/dashboard/leaveChart.js b/leave/static/dashboard/leaveChart.js index 63c8fe900..844b5bfca 100644 --- a/leave/static/dashboard/leaveChart.js +++ b/leave/static/dashboard/leaveChart.js @@ -1,6 +1,6 @@ $(document).ready(function () { //Todays leave count department wise chart - var myChart1 = document.getElementById("overAllLeave").getContext("2d"); + var myChart1 = document.getElementById("leaveEmployee"); var overAllLeave = new Chart(myChart1, { type: 'doughnut', data: { diff --git a/leave/templates/leave/company_leave/company-leave.html b/leave/templates/leave/company_leave/company-leave.html index 119b102b8..0c6746119 100644 --- a/leave/templates/leave/company_leave/company-leave.html +++ b/leave/templates/leave/company_leave/company-leave.html @@ -19,7 +19,7 @@ {% endif %} {% endfor %} {% else %} - All + {% trans "All" %} {% endif %}