Commit Graph

97 Commits (24d00a89fb7348bc05daa6224057280ce9d92c1c)

Author SHA1 Message Date
Laura Radaelli 24d00a89fb added proto for audit 2017-07-17 16:01:15 +03:00
Laura Radaelli ce2fe0e8f2 ignoring election params. dat files. Audit ballot QRcode. 2017-07-17 13:37:39 +03:00
Laura Radaelli 8ace24677b Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui 2017-07-08 14:09:18 +03:00
Laura Radaelli 95700f360e fixed printing auditing. Added separator. 2017-07-03 08:14:59 +03:00
Tal Moran 08d9bd6217 Integrated bb-server angular frontend in gradle build 2017-07-03 03:24:00 +03:00
Tal Moran 05c7a25bb7 Renamed proto files to use standard (lowercase-underscore) naming convention); added a separate proto for bb webapp 2017-06-30 02:28:03 +03:00
Laura Radaelli 9db8d8708a fixed alignment of welcome screen 2017-06-27 16:02:17 +03:00
Laura Radaelli b9613ed693 added summary screen after voting 2017-06-27 14:19:30 +03:00
Laura Radaelli 19a7d5731c added page number to question screen 2017-06-26 13:25:07 +03:00
Tal Moran 68e1737f22 Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now) 2017-06-26 01:59:32 +03:00
Tal Moran 6b47387920 Code now builds 2017-06-25 18:05:52 +03:00
Tal Moran cb1d2343c4 More refactoring for scannerAPI 2017-06-25 10:15:09 +03:00
Tal Moran 3b3a6a09b2 Removed debug printout 2017-06-22 01:42:24 +03:00
Tal Moran ea8813bade Updated voting-booth-gui build script to work without local nexus repository 2017-06-21 17:28:07 +03:00
Laura Radaelli 24b111a20b voting questions flow fixed (removed button cancel) 2017-06-14 19:15:13 +03:00
Laura Radaelli f813cf49ee channel single question 2017-06-14 18:17:07 +03:00
Laura Radaelli db4cf6a734 QR code for cast (missing QR code for audit) + test interaction polling station 2017-03-20 09:34:21 +02:00
Laura Radaelli 97fbfcecaf remove unused import and fixed cast/audit buttons width 2017-01-25 22:10:09 +02:00
Laura Radaelli f393825b26 printer added clean() method 2017-01-25 19:12:30 +02:00
Laura Radaelli 480f4e52bb moved code for fx to voting-booth-gui 2017-01-25 16:01:13 +02:00
Laura Radaelli 29b8ef9734 javafx integration runs till channel choice 2017-01-06 17:24:38 +02:00
Laura Radaelli 5113c2235b fx gui with MainController and Navigator (incomplete) 2016-12-16 22:10:23 +02:00
Laura Radaelli 0b1d334d3c start javaFX window from voting booth ToyRun 2016-12-13 10:23:51 +02:00
Laura Radaelli 971db5d89c barcode window always on top 2016-12-08 13:13:07 +02:00
Laura Radaelli 71076f5c7e fix NullPointerException when calling votersBallot.toString and add showBallot (new window) 2016-12-08 12:11:04 +02:00
VladimirEliTokarev 0509bf6dda Resolved the umextendablity of the summary ballot panel 2016-11-12 17:49:48 +02:00
VladimirEliTokarev 08cc50c22a Resulted the bug with the not expendable panel 2016-11-12 17:37:42 +02:00
VladimirEliTokarev 6161898805 Changed the configuration parser
The usage of \\z delimeter is mustable
2016-11-12 17:17:17 +02:00
VladimirEliTokarev 7b937cc754 Added the creator of the jar to compile and create jar
The jar converts json configuration into normal
2016-11-12 17:05:53 +02:00
Tal Moran e611d0c721 Removed generated files from repository 2016-11-05 23:58:33 +02:00
Tal Moran f5e71dec2f Added JOpt.simple dependency for command-line parsing; fixed bug in build.gradle to support alternative fatmain 2016-11-05 23:56:19 +02:00
VladimirEliTokarev d6ea9412e3 Changed the usage of json configuration
For now we use an binary file which contains all the protobuf ballot
quesitons.
However there is a problem, the jar that suppose to convert json into
binary configuraiton file doesnt work.
2016-11-05 18:00:28 +02:00
Tal Moran c4e0e5f56d Allow using resource paths for images linked in the JSON configuration file 2016-10-30 15:34:58 +02:00
Tal Moran ac4d668984 Use configuration file from bundled resource in test 2016-10-30 13:32:39 +02:00
VladimirEliTokarev b601619d39 Changed the configuraitons tests 2016-10-29 23:10:18 +03:00
VladimirEliTokarev 555783d30c Removed unnsessery panels 2016-10-29 23:06:28 +03:00
VladimirEliTokarev c5dcb9f06e Added the description of the picture of the candidate 2016-10-29 09:48:29 +03:00
VladimirEliTokarev fbc1707b37 Added the validation that the answers given are valid strings and pictures 2016-10-28 20:02:27 +03:00
VladimirEliTokarev e440bb3e76 Added configuration validation 2016-10-28 19:55:51 +03:00
Tal Moran ca89514c97 Modified JSON and BARBECUE deps to use external maven sources 2016-10-26 00:50:23 +03:00
VladimirEliTokarev d575eaf1d2 Moved the main file into outer folder 2016-10-24 17:12:10 +03:00
VladimirEliTokarev 2bf78f7c73 Added the logging to the configuration parsing and the main 2016-10-24 16:47:38 +03:00
VladimirEliTokarev 0af9d94a73 Addded logging to all of the panels. 2016-10-24 16:31:48 +03:00
VladimirEliTokarev 37f8893224 Added the randomiztaion of the answesr 2016-10-18 11:55:31 +03:00
VladimirEliTokarev c474bc5ffb Added the creation of the barcode 2016-10-05 17:12:44 +03:00
VladimirEliTokarev 5a78f723e5 Added button which takes you back 2016-10-05 16:52:28 +03:00
VladimirEliTokarev 94adef22f3 Added the thank for auditing pannel 2016-10-05 16:48:30 +03:00
VladimirEliTokarev dcaf36f8fa Added local usage of json configuration ar 2016-10-05 15:54:06 +03:00
VladimirEliTokarev ef5cd70cc9 The summiting of the voters selections working 2016-10-05 15:37:53 +03:00
VladimirEliTokarev 8e2fdb7828 Every pannel that choses somthing now saves it into VotersBallot` 2016-10-05 13:11:18 +03:00