Merge tag '2.39.5.8'

camsys · Oct 9, 2024 · 152f9c3 · 152f9c3
2 parents d27b218 + 87eb3bc
commit 152f9c3
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 34 deletions.
diff --git a/onebusaway-nyc-acta-webapp/pom.xml b/onebusaway-nyc-acta-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <artifactId>onebusaway-nyc-acta-webapp</artifactId>
   <packaging>war</packaging>

diff --git a/onebusaway-nyc-acta-webapp/src/main/webapp/css/mobile/mobile.css b/onebusaway-nyc-acta-webapp/src/main/webapp/css/mobile/mobile.css
@@ -158,6 +158,11 @@ strong {
 	padding-bottom: 1.0em;
 }
 
+#mobile-survey {
+	padding-top: 1.0em;
+	padding-bottom: 1.0em;
+}
+
 /* search panel */
 #searchPanel form {
 	position: relative;

diff --git a/onebusaway-nyc-admin-webapp/pom.xml b/onebusaway-nyc-admin-webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>onebusaway-nyc</artifactId>
 		<groupId>org.onebusaway</groupId>
-		<version>2.39.7</version>
+		<version>2.39.5.8</version>
 	</parent>
 	<groupId>org.onebusaway</groupId>
 	<artifactId>onebusaway-nyc-admin-webapp</artifactId>

diff --git a/onebusaway-nyc-api-core/pom.xml b/onebusaway-nyc-api-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
 
   <artifactId>onebusaway-nyc-api-core</artifactId>

diff --git a/onebusaway-nyc-api-lib/pom.xml b/onebusaway-nyc-api-lib/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onebusaway-nyc-api-lib</artifactId>

diff --git a/onebusaway-nyc-api-webapp/pom.xml b/onebusaway-nyc-api-webapp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onebusaway</groupId>
         <artifactId>onebusaway-nyc</artifactId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <artifactId>onebusaway-nyc-api-webapp</artifactId>
     <packaging>war</packaging>

diff --git a/onebusaway-nyc-gtfsrt-integration-tests/pom.xml b/onebusaway-nyc-gtfsrt-integration-tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-gtfsrt-integration-tests</artifactId>

diff --git a/onebusaway-nyc-gtfsrt-lib/pom.xml b/onebusaway-nyc-gtfsrt-lib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-gtfsrt-lib</artifactId>

diff --git a/onebusaway-nyc-gtfsrt-webapp/pom.xml b/onebusaway-nyc-gtfsrt-webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>onebusaway-nyc</artifactId>
 		<groupId>org.onebusaway</groupId>
-		<version>2.39.7</version>
+		<version>2.39.5.8</version>
 	</parent>
 	<groupId>org.onebusaway</groupId>
 	<artifactId>onebusaway-nyc-gtfsrt-webapp</artifactId>

diff --git a/onebusaway-nyc-gtfsrt/pom.xml b/onebusaway-nyc-gtfsrt/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>onebusaway-nyc</artifactId>
 		<groupId>org.onebusaway</groupId>
-		<version>2.39.7</version>
+		<version>2.39.5.8</version>
 	</parent>
 	<groupId>org.onebusaway</groupId>
 	<artifactId>onebusaway-nyc-gtfsrt</artifactId>

diff --git a/onebusaway-nyc-integration-tests/pom.xml b/onebusaway-nyc-integration-tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-integration-tests</artifactId>

diff --git a/onebusaway-nyc-ops-api-webapp/pom.xml b/onebusaway-nyc-ops-api-webapp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <properties>
     <spring.version>5.2.20.RELEASE</spring.version>
@@ -153,7 +153,7 @@
     <dependency>
       <groupId>org.onebusaway</groupId>
       <artifactId>onebusaway-nyc-api-lib</artifactId>
-      <version>2.39.7</version>
+      <version>2.39.5.8</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/onebusaway-nyc-presentation/pom.xml b/onebusaway-nyc-presentation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-presentation</artifactId>

diff --git a/onebusaway-nyc-queue-apc/pom.xml b/onebusaway-nyc-queue-apc/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-queue-apc</artifactId>

diff --git a/onebusaway-nyc-queue-broker/pom.xml b/onebusaway-nyc-queue-broker/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-queue-broker</artifactId>

diff --git a/onebusaway-nyc-queue-http-proxy/pom.xml b/onebusaway-nyc-queue-http-proxy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <artifactId>onebusaway-nyc-queue-http-proxy</artifactId>
   <packaging>war</packaging>

diff --git a/onebusaway-nyc-queue-realtime/pom.xml b/onebusaway-nyc-queue-realtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-queue-realtime</artifactId>

diff --git a/onebusaway-nyc-queue-subscriber/pom.xml b/onebusaway-nyc-queue-subscriber/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-queue-subscriber</artifactId>

diff --git a/onebusaway-nyc-queue-test/pom.xml b/onebusaway-nyc-queue-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-queue-test</artifactId>

diff --git a/onebusaway-nyc-report-archive/pom.xml b/onebusaway-nyc-report-archive/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <artifactId>onebusaway-nyc-report-archive</artifactId>
   <packaging>war</packaging>

diff --git a/onebusaway-nyc-report/pom.xml b/onebusaway-nyc-report/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <artifactId>onebusaway-nyc-report</artifactId>
     <packaging>jar</packaging>

diff --git a/onebusaway-nyc-siri-support/pom.xml b/onebusaway-nyc-siri-support/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-siri-support</artifactId>

diff --git a/onebusaway-nyc-sms-webapp/pom.xml b/onebusaway-nyc-sms-webapp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-sms-webapp</artifactId>

