Fixed the layout of the TrafficSimulation page to show longer paths.

computate-org · Oct 26, 2022 · 705bdd4 · 705bdd4
1 parent 2ad0776
commit 705bdd4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/...va/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java b/...va/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java
@@ -1362,15 +1362,13 @@ public static Integer htmlRowTrafficSimulation(String var) {
 		case VAR_sumocfgPath:
 			return 4;
 		case VAR_fcdFilePath:
-			return 4;
-		case VAR_netFilePath:
-			return 4;
-		case VAR_startSeconds:
 			return 5;
+		case VAR_startSeconds:
+			return 6;
 		case VAR_endSeconds:
-			return 5;
+			return 6;
 		case VAR_stepSeconds:
-			return 5;
+			return 6;
 			default:
 				return BaseModel.htmlRowBaseModel(var);
 		}
@@ -1383,9 +1381,7 @@ public static Integer htmlCellTrafficSimulation(String var) {
 		case VAR_sumocfgPath:
 			return 1;
 		case VAR_fcdFilePath:
-			return 3;
-		case VAR_netFilePath:
-			return 3;
+			return 1;
 		case VAR_startSeconds:
 			return 1;
 		case VAR_endSeconds:

diff --git a/.../java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java b/.../java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java
@@ -77,8 +77,8 @@ protected void _sumocfgPath(Wrap<String> w) {
 	 * DocValues: true
 	 * Persist: true
 	 * DisplayName: Floating Car Data file path
-	 * HtmlRow: 4
-	 * HtmlCell: 3
+	 * HtmlRow: 5
+	 * HtmlCell: 1
 	 * Facet: true
 	 */
 	protected void _fcdFilePath(Wrap<String> w) {
@@ -89,8 +89,6 @@ protected void _fcdFilePath(Wrap<String> w) {
 	 * DocValues: true
 	 * Persist: true
 	 * DisplayName: net file path
-	 * HtmlRow: 4
-	 * HtmlCell: 3
 	 * Facet: true
 	 */
 	protected void _netFilePath(Wrap<String> w) {
@@ -102,7 +100,7 @@ protected void _netFilePath(Wrap<String> w) {
 	 * Persist: true
 	 * DisplayName: start seconds
 	 * Description: -b, --begin TIME Defines the begin time in seconds; The simulation starts at this time
-	 * HtmlRow: 5
+	 * HtmlRow: 6
 	 * HtmlCell: 1
 	 * Facet: true
 	 */
@@ -115,7 +113,7 @@ protected void _startSeconds(Wrap<BigDecimal> w) {
 	 * Persist: true
 	 * DisplayName: end seconds
 	 * Description: -e, --end TIME Defines the end time in seconds; The simulation ends at this time
-	 * HtmlRow: 5
+	 * HtmlRow: 6
 	 * HtmlCell: 2
 	 * Facet: true
 	 */
@@ -128,7 +126,7 @@ protected void _endSeconds(Wrap<BigDecimal> w) {
 	 * Persist: true
 	 * DisplayName: step seconds
 	 * Description: --step-length TIME Defines the step duration in seconds
-	 * HtmlRow: 5
+	 * HtmlRow: 6
 	 * HtmlCell: 3
 	 * Facet: true
 	 */

diff --git a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs
@@ -418,8 +418,9 @@
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
+							</div>
+							<div class="w3-cell-row ">
 {{> "htmFcdFilePath" classApiMethodMethod="PATCH"}}
-{{> "htmNetFilePath" classApiMethodMethod="PATCH"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmStartSeconds" classApiMethodMethod="PATCH"}}
@@ -466,8 +467,9 @@
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmSumocfgPath" classApiMethodMethod="POST"}}
+							</div>
+							<div class="w3-cell-row ">
 {{> "htmFcdFilePath" classApiMethodMethod="POST"}}
-{{> "htmNetFilePath" classApiMethodMethod="POST"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmStartSeconds" classApiMethodMethod="POST"}}
@@ -539,8 +541,9 @@
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmSumocfgPath" classApiMethodMethod="Page"}}
+							</div>
+							<div class="w3-cell-row ">
 {{> "htmFcdFilePath" classApiMethodMethod="Page"}}
-{{> "htmNetFilePath" classApiMethodMethod="Page"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmStartSeconds" classApiMethodMethod="Page"}}