Commit Graph
100 Commits
Author SHA1 Message Date
Frederik Petersen 6685f97758 Fixed bug in master data import with override
and added test for it
2013-07-03 13:26:26 +02:00
Frederik Petersen 9b995adb4f Merge branch 'master' into import_dbdata
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-07-03 10:58:56 +02:00
Frederik Petersen f9c8ad3760 Fixed null pointer in regatta export/import due to null course area 2013-07-03 10:56:14 +02:00
Frederik Petersen 54a7c12646 Fixed course area null pointer for regatta 2013-07-03 10:49:56 +02:00
Frederik Petersen b2f8dbbada Merge branch 'master' into import_dbdata 2013-07-03 10:37:23 +02:00
Frederik Petersen b8093660ee Fixed NPE for master data import if default course area == null 2013-07-03 10:36:19 +02:00
Frederik Petersen 62734243a0 Added override flag for master data import
if set, all existing data with clashing names and ids will be overwritten
2013-07-03 10:31:37 +02:00
Frederik Petersen 0457feed82 Added test case for persistentreggatasforraceIDs export/import 2013-07-03 09:42:26 +02:00
Frederik Petersen a0e85006b5 Added serialization for PersistentRegattaForRaceIDs map to master data
import
2013-07-03 09:30:34 +02:00
Frederik Petersen 5b510f985b Added test for master data import without override
also fixed logging for course area (use id instead of new name)
2013-07-03 09:03:11 +02:00
Frederik Petersen 0a85d22d53 Introduced some logging to master data import operation
logs at info level, when some object with a sepcific name or id already
exists
2013-07-03 08:23:20 +02:00
Frederik Petersen b9f0da6b1c Nationality serializer and deserializer now check for null value 2013-07-02 17:53:00 +02:00
Frederik Petersen a3dcd7c9d6 Creation of events and course areas now possible without replication
this is important for the Master Data Importer not to replicate things
twice
2013-07-02 14:37:04 +02:00
Frederik Petersen 29ce40b930 Regattas can now be created without replication
important for master data import as it itself is a replication operation
2013-07-02 14:21:06 +02:00
Frederik Petersen 31760a3902 Added source folder of master data import to gwt.xmls 2013-07-02 13:30:55 +02:00
Frederik Petersen 40fa1ea6b9 Merge branch 'master' into import_dbdata 2013-07-02 13:09:47 +02:00
Frederik Petersen 570dfef4be Removed master data import post servlet
replaced with sailingservice implementation
2013-07-02 13:08:15 +02:00
Frederik Petersen 3f068e0917 Renamed MasterDataSerializerForNames 2013-07-02 09:49:12 +02:00
Frederik Petersen 9e1b3df73d Fixed merge problems after merge of master into import_dbdata 2013-06-29 10:54:13 +02:00
Frederik Petersen 5963984323 Merge branch 'master' into import_dbdata
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-29 10:46:20 +02:00
Frederik Petersen 18d5ca2fca Added race log import to master data import service
also tested that feature
2013-06-29 10:34:22 +02:00
Frederik Petersen b6643c3f51 Added master data import functionality for competitor display names and
suppressed competitors

-test covered
2013-06-28 13:09:41 +02:00
Frederik Petersen 5f26339d54 Added end-to-end test for master data import without using http stack
-it includes serialization and deserialization
2013-06-28 11:40:37 +02:00
Frederik Petersen 90cf250c0f Added score correction import per dummy tracked race
-also carried points import
2013-06-28 11:39:58 +02:00
Frederik Petersen 724fc0709d Added isLive flag to series json serializer
returns true if tracked race is live
returns false if there is no tracked race, or current time is not between
start and end of race
2013-06-27 14:06:12 +02:00
Frederik Petersen c30c43bb35 Added isLive flag to series json serializer
returns true if tracked race is live
returns false if there is no tracked race, or current time is not between
start and end of race
2013-06-27 11:28:24 +02:00
Frederik Petersen 94fa7a46f3 Added serialization of carried points to master data export 2013-06-27 10:42:47 +02:00
Frederik Petersen b3c4ba5ed5 Added import functionality for score corrections
used in master data import tab

used a hack to create score corrections without having any real tracked
races to add competitors to leaderboard:

