build report for feed
This commit is contained in:
parent
d441ce9c02
commit
aea8204997
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
# These values are common in all dictionaries
|
# These values are common in all dictionaries
|
||||||
{
|
{
|
||||||
'creation': '2012-03-27 14:35:52',
|
u'creation': '2012-07-03 13:29:42',
|
||||||
'docstatus': 0,
|
u'docstatus': 0,
|
||||||
'modified': '2012-03-27 14:35:52',
|
u'modified': '2012-10-15 15:23:02',
|
||||||
'modified_by': u'Administrator',
|
u'modified_by': u'Administrator',
|
||||||
'owner': u'Administrator'
|
u'owner': u'Administrator'
|
||||||
},
|
},
|
||||||
|
|
||||||
# These values are common for all DocType
|
# These values are common for all DocType
|
||||||
@ -15,33 +15,45 @@
|
|||||||
'autoname': u'_FEED.#####',
|
'autoname': u'_FEED.#####',
|
||||||
'colour': u'White:FFF',
|
'colour': u'White:FFF',
|
||||||
'default_print_format': u'Standard',
|
'default_print_format': u'Standard',
|
||||||
'doctype': 'DocType',
|
u'doctype': u'DocType',
|
||||||
'module': u'Home',
|
'module': u'Home',
|
||||||
'name': '__common__',
|
u'name': u'__common__',
|
||||||
'section_style': u'Simple',
|
'section_style': u'Simple',
|
||||||
'show_in_menu': 0,
|
'show_in_menu': 0,
|
||||||
'version': 3
|
'version': 1
|
||||||
},
|
},
|
||||||
|
|
||||||
# These values are common for all DocField
|
# These values are common for all DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'name': '__common__',
|
u'name': u'__common__',
|
||||||
'parent': u'Feed',
|
'parent': u'Feed',
|
||||||
'parentfield': u'fields',
|
'parentfield': u'fields',
|
||||||
'parenttype': u'DocType',
|
'parenttype': u'DocType',
|
||||||
'permlevel': 0
|
'permlevel': 0
|
||||||
},
|
},
|
||||||
|
|
||||||
|
# These values are common for all DocPerm
|
||||||
|
{
|
||||||
|
u'doctype': u'DocPerm',
|
||||||
|
u'name': u'__common__',
|
||||||
|
'parent': u'Feed',
|
||||||
|
'parentfield': u'permissions',
|
||||||
|
'parenttype': u'DocType',
|
||||||
|
'permlevel': 0,
|
||||||
|
'read': 1,
|
||||||
|
'role': u'System Manager'
|
||||||
|
},
|
||||||
|
|
||||||
# DocType, Feed
|
# DocType, Feed
|
||||||
{
|
{
|
||||||
'doctype': 'DocType',
|
u'doctype': u'DocType',
|
||||||
'name': u'Feed'
|
u'name': u'Feed'
|
||||||
},
|
},
|
||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'feed_type',
|
'fieldname': u'feed_type',
|
||||||
'fieldtype': u'Select',
|
'fieldtype': u'Select',
|
||||||
'label': u'Feed Type'
|
'label': u'Feed Type'
|
||||||
@ -49,7 +61,7 @@
|
|||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'doc_type',
|
'fieldname': u'doc_type',
|
||||||
'fieldtype': u'Data',
|
'fieldtype': u'Data',
|
||||||
'label': u'Doc Type'
|
'label': u'Doc Type'
|
||||||
@ -57,7 +69,7 @@
|
|||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'doc_name',
|
'fieldname': u'doc_name',
|
||||||
'fieldtype': u'Data',
|
'fieldtype': u'Data',
|
||||||
'label': u'Doc Name'
|
'label': u'Doc Name'
|
||||||
@ -65,7 +77,7 @@
|
|||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'subject',
|
'fieldname': u'subject',
|
||||||
'fieldtype': u'Data',
|
'fieldtype': u'Data',
|
||||||
'label': u'Subject'
|
'label': u'Subject'
|
||||||
@ -73,7 +85,7 @@
|
|||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'color',
|
'fieldname': u'color',
|
||||||
'fieldtype': u'Data',
|
'fieldtype': u'Data',
|
||||||
'label': u'Color'
|
'label': u'Color'
|
||||||
@ -81,9 +93,14 @@
|
|||||||
|
|
||||||
# DocField
|
# DocField
|
||||||
{
|
{
|
||||||
'doctype': u'DocField',
|
u'doctype': u'DocField',
|
||||||
'fieldname': u'full_name',
|
'fieldname': u'full_name',
|
||||||
'fieldtype': u'Data',
|
'fieldtype': u'Data',
|
||||||
'label': u'Full Name'
|
'label': u'Full Name'
|
||||||
|
},
|
||||||
|
|
||||||
|
# DocPerm
|
||||||
|
{
|
||||||
|
u'doctype': u'DocPerm'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -1,6 +1,7 @@
|
|||||||
wn.pages['activity'].onload = function(wrapper) {
|
wn.pages['activity'].onload = function(wrapper) {
|
||||||
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
|
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
|
||||||
wrapper.appframe.title('Activity');
|
wrapper.appframe.title('Activity');
|
||||||
|
|
||||||
var list = new wn.ui.Listing({
|
var list = new wn.ui.Listing({
|
||||||
appframe: wrapper.appframe,
|
appframe: wrapper.appframe,
|
||||||
method: 'home.page.activity.activity.get_feed',
|
method: 'home.page.activity.activity.get_feed',
|
||||||
@ -10,6 +11,13 @@ wn.pages['activity'].onload = function(wrapper) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
list.run();
|
list.run();
|
||||||
|
|
||||||
|
// Build Report Button
|
||||||
|
if(wn.boot.profile.can_get_report.indexOf("Feed")!=-1) {
|
||||||
|
wrapper.appframe.add_button('Build Report', function() {
|
||||||
|
wn.set_route('Report2', "Feed");
|
||||||
|
}, 'icon-th')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
erpnext.last_feed_date = false;
|
erpnext.last_feed_date = false;
|
||||||
|
|||||||
@ -43,7 +43,7 @@ def on_login_post_session(login_manager):
|
|||||||
from webnotes.utils import nowtime
|
from webnotes.utils import nowtime
|
||||||
from webnotes.profile import get_user_fullname
|
from webnotes.profile import get_user_fullname
|
||||||
home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
|
home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
|
||||||
'%s logged in at %s' % (get_user_fullname, nowtime()),
|
'%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()),
|
||||||
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
|
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user