Subversion Repositories SmartDukaan

Rev

Rev 1863 | Rev 1899 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1863 Rev 1891
Line 467... Line 467...
467
    if user_type is None:
467
    if user_type is None:
468
        return User.query.count()
468
        return User.query.count()
469
    else:
469
    else:
470
        return User.query.filter_by(is_anonymous = user_type).count()
470
        return User.query.filter_by(is_anonymous = user_type).count()
471
    
471
    
472
def get_users(user_type):
472
def get_users(user_type, start_date, end_date):
-
 
473
    query = session.query(User).join(UserState)
473
    if user_type is None:
474
    if start_date != -1:
-
 
475
        query = query.filter(UserState.active_since >= to_py_date(start_date))
474
        return User.query.all()
476
    if end_date != -1:
-
 
477
        query = query.filter(UserState.active_since <= to_py_date(end_date))
475
    else:
478
    if user_type is not None:
476
        return User.query.filter_by(is_anonymous = user_type).all()    
479
        query = query.filter(User.is_anonymous == user_type)
-
 
480
    return query.all()
477
    
481
    
478
#=============================================================================
482
#=============================================================================
479
# Helper functions 
483
# Helper functions 
480
#=============================================================================
484
#=============================================================================
481
 
485