From 8bfc04a9279030400eb7a7f2103fb4c6ecb1f9bc Mon Sep 17 00:00:00 2001
From: Christopher Tate <computate@computate.org>
Date: Wed, 26 Oct 2022 06:41:48 -0600
Subject: [PATCH] Removed the unnecessary Calendar header on all the model
 pages.

---
 .../user/SiteUserEnUSGenApiServiceImpl.java   | 156 +++++++++---------
 .../templates/enUS/BaseModelGenPage.hbs       |   1 -
 .../templates/enUS/BaseResultGenPage.hbs      |   1 -
 .../templates/enUS/IotNodeGenPage.hbs         |   1 -
 .../templates/enUS/IotNodeStepGenPage.hbs     |   1 -
 .../templates/enUS/MapResultGenPage.hbs       |   1 -
 .../templates/enUS/PersonStepGenPage.hbs      |   7 +-
 .../templates/enUS/SiteHtmGenPage.hbs         |   1 -
 .../templates/enUS/SitePageGenPage.hbs        |   1 -
 .../templates/enUS/SiteUserGenPage.hbs        |   1 -
 .../templates/enUS/SystemEventGenPage.hbs     |   1 -
 .../templates/enUS/TimeStepGenPage.hbs        |   1 -
 .../templates/enUS/TrafficLightGenPage.hbs    |   7 +-
 .../enUS/TrafficLightStepGenPage.hbs          |   7 +-
 .../enUS/TrafficSimulationGenPage.hbs         |   1 -
 .../templates/enUS/VehicleStepGenPage.hbs     |   7 +-
 16 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/src/main/java/org/computate/smartvillageview/enus/model/user/SiteUserEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
index 3825f6a7..46bb684e 100644
--- a/src/main/java/org/computate/smartvillageview/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
+++ b/src/main/java/org/computate/smartvillageview/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
@@ -457,6 +457,30 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
 
 			for(String entityVar : methodNames) {
 				switch(entityVar) {
+					case "setInheritPk":
+							o2.setInheritPk(jsonObject.getString(entityVar));
+							if(bParams.size() > 0)
+								bSql.append(", ");
+							bSql.append(SiteUser.VAR_inheritPk + "=$" + num);
+							num++;
+							bParams.add(o2.sqlInheritPk());
+						break;
+					case "setArchived":
+							o2.setArchived(jsonObject.getBoolean(entityVar));
+							if(bParams.size() > 0)
+								bSql.append(", ");
+							bSql.append(SiteUser.VAR_archived + "=$" + num);
+							num++;
+							bParams.add(o2.sqlArchived());
+						break;
+					case "setDeleted":
+							o2.setDeleted(jsonObject.getBoolean(entityVar));
+							if(bParams.size() > 0)
+								bSql.append(", ");
+							bSql.append(SiteUser.VAR_deleted + "=$" + num);
+							num++;
+							bParams.add(o2.sqlDeleted());
+						break;
 					case "setUserId":
 							o2.setUserId(jsonObject.getString(entityVar));
 							if(bParams.size() > 0)
@@ -521,30 +545,6 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
 							num++;
 							bParams.add(o2.sqlSeeDeleted());
 						break;
-					case "setInheritPk":
-							o2.setInheritPk(jsonObject.getString(entityVar));
-							if(bParams.size() > 0)
-								bSql.append(", ");
-							bSql.append(SiteUser.VAR_inheritPk + "=$" + num);
-							num++;
-							bParams.add(o2.sqlInheritPk());
-						break;
-					case "setArchived":
-							o2.setArchived(jsonObject.getBoolean(entityVar));
-							if(bParams.size() > 0)
-								bSql.append(", ");
-							bSql.append(SiteUser.VAR_archived + "=$" + num);
-							num++;
-							bParams.add(o2.sqlArchived());
-						break;
-					case "setDeleted":
-							o2.setDeleted(jsonObject.getBoolean(entityVar));
-							if(bParams.size() > 0)
-								bSql.append(", ");
-							bSql.append(SiteUser.VAR_deleted + "=$" + num);
-							num++;
-							bParams.add(o2.sqlDeleted());
-						break;
 				}
 			}
 			bSql.append(" WHERE pk=$" + num);
