WaysAhead Global commited on
Update main.py
Browse files
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 |
-
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 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(
|