From bf480e19eb94fd461c948fd30e7d47966e05cfda Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:42:19 +0530 Subject: [PATCH 1/4] feat(Job Portal): add Publish Applications Received toggle (#1561) (#1601) * feat: add Publish Applications Received toggle * feat: add a description to the Publish Applications Received field (cherry picked from commit 130fde9ac07514d325673936019f4e8f3581cdcf) Co-authored-by: Akash Tom <61287991+krantheman@users.noreply.github.com> --- hrms/hr/doctype/job_opening/job_opening.json | 9 ++++++ hrms/templates/generators/job_opening.html | 34 +++++++++++--------- hrms/www/jobs/index.html | 10 ++++-- hrms/www/jobs/index.py | 1 + 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json index 6e3331694e..7edf4a91b3 100644 --- a/hrms/hr/doctype/job_opening/job_opening.json +++ b/hrms/hr/doctype/job_opening/job_opening.json @@ -30,6 +30,7 @@ "section_break_6", "publish", "route", + "publish_applications_received", "column_break_12", "job_application_route", "section_break_14", @@ -241,6 +242,14 @@ "fieldtype": "Select", "label": "Salary Paid Per", "options": "Month\nYear" + }, + { + "default": "1", + "depends_on": "publish", + "description": "If enabled, the total no. of applications received for this opening will be displayed on the website", + "fieldname": "publish_applications_received", + "fieldtype": "Check", + "label": "Publish Applications Received" } ], "icon": "fa fa-bookmark", diff --git a/hrms/templates/generators/job_opening.html b/hrms/templates/generators/job_opening.html index 1ef81698d5..740ab40014 100644 --- a/hrms/templates/generators/job_opening.html +++ b/hrms/templates/generators/job_opening.html @@ -145,24 +145,26 @@ {% endif %} -
-
-
- - - -
-
-
{{ _("Applications Received") }}
-
{{ no_of_applications }}
+ {%- if publish_applications_received -%} +
+
+
+ + + +
+
+
{{ _("Applications Received") }}
+
{{ no_of_applications }}
+
-
+ {%- endif -%} {%- if (status == 'Open' and closes_on) or (status == 'Closed' and closed_on) -%}
diff --git a/hrms/www/jobs/index.html b/hrms/www/jobs/index.html index f32a759800..b7be8d1f00 100644 --- a/hrms/www/jobs/index.html +++ b/hrms/www/jobs/index.html @@ -230,9 +230,13 @@

{{ _("Job Openings") }}

-

- {{ _("Applications received:") + " " }} - {{ jo.no_of_applications }} +

+ {%- if jo.publish_applications_received -%} + {{ _("Applications received:") + " " }} + {{ jo.no_of_applications }} + {% else %} + ‎ + {% endif %}

{%- if jo.closes_on -%} diff --git a/hrms/www/jobs/index.py b/hrms/www/jobs/index.py index 9c9de2ba15..54cf4e2910 100644 --- a/hrms/www/jobs/index.py +++ b/hrms/www/jobs/index.py @@ -32,6 +32,7 @@ def get_job_openings(filters=None, txt=None, sort=None, limit=20, offset=0): jo.status, jo.job_title, jo.description, + jo.publish_applications_received, jo.publish_salary_range, jo.lower_range, jo.upper_range, From 95274507f4bef0a79098a3667e2ccf2848fc2eae Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 01:39:25 +0530 Subject: [PATCH 2/4] fix(PWA): csrf token error (backport #1604) (#1605) (cherry picked from commit 8acb4fc2abfae072595ea7bc997e972f360993d3) Co-authored-by: Rucha Mahabal --- hrms/www/hrms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hrms/www/hrms.py b/hrms/www/hrms.py index 1385c2984b..768400facc 100644 --- a/hrms/www/hrms.py +++ b/hrms/www/hrms.py @@ -7,8 +7,8 @@ def get_context(context): csrf_token = frappe.sessions.get_csrf_token() frappe.db.commit() # nosempgrep context = frappe._dict() + context.csrf_token = csrf_token context.boot = get_boot() - context.boot.csrf_token = csrf_token return context From e6cd65147d7c830e83f6fe6b6cf5b360a49a4e7d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:58:22 +0530 Subject: [PATCH 3/4] fix(Job Opening): update modified to sync doctype update (backport #1606) (#1607) * fix(Job Opening): update modified to sync doctype update (#1606) (cherry picked from commit 6257339b28ad7f7c698c3328765ab153d2a7a502) # Conflicts: # hrms/hr/doctype/job_opening/job_opening.json * chore: fix conflicts --------- Co-authored-by: Akash Tom <61287991+krantheman@users.noreply.github.com> Co-authored-by: Rucha Mahabal --- hrms/hr/doctype/job_opening/job_opening.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json index 7edf4a91b3..04e88fb5d6 100644 --- a/hrms/hr/doctype/job_opening/job_opening.json +++ b/hrms/hr/doctype/job_opening/job_opening.json @@ -255,7 +255,7 @@ "icon": "fa fa-bookmark", "idx": 1, "links": [], - "modified": "2024-01-03 14:34:32.159138", + "modified": "2024-04-01 11:32:47.167232", "modified_by": "Administrator", "module": "HR", "name": "Job Opening", From c2bb8e661965858ee069c886bcd17bb6daf32be4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:21:25 +0530 Subject: [PATCH 4/4] fix: employee filter in list view of employee checkin (backport #1612) (#1616) * fix: employee filter in list view of employee checkin (#1612) (cherry picked from commit 62313145d79f0f317025244aca92e1f6577d1ab1) # Conflicts: # hrms/hr/doctype/employee_checkin/employee_checkin.json * chore: fix conflicts --------- Co-authored-by: Jeevan syriac <95610320+Jeevansyriac@users.noreply.github.com> Co-authored-by: Rucha Mahabal --- hrms/hr/doctype/employee_checkin/employee_checkin.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.json b/hrms/hr/doctype/employee_checkin/employee_checkin.json index 0eb63c1bdc..14eb5cbcfa 100644 --- a/hrms/hr/doctype/employee_checkin/employee_checkin.json +++ b/hrms/hr/doctype/employee_checkin/employee_checkin.json @@ -24,6 +24,7 @@ { "fieldname": "employee", "fieldtype": "Link", + "in_standard_filter": 1, "label": "Employee", "options": "Employee", "reqd": 1, @@ -109,7 +110,7 @@ } ], "links": [], - "modified": "2023-05-12 14:52:22.660264", + "modified": "2024-04-02 01:50:23.150627", "modified_by": "Administrator", "module": "HR", "name": "Employee Checkin",