@@ -805,6 +805,60 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
 				Set<String> entityVars = jsonObject.fieldNames();
 				for(String entityVar : entityVars) {
 					switch(entityVar) {
+					case SiteUser.VAR_inheritPk:
+						o2.setInheritPk(jsonObject.getString(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_inheritPk + "=$" + num);
+						num++;
+						bParams.add(o2.sqlInheritPk());
+						break;
+					case SiteUser.VAR_created:
+						o2.setCreated(jsonObject.getString(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_created + "=$" + num);
+						num++;
+						bParams.add(o2.sqlCreated());
+						break;
+					case SiteUser.VAR_archived:
+						o2.setArchived(jsonObject.getBoolean(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_archived + "=$" + num);
+						num++;
+						bParams.add(o2.sqlArchived());
+						break;
+					case SiteUser.VAR_deleted:
+						o2.setDeleted(jsonObject.getBoolean(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_deleted + "=$" + num);
+						num++;
+						bParams.add(o2.sqlDeleted());
+						break;
+					case SiteUser.VAR_sessionId:
+						o2.setSessionId(jsonObject.getString(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_sessionId + "=$" + num);
+						num++;
+						bParams.add(o2.sqlSessionId());
+						break;
+					case SiteUser.VAR_userKey:
+						o2.setUserKey(jsonObject.getString(entityVar));
+						if(bParams.size() > 0) {
+							bSql.append(", ");
+						}
+						bSql.append(SiteUser.VAR_userKey + "=$" + num);
+						num++;
+						bParams.add(o2.sqlUserKey());
+						break;
 					case SiteUser.VAR_userId:
 						o2.setUserId(jsonObject.getString(entityVar));
 						if(bParams.size() > 0) {
@@ -877,60 +931,6 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
 						num++;
 						bParams.add(o2.sqlSeeDeleted());
 						break;
-					case SiteUser.VAR_inheritPk:
-						o2.setInheritPk(jsonObject.getString(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_inheritPk + "=$" + num);
-						num++;
-						bParams.add(o2.sqlInheritPk());
-						break;
-					case SiteUser.VAR_created:
-						o2.setCreated(jsonObject.getString(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_created + "=$" + num);
-						num++;
-						bParams.add(o2.sqlCreated());
-						break;
-					case SiteUser.VAR_archived:
-						o2.setArchived(jsonObject.getBoolean(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_archived + "=$" + num);
-						num++;
-						bParams.add(o2.sqlArchived());
-						break;
-					case SiteUser.VAR_deleted:
-						o2.setDeleted(jsonObject.getBoolean(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_deleted + "=$" + num);
-						num++;
-						bParams.add(o2.sqlDeleted());
-						break;
-					case SiteUser.VAR_sessionId:
-						o2.setSessionId(jsonObject.getString(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_sessionId + "=$" + num);
-						num++;
-						bParams.add(o2.sqlSessionId());
-						break;
-					case SiteUser.VAR_userKey:
-						o2.setUserKey(jsonObject.getString(entityVar));
-						if(bParams.size() > 0) {
-							bSql.append(", ");
-						}
-						bSql.append(SiteUser.VAR_userKey + "=$" + num);
-						num++;
-						bParams.add(o2.sqlUserKey());
-						break;
 					}
 				}
 			}
diff --git a/src/main/resources/templates/enUS/BaseModelGenPage.hbs b/src/main/resources/templates/enUS/BaseModelGenPage.hbs
index 43eb2e90..d739cb55 100644
--- a/src/main/resources/templates/enUS/BaseModelGenPage.hbs
+++ b/src/main/resources/templates/enUS/BaseModelGenPage.hbs
@@ -478,7 +478,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq baseModelCount int0}}
diff --git a/src/main/resources/templates/enUS/BaseResultGenPage.hbs b/src/main/resources/templates/enUS/BaseResultGenPage.hbs
index 93506a02..9a95a135 100644
--- a/src/main/resources/templates/enUS/BaseResultGenPage.hbs
+++ b/src/main/resources/templates/enUS/BaseResultGenPage.hbs
@@ -478,7 +478,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq baseResultCount int0}}
diff --git a/src/main/resources/templates/enUS/IotNodeGenPage.hbs b/src/main/resources/templates/enUS/IotNodeGenPage.hbs
index bfe0ad70..ffbc04cf 100644
--- a/src/main/resources/templates/enUS/IotNodeGenPage.hbs
+++ b/src/main/resources/templates/enUS/IotNodeGenPage.hbs
@@ -680,7 +680,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq iotNodeCount int0}}
diff --git a/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs b/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs
index 20b88b88..4ac6ece2 100644
--- a/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs
+++ b/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs
@@ -680,7 +680,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq iotNodeStepCount int0}}
diff --git a/src/main/resources/templates/enUS/MapResultGenPage.hbs b/src/main/resources/templates/enUS/MapResultGenPage.hbs
index 8b971622..1c2aacdd 100644
--- a/src/main/resources/templates/enUS/MapResultGenPage.hbs
+++ b/src/main/resources/templates/enUS/MapResultGenPage.hbs
@@ -511,7 +511,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq mapResultCount int0}}
diff --git a/src/main/resources/templates/enUS/PersonStepGenPage.hbs b/src/main/resources/templates/enUS/PersonStepGenPage.hbs
index 0cdf2e0f..0635811b 100644
--- a/src/main/resources/templates/enUS/PersonStepGenPage.hbs
+++ b/src/main/resources/templates/enUS/PersonStepGenPage.hbs
@@ -417,8 +417,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="PATCH"}}
 {{> "htmSimulationKey" classApiMethodMethod="PATCH"}}
