From a65b7d5f31dfaa044d5f1393ef5297b1736e88bb Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 23 Aug 2023 16:10:57 +0530
Subject: [PATCH] feat: add Salary Type field

---
 hrms/hr/doctype/job_opening/job_opening.json  | 10 +++++-
 hrms/hr/doctype/job_opening/job_opening.py    |  1 +
 .../templates/job_opening_row.html            | 32 +++++++++++++------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json
index 7b91c9d322..fe0d75a106 100644
--- a/hrms/hr/doctype/job_opening/job_opening.json
+++ b/hrms/hr/doctype/job_opening/job_opening.json
@@ -38,6 +38,7 @@
   "lower_range",
   "upper_range",
   "column_break_20",
+  "salary_type",
   "publish_salary_range"
  ],
  "fields": [
@@ -231,12 +232,19 @@
    "fieldname": "closed_on",
    "fieldtype": "Date",
    "label": "Closed On"
+  },
+  {
+   "default": "Per Month",
+   "fieldname": "salary_type",
+   "fieldtype": "Select",
+   "label": "Salary Type",
+   "options": "Per Hour\nPer Day\nPer Week\nPer Month\nPer Year\nPer Sale"
   }
  ],
  "icon": "fa fa-bookmark",
  "idx": 1,
  "links": [],
- "modified": "2023-08-23 11:48:22.678542",
+ "modified": "2023-08-23 15:55:02.233809",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Job Opening",
diff --git a/hrms/hr/doctype/job_opening/job_opening.py b/hrms/hr/doctype/job_opening/job_opening.py
index ac2fb9e3e1..42f75967c0 100644
--- a/hrms/hr/doctype/job_opening/job_opening.py
+++ b/hrms/hr/doctype/job_opening/job_opening.py
@@ -135,6 +135,7 @@ def get_job_openings(
 		"upper_range",
 		"currency",
 		"job_application_route",
+		"salary_type",
 	]
 
 	filters = filters or {}
diff --git a/hrms/hr/doctype/job_opening/templates/job_opening_row.html b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
index cc8523ed0a..66340e42fb 100644
--- a/hrms/hr/doctype/job_opening/templates/job_opening_row.html
+++ b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
@@ -1,18 +1,30 @@
-<div class="my-5">
-	<h3>{{ doc.job_title }}</h3>
-	<p>{{ doc.description }}</p>
+<div class="py-12 px-4">
+	<h3 class="mt-0">{{ doc.job_title }}</h3>
+	<p>{{ doc.description or _("No description") }}</p>
 	{%- if doc.publish_salary_range -%}
-	<p><b>{{_("Salary range per month")}}: </b>{{ frappe.format_value(frappe.utils.flt(doc.lower_range), currency=doc.currency) }} - {{ frappe.format_value(frappe.utils.flt(doc.upper_range), currency=doc.currency) }}</p>
+	<p>
+		<b>{{_("Salary Range ")}} ({{_(doc.salary_type)}}): </b>{{
+		frappe.format_value(frappe.utils.flt(doc.lower_range),
+		currency=doc.currency) }} - {{
+		frappe.format_value(frappe.utils.flt(doc.upper_range),
+		currency=doc.currency) }}
+	</p>
 	{% endif %}
 	<div>
 		{%- if doc.job_application_route -%}
-		<a class='btn btn-primary'
-		href='/{{doc.job_application_route}}/new?job_title={{ doc.name }}'>
-		{{ _("Apply Now") }}</a>
+		<a
+			class="btn btn-primary"
+			href="/{{doc.job_application_route}}/new?job_title={{ doc.name }}"
+		>
+			{{ _("Apply Now") }}</a
+		>
 		{% else %}
-		<a class='btn btn-primary'
-		href='/job_application/new?job_title={{ doc.name }}'>
-		{{ _("Apply Now") }}</a>
+		<a
+			class="btn btn-primary"
+			href="/job_application/new?job_title={{ doc.name }}"
+		>
+			{{ _("Apply Now") }}</a
+		>
 		{% endif %}
 	</div>
 </div>