Merge branch 'bug3484' of ssh://trac@sapsailing.com/home/trac/git into bug3484

2026-11-14 22:43:57 +00:00 · 2017-12-06 16:02:09 +01:00
commit c4acaff467
@@ -0,0 +1,172 @@
+/** Add css rules here for your application. */
+.clear {
+  clear: both;
+  font-size: 1px;
+  height: 0px;
+  line-height: 0px;
+  margin: -1px 0 0;
+  width: 100%; }
+
+.cover {
+  left: -1000px;
+  overflow: hidden;
+  position: absolute;
+  top: -1000px; }
+
+html {
+  font-size: 15px;
+}
+
+html, body {
+  height: 100%;
+  width: 100%;
+}
+
+body {
+    background: #fff;
+    font-family: 'Open Sans', Arial, Verdana, sans-serif;
+    line-height: 1;
+    font-size: 14px;
+    font-weight: 400;
+    margin: 0;
+  }
+
+/** Example rules used by the template application (remove for your app) */
+h1 {
+  font-size: 2em;
+  font-weight: bold;
+  color: #777777;
+  margin: 40px 0px 70px;
+  text-align: center;
+  }
+
+table {
+  border-collapse: separate; }
+
+.leaderboardContent {
+}
+
+.leaderboardContent td, .leaderboardContent th {
+/*  vertical-align: bottom; */
+    line-height: 1.3;
+/*  padding-top: 2px; */
+}
+
+.leaderboardContent-toolbar {
+
+}
+
+.leaderboardLabel {
+  border-bottom: 2px solid #007dc0;
+  font-weight: bold;
+  margin: 5px;
+ }
+
+.refreshAndSettings {
+  background: #f2f2f2;
+  border-bottom: 2px solid #fff;
+  border-top: 2px solid #fff;
+  height: 30px; }
+
+.refreshAndSettings table td {
+    padding: 0 10px 0 0;}
+
+.refreshAndSettings table table td{
+    padding: 0 0 0 0;}
+
+input.magnifier{
+    display: block;
+    margin: 3px auto 0 auto !important;
+}
+
+body, table td, select, button {
+    font-family: 'Open Sans', Arial, Verdana, sans-serif;
+    font-size: 14px;
+}
+
+.errorLabel {
+    color: #FF0000;
+}
+
+.abstractChartPanel-importantMessageOfChart {
+    font-family: 'Open Sans',Arial,Verdana,sans-serif;
+    font-weight: bold;
+    font-size: 20px;
+    height: 70px;
+    margin: 0 auto;
+    padding: 49px 0 0 80px;
+    width: 300px;
+    color: #7c7c7c;
+    background: url(images/important-message.png) left center no-repeat;
+}
+
+.LeaderboardHeader {
+    position: relative;
+    margin: 0 auto;
+    width: 100%;
+    text-align: center;
+    font-family: 'Open Sans', Arial, Verdana, sans-serif;
+    font-size: 18px;
+    color: #fff;
+    margin-top: 22px;
+}
+
+.leaderboardHeading {
+    font-size: 16px;
+    font-family: 'Open Sans', Arial, Verdana, sans-serif;
+    font-weight: bold;
+}
+
+.gwt-DialogBox {
+    z-index: 20;
+}
+
+.bold {
+    font-family: 'Open Sans Condensed', sans-serif;
+    font-weight: bold;
+}
+
+.trackingQuality-circle {
+  width: 8px;
+  height: 8px;
+  -moz-border-radius-topleft: 50%;
+  -webkit-border-top-left-radius: 50%;
+  -o-border-top-left-radius: 50%;
+  -ms-border-top-left-radius: 50%;
+  border-top-left-radius: 50%;
+  -moz-border-radius-topright: 50%;
+  -webkit-border-top-right-radius: 50%;
+  -o-border-top-right-radius: 50%;
+  -ms-border-top-right-radius: 50%;
+  border-top-right-radius: 50%;
+  -moz-border-radius-bottomleft: 50%;
+  -webkit-border-bottom-left-radius: 50%;
+  -o-border-bottom-left-radius: 50%;
+  -ms-border-bottom-left-radius: 50%;
+  border-bottom-left-radius: 50%;
+  -moz-border-radius-bottomright: 50%;
+  -webkit-border-bottom-right-radius: 50%;
+  -o-border-bottom-right-radius: 50%;
+  -ms-border-bottom-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  float: left;
+}
+
+.circleYellow {
+  background: #fbba00;
+}
+
+.circleGreen {
+  background: #8ab54e;
+}
+
+.circleRed {
+  background: #f01010;
+}
+
+.busyIndicator-Simple {
+    margin-top: 7px;    
+}
+
+.busyIndicator-Circle {
+}
@@ -0,0 +1,36 @@
+<!doctype html>
+
+<html>
+  <head>
+    <!--[if lt IE 9]>
+       <meta http-equiv="REFRESH" content="0; url=http://www.sapsailing.com/browser-info.html">
+    <![endif]-->
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>SAP Sailing Analytics PairingList</title>
+    <meta content='width = device-width, initial-scale = 1.0, user-scalable = yes' name='viewport'>
+    <meta content='yes' name='apple-mobile-web-app-capable'>
+    <meta content='black' name='apple-mobile-web-app-status-bar-style'>
+    <!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
+    <link href='images/sap-sailing-app-icon.png' rel='apple-touch-icon'>
+    <link rel="shortcut icon" type="image/x-icon" href="images/sap.ico" />
+    
+    <link rel="stylesheet" type="text/css" href="/sailing-normalize-3.0.2.cache.css">
+    <link rel="stylesheet" type="text/css" href="/sailing-fontface-1.0.cache.css">
+   <link rel="stylesheet" type="text/css" href="PairingList.css">
+    
+    <script type="text/javascript" src="js/jquery-1.5.2.min.js"></script>
+    
+    <script type="text/javascript" src="com.sap.sailing.gwt.ui.PairingList/com.sap.sailing.gwt.ui.PairingList.nocache.js"></script>
+
+  </head>
+  <body>
+    <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
+    <!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
+    <noscript>
+      <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
+        Your web browser must have JavaScript enabled
+        in order for this application to display correctly.
+      </div>
+    </noscript>
+  </body>
+</html>
@@ -61,7 +61,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-style PRETTY -incremental -workDir &quot;${project_loc:com.sap.sailing.gwt.ui}/.tmp/gwt-work&quot; -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9876 -startupUrl /gwt/Home.html com.sap.sailing.gwt.home.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/EmbeddedMapAndWindChart com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.regattaoverview.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator -startupUrl /gwt/VideoPopup.html com.sap.sailing.gwt.ui.VideoPopup -startupUrl /gwt/YoutubePopup.html com.sap.sailing.gwt.ui.YoutubePopup -startupUrl /gwt/AutoPlay.html com.sap.sailing.gwt.autoplay.AutoPlay"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-style PRETTY -incremental -workDir &quot;${project_loc:com.sap.sailing.gwt.ui}/.tmp/gwt-work&quot; -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9876 -startupUrl /gwt/Home.html com.sap.sailing.gwt.home.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.PairingList -startupUrl /gwt/PairingList.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/EmbeddedMapAndWindChart com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.regattaoverview.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator -startupUrl /gwt/VideoPopup.html com.sap.sailing.gwt.ui.VideoPopup -startupUrl /gwt/YoutubePopup.html com.sap.sailing.gwt.ui.YoutubePopup -startupUrl /gwt/AutoPlay.html com.sap.sailing.gwt.autoplay.AutoPlay"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx3072m -Dgwt.watchFileChanges=false"/>
 </launchConfiguration>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name='com.google.gwt.user.User'/>
