From 7dc1fec27ca956355c3b630e8107538eeaafed2d Mon Sep 17 00:00:00 2001 From: Himanshu Date: Mon, 25 Mar 2019 11:43:08 +0530 Subject: [PATCH 001/103] feat(Naming Series): Option to Add field_value in Naming Series (#7027) To use field_value in naming_series, just add field_name in curly braces instead of the old naming convention which was kinda confusing and not easily understandable. eg: {field_name}.-.YYYY.-.MM.-.DD.-.#### --- frappe/core/doctype/doctype/doctype.json | 3890 +++++++++++----------- frappe/model/document.py | 2 +- frappe/model/naming.py | 22 +- 3 files changed, 1958 insertions(+), 1956 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index 2d584eff5c..b6d3a83cf1 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -1,2078 +1,2078 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 1, - "autoname": "Prompt", - "beta": 0, - "creation": "2013-02-18 13:36:19", - "custom": 0, - "description": "DocType is a Table / Form in the application.", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 0, - "engine": "InnoDB", + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 1, + "autoname": "Prompt", + "beta": 0, + "creation": "2013-02-18 13:36:19", + "custom": 0, + "description": "DocType is a Table / Form in the application.", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Document", + "editable_grid": 0, + "engine": "InnoDB", "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "sb0", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "", - "length": 0, - "no_copy": 0, - "oldfieldtype": "Section Break", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb0", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "", + "length": 0, + "no_copy": 0, + "oldfieldtype": "Section Break", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "module", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Module", - "length": 0, - "no_copy": 0, - "oldfieldname": "module", - "oldfieldtype": "Link", - "options": "Module Def", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "module", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Module", + "length": 0, + "no_copy": 0, + "oldfieldname": "module", + "oldfieldtype": "Link", + "options": "Module Def", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Child Tables are shown as a Grid in other DocTypes.", - "fieldname": "istable", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 1, - "label": "Is Child Table", - "length": 0, - "no_copy": 0, - "oldfieldname": "istable", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Child Tables are shown as a Grid in other DocTypes.", + "fieldname": "istable", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 1, + "label": "Is Child Table", + "length": 0, + "no_copy": 0, + "oldfieldname": "istable", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", - "fieldname": "issingle", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 1, - "label": "Is Single", - "length": 0, - "no_copy": 0, - "oldfieldname": "issingle", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 1, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", + "fieldname": "issingle", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 1, + "label": "Is Single", + "length": 0, + "no_copy": 0, + "oldfieldname": "issingle", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 1, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "depends_on": "istable", - "fieldname": "editable_grid", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Editable Grid", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "depends_on": "istable", + "fieldname": "editable_grid", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Editable Grid", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "cb01", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb01", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "depends_on": "eval:!doc.istable && !doc.issingle", - "fieldname": "quick_entry", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Quick Entry", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "depends_on": "eval:!doc.istable && !doc.issingle", + "fieldname": "quick_entry", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Quick Entry", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "depends_on": "eval:!doc.istable", - "fieldname": "track_changes", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Track Changes", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "depends_on": "eval:!doc.istable", + "fieldname": "track_changes", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Track Changes", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "custom", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Custom?", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "custom", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Custom?", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "beta", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Beta", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "beta", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Beta", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "track_views", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Track Views", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "track_views", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Track Views", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "depends_on": "eval: doc.image_field", - "fieldname": "image_view", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Image View", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "depends_on": "eval: doc.image_field", + "fieldname": "image_view", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Image View", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "app", - "fieldtype": "Data", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "App", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "app", + "fieldtype": "Data", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "App", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "fields_section_break", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Fields", - "length": 0, - "no_copy": 0, - "oldfieldtype": "Section Break", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "fields_section_break", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Fields", + "length": 0, + "no_copy": 0, + "oldfieldtype": "Section Break", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "fields", - "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Fields", - "length": 0, - "no_copy": 0, - "oldfieldname": "fields", - "oldfieldtype": "Table", - "options": "DocField", - "permlevel": 0, - "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, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "fields", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Fields", + "length": 0, + "no_copy": 0, + "oldfieldname": "fields", + "oldfieldtype": "Table", + "options": "DocField", + "permlevel": 0, + "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, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "sb1", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Naming", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb1", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Naming", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Naming Options:\n
  1. field:[fieldname] - By Field
  2. naming_series: - By Naming Series (field called naming_series must be present
  3. Prompt - Prompt user for a name
  4. [series] - Series by prefix (separated by a dot); for example PRE.#####
    5. \n
  5. format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
", - "fieldname": "autoname", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Auto Name", - "length": 0, - "no_copy": 0, - "oldfieldname": "autoname", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Naming Options:\n
  1. field:[fieldname] - By Field
  2. naming_series: - By Naming Series (field called naming_series must be present)
  3. Prompt - Prompt user for a name
  4. [series] - Series by prefix (separated by a dot); for example PRE.#####
    5. \n
  5. format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
", + "fieldname": "autoname", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Auto Name", + "length": 0, + "no_copy": 0, + "oldfieldname": "autoname", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "name_case", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Name Case", - "length": 0, - "no_copy": 0, - "oldfieldname": "name_case", - "oldfieldtype": "Select", - "options": "\nTitle Case\nUPPER CASE", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "name_case", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Name Case", + "length": 0, + "no_copy": 0, + "oldfieldname": "name_case", + "oldfieldtype": "Select", + "options": "\nTitle Case\nUPPER CASE", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "column_break_15", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "", + "fieldname": "column_break_15", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "description", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Description", - "length": 0, - "no_copy": 0, - "oldfieldname": "description", - "oldfieldtype": "Text", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "description", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Description", + "length": 0, + "no_copy": 0, + "oldfieldname": "description", + "oldfieldtype": "Text", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "view_settings", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "View Settings", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "view_settings", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "View Settings", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "description": "", - "fieldname": "title_field", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Title Field", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "description": "", + "fieldname": "title_field", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Title Field", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "fieldname": "search_fields", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Search Fields", - "length": 0, - "no_copy": 0, - "oldfieldname": "search_fields", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "fieldname": "search_fields", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Search Fields", + "length": 0, + "no_copy": 0, + "oldfieldname": "search_fields", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fieldname": "image_field", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Image Field (Must of type \"Attach Image\")", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "image_field", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Image Field (Must of type \"Attach Image\")", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "description": "Comments and Communications will be associated with this linked document", - "fieldname": "timeline_field", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Timeline Field", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "description": "Comments and Communications will be associated with this linked document", + "fieldname": "timeline_field", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Timeline Field", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "allow_events_in_timeline", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Allow events in timeline", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "allow_events_in_timeline", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow events in timeline", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_29", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_29", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fieldname": "document_type", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Show in Module Section", - "length": 0, - "no_copy": 0, - "oldfieldname": "document_type", - "oldfieldtype": "Select", - "options": "\nDocument\nSetup\nSystem\nOther", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "document_type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Show in Module Section", + "length": 0, + "no_copy": 0, + "oldfieldname": "document_type", + "oldfieldtype": "Select", + "options": "\nDocument\nSetup\nSystem\nOther", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "restrict_to_domain", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Restrict To Domain", - "length": 0, - "no_copy": 0, - "options": "Domain", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "restrict_to_domain", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Restrict To Domain", + "length": 0, + "no_copy": 0, + "options": "Domain", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "icon", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Icon", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "icon", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Icon", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "color", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Color", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "color", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Color", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "track_seen", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Track Seen", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "track_seen", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Track Seen", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "read_only_onload", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Show Print First", - "length": 0, - "no_copy": 0, - "oldfieldname": "read_only_onload", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "read_only_onload", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Show Print First", + "length": 0, + "no_copy": 0, + "oldfieldname": "read_only_onload", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "hide_heading", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Hide Heading", - "length": 0, - "no_copy": 0, - "oldfieldname": "hide_heading", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "hide_heading", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Hide Heading", + "length": 0, + "no_copy": 0, + "oldfieldname": "hide_heading", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "hide_toolbar", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Hide Toolbar", - "length": 0, - "no_copy": 0, - "oldfieldname": "hide_toolbar", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "hide_toolbar", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Hide Toolbar", + "length": 0, + "no_copy": 0, + "oldfieldname": "hide_toolbar", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "allow_copy", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Hide Copy", - "length": 0, - "no_copy": 0, - "oldfieldname": "allow_copy", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "allow_copy", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Hide Copy", + "length": 0, + "no_copy": 0, + "oldfieldname": "allow_copy", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "show_name_in_global_search", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Make \"name\" searchable in Global Search", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "show_name_in_global_search", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Make \"name\" searchable in Global Search", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "fieldname": "sb2", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Permission Rules", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "fieldname": "sb2", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Permission Rules", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "permissions", - "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Permissions", - "length": 0, - "no_copy": 0, - "oldfieldname": "permissions", - "oldfieldtype": "Table", - "options": "DocPerm", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "", + "fieldname": "permissions", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Permissions", + "length": 0, + "no_copy": 0, + "oldfieldname": "permissions", + "oldfieldtype": "Table", + "options": "DocPerm", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.istable", - "fieldname": "sb3", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.istable", + "fieldname": "sb3", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "cb30", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Permissions Settings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb30", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Permissions Settings", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "is_submittable", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Is Submittable", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "is_submittable", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Is Submittable", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fieldname": "allow_import", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Allow Import (via Data Import Tool)", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "allow_import", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow Import (via Data Import Tool)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "allow_rename", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Allow Rename", - "length": 0, - "no_copy": 0, - "oldfieldname": "allow_rename", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "allow_rename", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow Rename", + "length": 0, + "no_copy": 0, + "oldfieldname": "allow_rename", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "cb31", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Other Settings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb31", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Other Settings", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "max_attachments", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Max Attachments", - "length": 0, - "no_copy": 0, - "oldfieldname": "max_attachments", - "oldfieldtype": "Int", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "max_attachments", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Max Attachments", + "length": 0, + "no_copy": 0, + "oldfieldname": "max_attachments", + "oldfieldtype": "Int", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "default_print_format", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Print Format", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "default_print_format", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Print Format", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "list_view_settings", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "List View Settings", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "list_view_settings", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "List View Settings", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "modified", - "depends_on": "eval:!doc.istable", - "description": "", - "fieldname": "sort_field", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Sort Field", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "modified", + "depends_on": "eval:!doc.istable", + "description": "", + "fieldname": "sort_field", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Sort Field", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "DESC", - "depends_on": "eval:!doc.istable", - "fieldname": "sort_order", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Sort Order", - "length": 0, - "no_copy": 0, - "options": "ASC\nDESC", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "DESC", + "depends_on": "eval:!doc.istable", + "fieldname": "sort_order", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Sort Order", + "length": 0, + "no_copy": 0, + "options": "ASC\nDESC", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_47", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_47", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "read_only", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "User Cannot Search", - "length": 0, - "no_copy": 0, - "oldfieldname": "read_only", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "read_only", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "User Cannot Search", + "length": 0, + "no_copy": 0, + "oldfieldname": "read_only", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "in_create", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "User Cannot Create", - "length": 0, - "no_copy": 0, - "oldfieldname": "in_create", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "in_create", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "User Cannot Create", + "length": 0, + "no_copy": 0, + "oldfieldname": "in_create", + "oldfieldtype": "Check", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "web_view", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Web View", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "web_view", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Web View", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "has_web_view", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Has Web View", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "has_web_view", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Has Web View", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "depends_on": "has_web_view", - "fieldname": "allow_guest_to_view", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Allow Guest to View", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "depends_on": "has_web_view", + "fieldname": "allow_guest_to_view", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow Guest to View", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_53", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_53", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "has_web_view", - "fieldname": "route", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Route", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "has_web_view", + "fieldname": "route", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Route", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "", - "depends_on": "has_web_view", - "fieldname": "is_published_field", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Is Published Field", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "", + "depends_on": "has_web_view", + "fieldname": "is_published_field", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Is Published Field", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "columns": 0, - "fieldname": "advanced", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Advanced", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "advanced", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Advanced", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "InnoDB", - "depends_on": "eval:!doc.issingle", - "fieldname": "engine", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Database Engine", - "length": 0, - "no_copy": 0, - "options": "InnoDB\nMyISAM", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "InnoDB", + "depends_on": "eval:!doc.issingle", + "fieldname": "engine", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Database Engine", + "length": 0, + "no_copy": 0, + "options": "InnoDB\nMyISAM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-bolt", - "idx": 6, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-09-24 13:57:58.777786", - "modified_by": "chdecultot@dokos.io", - "module": "Core", - "name": "DocType", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "icon": "fa fa-bolt", + "idx": 6, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-09-24 13:57:58.777786", + "modified_by": "chdecultot@dokos.io", + "module": "Core", + "name": "DocType", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "search_fields": "module", - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "search_fields": "module", + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0, "track_views": 0 } \ No newline at end of file diff --git a/frappe/model/document.py b/frappe/model/document.py index 7e52137942..1d14079866 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -213,12 +213,12 @@ class Document(BaseDocument): self.set_docstatus() self.check_if_latest() self.run_method("before_insert") + self._validate_links() self.set_new_name() self.set_parent_in_children() self.validate_higher_perm_levels() self.flags.in_insert = True - self._validate_links() self.run_before_save_methods() self._validate() self.set_docstatus() diff --git a/frappe/model/naming.py b/frappe/model/naming.py index f5b00085fd..648e3689f3 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -88,21 +88,21 @@ def set_name_by_naming_series(doc): def make_autoname(key='', doctype='', doc=''): """ - Creates an autoname from the given key: + Creates an autoname from the given key: - **Autoname rules:** + **Autoname rules:** - * The key is separated by '.' - * '####' represents a series. The string before this part becomes the prefix: - Example: ABC.#### creates a series ABC0001, ABC0002 etc - * 'MM' represents the current month - * 'YY' and 'YYYY' represent the current year + * The key is separated by '.' + * '####' represents a series. The string before this part becomes the prefix: + Example: ABC.#### creates a series ABC0001, ABC0002 etc + * 'MM' represents the current month + * 'YY' and 'YYYY' represent the current year *Example:* - * DE/./.YY./.MM./.##### will create a series like - DE/09/01/0001 where 09 is the year, 01 is the month and 0001 is the series + * DE/./.YY./.MM./.##### will create a series like + DE/09/01/0001 where 09 is the year, 01 is the month and 0001 is the series """ if key == "hash": return frappe.generate_hash(doctype, 10) @@ -121,7 +121,6 @@ def parse_naming_series(parts, doctype='', doc=''): n = '' if isinstance(parts, string_types): parts = parts.split('.') - series_set = False today = now_datetime() for e in parts: @@ -141,6 +140,9 @@ def parse_naming_series(parts, doctype='', doc=''): part = today.strftime('%Y') elif e == 'FY': part = frappe.defaults.get_user_default("fiscal_year") + elif e.startswith('{') and doc: + e = e.replace('{', '').replace('}', '') + part = doc.get(e) elif doc and doc.get(e): part = doc.get(e) else: From 762813a076dfcf6a8251ceae7443ae35357f7cdd Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 8 Jan 2019 23:05:45 +0530 Subject: [PATCH 002/103] feat(dashboard): Create Dashboard page --- frappe/core/page/dashboard/__init__.py | 0 frappe/core/page/dashboard/dashboard.js | 29 +++++++++++++++++++++++ frappe/core/page/dashboard/dashboard.json | 19 +++++++++++++++ frappe/core/page/dashboard/dashboard.py | 10 ++++++++ 4 files changed, 58 insertions(+) create mode 100644 frappe/core/page/dashboard/__init__.py create mode 100644 frappe/core/page/dashboard/dashboard.js create mode 100644 frappe/core/page/dashboard/dashboard.json create mode 100644 frappe/core/page/dashboard/dashboard.py diff --git a/frappe/core/page/dashboard/__init__.py b/frappe/core/page/dashboard/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js new file mode 100644 index 0000000000..d22584b9ba --- /dev/null +++ b/frappe/core/page/dashboard/dashboard.js @@ -0,0 +1,29 @@ +frappe.pages['dashboard'].on_page_load = function(wrapper) { + var page = frappe.ui.make_app_page({ + parent: wrapper, + title: 'Dashboard', + single_column: true + }); + + $(`
+
+
`).appendTo(this.page.main); + + frappe.call({ + method: "frappe.core.page.dashboard.dashboard.get_data", + args: { + dashboard_name: "erpnext.accounts.dashboard.get", + }, + callback: function(message) { + const data = message.message + var chart_args = { + data: { + datasets: data.datasets, + labels: data.labels, + }, + type: 'line', + } + new Chart('.dashboard-graph', chart_args) + } + }) +} \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.json b/frappe/core/page/dashboard/dashboard.json new file mode 100644 index 0000000000..891dcb26f8 --- /dev/null +++ b/frappe/core/page/dashboard/dashboard.json @@ -0,0 +1,19 @@ +{ + "content": null, + "creation": "2019-01-08 19:19:48.073410", + "docstatus": 0, + "doctype": "Page", + "idx": 0, + "modified": "2019-01-08 19:19:48.073410", + "modified_by": "Administrator", + "module": "Core", + "name": "dashboard", + "owner": "Administrator", + "page_name": "Dashboard", + "roles": [], + "script": null, + "standard": "Yes", + "style": null, + "system_page": 0, + "title": "Dashboard" +} \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py new file mode 100644 index 0000000000..f954dee751 --- /dev/null +++ b/frappe/core/page/dashboard/dashboard.py @@ -0,0 +1,10 @@ +# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt +from __future__ import unicode_literals +import frappe + + +@frappe.whitelist() +def get_data(dashboard_name): + results = frappe.get_attr(dashboard_name)() + return results From 8840a179991caafcbd9a70bd853ad1b057dce063 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 9 Jan 2019 11:19:08 +0530 Subject: [PATCH 003/103] feat(dashboard): Add timespan filter --- frappe/core/page/dashboard/dashboard.js | 59 +++++++++++++++++-------- frappe/core/page/dashboard/dashboard.py | 6 ++- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index d22584b9ba..859f0b52c6 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -1,29 +1,50 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { + var me = this var page = frappe.ui.make_app_page({ parent: wrapper, title: 'Dashboard', single_column: true - }); + }) $(`
-
-
`).appendTo(this.page.main); +
+ `).appendTo(this.page.main) - frappe.call({ - method: "frappe.core.page.dashboard.dashboard.get_data", - args: { - dashboard_name: "erpnext.accounts.dashboard.get", - }, - callback: function(message) { - const data = message.message - var chart_args = { - data: { - datasets: data.datasets, - labels: data.labels, - }, - type: 'line', + this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"]; + this.filters = { + timespan: "Week", + } + this.timespan_select = this.page.add_select(__("Timespan"), + this.timespans.map(d => { + return {"label": __(d), value: d } + }) + ) + + this.timespan_select.on("change", function() { + me.filters.timespan = this.value + me.create_chart() + }); + + this.create_chart = function() { + frappe.call({ + method: "frappe.core.page.dashboard.dashboard.get_data", + args: { + dashboard_name: "erpnext.accounts.dashboard.get", + filters: this.filters, + }, + callback: function(message) { + const data = message.message + var chart_args = { + data: { + datasets: data.datasets, + labels: data.labels, + }, + type: 'line', + } + new Chart('#dashboard-graph', chart_args) } - new Chart('.dashboard-graph', chart_args) - } - }) + }) + } + + this.create_chart() } \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index f954dee751..a3f26bb7df 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -1,10 +1,12 @@ # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt from __future__ import unicode_literals +import json import frappe @frappe.whitelist() -def get_data(dashboard_name): - results = frappe.get_attr(dashboard_name)() +def get_data(dashboard_name, filters=None): + filters = json.loads(filters) + results = frappe.get_attr(dashboard_name)(filters=frappe._dict(filters)) return results From 4f247a0ed551576a027f04a435ad9e306c734abe Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 9 Jan 2019 12:51:24 +0530 Subject: [PATCH 004/103] feat(dashboard): Add Time Grain filter --- frappe/core/page/dashboard/dashboard.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 859f0b52c6..e8917514eb 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -11,20 +11,33 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { `).appendTo(this.page.main) this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"]; + this.timegrains = ["Daily", "Weekly", "Monthly", "Quarterly"]; this.filters = { - timespan: "Week", + timespan: "Last Week", + timegrain: "Daily", } - this.timespan_select = this.page.add_select(__("Timespan"), + this.timespan_select = this.page.add_select(__("Time Span"), this.timespans.map(d => { return {"label": __(d), value: d } }) ) + this.timegrain_select = this.page.add_select(__("Time Grain"), + this.timegrains.map(d => { + return {"label": __(d), value: d } + }) + ) + this.timespan_select.on("change", function() { me.filters.timespan = this.value me.create_chart() }); + this.timegrain_select.on("change", function() { + me.filters.timegrain = this.value + me.create_chart() + }); + this.create_chart = function() { frappe.call({ method: "frappe.core.page.dashboard.dashboard.get_data", From 94c474072921061c57355c010ffbcb3cd6feefd4 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Jan 2019 12:22:32 +0530 Subject: [PATCH 005/103] feat(dashbard): Set account from filters --- frappe/core/page/dashboard/dashboard.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index e8917514eb..76f43118fc 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -15,7 +15,22 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { this.filters = { timespan: "Last Week", timegrain: "Daily", + account: "Cash - GTPL", } + + this.account_select = this.page.add_field({ + fieldname: "account", + label: __("Account"), + fieldtype: "Link", + options: "Account", + get_query: { + doctype: "Account", + filters: { + company: "Gadget Technologies Pvt. Ltd.", + } + } + }).$wrapper.find("input") + this.timespan_select = this.page.add_select(__("Time Span"), this.timespans.map(d => { return {"label": __(d), value: d } @@ -27,6 +42,10 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { return {"label": __(d), value: d } }) ) + this.account_select.on("change", function() { + me.filters.account = this.value + me.create_chart() + }); this.timespan_select.on("change", function() { me.filters.timespan = this.value From 6d404c881e6e1ffc1fb665237cce58ddf8a24e32 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Jan 2019 12:49:58 +0530 Subject: [PATCH 006/103] feat(dashboard): Create chart DocType --- frappe/core/doctype/chart/__init__.py | 0 frappe/core/doctype/chart/chart.js | 8 + frappe/core/doctype/chart/chart.json | 193 ++++++++++++++++++++++++ frappe/core/doctype/chart/chart.py | 10 ++ frappe/core/doctype/chart/test_chart.py | 10 ++ 5 files changed, 221 insertions(+) create mode 100644 frappe/core/doctype/chart/__init__.py create mode 100644 frappe/core/doctype/chart/chart.js create mode 100644 frappe/core/doctype/chart/chart.json create mode 100644 frappe/core/doctype/chart/chart.py create mode 100644 frappe/core/doctype/chart/test_chart.py diff --git a/frappe/core/doctype/chart/__init__.py b/frappe/core/doctype/chart/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/chart/chart.js b/frappe/core/doctype/chart/chart.js new file mode 100644 index 0000000000..70d191d079 --- /dev/null +++ b/frappe/core/doctype/chart/chart.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Chart', { + refresh: function(frm) { + + } +}); diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json new file mode 100644 index 0000000000..267e6ad671 --- /dev/null +++ b/frappe/core/doctype/chart/chart.json @@ -0,0 +1,193 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2019-01-10 12:28:06.282875", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_name", + "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": "Chart Name", + "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, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_path", + "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": "Chart Path", + "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, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Chart Type", + "length": 0, + "no_copy": 0, + "options": "Line\nBar", + "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, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_filters_json", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Filters JSON", + "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, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2019-01-10 12:47:50.709263", + "modified_by": "Administrator", + "module": "Core", + "name": "Chart", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "chart_name", + "track_changes": 1, + "track_seen": 0, + "track_views": 0 +} \ No newline at end of file diff --git a/frappe/core/doctype/chart/chart.py b/frappe/core/doctype/chart/chart.py new file mode 100644 index 0000000000..28ba6ba42b --- /dev/null +++ b/frappe/core/doctype/chart/chart.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Chart(Document): + pass diff --git a/frappe/core/doctype/chart/test_chart.py b/frappe/core/doctype/chart/test_chart.py new file mode 100644 index 0000000000..773e956f7b --- /dev/null +++ b/frappe/core/doctype/chart/test_chart.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestChart(unittest.TestCase): + pass From 529536da219869676686a4f9facdd9e2b03dd552 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Jan 2019 12:57:43 +0530 Subject: [PATCH 007/103] feat(dashboard): Create Dashboard DocType --- frappe/core/doctype/dashboard/__init__.py | 0 frappe/core/doctype/dashboard/dashboard.js | 8 ++ frappe/core/doctype/dashboard/dashboard.json | 129 ++++++++++++++++++ frappe/core/doctype/dashboard/dashboard.py | 10 ++ .../core/doctype/dashboard/test_dashboard.py | 10 ++ 5 files changed, 157 insertions(+) create mode 100644 frappe/core/doctype/dashboard/__init__.py create mode 100644 frappe/core/doctype/dashboard/dashboard.js create mode 100644 frappe/core/doctype/dashboard/dashboard.json create mode 100644 frappe/core/doctype/dashboard/dashboard.py create mode 100644 frappe/core/doctype/dashboard/test_dashboard.py diff --git a/frappe/core/doctype/dashboard/__init__.py b/frappe/core/doctype/dashboard/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js new file mode 100644 index 0000000000..2757332f42 --- /dev/null +++ b/frappe/core/doctype/dashboard/dashboard.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Dashboard', { + refresh: function(frm) { + + } +}); diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/core/doctype/dashboard/dashboard.json new file mode 100644 index 0000000000..8a81fd7c87 --- /dev/null +++ b/frappe/core/doctype/dashboard/dashboard.json @@ -0,0 +1,129 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2019-01-10 12:54:40.938705", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "dashboard_name", + "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": "Dashboard Name", + "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, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "charts", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Charts", + "length": 0, + "no_copy": 0, + "options": "Chart", + "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, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2019-01-10 12:54:40.938705", + "modified_by": "Administrator", + "module": "Core", + "name": "Dashboard", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "dashboard_name", + "track_changes": 1, + "track_seen": 0, + "track_views": 0 +} \ No newline at end of file diff --git a/frappe/core/doctype/dashboard/dashboard.py b/frappe/core/doctype/dashboard/dashboard.py new file mode 100644 index 0000000000..acaeb5dc67 --- /dev/null +++ b/frappe/core/doctype/dashboard/dashboard.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Dashboard(Document): + pass diff --git a/frappe/core/doctype/dashboard/test_dashboard.py b/frappe/core/doctype/dashboard/test_dashboard.py new file mode 100644 index 0000000000..ac56d00642 --- /dev/null +++ b/frappe/core/doctype/dashboard/test_dashboard.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestDashboard(unittest.TestCase): + pass From 12dc6c8bb6ae07918598d5e84c50ac138be60ccd Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:00:41 +0530 Subject: [PATCH 008/103] fix(dashboard): Use valid chart type in chart options --- frappe/core/doctype/chart/chart.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json index 267e6ad671..74614ee097 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/core/doctype/chart/chart.json @@ -96,7 +96,7 @@ "label": "Chart Type", "length": 0, "no_copy": 0, - "options": "Line\nBar", + "options": "line\nbar", "permlevel": 0, "precision": "", "print_hide": 0, @@ -153,7 +153,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-10 12:47:50.709263", + "modified": "2019-01-10 17:25:00.980022", "modified_by": "Administrator", "module": "Core", "name": "Chart", From 23ab8e64296d0ac244ab25cc8375bcf9176cd61b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:02:04 +0530 Subject: [PATCH 009/103] fix(dashboard): Do not render single chart by default --- frappe/core/page/dashboard/dashboard.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 76f43118fc..0c485175fa 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -77,6 +77,4 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { } }) } - - this.create_chart() } \ No newline at end of file From 5e85c129c3ccd3461e572c7316652d2357273771 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:05:28 +0530 Subject: [PATCH 010/103] feat(dashboard): Render multiple charts from charts table --- frappe/core/page/dashboard/dashboard.js | 27 +++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 0c485175fa..1168f4e22a 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -6,8 +6,23 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { single_column: true }) + this.route = frappe.get_route() + this.dashboard_name = this.route.slice(-1)[0] + this.dashboard_doc = null + frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => { + this.dashboard_doc = doc + this.charts = this.dashboard_doc.charts + + this.charts.map((chart) => { + var id = `dashboard-chart-${chart.name}` + var chart_wrapper = $(`
`).appendTo($("#dashboard-graph")) + this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json)) + }) + + }) + $(`
-
+
`).appendTo(this.page.main) this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"]; @@ -57,12 +72,12 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { me.create_chart() }); - this.create_chart = function() { + this.create_chart = function(wrapper, chart, filters) { frappe.call({ method: "frappe.core.page.dashboard.dashboard.get_data", args: { - dashboard_name: "erpnext.accounts.dashboard.get", - filters: this.filters, + dashboard_name: chart.chart_path, + filters: filters, }, callback: function(message) { const data = message.message @@ -71,9 +86,9 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { datasets: data.datasets, labels: data.labels, }, - type: 'line', + type: chart.chart_type, } - new Chart('#dashboard-graph', chart_args) + new Chart(wrapper, chart_args) } }) } From 0ad14c04d91a6597f7c87b3a9593ed6da26b7882 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:09:27 +0530 Subject: [PATCH 011/103] fix(dashboard): Change naming for Dashboard DocType --- frappe/core/doctype/dashboard/dashboard.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/core/doctype/dashboard/dashboard.json index 8a81fd7c87..27ddd19a0f 100644 --- a/frappe/core/doctype/dashboard/dashboard.json +++ b/frappe/core/doctype/dashboard/dashboard.json @@ -4,6 +4,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, + "autoname": "field:dashboard_name", "beta": 0, "creation": "2019-01-10 12:54:40.938705", "custom": 0, @@ -43,7 +44,7 @@ "search_index": 0, "set_only_once": 0, "translatable": 0, - "unique": 0 + "unique": 1 }, { "allow_bulk_edit": 0, @@ -89,7 +90,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-10 12:54:40.938705", + "modified": "2019-01-15 12:06:10.126944", "modified_by": "Administrator", "module": "Core", "name": "Dashboard", From 7b7c7b1dc91a5db5598368cb3451c5d5a3eff26b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:14:43 +0530 Subject: [PATCH 012/103] feat(dashboard): Set dashboard name as page title --- frappe/core/page/dashboard/dashboard.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 1168f4e22a..9d71c8830f 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -1,14 +1,16 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { var me = this - var page = frappe.ui.make_app_page({ - parent: wrapper, - title: 'Dashboard', - single_column: true - }) this.route = frappe.get_route() this.dashboard_name = this.route.slice(-1)[0] this.dashboard_doc = null + + var page = frappe.ui.make_app_page({ + parent: wrapper, + title: this.dashboard_name, + single_column: true + }) + frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => { this.dashboard_doc = doc this.charts = this.dashboard_doc.charts From f82a991949a6b8cce01f6796798208d83e08912b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:35:08 +0530 Subject: [PATCH 013/103] feat(dashboard): Add Show Dashboard button --- frappe/core/doctype/dashboard/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js index 2757332f42..1e4e73e482 100644 --- a/frappe/core/doctype/dashboard/dashboard.js +++ b/frappe/core/doctype/dashboard/dashboard.js @@ -3,6 +3,6 @@ frappe.ui.form.on('Dashboard', { refresh: function(frm) { - + frm.add_custom_button("Show Dashboard", () => frappe.set_route('dashboard', frm.doc.name)) } }); From aa3a0a89dd8406bfc2add0dfbd4e5a06f4986785 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:35:45 +0530 Subject: [PATCH 014/103] feat(dashboard): Translate Show Dashboard button label --- frappe/core/doctype/dashboard/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js index 1e4e73e482..9bcd8cf981 100644 --- a/frappe/core/doctype/dashboard/dashboard.js +++ b/frappe/core/doctype/dashboard/dashboard.js @@ -3,6 +3,6 @@ frappe.ui.form.on('Dashboard', { refresh: function(frm) { - frm.add_custom_button("Show Dashboard", () => frappe.set_route('dashboard', frm.doc.name)) + frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name)) } }); From 82bb567ace99add58c20cc394a720246953fafa0 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 12:47:05 +0530 Subject: [PATCH 015/103] fix(dashboard): Remove global filters --- frappe/core/page/dashboard/dashboard.js | 47 ------------------------- 1 file changed, 47 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 9d71c8830f..37cf8620b7 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -27,53 +27,6 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
`).appendTo(this.page.main) - this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"]; - this.timegrains = ["Daily", "Weekly", "Monthly", "Quarterly"]; - this.filters = { - timespan: "Last Week", - timegrain: "Daily", - account: "Cash - GTPL", - } - - this.account_select = this.page.add_field({ - fieldname: "account", - label: __("Account"), - fieldtype: "Link", - options: "Account", - get_query: { - doctype: "Account", - filters: { - company: "Gadget Technologies Pvt. Ltd.", - } - } - }).$wrapper.find("input") - - this.timespan_select = this.page.add_select(__("Time Span"), - this.timespans.map(d => { - return {"label": __(d), value: d } - }) - ) - - this.timegrain_select = this.page.add_select(__("Time Grain"), - this.timegrains.map(d => { - return {"label": __(d), value: d } - }) - ) - this.account_select.on("change", function() { - me.filters.account = this.value - me.create_chart() - }); - - this.timespan_select.on("change", function() { - me.filters.timespan = this.value - me.create_chart() - }); - - this.timegrain_select.on("change", function() { - me.filters.timegrain = this.value - me.create_chart() - }); - this.create_chart = function(wrapper, chart, filters) { frappe.call({ method: "frappe.core.page.dashboard.dashboard.get_data", From de24979f305ee748b1b57c35987259e32c5f4b8d Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 13:12:55 +0530 Subject: [PATCH 016/103] feat(dashboard): Set chart_name as chart title --- frappe/core/page/dashboard/dashboard.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 37cf8620b7..586a2dbc19 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -37,6 +37,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { callback: function(message) { const data = message.message var chart_args = { + title: chart.chart_name, data: { datasets: data.datasets, labels: data.labels, From 9dd0dde020e5af4b81c73deedad4d98e99e3df6b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 13:13:31 +0530 Subject: [PATCH 017/103] rafactor(dashboard): Use capitalized names in chart type --- frappe/core/doctype/chart/chart.json | 4 ++-- frappe/core/page/dashboard/dashboard.js | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json index 74614ee097..dc130dbcb9 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/core/doctype/chart/chart.json @@ -96,7 +96,7 @@ "label": "Chart Type", "length": 0, "no_copy": 0, - "options": "line\nbar", + "options": "Line\nBar", "permlevel": 0, "precision": "", "print_hide": 0, @@ -153,7 +153,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-10 17:25:00.980022", + "modified": "2019-01-15 13:06:10.149493", "modified_by": "Administrator", "module": "Core", "name": "Chart", diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 586a2dbc19..76abb95e4d 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -35,6 +35,10 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { filters: filters, }, callback: function(message) { + const chart_type_map = { + "Line": "line", + "Bar": "bar", + } const data = message.message var chart_args = { title: chart.chart_name, @@ -42,7 +46,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { datasets: data.datasets, labels: data.labels, }, - type: chart.chart_type, + type: chart_type_map[chart.chart_type], } new Chart(wrapper, chart_args) } From 95b501030f79dff8dd673db9f6cfb2e3e214dc3a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 14:32:00 +0530 Subject: [PATCH 018/103] fix(dashboard): Change fieldtype Chart Filters to Code --- frappe/core/doctype/chart/chart.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json index dc130dbcb9..d3fbe031f5 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/core/doctype/chart/chart.json @@ -118,7 +118,7 @@ "collapsible": 0, "columns": 0, "fieldname": "chart_filters_json", - "fieldtype": "Data", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -153,7 +153,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 13:06:10.149493", + "modified": "2019-01-15 14:23:32.211219", "modified_by": "Administrator", "module": "Core", "name": "Chart", From 59ca8942314e76e21919a560567224e8ca73ab4d Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 15 Jan 2019 14:50:31 +0530 Subject: [PATCH 019/103] feat(dashboard): Configurable chart width --- frappe/core/doctype/chart/chart.json | 35 ++++++++++++++++++++++++- frappe/core/page/dashboard/dashboard.js | 10 ++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json index d3fbe031f5..7b6751e116 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/core/doctype/chart/chart.json @@ -141,6 +141,39 @@ "set_only_once": 0, "translatable": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_width", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Chart Width", + "length": 0, + "no_copy": 0, + "options": "Half\nFull", + "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, + "translatable": 0, + "unique": 0 } ], "has_web_view": 0, @@ -153,7 +186,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 14:23:32.211219", + "modified": "2019-01-15 14:46:06.870884", "modified_by": "Administrator", "module": "Core", "name": "Chart", diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 76abb95e4d..a0965fc794 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -17,7 +17,15 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { this.charts.map((chart) => { var id = `dashboard-chart-${chart.name}` - var chart_wrapper = $(`
`).appendTo($("#dashboard-graph")) + + const column_width_map = { + "Half": "6", + "Full": "12", + } + var columns = column_width_map[chart.chart_width] + var chart_wrapper = $(`
`) + chart_wrapper.appendTo($("#dashboard-graph")) + this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json)) }) From 241d13743fd4d86da2d5cec2d140a0b7e509b734 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 13:39:55 +0530 Subject: [PATCH 020/103] refactor(dashboard): Move DocTypes to Desk module - Rename Chart to Dashboard Chart --- .../doctype/chart => desk/doctype/dashboard}/__init__.py | 0 frappe/{core => desk}/doctype/dashboard/dashboard.js | 0 frappe/{core => desk}/doctype/dashboard/dashboard.json | 6 +++--- frappe/{core => desk}/doctype/dashboard/dashboard.py | 0 frappe/{core => desk}/doctype/dashboard/test_dashboard.py | 0 .../dashboard => desk/doctype/dashboard_chart}/__init__.py | 0 .../doctype/dashboard_chart/dashboard_chart.js} | 2 +- .../doctype/dashboard_chart/dashboard_chart.json} | 6 +++--- .../doctype/dashboard_chart/dashboard_chart.py} | 2 +- .../doctype/dashboard_chart/test_dashboard_chart.py} | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename frappe/{core/doctype/chart => desk/doctype/dashboard}/__init__.py (100%) rename frappe/{core => desk}/doctype/dashboard/dashboard.js (100%) rename frappe/{core => desk}/doctype/dashboard/dashboard.json (96%) rename frappe/{core => desk}/doctype/dashboard/dashboard.py (100%) rename frappe/{core => desk}/doctype/dashboard/test_dashboard.py (100%) rename frappe/{core/doctype/dashboard => desk/doctype/dashboard_chart}/__init__.py (100%) rename frappe/{core/doctype/chart/chart.js => desk/doctype/dashboard_chart/dashboard_chart.js} (78%) rename frappe/{core/doctype/chart/chart.json => desk/doctype/dashboard_chart/dashboard_chart.json} (98%) rename frappe/{core/doctype/chart/chart.py => desk/doctype/dashboard_chart/dashboard_chart.py} (88%) rename frappe/{core/doctype/chart/test_chart.py => desk/doctype/dashboard_chart/test_dashboard_chart.py} (79%) diff --git a/frappe/core/doctype/chart/__init__.py b/frappe/desk/doctype/dashboard/__init__.py similarity index 100% rename from frappe/core/doctype/chart/__init__.py rename to frappe/desk/doctype/dashboard/__init__.py diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js similarity index 100% rename from frappe/core/doctype/dashboard/dashboard.js rename to frappe/desk/doctype/dashboard/dashboard.js diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json similarity index 96% rename from frappe/core/doctype/dashboard/dashboard.json rename to frappe/desk/doctype/dashboard/dashboard.json index 27ddd19a0f..e7f2d73784 100644 --- a/frappe/core/doctype/dashboard/dashboard.json +++ b/frappe/desk/doctype/dashboard/dashboard.json @@ -65,7 +65,7 @@ "label": "Charts", "length": 0, "no_copy": 0, - "options": "Chart", + "options": "Dashboard Chart", "permlevel": 0, "precision": "", "print_hide": 0, @@ -90,9 +90,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 12:06:10.126944", + "modified": "2019-01-16 13:35:14.516114", "modified_by": "Administrator", - "module": "Core", + "module": "Desk", "name": "Dashboard", "name_case": "", "owner": "Administrator", diff --git a/frappe/core/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py similarity index 100% rename from frappe/core/doctype/dashboard/dashboard.py rename to frappe/desk/doctype/dashboard/dashboard.py diff --git a/frappe/core/doctype/dashboard/test_dashboard.py b/frappe/desk/doctype/dashboard/test_dashboard.py similarity index 100% rename from frappe/core/doctype/dashboard/test_dashboard.py rename to frappe/desk/doctype/dashboard/test_dashboard.py diff --git a/frappe/core/doctype/dashboard/__init__.py b/frappe/desk/doctype/dashboard_chart/__init__.py similarity index 100% rename from frappe/core/doctype/dashboard/__init__.py rename to frappe/desk/doctype/dashboard_chart/__init__.py diff --git a/frappe/core/doctype/chart/chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js similarity index 78% rename from frappe/core/doctype/chart/chart.js rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 70d191d079..ff84a0a976 100644 --- a/frappe/core/doctype/chart/chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -1,7 +1,7 @@ // Copyright (c) 2019, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on('Chart', { +frappe.ui.form.on('Dashboard Chart', { refresh: function(frm) { } diff --git a/frappe/core/doctype/chart/chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json similarity index 98% rename from frappe/core/doctype/chart/chart.json rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 7b6751e116..8e267759e7 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -186,10 +186,10 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 14:46:06.870884", + "modified": "2019-01-16 13:34:58.802451", "modified_by": "Administrator", - "module": "Core", - "name": "Chart", + "module": "Desk", + "name": "Dashboard Chart", "name_case": "", "owner": "Administrator", "permissions": [ diff --git a/frappe/core/doctype/chart/chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py similarity index 88% rename from frappe/core/doctype/chart/chart.py rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 28ba6ba42b..99c6f9717f 100644 --- a/frappe/core/doctype/chart/chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -class Chart(Document): +class DashboardChart(Document): pass diff --git a/frappe/core/doctype/chart/test_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py similarity index 79% rename from frappe/core/doctype/chart/test_chart.py rename to frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 773e956f7b..a9aa0b2263 100644 --- a/frappe/core/doctype/chart/test_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals import frappe import unittest -class TestChart(unittest.TestCase): +class TestDashboardChart(unittest.TestCase): pass From 8028fef1961bb0df4aedd31053877ef75d70b176 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 14:19:31 +0530 Subject: [PATCH 021/103] refactor(dashboard): Refactor into Class --- frappe/core/page/dashboard/dashboard.js | 128 +++++++++++++++--------- 1 file changed, 78 insertions(+), 50 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index a0965fc794..9d2f1e5822 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -1,63 +1,91 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { - var me = this - this.route = frappe.get_route() - this.dashboard_name = this.route.slice(-1)[0] - this.dashboard_doc = null - var page = frappe.ui.make_app_page({ + let page = frappe.ui.make_app_page({ parent: wrapper, - title: this.dashboard_name, + title: __("Dashboard"), single_column: true }) - frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => { - this.dashboard_doc = doc - this.charts = this.dashboard_doc.charts - - this.charts.map((chart) => { - var id = `dashboard-chart-${chart.name}` - - const column_width_map = { - "Half": "6", - "Full": "12", - } - var columns = column_width_map[chart.chart_width] - var chart_wrapper = $(`
`) - chart_wrapper.appendTo($("#dashboard-graph")) - - this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json)) - }) - + frappe.dashboard = new Dashboard(wrapper) + $(wrapper).bind('show', function() { + frappe.dashboard.show() }) - $(`
-
-
`).appendTo(this.page.main) +} - this.create_chart = function(wrapper, chart, filters) { - frappe.call({ - method: "frappe.core.page.dashboard.dashboard.get_data", - args: { - dashboard_name: chart.chart_path, - filters: filters, - }, - callback: function(message) { - const chart_type_map = { - "Line": "line", - "Bar": "bar", - } - const data = message.message - var chart_args = { - title: chart.chart_name, - data: { - datasets: data.datasets, - labels: data.labels, - }, - type: chart_type_map[chart.chart_type], - } - new Chart(wrapper, chart_args) - } +class Dashboard { + constructor(wrapper) { + this.wrapper = $(wrapper) + $(`
+
+
`).appendTo(this.wrapper.find(".page-content").empty()) + this.container = this.wrapper.find(".dashboard-graph") + this.page = wrapper.page + } + + show() { + this.route = frappe.get_route() + const current_dashboard_name = this.route.slice(-1)[0] + + if(this.dashboard_name !== current_dashboard_name) { + this.dashboard_name = current_dashboard_name + this.page.set_title(this.dashboard_name) + this.refresh() + } + } + + refresh() { + this.get_dashboard_doc().then((doc) => { + this.dashboard_doc = doc + this.charts = this.dashboard_doc.charts + + this.charts.map((chart) => { + this.fetch_and_render_chart(chart); + }) }) } + + fetch_and_render_chart(chart) { + this.fetch_chart(chart).then((data) => this.render_chart(chart, data)) + } + + get_dashboard_doc() { + return frappe.model.with_doc('Dashboard', this.dashboard_name) + } + + fetch_chart(chart) { + return frappe.xcall( + "frappe.core.page.dashboard.dashboard.get_data", + { + dashboard_name: chart.chart_path, + filters: JSON.parse(chart.chart_filters_json), + } + ) + } + + render_chart(chart, data) { + const column_width_map = { + "Half": "6", + "Full": "12", + }; + let columns = column_width_map[chart.chart_width]; + let chart_container = $(`
`); + chart_container.appendTo(this.container); + + + const chart_type_map = { + "Line": "line", + "Bar": "bar", + }; + let chart_args = { + title: chart.chart_name, + data: { + datasets: data.datasets, + labels: data.labels, + }, + type: chart_type_map[chart.chart_type], + }; + new Chart(chart_container.find(".chart-wrapper")[0], chart_args); + } } \ No newline at end of file From 750540f625033ee3f53ad8d21938d8d82bc7fb1e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 14:35:10 +0530 Subject: [PATCH 022/103] refactor(dashboard): Refactor field names --- .../dashboard_chart/dashboard_chart.json | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 8e267759e7..13f089d904 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -52,7 +52,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "chart_path", + "fieldname": "method_path", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, @@ -61,7 +61,7 @@ "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, - "label": "Chart Path", + "label": "Method Path", "length": 0, "no_copy": 0, "permlevel": 0, @@ -84,7 +84,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "chart_type", + "fieldname": "type", "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, @@ -93,7 +93,7 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Chart Type", + "label": "Type", "length": 0, "no_copy": 0, "options": "Line\nBar", @@ -117,7 +117,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "chart_filters_json", + "fieldname": "filters_json", "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, @@ -149,7 +149,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "chart_width", + "fieldname": "width", "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, @@ -158,7 +158,7 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Chart Width", + "label": "Width", "length": 0, "no_copy": 0, "options": "Half\nFull", @@ -174,6 +174,38 @@ "set_only_once": 0, "translatable": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "color", + "fieldtype": "Color", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Color", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 } ], "has_web_view": 0, @@ -186,7 +218,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-16 13:34:58.802451", + "modified": "2019-01-16 14:33:08.565174", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From 8f929e1390e0b1d18afa691510b43f0f0444bfb6 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 14:35:28 +0530 Subject: [PATCH 023/103] feat(dashboard): Add color and styling --- frappe/core/page/dashboard/dashboard.css | 6 ++++++ frappe/core/page/dashboard/dashboard.js | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 frappe/core/page/dashboard/dashboard.css diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css new file mode 100644 index 0000000000..4bf25592f6 --- /dev/null +++ b/frappe/core/page/dashboard/dashboard.css @@ -0,0 +1,6 @@ +.chart-container { + border: 1px solid #d1d8dd; + border-radius: 4px; + margin: 15px 0; + padding: 15px; +} \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 9d2f1e5822..58c14ce350 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -58,8 +58,8 @@ class Dashboard { return frappe.xcall( "frappe.core.page.dashboard.dashboard.get_data", { - dashboard_name: chart.chart_path, - filters: JSON.parse(chart.chart_filters_json), + dashboard_name: chart.method_path, + filters: JSON.parse(chart.filters_json), } ) } @@ -69,7 +69,7 @@ class Dashboard { "Half": "6", "Full": "12", }; - let columns = column_width_map[chart.chart_width]; + let columns = column_width_map[chart.width]; let chart_container = $(`
`); chart_container.appendTo(this.container); @@ -84,7 +84,8 @@ class Dashboard { datasets: data.datasets, labels: data.labels, }, - type: chart_type_map[chart.chart_type], + type: chart_type_map[chart.type], + colors: [chart.color || "light-blue"], }; new Chart(chart_container.find(".chart-wrapper")[0], chart_args); } From 21ae89e721123043564495c19366d75776bb2618 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 15:54:41 +0530 Subject: [PATCH 024/103] feat(code-editor): Add JSON language for Code Editor --- frappe/public/js/frappe/form/controls/code.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 9d6f705523..4e4a79201e 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -32,7 +32,8 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({ 'HTML': 'ace/mode/html', 'CSS': 'ace/mode/css', 'Markdown': 'ace/mode/markdown', - 'SCSS': 'ace/mode/scss' + 'SCSS': 'ace/mode/scss', + 'JSON': 'ace/mode/json' }; const language = this.df.options; From cc0ea4f5ef6d2d88abaa5a44e646f1a16d9d8490 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 15:55:16 +0530 Subject: [PATCH 025/103] feat(dashboard): Add dropdown menu to set filters --- frappe/core/page/dashboard/dashboard.css | 10 +++++ frappe/core/page/dashboard/dashboard.js | 39 ++++++++++++++++++- .../dashboard_chart/dashboard_chart.json | 36 ++++++++++++++++- 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css index 4bf25592f6..66a7e8aa36 100644 --- a/frappe/core/page/dashboard/dashboard.css +++ b/frappe/core/page/dashboard/dashboard.css @@ -3,4 +3,14 @@ border-radius: 4px; margin: 15px 0; padding: 15px; +} + +.chart-actions { + position: absolute; + right: 30px; + top: 30px; +} + +.chart-column-container { + position: relative; } \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 58c14ce350..264498d30a 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -65,12 +65,49 @@ class Dashboard { } render_chart(chart, data) { + chart.filter_fields = JSON.parse(chart.filter_fields || '[]') + chart.filters_json = JSON.parse(chart.filters_json || '{}') + const column_width_map = { "Half": "6", "Full": "12", }; let columns = column_width_map[chart.width]; - let chart_container = $(`
`); + let actions = [ + { + label: __("More"), + action: "more", + handler() { + const d = new frappe.ui.Dialog({ + title: __('Set Filters'), + fields: chart.filter_fields + }) + d.set_values(chart.filters_json) + d.show(); + } + } + ] + + let chart_action = $(`
+ + +
+ `); + + chart_action.find("a[data-action]").each((i, o) => { + const action = o.dataset.action + $(o).click(actions.find(a => a.action === action)) + }) + + + let chart_container = $(`
+
+
`); + chart_action.prependTo(chart_container) chart_container.appendTo(this.container); diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 13f089d904..b6ac598854 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -129,6 +129,7 @@ "label": "Filters JSON", "length": 0, "no_copy": 0, + "options": "JSON", "permlevel": 0, "precision": "", "print_hide": 0, @@ -206,6 +207,39 @@ "set_only_once": 0, "translatable": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "filter_fields", + "fieldtype": "Code", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Filter Fields", + "length": 0, + "no_copy": 0, + "options": "JSON", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 } ], "has_web_view": 0, @@ -218,7 +252,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-16 14:33:08.565174", + "modified": "2019-01-16 15:22:10.760396", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From 499ddf53927c1ce3d386c443a6b927cbaf5cb467 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 16:20:00 +0530 Subject: [PATCH 026/103] refactor(dashboard): Rename More to Set Filters --- frappe/core/page/dashboard/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 264498d30a..e4f7b9c08e 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -75,8 +75,8 @@ class Dashboard { let columns = column_width_map[chart.width]; let actions = [ { - label: __("More"), - action: "more", + label: __("Set Filters"), + action: "set-filters", handler() { const d = new frappe.ui.Dialog({ title: __('Set Filters'), From f7f1aca59edf8a556abd64cf050cbfd74f67d58c Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 16:20:34 +0530 Subject: [PATCH 027/103] feat(dashboard): Add Refresh Chart button --- frappe/core/page/dashboard/dashboard.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index e4f7b9c08e..fe1a679969 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -85,6 +85,12 @@ class Dashboard { d.set_values(chart.filters_json) d.show(); } + }, + { + label: __("Refresh Chart"), + action: "refresh-chart", + handler() { + } } ] From 05da0a491602e7d57f45cb8810430e735f823e60 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 17:37:26 +0530 Subject: [PATCH 028/103] feat(dashboard): Cache results for Chart --- frappe/core/page/dashboard/dashboard.css | 7 ++++ frappe/core/page/dashboard/dashboard.js | 22 +++++++----- frappe/core/page/dashboard/dashboard.py | 26 ++++++++++++-- .../dashboard_chart/dashboard_chart.json | 34 ++++++++++++++++++- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css index 66a7e8aa36..e998997f67 100644 --- a/frappe/core/page/dashboard/dashboard.css +++ b/frappe/core/page/dashboard/dashboard.css @@ -13,4 +13,11 @@ .chart-column-container { position: relative; +} + +.last-synced-text { + position: absolute; + top: 34px; + right: 60px; + font-size: 10px; } \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index fe1a679969..5f53c41eea 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -33,6 +33,7 @@ class Dashboard { this.page.set_title(this.dashboard_name) this.refresh() } + this.charts = {} } refresh() { @@ -42,6 +43,8 @@ class Dashboard { this.charts.map((chart) => { this.fetch_and_render_chart(chart); + chart.filters_json = JSON.parse(chart.filters_json || '{}') + chart.filter_fields = JSON.parse(chart.filter_fields || '[]') }) }) } @@ -54,25 +57,23 @@ class Dashboard { return frappe.model.with_doc('Dashboard', this.dashboard_name) } - fetch_chart(chart) { + fetch_chart(chart, refresh=false) { return frappe.xcall( "frappe.core.page.dashboard.dashboard.get_data", { - dashboard_name: chart.method_path, - filters: JSON.parse(chart.filters_json), + chart_name: chart.name, + refresh: refresh, } ) } render_chart(chart, data) { - chart.filter_fields = JSON.parse(chart.filter_fields || '[]') - chart.filters_json = JSON.parse(chart.filters_json || '{}') - const column_width_map = { "Half": "6", "Full": "12", }; let columns = column_width_map[chart.width]; + var me = this let actions = [ { label: __("Set Filters"), @@ -87,13 +88,15 @@ class Dashboard { } }, { - label: __("Refresh Chart"), - action: "refresh-chart", + label: __("Force Refresh"), + action: "force-refresh", handler() { + me.fetch_chart(chart, true).then(data => {console.log(data);me.charts[chart.name].update(data)}) } } ] + let last_synced_text = $(`${__("Last synced {0}", [comment_when(chart.last_synced_on)])}`) let chart_action = $(`
- -
- `); + // var me = this + // let actions = [ + // { + // label: __("Set Filters"), + // action: "set-filters", + // handler() { + // const d = new frappe.ui.Dialog({ + // title: __('Set Filters'), + // fields: chart.filter_fields, + // primary_action: function() { + // const values = this.get_values() + // if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) { + // frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => { + // me.fetch_chart(chart).then(data => { + // me.charts[chart.name].update(data) + // }) + // }) + // } + // this.hide() + // }, + // primary_action_label: __('Save Filters') + // }) + // d.set_values(chart.filters_json) + // d.show(); + // } + // }, + // { + // label: __("Force Refresh"), + // action: "force-refresh", + // handler() { + // me.fetch_chart(chart, true).then(data => { + // me.charts[chart.name].update(data) + // }) + // } + // } + // ] - chart_action.find("a[data-action]").each((i, o) => { - const action = o.dataset.action - $(o).click(actions.find(a => a.action === action)) - }) + // let last_synced_text = $(`${__("Last synced {0}", [comment_when(chart.last_synced_on)])}`) + // let chart_action = $(`
+ // + // + //
+ // `); + + // chart_action.find("a[data-action]").each((i, o) => { + // const action = o.dataset.action + // $(o).click(actions.find(a => a.action === action)) + // }) - let chart_container = $(`
-
-
`); - chart_action.prependTo(chart_container) - last_synced_text.prependTo(chart_container) - chart_container.appendTo(this.container); + // chart_action.prependTo(chart_container) + // last_synced_text.prependTo(chart_container) const chart_type_map = { "Line": "line", "Bar": "bar", - }; + } let chart_args = { - title: chart.chart_name, + title: this.chart_doc.chart_name, data: { - datasets: data.datasets, - labels: data.labels, + datasets: this.data.datasets, + labels: this.data.labels, }, - type: chart_type_map[chart.type], - colors: [chart.color || "light-blue"], + type: chart_type_map[this.chart_doc.type], + colors: [this.chart_doc.color || "light-blue"], }; - this.charts[chart.name] = new Chart(chart_container.find(".chart-wrapper")[0], chart_args); + this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args); } + } \ No newline at end of file From ba23476141ecc65721291739c6158795a0d4432a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 19:36:23 +0530 Subject: [PATCH 032/103] refactor(dashboard): Update last_synced_on on forced refresh --- frappe/core/page/dashboard/dashboard.js | 152 +++++++++++++----------- 1 file changed, 85 insertions(+), 67 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index d8c9e2930f..b5b3448214 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -63,9 +63,7 @@ class DashboardChart { } show() { - this.filters = JSON.parse(this.chart_doc.filters_json || '{}') - this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]') - + this.prepare_chart_object() this.prepare_container() this.fetch().then((data) => { @@ -84,6 +82,66 @@ class DashboardChart {
`) this.chart_container.appendTo(this.container) + + let last_synced_text = $(``) + last_synced_text.prependTo(this.chart_container) + + let actions = [ + { + label: __("Set Filters"), + action: "set-filters", + handler: () => { + const d = new frappe.ui.Dialog({ + title: __('Set Filters'), + fields: this.filter_fields, + primary_action: () => { + const values = d.get_values() + if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { + frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { + this.fetch().then(data => { + this.data = data + this.render() + }) + }) + } + d.hide() + }, + primary_action_label: __('Save Filters') + }) + d.set_values(this.filters) + d.show(); + } + }, + { + label: __("Force Refresh"), + action: "force-refresh", + handler: () => { + this.fetch(true).then(data => { + this.data = data + this.chart_doc.last_synced_on = new Date() + this.render() + }) + } + } + ] + + this.chart_actions = $(`
+ + +
+ `); + + this.chart_actions.find("a[data-action]").each((i, o) => { + const action = o.dataset.action + $(o).click(actions.find(a => a.action === action)) + }) + + this.chart_actions.prependTo(this.chart_container) + } fetch(refresh=false) { @@ -97,79 +155,39 @@ class DashboardChart { } render() { - - // var me = this - // let actions = [ - // { - // label: __("Set Filters"), - // action: "set-filters", - // handler() { - // const d = new frappe.ui.Dialog({ - // title: __('Set Filters'), - // fields: chart.filter_fields, - // primary_action: function() { - // const values = this.get_values() - // if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) { - // frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => { - // me.fetch_chart(chart).then(data => { - // me.charts[chart.name].update(data) - // }) - // }) - // } - // this.hide() - // }, - // primary_action_label: __('Save Filters') - // }) - // d.set_values(chart.filters_json) - // d.show(); - // } - // }, - // { - // label: __("Force Refresh"), - // action: "force-refresh", - // handler() { - // me.fetch_chart(chart, true).then(data => { - // me.charts[chart.name].update(data) - // }) - // } - // } - // ] - - // let last_synced_text = $(`${__("Last synced {0}", [comment_when(chart.last_synced_on)])}`) - // let chart_action = $(`
- // - // - //
- // `); - - // chart_action.find("a[data-action]").each((i, o) => { - // const action = o.dataset.action - // $(o).click(actions.find(a => a.action === action)) - // }) - - - - // chart_action.prependTo(chart_container) - // last_synced_text.prependTo(chart_container) - + this.update_last_synced() const chart_type_map = { "Line": "line", "Bar": "bar", } let chart_args = { title: this.chart_doc.chart_name, - data: { - datasets: this.data.datasets, - labels: this.data.labels, - }, + data: this.data, type: chart_type_map[this.chart_doc.type], colors: [this.chart_doc.color || "light-blue"], }; - this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args); + if(!this.chart) { + this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args); + } + else { + this.chart.update(this.data) + } } + update_last_synced() { + let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]) + this.container.find(".last-synced-text").html(last_synced_text) + } + + update_chart_object() { + frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => { + this.chart_doc = doc + this.prepare_chart_object() + }) + } + + prepare_chart_object() { + this.filters = JSON.parse(this.chart_doc.filters_json || '{}') + this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]') + } } \ No newline at end of file From 17d17f13621e152784fc20bda5b7575939ff92c8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 20:02:29 +0530 Subject: [PATCH 033/103] fix(dashboard): Add missing semicolons --- frappe/core/page/dashboard/dashboard.js | 120 ++++++++++++------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index b5b3448214..906020880f 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -5,86 +5,86 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { parent: wrapper, title: __("Dashboard"), single_column: true - }) + }); - frappe.dashboard = new Dashboard(wrapper) + frappe.dashboard = new Dashboard(wrapper); $(wrapper).bind('show', function() { - frappe.dashboard.show() - }) + frappe.dashboard.show(); + }); } class Dashboard { constructor(wrapper) { - this.wrapper = $(wrapper) + this.wrapper = $(wrapper); $(`
-
`).appendTo(this.wrapper.find(".page-content").empty()) - this.container = this.wrapper.find(".dashboard-graph") - this.page = wrapper.page +
`).appendTo(this.wrapper.find(".page-content").empty()); + this.container = this.wrapper.find(".dashboard-graph"); + this.page = wrapper.page; } show() { - this.route = frappe.get_route() - const current_dashboard_name = this.route.slice(-1)[0] + this.route = frappe.get_route(); + const current_dashboard_name = this.route.slice(-1)[0]; if(this.dashboard_name !== current_dashboard_name) { - this.dashboard_name = current_dashboard_name - this.page.set_title(this.dashboard_name) - this.refresh() + this.dashboard_name = current_dashboard_name; + this.page.set_title(this.dashboard_name); + this.refresh(); } - this.charts = {} + this.charts = {}; } refresh() { this.get_dashboard_doc().then((doc) => { - this.dashboard_doc = doc - this.charts = this.dashboard_doc.charts + this.dashboard_doc = doc; + this.charts = this.dashboard_doc.charts; this.charts.map((chart_doc) => { - let chart_container = $("
") - chart_container.appendTo(this.container) + let chart_container = $("
"); + chart_container.appendTo(this.container); - let dashboard_chart = new DashboardChart(chart_doc, chart_container) - dashboard_chart.show() - }) + let dashboard_chart = new DashboardChart(chart_doc, chart_container); + dashboard_chart.show(); + }); }) } get_dashboard_doc() { - return frappe.model.with_doc('Dashboard', this.dashboard_name) + return frappe.model.with_doc('Dashboard', this.dashboard_name); } } class DashboardChart { constructor(chart_doc, chart_container) { - this.chart_doc = chart_doc - this.container = chart_container + this.chart_doc = chart_doc; + this.container = chart_container; } show() { - this.prepare_chart_object() - this.prepare_container() + this.prepare_chart_object(); + this.prepare_container(); this.fetch().then((data) => { - this.data = data - this.render() - }) + this.data = data; + this.render(); + }); } prepare_container() { const column_width_map = { "Half": "6", "Full": "12", - } - let columns = column_width_map[this.chart_doc.width] + }; + let columns = column_width_map[this.chart_doc.width]; this.chart_container = $(`
-
`) - this.chart_container.appendTo(this.container) +
`); + this.chart_container.appendTo(this.container); - let last_synced_text = $(``) - last_synced_text.prependTo(this.chart_container) + let last_synced_text = $(``); + last_synced_text.prependTo(this.chart_container); let actions = [ { @@ -95,20 +95,20 @@ class DashboardChart { title: __('Set Filters'), fields: this.filter_fields, primary_action: () => { - const values = d.get_values() + const values = d.get_values(); if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { this.fetch().then(data => { - this.data = data - this.render() + this.data = data; + this.render(); }) - }) + }); } - d.hide() + d.hide(); }, - primary_action_label: __('Save Filters') + primary_action_label: __('Save Filters'); }) - d.set_values(this.filters) + d.set_values(this.filters); d.show(); } }, @@ -117,9 +117,9 @@ class DashboardChart { action: "force-refresh", handler: () => { this.fetch(true).then(data => { - this.data = data - this.chart_doc.last_synced_on = new Date() - this.render() + this.data = data; + this.chart_doc.last_synced_on = new Date(); + this.render(); }) } } @@ -136,11 +136,11 @@ class DashboardChart { `); this.chart_actions.find("a[data-action]").each((i, o) => { - const action = o.dataset.action - $(o).click(actions.find(a => a.action === action)) - }) + const action = o.dataset.action; + $(o).click(actions.find(a => a.action === action)); + }); - this.chart_actions.prependTo(this.chart_container) + this.chart_actions.prependTo(this.chart_container); } @@ -151,15 +151,15 @@ class DashboardChart { chart_name: this.chart_doc.name, refresh: refresh, } - ) + ); } render() { - this.update_last_synced() + this.update_last_synced(); const chart_type_map = { "Line": "line", "Bar": "bar", - } + }; let chart_args = { title: this.chart_doc.chart_name, data: this.data, @@ -170,24 +170,24 @@ class DashboardChart { this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args); } else { - this.chart.update(this.data) + this.chart.update(this.data); } } update_last_synced() { - let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]) - this.container.find(".last-synced-text").html(last_synced_text) + let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]); + this.container.find(".last-synced-text").html(last_synced_text); } update_chart_object() { frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => { - this.chart_doc = doc - this.prepare_chart_object() - }) + this.chart_doc = doc; + this.prepare_chart_object(); + }); } prepare_chart_object() { - this.filters = JSON.parse(this.chart_doc.filters_json || '{}') - this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]') + this.filters = JSON.parse(this.chart_doc.filters_json || '{}'); + this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]'); } } \ No newline at end of file From 277969ecfc1f2d58f7d964e33628c301bbe2476c Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 20:06:00 +0530 Subject: [PATCH 034/103] fix(dashboard: Remove empty lines --- frappe/core/page/dashboard/dashboard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 906020880f..71f5b0361a 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -1,7 +1,5 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { - - - let page = frappe.ui.make_app_page({ + frappe.ui.make_app_page({ parent: wrapper, title: __("Dashboard"), single_column: true @@ -11,7 +9,6 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { $(wrapper).bind('show', function() { frappe.dashboard.show(); }); - } class Dashboard { From ea2019cecaf9245b94412411a4e24ae5e942374a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 20:51:50 +0530 Subject: [PATCH 035/103] refactor(dashboard): Make Dashboard Chart Form View pretty --- .../dashboard_chart/dashboard_chart.json | 256 +++++++++++++++--- 1 file changed, 222 insertions(+), 34 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 14c719f9d7..fa606abb88 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -45,6 +45,37 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -77,6 +108,38 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_details_section", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Chart Details", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -110,39 +173,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "filters_json", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Filters JSON", - "length": 0, - "no_copy": 0, - "options": "JSON", - "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, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -176,6 +206,37 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -208,6 +269,69 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "filter_details_section", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Filter Details", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_9", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -272,6 +396,70 @@ "set_only_once": 0, "translatable": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_11", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "filters_json", + "fieldtype": "Code", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Filters JSON", + "length": 0, + "no_copy": 0, + "options": "JSON", + "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, + "translatable": 0, + "unique": 0 } ], "has_web_view": 0, @@ -284,7 +472,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-16 17:05:48.904556", + "modified": "2019-01-16 20:10:54.811477", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From 2b86047535ceba6b1107938a7845320f4734ae86 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 20:53:23 +0530 Subject: [PATCH 036/103] fix(dashboard): Show currently set values in Dialog --- frappe/core/page/dashboard/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 71f5b0361a..4f9c172bf7 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -62,8 +62,8 @@ class DashboardChart { show() { this.prepare_chart_object(); this.prepare_container(); - this.fetch().then((data) => { + this.update_last_synced(); this.data = data; this.render(); }); @@ -114,8 +114,8 @@ class DashboardChart { action: "force-refresh", handler: () => { this.fetch(true).then(data => { + this.update_chart_object(); this.data = data; - this.chart_doc.last_synced_on = new Date(); this.render(); }) } @@ -152,7 +152,6 @@ class DashboardChart { } render() { - this.update_last_synced(); const chart_type_map = { "Line": "line", "Bar": "bar", @@ -180,6 +179,7 @@ class DashboardChart { frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => { this.chart_doc = doc; this.prepare_chart_object(); + this.update_last_synced(); }); } From 4c436b97f9e6cad6b3fce315c8891d67c9bf869e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 20:53:58 +0530 Subject: [PATCH 037/103] feat(dashboard): Show Save Filters button after change in filters --- frappe/core/page/dashboard/dashboard.js | 35 +++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 4f9c172bf7..66d1b0ecf3 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -91,22 +91,29 @@ class DashboardChart { const d = new frappe.ui.Dialog({ title: __('Set Filters'), fields: this.filter_fields, - primary_action: () => { - const values = d.get_values(); - if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { - frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { - this.fetch().then(data => { - this.data = data; - this.render(); - }) - }); - } - d.hide(); - }, - primary_action_label: __('Save Filters'); - }) + }); d.set_values(this.filters); d.show(); + + const set_filters = () => { + const values = d.get_values(); + if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { + frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { + this.fetch().then(data => { + this.update_chart_object(); + this.data = data; + this.render(); + }) + }); + } + d.hide(); + } + + this.filter_fields.map(field => field.onchange = e => { + if(e) { + d.set_primary_action(__('Save Filters'), set_filters); + } + }); } }, { From f805a2f4bbbcd8d4ffa4ae712d356dc64c5f1baf Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 21:52:10 +0530 Subject: [PATCH 038/103] style: Linting fixes --- frappe/core/page/dashboard/dashboard.js | 15 +++++++-------- frappe/desk/doctype/dashboard/dashboard.js | 2 +- frappe/desk/doctype/dashboard/dashboard.py | 1 - frappe/desk/doctype/dashboard/test_dashboard.py | 1 - .../doctype/dashboard_chart/dashboard_chart.py | 1 - .../dashboard_chart/test_dashboard_chart.py | 1 - 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 66d1b0ecf3..655bbe7444 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -9,7 +9,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) { $(wrapper).bind('show', function() { frappe.dashboard.show(); }); -} +}; class Dashboard { constructor(wrapper) { @@ -45,7 +45,7 @@ class Dashboard { let dashboard_chart = new DashboardChart(chart_doc, chart_container); dashboard_chart.show(); }); - }) + }); } get_dashboard_doc() { @@ -103,11 +103,11 @@ class DashboardChart { this.update_chart_object(); this.data = data; this.render(); - }) + }); }); } d.hide(); - } + }; this.filter_fields.map(field => field.onchange = e => { if(e) { @@ -124,10 +124,10 @@ class DashboardChart { this.update_chart_object(); this.data = data; this.render(); - }) + }); } } - ] + ]; this.chart_actions = $(`
frappe.set_route('dashboard', frm.doc.name)) + frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name)); } }); diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py index acaeb5dc67..fae0585161 100644 --- a/frappe/desk/doctype/dashboard/dashboard.py +++ b/frappe/desk/doctype/dashboard/dashboard.py @@ -3,7 +3,6 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe from frappe.model.document import Document class Dashboard(Document): diff --git a/frappe/desk/doctype/dashboard/test_dashboard.py b/frappe/desk/doctype/dashboard/test_dashboard.py index ac56d00642..d5485d8f70 100644 --- a/frappe/desk/doctype/dashboard/test_dashboard.py +++ b/frappe/desk/doctype/dashboard/test_dashboard.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestDashboard(unittest.TestCase): diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 99c6f9717f..5ff00ac43b 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -3,7 +3,6 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe from frappe.model.document import Document class DashboardChart(Document): diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index a9aa0b2263..5c22f62276 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestDashboardChart(unittest.TestCase): From f41eb39b13784391c94dc266fb69afc5b48b388e Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 09:37:13 +0530 Subject: [PATCH 039/103] feat(dashboard): Create Dashboard Chart Source doctype --- .../dashboard_chart_source/__init__.py | 0 .../dashboard_chart_source.js | 8 ++ .../dashboard_chart_source.json | 130 ++++++++++++++++++ .../dashboard_chart_source.py | 17 +++ .../test_dashboard_chart_source.py | 10 ++ 5 files changed, 165 insertions(+) create mode 100644 frappe/desk/doctype/dashboard_chart_source/__init__.py create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py create mode 100644 frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py diff --git a/frappe/desk/doctype/dashboard_chart_source/__init__.py b/frappe/desk/doctype/dashboard_chart_source/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js new file mode 100644 index 0000000000..7218f2b86c --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Dashboard Chart Source', { + refresh: function(frm) { + + } +}); diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json new file mode 100644 index 0000000000..a87b2bf9b9 --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json @@ -0,0 +1,130 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:source_name", + "beta": 0, + "creation": "2019-02-06 07:55:29.579840", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "source_name", + "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": "Source Name", + "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, + "translatable": 0, + "unique": 1 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "module", + "fieldtype": "Link", + "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": "Module", + "length": 0, + "no_copy": 0, + "options": "Module Def", + "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, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2019-02-06 07:55:31.898604", + "modified_by": "Administrator", + "module": "Desk", + "name": "Dashboard Chart Source", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "", + "track_changes": 1, + "track_seen": 0, + "track_views": 0 +} \ No newline at end of file diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py new file mode 100644 index 0000000000..048d2bc588 --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document +from frappe.modules.export_file import export_to_files + + +class DashboardChartSource(Document): + def validate(self): + if frappe.session.user != "Administrator": + frappe.throw(_("Only Administrator allowed to create Dashboard Chart Sources")) + + def on_update(self): + export_to_files(record_list=[[self.doctype, self.name]], record_module=self.module, create_init=True) diff --git a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py new file mode 100644 index 0000000000..1247240ff1 --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestDashboardChartSource(unittest.TestCase): + pass From ab6e1a312cdc8f0bd4e82db4619ed95f402f70cb Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 09:37:46 +0530 Subject: [PATCH 040/103] feat(dashboard): Show filters in a table --- .../dashboard_chart/dashboard_chart.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index ff84a0a976..d902616147 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -2,6 +2,30 @@ // For license information, please see license.txt frappe.ui.form.on('Dashboard Chart', { + onload: function(frm) { + var wrapper = $(frm.fields_dict["filters_json"].wrapper).empty(); + let filter_table = $(` + + + + + + + +
${ __("Filter") }${ __("Value") }
`); + + const filters = JSON.parse(frm.doc.filters_json); + + Object.keys(filters).forEach(key => { + const filter_row = $(` + ${frappe.model.unscrub(key)} + ${filters[key]} + `); + filter_table.find('tbody').append(filter_row); + }); + + wrapper.append(filter_table); + }, refresh: function(frm) { } From 7ba50fa48edea9475014578bd14e35203f4d99bc Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 09:39:18 +0530 Subject: [PATCH 041/103] refactor(dashboard): Fetch filter fields from .js file --- frappe/core/page/dashboard/dashboard.js | 47 +++- frappe/core/page/dashboard/dashboard.py | 19 ++ .../dashboard_chart/dashboard_chart.json | 222 +++++++----------- 3 files changed, 134 insertions(+), 154 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 655bbe7444..cf082d8d27 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -1,3 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors +// MIT License. See license.txt + +frappe.provide("frappe.dashboard_chart_sources"); + frappe.pages['dashboard'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, @@ -60,12 +65,14 @@ class DashboardChart { } show() { - this.prepare_chart_object(); - this.prepare_container(); - this.fetch().then((data) => { - this.update_last_synced(); - this.data = data; - this.render(); + this.get_settings().then(() => { + this.prepare_chart_object(); + this.prepare_container(); + this.fetch().then((data) => { + this.update_last_synced(); + this.data = data; + this.render(); + }); }); } @@ -90,7 +97,7 @@ class DashboardChart { handler: () => { const d = new frappe.ui.Dialog({ title: __('Set Filters'), - fields: this.filter_fields, + fields: this.settings.filters, }); d.set_values(this.filters); d.show(); @@ -109,7 +116,7 @@ class DashboardChart { d.hide(); }; - this.filter_fields.map(field => field.onchange = e => { + this.settings.filters.map(field => field.onchange = e => { if(e) { d.set_primary_action(__('Save Filters'), set_filters); } @@ -150,10 +157,9 @@ class DashboardChart { fetch(refresh=false) { return frappe.xcall( - "frappe.core.page.dashboard.dashboard.get_data", + this.settings.method_path, { - chart_name: this.chart_doc.name, - refresh: refresh, + filters: this.filters, } ); } @@ -191,6 +197,23 @@ class DashboardChart { prepare_chart_object() { this.filters = JSON.parse(this.chart_doc.filters_json || '{}'); - this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]'); + } + + get_settings() { + if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[this.chart_doc.source]) { + return this._load_script; + } + this._load_script = new Promise(resolve => frappe.call({ + method: 'frappe.core.page.dashboard.dashboard.get_script', + args: { + source_name: this.chart_doc.source + }, + callback: result => { + frappe.dom.eval(result.message.script || ''); + this.settings = frappe.dashboard_chart_sources[this.chart_doc.source]; + resolve(); + } + })); + return this._load_script; } } \ No newline at end of file diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index e88d990788..3c3aae3800 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -2,7 +2,10 @@ # MIT License. See license.txt from __future__ import unicode_literals import json +import os import frappe +from frappe.modules import get_module_path +from frappe.model.utils import render_include @frappe.whitelist() @@ -30,3 +33,19 @@ def generate_and_cache_results(chart, filters, cache_key): frappe.cache().set_value(cache_key, json.dumps(results, default=str)) frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now()) return results + + +@frappe.whitelist() +def get_script(source_name): + source = frappe.get_doc("Dashboard Chart Source", source_name) + module_path = get_module_path(source.module) + scrubbed_source_name = frappe.scrub(source_name) + script_path = os.path.join(module_path, "dashboard_chart_source", scrubbed_source_name, scrubbed_source_name + ".js") + + if os.path.exists(script_path): + with open(script_path, "r") as f: + script = f.read() + + return { + "script": render_include(script), + } diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index fa606abb88..9cb71f2a34 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -4,6 +4,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, + "autoname": "field:chart_name", "beta": 0, "creation": "2019-01-10 12:28:06.282875", "custom": 0, @@ -43,7 +44,7 @@ "search_index": 0, "set_only_once": 0, "translatable": 0, - "unique": 0 + "unique": 1 }, { "allow_bulk_edit": 0, @@ -52,7 +53,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_2", + "fieldname": "column_break_6", "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, @@ -83,18 +84,19 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "method_path", - "fieldtype": "Data", + "fieldname": "source", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 1, + "in_list_view": 0, "in_standard_filter": 0, - "label": "Method Path", + "label": "Chart Source", "length": 0, "no_copy": 0, + "options": "Dashboard Chart Source", "permlevel": 0, "precision": "", "print_hide": 0, @@ -115,7 +117,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "chart_details_section", + "fieldname": "filters_section", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, @@ -124,7 +126,72 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Chart Details", + "label": "Filters", + "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": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "filters_json", + "fieldtype": "Code", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Filters JSON", + "length": 0, + "no_copy": 0, + "options": "JSON", + "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, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "chart_options_section", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Chart Options", "length": 0, "no_copy": 0, "permlevel": 0, @@ -213,7 +280,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_6", + "fieldname": "column_break_2", "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, @@ -276,7 +343,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "filter_details_section", + "fieldname": "section_break_10", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, @@ -285,7 +352,6 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Filter Details", "length": 0, "no_copy": 0, "permlevel": 0, @@ -301,70 +367,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_9", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "filter_fields", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Filter Fields", - "length": 0, - "no_copy": 0, - "options": "JSON", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -388,7 +390,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -396,70 +398,6 @@ "set_only_once": 0, "translatable": 0, "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_11", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "filters_json", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Filters JSON", - "length": 0, - "no_copy": 0, - "options": "JSON", - "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, - "translatable": 0, - "unique": 0 } ], "has_web_view": 0, @@ -472,7 +410,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-16 20:10:54.811477", + "modified": "2019-02-06 09:27:26.109148", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", @@ -505,7 +443,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", - "title_field": "chart_name", + "title_field": "", "track_changes": 1, "track_seen": 0, "track_views": 0 From 310086c88f0dcba4b550b9f630c25c13f7cf3871 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 09:40:08 +0530 Subject: [PATCH 042/103] feat(dashboard): Create Dashboard Chart Source docs from exported files --- frappe/model/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index e59944bb1b..18bf827c5f 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -68,7 +68,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F """walk and sync all doctypes and pages""" # load in sequence - warning for devs - document_types = ['doctype', 'page', 'report', 'print_format', + document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'notification', 'print_style', 'data_migration_mapping', 'data_migration_plan'] for doctype in document_types: From 60951d00f844c98d65830eaf83f13fbd5d8c7730 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:15:01 +0530 Subject: [PATCH 043/103] feat(dashboard): New cache_source decorator for caching --- frappe/core/page/dashboard/dashboard.js | 2 ++ frappe/core/page/dashboard/dashboard.py | 40 ++++++++++++------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index cf082d8d27..2edfe578cf 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -159,7 +159,9 @@ class DashboardChart { return frappe.xcall( this.settings.method_path, { + chart_name: this.chart_doc.name, filters: this.filters, + refresh: refresh, } ); } diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index 3c3aae3800..a9717d41c4 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -8,30 +8,30 @@ from frappe.modules import get_module_path from frappe.model.utils import render_include -@frappe.whitelist() -def get_data(chart_name, refresh=False): - chart = frappe.get_doc("Dashboard Chart", chart_name) - filters = json.loads(chart.filters_json) - cache_key = json.dumps({ - "name": chart.method_path, - "filters": filters - }, default=str) - - if refresh == "true": - results = generate_and_cache_results(chart, filters, cache_key) - else: - cached_results = frappe.cache().get_value(cache_key) - if cached_results: - results = json.loads(frappe.safe_decode(cached_results)) +def cache_source(function): + def wrapper(*args, **kwargs): + filters = json.loads(kwargs.get("filters", "{}")) + chart_name = kwargs.get("chart_name") + cache_key = json.dumps({ + "name": chart_name, + "filters": filters + }, default=str) + if kwargs.get("refresh") == "true": + results = generate_and_cache_results(chart_name, function, filters, cache_key) else: - results = generate_and_cache_results(chart, filters, cache_key) - return results + cached_results = frappe.cache().get_value(cache_key) + if cached_results: + results = json.loads(frappe.safe_decode(cached_results)) + else: + results = generate_and_cache_results(chart_name, function, filters, cache_key) + return results + return wrapper -def generate_and_cache_results(chart, filters, cache_key): - results = frappe.get_attr(chart.method_path)(filters=frappe._dict(filters)) +def generate_and_cache_results(chart_name, function, filters, cache_key): + results = function(frappe._dict(filters)) frappe.cache().set_value(cache_key, json.dumps(results, default=str)) - frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now()) + frappe.db.set_value("Dashboard Chart", chart_name, "last_synced_on", frappe.utils.now()) return results From 138fc5c82bb332b34d91a063367e528ac1efffa8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:40:11 +0530 Subject: [PATCH 044/103] fix(dashboard): Fetch data with correct filters --- frappe/core/page/dashboard/dashboard.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 2edfe578cf..084460d9e4 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -68,7 +68,7 @@ class DashboardChart { this.get_settings().then(() => { this.prepare_chart_object(); this.prepare_container(); - this.fetch().then((data) => { + this.fetch(this.filters).then((data) => { this.update_last_synced(); this.data = data; this.render(); @@ -106,7 +106,7 @@ class DashboardChart { const values = d.get_values(); if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { - this.fetch().then(data => { + this.fetch(values, true).then(data => { this.update_chart_object(); this.data = data; this.render(); @@ -127,7 +127,7 @@ class DashboardChart { label: __("Force Refresh"), action: "force-refresh", handler: () => { - this.fetch(true).then(data => { + this.fetch(this.filters, true).then(data => { this.update_chart_object(); this.data = data; this.render(); @@ -155,12 +155,12 @@ class DashboardChart { } - fetch(refresh=false) { + fetch(filters, refresh=false) { return frappe.xcall( this.settings.method_path, { chart_name: this.chart_doc.name, - filters: this.filters, + filters: filters, refresh: refresh, } ); From 11202c79b4f686ca99432037899a5fa914b656c2 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:41:32 +0530 Subject: [PATCH 045/103] refactor(dashboard): Remove tabular filter view --- .../dashboard_chart/dashboard_chart.js | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index d902616147..ff84a0a976 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -2,30 +2,6 @@ // For license information, please see license.txt frappe.ui.form.on('Dashboard Chart', { - onload: function(frm) { - var wrapper = $(frm.fields_dict["filters_json"].wrapper).empty(); - let filter_table = $(` - - - - - - - -
${ __("Filter") }${ __("Value") }
`); - - const filters = JSON.parse(frm.doc.filters_json); - - Object.keys(filters).forEach(key => { - const filter_row = $(` - ${frappe.model.unscrub(key)} - ${filters[key]} - `); - filter_table.find('tbody').append(filter_row); - }); - - wrapper.append(filter_table); - }, refresh: function(frm) { } From e7a59ad1cbe6dc789da0fc4a83b7e2d98ac0af6f Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:43:57 +0530 Subject: [PATCH 046/103] fix(dashboard): Remove unnecessary column break --- .../dashboard_chart/dashboard_chart.json | 34 ++----------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 9cb71f2a34..0aefc38c63 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -46,37 +46,6 @@ "translatable": 0, "unique": 1 }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_6", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, @@ -149,6 +118,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "default": "", "fieldname": "filters_json", "fieldtype": "Code", "hidden": 0, @@ -410,7 +380,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-02-06 09:27:26.109148", + "modified": "2019-02-06 10:43:29.276670", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From fa7b67d16b8bd86a3e36d795aed6fc2852e09fd1 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:53:24 +0530 Subject: [PATCH 047/103] refactor(dashboard): Break down prepare_container into smaller functions --- frappe/core/page/dashboard/dashboard.js | 63 +++++++++++++------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 084460d9e4..53c1490dbd 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -68,6 +68,7 @@ class DashboardChart { this.get_settings().then(() => { this.prepare_chart_object(); this.prepare_container(); + this.prepare_chart_actions(); this.fetch(this.filters).then((data) => { this.update_last_synced(); this.data = data; @@ -89,39 +90,14 @@ class DashboardChart { let last_synced_text = $(``); last_synced_text.prependTo(this.chart_container); + } + prepare_chart_actions() { let actions = [ { label: __("Set Filters"), action: "set-filters", - handler: () => { - const d = new frappe.ui.Dialog({ - title: __('Set Filters'), - fields: this.settings.filters, - }); - d.set_values(this.filters); - d.show(); - - const set_filters = () => { - const values = d.get_values(); - if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { - frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { - this.fetch(values, true).then(data => { - this.update_chart_object(); - this.data = data; - this.render(); - }); - }); - } - d.hide(); - }; - - this.settings.filters.map(field => field.onchange = e => { - if(e) { - d.set_primary_action(__('Save Filters'), set_filters); - } - }); - } + handler: this.create_set_filters_dialog }, { label: __("Force Refresh"), @@ -150,9 +126,7 @@ class DashboardChart { const action = o.dataset.action; $(o).click(actions.find(a => a.action === action)); }); - this.chart_actions.prependTo(this.chart_container); - } fetch(filters, refresh=false) { @@ -218,4 +192,33 @@ class DashboardChart { })); return this._load_script; } + + create_set_filters_dialog() { + const d = new frappe.ui.Dialog({ + title: __('Set Filters'), + fields: this.settings.filters, + }); + d.set_values(this.filters); + d.show(); + + const set_filters = () => { + const values = d.get_values(); + if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) { + frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => { + this.fetch(values, true).then(data => { + this.update_chart_object(); + this.data = data; + this.render(); + }); + }); + } + d.hide(); + }; + + this.settings.filters.map(field => field.onchange = e => { + if(e) { + d.set_primary_action(__('Save Filters'), set_filters); + } + }); + } } \ No newline at end of file From 654d125a3b672f627d73b1ffade1bf5c5a850124 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 10:54:23 +0530 Subject: [PATCH 048/103] fix(dashboard): Update error message --- .../doctype/dashboard_chart_source/dashboard_chart_source.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py index 048d2bc588..70c1bda483 100644 --- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py +++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py @@ -11,7 +11,7 @@ from frappe.modules.export_file import export_to_files class DashboardChartSource(Document): def validate(self): if frappe.session.user != "Administrator": - frappe.throw(_("Only Administrator allowed to create Dashboard Chart Sources")) + frappe.throw(_("Only Administrator is allowed to create Dashboard Chart Sources")) def on_update(self): export_to_files(record_list=[[self.doctype, self.name]], record_module=self.module, create_init=True) From dd94bc04aee2642dc79f44acc591f738f04e0b6b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 13:10:57 +0530 Subject: [PATCH 049/103] fix(dashboard): Show update filters modal correctly --- frappe/core/page/dashboard/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 53c1490dbd..cb04a3968d 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -97,7 +97,7 @@ class DashboardChart { { label: __("Set Filters"), action: "set-filters", - handler: this.create_set_filters_dialog + handler: this.create_set_filters_dialog.bind(this) }, { label: __("Force Refresh"), @@ -196,7 +196,7 @@ class DashboardChart { create_set_filters_dialog() { const d = new frappe.ui.Dialog({ title: __('Set Filters'), - fields: this.settings.filters, + fields: this.settings.filters }); d.set_values(this.filters); d.show(); From f36d2c078fefc386bbd685ec563f2048d247f6bc Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 13:11:37 +0530 Subject: [PATCH 050/103] style: Linting fixes --- .../dashboard_chart_source/test_dashboard_chart_source.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py index 1247240ff1..822526b591 100644 --- a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py +++ b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestDashboardChartSource(unittest.TestCase): From b7241f34b4479caf293d8f553df36ce8fd53ea0c Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 19:38:02 +0530 Subject: [PATCH 051/103] feat(dashboard): Provide modal to update filters --- .../dashboard_chart/dashboard_chart.js | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index ff84a0a976..657402501f 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -1,8 +1,73 @@ // Copyright (c) 2019, Frappe Technologies and contributors // For license information, please see license.txt +frappe.provide("frappe.dashboard_chart_sources"); frappe.ui.form.on('Dashboard Chart', { refresh: function(frm) { + frm.trigger("show_filters"); + }, + source: function(frm) { + frm.trigger("show_filters"); + }, + + show_filters: function(frm) { + if (frm.doc.source) { + if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[frm.doc.source]) { + frm.trigger('render_filters_table'); + } else { + frappe.call({ + method: 'frappe.core.page.dashboard.dashboard.get_script', + args: { + source_name: frm.doc.source + }, + callback: result => { + frappe.dom.eval(result.message.script || ''); + frm.trigger('render_filters_table'); + } + }); + } + } + }, + + render_filters_table: function(frm) { + let fields = frappe.dashboard_chart_sources[frm.doc.source].filters; + + let wrapper = $(frm.get_field('filters_json').wrapper).empty(); + let table = $(` + + + + + + + +
${__('Filter')}${__('Value')}
`).appendTo(wrapper); + $(`

