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

Jump to bottom

Fix timespan summing for annotations due to annotationLayer join #7787

Merged
merged 2 commits into from
May 7, 2024
Merged

Fix timespan summing for annotations due to annotationLayer join #7787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34cc8a
Fix timespan summing for annotations due to annotationLayer join
fm3 May 7, 2024
59d0301
changelog
fm3 May 7, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- In the time tracking view, all annotations and tasks can be shown for each user by expanding the table. The individual time spans spent with a task or annotating an explorative annotation can be accessed via CSV export. The detail view including a chart for the individual spans has been removed. [#7733](https://github.com/scalableminds/webknossos/pull/7733)

### Fixed
- Fixed a bug where some annotation times would be shown double. [#7787](https://github.com/scalableminds/webknossos/pull/7787)

### Removed

Expand Down
22 changes: 14 additions & 8 deletions app/models/user/time/TimeSpan.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.time.Instant
import com.scalableminds.util.tools.Fox
import com.scalableminds.webknossos.schema.Tables._
import models.annotation.AnnotationType.AnnotationType
import play.api.libs.json.{JsObject, JsValue, Json}
import play.api.libs.json.{JsArray, JsObject, JsValue, Json}
import slick.lifted.Rep
import utils.sql.{SQLDAO, SqlClient, SqlToken}
import utils.ObjectId
Expand Down Expand Up @@ -80,12 +80,18 @@ class TimeSpanDAO @Inject()(sqlClient: SqlClient)(implicit ec: ExecutionContext)
for {
tuples <- run(
q"""
SELECT a._id, t._id, p.name, SUM(ts.time), ARRAY_REMOVE(ARRAY_AGG(al.statistics), null) AS annotation_layer_statistics
WITH annotationLayerStatistics AS (
SELECT an._id AS _annotation, JSON_AGG(al.statistics) AS layerStatistics
FROM webknossos.annotation_layers al
JOIN webknossos.annotations an ON al._annotation = an._id
GROUP BY an._id
)
SELECT a._id, t._id, p.name, SUM(ts.time), JSON_AGG(als.layerStatistics)->0 AS annotationLayerStatistics
FROM webknossos.timespans_ ts
JOIN webknossos.annotations_ a on ts._annotation = a._id
JOIN webknossos.annotation_layers as al ON al._annotation = a._id
LEFT JOIN webknossos.tasks_ t on a._task = t._id
LEFT JOIN webknossos.projects_ p on t._project = p._id
JOIN webknossos.annotations_ a ON ts._annotation = a._id
JOIN annotationLayerStatistics AS als ON als._annotation = a._id
LEFT JOIN webknossos.tasks_ t ON a._task = t._id
LEFT JOIN webknossos.projects_ p ON t._project = p._id
WHERE ts._user = $userId
AND ts.time > 0
AND ts.created >= $start
Expand All @@ -97,13 +103,13 @@ class TimeSpanDAO @Inject()(sqlClient: SqlClient)(implicit ec: ExecutionContext)
""".as[(String, Option[String], Option[String], Long, String)]
)
parsed = tuples.map { t =>
val layerStats: JsArray = Json.parse(t._5).validate[JsArray].getOrElse(Json.arr())
Json.obj(
"annotation" -> t._1,
"task" -> t._2,
"projectName" -> t._3,
"timeMillis" -> t._4,
"annotationLayerStats" -> parseArrayLiteral(t._5).map(layerStats =>
Json.parse(layerStats).validate[JsObject].getOrElse(Json.obj()))
"annotationLayerStats" -> layerStats
)
}
} yield Json.toJson(parsed)
Expand Down