Commit Graph

376 Commits (master)

Author SHA1 Message Date
Vladimir Eliezer Tokarev 01cda996f9 Connected the Welcome splash to straight channel section
When start voting pressed in welcome splash panel strair channel loaded
2016-08-27 15:07:18 +03:00
Vladimir Eliezer Tokarev e200bc0f8b Converted TwoWayNode into abstract class
Becuase all the classes that will extend this class will implelmett thisa
same logic, so there is no reason to implement it as interface.
2016-08-27 14:24:00 +03:00
Vladimir Eliezer Tokarev 9b636f2d2e Converted WelcomeSplash into two way link
Welcome Splash should be the first object to displayed and when the next
button pressed it shoud jump to already created straight channel section.
2016-08-27 14:07:13 +03:00
Vladimir Eliezer Tokarev e605089666 Created the basic idea polling booth gui
The idea is simple all of the fxmls panels will be connected this how
every one willknow which is the next or the previous panel
2016-08-27 13:34:03 +03:00
Vladimir Eliezer Tokarev c39d0774f9 Changed the name of fxml 2016-08-27 12:38:38 +03:00
Vladimir Eliezer Tokarev 19b11736e0 Created the vote has been casted
This was the last fxml that i needed to create now i should connect by
simple flow all of the panels.
next is implement panels logic and then work with the backend.
2016-08-20 13:01:27 +03:00
Vladimir Eliezer Tokarev 3a86e6f01a Created the thank for auditing panel
this panel returns the voter into first stage of selection.
2016-08-20 12:27:27 +03:00
Vladimir Eliezer Tokarev c26acbc3cf Created cast of audit panel
This panel lets you choose whenerver you want to cast or audit your vote
voting will set your vote as countable, and acudit is the choise for
checking the encoding process works fine.
2016-08-20 12:15:58 +03:00
Vladimir Eliezer Tokarev 86de5b07a4 Created the printing commitment barcode panel
Printing Commitment Barcode panel represent the progress of the printing
of the voters choise.
2016-08-20 11:55:14 +03:00
Vladimir Eliezer Tokarev 8a73f21f48 Created the ballot summary panel
ballot summary panel summaries the status of current voter
2016-08-20 11:48:54 +03:00
Hai Brenner f2ea4b5d15 Typo: fix typo in documentation 2016-08-11 13:36:09 +03:00
Hai Brenner 6b512e078b Merge branch 'master' into dist_dec
# Conflicts:
#	meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
#	meerkat-common/src/main/proto/meerkat/BulletinBoardAPI.proto
#	settings.gradle
2016-08-09 14:30:40 +03:00
Hai Brenner ce40a04ac7 Make code of SDKG test prettier 2016-08-07 17:04:23 +03:00
Vladimir Eliezer Tokarev bc790c3eb4 Created select candidate by picture fxml 2016-08-06 16:19:34 +03:00
Vladimir Eliezer Tokarev 99edbcf1b1 Created the candidate write name and the candidate selections uml 2016-08-06 16:01:33 +03:00
Hai Brenner 4ddd5f852a Fix: better test of the NetworkVirtualPrinter 2016-08-02 14:24:25 +03:00
Hai Brenner c78b78aa3c no change 2016-08-02 14:22:21 +03:00
Hai Brenner afed4fb510 Fix: reading protobuf BoolValues through network used to fail due to problematic dynamic casting 2016-08-02 14:13:10 +03:00
Hai Brenner aea84d0f54 Add: todo comments 2016-07-31 17:44:24 +03:00
Hai Brenner cb65103fca Fix: typo in comment 2016-07-31 17:43:58 +03:00
Vladimir Eliezer Tokarev 4f3fc40dc6 Created the voting-booth-station
The created branch is for the voting booth gui, and created the enter
splash fxml file and the straight into channel fxml.
2016-07-30 16:57:17 +03:00
Hai Brenner ae357541e8 Fix typo in documentation comment 2016-07-27 14:25:09 +03:00
Hai Brenner da7a05ecd8 Fix: UI now has command queue of size 1.
A new CommandPend class is introduced. It functions basically as
an ArrayBlockingQueue of size 1.
Difference is that it can handle two functions from two different threads
 - trample(cmd): removes the previously kept command (if there is such) and overrides it with the next command
 - offer(cmd): keeps the given command, but only if it doesn't currently keeps an older one

