diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json index f9a30f4b6e..d1e34066a6 100644 --- a/hrms/hr/doctype/job_opening/job_opening.json +++ b/hrms/hr/doctype/job_opening/job_opening.json @@ -257,6 +257,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "modified": "2023-09-14 16:50:39.316079", ======= @@ -283,6 +284,9 @@ ======= "modified": "2023-09-14 15:57:04.756209", >>>>>>> 311249ba9 (feat: add description to Closes On field) +======= + "modified": "2023-09-15 13:41:54.111743", +>>>>>>> 836271d4b (feat: handle view for closed openings) "modified_by": "Administrator", "module": "HR", "name": "Job Opening", @@ -307,6 +311,15 @@ ], "sort_field": "modified", "sort_order": "ASC", - "states": [], + "states": [ + { + "color": "Green", + "title": "Open" + }, + { + "color": "Gray", + "title": "Closed" + } + ], "title_field": "job_title" } \ No newline at end of file diff --git a/hrms/templates/generators/job_opening.html b/hrms/templates/generators/job_opening.html index ac3fe80026..31198f1573 100644 --- a/hrms/templates/generators/job_opening.html +++ b/hrms/templates/generators/job_opening.html @@ -13,13 +13,17 @@

{{ job_title }}

- {%- if job_application_route -%} + {%- if status == "Open" -%} {{ _("Apply - Now") }} - {% else %} - {{ _("Apply Now") }} + href="{{ '/' ~ job_application_route ~ '/new?job_title=' ~ name if job_application_route else '/job_application/new?job_title=' ~ name }}"> + {{ _("Apply Now") }} + + {%- else -%} +
{{ _("Opening closed.") }} +
{% endif %}
@@ -81,13 +85,9 @@

{{ job_title }}

{{ _("Salary Range") }}
- {%- if lower_range -%} - {{ frappe.format_value(frappe.utils.flt(lower_range), currency=currency) }} - {% endif %} + {%- if lower_range -%}{{ frappe.format_value(frappe.utils.flt(lower_range) , currency=currency) }}{% endif %} {%- if lower_range and upper_range -%}{{ " - " }}{% endif %} - {%- if upper_range -%} - {{ frappe.format_value(frappe.utils.flt(upper_range), currency=currency) }} - {% endif %} + {%- if upper_range -%}{{ frappe.format_value(frappe.utils.flt(upper_range) , currency=currency) }}{% endif %} / {{ salary_per.lower() }}
@@ -128,7 +128,7 @@

{{ job_title }}

- {%- if closes_on -%} + {%- if (status == 'Open' and closes_on) or (status == 'Closed' and closed_on) -%}
@@ -140,8 +140,10 @@

{{ job_title }}

-
{{ _("Closes On") }}
-
{{ frappe.format_date(closes_on, "d MMM, YYYY") }}
+
{{ _("Closes On" if status == "Open" else "Closed On") }}
+
+ {{ frappe.format_date(closes_on if status == "Open" else closed_on, "d MMM, YYYY") }} +