Skip to content

Commit

Permalink
Removed the unnecessary Calendar header on all the model pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@computate
computate committed Oct 26, 2022
1 parent 705bdd4 commit 8bfc04a
Show file tree
Hide file tree
Showing 16 changed files with 90 additions and 105 deletions.
156 changes: 78 additions & 78 deletions ...in/java/org/computate/smartvillageview/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/BaseModelGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/BaseResultGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/IotNodeGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/IotNodeStepGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/MapResultGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/templates/enUS/PersonStepGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/SiteHtmGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/SitePageGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/SiteUserGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/SystemEventGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/TimeStepGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/templates/enUS/TrafficLightGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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}}
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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"}}
Expand Down Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
Loading

0 comments on commit 8bfc04a

Please sign in to comment.