the importer sets a temporary dummy trackedrace to get the competitors
into the leaderboard, so that the score corrections can be loaded
2013-06-27 10:03:59 +02:00
Frederik Petersen ff837d78b2 Moved master data container classes to designated package 2013-06-24 12:29:17 +02:00
Frederik Petersen b6088c0ee5 Added result discarding rule to master data of series
+ fixed timepoint serialization for score corrections
2013-06-24 12:06:25 +02:00
Frederik Petersen 5b9d9e3183 Fixed labeling for Master data import panel 2013-06-23 16:18:09 +02:00
Frederik Petersen eb7f7d1bd8 Fixed one more STRING<->UUID id problem in master data import 2013-06-23 16:16:12 +02:00
Frederik Petersen de1786ce95 Fixed ids in master data import 2013-06-23 16:12:29 +02:00
Frederik Petersen 2246f2266a Fixed series order
used list instead of set
2013-06-23 15:29:14 +02:00
Frederik Petersen 3f1db2ffcf Fixed creation count 2013-06-23 15:27:45 +02:00
Frederik Petersen 7e9df0f3b1 Fixed bug that ruined the course area ids upon master data import 2013-06-23 15:02:36 +02:00
Frederik Petersen 70c4481de0 Removed event import dropdown 2013-06-23 15:00:18 +02:00
Frederik Petersen 0d85132e04 Master data import now imports race columns
-works with flexible and regatta leaderboard groups
-does not import score corrections and race logs yet
-events created by import cannot be deleted (bug)
2013-06-23 14:26:18 +02:00
Frederik Petersen 1004efea35 Added Event master data deserialization and their creation in import 2013-06-21 14:44:55 +02:00
Frederik Petersen 966ea872bc Added regatta and event serialization for master data export 2013-06-21 13:06:37 +02:00
Frederik Petersen 6f5e9e4703 Enhanced Master data import
leaderboardgroups and leaderboards (only flexible for now) can now be
imported from a remote server. race columns, score corrections, events,
etc are not imported at this point
2013-06-20 19:27:39 +02:00
Frederik Petersen 02e14d276a Added more detailed serialization
enables us to transfer server master data from one instance to another.

-added nationality for persons
-added coach for teams
-added master data specific serialization classes
2013-06-18 14:00:00 +02:00
Frederik Petersen 56f0067ede Fixed wind estimation bug regarding cluster size confidence
also adapted test
2013-06-14 16:52:15 +02:00
Frederik Petersen eda482d35c Modified master data export to use JsonSerializer classes 2013-06-14 14:04:47 +02:00
Frederik Petersen c58ce50f8f Added score correction and part of race columns to master data export 2013-06-14 10:23:01 +02:00
Frederik Petersen 262908ec96 Added incomplete master data export servlet 2013-06-13 11:09:11 +02:00
Frederik Petersen 27ecb194be Added import master data tab to admin console 2013-06-13 09:57:41 +02:00
Frederik Petersen 60aba0fc15 Changed polarsheetspanel from docklayoutpanel to splitlayoutpanel 2013-05-29 10:26:02 +02:00
Frederik Petersen 5f7217ed29 Polar sheets now correctly resize according to client view size 2013-05-29 10:26:01 +02:00
Frederik Petersen 6b69dbd9d7 Added export button for Rasmus polarsheet export functionality 2013-05-24 17:34:10 +02:00
Frederik Petersen b3331c1c27 Added a more dynamic way of wind-stepping for polar sheets 2013-05-24 16:15:15 +02:00
Frederik Petersen d5eca944bd Added scripts for converting and downscaling videos
The videos are downloaded from provided ftp server,
converted and reuploaded into an out directory.
They can then be referenced in the Video/Audio tab of the AdminConsole
2013-05-22 13:03:23 +02:00
Frederik Petersen 8fd2e7f7e3 Changed PolarSheetGeneration workers to be simple Runnables
rather than FutureTasks, since the results are continuosly pushed to the
result container
2013-02-08 15:35:35 +01:00
Frederik Petersen 31a5d7f9ff Only windspeeds with 5% or more of the total datapoint count are shown 2013-02-08 12:04:02 +01:00
Frederik Petersen d30aea90ec PolarSheetGeneration is now happening on a per windspeed basis 2013-02-08 11:28:58 +01:00
Frederik Petersen ce80f0e211 Changed point marker color range to red/blue for polarsheet 2013-02-07 11:50:44 +01:00
Frederik Petersen 98d54ccbd5 Merge branch 'master' into polarsheets 2013-02-07 09:23:06 +01:00
Frederik Petersen faa30981b0 Added start/stop timepoint optimization to polar sheet generation 2013-02-07 09:21:20 +01:00
Frederik Petersen 53f7b30089 Merge branch 'master' into polarsheets 2013-02-06 08:59:13 +01:00
Frederik Petersen b75d043a79 Added some comments to polar sheet generation logic 2013-02-05 16:13:46 +01:00
Frederik Petersen 1a98bf17ae Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-05 14:22:03 +01:00
Frederik Petersen 6a7d95cd4a Added test for GeneratePolarSheet service 2013-02-05 14:21:12 +01:00
Frederik Petersen 9852b7fe52 Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.java
2013-02-04 16:44:55 +01:00
Frederik Petersen d2c9b76977 Added test-case for PolarSheet Generation 2013-02-04 16:41:04 +01:00
Frederik Petersen 30d5dedcb4 Added some ui-focused functionalities to polarsheetspanel
Chartseries now have boatclassname as their name or "mixed" if multiple
boat classes were selected

