[new] Grant application doctype clean up after review
diff --git a/erpnext/non_profit/doctype/chapter/chapter.py b/erpnext/non_profit/doctype/chapter/chapter.py
index 67e2296..d484882 100644
--- a/erpnext/non_profit/doctype/chapter/chapter.py
+++ b/erpnext/non_profit/doctype/chapter/chapter.py
@@ -13,6 +13,7 @@
def get_context(self, context):
context.no_cache = True
+ context.show_sidebar = True
context.parents = [dict(label='View All Chapters',
route='chapters', title='View Chapters')]
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.json b/erpnext/non_profit/doctype/grant_application/grant_application.json
index 0f2dc10..31da2af 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application.json
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.json
@@ -38,7 +38,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 0,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -79,6 +79,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "email",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Email",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_5",
"fieldtype": "Column Break",
"hidden": 0,
@@ -170,36 +200,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "email",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Email",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
@@ -837,7 +837,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-11-20 17:43:57.337044",
+ "modified": "2017-12-01 12:55:35.934666",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Grant Application",
@@ -885,7 +885,7 @@
"write": 1
}
],
- "quick_entry": 1,
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"restrict_to_domain": "Non Profit",
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.py b/erpnext/non_profit/doctype/grant_application/grant_application.py
index 3aa8d14..b3fb1a9 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application.py
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.py
@@ -22,11 +22,17 @@
"""Load address and contacts in `__onload`"""
load_address_and_contact(self)
+ def get_context(self, context):
+ context.no_cache = True
+ context.show_sidebar = True
+ context.parents = [dict(label='View All Grant Applications',
+ route='grant-application', title='View Grants')]
def get_list_context(context):
context.allow_guest = True
context.no_cache = True
context.no_breadcrumbs = True
+ context.show_sidebar = True
context.order_by = 'creation desc'
context.introduction ='<div>Grant Application List</div><br><a class="btn btn-primary" href="/my-grant?new=1">Apply for new Grant Application</a>'
diff --git a/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html b/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html
index 64ef869..4d1c2e4 100644
--- a/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html
+++ b/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html
@@ -1,9 +1,51 @@
-<div style='margin-bottom: 30px; max-width: 600px;'
- class='with-border clickable'>
- <a href="/{{ doc.route }}">
- <h3 style='margin-top: 0px;'>{{ doc.title }}</h3>
- <p>
- <span class='label'>{{ frappe.format_date(doc.creation) }}</span>
- </p>
- </a>
-</div>
+{% if doc.published %}
+ <div style='margin-bottom: 30px; max-width: 600px;'
+ class='with-border clickable'>
+ <a href="/{{ doc.route }}">
+ <h3 style='margin-top: 0px;'>{{ doc.title }}</h3>
+ <p>
+ <span class='label'>{{ frappe.format_date(doc.creation) }}</span>
+ </p>
+ </a>
+ </div>
+{% endif %}
+
+<style type="text/css">
+.label {
+ font-weight: normal;
+ background-color: #d1d8dd;
+ font-size: 13px;
+ padding: 3px 7px;
+ margin-right: 10px;
+}
+
+
+.with-border {
+ border: 1px solid #d1d8dd;
+ border-radius: 3px;
+ padding: 15px;
+ margin-bottom: 30px;
+}
+
+.with-border h3 {
+ margin-top: 0px;
+}
+
+a {
+ color: #5E64FF;
+}
+
+.clickable a {
+ color: #161c23;
+}
+
+.with-border.clickable:hover {
+ border-color: #36414C;
+ background-color: #fafbfc;
+
+}
+
+.with-border a, .with-border a:hover {
+ text-decoration: none;
+}
+</style>
\ No newline at end of file