${__("Click table to edit")}

`).appendTo(wrapper); + + let filters = JSON.parse(frm.doc.filters_json || '{}'); + fields.map( f => { + const filter_row = $(`${f.label}${filters[f.fieldname]}`); + table.find('tbody').append(filter_row); + }); + + table.on('click', () => { + let dialog = new frappe.ui.Dialog({ + title: __('Set Filters'), + fields: fields, + primary_action: function() { + let values = this.get_values(); + if(values) { + this.hide(); + frm.set_value('filters_json', JSON.stringify(values)); + frm.trigger('show_filters'); + } + } + }); + dialog.show(); + dialog.set_values(filters); + }); } }); + + From 866f8b2a0825f618d35042905dbbb36e7290b65a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 20:41:34 +0530 Subject: [PATCH 052/103] feat(dashboard): Use xIsSeries chart option for time series --- frappe/core/page/dashboard/dashboard.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index cb04a3968d..5ff0cbf98b 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -150,6 +150,9 @@ class DashboardChart { data: this.data, type: chart_type_map[this.chart_doc.type], colors: [this.chart_doc.color || "light-blue"], + axisOptions: { + xIsSeries: this.settings.is_time_series + }, }; if(!this.chart) { this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args); From 179a9e0db6ccefd5941ca85bcd31547a3cdeae6c Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 6 Feb 2019 23:44:27 +0530 Subject: [PATCH 053/103] feat(dashboard): Show links to other dashboards in a dropdown menu --- frappe/core/page/dashboard/dashboard.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 5ff0cbf98b..4e3ef18a5a 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -33,6 +33,7 @@ class Dashboard { if(this.dashboard_name !== current_dashboard_name) { this.dashboard_name = current_dashboard_name; this.page.set_title(this.dashboard_name); + this.set_dropdown(); this.refresh(); } this.charts = {}; @@ -56,6 +57,17 @@ class Dashboard { get_dashboard_doc() { return frappe.model.with_doc('Dashboard', this.dashboard_name); } + + set_dropdown() { + frappe.db.get_list("Dashboard").then(dashboards => { + dashboards.map(dashboard => { + let name = dashboard.name; + if(name != this.dashboard_name){ + this.page.add_menu_item(name, () => frappe.set_route("dashboard", name)); + } + }); + }); + } } class DashboardChart { From 45332d02c44046f04300a95b5c6e6b33f862f082 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 12 Mar 2019 16:35:40 +0530 Subject: [PATCH 054/103] fix(dashboard): Use Dashboard Chart Link for listing charts --- frappe/core/page/dashboard/dashboard.js | 8 +- frappe/desk/doctype/dashboard/dashboard.json | 6 +- .../dashboard_chart/dashboard_chart.json | 14 +++- .../doctype/dashboard_chart_link/__init__.py | 0 .../dashboard_chart_link.json | 77 +++++++++++++++++++ .../dashboard_chart_link.py | 10 +++ 6 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 frappe/desk/doctype/dashboard_chart_link/__init__.py create mode 100644 frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json create mode 100644 frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 4e3ef18a5a..bf218670f2 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -44,12 +44,14 @@ class Dashboard { this.dashboard_doc = doc; this.charts = this.dashboard_doc.charts; - this.charts.map((chart_doc) => { + this.charts.map((chart) => { let chart_container = $("
"); chart_container.appendTo(this.container); - let dashboard_chart = new DashboardChart(chart_doc, chart_container); - dashboard_chart.show(); + frappe.model.with_doc("Dashboard Chart", chart.chart).then( chart_doc => { + let dashboard_chart = new DashboardChart(chart_doc, chart_container); + dashboard_chart.show(); + }); }); }); } diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json index e7f2d73784..4df97a957c 100644 --- a/frappe/desk/doctype/dashboard/dashboard.json +++ b/frappe/desk/doctype/dashboard/dashboard.json @@ -21,6 +21,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "dashboard_name", "fieldtype": "Data", "hidden": 0, @@ -53,6 +54,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "charts", "fieldtype": "Table", "hidden": 0, @@ -65,7 +67,7 @@ "label": "Charts", "length": 0, "no_copy": 0, - "options": "Dashboard Chart", + "options": "Dashboard Chart Link", "permlevel": 0, "precision": "", "print_hide": 0, @@ -90,7 +92,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-16 13:35:14.516114", + "modified": "2019-03-12 15:01:12.183208", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard", diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 0aefc38c63..09503d8a17 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -21,6 +21,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "chart_name", "fieldtype": "Data", "hidden": 0, @@ -53,6 +54,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "source", "fieldtype": "Link", "hidden": 0, @@ -86,6 +88,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "filters_section", "fieldtype": "Section Break", "hidden": 0, @@ -119,6 +122,8 @@ "collapsible": 0, "columns": 0, "default": "", + "depends_on": "", + "fetch_if_empty": 0, "fieldname": "filters_json", "fieldtype": "Code", "hidden": 0, @@ -152,6 +157,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "chart_options_section", "fieldtype": "Section Break", "hidden": 0, @@ -184,6 +190,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "type", "fieldtype": "Select", "hidden": 0, @@ -217,6 +224,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "width", "fieldtype": "Select", "hidden": 0, @@ -250,6 +258,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "column_break_2", "fieldtype": "Column Break", "hidden": 0, @@ -281,6 +290,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "color", "fieldtype": "Color", "hidden": 0, @@ -313,6 +323,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "section_break_10", "fieldtype": "Section Break", "hidden": 0, @@ -344,6 +355,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "last_synced_on", "fieldtype": "Datetime", "hidden": 0, @@ -380,7 +392,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-02-06 10:43:29.276670", + "modified": "2019-03-12 15:06:15.868942", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/dashboard_chart_link/__init__.py b/frappe/desk/doctype/dashboard_chart_link/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json new file mode 100644 index 0000000000..df278fb4c1 --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json @@ -0,0 +1,77 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2019-03-12 15:00:57.052684", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "chart", + "fieldtype": "Link", + "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": "Chart", + "length": 0, + "no_copy": 0, + "options": "Dashboard Chart", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2019-03-12 15:01:31.639414", + "modified_by": "Administrator", + "module": "Desk", + "name": "Dashboard Chart Link", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "ASC", + "track_changes": 1, + "track_seen": 0, + "track_views": 0 +} \ No newline at end of file diff --git a/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py new file mode 100644 index 0000000000..7cd4f9daa3 --- /dev/null +++ b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class DashboardChartLink(Document): + pass From 3567326ae90a6e34f2330669374ebad96101c079 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 18 Mar 2019 11:17:38 +0530 Subject: [PATCH 055/103] fix(dashboard): Use config insteaad of get_script Earlier implementation used a get_script function which served a JS configuration file which was then evaluated inside the dom. Now dashboard chart source contains a code field for storing configuration in JSON --- frappe/core/page/dashboard/dashboard.js | 17 ++------- frappe/core/page/dashboard/dashboard.py | 16 -------- .../dashboard_chart/dashboard_chart.js | 21 +++++----- .../dashboard_chart/dashboard_chart.json | 2 +- .../dashboard_chart_source.json | 38 ++++++++++++++++++- 5 files changed, 50 insertions(+), 44 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index bf218670f2..ea49cf2999 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -193,21 +193,10 @@ class DashboardChart { } get_settings() { - if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[this.chart_doc.source]) { - return this._load_script; - } - this._load_script = new Promise(resolve => frappe.call({ - method: 'frappe.core.page.dashboard.dashboard.get_script', - args: { - source_name: this.chart_doc.source - }, - callback: result => { - frappe.dom.eval(result.message.script || ''); - this.settings = frappe.dashboard_chart_sources[this.chart_doc.source]; - resolve(); - } + return new Promise(resolve => frappe.db.get_value("Dashboard Chart Source", this.chart_doc.source, "config", e => { + this.settings = JSON.parse(e.config); + resolve(); })); - return this._load_script; } create_set_filters_dialog() { diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index a9717d41c4..ce4bf4742c 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -33,19 +33,3 @@ def generate_and_cache_results(chart_name, function, filters, cache_key): frappe.cache().set_value(cache_key, json.dumps(results, default=str)) frappe.db.set_value("Dashboard Chart", chart_name, "last_synced_on", frappe.utils.now()) return results - - -@frappe.whitelist() -def get_script(source_name): - source = frappe.get_doc("Dashboard Chart Source", source_name) - module_path = get_module_path(source.module) - scrubbed_source_name = frappe.scrub(source_name) - script_path = os.path.join(module_path, "dashboard_chart_source", scrubbed_source_name, scrubbed_source_name + ".js") - - if os.path.exists(script_path): - with open(script_path, "r") as f: - script = f.read() - - return { - "script": render_include(script), - } diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 657402501f..b86e6b7d8d 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -4,6 +4,7 @@ frappe.provide("frappe.dashboard_chart_sources"); frappe.ui.form.on('Dashboard Chart', { refresh: function(frm) { + frm.set_df_property("filters_section", "hidden", 1); frm.trigger("show_filters"); }, @@ -13,25 +14,20 @@ frappe.ui.form.on('Dashboard Chart', { show_filters: function(frm) { if (frm.doc.source) { - if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[frm.doc.source]) { + if (frm.filters) { frm.trigger('render_filters_table'); } else { - frappe.call({ - method: 'frappe.core.page.dashboard.dashboard.get_script', - args: { - source_name: frm.doc.source - }, - callback: result => { - frappe.dom.eval(result.message.script || ''); - frm.trigger('render_filters_table'); - } + frappe.db.get_value("Dashboard Chart Source", frm.doc.source, "config", e => { + frm.filters = JSON.parse(e.config).filters; + frm.trigger('render_filters_table'); }); } } }, render_filters_table: function(frm) { - let fields = frappe.dashboard_chart_sources[frm.doc.source].filters; + frm.set_df_property("filters_section", "hidden", 0); + let fields = frm.filters; let wrapper = $(frm.get_field('filters_json').wrapper).empty(); let table = $(` @@ -62,7 +58,8 @@ frappe.ui.form.on('Dashboard Chart', { frm.set_value('filters_json', JSON.stringify(values)); frm.trigger('show_filters'); } - } + }, + primary_action_label: "Set" }); dialog.show(); dialog.set_values(filters); diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 09503d8a17..6406a3a0f0 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -392,7 +392,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-03-12 15:06:15.868942", + "modified": "2019-03-18 11:05:51.316816", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json index a87b2bf9b9..f46468ba9f 100644 --- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json +++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json @@ -21,6 +21,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "source_name", "fieldtype": "Data", "hidden": 0, @@ -53,6 +54,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "module", "fieldtype": "Link", "hidden": 0, @@ -78,6 +80,40 @@ "set_only_once": 0, "translatable": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "config", + "fieldtype": "Code", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Config", + "length": 0, + "no_copy": 0, + "options": "JSON", + "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, + "translatable": 0, + "unique": 0 } ], "has_web_view": 0, @@ -90,7 +126,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-02-06 07:55:31.898604", + "modified": "2019-03-15 14:57:17.696656", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart Source", From e31368a9f72faa31cd6f11f694e63eb4cf259a51 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 18 Mar 2019 11:35:07 +0530 Subject: [PATCH 056/103] style: Linting fixes --- frappe/core/page/dashboard/dashboard.js | 5 ++++- frappe/core/page/dashboard/dashboard.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index ea49cf2999..7ac3eec066 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -125,7 +125,10 @@ class DashboardChart { } } ]; + this.set_chart_actions(actions); + } + set_chart_actions(actions) { this.chart_actions = $(`
- {{ col.formatter - ? col.formatter(row._index, col._index, value, col, row, true) - : (col.docfield ? frappe.format(value, col.docfield) : value) }} + {{ + col.formatter + ? col.formatter(row._index, col._index, value, col, row, true) + : col.format + ? col.format(value, row, col, data) + : col.docfield + ? frappe.format(value, col.docfield) + : value + }}
{% if(frappe.help.has_help(doctype)) { %} diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 9f5ebfb2a7..7f280a38a2 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -26,7 +26,6 @@ frappe.views.ListSidebar = class ListSidebar { this.setup_reports(); this.setup_list_filter(); - this.setup_assigned_to(); this.setup_views(); this.setup_kanban_boards(); this.setup_calendar_view(); @@ -37,6 +36,14 @@ frappe.views.ListSidebar = class ListSidebar { if (limits.upgrade_url && limits.expiry && !frappe.flags.upgrade_dismissed) { this.setup_upgrade_box(); } + + if(this.doctype !== 'ToDo') { + $('.assigned-to').show(); + } + $('.assigned-to').on('click', () => { + this.setup_assigned_to(); + }); + } setup_views() { @@ -217,14 +224,16 @@ frappe.views.ListSidebar = class ListSidebar { } setup_assigned_to() { + $('.assigned').remove(); + $('.assigned-loading').show(); let dropdown = this.page.sidebar.find('.assigned-dropdown'); - if(this.doctype === 'ToDo') { - $('.assigned-to').remove(); - } - frappe.call('frappe.desk.listview.get_user_assignments_and_count').then((data) => { + let current_filters = this.list_view.get_filters_for_args(); + + frappe.call('frappe.desk.listview.get_user_assignments_and_count', {doctype: this.doctype, current_filters: current_filters}).then((data) => { + $('.assigned-loading').hide(); let current_user_count = data.message.find(user => user.name === frappe.session.user).count; this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown); - let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name)); + let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name) && user.count!==0 ); user_list.forEach((user) => { this.get_html_for_assigned(user.name, user.count).appendTo(dropdown); }); @@ -239,7 +248,7 @@ frappe.views.ListSidebar = class ListSidebar { get_html_for_assigned(name, count) { if (name === frappe.session.user) name='Me'; - if (count > 99) count='99+'; + if (count > 50) count='50+'; let html = $('
  • ' + name + '' + count + '
    • '); return html; From 7a81f26780e2949579e1cea0d3babfc80e9a2bf7 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Mon, 25 Mar 2019 21:22:33 +0530 Subject: [PATCH 092/103] fix: Improve query for assignment count --- frappe/desk/listview.py | 18 ++++++++++++------ frappe/public/js/frappe/list/list_sidebar.html | 2 +- frappe/public/js/frappe/list/list_sidebar.js | 7 +++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index d4f0d1f04a..fae3e6d52f 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -29,11 +29,17 @@ def set_list_settings(doctype, values): def get_user_assignments_and_count(doctype, current_filters): filtered_list = frappe.get_all(doctype, filters=current_filters) - names = list(map(lambda x: x.name, filtered_list)) - user_list = frappe.get_all("User", filters={"user_type": "System User"}) + names = "'"+"','".join(list(map(lambda x: x.name, filtered_list)))+"'" + if names: - assignment_data = sorted([{"count":frappe.db.count('ToDo', filters = {'owner': user['name'], 'status': 'Open', 'reference_name': ('in', names)}), - "name": user['name']} for user in user_list], key=lambda k: k['count'], reverse = True) - return assignment_data - else: + todo_list = sorted(frappe.db.sql("""select tabToDo.owner as name, count(*) as count from tabToDo, tabUser + where + tabToDo.status='open' and + tabToDo.owner = tabUser.name and + tabUser.user_type = 'System User' and + tabToDo.reference_name in ({names}) + group by tabToDo.owner + """.format(doctype = doctype, names = names), as_dict=True), key=lambda k: k['count'], reverse = True) + return todo_list + else: return [] \ No newline at end of file diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html index 8cb7c1e0c0..502968e967 100644 --- a/frappe/public/js/frappe/list/list_sidebar.html +++ b/frappe/public/js/frappe/list/list_sidebar.html @@ -50,7 +50,7 @@ {%= __("Assigned To") %}
      -
    • +
    • {%= (__("Loading") + "..." ) %}
      • diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 7f280a38a2..ab5e052420 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -231,8 +231,11 @@ frappe.views.ListSidebar = class ListSidebar { frappe.call('frappe.desk.listview.get_user_assignments_and_count', {doctype: this.doctype, current_filters: current_filters}).then((data) => { $('.assigned-loading').hide(); - let current_user_count = data.message.find(user => user.name === frappe.session.user).count; - this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown); + let current_user = data.message.find(user => user.name === frappe.session.user); + if(current_user) { + let current_user_count = current_user.count; + this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown); + } let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name) && user.count!==0 ); user_list.forEach((user) => { this.get_html_for_assigned(user.name, user.count).appendTo(dropdown); From 8a4bfb142978955d4de236d14fee5144d148c35c Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Tue, 26 Mar 2019 12:06:50 +0530 Subject: [PATCH 093/103] Improve query for assignment count and add test --- frappe/desk/listview.py | 37 ++++++++------ frappe/model/db_query.py | 10 +++- frappe/public/js/frappe/list/list_sidebar.js | 4 +- frappe/tests/test_assign.py | 52 +++++++++++++++++--- 4 files changed, 78 insertions(+), 25 deletions(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index fae3e6d52f..59d9108730 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -27,19 +27,26 @@ def set_list_settings(doctype, values): @frappe.whitelist() def get_user_assignments_and_count(doctype, current_filters): - filtered_list = frappe.get_all(doctype, - filters=current_filters) - names = "'"+"','".join(list(map(lambda x: x.name, filtered_list)))+"'" - if names: - todo_list = sorted(frappe.db.sql("""select tabToDo.owner as name, count(*) as count from tabToDo, tabUser - where - tabToDo.status='open' and - tabToDo.owner = tabUser.name and - tabUser.user_type = 'System User' and - tabToDo.reference_name in ({names}) - group by tabToDo.owner - """.format(doctype = doctype, names = names), as_dict=True), key=lambda k: k['count'], reverse = True) - return todo_list - else: - return [] \ No newline at end of file + subquery_condition = '' + if current_filters: + # get the subquery + subquery = frappe.get_all(doctype, + filters=current_filters, return_query = True) + subquery_condition = ' and tabToDo.reference_name in ({subquery})'.format(subquery = subquery) + + todo_list = frappe.db.sql("""select tabToDo.owner as name, count(*) as count + from + tabToDo, tabUser + where + tabToDo.status='open' and + tabToDo.owner = tabUser.name and + tabUser.user_type = 'System User' + {subquery_condition} + group by + tabToDo.owner + order by + count desc + limit 50""".format(subquery_condition = subquery_condition), as_dict=True) + + return todo_list \ No newline at end of file diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 9a02bd9f1f..53a1c6c13d 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -36,7 +36,7 @@ class DatabaseQuery(object): ignore_permissions=False, user=None, with_comment_count=False, join='left join', distinct=False, start=None, page_length=None, limit=None, ignore_ifnull=False, save_user_settings=False, save_user_settings_fields=False, - update=None, add_total_row=None, user_settings=None, reference_doctype=None): + update=None, add_total_row=None, user_settings=None, reference_doctype=None, return_query=False): if not ignore_permissions and not frappe.has_permission(self.doctype, "read", user=user): frappe.flags.error_message = _('Insufficient Permission for {0}').format(frappe.bold(self.doctype)) raise frappe.PermissionError(self.doctype) @@ -79,6 +79,7 @@ class DatabaseQuery(object): self.user = user or frappe.session.user self.update = update self.user_settings_fields = copy.deepcopy(self.fields) + self.return_query = return_query # for contextual user permission check # to determine which user permission is applicable on link field of specific doctype @@ -91,6 +92,8 @@ class DatabaseQuery(object): result = self.run_custom_query(query) else: result = self.build_and_run() + if return_query: + return result if with_comment_count and not as_list and self.doctype: self.add_comment_count(result) @@ -115,7 +118,10 @@ class DatabaseQuery(object): query = """select %(fields)s from %(tables)s %(conditions)s %(group_by)s %(order_by)s %(limit)s""" % args - return frappe.db.sql(query, as_dict=not self.as_list, debug=self.debug, update=self.update) + if self.return_query: + return query + else: + return frappe.db.sql(query, as_dict=not self.as_list, debug=self.debug, update=self.update) def prepare_args(self): self.parse_args() diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index ab5e052420..e69726f36e 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -41,6 +41,7 @@ frappe.views.ListSidebar = class ListSidebar { $('.assigned-to').show(); } $('.assigned-to').on('click', () => { + $('.assigned').remove(); this.setup_assigned_to(); }); @@ -224,7 +225,6 @@ frappe.views.ListSidebar = class ListSidebar { } setup_assigned_to() { - $('.assigned').remove(); $('.assigned-loading').show(); let dropdown = this.page.sidebar.find('.assigned-dropdown'); let current_filters = this.list_view.get_filters_for_args(); @@ -251,7 +251,7 @@ frappe.views.ListSidebar = class ListSidebar { get_html_for_assigned(name, count) { if (name === frappe.session.user) name='Me'; - if (count > 50) count='50+'; + if (count > 99) count='99+'; let html = $('
    • ' + name + '' + count + '
      • '); return html; diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py index ed47f07dda..247489b0f9 100644 --- a/frappe/tests/test_assign.py +++ b/frappe/tests/test_assign.py @@ -4,6 +4,8 @@ from __future__ import unicode_literals import frappe, unittest import frappe.desk.form.assign_to +from frappe.desk.listview import get_user_assignments_and_count +from frappe.automation.doctype.assignment_rule.test_assignment_rule import make_note class TestAssign(unittest.TestCase): def test_assign(self): @@ -11,12 +13,7 @@ class TestAssign(unittest.TestCase): if not frappe.db.exists("User", "test@example.com"): frappe.get_doc({"doctype":"User", "email":"test@example.com", "first_name":"Test"}).insert() - added = frappe.desk.form.assign_to.add({ - "assign_to": "test@example.com", - "doctype": todo.doctype, - "name": todo.name, - "description": todo.description, - }) + added = assign(todo, "test@example.com") self.assertTrue("test@example.com" in [d.owner for d in added]) @@ -25,3 +22,46 @@ class TestAssign(unittest.TestCase): # assignment is cleared assignments = frappe.desk.form.assign_to.get(dict(doctype = todo.doctype, name=todo.name)) self.assertEqual(len(assignments), 0) + + def test_assignment_count(self): + frappe.db.sql('delete from tabToDo') + + if not frappe.db.exists("User", "test_assign1@example.com"): + frappe.get_doc({"doctype":"User", "email":"test_assign1@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert() + + if not frappe.db.exists("User", "test_assign2@example.com"): + frappe.get_doc({"doctype":"User", "email":"test_assign2@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert() + + note = make_note() + assign(note, "test_assign1@example.com") + + note = make_note(dict(public=1)) + assign(note, "test_assign2@example.com") + + note = make_note(dict(public=1)) + assign(note, "test_assign2@example.com") + + note = make_note() + assign(note, "test_assign2@example.com") + + data = {d.name: d.count for d in get_user_assignments_and_count('Note', [])} + + self.assertTrue('test_assign1@example.com' in data) + self.assertEqual(data['test_assign1@example.com'], 1) + self.assertEqual(data['test_assign2@example.com'], 3) + + data = {d.name: d.count for d in get_user_assignments_and_count('Note', [{'public': 1}])} + + self.assertFalse('test_assign1@example.com' in data) + self.assertEqual(data['test_assign2@example.com'], 2) + + frappe.db.rollback() + + +def assign(doc, user): + return frappe.desk.form.assign_to.add({ + "assign_to": user, + "doctype": doc.doctype, + "name": doc.name, + "description": 'test', + }) From 3725ebf7c3fd0ece18abcc7bf3c617a1c01592c8 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 27 Mar 2019 22:40:43 +0530 Subject: [PATCH 094/103] fix: Wrap quotes around columns and column names in query --- frappe/desk/listview.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index 59d9108730..745e021efe 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -33,18 +33,18 @@ def get_user_assignments_and_count(doctype, current_filters): # get the subquery subquery = frappe.get_all(doctype, filters=current_filters, return_query = True) - subquery_condition = ' and tabToDo.reference_name in ({subquery})'.format(subquery = subquery) + subquery_condition = ' and `tabToDo`.reference_name in ({subquery})'.format(subquery = subquery) - todo_list = frappe.db.sql("""select tabToDo.owner as name, count(*) as count + todo_list = frappe.db.sql("""select `tabToDo`.owner as name, count(*) as count from - tabToDo, tabUser + `tabToDo`, `tabUser` where - tabToDo.status='open' and - tabToDo.owner = tabUser.name and - tabUser.user_type = 'System User' + `tabToDo`.status='open' and + `tabToDo`.owner = `tabUser`.name and + `tabUser`.user_type = 'System User' {subquery_condition} group by - tabToDo.owner + `tabToDo`.owner order by count desc limit 50""".format(subquery_condition = subquery_condition), as_dict=True) From e6c6aeb98ee3c257f42691c03ee0fd1724b5f005 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 28 Mar 2019 00:55:58 +0530 Subject: [PATCH 095/103] style: change rating formatter --- cypress/integration/control_rating.js | 8 ++++---- frappe/public/js/frappe/form/controls/rating.js | 11 +++++------ frappe/public/js/frappe/form/formatters.js | 12 +++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js index 62ddbe3e36..463807f143 100644 --- a/cypress/integration/control_rating.js +++ b/cypress/integration/control_rating.js @@ -4,7 +4,7 @@ context('Rating Control', () => { }); it('click on the star rating to record value', () => { - cy.visit('/desk') + cy.visit('/desk'); cy.dialog('Rating', { 'fieldname': 'rate', 'fieldtype': 'Rating', @@ -18,15 +18,15 @@ context('Rating Control', () => { cy.get('@dialog').then(dialog => { var value = dialog.get_value('rate'); expect(value).to.equal(1); - }) + }); }); it('hover on the star', () => { - cy.visit('/desk') + cy.visit('/desk'); cy.dialog('Rating', { 'fieldname': 'rate', 'fieldtype': 'Rating', - }) + }); cy.get('div.rating') .children('i.fa') .first() diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js index b9f4df0687..844e932665 100644 --- a/frappe/public/js/frappe/form/controls/rating.js +++ b/frappe/public/js/frappe/form/controls/rating.js @@ -24,10 +24,10 @@ frappe.ui.form.ControlRating = frappe.ui.form.ControlInt.extend({ } }); }, (ev) => { - const el = $(ev.currentTarget); - el.parent().children('i.fa').each( function() { - $(this).removeClass('star-hover'); - }); + const el = $(ev.currentTarget); + el.parent().children('i.fa').each( function() { + $(this).removeClass('star-hover'); + }); }); $(this.input_area).find('i').click((ev) => { @@ -54,8 +54,7 @@ frappe.ui.form.ControlRating = frappe.ui.form.ControlInt.extend({ el.children('i.fa').prevObject.each( function(e) { if (e < value) { $(this).addClass('star-click'); - } - else { + } else { $(this).removeClass('star-click'); } }); diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 66ba0afdba..c8afb6466a 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -53,13 +53,11 @@ frappe.form.formatters = { return frappe.form.formatters._right(flt(value, 2) + "%", options) }, Rating: function(value) { - return ` - - ${Array.from(new Array(5)).map((_, i) => - `` - ).join('')} - - `; + return ` + ${Array.from(new Array(5)).map((_, i) => + `` + ).join('')} + `; }, Currency: function (value, docfield, options, doc) { var currency = frappe.meta.get_field_currency(docfield, doc); From 56dfe365edfc0dc6e93ca34717d23032ae16a185 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 28 Mar 2019 10:27:50 +0530 Subject: [PATCH 096/103] fix: Add missing is_column_missing method (#7150) --- frappe/database/database.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/database/database.py b/frappe/database/database.py index c9b184cbd1..d3b44913fc 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -879,6 +879,10 @@ class Database(object): # implemented in specific class pass + @staticmethod + def is_column_missing(e): + return frappe.db.is_missing_column(e) + def get_descendants(self, doctype, name): '''Return descendants of the current record''' node_location_indexes = self.get_value(doctype, name, ('lft', 'rgt')) From 664bc680bd004fdb4846852209ed5519ad07811f Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com> Date: Thu, 28 Mar 2019 11:44:19 +0530 Subject: [PATCH 097/103] fix: Add Currency Yemeni Rial (#7131) Closes issue https://github.com/frappe/erpnext/issues/16956 --- frappe/geo/country_info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json index ae0a8d8b59..a3f039ca17 100644 --- a/frappe/geo/country_info.json +++ b/frappe/geo/country_info.json @@ -2690,8 +2690,11 @@ }, "Yemen": { "code": "ye", + "currency": "YER", "currency_fraction": "Fils", "currency_fraction_units": 100, + "smallest_currency_fraction_value": 0.01, + "currency_name": "Yemeni Rial", "currency_symbol": "\ufdfc", "number_format": "#,###.##", "timezones": [ From 73c1f531e8b31aacd6242d9b4f7e2415074d7498 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 28 Mar 2019 11:46:51 +0530 Subject: [PATCH 098/103] fix: Set default only if the dependent field is set (#7130) Client side fix https://github.com/frappe/frappe/pull/7004 --- frappe/model/create_new.py | 17 +++++++++++++---- frappe/tests/test_document.py | 18 ++++++++++++++++++ frappe/utils/testutils.py | 6 ++++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py index b48f279a5e..8bb1356bd9 100644 --- a/frappe/model/create_new.py +++ b/frappe/model/create_new.py @@ -60,15 +60,24 @@ def set_user_and_static_default_values(doc): allowed_records = get_allowed_docs_for_doctype(doctype_user_permissions, df.parent) user_default_value = get_user_default_value(df, defaults, doctype_user_permissions, allowed_records) - if user_default_value is not None: - doc.set(df.fieldname, user_default_value) - + if user_default_value != None: + # do not set default if the field on which current field is dependent is not set + if is_dependent_field_set(df.depends_on, doc): + doc.set(df.fieldname, user_default_value) else: if df.fieldname != doc.meta.title_field: static_default_value = get_static_default_value(df, doctype_user_permissions, allowed_records) - if static_default_value is not None: + if static_default_value != None and is_dependent_field_set(df.depends_on, doc): doc.set(df.fieldname, static_default_value) + +def is_dependent_field_set(fieldname, doc): + value_dict = doc.as_dict() + if not fieldname: return True + # to check if fieldname passed is valid + if fieldname not in value_dict: return True + return value_dict[fieldname] + def get_user_default_value(df, defaults, doctype_user_permissions, allowed_records): # don't set defaults for "User" link field using User Permissions! if df.fieldtype == "Link" and df.options != "User": diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index f261641567..180e1b0307 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe, unittest, os from frappe.utils import cint from frappe.model.naming import revert_series_if_last, make_autoname, parse_naming_series +from frappe.utils.testutils import add_custom_field, clear_custom_fields class TestDocument(unittest.TestCase): def test_get_return_empty_list_for_table_field_if_none(self): @@ -235,3 +236,20 @@ class TestDocument(unittest.TestCase): new_current = cint(frappe.db.get_value('Series', prefix, "current", order_by="name")) self.assertEqual(cint(old_current) - 1, new_current) + + def test_default_of_dependent_field(self): + add_custom_field('ToDo', 'parent_field', 'Data') + + add_custom_field('ToDo', 'dependent_field', 'Data', + default='Some Data', depends_on='parent_field') + + add_custom_field('ToDo', 'independent_field', 'Data', + default='Some Data') + + + doc = frappe.new_doc('ToDo') + + self.assertFalse(doc.get('dependent_field')) + self.assertEqual(doc.get('independent_field'), 'Some Data') + + clear_custom_fields('ToDo') \ No newline at end of file diff --git a/frappe/utils/testutils.py b/frappe/utils/testutils.py index 4af3ad647c..e47cf3d90f 100644 --- a/frappe/utils/testutils.py +++ b/frappe/utils/testutils.py @@ -4,13 +4,15 @@ from __future__ import unicode_literals import frappe -def add_custom_field(doctype, fieldname, fieldtype='Data', options=None): +def add_custom_field(doctype, fieldname, fieldtype='Data', options=None, default=None, depends_on=None): frappe.get_doc({ "doctype": "Custom Field", "dt": doctype, "fieldname": fieldname, "fieldtype": fieldtype, - "options": options + "options": options, + "default": default, + "depends_on": depends_on }).insert() def clear_custom_fields(doctype): From 49b6b81a0f0fdfee874b180fd3e8f36e0e47a8eb Mon Sep 17 00:00:00 2001 From: Raffael Meyer Date: Thu, 28 Mar 2019 07:18:57 +0100 Subject: [PATCH 099/103] fix(integrations): complete file-api migration (#7132) --- .../gsuite_templates/gsuite_templates.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py b/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py index 83f379ee29..ad9f8145de 100644 --- a/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py +++ b/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py @@ -22,11 +22,11 @@ def create_gsuite_doc(doctype, docname, gs_template=None): json_data = doc.as_dict() filename = templ.document_name.format(**json_data) - r = run_gsuite_script('new', filename, templ.template_id, templ.destination_id, json_data) + response = run_gsuite_script('new', filename, templ.template_id, templ.destination_id, json_data) _file = frappe.get_doc({ "doctype": "File", - "file_url": r['url'], + "file_url": response['url'], "file_name": filename, "attached_to_doctype": doctype, "attached_to_name": docname, @@ -36,15 +36,15 @@ def create_gsuite_doc(doctype, docname, gs_template=None): comment = frappe.get_doc(doctype, docname).add_comment("Attachment", _("added {0}").format("{file_name}{icon}".format(**{ - "icon": ' ' if filedata.is_private else "", - "file_url": filedata.file_url.replace("#", "%23") if filedata.file_name else filedata.file_url, - "file_name": filedata.file_name or filedata.file_url + "icon": ' ' if _file.is_private else "", + "file_url": _file.file_url.replace("#", "%23") if _file.file_name else _file.file_url, + "file_name": _file.file_name or _file.file_url }))) return { - "name": filedata.name, - "file_name": filedata.file_name, - "file_url": filedata.file_url, - "is_private": filedata.is_private, + "name": _file.name, + "file_name": _file.file_name, + "file_url": _file.file_url, + "is_private": _file.is_private, "comment": comment.as_dict() if comment else {} } From 4da80bae914d6e6b07b1ebc3e292d7934a0f790f Mon Sep 17 00:00:00 2001 From: Himanshu Mishra Date: Thu, 28 Mar 2019 11:57:15 +0530 Subject: [PATCH 100/103] fix: doctype passed but not used (#7112) --- frappe/model/naming.py | 4 ++-- frappe/tests/test_naming.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index f38758ca9c..43c11da01d 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -129,7 +129,7 @@ def parse_naming_series(parts, doctype='', doc=''): if e.startswith('#'): if not series_set: digits = len(e) - part = getseries(n, digits, doctype) + part = getseries(n, digits) series_set = True elif e == 'YY': part = today.strftime('%y') @@ -152,7 +152,7 @@ def parse_naming_series(parts, doctype='', doc=''): return n -def getseries(key, digits, doctype=''): +def getseries(key, digits): # series created ? current = frappe.db.sql("SELECT `current` FROM `tabSeries` WHERE `name`=%s FOR UPDATE", (key,)) if current and current[0][0] is not None: diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 1b1f0ac98c..90ab6a6a94 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -51,7 +51,7 @@ class TestNaming(unittest.TestCase): todo.description = description todo.insert() - series = getseries('', 2, doctype) + series = getseries('', 2) series = str(int(series)-1) @@ -93,4 +93,4 @@ class TestNaming(unittest.TestCase): count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(count.get('current'), 2) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) \ No newline at end of file + frappe.db.sql("""delete from `tabSeries` where name = %s""", series) From b5d1a3aa1867b004a9ca7d049a96fba789de8525 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 28 Mar 2019 12:05:31 +0530 Subject: [PATCH 101/103] fix: pass fields as array in cypress dialog --- cypress/integration/control_rating.js | 8 ++++---- cypress/support/commands.js | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js index 463807f143..a367a82273 100644 --- a/cypress/integration/control_rating.js +++ b/cypress/integration/control_rating.js @@ -5,10 +5,10 @@ context('Rating Control', () => { it('click on the star rating to record value', () => { cy.visit('/desk'); - cy.dialog('Rating', { + cy.dialog('Rating', [{ 'fieldname': 'rate', 'fieldtype': 'Rating', - }).as('dialog'); + }]).as('dialog'); cy.get('div.rating') .children('i.fa') @@ -23,10 +23,10 @@ context('Rating Control', () => { it('hover on the star', () => { cy.visit('/desk'); - cy.dialog('Rating', { + cy.dialog('Rating', [{ 'fieldname': 'rate', 'fieldtype': 'Rating', - }); + }]); cy.get('div.rating') .children('i.fa') .first() diff --git a/cypress/support/commands.js b/cypress/support/commands.js index ed81c182a6..8c2156e9f4 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -66,9 +66,7 @@ Cypress.Commands.add('dialog', (title, fields) => { cy.window().then(win => { var d = new win.frappe.ui.Dialog({ title: title, - fields: [ - fields - ], + fields: fields, primary_action: function(){ d.hide(); } From bfb96d7639928a607904ac660a6812adf40f9f20 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Thu, 28 Mar 2019 13:42:14 +0550 Subject: [PATCH 102/103] bumped to version 11.1.17 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index d9b3b8d7b5..7238cc6d47 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -24,7 +24,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '11.1.16' +__version__ = '11.1.17' __title__ = "Frappe Framework" local = Local() From 85fb946392e4035d0d7349679e5f43548652f72a Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Thu, 28 Mar 2019 18:29:12 +0530 Subject: [PATCH 103/103] fix(Assigned To): fix "Assigned To" query for postgres (#7154) --- frappe/desk/listview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index 745e021efe..f31aae401e 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -39,7 +39,7 @@ def get_user_assignments_and_count(doctype, current_filters): from `tabToDo`, `tabUser` where - `tabToDo`.status='open' and + `tabToDo`.status='Open' and `tabToDo`.owner = `tabUser`.name and `tabUser`.user_type = 'System User' {subquery_condition}