+Some axis labels
-some bugs
2013-02-01 15:49:09 +01:00
Frederik Petersen c2a2d5aded Added histogram for polarsheet angles 2013-01-31 16:37:26 +01:00
Frederik Petersen 42127c83fb Changed multithreading approach of polar sheets generation to use executor 2013-01-31 09:03:41 +01:00
Frederik Petersen 8ee3d50d1b Added debugging labels to polarsheetspanel 2013-01-30 14:44:40 +01:00
Frederik Petersen 43eb0a5e83 Fixed missing import and field for last merge 2013-01-30 08:37:36 +01:00
Frederik Petersen 8d118b0bcc Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-01-30 08:36:45 +01:00
Frederik Petersen 298744e141 Fixes for Polarsheet generation
concerning multi-threading
angles

Still problem with locks
2013-01-29 17:07:10 +01:00
Frederik Petersen 58bd249568 Merge branch 'master' into polarsheets 2013-01-29 13:00:22 +01:00
Frederik Petersen f50c5f964f Added connection between polarsheets front- and backend 2013-01-29 12:59:23 +01:00
Frederik Petersen c503ac30cc Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/org.moxieapps.gwt.highcharts/src/org/moxieapps/gwt/highcharts/client/BaseChart.java
2013-01-28 16:06:32 +01:00
Frederik Petersen b4cd90a6d0 Downgraded Highcharts lib from 2.3.5 to 2.3.3 2013-01-28 16:01:50 +01:00
Frederik Petersen d19074a89d Added a subsection about external libraries to Architecture doc 2013-01-28 15:57:08 +01:00
Frederik Petersen ca1d653566 Merge branch 'master' of ssh://git.wdf.sap.corp:29418/SAPSail/sapsailingcapture 2013-01-28 14:46:22 +01:00
Frederik Petersen e2088f8ec9 Downgraded Highcharts js lib to 2.3.3 from 2.3.5
This is the version the current gwt wrapper is tested with.
Resizing the wind+competitor charts had some flaws with version 2.3.5
2013-01-28 14:44:58 +01:00
Frederik Petersen 8e480d4d24 Changed jquery version
1.4.2 -> 1.5.2
to provide compability with new HighCharts version
2013-01-28 13:42:35 +01:00
Frederik Petersen 5b456f2b6e Changed checkbox margin in bugfix to play nice with new HighCharts vers
20->40
2013-01-28 09:28:45 +01:00
Frederik Petersen 7763845750 Extracted new highcharts js files into corresponding dir 2013-01-28 08:39:34 +01:00
Frederik Petersen 18d562445b Initial highcharts upgrade
new gwt version: 1.5.0
new js lib version: 2.3.5

Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
2013-01-28 08:39:04 +01:00
Frederik Petersen 97f388c9a2 Removed unused highcharts lib from gwt.ui bundle
we include the source code in the project
2013-01-28 08:37:13 +01:00
Frederik Petersen 913e0381e9 Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-01-28 08:28:44 +01:00
Frederik Petersen 71ab90a6a8 Merge branch 'master' into polarsheets 2013-01-25 11:25:04 +01:00
Frederik Petersen 4a9b3aa0bf Added serverside polar sheet generation workers.
data needs to be queried from the polarsheetgenerationworker
2013-01-25 11:23:34 +01:00
Frederik Petersen 519d442deb Added comment for waitForLatest parameter
method: getManeuvers
class: TrackedRace
2013-01-25 10:54:14 +01:00
Frederik Petersen d7847aba19 Added method in sailing service for polar sheet generation
also added some functionality to the polarsheetchartpanel
2013-01-24 15:53:01 +01:00
Frederik Petersen c973498ca5 Extracted new highcharts js files into corresponding dir 2013-01-24 13:33:25 +01:00
Frederik Petersen d0e9ebd793 Initial highcharts upgrade
new gwt version: 1.5.0
new js lib version: 2.3.5
2013-01-24 10:22:52 +01:00
Frederik Petersen ba43354923 Merge branch 'master' into polarsheets
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	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-01-24 09:10:39 +01:00
Frederik Petersen 7a73c7a368 Added PolarSheetsChartPanel
not a lot of functionality yet
2013-01-23 16:57:11 +01:00
Frederik Petersen 7611b096e9 Removed unused highcharts lib from gwt.ui bundle
we include the source code in the project
2013-01-23 16:56:12 +01:00
Frederik Petersen f9901035b2 Merge branch 'master' into polarsheets
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-01-23 13:06:52 +01:00
Frederik Petersen 0367fbcf6a Refactored polar sheets panel and its components 2013-01-23 11:24:54 +01:00
Frederik Petersen 64d32accf3 Merge branch 'master' into polarsheets 2013-01-23 10:53:33 +01:00
Frederik Petersen 30b4f04ac7 Added polar sheet generation button to the PolarSheetPanel 2013-01-23 10:51:53 +01:00
Frederik Petersen a27340e3d4 Added advanced settings for the gwt compiler
extended by three new modules
2013-01-23 10:30:17 +01:00
Frederik Petersen d194ec2b08 Merge branch 'master' into polarsheets 2013-01-23 10:20:59 +01:00
Frederik Petersen 4272c96ee6 Changed FilteredTrackedRacesList to implement new abstract class
it now implements the freshly created AbstractTrackedRacesComposite class
2013-01-23 10:18:45 +01:00