Skip to content

Commit

Permalink
Added the original object in PUTImport PATCH to fix websockets
Browse files Browse the repository at this point in the history 
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
@computate
computate committed Jan 9, 2024
1 parent 22ce044 commit d0b1e11
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 83 deletions.
3 changes: 3 additions & 0 deletions src/main/java/org/computate/smartvillage/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,9 @@ public void putimportSiteHtmFuture(JsonObject body, ServiceRequest serviceReques
}
}
if(body2.size() > 0) {
if(searchList.size() == 1) {
apiRequest.setOriginal(o);
}
siteRequest.setJsonObject(body2);
patchSiteHtmFuture(o2, true).onSuccess(b -> {
LOG.debug("Import SiteHtm {} succeeded, modified SiteHtm. ", body.getValue(SiteHtm.VAR_id));
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/computate/smartvillage/enus/model/page/SitePageEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,9 @@ public void putimportSitePageFuture(JsonObject body, ServiceRequest serviceReque
}
}
if(body2.size() > 0) {
if(searchList.size() == 1) {
apiRequest.setOriginal(o);
}
siteRequest.setJsonObject(body2);
patchSitePageFuture(o2, true).onSuccess(b -> {
LOG.debug("Import SitePage {} succeeded, modified SitePage. ", body.getValue(SitePage.VAR_id));
Expand Down
3 changes: 3 additions & 0 deletions .../org/computate/smartvillage/enus/model/system/event/SystemEventEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,9 @@ public void putimportSystemEventFuture(JsonObject body, ServiceRequest serviceRe
}
}
if(body2.size() > 0) {
if(searchList.size() == 1) {
apiRequest.setOriginal(o);
}
siteRequest.setJsonObject(body2);
patchSystemEventFuture(o2, true).onSuccess(b -> {
LOG.debug("Import SystemEvent {} succeeded, modified SystemEvent. ", body.getValue(SystemEvent.VAR_id));
Expand Down
38 changes: 21 additions & 17 deletions src/main/java/org/computate/smartvillage/enus/model/user/SiteUserEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,14 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlArchived());
break;
case "setDeleted":
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0)
bSql.append(", ");
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case "setSessionId":
o2.setSessionId(jsonObject.getString(entityVar));
if(bParams.size() > 0)
Expand All @@ -540,14 +548,6 @@ public Future<SiteUser> sqlPATCHSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlUserKey());
break;
case "setDeleted":
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0)
bSql.append(", ");
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case "setUserId":
o2.setUserId(jsonObject.getString(entityVar));
if(bParams.size() > 0)
Expand Down Expand Up @@ -924,6 +924,15 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlArchived());
break;
case SiteUser.VAR_deleted:
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0) {
bSql.append(", ");
}
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case SiteUser.VAR_sessionId:
o2.setSessionId(jsonObject.getString(entityVar));
if(bParams.size() > 0) {
Expand All @@ -942,15 +951,6 @@ public Future<Void> sqlPOSTSiteUser(SiteUser o, Boolean inheritPk) {
num++;
bParams.add(o2.sqlUserKey());
break;
case SiteUser.VAR_deleted:
o2.setDeleted(jsonObject.getBoolean(entityVar));
if(bParams.size() > 0) {
bSql.append(", ");
}
bSql.append(SiteUser.VAR_deleted + "=$" + num);
num++;
bParams.add(o2.sqlDeleted());
break;
case SiteUser.VAR_userId:
o2.setUserId(jsonObject.getString(entityVar));
if(bParams.size() > 0) {
Expand Down Expand Up @@ -1254,6 +1254,10 @@ public void putimportSiteUserFuture(JsonObject body, ServiceRequest serviceReque
}
}
if(body2.size() > 0) {
if(searchList.size() == 1) {
apiRequest.setOriginal(o);
apiRequest.setPk(o.getPk());
}
siteRequest.setJsonObject(body2);
patchSiteUserFuture(o, true).onSuccess(b -> {
LOG.debug("Import SiteUser {} succeeded, modified SiteUser. ", body.getValue(SiteUser.VAR_pk));
Expand Down
130 changes: 65 additions & 65 deletions src/main/resources/templates/enUS/MapResultGenPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,30 +525,30 @@
<!-- BooleanUtils.isFalse(entiteHtmLigneVerticale) -->
<div class="w3-cell-row HtmRow">
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmDateTime" roleForWriteBool="true" roleForReadBool="true"}}
{{> "htmTime" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
{{> "htmDateTime" roleForWriteBool="false" roleForReadBool="true"}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="true"}}
{{else}}
{{> "htmDateTime" roleForWriteBool="false" roleForReadBool="false"}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="false"}}
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmStep" roleForWriteBool="true" roleForReadBool="true"}}
{{> "htmDateTime" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
{{> "htmStep" roleForWriteBool="false" roleForReadBool="true"}}
{{> "htmDateTime" roleForWriteBool="false" roleForReadBool="true"}}
{{else}}
{{> "htmStep" roleForWriteBool="false" roleForReadBool="false"}}
{{> "htmDateTime" roleForWriteBool="false" roleForReadBool="false"}}
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
{{> "htmTime" roleForWriteBool="true" roleForReadBool="true"}}
{{> "htmStep" roleForWriteBool="true" roleForReadBool="true"}}
{{else}}
{{#ifContainsAnyRoles roles roleForRead}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="true"}}
{{> "htmStep" roleForWriteBool="false" roleForReadBool="true"}}
{{else}}
{{> "htmTime" roleForWriteBool="false" roleForReadBool="false"}}
{{> "htmStep" roleForWriteBool="false" roleForReadBool="false"}}
{{/ifContainsAnyRoles}}
{{/ifContainsAnyRoles}}
{{#ifContainsAnyRoles roles roleForWrite}}
Expand Down Expand Up @@ -1073,6 +1073,62 @@
{{/eq}}
{{/inline}}
{{#*inline "htmTime"}}
<!-- #*inline "htmTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
<div class="w3-padding ">
<div id="suggest{{classApiMethodMethod}}MapResultTime">
<div class="w3-card ">
<div class="w3-cell-row w3-2017-shaded-spruce">
<label for="{{classApiMethodMethod}}_time">Time in seconds</label>
</div>
<div class="w3-cell-row w3-padding ">
<div class="w3-cell ">
{{> "inputTime" roleForWrite=roleForWrite roleForRead=roleForRead}}
</div>
</div>
</div>
</div>
</div>
</div>
{{/inline}}
{{#*inline "inputTime"}}
{{#eq roleForWriteBool "true"}}
<input
type="text"
placeholder="Time in seconds"
title="The time in seconds. " id="{{classApiMethodMethod}}_time"
{{#eq "Page" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{classApiMethodMethod}}_time" class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="time"
{{/eq}}
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
onclick="removeGlow($(this)); "
onchange="patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setTime', $(this).val(), function() { addGlow($('#{{classApiMethodMethod}}_time')); }, function() { addError($('#{{classApiMethodMethod}}_time')); }); "
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
value="{{mapResult_.time}}"
{{/eq}}
/>

{{else}}
{{#ifContainsKeys userKeys}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/ifContainsKeys}}
{{else}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/eq}}
{{/inline}}

{{#*inline "htmDateTime"}}
<!-- #*inline "htmDateTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
Expand Down Expand Up @@ -1185,62 +1241,6 @@
{{/eq}}
{{/inline}}

{{#*inline "htmTime"}}
<!-- #*inline "htmTime" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
<div class="w3-padding ">
<div id="suggest{{classApiMethodMethod}}MapResultTime">
<div class="w3-card ">
<div class="w3-cell-row w3-2017-shaded-spruce">
<label for="{{classApiMethodMethod}}_time">Time in seconds</label>
</div>
<div class="w3-cell-row w3-padding ">
<div class="w3-cell ">
{{> "inputTime" roleForWrite=roleForWrite roleForRead=roleForRead}}
</div>
</div>
</div>
</div>
</div>
</div>
{{/inline}}
{{#*inline "inputTime"}}
{{#eq roleForWriteBool "true"}}
<input
type="text"
placeholder="Time in seconds"
title="The time in seconds. " id="{{classApiMethodMethod}}_time"
{{#eq "Page" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{classApiMethodMethod}}_time" class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="time"
{{/eq}}
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
onclick="removeGlow($(this)); "
onchange="patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setTime', $(this).val(), function() { addGlow($('#{{classApiMethodMethod}}_time')); }, function() { addError($('#{{classApiMethodMethod}}_time')); }); "
{{/eq}}
{{#eq "Page" classApiMethodMethod}}
value="{{mapResult_.time}}"
{{/eq}}
/>

{{else}}
{{#ifContainsKeys userKeys}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/ifContainsKeys}}
{{else}}
<span class="varMapResult{{id}}Time varMapResultTime ">{{mapResult_.time}}</span>
{{/eq}}
{{/inline}}

{{#*inline "htmLocation"}}
<!-- #*inline "htmLocation" -->
<div class="w3-cell w3-cell-top w3-center w3-mobile ">
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/templates/enUS/MapResultPage.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
{{#partial "jsWebsocket"}}{{> jsWebsocketMapResultPage}}{{/partial}}
{{#partial "jsTooltip"}}{{> jsTooltipMapResultPage}}{{/partial}}
{{#partial "htmTooltip"}}{{> htmTooltipMapResultPage}}{{/partial}}
{{#partial "jsLegend"}}{{> jsLegendMapResultPage}}{{/partial}}
{{#partial "htmLegend"}}{{> htmLegendMapResultPage}}{{/partial}}
{{#partial "jsStyle"}}{{> jsStyleMapResultPage}}{{/partial}}
{{#partial "htmBodySidebar"}}{{> htmBodySidebarMapResultPage}}{{/partial}}
{{#partial "htmBodyStart"}}{{> htmBodyStartMapResultPage}}{{/partial}}
Expand All @@ -25,7 +27,6 @@
{{#partial "htmBodyGraph"}}{{> htmBodyGraphMapResultPage}}{{/partial}}
{{#partial "htmBodyGraphLocation"}}{{> htmBodyGraphLocationMapResultPage}}{{/partial}}
{{#partial "htmBodyCount0"}}{{> htmBodyCount0MapResultPage}}{{/partial}}
{{#partial "htmBodyCount1All"}}{{> htmBodyCount1AllMapResultPage}}{{/partial}}
{{#partial "htmBodyCount1"}}{{> htmBodyCount1MapResultPage}}{{/partial}}
{{#partial "htmBodyAll"}}{{> htmBodyAllMapResultPage}}{{/partial}}
{{#partial "htmForm"}}{{> htmFormMapResultPage}}{{/partial}}
Expand Down

0 comments on commit d0b1e11

Please sign in to comment.