Skip to content

Commit 863ce62

Browse files
author
gustavnavar
committed
update samples
1 parent c236ca5 commit 863ce62

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,9 @@ build/
5050
/.idea/dataSources/0c65a8f5-b3f4-462e-a382-2b383a0b633e/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/sys.zb4BAA.meta
5151
/.idea/dataSources/ede369a1-6fac-4381-baa8-49852c4d584d/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/sys.zb4BAA.meta
5252
/.idea/workspace.xml
53+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557.xml
54+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/dbo.sYMBAA.zip
55+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/dbo.sYMBAA.meta
56+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/sys.zb4BAA.meta
57+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557/storage_v2/_src_/database/NORTHWIND.bf6LwA.meta
58+
/.idea/dataSources/a25760d5-5c68-4705-a93e-863c8c892557/storage_v2/_src_/database/NORTHWIND.bf6LwA/schema/INFORMATION_SCHEMA.NBgcMw.meta

demo/src/main/java/me/agno/demo/controllers/SampleDataController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public ResponseEntity<ItemsDTO<Order>> orderColumnsWithCrud(HttpServletRequest r
280280
EntityManager em = entityManagerFactory.createEntityManager();
281281

282282
Consumer<IGridColumnCollection<Order>> columns = c -> {
283-
c.add("orderID", Integer.class);//.setPrimaryKey(true);
283+
c.add("orderID", Integer.class).setPrimaryKey(true);
284284
c.add("customerID", String.class);
285285
c.add("employeeID", Integer.class);
286286
c.add("shipVia", Integer.class, true);
@@ -315,7 +315,7 @@ public ResponseEntity<ItemsDTO<Order>> orderColumnsWithSubgridCrud(HttpServletRe
315315
EntityManager em = entityManagerFactory.createEntityManager();
316316

317317
Consumer<IGridColumnCollection<Order>> columns = c -> {
318-
c.add("orderID", Integer.class);//.setPrimaryKey(true);
318+
c.add("orderID", Integer.class).setPrimaryKey(true);
319319
c.add("customerID", String.class);
320320
c.add("employeeID", Integer.class);
321321
c.add("shipVia", Integer.class, true);
@@ -404,7 +404,7 @@ public ResponseEntity<ItemsDTO<Order>> getVirtualizedOrdersGrid(HttpServletReque
404404
EntityManager em = entityManagerFactory.createEntityManager();
405405

406406
Consumer<IGridColumnCollection<Order>> columns = c -> {
407-
c.add("orderID", Integer.class);//.setPrimaryKey(true);
407+
c.add("orderID", Integer.class).setPrimaryKey(true);
408408
c.add("customerID", String.class);
409409
c.add("employeeID", Integer.class);
410410
c.add("shipVia", Integer.class, true);
@@ -442,7 +442,7 @@ public ResponseEntity<ItemsDTO<Order>> getOrdersGridAllFeatures(HttpServletReque
442442
EntityManager em = entityManagerFactory.createEntityManager();
443443

444444
Consumer<IGridColumnCollection<Order>> columns = c -> {
445-
c.add("orderID", Integer.class);//.setPrimaryKey(true);
445+
c.add("orderID", Integer.class).setPrimaryKey(true);
446446
c.add("customerID", String.class);
447447
c.add("employeeID", Integer.class);
448448
c.add("shipVia", Integer.class, true);
@@ -507,7 +507,7 @@ public ResponseEntity<ItemsDTO<Employee>> getEmployeesGrid(HttpServletRequest r
507507
EntityManager em = entityManagerFactory.createEntityManager();
508508

509509
Consumer<IGridColumnCollection<Employee>> columns = c -> {
510-
c.add("employeeID", Integer.class);//.setPrimaryKey(true);
510+
c.add("employeeID", Integer.class).setPrimaryKey(true);
511511
c.add("titleOfCourtesy", String.class);
512512
c.add("firstName", String.class);
513513
c.add("lastName", String.class);
@@ -664,8 +664,8 @@ public ResponseEntity<?> getOrderDetailsGrid(HttpServletRequest request,
664664
EntityManager em = entityManagerFactory.createEntityManager();
665665

666666
Consumer<IGridColumnCollection<OrderDetail>> columns = c -> {
667-
c.add("orderID", Integer.class, true); //.setPrimaryKey(true);
668-
c.add("productID", Integer.class); //.setPrimaryKey(true);
667+
c.add("orderID", Integer.class, true).setPrimaryKey(true);
668+
c.add("productID", Integer.class).setPrimaryKey(true);
669669
c.add("product.productName", String.class);
670670
c.add("quantity", Short.class);
671671
c.add("unitPrice", BigDecimal.class);

0 commit comments

Comments
 (0)