From c3448634057b9c6ad6a7a65124346d636d812546 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 25 Oct 2017 14:48:29 +0530 Subject: [PATCH 1/2] Job status added in job portal --- .../doctype/portal_job/portal_job.json | 13 +++++++++++-- .../doctype/portal_job/templates/portal_job.html | 4 ++++ .../portal_job/templates/portal_job_row.html | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json index 893f6212..15d31daf 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json +++ b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json @@ -13,6 +13,7 @@ "engine": "InnoDB", "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -42,6 +43,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -71,6 +73,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -87,7 +90,7 @@ "label": "Status", "length": 0, "no_copy": 0, - "options": "Open\nCompleted\nExpired\nWithdrawn", + "options": "Open\nCompleted\nDeveloper Hired\nExpired\nWithdrawn", "permlevel": 0, "precision": "", "print_hide": 0, @@ -101,6 +104,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -130,6 +134,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -160,6 +165,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -190,6 +196,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -220,6 +227,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -250,6 +258,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -290,7 +299,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-03-22 15:30:54.620681", + "modified": "2017-10-25 05:17:34.191213", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Portal Job", diff --git a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html index f12d6fc4..641b9fec 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html +++ b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html @@ -23,6 +23,10 @@ Date {{ frappe.format_date(creation) }} + + Status + {{ status }} +

Details

{{ description }}

diff --git a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job_row.html b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job_row.html index 42f12803..42be8c1c 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job_row.html +++ b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job_row.html @@ -6,6 +6,7 @@ {{ frappe.format_date(doc.creation) }} {{ doc.country }} {{ doc.job_type }} + {{ doc.status }}

{{ html2text(doc.description)[:200] }}{% if doc.description|len > 200 %}...{% endif %}

From c22f0bedb41322e4dd9c655c1b0489c81e0d74a0 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 25 Oct 2017 15:08:10 +0530 Subject: [PATCH 2/2] [Mod] Modified Status in jobs web form --- .../erpnext_foundation/doctype/portal_job/portal_job.json | 2 +- foundation/erpnext_foundation/web_form/jobs/jobs.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json index 15d31daf..c67099a0 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json +++ b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json @@ -299,7 +299,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-10-25 05:17:34.191213", + "modified": "2017-10-25 05:24:04.271224", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Portal Job", diff --git a/foundation/erpnext_foundation/web_form/jobs/jobs.json b/foundation/erpnext_foundation/web_form/jobs/jobs.json index ad384e66..044e1685 100644 --- a/foundation/erpnext_foundation/web_form/jobs/jobs.json +++ b/foundation/erpnext_foundation/web_form/jobs/jobs.json @@ -17,7 +17,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-08-31 16:58:13.787406", + "modified": "2017-10-25 05:36:04.935016", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "jobs", @@ -58,7 +58,7 @@ "label": "Status", "max_length": 0, "max_value": 0, - "options": "Open\nCompleted\nExpired\nWithdrawn", + "options": "Open\nCompleted\nDeveloper Hired\nExpired\nWithdrawn", "read_only": 0, "reqd": 0 },