+    <inherits name='com.sap.sse.security.ui.Settings'/>
+    <inherits name='com.sap.sailing.gwt.settings.Settings'/>
+
+    <source path="pairinglist"/> 
+
+</module>
+ 
@@ -56,7 +56,7 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
        CaptionPanel dataPanel = new CaptionPanel();
        dataPanel.setCaptionText("Pairing List Data");

-        Grid formGrid = new Grid(4, 2);
+        Grid formGrid = new Grid(5, 2);
        dataPanel.add(formGrid);

        formGrid.setWidget(0, 0, new Label("Number of Flights:"));
@@ -67,6 +67,10 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
        formGrid.setWidget(2, 1, new Label(String.valueOf(this.template.getCompetitorCount())));
        formGrid.setWidget(3, 0, new Label("Quality:"));
        formGrid.setWidget(3, 1, new Label(String.valueOf(Math.floor(this.template.getQuality() * 1000) / 1000)));
+        if (this.template.getFlightMultiplier() > 1) {
+            formGrid.setWidget(4, 0, new Label("Flight Multiplier:"));
+            formGrid.setWidget(4, 1, new Label(String.valueOf(this.template.getFlightMultiplier())));
+        }

        formGrid.setCellSpacing(10);

@@ -1,33 +0,0 @@
-package com.sap.sailing.gwt.ui.adminconsole;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class PairingListTemplateServlet extends HttpServlet{
-    
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
-    }
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String fileName = (String) request.getSession().getAttribute("fileName");
-        
-        InputStream inputStream = null;
-        OutputStream outputStream = response.getOutputStream();
-        
-        FileInputStream fileInputStream = new FileInputStream(fileName);
-        outputStream.write(5000);
-        inputStream.close();
-        outputStream.close();
-    }
-    
-}
@@ -0,0 +1,40 @@
+package com.sap.sailing.gwt.ui.pairinglist;
+
+import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
+import com.google.gwt.user.client.ui.RootLayoutPanel;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication;
+import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication;
+import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
+
+public class PairingListEntryPoint extends AbstractSailingEntryPoint {
+    
+    @Override
+    protected void doOnModuleLoad() {
+        super.doOnModuleLoad();
+
+        this.createUI();
+    }
+    
+    private void createUI() {
+        DockLayoutPanel mainPanel = new DockLayoutPanel(Unit.PX);
+        RootLayoutPanel.get().add(mainPanel);
+        
+        SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication("PairingList");
+        new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView());
+        mainPanel.addNorth(header, 75);
+        
+        mainPanel.add(new ScrollPanel(createPairingListPanel()));
+    }
+    
+    private Widget createPairingListPanel() {
+        VerticalPanel pairingListPanel = new VerticalPanel();
+        
+        // TODO show pairing list
+        
+        return pairingListPanel;
+    }
+}
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Could not determine the version of your GWT SDK; using the module DTD 
+    from GWT 1.6.4. You may want to change this. -->
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
+<module>
+    <inherits name='com.sap.sailing.gwt.ui.CommonConfigs' />
+
+    <!-- Highcharts API -->
+    <inherits name="com.sap.sse.gwt.Highcharts_Autoinject" />
+
+    <!-- Google Maps API -->
+    <inherits name='com.google.gwt.ajaxloader.AjaxLoader' />
+    <inherits name='com.google.gwt.maps.Maps' />
+
+    <!-- Bootstrap API -->
+    <inherits name="com.github.gwtbootstrap.BootstrapNoResources" />
+    <inherits
+        name='com.github.gwtbootstrap.datetimepicker.DatetimepickerNoResources' />
+
+    <!-- Other module inherits -->
+    <inherits name="com.sap.sse.gwt.SSESharedGWT" />
+    <inherits name="com.sap.sse.SSECommon" />
+    <inherits name="com.sap.sailing.domain.SailingDomain" />
+    <inherits name="com.sap.sse.gwt.AdminConsole" />
+    <inherits name="com.sap.sse.security.ui.LoginPanel" />
+
+    <!-- Specify the app entry point class. -->
+    <entry-point class='com.sap.sailing.gwt.ui.pairinglist.PairingListEntryPoint' />
+
+    <!-- module containing locale configuration -->
+    <inherits name='com.sap.sailing.gwt.common.SailingLocalesAllPermutations' />
+
+    <inherits name='com.sap.sailing.gwt.ui.SourceLeaderboard' />
+    <inherits name='com.sap.sailing.gwt.ui.SourceCommon' />
+    <inherits name='com.sap.sailing.gwt.ui.SourceClient' />
+    <inherits name='com.sap.sailing.gwt.ui.SourceShared' />
+    <inherits name="com.sap.sailing.gwt.ui.SourceLeaderboard" />
+    <inherits name="com.sap.sailing.gwt.ui.SourceAdminConsole" />
+    <inherits name="com.sap.sailing.gwt.ui.SourcePairingList" />
+    <inherits name='com.sap.sailing.gwt.settings.Settings'/>
+    
+    <inherits name='com.sap.sse.gwt.CommonControlCSS_Autoinject'/>  
+    <inherits name='com.sap.sailing.gwt.common.AuthenticationCommon'/>
+</module>