-{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 {{> "htmTimeStepId" classApiMethodMethod="PATCH"}}
+{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="PATCH"}}
@@ -473,8 +473,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="POST"}}
 {{> "htmSimulationKey" classApiMethodMethod="POST"}}
-{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 {{> "htmTimeStepId" classApiMethodMethod="POST"}}
+{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="POST"}}
@@ -552,8 +552,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="Page"}}
 {{> "htmSimulationKey" classApiMethodMethod="Page"}}
-{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 {{> "htmTimeStepId" classApiMethodMethod="Page"}}
+{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="Page"}}
@@ -665,7 +665,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq personStepCount int0}}
diff --git a/src/main/resources/templates/enUS/SiteHtmGenPage.hbs b/src/main/resources/templates/enUS/SiteHtmGenPage.hbs
index cc9347d2..bce2f76f 100644
--- a/src/main/resources/templates/enUS/SiteHtmGenPage.hbs
+++ b/src/main/resources/templates/enUS/SiteHtmGenPage.hbs
@@ -620,7 +620,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq siteHtmCount int0}}
diff --git a/src/main/resources/templates/enUS/SitePageGenPage.hbs b/src/main/resources/templates/enUS/SitePageGenPage.hbs
index d2c1d53c..d75c7492 100644
--- a/src/main/resources/templates/enUS/SitePageGenPage.hbs
+++ b/src/main/resources/templates/enUS/SitePageGenPage.hbs
@@ -629,7 +629,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq sitePageCount int0}}
diff --git a/src/main/resources/templates/enUS/SiteUserGenPage.hbs b/src/main/resources/templates/enUS/SiteUserGenPage.hbs
index 0073318f..787d43ad 100644
--- a/src/main/resources/templates/enUS/SiteUserGenPage.hbs
+++ b/src/main/resources/templates/enUS/SiteUserGenPage.hbs
@@ -616,7 +616,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq siteUserCount int0}}
diff --git a/src/main/resources/templates/enUS/SystemEventGenPage.hbs b/src/main/resources/templates/enUS/SystemEventGenPage.hbs
index be8948e9..6a6ba927 100644
--- a/src/main/resources/templates/enUS/SystemEventGenPage.hbs
+++ b/src/main/resources/templates/enUS/SystemEventGenPage.hbs
@@ -632,7 +632,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq systemEventCount int0}}
diff --git a/src/main/resources/templates/enUS/TimeStepGenPage.hbs b/src/main/resources/templates/enUS/TimeStepGenPage.hbs
index 192a97ee..1e8f393a 100644
--- a/src/main/resources/templates/enUS/TimeStepGenPage.hbs
+++ b/src/main/resources/templates/enUS/TimeStepGenPage.hbs
@@ -620,7 +620,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq timeStepCount int0}}
diff --git a/src/main/resources/templates/enUS/TrafficLightGenPage.hbs b/src/main/resources/templates/enUS/TrafficLightGenPage.hbs
index 37ccef95..2a45eea2 100644
--- a/src/main/resources/templates/enUS/TrafficLightGenPage.hbs
+++ b/src/main/resources/templates/enUS/TrafficLightGenPage.hbs
@@ -417,8 +417,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="PATCH"}}
 {{> "htmSimulationKey" classApiMethodMethod="PATCH"}}
