Commit Graph
100 Commits
Author SHA1 Message Date
Armin Zamani 684c405740 RCApp Fix: Empty text field in wind activity resulted in
NumberFormatException after focus change.
2014-06-28 17:31:11 +02:00
Armin Zamani 5103643e41 Fix for RacingProcedures: Handling of Blue Flag in finishing phase was
missing. Regatta overview now displays the blue flag.
2014-06-28 16:49:37 +02:00
Armin Zamani ef2bbc6f53 Merge branch 'master' into kiwo2014 2014-06-25 18:58:33 +02:00
Armin Zamani 1d03b12aa3 Merge branch 'master' into ft-flags 2014-06-25 18:49:43 +02:00
Armin Zamani 3863b9b8a6 Changed version code in Android manifest file 2014-06-25 18:47:43 +02:00
Armin Zamani 92770b97a0 Merge branch 'master' into ft-flags 2014-06-24 18:34:56 +02:00
Armin Zamani cbb21e9fa3 RC App: Updated app version code 2014-06-23 19:45:05 +02:00
Armin Zamani 904639a7b3 RC App: Course Design names are displayed sortedly 2014-06-23 17:45:31 +02:00
Armin Zamani ed86204062 Merge branch 'kiwo2014' of ssh://trac@sapsailing.com/home/trac/git into kiwo2014 2014-06-23 17:37:36 +02:00
Armin Zamani bd60c35232 RC App: Course Design names are displayed sortedly 2014-06-23 17:37:15 +02:00
Armin Zamani c4130c439f Merge branch 'kiwo2014' of ssh://trac@sapsailing.com/home/trac/git into kiwo2014 2014-06-22 12:02:21 +02:00
Armin Zamani 37b9514ed4 Fix for RegattaOverview: Aborting flags are displayed for races if no
start time is set before
2014-06-22 12:01:51 +02:00
Armin Zamani 8fb95cac9f Merge branch 'kiwo2014' of ssh://trac@sapsailing.com/home/trac/git into kiwo2014 2014-06-20 21:48:28 +02:00
Armin Zamani 9b97b5a039 RCApp Fix: Race course is changeable in Running and Finishing phase 2014-06-20 21:45:41 +02:00
Armin Zahamani Faharani e956367926 Created kielerwoche2014 (markdown) 2014-06-20 10:31:45 +00:00
Armin Zahamani Faharani fd136e64a8 Updated home (markdown) 2014-06-20 10:27:18 +00:00
Armin Zamani 79c598d23f ESS specific change: For the landmark finish flag the mark meta data type "LANDMARK" and color "black" are expected 2013-08-20 12:14:01 +02:00
Armin Zamani 2df5fc46b9 one missing move of milliseconds timepoint in a race log test, fixed wrong merge conflict resolution 2013-08-20 09:29:00 +02:00
Armin Zamani a139150617 Merge branch 'master' into racecommittee_app 2013-08-18 18:45:03 +02:00
Armin Zamani 9e452bd70c Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java
2013-08-13 21:01:20 +02:00
Armin Zamani 41e849bf1e Merge branch 'master' into racecommittee_app 2013-08-12 21:35:42 +02:00
Armin Zamani 2f2f58cef0 Merge branch 'master' into racecommittee_app 2013-08-12 15:36:40 +02:00
Armin Zamani 66296ea1e8 Merge branch 'master' into racecommittee_app 2013-08-08 23:30:35 +02:00
Armin Zamani 068e26d571 Merge branch 'racecommittee_app' into racecommittee_app_loaders 2013-08-02 01:47:09 +02:00
Armin Zamani 03a0cd810d Merge branch 'master' into racecommittee_app 2013-08-01 17:54:21 +02:00
Armin Zamani 675bf9d28f Merge branch 'master' into racecommittee_app 2013-07-28 14:30:57 +02:00
Armin Zamani 9678692407 Merge branch 'master' into racecommittee_app 2013-07-28 13:00:59 +02:00
Armin Zamani 66155adf8b Merge branch 'master' into racecommittee_app 2013-07-28 10:00:39 +02:00
Armin Zamani e014077895 internationalized further strings 2013-07-26 23:57:57 +02:00
Armin Zamani 6d1c4873dd Merge branch 'racecommittee_app' into racecommittee_app_deDE 2013-07-26 22:59:50 +02:00
Armin Zamani 1e5890dc7f Merge branch 'master' into racecommittee_app 2013-07-26 10:09:56 +02:00
Armin Zamani 1189f3d6e9 Merge branch 'master' into racecommittee_app 2013-07-26 00:23:31 +02:00
Armin Zamani 22d88ba333 Merge branch 'master' into racecommittee_app 2013-07-25 17:20:15 +02:00
Armin Zamani bc23812e7f fixed wind text positioning, managedRaces are loaded with default startprocedure from AppPreferences, ESS finishing Fragment shows are you sure dialog again for finishing the race 2013-07-25 02:55:22 +02:00
Armin Zamani e13398a99a Merge branch 'master' into racecommittee_app 2013-07-25 01:19:09 +02:00
Armin Zamani f4b79f237b Merge branch 'master' into racecommittee_app 2013-07-23 10:42:49 +02:00
Armin Zamani 644f36de71 Merge branch 'master' into racecommittee_app 2013-07-22 17:10:25 +02:00
Armin Zamani 1a118328ca Merge branch 'master' into racecommittee_app 2013-07-22 16:15:28 +02:00
Armin Zamani f99cf8a60e Merge branch 'master' into racecommittee_app 2013-07-22 14:07:27 +02:00
Armin Zamani a599d4b9e9 Fixed the problem that commit ef4ec5516c intended to fix: When the user logs in as e.g. a demo user, logs out and tries to log in as Officer again, the login type is selected properly now. When no login type is selected by the user, the user cannot log onto the course area 2013-07-20 22:34:11 +02:00
Armin Zamani 6ed1ff331e Merge branch 'master' into racecommittee_app 2013-07-19 22:59:13 +02:00
Armin Zamani 98d20345d5 Merge branch 'master' into racecommittee_app 2013-07-18 14:45:22 +02:00
Armin Zamani 4ce7b463b2 Merge branch 'master' into racecommittee_app 2013-07-17 12:18:33 +02:00
Armin Zamani dbad878035 Removed additional getTimePoint() declaration in RaceLogEvent 2013-07-16 21:44:25 +02:00
Armin Zamani ef7b049887 Merge branch 'master' into racecommittee_app 2013-07-16 20:31:02 +02:00
Armin Zamani 5fed0bfcb2 Merge branch 'master' into racecommittee_app 2013-07-16 00:46:22 +02:00
Armin Zamani 031b07946b Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-07 15:26:14 +02:00
Armin Zamani 992939a6e2 Merge branch 'master' into racecommittee_app 2013-07-07 15:25:32 +02:00
Armin Zamani 18a93bf409 App: Show mark images in the course designer known by the ESS race officers 2013-07-07 15:22:21 +02:00
Armin Zamani ecf739b8dd RegattaOverview: Implemented "Deselect all"/"Select all" button for settings. Note that deselecting all checkboxes and clicking on OK means to show all courseareas or regattas 2013-07-06 00:29:14 +02:00
Armin Zamani 47572a98f1 Bug fix after merge of StringMessages 2013-07-05 23:07:33 +02:00
Armin Zamani 8b4ee1b4e9 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-05 21:27:33 +02:00
Armin Zamani b5b50680d2 Merge branch 'master' into racecommittee_app 2013-07-05 21:26:57 +02:00
Armin Zamani 4541bbe2b5 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-05 09:26:17 +02:00
Armin Zamani 78e0ccb84f Merge branch 'master' into racecommittee_app 2013-07-05 09:25:49 +02:00
Armin Zamani 8af60a38ce Merge branch 'racecommittee_app' into racecommittee_wind
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-07-04 21:07:35 +02:00
Armin Zamani 05d1239b42 Merge branch 'master' into racecommittee_app 2013-07-04 21:05:51 +02:00
Armin Zamani 4aaa395c6c Merge branch 'racecommittee_app' into racecommittee_wind
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-07-04 14:30:03 +02:00
Armin Zamani 08d74532ed Merge branch 'master' into racecommittee_app 2013-07-04 14:27:42 +02:00
Armin Zamani 4b40d90fd0 Merge branch 'racecommittee_app' into racecommittee_wind
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-07-04 14:25:05 +02:00
Armin Zamani fbdfc2799a Merge branch 'master' into racecommittee_app 2013-07-04 09:36:56 +02:00
Armin Zamani 3a0862eefe moved WindByRaceLogTest to com.sap.sailing.server.test, moved removing of wind fixes while detaching a TrackedRace from a RaceColumn to an own method 2013-07-03 19:33:30 +02:00
Armin Zamani 2162e94417 moved all strings in FlagsMeaningExplanator to StringMessages 2013-07-03 14:58:29 +02:00
Armin Zamani 9ba95416c2 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-03 13:55:08 +02:00
Armin Zamani 032b8a5381 Merge branch 'master' into racecommittee_app 2013-07-03 11:43:14 +02:00
Armin Zamani 1ff532de01 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-02 22:08:26 +02:00
Armin Zamani 72034625e3 Merge branch 'master' into racecommittee_app 2013-07-02 22:07:26 +02:00
Armin Zamani ec0ffe3141 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-02 09:29:24 +02:00
Armin Zamani b401c3ea03 Merge branch 'master' into racecommittee_app 2013-07-02 09:28:45 +02:00
Armin Zamani f212539d54 Merge branch 'racecommittee_app' into racecommittee_wind 2013-07-01 17:25:33 +02:00
Armin Zamani b96c897656 Merge branch 'master' into racecommittee_app 2013-07-01 17:22:34 +02:00
Armin Zamani 61299fb7bc Added a test for the integration of Race Log Wind fixes in the WindStore (detaching test fails) 2013-07-01 17:20:07 +02:00
Armin Zamani 19fc14dab2 implemented windFixes finder test 2013-06-30 14:10:27 +02:00
Armin Zamani 88a60b8e1d Fixed typo in finder test names 2013-06-30 14:09:55 +02:00
Armin Zamani d8e546de5e Merge branch 'racecommittee_app' into racecommittee_wind 2013-06-30 13:28:57 +02:00
Armin Zamani 986490e50d code cleanup (removed two todos) 2013-06-30 13:27:38 +02:00
Armin Zamani f5856466f6 Merge branch 'master' into racecommittee_app 2013-06-30 13:22:04 +02:00
Armin Zamani 8cba5d275c Merge branch 'master' into racecommittee_app 2013-06-30 00:33:40 +02:00
Armin Zamani 7d01534075 Improved logging in app 2013-06-28 23:49:54 +02:00
Armin Zamani 20b7899d13 Gate Start: Only the class flag is removed at start time, the golf flag is removed seperately 2013-06-28 23:16:30 +02:00
Armin Zamani de76498453 introduced a flags meaning explanator for the flags tool tip 2013-06-28 22:25:23 +02:00
Armin Zamani a802234048 use recordWind instead of add of windTrack 2013-06-28 00:52:01 +02:00
Armin Zamani 314b12cbd7 Merge branch 'racecommittee_app' into racecommittee_wind 2013-06-27 23:13:07 +02:00
Armin Zamani 3526e7489f changed race log event insertion logging to fine level 2013-06-27 18:35:41 +02:00
Armin Zamani f9d7d50b8e Merge branch 'master' into racecommittee_app 2013-06-27 18:21:29 +02:00
Armin Zamani d64565018f added logging when a race log event is inserted in database 2013-06-27 18:18:23 +02:00
Armin Zamani b0f1b72667 adapted the course layout names for the international part of Kieler Woche 2013 according to sailing instructions for the course entry backup solution 2013-06-27 11:38:32 +02:00
Armin Zamani 4d02b07304 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-06-26 15:10:55 +02:00
Armin Zamani a573ffb6fc Merge branch 'master' into racecommittee_app 2013-06-26 11:41:03 +02:00
Armin Zamani ac283bb75d moved the resend interval for events to the AppConstants 2013-06-26 10:22:30 +02:00
Armin Zamani 2d8ebdf35a First step towards wind store in TrackedRace for wind fixes by the racecommittee 2013-06-26 00:34:15 +02:00
Armin Zamani f9584308fa Merge branch 'master' into racecommittee_app 2013-06-25 18:31:30 +02:00
Armin Zamani 0eb1019210 RegattaOverview: added null check for event id for local storage of settings 2013-06-25 16:44:31 +02:00
Armin Zamani 9c3093636b Merge branch 'master' into racecommittee_app 2013-06-25 16:22:11 +02:00
Armin Zamani c72ffc5090 Merge branch 'master' into racecommittee_app 2013-06-25 13:11:03 +02:00
Armin Zamani f7dda629a5 Merge branch 'master' into racecommittee_app 2013-06-25 10:58:31 +02:00
Armin Zamani 4fac255828 Merge branch 'master' into racecommittee_app 2013-06-24 22:14:20 +02:00
Armin Zamani 97dfbf8a2f Merge branch 'racecommittee_app' into racecommittee_regattaoverview
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-06-24 16:04:24 +02:00
Armin Zamani 087f24d33d Merge branch 'racecommittee_app' into racecommittee_kw13 2013-06-24 16:02:04 +02:00
Armin Zamani b551d1faad Merge branch 'master' into racecommittee_app 2013-06-24 16:01:24 +02:00