From bfb1cb21488cb362d2f2003561e07c753746de4a Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 15 Mar 2023 22:22:26 -0600 Subject: [PATCH] Improved websocket handlebars templating to override --- .../enus/model/base/BaseModelGen.java | 21 ++++---- .../enus/model/base/BaseModelGenPageGen.java | 27 +++++++++++ .../enus/model/htm/SiteHtmGenPageGen.java | 27 +++++++++++ .../enus/model/iotnode/IotNodeGenPageGen.java | 27 +++++++++++ .../enus/model/page/SitePageGenPageGen.java | 27 +++++++++++ .../system/event/SystemEventGenPageGen.java | 27 +++++++++++ .../bicycle/step/BicycleStepGenPageGen.java | 27 +++++++++++ .../TrafficFlowObservedGenPageGen.java | 27 +++++++++++ .../traffic/light/TrafficLightGenPageGen.java | 27 +++++++++++ .../step/TrafficLightStepGenPageGen.java | 27 +++++++++++ .../person/step/PersonStepGenPageGen.java | 27 +++++++++++ .../map/TrafficSimulationMapPageGen.java | 27 +++++++++++ .../traffic/time/step/TimeStepGenPageGen.java | 27 +++++++++++ .../vehicle/step/VehicleStepGenPageGen.java | 27 +++++++++++ .../enus/model/user/SiteUserGenPageGen.java | 27 +++++++++++ .../enus/page/HomePageGen.java | 48 +++++++++++++++---- .../enus/page/PageLayoutGen.java | 42 +++++++++------- .../enus/request/SiteRequestEnUSGen.java | 14 +++--- .../enus/result/base/BaseResultGen.java | 21 ++++---- .../result/base/BaseResultGenPageGen.java | 27 +++++++++++ .../iotnode/step/IotNodeStepGenPageGen.java | 27 +++++++++++ .../enus/result/map/MapResultGenPageGen.java | 27 +++++++++++ .../htm/SiteHtmEnUSGenApiServiceImpl.java | 14 +++--- .../iotnode/IotNodeEnUSGenApiServiceImpl.java | 14 +++--- .../page/SitePageEnUSGenApiServiceImpl.java | 14 +++--- .../SystemEventEnUSGenApiServiceImpl.java | 14 +++--- .../BicycleStepEnUSGenApiServiceImpl.java | 14 +++--- ...fficFlowObservedEnUSGenApiServiceImpl.java | 14 +++--- .../TrafficLightEnUSGenApiServiceImpl.java | 14 +++--- ...TrafficLightStepEnUSGenApiServiceImpl.java | 14 +++--- .../step/PersonStepEnUSGenApiServiceImpl.java | 14 +++--- .../step/TimeStepEnUSGenApiServiceImpl.java | 14 +++--- .../VehicleStepEnUSGenApiServiceImpl.java | 14 +++--- .../user/SiteUserEnUSGenApiServiceImpl.java | 14 +++--- .../IotNodeStepEnUSGenApiServiceImpl.java | 14 +++--- .../templates/enUS/BaseModelGenPage.hbs | 22 +++++---- .../templates/enUS/BaseResultGenPage.hbs | 22 +++++---- .../templates/enUS/BicycleStepGenPage.hbs | 22 +++++---- .../templates/enUS/BicycleStepPage.hbs | 1 + .../resources/templates/enUS/DynamicPage.hbs | 1 + .../templates/enUS/IotNodeGenPage.hbs | 22 +++++---- .../resources/templates/enUS/IotNodePage.hbs | 1 + .../templates/enUS/IotNodeStepGenPage.hbs | 22 +++++---- .../templates/enUS/IotNodeStepPage.hbs | 1 + .../templates/enUS/MapResultGenPage.hbs | 22 +++++---- .../templates/enUS/MapResultPage.hbs | 1 + .../resources/templates/enUS/PageLayout.hbs | 1 + .../templates/enUS/PersonStepGenPage.hbs | 22 +++++---- .../templates/enUS/PersonStepPage.hbs | 1 + .../enUS/SimulationReportGenPage.hbs | 22 +++++---- .../templates/enUS/SimulationReportPage.hbs | 31 +++++++++++- .../templates/enUS/SiteHtmGenPage.hbs | 22 +++++---- .../resources/templates/enUS/SiteHtmPage.hbs | 1 + .../templates/enUS/SitePageGenPage.hbs | 22 +++++---- .../resources/templates/enUS/SitePagePage.hbs | 1 + .../templates/enUS/SiteUserGenPage.hbs | 22 +++++---- .../resources/templates/enUS/SiteUserPage.hbs | 1 + .../templates/enUS/SystemEventGenPage.hbs | 22 +++++---- .../templates/enUS/SystemEventPage.hbs | 1 + .../templates/enUS/TimeStepGenPage.hbs | 22 +++++---- .../resources/templates/enUS/TimeStepPage.hbs | 1 + .../enUS/TrafficFlowObservedGenPage.hbs | 22 +++++---- .../enUS/TrafficFlowObservedPage.hbs | 1 + .../templates/enUS/TrafficLightGenPage.hbs | 22 +++++---- .../templates/enUS/TrafficLightPage.hbs | 1 + .../enUS/TrafficLightStepGenPage.hbs | 22 +++++---- .../templates/enUS/TrafficLightStepPage.hbs | 1 + .../enUS/TrafficSimulationGenPage.hbs | 22 +++++---- .../templates/enUS/TrafficSimulationPage.hbs | 1 + .../templates/enUS/VehicleStepGenPage.hbs | 22 +++++---- .../templates/enUS/VehicleStepPage.hbs | 1 + 71 files changed, 925 insertions(+), 306 deletions(-) diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGen.java index bc773bbb..0a24f50f 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGen.java @@ -696,9 +696,10 @@ public static String staticSearchFqClassSimpleName(SiteRequestEnUS siteRequest_, public List getClassCanonicalNames() { return classCanonicalNames; } - - public void setClassCanonicalNames(List classCanonicalNames) { - this.classCanonicalNames = classCanonicalNames; + public void setClassCanonicalNames(String o) { + String l = BaseModel.staticSetClassCanonicalNames(siteRequest_, o); + if(l != null) + addClassCanonicalNames(l); } public static String staticSetClassCanonicalNames(SiteRequestEnUS siteRequest_, String o) { return o; @@ -881,9 +882,10 @@ public Long sqlUserKey() { public List getSaves() { return saves; } - - public void setSaves(List saves) { - this.saves = saves; + public void setSaves(String o) { + String l = BaseModel.staticSetSaves(siteRequest_, o); + if(l != null) + addSaves(l); } public static String staticSetSaves(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1100,9 +1102,10 @@ public static String staticSearchFqObjectSuggest(SiteRequestEnUS siteRequest_, S public List getObjectText() { return objectText; } - - public void setObjectText(List objectText) { - this.objectText = objectText; + public void setObjectText(String o) { + String l = BaseModel.staticSetObjectText(siteRequest_, o); + if(l != null) + addObjectText(l); } public static String staticSetObjectText(SiteRequestEnUS siteRequest_, String o) { return o; diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGenPageGen.java index e3a28a94..43c4a239 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/base/BaseModelGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListBaseModel() { public void setListBaseModel(JsonArray listBaseModel) { this.listBaseModel = listBaseModel; } + @JsonIgnore + public void setListBaseModel(String o) { + this.listBaseModel = BaseModelGenPage.staticSetListBaseModel(siteRequest_, o); + } public static JsonArray staticSetListBaseModel(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected BaseModelGenPage listBaseModelInit() { @@ -190,6 +197,18 @@ protected BaseModelGenPage listBaseModelInit() { return (BaseModelGenPage)this; } + public static JsonArray staticSearchListBaseModel(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListBaseModel(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListBaseModel(SiteRequestEnUS siteRequest_, String o) { + return BaseModelGenPage.staticSearchStrListBaseModel(siteRequest_, BaseModelGenPage.staticSearchListBaseModel(siteRequest_, BaseModelGenPage.staticSetListBaseModel(siteRequest_, o))); + } + //////////////////// // baseModelCount // //////////////////// @@ -534,6 +553,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetBaseModelGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBaseModel": + return BaseModelGenPage.staticSetListBaseModel(siteRequest_, o); case "baseModelCount": return BaseModelGenPage.staticSetBaseModelCount(siteRequest_, o); case "pk": @@ -554,6 +575,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchBaseModelGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBaseModel": + return BaseModelGenPage.staticSearchListBaseModel(siteRequest_, (JsonArray)o); case "baseModelCount": return BaseModelGenPage.staticSearchBaseModelCount(siteRequest_, (Integer)o); case "pk": @@ -574,6 +597,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrBaseModelGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBaseModel": + return BaseModelGenPage.staticSearchStrListBaseModel(siteRequest_, (JsonArray)o); case "baseModelCount": return BaseModelGenPage.staticSearchStrBaseModelCount(siteRequest_, (Integer)o); case "pk": @@ -594,6 +619,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqBaseModelGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBaseModel": + return BaseModelGenPage.staticSearchFqListBaseModel(siteRequest_, o); case "baseModelCount": return BaseModelGenPage.staticSearchFqBaseModelCount(siteRequest_, o); case "pk": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/htm/SiteHtmGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/htm/SiteHtmGenPageGen.java index 872fd329..0cff34c9 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/htm/SiteHtmGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/htm/SiteHtmGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListSiteHtm() { public void setListSiteHtm(JsonArray listSiteHtm) { this.listSiteHtm = listSiteHtm; } + @JsonIgnore + public void setListSiteHtm(String o) { + this.listSiteHtm = SiteHtmGenPage.staticSetListSiteHtm(siteRequest_, o); + } public static JsonArray staticSetListSiteHtm(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected SiteHtmGenPage listSiteHtmInit() { @@ -190,6 +197,18 @@ protected SiteHtmGenPage listSiteHtmInit() { return (SiteHtmGenPage)this; } + public static JsonArray staticSearchListSiteHtm(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListSiteHtm(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListSiteHtm(SiteRequestEnUS siteRequest_, String o) { + return SiteHtmGenPage.staticSearchStrListSiteHtm(siteRequest_, SiteHtmGenPage.staticSearchListSiteHtm(siteRequest_, SiteHtmGenPage.staticSetListSiteHtm(siteRequest_, o))); + } + ////////////////// // siteHtmCount // ////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetSiteHtmGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSiteHtm": + return SiteHtmGenPage.staticSetListSiteHtm(siteRequest_, o); case "siteHtmCount": return SiteHtmGenPage.staticSetSiteHtmCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchSiteHtmGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSiteHtm": + return SiteHtmGenPage.staticSearchListSiteHtm(siteRequest_, (JsonArray)o); case "siteHtmCount": return SiteHtmGenPage.staticSearchSiteHtmCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrSiteHtmGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSiteHtm": + return SiteHtmGenPage.staticSearchStrListSiteHtm(siteRequest_, (JsonArray)o); case "siteHtmCount": return SiteHtmGenPage.staticSearchStrSiteHtmCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqSiteHtmGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSiteHtm": + return SiteHtmGenPage.staticSearchFqListSiteHtm(siteRequest_, o); case "siteHtmCount": return SiteHtmGenPage.staticSearchFqSiteHtmCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeGenPageGen.java index cde29fae..fdd2ad0f 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListIotNode() { public void setListIotNode(JsonArray listIotNode) { this.listIotNode = listIotNode; } + @JsonIgnore + public void setListIotNode(String o) { + this.listIotNode = IotNodeGenPage.staticSetListIotNode(siteRequest_, o); + } public static JsonArray staticSetListIotNode(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected IotNodeGenPage listIotNodeInit() { @@ -190,6 +197,18 @@ protected IotNodeGenPage listIotNodeInit() { return (IotNodeGenPage)this; } + public static JsonArray staticSearchListIotNode(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListIotNode(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListIotNode(SiteRequestEnUS siteRequest_, String o) { + return IotNodeGenPage.staticSearchStrListIotNode(siteRequest_, IotNodeGenPage.staticSearchListIotNode(siteRequest_, IotNodeGenPage.staticSetListIotNode(siteRequest_, o))); + } + ////////////////// // iotNodeCount // ////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetIotNodeGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listIotNode": + return IotNodeGenPage.staticSetListIotNode(siteRequest_, o); case "iotNodeCount": return IotNodeGenPage.staticSetIotNodeCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchIotNodeGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listIotNode": + return IotNodeGenPage.staticSearchListIotNode(siteRequest_, (JsonArray)o); case "iotNodeCount": return IotNodeGenPage.staticSearchIotNodeCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrIotNodeGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listIotNode": + return IotNodeGenPage.staticSearchStrListIotNode(siteRequest_, (JsonArray)o); case "iotNodeCount": return IotNodeGenPage.staticSearchStrIotNodeCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqIotNodeGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listIotNode": + return IotNodeGenPage.staticSearchFqListIotNode(siteRequest_, o); case "iotNodeCount": return IotNodeGenPage.staticSearchFqIotNodeCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/page/SitePageGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/page/SitePageGenPageGen.java index 1f335e11..1bb5dec1 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/page/SitePageGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/page/SitePageGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListSitePage() { public void setListSitePage(JsonArray listSitePage) { this.listSitePage = listSitePage; } + @JsonIgnore + public void setListSitePage(String o) { + this.listSitePage = SitePageGenPage.staticSetListSitePage(siteRequest_, o); + } public static JsonArray staticSetListSitePage(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected SitePageGenPage listSitePageInit() { @@ -190,6 +197,18 @@ protected SitePageGenPage listSitePageInit() { return (SitePageGenPage)this; } + public static JsonArray staticSearchListSitePage(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListSitePage(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListSitePage(SiteRequestEnUS siteRequest_, String o) { + return SitePageGenPage.staticSearchStrListSitePage(siteRequest_, SitePageGenPage.staticSearchListSitePage(siteRequest_, SitePageGenPage.staticSetListSitePage(siteRequest_, o))); + } + /////////////////// // sitePageCount // /////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetSitePageGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSitePage": + return SitePageGenPage.staticSetListSitePage(siteRequest_, o); case "sitePageCount": return SitePageGenPage.staticSetSitePageCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchSitePageGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSitePage": + return SitePageGenPage.staticSearchListSitePage(siteRequest_, (JsonArray)o); case "sitePageCount": return SitePageGenPage.staticSearchSitePageCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrSitePageGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSitePage": + return SitePageGenPage.staticSearchStrListSitePage(siteRequest_, (JsonArray)o); case "sitePageCount": return SitePageGenPage.staticSearchStrSitePageCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqSitePageGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSitePage": + return SitePageGenPage.staticSearchFqListSitePage(siteRequest_, o); case "sitePageCount": return SitePageGenPage.staticSearchFqSitePageCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/system/event/SystemEventGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/system/event/SystemEventGenPageGen.java index 06a25623..d7ada411 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/system/event/SystemEventGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/system/event/SystemEventGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListSystemEvent() { public void setListSystemEvent(JsonArray listSystemEvent) { this.listSystemEvent = listSystemEvent; } + @JsonIgnore + public void setListSystemEvent(String o) { + this.listSystemEvent = SystemEventGenPage.staticSetListSystemEvent(siteRequest_, o); + } public static JsonArray staticSetListSystemEvent(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected SystemEventGenPage listSystemEventInit() { @@ -190,6 +197,18 @@ protected SystemEventGenPage listSystemEventInit() { return (SystemEventGenPage)this; } + public static JsonArray staticSearchListSystemEvent(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListSystemEvent(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListSystemEvent(SiteRequestEnUS siteRequest_, String o) { + return SystemEventGenPage.staticSearchStrListSystemEvent(siteRequest_, SystemEventGenPage.staticSearchListSystemEvent(siteRequest_, SystemEventGenPage.staticSetListSystemEvent(siteRequest_, o))); + } + ////////////////////// // systemEventCount // ////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetSystemEventGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSystemEvent": + return SystemEventGenPage.staticSetListSystemEvent(siteRequest_, o); case "systemEventCount": return SystemEventGenPage.staticSetSystemEventCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchSystemEventGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSystemEvent": + return SystemEventGenPage.staticSearchListSystemEvent(siteRequest_, (JsonArray)o); case "systemEventCount": return SystemEventGenPage.staticSearchSystemEventCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrSystemEventGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSystemEvent": + return SystemEventGenPage.staticSearchStrListSystemEvent(siteRequest_, (JsonArray)o); case "systemEventCount": return SystemEventGenPage.staticSearchStrSystemEventCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqSystemEventGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSystemEvent": + return SystemEventGenPage.staticSearchFqListSystemEvent(siteRequest_, o); case "systemEventCount": return SystemEventGenPage.staticSearchFqSystemEventCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepGenPageGen.java index 2273fb65..55c327db 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListBicycleStep() { public void setListBicycleStep(JsonArray listBicycleStep) { this.listBicycleStep = listBicycleStep; } + @JsonIgnore + public void setListBicycleStep(String o) { + this.listBicycleStep = BicycleStepGenPage.staticSetListBicycleStep(siteRequest_, o); + } public static JsonArray staticSetListBicycleStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected BicycleStepGenPage listBicycleStepInit() { @@ -190,6 +197,18 @@ protected BicycleStepGenPage listBicycleStepInit() { return (BicycleStepGenPage)this; } + public static JsonArray staticSearchListBicycleStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListBicycleStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListBicycleStep(SiteRequestEnUS siteRequest_, String o) { + return BicycleStepGenPage.staticSearchStrListBicycleStep(siteRequest_, BicycleStepGenPage.staticSearchListBicycleStep(siteRequest_, BicycleStepGenPage.staticSetListBicycleStep(siteRequest_, o))); + } + ////////////////////// // bicycleStepCount // ////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetBicycleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBicycleStep": + return BicycleStepGenPage.staticSetListBicycleStep(siteRequest_, o); case "bicycleStepCount": return BicycleStepGenPage.staticSetBicycleStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchBicycleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBicycleStep": + return BicycleStepGenPage.staticSearchListBicycleStep(siteRequest_, (JsonArray)o); case "bicycleStepCount": return BicycleStepGenPage.staticSearchBicycleStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrBicycleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBicycleStep": + return BicycleStepGenPage.staticSearchStrListBicycleStep(siteRequest_, (JsonArray)o); case "bicycleStepCount": return BicycleStepGenPage.staticSearchStrBicycleStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqBicycleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBicycleStep": + return BicycleStepGenPage.staticSearchFqListBicycleStep(siteRequest_, o); case "bicycleStepCount": return BicycleStepGenPage.staticSearchFqBicycleStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedGenPageGen.java index 64b8150c..eadf342d 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListTrafficFlowObserved() { public void setListTrafficFlowObserved(JsonArray listTrafficFlowObserved) { this.listTrafficFlowObserved = listTrafficFlowObserved; } + @JsonIgnore + public void setListTrafficFlowObserved(String o) { + this.listTrafficFlowObserved = TrafficFlowObservedGenPage.staticSetListTrafficFlowObserved(siteRequest_, o); + } public static JsonArray staticSetListTrafficFlowObserved(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected TrafficFlowObservedGenPage listTrafficFlowObservedInit() { @@ -190,6 +197,18 @@ protected TrafficFlowObservedGenPage listTrafficFlowObservedInit() { return (TrafficFlowObservedGenPage)this; } + public static JsonArray staticSearchListTrafficFlowObserved(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListTrafficFlowObserved(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListTrafficFlowObserved(SiteRequestEnUS siteRequest_, String o) { + return TrafficFlowObservedGenPage.staticSearchStrListTrafficFlowObserved(siteRequest_, TrafficFlowObservedGenPage.staticSearchListTrafficFlowObserved(siteRequest_, TrafficFlowObservedGenPage.staticSetListTrafficFlowObserved(siteRequest_, o))); + } + ////////////////////////////// // trafficFlowObservedCount // ////////////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetTrafficFlowObservedGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficFlowObserved": + return TrafficFlowObservedGenPage.staticSetListTrafficFlowObserved(siteRequest_, o); case "trafficFlowObservedCount": return TrafficFlowObservedGenPage.staticSetTrafficFlowObservedCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchTrafficFlowObservedGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficFlowObserved": + return TrafficFlowObservedGenPage.staticSearchListTrafficFlowObserved(siteRequest_, (JsonArray)o); case "trafficFlowObservedCount": return TrafficFlowObservedGenPage.staticSearchTrafficFlowObservedCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrTrafficFlowObservedGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficFlowObserved": + return TrafficFlowObservedGenPage.staticSearchStrListTrafficFlowObserved(siteRequest_, (JsonArray)o); case "trafficFlowObservedCount": return TrafficFlowObservedGenPage.staticSearchStrTrafficFlowObservedCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqTrafficFlowObservedGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficFlowObserved": + return TrafficFlowObservedGenPage.staticSearchFqListTrafficFlowObserved(siteRequest_, o); case "trafficFlowObservedCount": return TrafficFlowObservedGenPage.staticSearchFqTrafficFlowObservedCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightGenPageGen.java index 6d2a3ac7..c8e9988d 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListTrafficLight() { public void setListTrafficLight(JsonArray listTrafficLight) { this.listTrafficLight = listTrafficLight; } + @JsonIgnore + public void setListTrafficLight(String o) { + this.listTrafficLight = TrafficLightGenPage.staticSetListTrafficLight(siteRequest_, o); + } public static JsonArray staticSetListTrafficLight(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected TrafficLightGenPage listTrafficLightInit() { @@ -190,6 +197,18 @@ protected TrafficLightGenPage listTrafficLightInit() { return (TrafficLightGenPage)this; } + public static JsonArray staticSearchListTrafficLight(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListTrafficLight(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListTrafficLight(SiteRequestEnUS siteRequest_, String o) { + return TrafficLightGenPage.staticSearchStrListTrafficLight(siteRequest_, TrafficLightGenPage.staticSearchListTrafficLight(siteRequest_, TrafficLightGenPage.staticSetListTrafficLight(siteRequest_, o))); + } + /////////////////////// // trafficLightCount // /////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetTrafficLightGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficLight": + return TrafficLightGenPage.staticSetListTrafficLight(siteRequest_, o); case "trafficLightCount": return TrafficLightGenPage.staticSetTrafficLightCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchTrafficLightGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficLight": + return TrafficLightGenPage.staticSearchListTrafficLight(siteRequest_, (JsonArray)o); case "trafficLightCount": return TrafficLightGenPage.staticSearchTrafficLightCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrTrafficLightGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficLight": + return TrafficLightGenPage.staticSearchStrListTrafficLight(siteRequest_, (JsonArray)o); case "trafficLightCount": return TrafficLightGenPage.staticSearchStrTrafficLightCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqTrafficLightGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficLight": + return TrafficLightGenPage.staticSearchFqListTrafficLight(siteRequest_, o); case "trafficLightCount": return TrafficLightGenPage.staticSearchFqTrafficLightCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepGenPageGen.java index 0804e59e..3baeca83 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListTrafficLightStep() { public void setListTrafficLightStep(JsonArray listTrafficLightStep) { this.listTrafficLightStep = listTrafficLightStep; } + @JsonIgnore + public void setListTrafficLightStep(String o) { + this.listTrafficLightStep = TrafficLightStepGenPage.staticSetListTrafficLightStep(siteRequest_, o); + } public static JsonArray staticSetListTrafficLightStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected TrafficLightStepGenPage listTrafficLightStepInit() { @@ -190,6 +197,18 @@ protected TrafficLightStepGenPage listTrafficLightStepInit() { return (TrafficLightStepGenPage)this; } + public static JsonArray staticSearchListTrafficLightStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListTrafficLightStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListTrafficLightStep(SiteRequestEnUS siteRequest_, String o) { + return TrafficLightStepGenPage.staticSearchStrListTrafficLightStep(siteRequest_, TrafficLightStepGenPage.staticSearchListTrafficLightStep(siteRequest_, TrafficLightStepGenPage.staticSetListTrafficLightStep(siteRequest_, o))); + } + /////////////////////////// // trafficLightStepCount // /////////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetTrafficLightStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficLightStep": + return TrafficLightStepGenPage.staticSetListTrafficLightStep(siteRequest_, o); case "trafficLightStepCount": return TrafficLightStepGenPage.staticSetTrafficLightStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchTrafficLightStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficLightStep": + return TrafficLightStepGenPage.staticSearchListTrafficLightStep(siteRequest_, (JsonArray)o); case "trafficLightStepCount": return TrafficLightStepGenPage.staticSearchTrafficLightStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrTrafficLightStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTrafficLightStep": + return TrafficLightStepGenPage.staticSearchStrListTrafficLightStep(siteRequest_, (JsonArray)o); case "trafficLightStepCount": return TrafficLightStepGenPage.staticSearchStrTrafficLightStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqTrafficLightStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTrafficLightStep": + return TrafficLightStepGenPage.staticSearchFqListTrafficLightStep(siteRequest_, o); case "trafficLightStepCount": return TrafficLightStepGenPage.staticSearchFqTrafficLightStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepGenPageGen.java index cdc7e920..d81688f7 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListPersonStep() { public void setListPersonStep(JsonArray listPersonStep) { this.listPersonStep = listPersonStep; } + @JsonIgnore + public void setListPersonStep(String o) { + this.listPersonStep = PersonStepGenPage.staticSetListPersonStep(siteRequest_, o); + } public static JsonArray staticSetListPersonStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected PersonStepGenPage listPersonStepInit() { @@ -190,6 +197,18 @@ protected PersonStepGenPage listPersonStepInit() { return (PersonStepGenPage)this; } + public static JsonArray staticSearchListPersonStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListPersonStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListPersonStep(SiteRequestEnUS siteRequest_, String o) { + return PersonStepGenPage.staticSearchStrListPersonStep(siteRequest_, PersonStepGenPage.staticSearchListPersonStep(siteRequest_, PersonStepGenPage.staticSetListPersonStep(siteRequest_, o))); + } + ///////////////////// // personStepCount // ///////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetPersonStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listPersonStep": + return PersonStepGenPage.staticSetListPersonStep(siteRequest_, o); case "personStepCount": return PersonStepGenPage.staticSetPersonStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchPersonStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listPersonStep": + return PersonStepGenPage.staticSearchListPersonStep(siteRequest_, (JsonArray)o); case "personStepCount": return PersonStepGenPage.staticSearchPersonStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrPersonStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listPersonStep": + return PersonStepGenPage.staticSearchStrListPersonStep(siteRequest_, (JsonArray)o); case "personStepCount": return PersonStepGenPage.staticSearchStrPersonStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqPersonStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listPersonStep": + return PersonStepGenPage.staticSearchFqListPersonStep(siteRequest_, o); case "personStepCount": return PersonStepGenPage.staticSearchFqPersonStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/map/TrafficSimulationMapPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/map/TrafficSimulationMapPageGen.java index 2f788109..c27b8821 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/map/TrafficSimulationMapPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/map/TrafficSimulationMapPageGen.java @@ -1027,7 +1027,14 @@ public JsonArray getListTrafficSimulation() { public void setListTrafficSimulation(JsonArray listTrafficSimulation) { this.listTrafficSimulation = listTrafficSimulation; } + @JsonIgnore + public void setListTrafficSimulation(String o) { + this.listTrafficSimulation = TrafficSimulationMapPage.staticSetListTrafficSimulation(siteRequest_, o); + } public static JsonArray staticSetListTrafficSimulation(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected TrafficSimulationMapPage listTrafficSimulationInit() { @@ -1035,6 +1042,18 @@ protected TrafficSimulationMapPage listTrafficSimulationInit() { return (TrafficSimulationMapPage)this; } + public static JsonArray staticSearchListTrafficSimulation(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListTrafficSimulation(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListTrafficSimulation(SiteRequestEnUS siteRequest_, String o) { + return TrafficSimulationMapPage.staticSearchStrListTrafficSimulation(siteRequest_, TrafficSimulationMapPage.staticSearchListTrafficSimulation(siteRequest_, TrafficSimulationMapPage.staticSetListTrafficSimulation(siteRequest_, o))); + } + /////////// // stats // /////////// @@ -1587,6 +1606,8 @@ public static Object staticSetTrafficSimulationMapPage(String entityVar, SiteReq return TrafficSimulationMapPage.staticSetDEFAULT_MAP_LOCATION(siteRequest_, o); case "DEFAULT_MAP_ZOOM": return TrafficSimulationMapPage.staticSetDEFAULT_MAP_ZOOM(siteRequest_, o); + case "listTrafficSimulation": + return TrafficSimulationMapPage.staticSetListTrafficSimulation(siteRequest_, o); case "trafficSimulationCount": return TrafficSimulationMapPage.staticSetTrafficSimulationCount(siteRequest_, o); case "pk": @@ -1635,6 +1656,8 @@ public static Object staticSearchTrafficSimulationMapPage(String entityVar, Site return TrafficSimulationMapPage.staticSearchDEFAULT_MAP_LOCATION(siteRequest_, (JsonObject)o); case "DEFAULT_MAP_ZOOM": return TrafficSimulationMapPage.staticSearchDEFAULT_MAP_ZOOM(siteRequest_, (BigDecimal)o); + case "listTrafficSimulation": + return TrafficSimulationMapPage.staticSearchListTrafficSimulation(siteRequest_, (JsonArray)o); case "trafficSimulationCount": return TrafficSimulationMapPage.staticSearchTrafficSimulationCount(siteRequest_, (Integer)o); case "pk": @@ -1683,6 +1706,8 @@ public static String staticSearchStrTrafficSimulationMapPage(String entityVar, S return TrafficSimulationMapPage.staticSearchStrDEFAULT_MAP_LOCATION(siteRequest_, (JsonObject)o); case "DEFAULT_MAP_ZOOM": return TrafficSimulationMapPage.staticSearchStrDEFAULT_MAP_ZOOM(siteRequest_, (Double)o); + case "listTrafficSimulation": + return TrafficSimulationMapPage.staticSearchStrListTrafficSimulation(siteRequest_, (JsonArray)o); case "trafficSimulationCount": return TrafficSimulationMapPage.staticSearchStrTrafficSimulationCount(siteRequest_, (Integer)o); case "pk": @@ -1731,6 +1756,8 @@ public static String staticSearchFqTrafficSimulationMapPage(String entityVar, Si return TrafficSimulationMapPage.staticSearchFqDEFAULT_MAP_LOCATION(siteRequest_, o); case "DEFAULT_MAP_ZOOM": return TrafficSimulationMapPage.staticSearchFqDEFAULT_MAP_ZOOM(siteRequest_, o); + case "listTrafficSimulation": + return TrafficSimulationMapPage.staticSearchFqListTrafficSimulation(siteRequest_, o); case "trafficSimulationCount": return TrafficSimulationMapPage.staticSearchFqTrafficSimulationCount(siteRequest_, o); case "pk": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepGenPageGen.java index a50ad5e5..2b2567a4 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListTimeStep() { public void setListTimeStep(JsonArray listTimeStep) { this.listTimeStep = listTimeStep; } + @JsonIgnore + public void setListTimeStep(String o) { + this.listTimeStep = TimeStepGenPage.staticSetListTimeStep(siteRequest_, o); + } public static JsonArray staticSetListTimeStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected TimeStepGenPage listTimeStepInit() { @@ -190,6 +197,18 @@ protected TimeStepGenPage listTimeStepInit() { return (TimeStepGenPage)this; } + public static JsonArray staticSearchListTimeStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListTimeStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListTimeStep(SiteRequestEnUS siteRequest_, String o) { + return TimeStepGenPage.staticSearchStrListTimeStep(siteRequest_, TimeStepGenPage.staticSearchListTimeStep(siteRequest_, TimeStepGenPage.staticSetListTimeStep(siteRequest_, o))); + } + /////////////////// // timeStepCount // /////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetTimeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTimeStep": + return TimeStepGenPage.staticSetListTimeStep(siteRequest_, o); case "timeStepCount": return TimeStepGenPage.staticSetTimeStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchTimeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTimeStep": + return TimeStepGenPage.staticSearchListTimeStep(siteRequest_, (JsonArray)o); case "timeStepCount": return TimeStepGenPage.staticSearchTimeStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrTimeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listTimeStep": + return TimeStepGenPage.staticSearchStrListTimeStep(siteRequest_, (JsonArray)o); case "timeStepCount": return TimeStepGenPage.staticSearchStrTimeStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqTimeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listTimeStep": + return TimeStepGenPage.staticSearchFqListTimeStep(siteRequest_, o); case "timeStepCount": return TimeStepGenPage.staticSearchFqTimeStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepGenPageGen.java index a1f5114b..dd7e8ded 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListVehicleStep() { public void setListVehicleStep(JsonArray listVehicleStep) { this.listVehicleStep = listVehicleStep; } + @JsonIgnore + public void setListVehicleStep(String o) { + this.listVehicleStep = VehicleStepGenPage.staticSetListVehicleStep(siteRequest_, o); + } public static JsonArray staticSetListVehicleStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected VehicleStepGenPage listVehicleStepInit() { @@ -190,6 +197,18 @@ protected VehicleStepGenPage listVehicleStepInit() { return (VehicleStepGenPage)this; } + public static JsonArray staticSearchListVehicleStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListVehicleStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListVehicleStep(SiteRequestEnUS siteRequest_, String o) { + return VehicleStepGenPage.staticSearchStrListVehicleStep(siteRequest_, VehicleStepGenPage.staticSearchListVehicleStep(siteRequest_, VehicleStepGenPage.staticSetListVehicleStep(siteRequest_, o))); + } + ////////////////////// // vehicleStepCount // ////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetVehicleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listVehicleStep": + return VehicleStepGenPage.staticSetListVehicleStep(siteRequest_, o); case "vehicleStepCount": return VehicleStepGenPage.staticSetVehicleStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchVehicleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listVehicleStep": + return VehicleStepGenPage.staticSearchListVehicleStep(siteRequest_, (JsonArray)o); case "vehicleStepCount": return VehicleStepGenPage.staticSearchVehicleStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrVehicleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listVehicleStep": + return VehicleStepGenPage.staticSearchStrListVehicleStep(siteRequest_, (JsonArray)o); case "vehicleStepCount": return VehicleStepGenPage.staticSearchStrVehicleStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqVehicleStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listVehicleStep": + return VehicleStepGenPage.staticSearchFqListVehicleStep(siteRequest_, o); case "vehicleStepCount": return VehicleStepGenPage.staticSearchFqVehicleStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/user/SiteUserGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/user/SiteUserGenPageGen.java index f4674556..6d66fec1 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/user/SiteUserGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/user/SiteUserGenPageGen.java @@ -183,7 +183,14 @@ public JsonArray getListSiteUser() { public void setListSiteUser(JsonArray listSiteUser) { this.listSiteUser = listSiteUser; } + @JsonIgnore + public void setListSiteUser(String o) { + this.listSiteUser = SiteUserGenPage.staticSetListSiteUser(siteRequest_, o); + } public static JsonArray staticSetListSiteUser(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected SiteUserGenPage listSiteUserInit() { @@ -191,6 +198,18 @@ protected SiteUserGenPage listSiteUserInit() { return (SiteUserGenPage)this; } + public static JsonArray staticSearchListSiteUser(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListSiteUser(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListSiteUser(SiteRequestEnUS siteRequest_, String o) { + return SiteUserGenPage.staticSearchStrListSiteUser(siteRequest_, SiteUserGenPage.staticSearchListSiteUser(siteRequest_, SiteUserGenPage.staticSetListSiteUser(siteRequest_, o))); + } + /////////////////// // siteUserCount // /////////////////// @@ -588,6 +607,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetSiteUserGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSiteUser": + return SiteUserGenPage.staticSetListSiteUser(siteRequest_, o); case "siteUserCount": return SiteUserGenPage.staticSetSiteUserCount(siteRequest_, o); case "pk": @@ -610,6 +631,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchSiteUserGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSiteUser": + return SiteUserGenPage.staticSearchListSiteUser(siteRequest_, (JsonArray)o); case "siteUserCount": return SiteUserGenPage.staticSearchSiteUserCount(siteRequest_, (Integer)o); case "pk": @@ -632,6 +655,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrSiteUserGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listSiteUser": + return SiteUserGenPage.staticSearchStrListSiteUser(siteRequest_, (JsonArray)o); case "siteUserCount": return SiteUserGenPage.staticSearchStrSiteUserCount(siteRequest_, (Integer)o); case "pk": @@ -654,6 +679,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqSiteUserGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listSiteUser": + return SiteUserGenPage.staticSearchFqListSiteUser(siteRequest_, o); case "siteUserCount": return SiteUserGenPage.staticSearchFqSiteUserCount(siteRequest_, o); case "pk": diff --git a/src/gen/java/org/computate/smartvillageview/enus/page/HomePageGen.java b/src/gen/java/org/computate/smartvillageview/enus/page/HomePageGen.java index 082a4329..1fb4cd60 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/page/HomePageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/page/HomePageGen.java @@ -422,9 +422,10 @@ protected HomePage defaultLocaleInit() { public List getDefaultFieldListVars() { return defaultFieldListVars; } - - public void setDefaultFieldListVars(List defaultFieldListVars) { - this.defaultFieldListVars = defaultFieldListVars; + public void setDefaultFieldListVars(String o) { + String l = HomePage.staticSetDefaultFieldListVars(siteRequest_, o); + if(l != null) + addDefaultFieldListVars(l); } public static String staticSetDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) { return o; @@ -491,9 +492,10 @@ public static String staticSearchFqDefaultFieldListVars(SiteRequestEnUS siteRequ public List getDefaultStatsVars() { return defaultStatsVars; } - - public void setDefaultStatsVars(List defaultStatsVars) { - this.defaultStatsVars = defaultStatsVars; + public void setDefaultStatsVars(String o) { + String l = HomePage.staticSetDefaultStatsVars(siteRequest_, o); + if(l != null) + addDefaultStatsVars(l); } public static String staticSetDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) { return o; @@ -560,9 +562,10 @@ public static String staticSearchFqDefaultStatsVars(SiteRequestEnUS siteRequest_ public List getDefaultPivotVars() { return defaultPivotVars; } - - public void setDefaultPivotVars(List defaultPivotVars) { - this.defaultPivotVars = defaultPivotVars; + public void setDefaultPivotVars(String o) { + String l = HomePage.staticSetDefaultPivotVars(siteRequest_, o); + if(l != null) + addDefaultPivotVars(l); } public static String staticSetDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) { return o; @@ -632,7 +635,14 @@ public JsonArray getListSitePage() { public void setListSitePage(JsonArray listSitePage) { this.listSitePage = listSitePage; } + @JsonIgnore + public void setListSitePage(String o) { + this.listSitePage = HomePage.staticSetListSitePage(siteRequest_, o); + } public static JsonArray staticSetListSitePage(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected HomePage listSitePageInit() { @@ -640,6 +650,18 @@ protected HomePage listSitePageInit() { return (HomePage)this; } + public static JsonArray staticSearchListSitePage(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListSitePage(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListSitePage(SiteRequestEnUS siteRequest_, String o) { + return HomePage.staticSearchStrListSitePage(siteRequest_, HomePage.staticSearchListSitePage(siteRequest_, HomePage.staticSetListSitePage(siteRequest_, o))); + } + /////////// // stats // /////////// @@ -1017,6 +1039,8 @@ public static Object staticSetHomePage(String entityVar, SiteRequestEnUS siteReq return HomePage.staticSetDefaultStatsVars(siteRequest_, o); case "defaultPivotVars": return HomePage.staticSetDefaultPivotVars(siteRequest_, o); + case "listSitePage": + return HomePage.staticSetListSitePage(siteRequest_, o); case "sitePageCount": return HomePage.staticSetSitePageCount(siteRequest_, o); default: @@ -1045,6 +1069,8 @@ public static Object staticSearchHomePage(String entityVar, SiteRequestEnUS site return HomePage.staticSearchDefaultStatsVars(siteRequest_, (String)o); case "defaultPivotVars": return HomePage.staticSearchDefaultPivotVars(siteRequest_, (String)o); + case "listSitePage": + return HomePage.staticSearchListSitePage(siteRequest_, (JsonArray)o); case "sitePageCount": return HomePage.staticSearchSitePageCount(siteRequest_, (Integer)o); default: @@ -1073,6 +1099,8 @@ public static String staticSearchStrHomePage(String entityVar, SiteRequestEnUS s return HomePage.staticSearchStrDefaultStatsVars(siteRequest_, (String)o); case "defaultPivotVars": return HomePage.staticSearchStrDefaultPivotVars(siteRequest_, (String)o); + case "listSitePage": + return HomePage.staticSearchStrListSitePage(siteRequest_, (JsonArray)o); case "sitePageCount": return HomePage.staticSearchStrSitePageCount(siteRequest_, (Integer)o); default: @@ -1101,6 +1129,8 @@ public static String staticSearchFqHomePage(String entityVar, SiteRequestEnUS si return HomePage.staticSearchFqDefaultStatsVars(siteRequest_, o); case "defaultPivotVars": return HomePage.staticSearchFqDefaultPivotVars(siteRequest_, o); + case "listSitePage": + return HomePage.staticSearchFqListSitePage(siteRequest_, o); case "sitePageCount": return HomePage.staticSearchFqSitePageCount(siteRequest_, o); default: diff --git a/src/gen/java/org/computate/smartvillageview/enus/page/PageLayoutGen.java b/src/gen/java/org/computate/smartvillageview/enus/page/PageLayoutGen.java index afd16e38..5dc5695c 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/page/PageLayoutGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/page/PageLayoutGen.java @@ -1564,9 +1564,10 @@ public static String staticSearchFqPageTitle(SiteRequestEnUS siteRequest_, Strin public List getRoles() { return roles; } - - public void setRoles(List roles) { - this.roles = roles; + public void setRoles(String o) { + String l = PageLayout.staticSetRoles(siteRequest_, o); + if(l != null) + addRoles(l); } public static String staticSetRoles(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1633,9 +1634,10 @@ public static String staticSearchFqRoles(SiteRequestEnUS siteRequest_, String o) public List getRoleRequired() { return roleRequired; } - - public void setRoleRequired(List roleRequired) { - this.roleRequired = roleRequired; + public void setRoleRequired(String o) { + String l = PageLayout.staticSetRoleRequired(siteRequest_, o); + if(l != null) + addRoleRequired(l); } public static String staticSetRoleRequired(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1702,9 +1704,10 @@ public static String staticSearchFqRoleRequired(SiteRequestEnUS siteRequest_, St public List getAuthRoleAdmin() { return authRoleAdmin; } - - public void setAuthRoleAdmin(List authRoleAdmin) { - this.authRoleAdmin = authRoleAdmin; + public void setAuthRoleAdmin(String o) { + String l = PageLayout.staticSetAuthRoleAdmin(siteRequest_, o); + if(l != null) + addAuthRoleAdmin(l); } public static String staticSetAuthRoleAdmin(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1903,9 +1906,10 @@ public static String staticSearchFqPagination(SiteRequestEnUS siteRequest_, Stri public List getDefaultFieldListVars() { return defaultFieldListVars; } - - public void setDefaultFieldListVars(List defaultFieldListVars) { - this.defaultFieldListVars = defaultFieldListVars; + public void setDefaultFieldListVars(String o) { + String l = PageLayout.staticSetDefaultFieldListVars(siteRequest_, o); + if(l != null) + addDefaultFieldListVars(l); } public static String staticSetDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1972,9 +1976,10 @@ public static String staticSearchFqDefaultFieldListVars(SiteRequestEnUS siteRequ public List getDefaultStatsVars() { return defaultStatsVars; } - - public void setDefaultStatsVars(List defaultStatsVars) { - this.defaultStatsVars = defaultStatsVars; + public void setDefaultStatsVars(String o) { + String l = PageLayout.staticSetDefaultStatsVars(siteRequest_, o); + if(l != null) + addDefaultStatsVars(l); } public static String staticSetDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) { return o; @@ -2041,9 +2046,10 @@ public static String staticSearchFqDefaultStatsVars(SiteRequestEnUS siteRequest_ public List getDefaultPivotVars() { return defaultPivotVars; } - - public void setDefaultPivotVars(List defaultPivotVars) { - this.defaultPivotVars = defaultPivotVars; + public void setDefaultPivotVars(String o) { + String l = PageLayout.staticSetDefaultPivotVars(siteRequest_, o); + if(l != null) + addDefaultPivotVars(l); } public static String staticSetDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) { return o; diff --git a/src/gen/java/org/computate/smartvillageview/enus/request/SiteRequestEnUSGen.java b/src/gen/java/org/computate/smartvillageview/enus/request/SiteRequestEnUSGen.java index dc0b916f..c34904ac 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/request/SiteRequestEnUSGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/request/SiteRequestEnUSGen.java @@ -950,9 +950,10 @@ public static String staticSearchFqUserEmail(SiteRequestEnUS siteRequest_, Strin public List getUserRealmRoles() { return userRealmRoles; } - - public void setUserRealmRoles(List userRealmRoles) { - this.userRealmRoles = userRealmRoles; + public void setUserRealmRoles(String o) { + String l = SiteRequestEnUS.staticSetUserRealmRoles(siteRequest_, o); + if(l != null) + addUserRealmRoles(l); } public static String staticSetUserRealmRoles(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1077,9 +1078,10 @@ public static String staticSearchFqUserResource(SiteRequestEnUS siteRequest_, St public List getUserResourceRoles() { return userResourceRoles; } - - public void setUserResourceRoles(List userResourceRoles) { - this.userResourceRoles = userResourceRoles; + public void setUserResourceRoles(String o) { + String l = SiteRequestEnUS.staticSetUserResourceRoles(siteRequest_, o); + if(l != null) + addUserResourceRoles(l); } public static String staticSetUserResourceRoles(SiteRequestEnUS siteRequest_, String o) { return o; diff --git a/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGen.java b/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGen.java index 80d4d6ef..b6a34b67 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGen.java @@ -632,9 +632,10 @@ public static String staticSearchFqClassSimpleName(SiteRequestEnUS siteRequest_, public List getClassCanonicalNames() { return classCanonicalNames; } - - public void setClassCanonicalNames(List classCanonicalNames) { - this.classCanonicalNames = classCanonicalNames; + public void setClassCanonicalNames(String o) { + String l = BaseResult.staticSetClassCanonicalNames(siteRequest_, o); + if(l != null) + addClassCanonicalNames(l); } public static String staticSetClassCanonicalNames(SiteRequestEnUS siteRequest_, String o) { return o; @@ -817,9 +818,10 @@ public Long sqlUserKey() { public List getSaves() { return saves; } - - public void setSaves(List saves) { - this.saves = saves; + public void setSaves(String o) { + String l = BaseResult.staticSetSaves(siteRequest_, o); + if(l != null) + addSaves(l); } public static String staticSetSaves(SiteRequestEnUS siteRequest_, String o) { return o; @@ -1040,9 +1042,10 @@ public static String staticSearchFqObjectSuggest(SiteRequestEnUS siteRequest_, S public List getObjectText() { return objectText; } - - public void setObjectText(List objectText) { - this.objectText = objectText; + public void setObjectText(String o) { + String l = BaseResult.staticSetObjectText(siteRequest_, o); + if(l != null) + addObjectText(l); } public static String staticSetObjectText(SiteRequestEnUS siteRequest_, String o) { return o; diff --git a/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGenPageGen.java index d0a428dc..b4494baa 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/result/base/BaseResultGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListBaseResult() { public void setListBaseResult(JsonArray listBaseResult) { this.listBaseResult = listBaseResult; } + @JsonIgnore + public void setListBaseResult(String o) { + this.listBaseResult = BaseResultGenPage.staticSetListBaseResult(siteRequest_, o); + } public static JsonArray staticSetListBaseResult(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected BaseResultGenPage listBaseResultInit() { @@ -190,6 +197,18 @@ protected BaseResultGenPage listBaseResultInit() { return (BaseResultGenPage)this; } + public static JsonArray staticSearchListBaseResult(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListBaseResult(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListBaseResult(SiteRequestEnUS siteRequest_, String o) { + return BaseResultGenPage.staticSearchStrListBaseResult(siteRequest_, BaseResultGenPage.staticSearchListBaseResult(siteRequest_, BaseResultGenPage.staticSetListBaseResult(siteRequest_, o))); + } + ///////////////////// // baseResultCount // ///////////////////// @@ -473,6 +492,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetBaseResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBaseResult": + return BaseResultGenPage.staticSetListBaseResult(siteRequest_, o); case "baseResultCount": return BaseResultGenPage.staticSetBaseResultCount(siteRequest_, o); case "id": @@ -491,6 +512,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchBaseResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBaseResult": + return BaseResultGenPage.staticSearchListBaseResult(siteRequest_, (JsonArray)o); case "baseResultCount": return BaseResultGenPage.staticSearchBaseResultCount(siteRequest_, (Integer)o); case "id": @@ -509,6 +532,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrBaseResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listBaseResult": + return BaseResultGenPage.staticSearchStrListBaseResult(siteRequest_, (JsonArray)o); case "baseResultCount": return BaseResultGenPage.staticSearchStrBaseResultCount(siteRequest_, (Integer)o); case "id": @@ -527,6 +552,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqBaseResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listBaseResult": + return BaseResultGenPage.staticSearchFqListBaseResult(siteRequest_, o); case "baseResultCount": return BaseResultGenPage.staticSearchFqBaseResultCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepGenPageGen.java index 4eca747c..6db737d3 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListIotNodeStep() { public void setListIotNodeStep(JsonArray listIotNodeStep) { this.listIotNodeStep = listIotNodeStep; } + @JsonIgnore + public void setListIotNodeStep(String o) { + this.listIotNodeStep = IotNodeStepGenPage.staticSetListIotNodeStep(siteRequest_, o); + } public static JsonArray staticSetListIotNodeStep(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected IotNodeStepGenPage listIotNodeStepInit() { @@ -190,6 +197,18 @@ protected IotNodeStepGenPage listIotNodeStepInit() { return (IotNodeStepGenPage)this; } + public static JsonArray staticSearchListIotNodeStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListIotNodeStep(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListIotNodeStep(SiteRequestEnUS siteRequest_, String o) { + return IotNodeStepGenPage.staticSearchStrListIotNodeStep(siteRequest_, IotNodeStepGenPage.staticSearchListIotNodeStep(siteRequest_, IotNodeStepGenPage.staticSetListIotNodeStep(siteRequest_, o))); + } + ////////////////////// // iotNodeStepCount // ////////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetIotNodeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listIotNodeStep": + return IotNodeStepGenPage.staticSetListIotNodeStep(siteRequest_, o); case "iotNodeStepCount": return IotNodeStepGenPage.staticSetIotNodeStepCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchIotNodeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listIotNodeStep": + return IotNodeStepGenPage.staticSearchListIotNodeStep(siteRequest_, (JsonArray)o); case "iotNodeStepCount": return IotNodeStepGenPage.staticSearchIotNodeStepCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrIotNodeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listIotNodeStep": + return IotNodeStepGenPage.staticSearchStrListIotNodeStep(siteRequest_, (JsonArray)o); case "iotNodeStepCount": return IotNodeStepGenPage.staticSearchStrIotNodeStepCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqIotNodeStepGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listIotNodeStep": + return IotNodeStepGenPage.staticSearchFqListIotNodeStep(siteRequest_, o); case "iotNodeStepCount": return IotNodeStepGenPage.staticSearchFqIotNodeStepCount(siteRequest_, o); case "id": diff --git a/src/gen/java/org/computate/smartvillageview/enus/result/map/MapResultGenPageGen.java b/src/gen/java/org/computate/smartvillageview/enus/result/map/MapResultGenPageGen.java index be8da825..f47e775a 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/result/map/MapResultGenPageGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/result/map/MapResultGenPageGen.java @@ -182,7 +182,14 @@ public JsonArray getListMapResult() { public void setListMapResult(JsonArray listMapResult) { this.listMapResult = listMapResult; } + @JsonIgnore + public void setListMapResult(String o) { + this.listMapResult = MapResultGenPage.staticSetListMapResult(siteRequest_, o); + } public static JsonArray staticSetListMapResult(SiteRequestEnUS siteRequest_, String o) { + if(o != null) { + return new JsonArray(o); + } return null; } protected MapResultGenPage listMapResultInit() { @@ -190,6 +197,18 @@ protected MapResultGenPage listMapResultInit() { return (MapResultGenPage)this; } + public static JsonArray staticSearchListMapResult(SiteRequestEnUS siteRequest_, JsonArray o) { + return o; + } + + public static String staticSearchStrListMapResult(SiteRequestEnUS siteRequest_, JsonArray o) { + return o == null ? null : o.toString(); + } + + public static String staticSearchFqListMapResult(SiteRequestEnUS siteRequest_, String o) { + return MapResultGenPage.staticSearchStrListMapResult(siteRequest_, MapResultGenPage.staticSearchListMapResult(siteRequest_, MapResultGenPage.staticSetListMapResult(siteRequest_, o))); + } + //////////////////// // mapResultCount // //////////////////// @@ -526,6 +545,8 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq } public static Object staticSetMapResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listMapResult": + return MapResultGenPage.staticSetListMapResult(siteRequest_, o); case "mapResultCount": return MapResultGenPage.staticSetMapResultCount(siteRequest_, o); case "id": @@ -546,6 +567,8 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site } public static Object staticSearchMapResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listMapResult": + return MapResultGenPage.staticSearchListMapResult(siteRequest_, (JsonArray)o); case "mapResultCount": return MapResultGenPage.staticSearchMapResultCount(siteRequest_, (Integer)o); case "id": @@ -566,6 +589,8 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s } public static String staticSearchStrMapResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) { switch(entityVar) { + case "listMapResult": + return MapResultGenPage.staticSearchStrListMapResult(siteRequest_, (JsonArray)o); case "mapResultCount": return MapResultGenPage.staticSearchStrMapResultCount(siteRequest_, (Integer)o); case "id": @@ -586,6 +611,8 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si } public static String staticSearchFqMapResultGenPage(String entityVar, SiteRequestEnUS siteRequest_, String o) { switch(entityVar) { + case "listMapResult": + return MapResultGenPage.staticSearchFqListMapResult(siteRequest_, o); case "mapResultCount": return MapResultGenPage.staticSearchFqMapResultCount(siteRequest_, o); case "id": diff --git a/src/main/java/org/computate/smartvillageview/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java index 0138dc15..0ccdd739 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java @@ -655,12 +655,6 @@ public Future listPATCHSiteHtm(ApiRequest apiRequest, SearchList })); }); CompositeFuture.all(futures).onSuccess( a -> { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSiteHtm.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listSiteHtm.first().apiRequestSiteHtm(); - eventBus.publish("websocketSiteHtm", JsonObject.mapFrom(apiRequest).toString()); - } listSiteHtm.next().onSuccess(next -> { if(next) { listPATCHSiteHtm(apiRequest, listSiteHtm).onSuccess(b -> { @@ -705,7 +699,13 @@ public void patchSiteHtmFuture(JsonObject body, ServiceRequest serviceRequest, H if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketSiteHtm", JsonObject.mapFrom(apiRequest).toString()); - patchSiteHtmFuture(o, false).onSuccess(a -> { + patchSiteHtmFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSiteHtm.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestSiteHtm(); + eventBus.publish("websocketSiteHtm", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeEnUSGenApiServiceImpl.java index c1be8e1f..0dd13c59 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/iotnode/IotNodeEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHIotNode(ApiRequest apiRequest, SearchList })); }); CompositeFuture.all(futures).onSuccess( a -> { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listIotNode.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listIotNode.first().apiRequestIotNode(); - eventBus.publish("websocketIotNode", JsonObject.mapFrom(apiRequest).toString()); - } listIotNode.next().onSuccess(next -> { if(next) { listPATCHIotNode(apiRequest, listIotNode).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchIotNodeFuture(JsonObject body, ServiceRequest serviceRequest, H if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketIotNode", JsonObject.mapFrom(apiRequest).toString()); - patchIotNodeFuture(o, false).onSuccess(a -> { + patchIotNodeFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listIotNode.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestIotNode(); + eventBus.publish("websocketIotNode", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/page/SitePageEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/page/SitePageEnUSGenApiServiceImpl.java index cd2b432a..297877fd 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/page/SitePageEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/page/SitePageEnUSGenApiServiceImpl.java @@ -601,12 +601,6 @@ public Future listPATCHSitePage(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSitePage.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listSitePage.first().apiRequestSitePage(); - eventBus.publish("websocketSitePage", JsonObject.mapFrom(apiRequest).toString()); - } listSitePage.next().onSuccess(next -> { if(next) { listPATCHSitePage(apiRequest, listSitePage).onSuccess(b -> { @@ -651,7 +645,13 @@ public void patchSitePageFuture(JsonObject body, ServiceRequest serviceRequest, if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketSitePage", JsonObject.mapFrom(apiRequest).toString()); - patchSitePageFuture(o, false).onSuccess(a -> { + patchSitePageFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSitePage.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestSitePage(); + eventBus.publish("websocketSitePage", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java index 0dc76af5..eb68206c 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java @@ -601,12 +601,6 @@ public Future listPATCHSystemEvent(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSystemEvent.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listSystemEvent.first().apiRequestSystemEvent(); - eventBus.publish("websocketSystemEvent", JsonObject.mapFrom(apiRequest).toString()); - } listSystemEvent.next().onSuccess(next -> { if(next) { listPATCHSystemEvent(apiRequest, listSystemEvent).onSuccess(b -> { @@ -651,7 +645,13 @@ public void patchSystemEventFuture(JsonObject body, ServiceRequest serviceReques if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketSystemEvent", JsonObject.mapFrom(apiRequest).toString()); - patchSystemEventFuture(o, false).onSuccess(a -> { + patchSystemEventFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSystemEvent.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestSystemEvent(); + eventBus.publish("websocketSystemEvent", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepEnUSGenApiServiceImpl.java index 9f0f6c26..cb2c0d79 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/bicycle/step/BicycleStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHBicycleStep(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listBicycleStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listBicycleStep.first().apiRequestBicycleStep(); - eventBus.publish("websocketBicycleStep", JsonObject.mapFrom(apiRequest).toString()); - } listBicycleStep.next().onSuccess(next -> { if(next) { listPATCHBicycleStep(apiRequest, listBicycleStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchBicycleStepFuture(JsonObject body, ServiceRequest serviceReques if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketBicycleStep", JsonObject.mapFrom(apiRequest).toString()); - patchBicycleStepFuture(o, false).onSuccess(a -> { + patchBicycleStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listBicycleStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestBicycleStep(); + eventBus.publish("websocketBicycleStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedEnUSGenApiServiceImpl.java index 2319ae72..70aa671d 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/fiware/trafficflowobserved/TrafficFlowObservedEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHTrafficFlowObserved(ApiRequest apiRequest, SearchLi })); }); CompositeFuture.all(futures).onSuccess( a -> { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficFlowObserved.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listTrafficFlowObserved.first().apiRequestTrafficFlowObserved(); - eventBus.publish("websocketTrafficFlowObserved", JsonObject.mapFrom(apiRequest).toString()); - } listTrafficFlowObserved.next().onSuccess(next -> { if(next) { listPATCHTrafficFlowObserved(apiRequest, listTrafficFlowObserved).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchTrafficFlowObservedFuture(JsonObject body, ServiceRequest servi if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketTrafficFlowObserved", JsonObject.mapFrom(apiRequest).toString()); - patchTrafficFlowObservedFuture(o, false).onSuccess(a -> { + patchTrafficFlowObservedFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficFlowObserved.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestTrafficFlowObserved(); + eventBus.publish("websocketTrafficFlowObserved", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightEnUSGenApiServiceImpl.java index dd64b127..06390f9e 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/TrafficLightEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHTrafficLight(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficLight.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listTrafficLight.first().apiRequestTrafficLight(); - eventBus.publish("websocketTrafficLight", JsonObject.mapFrom(apiRequest).toString()); - } listTrafficLight.next().onSuccess(next -> { if(next) { listPATCHTrafficLight(apiRequest, listTrafficLight).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchTrafficLightFuture(JsonObject body, ServiceRequest serviceReque if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketTrafficLight", JsonObject.mapFrom(apiRequest).toString()); - patchTrafficLightFuture(o, false).onSuccess(a -> { + patchTrafficLightFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficLight.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestTrafficLight(); + eventBus.publish("websocketTrafficLight", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepEnUSGenApiServiceImpl.java index 0be2e1b1..ebdaed7b 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/light/step/TrafficLightStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHTrafficLightStep(ApiRequest apiRequest, SearchList< })); }); CompositeFuture.all(futures).onSuccess( a -> { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficLightStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listTrafficLightStep.first().apiRequestTrafficLightStep(); - eventBus.publish("websocketTrafficLightStep", JsonObject.mapFrom(apiRequest).toString()); - } listTrafficLightStep.next().onSuccess(next -> { if(next) { listPATCHTrafficLightStep(apiRequest, listTrafficLightStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchTrafficLightStepFuture(JsonObject body, ServiceRequest serviceR if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketTrafficLightStep", JsonObject.mapFrom(apiRequest).toString()); - patchTrafficLightStepFuture(o, false).onSuccess(a -> { + patchTrafficLightStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTrafficLightStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestTrafficLightStep(); + eventBus.publish("websocketTrafficLightStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepEnUSGenApiServiceImpl.java index 315f20f4..88da4e80 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/person/step/PersonStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHPersonStep(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listPersonStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listPersonStep.first().apiRequestPersonStep(); - eventBus.publish("websocketPersonStep", JsonObject.mapFrom(apiRequest).toString()); - } listPersonStep.next().onSuccess(next -> { if(next) { listPATCHPersonStep(apiRequest, listPersonStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchPersonStepFuture(JsonObject body, ServiceRequest serviceRequest if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketPersonStep", JsonObject.mapFrom(apiRequest).toString()); - patchPersonStepFuture(o, false).onSuccess(a -> { + patchPersonStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listPersonStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestPersonStep(); + eventBus.publish("websocketPersonStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepEnUSGenApiServiceImpl.java index 5b276681..029fbae6 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/time/step/TimeStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHTimeStep(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTimeStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listTimeStep.first().apiRequestTimeStep(); - eventBus.publish("websocketTimeStep", JsonObject.mapFrom(apiRequest).toString()); - } listTimeStep.next().onSuccess(next -> { if(next) { listPATCHTimeStep(apiRequest, listTimeStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchTimeStepFuture(JsonObject body, ServiceRequest serviceRequest, if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketTimeStep", JsonObject.mapFrom(apiRequest).toString()); - patchTimeStepFuture(o, false).onSuccess(a -> { + patchTimeStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listTimeStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestTimeStep(); + eventBus.publish("websocketTimeStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepEnUSGenApiServiceImpl.java index c3838175..4180de55 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/vehicle/step/VehicleStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHVehicleStep(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listVehicleStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listVehicleStep.first().apiRequestVehicleStep(); - eventBus.publish("websocketVehicleStep", JsonObject.mapFrom(apiRequest).toString()); - } listVehicleStep.next().onSuccess(next -> { if(next) { listPATCHVehicleStep(apiRequest, listVehicleStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchVehicleStepFuture(JsonObject body, ServiceRequest serviceReques if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketVehicleStep", JsonObject.mapFrom(apiRequest).toString()); - patchVehicleStepFuture(o, false).onSuccess(a -> { + patchVehicleStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listVehicleStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestVehicleStep(); + eventBus.publish("websocketVehicleStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); 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 2f582fa4..0f79e0ce 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 @@ -330,12 +330,6 @@ public Future listPATCHSiteUser(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSiteUser.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listSiteUser.first().apiRequestSiteUser(); - eventBus.publish("websocketSiteUser", JsonObject.mapFrom(apiRequest).toString()); - } listSiteUser.next().onSuccess(next -> { if(next) { listPATCHSiteUser(apiRequest, listSiteUser).onSuccess(b -> { @@ -381,7 +375,13 @@ public void patchSiteUserFuture(JsonObject body, ServiceRequest serviceRequest, apiRequest.setOriginal(o); apiRequest.setPk(Optional.ofNullable(listSiteUser.first()).map(o2 -> o2.getPk()).orElse(null)); eventBus.publish("websocketSiteUser", JsonObject.mapFrom(apiRequest).toString()); - patchSiteUserFuture(o, false).onSuccess(a -> { + patchSiteUserFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listSiteUser.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestSiteUser(); + eventBus.publish("websocketSiteUser", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepEnUSGenApiServiceImpl.java b/src/main/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepEnUSGenApiServiceImpl.java index cd3ffb67..fd77c060 100644 --- a/src/main/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepEnUSGenApiServiceImpl.java +++ b/src/main/java/org/computate/smartvillageview/enus/result/iotnode/step/IotNodeStepEnUSGenApiServiceImpl.java @@ -474,12 +474,6 @@ public Future listPATCHIotNodeStep(ApiRequest apiRequest, SearchList { - if(apiRequest != null) { - apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listIotNodeStep.getResponse().getResponse().getDocs().size()); - if(apiRequest.getNumFound() == 1L) - listIotNodeStep.first().apiRequestIotNodeStep(); - eventBus.publish("websocketIotNodeStep", JsonObject.mapFrom(apiRequest).toString()); - } listIotNodeStep.next().onSuccess(next -> { if(next) { listPATCHIotNodeStep(apiRequest, listIotNodeStep).onSuccess(b -> { @@ -524,7 +518,13 @@ public void patchIotNodeStepFuture(JsonObject body, ServiceRequest serviceReques if(apiRequest.getNumFound() == 1L) apiRequest.setOriginal(o); eventBus.publish("websocketIotNodeStep", JsonObject.mapFrom(apiRequest).toString()); - patchIotNodeStepFuture(o, false).onSuccess(a -> { + patchIotNodeStepFuture(o, false).onSuccess(o2 -> { + if(apiRequest != null) { + apiRequest.setNumPATCH(apiRequest.getNumPATCH() + listIotNodeStep.getResponse().getResponse().getDocs().size()); + if(apiRequest.getNumFound() == 1L) + o2.apiRequestIotNodeStep(); + eventBus.publish("websocketIotNodeStep", JsonObject.mapFrom(apiRequest).toString()); + } eventHandler.handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily())))); }).onFailure(ex -> { eventHandler.handle(Future.failedFuture(ex)); diff --git a/src/main/resources/templates/enUS/BaseModelGenPage.hbs b/src/main/resources/templates/enUS/BaseModelGenPage.hbs index 593d9e30..bd052285 100644 --- a/src/main/resources/templates/enUS/BaseModelGenPage.hbs +++ b/src/main/resources/templates/enUS/BaseModelGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptBaseModelPage"}} {{/inline}} +{{#*inline "websocketBaseModelPage"}} + + websocketBaseModel(websocketBaseModelInner); +{{/inline}} {{#*inline "htmUrlBaseModel"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadBaseModelPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchBaseModelPage"}} diff --git a/src/main/resources/templates/enUS/BaseResultGenPage.hbs b/src/main/resources/templates/enUS/BaseResultGenPage.hbs index fbf68736..523b52a7 100644 --- a/src/main/resources/templates/enUS/BaseResultGenPage.hbs +++ b/src/main/resources/templates/enUS/BaseResultGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptBaseResultPage"}} {{/inline}} +{{#*inline "websocketBaseResultPage"}} + + websocketBaseResult(websocketBaseResultInner); +{{/inline}} {{#*inline "htmUrlBaseResult"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadBaseResultPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchBaseResultPage"}} diff --git a/src/main/resources/templates/enUS/BicycleStepGenPage.hbs b/src/main/resources/templates/enUS/BicycleStepGenPage.hbs index 8b37ab1a..56db92ee 100644 --- a/src/main/resources/templates/enUS/BicycleStepGenPage.hbs +++ b/src/main/resources/templates/enUS/BicycleStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptBicycleStepPage"}} {{/inline}} +{{#*inline "websocketBicycleStepPage"}} + + websocketBicycleStep(websocketBicycleStepInner); +{{/inline}} {{#*inline "htmUrlBicycleStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadBicycleStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchBicycleStepPage"}} diff --git a/src/main/resources/templates/enUS/BicycleStepPage.hbs b/src/main/resources/templates/enUS/BicycleStepPage.hbs index 344323eb..1e98ba06 100644 --- a/src/main/resources/templates/enUS/BicycleStepPage.hbs +++ b/src/main/resources/templates/enUS/BicycleStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleBicycleStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsBicycleStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptBicycleStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketBicycleStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarBicycleStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartBicycleStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleBicycleStepPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/DynamicPage.hbs b/src/main/resources/templates/enUS/DynamicPage.hbs index 25991225..8b207bcb 100644 --- a/src/main/resources/templates/enUS/DynamicPage.hbs +++ b/src/main/resources/templates/enUS/DynamicPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleDynamicPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsDynamicPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptDynamicPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketDynamicPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartDynamicPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleDynamicPage}}{{/partial}} {{#partial "htmBodyEnd"}}{{> htmBodyEndDynamicPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/IotNodeGenPage.hbs b/src/main/resources/templates/enUS/IotNodeGenPage.hbs index 091555aa..6380da14 100644 --- a/src/main/resources/templates/enUS/IotNodeGenPage.hbs +++ b/src/main/resources/templates/enUS/IotNodeGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptIotNodePage"}} {{/inline}} +{{#*inline "websocketIotNodePage"}} + + websocketIotNode(websocketIotNodeInner); +{{/inline}} {{#*inline "htmUrlIotNode"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadIotNodePage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchIotNodePage"}} diff --git a/src/main/resources/templates/enUS/IotNodePage.hbs b/src/main/resources/templates/enUS/IotNodePage.hbs index 5a706cbf..9c97a868 100644 --- a/src/main/resources/templates/enUS/IotNodePage.hbs +++ b/src/main/resources/templates/enUS/IotNodePage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleIotNodePage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsIotNodePage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptIotNodePage}}{{/partial}} +{{#partial "websocket"}}{{> websocketIotNodePage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarIotNodePage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartIotNodePage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleIotNodePage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs b/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs index d64c773a..39827aad 100644 --- a/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs +++ b/src/main/resources/templates/enUS/IotNodeStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptIotNodeStepPage"}} {{/inline}} +{{#*inline "websocketIotNodeStepPage"}} + + websocketIotNodeStep(websocketIotNodeStepInner); +{{/inline}} {{#*inline "htmUrlIotNodeStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadIotNodeStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchIotNodeStepPage"}} diff --git a/src/main/resources/templates/enUS/IotNodeStepPage.hbs b/src/main/resources/templates/enUS/IotNodeStepPage.hbs index b04971f7..9a1a7ce6 100644 --- a/src/main/resources/templates/enUS/IotNodeStepPage.hbs +++ b/src/main/resources/templates/enUS/IotNodeStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleIotNodeStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsIotNodeStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptIotNodeStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketIotNodeStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarIotNodeStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartIotNodeStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleIotNodeStepPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/MapResultGenPage.hbs b/src/main/resources/templates/enUS/MapResultGenPage.hbs index d276038d..2d346d97 100644 --- a/src/main/resources/templates/enUS/MapResultGenPage.hbs +++ b/src/main/resources/templates/enUS/MapResultGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptMapResultPage"}} {{/inline}} +{{#*inline "websocketMapResultPage"}} + + websocketMapResult(websocketMapResultInner); +{{/inline}} {{#*inline "htmUrlMapResult"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadMapResultPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchMapResultPage"}} diff --git a/src/main/resources/templates/enUS/MapResultPage.hbs b/src/main/resources/templates/enUS/MapResultPage.hbs index 6105dab1..02de79d9 100644 --- a/src/main/resources/templates/enUS/MapResultPage.hbs +++ b/src/main/resources/templates/enUS/MapResultPage.hbs @@ -5,6 +5,7 @@ {{#partial "htmStyle"}}{{> htmStyleMapResultPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsMapResultPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptMapResultPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketMapResultPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarMapResultPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartMapResultPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleMapResultPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/PageLayout.hbs b/src/main/resources/templates/enUS/PageLayout.hbs index 29d7e69e..fc5f2205 100644 --- a/src/main/resources/templates/enUS/PageLayout.hbs +++ b/src/main/resources/templates/enUS/PageLayout.hbs @@ -15,6 +15,7 @@ {{/inline}} {{#*inline "htmScriptPageLayout"}} {{/inline}} +{{#*inline "websocketPageLayout"}}{{/inline}} {{#*inline "htmStylePageLayout"}} diff --git a/src/main/resources/templates/enUS/PersonStepGenPage.hbs b/src/main/resources/templates/enUS/PersonStepGenPage.hbs index 288bf62c..a7c14a2f 100644 --- a/src/main/resources/templates/enUS/PersonStepGenPage.hbs +++ b/src/main/resources/templates/enUS/PersonStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptPersonStepPage"}} {{/inline}} +{{#*inline "websocketPersonStepPage"}} + + websocketPersonStep(websocketPersonStepInner); +{{/inline}} {{#*inline "htmUrlPersonStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadPersonStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchPersonStepPage"}} diff --git a/src/main/resources/templates/enUS/PersonStepPage.hbs b/src/main/resources/templates/enUS/PersonStepPage.hbs index c5cfe2ea..718b1cc7 100644 --- a/src/main/resources/templates/enUS/PersonStepPage.hbs +++ b/src/main/resources/templates/enUS/PersonStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStylePersonStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsPersonStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptPersonStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketPersonStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarPersonStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartPersonStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddlePersonStepPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/SimulationReportGenPage.hbs b/src/main/resources/templates/enUS/SimulationReportGenPage.hbs index 9d3a9956..3ce99dc4 100644 --- a/src/main/resources/templates/enUS/SimulationReportGenPage.hbs +++ b/src/main/resources/templates/enUS/SimulationReportGenPage.hbs @@ -9,6 +9,14 @@ {{/inline}} {{#*inline "htmScriptSimulationReportPage"}} {{/inline}} +{{#*inline "websocketSimulationReportPage"}} + + websocketSimulationReport(websocketSimulationReportInner); +{{/inline}} {{#*inline "htmUrlSimulationReport"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadSimulationReportPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchSimulationReportPage"}} diff --git a/src/main/resources/templates/enUS/SimulationReportPage.hbs b/src/main/resources/templates/enUS/SimulationReportPage.hbs index 30b25c4a..847eab6b 100644 --- a/src/main/resources/templates/enUS/SimulationReportPage.hbs +++ b/src/main/resources/templates/enUS/SimulationReportPage.hbs @@ -3,7 +3,34 @@ {{#partial "htmMeta"}}{{> htmMetaSimulationReportPage}}{{/partial}} {{#partial "htmStyle"}}{{> htmStyleSimulationReportPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsSimulationReportPage}}{{/partial}} -{{#partial "htmScript"}}{{> htmScriptSimulationReportPage}}{{/partial}} +{{#partial "htmScript"}}{{> htmScriptSimulationReportPage}} + +{{/partial}} +{{#partial "websocket"}} + websocketSimulationReport(websocketSimulationReportInner2); +{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarSimulationReportPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartSimulationReportPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleSimulationReportPage}}{{/partial}} @@ -44,7 +71,7 @@ {{#partial "htmForm_searchpageSimulationReport"}}{{> htmFormSimulationReportPage_searchpageSimulationReport}}
- +
{{/partial}} {{> SimulationReportGenPage}} diff --git a/src/main/resources/templates/enUS/SiteHtmGenPage.hbs b/src/main/resources/templates/enUS/SiteHtmGenPage.hbs index d512b812..d001e0f4 100644 --- a/src/main/resources/templates/enUS/SiteHtmGenPage.hbs +++ b/src/main/resources/templates/enUS/SiteHtmGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptSiteHtmPage"}} {{/inline}} +{{#*inline "websocketSiteHtmPage"}} + + websocketSiteHtm(websocketSiteHtmInner); +{{/inline}} {{#*inline "htmUrlSiteHtm"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadSiteHtmPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchSiteHtmPage"}} diff --git a/src/main/resources/templates/enUS/SiteHtmPage.hbs b/src/main/resources/templates/enUS/SiteHtmPage.hbs index bb32b70c..b4e22e08 100644 --- a/src/main/resources/templates/enUS/SiteHtmPage.hbs +++ b/src/main/resources/templates/enUS/SiteHtmPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleSiteHtmPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsSiteHtmPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptSiteHtmPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketSiteHtmPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarSiteHtmPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartSiteHtmPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleSiteHtmPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/SitePageGenPage.hbs b/src/main/resources/templates/enUS/SitePageGenPage.hbs index 10d2ba00..ec152c19 100644 --- a/src/main/resources/templates/enUS/SitePageGenPage.hbs +++ b/src/main/resources/templates/enUS/SitePageGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptSitePagePage"}} {{/inline}} +{{#*inline "websocketSitePagePage"}} + + websocketSitePage(websocketSitePageInner); +{{/inline}} {{#*inline "htmUrlSitePage"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadSitePagePage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchSitePagePage"}} diff --git a/src/main/resources/templates/enUS/SitePagePage.hbs b/src/main/resources/templates/enUS/SitePagePage.hbs index 649868e9..22a97508 100644 --- a/src/main/resources/templates/enUS/SitePagePage.hbs +++ b/src/main/resources/templates/enUS/SitePagePage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleSitePagePage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsSitePagePage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptSitePagePage}}{{/partial}} +{{#partial "websocket"}}{{> websocketSitePagePage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarSitePagePage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartSitePagePage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleSitePagePage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/SiteUserGenPage.hbs b/src/main/resources/templates/enUS/SiteUserGenPage.hbs index e4671a41..c11e9c8a 100644 --- a/src/main/resources/templates/enUS/SiteUserGenPage.hbs +++ b/src/main/resources/templates/enUS/SiteUserGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptSiteUserPage"}} {{/inline}} +{{#*inline "websocketSiteUserPage"}} + + websocketSiteUser(websocketSiteUserInner); +{{/inline}} {{#*inline "htmUrlSiteUser"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadSiteUserPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchSiteUserPage"}} diff --git a/src/main/resources/templates/enUS/SiteUserPage.hbs b/src/main/resources/templates/enUS/SiteUserPage.hbs index 4a52be2e..5250df02 100644 --- a/src/main/resources/templates/enUS/SiteUserPage.hbs +++ b/src/main/resources/templates/enUS/SiteUserPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleSiteUserPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsSiteUserPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptSiteUserPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketSiteUserPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarSiteUserPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartSiteUserPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleSiteUserPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/SystemEventGenPage.hbs b/src/main/resources/templates/enUS/SystemEventGenPage.hbs index 37728d79..9751e840 100644 --- a/src/main/resources/templates/enUS/SystemEventGenPage.hbs +++ b/src/main/resources/templates/enUS/SystemEventGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptSystemEventPage"}} {{/inline}} +{{#*inline "websocketSystemEventPage"}} + + websocketSystemEvent(websocketSystemEventInner); +{{/inline}} {{#*inline "htmUrlSystemEvent"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadSystemEventPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchSystemEventPage"}} diff --git a/src/main/resources/templates/enUS/SystemEventPage.hbs b/src/main/resources/templates/enUS/SystemEventPage.hbs index 12fa8554..24ed3809 100644 --- a/src/main/resources/templates/enUS/SystemEventPage.hbs +++ b/src/main/resources/templates/enUS/SystemEventPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleSystemEventPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsSystemEventPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptSystemEventPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketSystemEventPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarSystemEventPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartSystemEventPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleSystemEventPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/TimeStepGenPage.hbs b/src/main/resources/templates/enUS/TimeStepGenPage.hbs index 19693205..88ecf2bd 100644 --- a/src/main/resources/templates/enUS/TimeStepGenPage.hbs +++ b/src/main/resources/templates/enUS/TimeStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptTimeStepPage"}} {{/inline}} +{{#*inline "websocketTimeStepPage"}} + + websocketTimeStep(websocketTimeStepInner); +{{/inline}} {{#*inline "htmUrlTimeStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadTimeStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchTimeStepPage"}} diff --git a/src/main/resources/templates/enUS/TimeStepPage.hbs b/src/main/resources/templates/enUS/TimeStepPage.hbs index 3b15e9bd..7c470987 100644 --- a/src/main/resources/templates/enUS/TimeStepPage.hbs +++ b/src/main/resources/templates/enUS/TimeStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleTimeStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsTimeStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptTimeStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketTimeStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarTimeStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartTimeStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleTimeStepPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/TrafficFlowObservedGenPage.hbs b/src/main/resources/templates/enUS/TrafficFlowObservedGenPage.hbs index 09c499f9..2781b92a 100644 --- a/src/main/resources/templates/enUS/TrafficFlowObservedGenPage.hbs +++ b/src/main/resources/templates/enUS/TrafficFlowObservedGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptTrafficFlowObservedPage"}} {{/inline}} +{{#*inline "websocketTrafficFlowObservedPage"}} + + websocketTrafficFlowObserved(websocketTrafficFlowObservedInner); +{{/inline}} {{#*inline "htmUrlTrafficFlowObserved"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadTrafficFlowObservedPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchTrafficFlowObservedPage"}} diff --git a/src/main/resources/templates/enUS/TrafficFlowObservedPage.hbs b/src/main/resources/templates/enUS/TrafficFlowObservedPage.hbs index 6a0b2439..53b89731 100644 --- a/src/main/resources/templates/enUS/TrafficFlowObservedPage.hbs +++ b/src/main/resources/templates/enUS/TrafficFlowObservedPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleTrafficFlowObservedPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsTrafficFlowObservedPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptTrafficFlowObservedPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketTrafficFlowObservedPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarTrafficFlowObservedPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartTrafficFlowObservedPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleTrafficFlowObservedPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/TrafficLightGenPage.hbs b/src/main/resources/templates/enUS/TrafficLightGenPage.hbs index c85fc3b7..ab622772 100644 --- a/src/main/resources/templates/enUS/TrafficLightGenPage.hbs +++ b/src/main/resources/templates/enUS/TrafficLightGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptTrafficLightPage"}} {{/inline}} +{{#*inline "websocketTrafficLightPage"}} + + websocketTrafficLight(websocketTrafficLightInner); +{{/inline}} {{#*inline "htmUrlTrafficLight"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadTrafficLightPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchTrafficLightPage"}} diff --git a/src/main/resources/templates/enUS/TrafficLightPage.hbs b/src/main/resources/templates/enUS/TrafficLightPage.hbs index d2619bb8..cff99aa2 100644 --- a/src/main/resources/templates/enUS/TrafficLightPage.hbs +++ b/src/main/resources/templates/enUS/TrafficLightPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleTrafficLightPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsTrafficLightPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptTrafficLightPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketTrafficLightPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarTrafficLightPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartTrafficLightPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleTrafficLightPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs b/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs index 737cfaf4..1fcab634 100644 --- a/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs +++ b/src/main/resources/templates/enUS/TrafficLightStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptTrafficLightStepPage"}} {{/inline}} +{{#*inline "websocketTrafficLightStepPage"}} + + websocketTrafficLightStep(websocketTrafficLightStepInner); +{{/inline}} {{#*inline "htmUrlTrafficLightStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadTrafficLightStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchTrafficLightStepPage"}} diff --git a/src/main/resources/templates/enUS/TrafficLightStepPage.hbs b/src/main/resources/templates/enUS/TrafficLightStepPage.hbs index f43edc47..78a230b7 100644 --- a/src/main/resources/templates/enUS/TrafficLightStepPage.hbs +++ b/src/main/resources/templates/enUS/TrafficLightStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleTrafficLightStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsTrafficLightStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptTrafficLightStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketTrafficLightStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarTrafficLightStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartTrafficLightStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleTrafficLightStepPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs index 65adc62b..b5a041cf 100644 --- a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs +++ b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs @@ -9,6 +9,14 @@ {{/inline}} {{#*inline "htmScriptTrafficSimulationPage"}} {{/inline}} +{{#*inline "websocketTrafficSimulationPage"}} + + websocketTrafficSimulation(websocketTrafficSimulationInner); +{{/inline}} {{#*inline "htmUrlTrafficSimulation"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadTrafficSimulationPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchTrafficSimulationPage"}} diff --git a/src/main/resources/templates/enUS/TrafficSimulationPage.hbs b/src/main/resources/templates/enUS/TrafficSimulationPage.hbs index 9c19257a..3dd87160 100644 --- a/src/main/resources/templates/enUS/TrafficSimulationPage.hbs +++ b/src/main/resources/templates/enUS/TrafficSimulationPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleTrafficSimulationPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsTrafficSimulationPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptTrafficSimulationPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketTrafficSimulationPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarTrafficSimulationPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartTrafficSimulationPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleTrafficSimulationPage}}{{/partial}} diff --git a/src/main/resources/templates/enUS/VehicleStepGenPage.hbs b/src/main/resources/templates/enUS/VehicleStepGenPage.hbs index 4422f51e..f3026ea9 100644 --- a/src/main/resources/templates/enUS/VehicleStepGenPage.hbs +++ b/src/main/resources/templates/enUS/VehicleStepGenPage.hbs @@ -8,6 +8,14 @@ {{/inline}} {{#*inline "htmScriptVehicleStepPage"}} {{/inline}} +{{#*inline "websocketVehicleStepPage"}} + + websocketVehicleStep(websocketVehicleStepInner); +{{/inline}} {{#*inline "htmUrlVehicleStep"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}} {{#*inline "htmHeadVehicleStepPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}} {{#*inline "htmBodySearchVehicleStepPage"}} diff --git a/src/main/resources/templates/enUS/VehicleStepPage.hbs b/src/main/resources/templates/enUS/VehicleStepPage.hbs index 72acc6d7..c25a7cc3 100644 --- a/src/main/resources/templates/enUS/VehicleStepPage.hbs +++ b/src/main/resources/templates/enUS/VehicleStepPage.hbs @@ -4,6 +4,7 @@ {{#partial "htmStyle"}}{{> htmStyleVehicleStepPage}}{{/partial}} {{#partial "htmScripts"}}{{> htmScriptsVehicleStepPage}}{{/partial}} {{#partial "htmScript"}}{{> htmScriptVehicleStepPage}}{{/partial}} +{{#partial "websocket"}}{{> websocketVehicleStepPage}}{{/partial}} {{#partial "htmBodySidebar"}}{{> htmBodySidebarVehicleStepPage}}{{/partial}} {{#partial "htmBodyStart"}}{{> htmBodyStartVehicleStepPage}}{{/partial}} {{#partial "htmBodyMiddle"}}{{> htmBodyMiddleVehicleStepPage}}{{/partial}}