Skip to content

Commit

Permalink
Merge pull request #44 from axonivy-market/raise-to-12.0.0-SNAPSHOT
Browse files Browse the repository at this point in the history
address warnings from invalid field names
  • Loading branch information
ivy-rew authored Nov 29, 2024
2 parents eee48de + 07fb5b6 commit 8293e2b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion db-demos/dataclasses/db/demos/Player.d.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "PID",
"name" : "pid",
"type" : "Integer",
"modifiers" : [ "PERSISTENT" ]
}, {
Expand Down
2 changes: 1 addition & 1 deletion db-demos/dataclasses/db/demos/Team.d.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "TID",
"name" : "tid",
"type" : "Integer",
"modifiers" : [ "PERSISTENT" ]
} ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
</p:column>

<p:column headerText="PID">
<h:outputText value="#{player.PID}" />
<h:outputText value="#{player.pid}" />
</p:column>

<p:column headerText="TID">
<h:outputText value="#{player.team.TID}" />
<h:outputText value="#{player.team.tid}" />
</p:column>

<p:column headerText="Delete">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"output" : {
"code" : [
"import db.demos.Player;",
"in.player.setPID(lastInsertedId);",
"in.player.setPid(lastInsertedId);",
"out.players.add(in.player);",
"out.player = new Player();"
]
Expand Down Expand Up @@ -190,9 +190,9 @@
" player.setFavoritecolor(favoritecolor);",
" player.setName(name);",
" player.setBirthday(birthday);",
" player.setPID(PID);",
" player.setPid(PID);",
" Team team = new Team();",
" team.setTID(TID);",
" team.setTid(TID);",
" player.setTeam(team);",
" out.players.add(player);",
" out.shared.players.add(player);",
Expand Down
2 changes: 1 addition & 1 deletion db-demos/src_hd/db/demos/TeamInterface/TeamInterface.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
showGridlines="true">

<p:column headerText="TID">
<h:outputText value="#{team.TID}" />
<h:outputText value="#{team.tid}" />
</p:column>

<p:column headerText="Teamname">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"code" : [
"import db.demos.Team;",
"",
"in.team.setTID(lastInsertedId);",
"in.team.setTid(lastInsertedId);",
"out.teams.add(in.team);",
"",
"out.team = new Team();",
Expand Down Expand Up @@ -183,7 +183,7 @@
" Team team = new Team();",
" team.setTeamname(teamname);",
" team.setFoundationDay(foundationDay);",
" team.setTID(TID);",
" team.setTid(TID);",
" out.teams.add(team);",
" out.shared.teams.add(team);",
" ",
Expand Down Expand Up @@ -225,7 +225,7 @@
" Team team = new Team();",
" team.setTeamname(teamname);",
" team.setFoundationDay(foundationDay);",
" team.setTID(TID);",
" team.setTid(TID);",
" out.teams.add(team);",
" out.shared.teams.add(team);",
" ",
Expand Down Expand Up @@ -265,7 +265,7 @@
" Team team = new Team();",
" team.setTeamname(teamname);",
" team.setFoundationDay(foundationDay);",
" team.setTID(TID);",
" team.setTid(TID);",
" out.teams.add(team);",
" out.shared.teams.add(team);",
" ",
Expand Down

0 comments on commit 8293e2b

Please sign in to comment.