-{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 {{> "htmTimeStepId" classApiMethodMethod="PATCH"}}
+{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="PATCH"}}
@@ -473,8 +473,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="POST"}}
 {{> "htmSimulationKey" classApiMethodMethod="POST"}}
-{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 {{> "htmTimeStepId" classApiMethodMethod="POST"}}
+{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="POST"}}
@@ -552,8 +552,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="Page"}}
 {{> "htmSimulationKey" classApiMethodMethod="Page"}}
-{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 {{> "htmTimeStepId" classApiMethodMethod="Page"}}
+{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="Page"}}
@@ -665,7 +665,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq trafficLightCount int0}}
diff --git a/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs b/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs
index fab19714..f352d086 100644
--- a/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs
+++ b/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs
@@ -417,8 +417,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="PATCH"}}
 {{> "htmSimulationKey" classApiMethodMethod="PATCH"}}
-{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 {{> "htmTimeStepId" classApiMethodMethod="PATCH"}}
+{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="PATCH"}}
@@ -475,8 +475,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="POST"}}
 {{> "htmSimulationKey" classApiMethodMethod="POST"}}
-{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 {{> "htmTimeStepId" classApiMethodMethod="POST"}}
+{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="POST"}}
@@ -556,8 +556,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="Page"}}
 {{> "htmSimulationKey" classApiMethodMethod="Page"}}
-{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 {{> "htmTimeStepId" classApiMethodMethod="Page"}}
+{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="Page"}}
@@ -671,7 +671,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq trafficLightStepCount int0}}
diff --git a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs
index 586a2361..d2930dfb 100644
--- a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs
+++ b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs
@@ -646,7 +646,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq trafficSimulationCount int0}}
diff --git a/src/main/resources/templates/enUS/VehicleStepGenPage.hbs b/src/main/resources/templates/enUS/VehicleStepGenPage.hbs
index 72c4b522..b281a6e7 100644
--- a/src/main/resources/templates/enUS/VehicleStepGenPage.hbs
+++ b/src/main/resources/templates/enUS/VehicleStepGenPage.hbs
@@ -417,8 +417,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="PATCH"}}
 {{> "htmSimulationKey" classApiMethodMethod="PATCH"}}
-{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 {{> "htmTimeStepId" classApiMethodMethod="PATCH"}}
+{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="PATCH"}}
@@ -473,8 +473,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="POST"}}
 {{> "htmSimulationKey" classApiMethodMethod="POST"}}
-{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 {{> "htmTimeStepId" classApiMethodMethod="POST"}}
+{{> "htmSumocfgPath" classApiMethodMethod="POST"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="POST"}}
@@ -552,8 +552,8 @@
 							<div class="w3-cell-row ">
 {{> "htmSimulationName" classApiMethodMethod="Page"}}
 {{> "htmSimulationKey" classApiMethodMethod="Page"}}
-{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 {{> "htmTimeStepId" classApiMethodMethod="Page"}}
+{{> "htmSumocfgPath" classApiMethodMethod="Page"}}
 							</div>
 							<div class="w3-cell-row ">
 {{> "htmTime" classApiMethodMethod="Page"}}
@@ -665,7 +665,6 @@
 {{#block "htmBodyGraph"}}{{/block}}
 	<div class="pageContent w3-content ">
 		<div id="site-calendar-box">
-			<h3 id="site-calendar-title">Calendar</h3>
 			<div id="site-calendar"><!-- // --></div>
 		</div>
 	{{#eq vehicleStepCount int0}}