Skip to content

Commit 3b2c155

Browse files
authored
ignore TracingBases + Cancelled annotations in users-with-open-tasks view (#2765)
1 parent d707c9f commit 3b2c155

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/models/project/Project.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.scalableminds.util.reactivemongo.{DBAccessContext, GlobalAccessContex
44
import com.scalableminds.util.tools.{Fox, FoxImplicits}
55
import com.scalableminds.webknossos.schema.Tables._
66
import com.typesafe.scalalogging.LazyLogging
7-
import models.annotation.AnnotationState
7+
import models.annotation.{AnnotationState, AnnotationTypeSQL}
88
import models.task.TaskSQLDAO
99
import models.team.{Team, TeamDAO, TeamSQLDAO}
1010
import models.user.{User, UserService}
@@ -139,7 +139,8 @@ object ProjectSQLDAO extends SQLDAO[ProjectSQL, ProjectsRow, Projects] {
139139
join webknossos.projects_ p on t._project = p._id
140140
join webknossos.users_ u on a._user = u._id
141141
where p.name = ${name}
142-
and a.state != '#${AnnotationState.Finished.toString}'
142+
and a.state = '#${AnnotationState.Active.toString}'
143+
and a.typ = '#${AnnotationTypeSQL.Task}'
143144
group by u.email
144145
""".as[String])
145146
} yield rSeq.toList

0 commit comments

Comments
 (0)