Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore TracingBases + Cancelled annotations in users-with-open-tasks view #2765

Merged
merged 2 commits into from
Jun 18, 2018
Merged

ignore TracingBases + Cancelled annotations in users-with-open-tasks view #2765

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d65c92
ignore TracingBases + Cancelled annotations in users-with-open-tasks …
fm3 Jun 18, 2018
9c288b4
Merge branch 'master' into project-list-active-users
fm3 Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/models/project/Project.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.scalableminds.util.reactivemongo.{DBAccessContext, GlobalAccessContex
import com.scalableminds.util.tools.{Fox, FoxImplicits}
import com.scalableminds.webknossos.schema.Tables._
import com.typesafe.scalalogging.LazyLogging
import models.annotation.AnnotationState
import models.annotation.{AnnotationState, AnnotationTypeSQL}
import models.task.TaskSQLDAO
import models.team.{Team, TeamDAO, TeamSQLDAO}
import models.user.{User, UserService}
Expand Down Expand Up @@ -139,7 +139,8 @@ object ProjectSQLDAO extends SQLDAO[ProjectSQL, ProjectsRow, Projects] {
join webknossos.projects_ p on t._project = p._id
join webknossos.users_ u on a._user = u._id
where p.name = ${name}
and a.state != '#${AnnotationState.Finished.toString}'
and a.state = '#${AnnotationState.Active.toString}'
and a.typ = '#${AnnotationTypeSQL.Task}'
group by u.email
""".as[String])
} yield rSeq.toList
Expand Down