|
73 | 73 | G.group_id = GD.group_id;
|
74 | 74 | """
|
75 | 75 |
|
76 |
| -TASK_GROUP_METADATA_QUERY = """ |
| 76 | +TASK_GROUP_METADATA_QUERY = f""" |
77 | 77 | SELECT
|
78 |
| - G.project_id, |
| 78 | + P.project_id, |
79 | 79 | G.group_id,
|
80 |
| - G.total_area as total_task_group_area, |
| 80 | + CASE |
| 81 | + -- Hide area for Footprint |
| 82 | + WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 0 |
| 83 | + ELSE G.total_area |
| 84 | + ) as total_task_group_area, |
81 | 85 | G.time_spent_max_allowed
|
82 | 86 | FROM groups G
|
83 | 87 | INNER JOIN used_task_groups UG USING (project_id, group_id)
|
|
106 | 110 | FROM mapping_sessions MS
|
107 | 111 | INNER JOIN projects P USING (project_id)
|
108 | 112 | WHERE
|
109 |
| - -- Skip for footprint type missions |
110 |
| - P.project_type != {Project.Type.FOOTPRINT.value} |
111 |
| - AND MS.start_time >= %(from_date)s |
| 113 | + MS.start_time >= %(from_date)s |
112 | 114 | AND MS.start_time < %(until_date)s
|
113 | 115 | GROUP BY project_id, project_type, group_id -- To get unique
|
114 | 116 | ),
|
|
185 | 187 | INNER JOIN mapping_sessions MS USING (mapping_session_id)
|
186 | 188 | INNER JOIN projects P USING (project_id)
|
187 | 189 | WHERE
|
188 |
| - -- Skip for footprint type missions |
189 |
| - P.project_type != {Project.Type.FOOTPRINT.value} |
190 |
| - AND MS.start_time >= %(from_date)s |
| 190 | + MS.start_time >= %(from_date)s |
191 | 191 | AND MS.start_time < %(until_date)s
|
192 | 192 | GROUP BY project_id, project_type, group_id -- To get unique
|
193 | 193 | ),
|
|
0 commit comments