assembly statistics
This commit is contained in:
		@@ -64,8 +64,6 @@ def table_assembly_stats():
 | 
			
		||||
        .join(database.User)
 | 
			
		||||
        .filter(
 | 
			
		||||
            database.Assembly.state == database.enums.AssemblyState.CONFIRMED,
 | 
			
		||||
            database.Assembly.ended_at >= date_from,
 | 
			
		||||
            database.Assembly.ended_at <= date_to,
 | 
			
		||||
            database.User.is_admin == False
 | 
			
		||||
        )
 | 
			
		||||
        .group_by(database.User.login, database.Assembly.user_id)
 | 
			
		||||
@@ -76,6 +74,12 @@ def table_assembly_stats():
 | 
			
		||||
        )
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    if len(date_from) > 0 and len(date_to) > 0:
 | 
			
		||||
        dated_query = dated_query.filter(
 | 
			
		||||
            database.Assembly.ended_at >= date_from,
 | 
			
		||||
            database.Assembly.ended_at <= date_to
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    json_result = []
 | 
			
		||||
    for row in dated_query.all():
 | 
			
		||||
        json_result.append({
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user