final

Author: Ravn10

MANIFEST.in

@@ -11,3 +11,4 @@ def boot_session(bootinfo):
             emp = frappe.get_doc('Employee', employee_docname[0][0])
             frappe.msgprint(_(emp.employee))
             bootinfo.employee = emp.employee
+            bootinfo.department = emp.department

README.md

@@ -693,9 +693,12 @@ a:not([href]):hover{
     max-height: 200px;
     overflow-y: auto;
 }
+
 .sidebar {
     position:fixed;
     z-index: 1;
+    max-width: 13%;
+    height: 100vh;
 }
 
 .scroll {

ess/__init__.py

@@ -25,12 +25,34 @@ ESS = Class.extend({
                             fieldname: 'employee',
                             options: 'Employee',
                             label: __('Employee'),
-                        }
+                            
+                        },
+                        // {
+                        //     fieldtype: 'Link',
+                        //     fieldname: 'department',
+                        //     options: 'Department',
+                        //     label: __('Department')
+                        // }
                     ],
                     primary_action_label: __('Go'),
-                    primary_action: ({ employee }) => {
+                    primary_action: (values) => {
+                        console.log(values)
+                        frappe.call({
+                            'method': 'frappe.client.get_value',
+                            args: {
+                                'doctype': 'Employee',
+                                'filters': {
+                                    'name': values.employee
+                                },
+                                'fieldname': ['department']
+                            }
+                        }).then(r => {
+                            console.log(r.message)
+                            frappe.boot.department = r.message['department']
+                        });
                         dialog.hide();
-                        frappe.boot.employee = employee
+                        frappe.boot.employee = values.employee
+                        // frappe.boot.department = values.department
                         this.make_sidebar()
                     }
                 });
@@ -157,10 +179,13 @@ ESS = Class.extend({
 
         })
     },
-    // get members present absent on duty today
+    // get members present aant on duty today
     get_members_status_for_the_day: function(){
         frappe.call({
             method: "ess.employee_self_service_portal.page.ess.ess.get_presenty",
+            args:{
+                "department":frappe.boot.department
+            },
             async: false,
             callback: function(r) {
                 console.log(r.message)
@@ -540,8 +565,10 @@ ESS = Class.extend({
     },
     // get_employee_on_leave_this_month
     get_employee_on_leave_this_month: function(){
+        console.log("in here .....")
         frappe.call({
-            method:"ess.employee_self_service_portal.page.ess.ess.get_employee_on_leave_this_month"
+            method:"ess.employee_self_service_portal.page.ess.ess.get_employee_on_leave_this_month",
+            args:{'department':frappe.boot.department},
         }).then(r => {
             console.log("Leave Section")
             console.log(r.message)
@@ -629,7 +656,8 @@ ESS = Class.extend({
             const datatable_options = {
                 columns: columns,
                 data: r.message.result,
-                layout:'fixed'
+                layout:'fluid',
+                noDataMessage: "no data available"
             };
             datatable = new frappe.DataTable('.report-container',
             datatable_options
@@ -676,7 +704,8 @@ ESS = Class.extend({
             const datatable_options = {
                 columns: columns,
                 data: r.message.result,
-                layout:'fixed'
+                layout:'fixed',
+                noDataMessage: 'no data available'
             };
             datatable = new frappe.DataTable('.leave-report-container',
             datatable_options

ess/boot.py

@@ -139,15 +139,15 @@ def get_employee_with_birthday_this_month():
     birthday_persons = frappe.db.sql("""select name, employee_name, date_of_birth
                                      from tabEmployee
                                      where status = 'Active' %s
-                                     order by date_of_birth DESC""" % conditions, as_dict=1)
+                                     order by date_of_birth DESC""" % conditions, as_dict=True)
     def get_day(data):
         print(data)
-        data['day'] = data['date_of_birth'].day
+        data['day'] = data['date_of_birth'].strftime('%d-%m')
     list(map(get_day,birthday_persons))
     return birthday_persons
 
 @frappe.whitelist()
-def get_employee_on_leave_this_month():
+def get_employee_on_leave_this_month(department):
     month_first_date = get_first_day(nowdate())
     leave_info = frappe.db.sql('''select employee_name, from_date, to_date, half_day
                   from `tabLeave Application`
@@ -160,13 +160,13 @@ def get_employee_on_leave_this_month():
                   as_dict=1
                   )
     def get_day(data):
-        data['from'] = data['from_date'].day
-        data['to'] = data['to_date'].day
+        data['from'] = data['from_date'].strftime('%d-%m')
+        data['to'] = data['to_date'].strftime('%d-%m')
     list(map(get_day,leave_info))
-    absent_today = frappe.db.get_all("Attendance",filters={'status':"Absent",'attendance_date':frappe.utils.get_datetime().date()},fields=['employee_name'])
+    absent_today = frappe.db.get_all("Attendance",filters={'department' : department,'status':"Absent",'attendance_date':frappe.utils.get_datetime().date()},fields=['employee_name'])
     employee = get_active_employees()
     for emp in employee:
-        if frappe.db.count('Attendance',filters={'employee':emp.name,'attendance_date':frappe.utils.get_datetime().date()}) == 0:
+        if frappe.db.count('Attendance',filters={'department' : department,'employee':emp.name,'attendance_date':frappe.utils.get_datetime().date()}) == 0:
             absent_today.append({'employee_name':emp.employee_name,})
     return leave_info, absent_today
 
@@ -226,10 +226,10 @@ def get_hr_admin_data():
 
 
 @frappe.whitelist()
-def get_presenty():
-    members_present_toady = frappe.get_all('Attendance',filters={'attendance_date':nowdate(),'workflow_state':'Approved','status':['in',['Present','Work From Home']]},fields=['employee_name'])
-    x, members_absent_today = get_employee_on_leave_this_month()
-    members_on_duty = frappe.get_all('Attendance',filters={'attendance_date':nowdate(),'workflow_state':'Approved','status':'On Duty (OD)'},fields=['employee_name'])
+def get_presenty(department):
+    members_present_toady = frappe.get_all('Attendance',filters={'attendance_date':nowdate(),'workflow_state':'Approved','status':['in',['Present','Work From Home']],'department': department},fields=['employee_name'])
+    x, members_absent_today = get_employee_on_leave_this_month(department)
+    members_on_duty = frappe.get_all('Attendance',filters={'attendance_date':nowdate(),'workflow_state':'Approved','status':'On Duty (OD)','department' :department},fields=['employee_name'])
     return {
         "members_present_toady":members_present_toady,
         "members_absent_today":members_absent_today,