This new functionality is used so the UI can get commands from the controller
(but only take into account the latest one). At the same time it gets tick commands
from its clock ticker, but only keep and handle those if it doesn't have
a real controller command to handle.
2016-07-19 12:05:06 +03:00
Hai Brenner 1cf16d8386 Fix: output device now has queue of size 1. a newer command always overrides the previous one 2016-07-19 11:59:50 +03:00
Hai Brenner 88991ea9ff Refactor: some more comments, and better looking code in VotingBoothImpl.java 2016-07-12 15:32:22 +03:00
Hai Brenner 0956fa98d3 Refactor: add comments to VotingBoothImpl.java, and rename tasks to commands (because they were two names of the same thing)
Signed-off-by: Hai Brenner <haibrenner@gmail.com>
2016-07-12 15:23:46 +03:00
Hai Brenner 42d68b7ce8 Test: Add NetworkVirtualPrinterTest 2016-07-12 11:54:50 +03:00
Hai Brenner 5404bb9ed2 Fix error in setting name of output device thread 2016-07-12 11:51:16 +03:00
Hai Brenner f2836d277a Add polling-station project dependency to VB build.gradle for testing purposes 2016-07-12 11:50:21 +03:00
Hai Brenner b667de95aa Fix protobuf definition of EncryptedBallot to match the standard convention. 2016-07-12 11:49:25 +03:00
Hai Brenner 49551dc36b Merge branch 'master' into vbdev2
Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto
2016-07-06 21:55:34 +03:00
Hai Brenner 88c4e0e644 Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java 2016-07-06 21:45:35 +03:00
Hai Brenner d804f0dbac voting-booth gradle.build now has dependencies on jetty and RESTful API for testing purposes 2016-07-06 21:33:30 +03:00
Hai Brenner b1a033da5e Add the channel identifier to the PlaintextBallot, so it is now printed by the output device 2016-07-06 13:24:10 +03:00
Hai Brenner 853a6b5684 Another (final) Generics type fix 2016-07-04 16:05:52 +03:00
Hai Brenner 2336d44ffc reduced more compilation warnings by having better Generics type handling and better JavaDocs 2016-07-04 16:04:04 +03:00
Hai Brenner d8b766725b Removed many compilation warnings by having better handling of Generics types and better JavaDocs 2016-07-04 15:52:05 +03:00
Hai Brenner 218677fd96 added many comments and JavaDocs 2016-07-04 14:17:11 +03:00
Hai Brenner 2b56928e9a added some JavaDoc comments and documentation 2016-07-04 11:54:36 +03:00
Hai Brenner 7db6218735 fixed: access to the static system messages from the StorageManage class, rather than its instance 2016-07-04 11:53:28 +03:00
Hai Brenner 66e5db9f22 cleared some unnecessary imports 2016-07-04 11:51:49 +03:00
arbel.peled 48bf8dbe6b Ignore .arcconfig 2016-06-28 15:10:38 +03:00
arbel.peled 8aada21119 Fixed some errors in the tests.
Made Threaded Client parameterized (with respect to waiting times and thread count).
2016-06-28 15:08:36 +03:00
Hai Brenner e298ab1e76 removed two unnecessary imports 2016-06-28 11:35:36 +03:00
Hai Brenner 14fac728b3 1. ScannedData now has a Channel and a SignedEncryptedBallot attributes,
rather than just 'data' attribute
2. Implemented a NetworkVirtualPrinter output device, and now both
   this class and the previous SystemConsoleOutputDevice extend the same
   new abstract class AsyncRunnableOutputDevice which supplies default
   implementations for the interface methods.
2016-06-28 11:32:00 +03:00
Hai Brenner 3a5908ac49 A cancel by the voter is now sent to the execution flow as a Throwable
rather than an Exception.
2016-06-28 11:28:14 +03:00
Hai Brenner 438df78e36 Changed the ToySignature test file to match the new Signature interface. 2016-06-28 11:26:50 +03:00
Hai Brenner 4379921445 For some reason restful API did not appear in my gradle.build. It is fixed now. 2016-06-28 11:26:00 +03:00
arbel.peled 53d609bfee Removed database address from Bulletin Board Server init method (the address is given to the Query Provider).
Added integration tests for Single Server Bulletin Board Client.
Fixed subscription logic in the Single Server Bulletin Board Client.
Decoupled Single Server- and Simple- Bulletin Board Clients (Simple-... is now obsolete).
Fixed some bugs.
Threaded Bulletin Board Client now has some errors in integration.
2016-06-28 08:19:29 +03:00
Hai Brenner d12ad408c4 Merge branch 'master' into vbdev2
Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto
2016-06-26 17:17:24 +03:00