diff --git a/onebusaway-nyc-tdm-adapters/pom.xml b/onebusaway-nyc-tdm-adapters/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <artifactId>onebusaway-nyc-tdm-adapters</artifactId>
   <packaging>jar</packaging>

diff --git a/onebusaway-nyc-tdm-webapp/pom.xml b/onebusaway-nyc-tdm-webapp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-tdm-webapp</artifactId>

diff --git a/onebusaway-nyc-transit-data-federation-webapp/pom.xml b/onebusaway-nyc-transit-data-federation-webapp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onebusaway</groupId>
         <artifactId>onebusaway-nyc</artifactId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-transit-data-federation-webapp</artifactId>

diff --git a/onebusaway-nyc-transit-data-federation/pom.xml b/onebusaway-nyc-transit-data-federation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <artifactId>onebusaway-nyc-transit-data-federation</artifactId>
     <packaging>jar</packaging>

diff --git a/onebusaway-nyc-transit-data/pom.xml b/onebusaway-nyc-transit-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-transit-data</artifactId>

diff --git a/onebusaway-nyc-util/pom.xml b/onebusaway-nyc-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>onebusaway-nyc</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
   </parent>
   <groupId>org.onebusaway</groupId>
   <artifactId>onebusaway-nyc-util</artifactId>

diff --git a/onebusaway-nyc-vehicle-tracking-webapp/pom.xml b/onebusaway-nyc-vehicle-tracking-webapp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>onebusaway-nyc</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.39.7</version>
+        <version>2.39.5.8</version>
     </parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-nyc-vehicle-tracking-webapp</artifactId>

diff --git a/onebusaway-nyc-vehicle-tracking/pom.xml b/onebusaway-nyc-vehicle-tracking/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>onebusaway-nyc</artifactId>
 		<groupId>org.onebusaway</groupId>
-		<version>2.39.7</version>
+		<version>2.39.5.8</version>
 	</parent>
 	<artifactId>onebusaway-nyc-vehicle-tracking</artifactId>
 	<packaging>jar</packaging>

diff --git a/onebusaway-nyc-webapp/pom.xml b/onebusaway-nyc-webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>onebusaway-nyc</artifactId>
 		<groupId>org.onebusaway</groupId>
-		<version>2.39.7</version>
+		<version>2.39.5.8</version>
 	</parent>
 	<groupId>org.onebusaway</groupId>
 	<artifactId>onebusaway-nyc-webapp</artifactId>

diff --git a/...yc-webapp/src/main/java/org/onebusaway/nyc/webapp/actions/OneBusAwayNYCActionSupport.java b/...yc-webapp/src/main/java/org/onebusaway/nyc/webapp/actions/OneBusAwayNYCActionSupport.java
@@ -19,6 +19,7 @@
 import java.util.GregorianCalendar;
 import java.util.Map;
 
+import org.onebusaway.nyc.util.configuration.ConfigurationService;
 import org.onebusaway.presentation.impl.NextActionSupport;
 import org.onebusaway.users.client.model.UserBean;
 import org.onebusaway.users.services.CurrentUserService;
@@ -47,6 +48,9 @@ public long getTime() {
 
   @Autowired
   protected CurrentUserService _currentUserService;
+
+  @Autowired
+  private ConfigurationService _configurationService;
 
   public boolean isAdminUser() {
 	return _currentUserService.isCurrentUserAdmin();
@@ -107,4 +111,24 @@ protected UserBean getCurrentUser() {
     return user;
   }
 
+  public String getSurveyText() {
+    return _configurationService.getConfigurationValueAsString(
+            "display.surveyTextMobile", "Take a brief survey to help us improve your ride");
+  }
+
+  public String getSurveyLinkText() {
+    return _configurationService.getConfigurationValueAsString(
+            "display.surveyLinkTextMobile", "mta.info/csurvey");
+  }
+
+  public String getSurveyLinkUrl() {
+    return _configurationService.getConfigurationValueAsString(
+            "display.surveyLinkUrlMobile", "https://mta.info/csurvey");
+  }
+
+  public Boolean getShowSurvey() {
+    return _configurationService.getConfigurationValueAsBoolean(
+            "display.showSurveyMobile", false);
+  }
+
 }
diff --git a/onebusaway-nyc-webapp/src/main/webapp/WEB-INF/decorators/mobile.jspx b/onebusaway-nyc-webapp/src/main/webapp/WEB-INF/decorators/mobile.jspx
@@ -60,8 +60,17 @@
 	</div>
 
 	<decorator:body />
-	
+
 	<div id="footer">
+		<s:if test="%{getShowSurvey() &amp;&amp; getSurveyText() != null &amp;&amp; !getSurveyText().isEmpty()
+			&amp;&amp; getSurveyLinkText() != null &amp;&amp; !getSurveyLinkText().isEmpty()
+			&amp;&amp; getSurveyLinkUrl() != null &amp;&amp; !getSurveyLinkUrl().isEmpty()}">
+			<div id="mobile-survey">
+				<p>
+					${surveyText} <a href="${surveyLinkUrl}">${surveyLinkText}</a>
+				</p>
+			</div>
+		</s:if>
     	<p>
 			<s:url var="mobileHelpUrl" namespace="/m/wiki" action="Help/Index"/>	
     		<a href="${mobileHelpUrl}">Help</a> | 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onebusaway-nyc</artifactId>
-    <version>2.39.7</version>
+    <version>2.39.5.8</version>
     <packaging>pom</packaging>
     <name>onebusaway-nyc</name>