Skip to content

Commit dbddc33

Browse files
Serialization is cancelable
1 parent 13a05f9 commit dbddc33

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/scala/eyetest/app/Login.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ class Login(repositories: Repositories) extends Frame with FrameProcess {
6666

6767
controls = controlsIter ...
6868

69-
controlsIter = + [guard: userComboBox, {() => userComboBox.peer.getSelectedItem != null} testBtn doTest]
69+
controlsIter = + [userIsSelected testBtn doTest]
7070
[registerBtn doRegister ]
71-
[serializeBtn doSerialize]
71+
[userIsSelected serializeBtn doSerialize]
72+
73+
userIsSelected = guard: userComboBox, {() => userComboBox.peer.getSelectedItem != null}
7274

7375
doTest = let visible = false
7476

@@ -90,7 +92,8 @@ class Login(repositories: Repositories) extends Frame with FrameProcess {
9092
initUsers
9193
let visible = true
9294

93-
doSerialize = selectFile ~~(file: File)~~> repositories.score.scoresOf: getCurrentUser ~~(scores: Seq[Score])~~> [
95+
doSerialize = selectFile ~~(null)~~> [+]
96+
+~~(file: File)~~> repositories.score.scoresOf: getCurrentUser ~~(scores: Seq[Score])~~> [
9497
val csv = "Date,Right Eye,Left Eye\n" + scores.map {case (right, left, date) =>
9598
val formated = new java.text.SimpleDateFormat("dd.MM.yyyy").format(date) // SimpleDateFormat to be abstracted to a separate var as soon as local vars can be used from other local vars' definitions
9699
s"$formated,$right,$left"}.mkString("\n")

0 commit comments

Comments
 (0)