WaysAhead Global commited on
Commit
07fb1fb
·
verified ·
1 Parent(s): a73df9d

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +17 -21
main.py CHANGED
@@ -49,27 +49,23 @@ def build_sql(first_name: str, last_name: str = None, start_date: str = None, en
49
  name_filter += f" AND u.LastName = '{last_name}'"
50
 
51
  return f"""
52
- SELECT
53
- lh.CreatedDate,
54
- lh.Description,
55
- lh.Comment,
56
- lh.LogbookId,
57
- COALESCE(u.FirstName + ' ' + u.LastName, 'Unknown') AS AssignedTo,
58
- COALESCE(p.Name, 'No Priority') AS Priority,
59
- lh.StatusId,
60
- lh.ActualTime,
61
- COALESCE(cu.FirstName + ' ' + cu.LastName, 'Unknown') AS CreatedBy,
62
- s.Track,
63
- s.SubTrack
64
- FROM LogbookHistory lh
65
- LEFT JOIN [User] u ON lh.AssisgnTo = u.UserId
66
- LEFT JOIN [User] cu ON lh.CreatedBy = cu.UserId
67
- LEFT JOIN Priority p ON lh.PriorityId = p.PriorityId
68
- LEFT JOIN tbl_Sprint s ON lh.LogbookId = s.LogbookId
69
- WHERE {name_filter}
70
- AND lh.CreatedDate BETWEEN '{start_date}' AND '{end_date}'
71
- ORDER BY lh.CreatedDate ASC
72
- """
73
 
74
  # SQL tool
75
  query_weekly_progress = Tool(
 
49
  name_filter += f" AND u.LastName = '{last_name}'"
50
 
51
  return f"""
52
+ SELECT
53
+ COALESCE(p.Name, 'No Priority') AS Priority,
54
+ lh.LogbookId,
55
+ lh.CreatedDate,
56
+ s.Track,
57
+ s.SubTrack,
58
+ COALESCE(u.FirstName + ' ' + u.LastName, 'Unknown') AS Name
59
+ FROM LogbookHistory lh
60
+ LEFT JOIN [User] u ON lh.AssisgnTo = u.UserId
61
+ LEFT JOIN [User] cu ON lh.CreatedBy = cu.UserId
62
+ LEFT JOIN Priority p ON lh.PriorityId = p.PriorityId
63
+ LEFT JOIN tbl_Sprint s ON lh.LogbookId = s.LogbookId
64
+ WHERE {name_filter}
65
+ AND lh.CreatedDate BETWEEN '{start_date}' AND '{end_date}'
66
+ ORDER BY lh.CreatedDate ASC
67
+ """
68
+
 
 
 
 
69
 
70
  # SQL tool
71
  query_weekly_progress = Tool(