From a2d293ed01bd7b3c14b92d0aca75ee3e07337eff Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Tue, 25 Nov 2025 00:39:31 +0330 Subject: [PATCH] update --- docs/model.ndm2 | 5230 +++++++++-------- .../CreateNewTransactionsCommand.cs | 2 + .../UpdateTransactionsCommand.cs | 2 + .../GetAllTransactionsByFilterQuery.cs | 2 + .../GetAllTransactionsByFilterQueryHandler.cs | 17 +- .../GetAllTransactionsByFilterResponseDto.cs | 2 + .../GetTransactionsResponseDto.cs | 2 + .../CreateNewUserOrderCommand.cs | 2 + .../CreateNewUserOrderCommandHandler.cs | 2 +- .../SubmitShopBuyOrderCommandHandler.cs | 61 +- .../UpdateUserOrder/UpdateUserOrderCommand.cs | 2 + .../GetAllUserOrderByFilterQuery.cs | 2 + .../GetAllUserOrderByFilterQueryHandler.cs | 2 +- .../GetAllUserOrderByFilterResponseDto.cs | 2 + .../GetUserOrder/GetUserOrderResponseDto.cs | 2 + .../Entities/Transactions.cs | 2 + .../Entities/UserOrder.cs | 2 + .../CMSMicroservice.Protobuf.csproj | 2 +- 18 files changed, 2705 insertions(+), 2633 deletions(-) diff --git a/docs/model.ndm2 b/docs/model.ndm2 index 4bf3687..a70021a 100644 --- a/docs/model.ndm2 +++ b/docs/model.ndm2 @@ -44670,26 +44670,6 @@ } }, "foreignKeys": [ - { - "objectType": "ForeignKey_MSSQL", - "name": "fk_Transactions_UserOrder_1", - "fields": [ - "OrderId" - ], - "referencedSchema": "CMS", - "referencedTable": "UserOrder", - "referencedFields": [ - "Id" - ], - "onDelete": "", - "onUpdate": "", - "isNotForReplication": false, - "isEnabled": true, - "comment": "", - "sourceCardinality": "NoneRelationship", - "targetCardinality": "NoneRelationship", - "oldName": "" - }, { "objectType": "ForeignKey_MSSQL", "name": "fk_Transactions_PaymentStatus_1", @@ -47133,6 +47113,26 @@ "sourceCardinality": "NoneRelationship", "targetCardinality": "NoneRelationship", "oldName": "" + }, + { + "objectType": "ForeignKey_MSSQL", + "name": "fk_UserOrder_Transactions_1", + "fields": [ + "TransactionId" + ], + "referencedSchema": "CMS", + "referencedTable": "Transactions", + "referencedFields": [ + "Id" + ], + "onDelete": "", + "onUpdate": "", + "isNotForReplication": false, + "isEnabled": true, + "comment": "", + "sourceCardinality": "NoneRelationship", + "targetCardinality": "NoneRelationship", + "oldName": "" } ], "uniques": [], @@ -51744,7 +51744,7 @@ "diagrams": [ { "name": "CMS", - "paperWidth": 7, + "paperWidth": 6, "paperHeight": 3, "tableFont": "Arial Unicode MS", "tableFontSize": 14, @@ -51759,8 +51759,8 @@ "type": "table", "schemaName": "CMS", "tableName": "User", - "x": 9510, - "y": 5550, + "x": 6510, + "y": 8070, "width": 370, "height": 435, "isBold": false, @@ -51775,8 +51775,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserAddress", - "x": 10540, - "y": 5450, + "x": 6970, + "y": 6680, "width": 310, "height": 220, "isBold": false, @@ -51791,8 +51791,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Package", - "x": 11370, - "y": 7730, + "x": 7880, + "y": 6330, "width": 310, "height": 170, "isBold": false, @@ -51807,8 +51807,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserOrder", - "x": 11010, - "y": 7630, + "x": 7560, + "y": 6550, "width": 310, "height": 285, "isBold": false, @@ -51823,8 +51823,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Role", - "x": 9400, - "y": 5030, + "x": 6410, + "y": 6260, "width": 310, "height": 130, "isBold": false, @@ -51839,8 +51839,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserRole", - "x": 9400, - "y": 5210, + "x": 6410, + "y": 6440, "width": 310, "height": 130, "isBold": false, @@ -51855,8 +51855,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserService", - "x": 16130, - "y": 8390, + "x": 11090, + "y": 11300, "width": 400, "height": 284, "isBold": false, @@ -51871,8 +51871,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserRequest", - "x": 16300, - "y": 7280, + "x": 11260, + "y": 10300, "width": 400, "height": 270, "isBold": false, @@ -51887,8 +51887,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserResponse", - "x": 15970, - "y": 7130, + "x": 10940, + "y": 10140, "width": 400, "height": 106, "isBold": false, @@ -51903,8 +51903,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserRequest", - "x": 15620, - "y": 8380, + "x": 10580, + "y": 11090, "width": 400, "height": 300, "isBold": false, @@ -51919,8 +51919,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserRequest", - "x": 16130, - "y": 8720, + "x": 10130, + "y": 11380, "width": 400, "height": 106, "isBold": false, @@ -51935,8 +51935,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserRequest", - "x": 16580, - "y": 8610, + "x": 10580, + "y": 11490, "width": 400, "height": 106, "isBold": false, @@ -51951,8 +51951,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserResponse", - "x": 17710, - "y": 8500, + "x": 10940, + "y": 11650, "width": 400, "height": 350, "isBold": false, @@ -51967,8 +51967,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserByFilterRequest", - "x": 17710, - "y": 8320, + "x": 11390, + "y": 11700, "width": 400, "height": 137, "isBold": false, @@ -51983,8 +51983,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserByFilterFilter", - "x": 18160, - "y": 8100, + "x": 11390, + "y": 11890, "width": 400, "height": 350, "isBold": false, @@ -51999,8 +51999,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserByFilterResponse", - "x": 17650, - "y": 7960, + "x": 11610, + "y": 11500, "width": 400, "height": 118, "isBold": false, @@ -52015,8 +52015,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserByFilterResponseModel", - "x": 18100, - "y": 7710, + "x": 12510, + "y": 11380, "width": 400, "height": 350, "isBold": false, @@ -52031,8 +52031,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserAddressService", - "x": 18450, - "y": 7440, + "x": 13430, + "y": 10460, "width": 400, "height": 200, "isBold": false, @@ -52047,8 +52047,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserAddressRequest", - "x": 16800, - "y": 7310, + "x": 11780, + "y": 10330, "width": 400, "height": 213, "isBold": false, @@ -52063,8 +52063,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserAddressResponse", - "x": 16800, - "y": 7580, + "x": 11780, + "y": 10590, "width": 400, "height": 106, "isBold": false, @@ -52079,8 +52079,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserAddressRequest", - "x": 18540, - "y": 7690, + "x": 13430, + "y": 10710, "width": 400, "height": 213, "isBold": false, @@ -52095,8 +52095,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserAddressRequest", - "x": 18950, - "y": 7490, + "x": 13940, + "y": 10510, "width": 400, "height": 106, "isBold": false, @@ -52111,8 +52111,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserAddressRequest", - "x": 18450, - "y": 7290, + "x": 13430, + "y": 10300, "width": 400, "height": 106, "isBold": false, @@ -52127,8 +52127,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserAddressResponse", - "x": 17940, - "y": 7220, + "x": 12920, + "y": 10240, "width": 400, "height": 213, "isBold": false, @@ -52143,8 +52143,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserAddressByFilterRequest", - "x": 17370, - "y": 6910, + "x": 12350, + "y": 9860, "width": 400, "height": 137, "isBold": false, @@ -52159,8 +52159,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserAddressByFilterFilter", - "x": 16920, - "y": 6790, + "x": 11890, + "y": 9740, "width": 400, "height": 213, "isBold": false, @@ -52175,8 +52175,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserAddressByFilterResponse", - "x": 17370, - "y": 7170, + "x": 12350, + "y": 10120, "width": 400, "height": 118, "isBold": false, @@ -52191,8 +52191,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserAddressByFilterResponseModel", - "x": 16920, - "y": 7050, + "x": 11890, + "y": 10010, "width": 400, "height": 213, "isBold": false, @@ -52207,8 +52207,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PackageService", - "x": 16360, - "y": 5900, + "x": 10690, + "y": 8830, "width": 400, "height": 175, "isBold": false, @@ -52223,8 +52223,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPackageRequest", - "x": 16410, - "y": 6980, + "x": 10750, + "y": 9920, "width": 400, "height": 175, "isBold": false, @@ -52239,8 +52239,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPackageResponse", - "x": 16670, - "y": 6130, + "x": 11000, + "y": 9050, "width": 400, "height": 106, "isBold": false, @@ -52255,8 +52255,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdatePackageRequest", - "x": 16810, - "y": 5900, + "x": 11140, + "y": 8830, "width": 400, "height": 175, "isBold": false, @@ -52271,8 +52271,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeletePackageRequest", - "x": 16360, - "y": 5750, + "x": 10690, + "y": 8670, "width": 400, "height": 106, "isBold": false, @@ -52287,8 +52287,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPackageRequest", - "x": 15370, - "y": 5910, + "x": 9680, + "y": 8830, "width": 400, "height": 106, "isBold": false, @@ -52303,8 +52303,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPackageResponse", - "x": 15610, - "y": 6090, + "x": 9940, + "y": 9010, "width": 400, "height": 175, "isBold": false, @@ -52319,8 +52319,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPackageByFilterRequest", - "x": 16060, - "y": 6190, + "x": 10390, + "y": 9110, "width": 400, "height": 137, "isBold": false, @@ -52335,8 +52335,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPackageByFilterFilter", - "x": 16060, - "y": 6370, + "x": 10390, + "y": 9300, "width": 400, "height": 175, "isBold": false, @@ -52351,8 +52351,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPackageByFilterResponse", - "x": 16160, - "y": 6600, + "x": 10490, + "y": 9530, "width": 400, "height": 118, "isBold": false, @@ -52367,8 +52367,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPackageByFilterResponseModel", - "x": 16160, - "y": 6760, + "x": 10490, + "y": 9690, "width": 400, "height": 175, "isBold": false, @@ -52383,8 +52383,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserOrderService", - "x": 5230, - "y": 8590, + "x": 9270, + "y": 12080, "width": 400, "height": 218, "isBold": false, @@ -52399,8 +52399,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserOrderRequest", - "x": 11040, - "y": 8430, + "x": 9130, + "y": 6720, "width": 400, "height": 267, "isBold": false, @@ -52415,8 +52415,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserOrderResponse", - "x": 15520, - "y": 8730, + "x": 10030, + "y": 12060, "width": 400, "height": 106, "isBold": false, @@ -52431,8 +52431,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserOrderRequest", - "x": 5610, - "y": 8200, + "x": 8970, + "y": 11480, "width": 400, "height": 312, "isBold": false, @@ -52447,8 +52447,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserOrderRequest", - "x": 5080, - "y": 4530, + "x": 8820, + "y": 12130, "width": 400, "height": 106, "isBold": false, @@ -52463,8 +52463,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserOrderRequest", - "x": 4720, - "y": 8640, + "x": 9270, + "y": 12350, "width": 400, "height": 106, "isBold": false, @@ -52479,8 +52479,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserOrderResponse", - "x": 15110, - "y": 8010, + "x": 9580, + "y": 6500, "width": 400, "height": 326, "isBold": false, @@ -52495,8 +52495,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserOrderByFilterRequest", - "x": 5710, - "y": 8010, + "x": 8520, + "y": 11440, "width": 400, "height": 137, "isBold": false, @@ -52511,8 +52511,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserOrderByFilterFilter", - "x": 6160, - "y": 7930, + "x": 8520, + "y": 11080, "width": 400, "height": 307, "isBold": false, @@ -52527,8 +52527,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserOrderByFilterResponse", - "x": 5400, - "y": 4690, + "x": 5050, + "y": 11950, "width": 400, "height": 118, "isBold": false, @@ -52543,8 +52543,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserOrderByFilterResponseModel", - "x": 10750, - "y": 3640, + "x": 5050, + "y": 6020, "width": 400, "height": 308, "isBold": false, @@ -52559,8 +52559,8 @@ "type": "table", "schemaName": "CMS", "tableName": "RoleService", - "x": 15570, - "y": 10370, + "x": 10090, + "y": 13130, "width": 400, "height": 175, "isBold": false, @@ -52575,8 +52575,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewRoleRequest", - "x": 15520, - "y": 8880, + "x": 10030, + "y": 12220, "width": 400, "height": 137, "isBold": false, @@ -52591,8 +52591,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewRoleResponse", - "x": 15270, - "y": 9070, + "x": 9780, + "y": 12970, "width": 400, "height": 106, "isBold": false, @@ -52607,8 +52607,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateRoleRequest", - "x": 15130, - "y": 10390, + "x": 9640, + "y": 13150, "width": 400, "height": 137, "isBold": false, @@ -52623,8 +52623,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteRoleRequest", - "x": 15570, - "y": 10590, + "x": 10090, + "y": 13360, "width": 400, "height": 106, "isBold": false, @@ -52639,8 +52639,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetRoleRequest", - "x": 16020, - "y": 10400, + "x": 10540, + "y": 13160, "width": 400, "height": 106, "isBold": false, @@ -52655,8 +52655,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetRoleResponse", - "x": 15910, - "y": 10120, + "x": 10430, + "y": 12880, "width": 400, "height": 137, "isBold": false, @@ -52671,8 +52671,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllRoleByFilterRequest", - "x": 15840, - "y": 9880, + "x": 10740, + "y": 12580, "width": 400, "height": 137, "isBold": false, @@ -52687,8 +52687,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllRoleByFilterFilter", - "x": 15840, - "y": 9700, + "x": 10740, + "y": 12390, "width": 400, "height": 137, "isBold": false, @@ -52703,8 +52703,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllRoleByFilterResponse", - "x": 15770, - "y": 9470, + "x": 10290, + "y": 12600, "width": 400, "height": 118, "isBold": false, @@ -52719,8 +52719,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllRoleByFilterResponseModel", - "x": 15770, - "y": 9280, + "x": 10290, + "y": 12410, "width": 400, "height": 137, "isBold": false, @@ -52735,8 +52735,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserRoleService", - "x": 20820, - "y": 3460, + "x": 15980, + "y": 12110, "width": 400, "height": 175, "isBold": false, @@ -52751,8 +52751,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserRoleRequest", - "x": 19310, - "y": 8880, + "x": 14260, + "y": 12220, "width": 400, "height": 137, "isBold": false, @@ -52767,8 +52767,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserRoleResponse", - "x": 19680, - "y": 3570, + "x": 14840, + "y": 12220, "width": 400, "height": 106, "isBold": false, @@ -52783,8 +52783,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserRoleRequest", - "x": 20820, - "y": 3680, + "x": 15980, + "y": 12340, "width": 400, "height": 137, "isBold": false, @@ -52799,8 +52799,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserRoleRequest", - "x": 21320, - "y": 3490, + "x": 16490, + "y": 12150, "width": 400, "height": 106, "isBold": false, @@ -52815,8 +52815,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserRoleRequest", - "x": 20820, - "y": 3310, + "x": 15980, + "y": 11950, "width": 400, "height": 106, "isBold": false, @@ -52831,8 +52831,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserRoleResponse", - "x": 20310, - "y": 3320, + "x": 15470, + "y": 11970, "width": 400, "height": 137, "isBold": false, @@ -52847,8 +52847,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserRoleByFilterRequest", - "x": 19740, - "y": 2760, + "x": 14900, + "y": 11810, "width": 400, "height": 137, "isBold": false, @@ -52863,8 +52863,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserRoleByFilterFilter", - "x": 19300, - "y": 2720, + "x": 14450, + "y": 11790, "width": 400, "height": 137, "isBold": false, @@ -52879,8 +52879,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserRoleByFilterResponse", - "x": 19740, - "y": 2950, + "x": 14900, + "y": 11990, "width": 400, "height": 118, "isBold": false, @@ -52895,8 +52895,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserRoleByFilterResponseModel", - "x": 19290, - "y": 2900, + "x": 14450, + "y": 11970, "width": 400, "height": 137, "isBold": false, @@ -52911,8 +52911,8 @@ "type": "table", "schemaName": "CMS", "tableName": "OtpToken", - "x": 8380, - "y": 5520, + "x": 6410, + "y": 9170, "width": 310, "height": 258, "isBold": false, @@ -52927,8 +52927,8 @@ "type": "table", "schemaName": "CMS", "tableName": "OtpTokenService", - "x": 18850, - "y": 3080, + "x": 5350, + "y": 2970, "width": 400, "height": 150, "isBold": false, @@ -52943,8 +52943,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewOtpTokenRequest", - "x": 19050, - "y": 3500, + "x": 5200, + "y": 3460, "width": 400, "height": 154, "isBold": false, @@ -52959,8 +52959,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewOtpTokenResponse", - "x": 19150, - "y": 3280, + "x": 5510, + "y": 3230, "width": 400, "height": 180, "isBold": false, @@ -52975,8 +52975,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllOtpTokenByFilterRequest", - "x": 19290, - "y": 3090, + "x": 5800, + "y": 2980, "width": 400, "height": 137, "isBold": false, @@ -52991,8 +52991,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllOtpTokenByFilterFilter", - "x": 19740, - "y": 3110, + "x": 6250, + "y": 2940, "width": 400, "height": 213, "isBold": false, @@ -53007,8 +53007,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllOtpTokenByFilterResponse", - "x": 18850, - "y": 2910, + "x": 5350, + "y": 2810, "width": 400, "height": 118, "isBold": false, @@ -53023,8 +53023,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllOtpTokenByFilterResponseModel", - "x": 18850, - "y": 2650, + "x": 5350, + "y": 2540, "width": 400, "height": 213, "isBold": false, @@ -53039,8 +53039,8 @@ "type": "table", "schemaName": "CMS", "tableName": "VerifyOtpTokenRequest", - "x": 18340, - "y": 3000, + "x": 4840, + "y": 2900, "width": 400, "height": 160, "isBold": false, @@ -53055,8 +53055,8 @@ "type": "table", "schemaName": "CMS", "tableName": "VerifyOtpTokenResponse", - "x": 18340, - "y": 3210, + "x": 4840, + "y": 3110, "width": 400, "height": 180, "isBold": false, @@ -53071,8 +53071,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetJwtTokenRequest", - "x": 17140, - "y": 8300, + "x": 12060, + "y": 11390, "width": 400, "height": 106, "isBold": false, @@ -53087,8 +53087,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetJwtTokenResponse", - "x": 16630, - "y": 8270, + "x": 11610, + "y": 11290, "width": 400, "height": 106, "isBold": false, @@ -53103,8 +53103,8 @@ "type": "table", "schemaName": "CMS", "tableName": "SetAddressAsDefaultRequest", - "x": 17310, - "y": 7430, + "x": 12290, + "y": 10450, "width": 400, "height": 106, "isBold": false, @@ -53119,8 +53119,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserWallet", - "x": 9100, - "y": 5490, + "x": 6150, + "y": 8180, "width": 310, "height": 220, "isBold": false, @@ -53135,8 +53135,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserWalletChangeLog", - "x": 8740, - "y": 5490, + "x": 5790, + "y": 8180, "width": 310, "height": 220, "isBold": false, @@ -53151,8 +53151,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Transactions", - "x": 11120, - "y": 5190, + "x": 7660, + "y": 5980, "width": 310, "height": 296, "isBold": false, @@ -53167,8 +53167,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserCarts", - "x": 9300, - "y": 6660, + "x": 7430, + "y": 8350, "width": 310, "height": 220, "isBold": false, @@ -53183,8 +53183,8 @@ "type": "table", "schemaName": "CMS", "tableName": "FactorDetails", - "x": 9650, - "y": 7820, + "x": 8260, + "y": 7940, "width": 310, "height": 290, "isBold": false, @@ -53199,8 +53199,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Products", - "x": 9650, - "y": 6600, + "x": 7430, + "y": 7940, "width": 310, "height": 358, "isBold": false, @@ -53215,8 +53215,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ProductImages", - "x": 9860, - "y": 7410, + "x": 8060, + "y": 7530, "width": 310, "height": 358, "isBold": false, @@ -53231,8 +53231,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ProductGallerys", - "x": 9860, - "y": 7000, + "x": 7640, + "y": 7530, "width": 310, "height": 358, "isBold": false, @@ -53247,8 +53247,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PaymentStatus", - "x": 10910, - "y": 4850, + "x": 5550, + "y": 6080, "width": 310, "height": 170, "isBold": false, @@ -53263,8 +53263,8 @@ "type": "table", "schemaName": "CMS", "tableName": "TransactionType", - "x": 11470, - "y": 5250, + "x": 7660, + "y": 5760, "width": 310, "height": 170, "isBold": false, @@ -53279,8 +53279,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserWalletService", - "x": 3640, - "y": 10710, + "x": 3650, + "y": 6390, "width": 400, "height": 175, "isBold": false, @@ -53295,8 +53295,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserWalletRequest", - "x": 4620, - "y": 10150, + "x": 4790, + "y": 5830, "width": 400, "height": 137, "isBold": false, @@ -53311,8 +53311,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserWalletResponse", - "x": 3810, - "y": 10050, + "x": 3820, + "y": 5730, "width": 400, "height": 106, "isBold": false, @@ -53327,8 +53327,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserWalletRequest", - "x": 3480, - "y": 9870, + "x": 3500, + "y": 5550, "width": 400, "height": 137, "isBold": false, @@ -53343,8 +53343,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserWalletRequest", - "x": 3130, - "y": 10740, + "x": 3140, + "y": 6420, "width": 400, "height": 106, "isBold": false, @@ -53359,8 +53359,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserWalletRequest", - "x": 3640, - "y": 10930, + "x": 3650, + "y": 6620, "width": 400, "height": 106, "isBold": false, @@ -53375,8 +53375,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserWalletResponse", - "x": 4080, - "y": 10710, + "x": 4100, + "y": 6390, "width": 400, "height": 137, "isBold": false, @@ -53392,7 +53392,7 @@ "schemaName": "CMS", "tableName": "GetAllUserWalletByFilterRequest", "x": 4020, - "y": 10520, + "y": 6200, "width": 400, "height": 137, "isBold": false, @@ -53407,8 +53407,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletByFilterFilter", - "x": 4520, - "y": 10520, + "x": 4540, + "y": 6200, "width": 400, "height": 137, "isBold": false, @@ -53423,8 +53423,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletByFilterResponse", - "x": 3950, - "y": 10340, + "x": 3960, + "y": 6020, "width": 400, "height": 118, "isBold": false, @@ -53439,8 +53439,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletByFilterResponseModel", - "x": 4390, - "y": 10340, + "x": 4410, + "y": 6020, "width": 400, "height": 137, "isBold": false, @@ -53455,8 +53455,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserWalletChangeLogService", - "x": 5080, - "y": 12430, + "x": 5100, + "y": 14840, "width": 400, "height": 175, "isBold": false, @@ -53471,8 +53471,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserWalletChangeLogRequest", - "x": 4780, - "y": 10710, + "x": 4790, + "y": 13470, "width": 400, "height": 194, "isBold": false, @@ -53487,8 +53487,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserWalletChangeLogResponse", - "x": 4770, - "y": 10950, + "x": 4790, + "y": 14670, "width": 400, "height": 106, "isBold": false, @@ -53503,8 +53503,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserWalletChangeLogRequest", - "x": 4630, - "y": 12420, + "x": 4650, + "y": 14830, "width": 400, "height": 194, "isBold": false, @@ -53519,8 +53519,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserWalletChangeLogRequest", - "x": 5080, - "y": 12650, + "x": 5100, + "y": 15060, "width": 400, "height": 106, "isBold": false, @@ -53535,8 +53535,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserWalletChangeLogRequest", - "x": 5530, - "y": 12460, + "x": 5550, + "y": 14870, "width": 400, "height": 106, "isBold": false, @@ -53551,8 +53551,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserWalletChangeLogResponse", - "x": 5390, - "y": 12120, + "x": 5440, + "y": 14530, "width": 400, "height": 194, "isBold": false, @@ -53567,8 +53567,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletChangeLogByFilterRequest", - "x": 5320, - "y": 11880, + "x": 5370, + "y": 14290, "width": 400, "height": 137, "isBold": false, @@ -53583,8 +53583,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletChangeLogByFilterFilter", - "x": 5320, - "y": 11640, + "x": 5370, + "y": 14040, "width": 400, "height": 194, "isBold": false, @@ -53599,8 +53599,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletChangeLogByFilterResponse", - "x": 5250, - "y": 11410, + "x": 5300, + "y": 13810, "width": 400, "height": 118, "isBold": false, @@ -53615,8 +53615,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserWalletChangeLogByFilterResponseModel", - "x": 5250, - "y": 11170, + "x": 5300, + "y": 13570, "width": 400, "height": 194, "isBold": false, @@ -53631,8 +53631,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserCartsService", - "x": 22850, - "y": 10730, + "x": 18530, + "y": 13330, "width": 400, "height": 175, "isBold": false, @@ -53647,8 +53647,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserCartsRequest", - "x": 21650, - "y": 10680, + "x": 16900, + "y": 13440, "width": 400, "height": 156, "isBold": false, @@ -53663,8 +53663,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserCartsResponse", - "x": 22160, - "y": 10680, + "x": 17390, + "y": 13440, "width": 400, "height": 106, "isBold": false, @@ -53679,8 +53679,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserCartsRequest", - "x": 22160, - "y": 10830, + "x": 18530, + "y": 13550, "width": 400, "height": 156, "isBold": false, @@ -53695,8 +53695,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserCartsRequest", - "x": 22850, - "y": 10950, + "x": 19040, + "y": 13370, "width": 400, "height": 106, "isBold": false, @@ -53711,8 +53711,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserCartsRequest", - "x": 23350, - "y": 10760, + "x": 18530, + "y": 13170, "width": 400, "height": 106, "isBold": false, @@ -53727,8 +53727,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserCartsResponse", - "x": 22850, - "y": 10520, + "x": 18020, + "y": 13170, "width": 400, "height": 156, "isBold": false, @@ -53743,8 +53743,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserCartsByFilterRequest", - "x": 22340, - "y": 10090, + "x": 17450, + "y": 12860, "width": 400, "height": 137, "isBold": false, @@ -53759,8 +53759,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserCartsByFilterFilter", - "x": 21890, - "y": 10030, + "x": 17000, + "y": 12790, "width": 400, "height": 156, "isBold": false, @@ -53775,8 +53775,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserCartsByFilterResponse", - "x": 22280, - "y": 10450, + "x": 17450, + "y": 13210, "width": 400, "height": 118, "isBold": false, @@ -53791,8 +53791,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserCartsByFilterResponseModel", - "x": 21830, - "y": 10230, + "x": 17000, + "y": 13000, "width": 400, "height": 334, "isBold": false, @@ -53807,8 +53807,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ProductGallerysService", - "x": 21520, - "y": 1520, + "x": 2460, + "y": 2120, "width": 400, "height": 175, "isBold": false, @@ -53823,8 +53823,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductGallerysRequest", - "x": 21580, - "y": 2530, + "x": 3140, + "y": 2440, "width": 400, "height": 137, "isBold": false, @@ -53839,8 +53839,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductGallerysResponse", - "x": 21830, - "y": 1750, + "x": 3240, + "y": 2290, "width": 400, "height": 106, "isBold": false, @@ -53855,8 +53855,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateProductGallerysRequest", - "x": 21970, - "y": 1540, + "x": 3500, + "y": 2100, "width": 400, "height": 137, "isBold": false, @@ -53871,8 +53871,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteProductGallerysRequest", - "x": 21520, - "y": 1370, + "x": 2460, + "y": 1960, "width": 400, "height": 106, "isBold": false, @@ -53887,8 +53887,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductGallerysRequest", - "x": 20520, - "y": 1530, + "x": 2010, + "y": 2150, "width": 400, "height": 106, "isBold": false, @@ -53903,8 +53903,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductGallerysResponse", - "x": 20770, - "y": 1700, + "x": 2310, + "y": 3190, "width": 400, "height": 137, "isBold": false, @@ -53919,8 +53919,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductGallerysByFilterRequest", - "x": 21220, - "y": 1800, + "x": 2560, + "y": 2820, "width": 400, "height": 137, "isBold": false, @@ -53935,8 +53935,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductGallerysByFilterFilter", - "x": 21220, - "y": 1990, + "x": 2560, + "y": 3010, "width": 400, "height": 137, "isBold": false, @@ -53951,8 +53951,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductGallerysByFilterResponse", - "x": 21320, - "y": 2170, + "x": 2630, + "y": 2400, "width": 400, "height": 118, "isBold": false, @@ -53967,8 +53967,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductGallerysByFilterResponseModel", - "x": 21320, - "y": 2340, + "x": 2630, + "y": 2570, "width": 400, "height": 137, "isBold": false, @@ -53983,8 +53983,8 @@ "type": "table", "schemaName": "CMS", "tableName": "FactorDetailsService", - "x": 2410, - "y": 13620, + "x": 2420, + "y": 16030, "width": 400, "height": 175, "isBold": false, @@ -53999,8 +53999,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewFactorDetailsRequest", - "x": 3030, - "y": 12440, + "x": 3040, + "y": 14840, "width": 400, "height": 232, "isBold": false, @@ -54015,8 +54015,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewFactorDetailsResponse", - "x": 2580, - "y": 12390, + "x": 2590, + "y": 14800, "width": 400, "height": 106, "isBold": false, @@ -54031,8 +54031,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateFactorDetailsRequest", - "x": 2250, - "y": 12110, + "x": 2260, + "y": 14520, "width": 400, "height": 232, "isBold": false, @@ -54047,8 +54047,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteFactorDetailsRequest", - "x": 1900, - "y": 13660, + "x": 1910, + "y": 16060, "width": 400, "height": 106, "isBold": false, @@ -54063,8 +54063,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetFactorDetailsRequest", - "x": 2410, - "y": 13840, + "x": 2420, + "y": 16250, "width": 400, "height": 106, "isBold": false, @@ -54079,8 +54079,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetFactorDetailsResponse", - "x": 2860, - "y": 13660, + "x": 2870, + "y": 16060, "width": 400, "height": 232, "isBold": false, @@ -54096,7 +54096,7 @@ "schemaName": "CMS", "tableName": "GetAllFactorDetailsByFilterRequest", "x": 2790, - "y": 13420, + "y": 15830, "width": 400, "height": 137, "isBold": false, @@ -54112,7 +54112,7 @@ "schemaName": "CMS", "tableName": "GetAllFactorDetailsByFilterFilter", "x": 3300, - "y": 13380, + "y": 15780, "width": 400, "height": 232, "isBold": false, @@ -54128,7 +54128,7 @@ "schemaName": "CMS", "tableName": "GetAllFactorDetailsByFilterResponse", "x": 2720, - "y": 13150, + "y": 15560, "width": 400, "height": 118, "isBold": false, @@ -54144,7 +54144,7 @@ "schemaName": "CMS", "tableName": "GetAllFactorDetailsByFilterResponseModel", "x": 3170, - "y": 13090, + "y": 15500, "width": 400, "height": 232, "isBold": false, @@ -54159,8 +54159,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ProductsService", - "x": 3610, - "y": 14030, + "x": 3630, + "y": 16420, "width": 400, "height": 175, "isBold": false, @@ -54175,8 +54175,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductsRequest", - "x": 3030, - "y": 12720, + "x": 3040, + "y": 15130, "width": 400, "height": 327, "isBold": false, @@ -54191,8 +54191,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductsResponse", - "x": 3310, - "y": 13790, + "x": 3320, + "y": 16190, "width": 400, "height": 106, "isBold": false, @@ -54207,8 +54207,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateProductsRequest", - "x": 3160, - "y": 13950, + "x": 3170, + "y": 16340, "width": 400, "height": 327, "isBold": false, @@ -54223,8 +54223,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteProductsRequest", - "x": 3610, - "y": 14500, + "x": 3630, + "y": 16650, "width": 400, "height": 106, "isBold": false, @@ -54239,8 +54239,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductsRequest", - "x": 3930, - "y": 14350, + "x": 4080, + "y": 16450, "width": 400, "height": 106, "isBold": false, @@ -54255,8 +54255,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductsResponse", - "x": 4060, - "y": 13970, + "x": 3970, + "y": 15990, "width": 400, "height": 327, "isBold": false, @@ -54271,8 +54271,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductsByFilterRequest", - "x": 3920, - "y": 13780, + "x": 4280, + "y": 15680, "width": 400, "height": 137, "isBold": false, @@ -54287,8 +54287,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductsByFilterFilter", - "x": 3920, - "y": 13410, + "x": 4280, + "y": 15300, "width": 400, "height": 327, "isBold": false, @@ -54303,8 +54303,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductsByFilterResponse", - "x": 3820, - "y": 13240, + "x": 3830, + "y": 15700, "width": 400, "height": 118, "isBold": false, @@ -54319,8 +54319,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductsByFilterResponseModel", - "x": 3820, - "y": 12860, + "x": 3830, + "y": 15320, "width": 400, "height": 327, "isBold": false, @@ -54335,8 +54335,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ProductImagesService", - "x": 25380, - "y": 12630, + "x": 21080, + "y": 15030, "width": 400, "height": 175, "isBold": false, @@ -54351,8 +54351,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductImagesRequest", - "x": 23760, - "y": 12730, + "x": 19450, + "y": 15140, "width": 400, "height": 156, "isBold": false, @@ -54367,8 +54367,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewProductImagesResponse", - "x": 24250, - "y": 12730, + "x": 19940, + "y": 15140, "width": 400, "height": 106, "isBold": false, @@ -54383,8 +54383,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateProductImagesRequest", - "x": 25380, - "y": 12850, + "x": 21080, + "y": 15260, "width": 400, "height": 156, "isBold": false, @@ -54399,8 +54399,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteProductImagesRequest", - "x": 25890, - "y": 12660, + "x": 21590, + "y": 15070, "width": 400, "height": 106, "isBold": false, @@ -54415,8 +54415,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductImagesRequest", - "x": 25380, - "y": 12470, + "x": 21080, + "y": 14880, "width": 400, "height": 106, "isBold": false, @@ -54431,8 +54431,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetProductImagesResponse", - "x": 24880, - "y": 12470, + "x": 20570, + "y": 14870, "width": 400, "height": 156, "isBold": false, @@ -54447,8 +54447,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductImagesByFilterRequest", - "x": 24310, - "y": 12320, + "x": 20000, + "y": 14730, "width": 400, "height": 137, "isBold": false, @@ -54463,8 +54463,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductImagesByFilterFilter", - "x": 23860, - "y": 12260, + "x": 19550, + "y": 14670, "width": 400, "height": 156, "isBold": false, @@ -54479,8 +54479,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductImagesByFilterResponse", - "x": 24310, - "y": 12500, + "x": 20000, + "y": 14920, "width": 400, "height": 118, "isBold": false, @@ -54495,8 +54495,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllProductImagesByFilterResponseModel", - "x": 23860, - "y": 12470, + "x": 19550, + "y": 14880, "width": 400, "height": 156, "isBold": false, @@ -54511,8 +54511,8 @@ "type": "table", "schemaName": "CMS", "tableName": "AdminGetJwtTokenRequest", - "x": 16510, - "y": 8090, + "x": 11470, + "y": 11110, "width": 400, "height": 128, "isBold": false, @@ -54527,8 +54527,8 @@ "type": "table", "schemaName": "CMS", "tableName": "AdminGetJwtTokenResponse", - "x": 16440, - "y": 7940, + "x": 11400, + "y": 10950, "width": 400, "height": 106, "isBold": false, @@ -54543,8 +54543,8 @@ "type": "table", "schemaName": "CMS", "tableName": "SetPasswordForUserRequest", - "x": 16370, - "y": 7730, + "x": 11330, + "y": 10750, "width": 400, "height": 155, "isBold": false, @@ -54559,8 +54559,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Contract", - "x": 8800, - "y": 5760, + "x": 6540, + "y": 8860, "width": 310, "height": 258, "isBold": false, @@ -54575,8 +54575,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserContract", - "x": 9160, - "y": 5760, + "x": 6540, + "y": 8550, "width": 310, "height": 258, "isBold": false, @@ -54591,8 +54591,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ContractService", - "x": 6830, - "y": 6560, + "x": 7380, + "y": 10290, "width": 400, "height": 175, "isBold": false, @@ -54607,8 +54607,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewContractRequest", - "x": 6420, - "y": 5760, + "x": 7380, + "y": 10510, "width": 400, "height": 175, "isBold": false, @@ -54623,8 +54623,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewContractResponse", - "x": 7100, - "y": 6060, + "x": 7070, + "y": 10120, "width": 400, "height": 106, "isBold": false, @@ -54639,8 +54639,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateContractRequest", - "x": 6830, - "y": 6780, + "x": 8320, + "y": 10290, "width": 400, "height": 175, "isBold": false, @@ -54656,7 +54656,7 @@ "schemaName": "CMS", "tableName": "DeleteContractRequest", "x": 6870, - "y": 5900, + "y": 10270, "width": 400, "height": 106, "isBold": false, @@ -54671,8 +54671,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetContractRequest", - "x": 6520, - "y": 6400, + "x": 6870, + "y": 10430, "width": 400, "height": 106, "isBold": false, @@ -54688,7 +54688,7 @@ "schemaName": "CMS", "tableName": "GetContractResponse", "x": 7170, - "y": 6210, + "y": 9890, "width": 400, "height": 175, "isBold": false, @@ -54703,8 +54703,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllContractByFilterRequest", - "x": 7280, - "y": 6440, + "x": 7620, + "y": 9870, "width": 400, "height": 137, "isBold": false, @@ -54719,8 +54719,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllContractByFilterFilter", - "x": 7790, - "y": 6360, + "x": 7310, + "y": 9650, "width": 400, "height": 175, "isBold": false, @@ -54735,8 +54735,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllContractByFilterResponse", - "x": 7340, - "y": 6620, + "x": 7760, + "y": 10060, "width": 400, "height": 118, "isBold": false, @@ -54751,8 +54751,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllContractByFilterResponseModel", - "x": 7790, - "y": 6580, + "x": 8070, + "y": 9840, "width": 400, "height": 175, "isBold": false, @@ -54767,8 +54767,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UserContractService", - "x": 21020, - "y": 190, + "x": 18980, + "y": 870, "width": 400, "height": 175, "isBold": false, @@ -54783,8 +54783,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserContractRequest", - "x": 21080, - "y": 1270, + "x": 19040, + "y": 1740, "width": 400, "height": 175, "isBold": false, @@ -54799,8 +54799,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewUserContractResponse", - "x": 21330, - "y": 410, + "x": 19290, + "y": 1100, "width": 400, "height": 106, "isBold": false, @@ -54815,8 +54815,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateUserContractRequest", - "x": 21470, - "y": 190, + "x": 19430, + "y": 870, "width": 400, "height": 175, "isBold": false, @@ -54831,8 +54831,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteUserContractRequest", - "x": 21020, - "y": 30, + "x": 18980, + "y": 720, "width": 400, "height": 106, "isBold": false, @@ -54847,8 +54847,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserContractRequest", - "x": 20020, - "y": 190, + "x": 17930, + "y": 880, "width": 400, "height": 106, "isBold": false, @@ -54863,8 +54863,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetUserContractResponse", - "x": 20270, - "y": 370, + "x": 18190, + "y": 1060, "width": 400, "height": 175, "isBold": false, @@ -54879,8 +54879,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserContractByFilterRequest", - "x": 20720, - "y": 470, + "x": 18640, + "y": 1160, "width": 400, "height": 137, "isBold": false, @@ -54895,8 +54895,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserContractByFilterFilter", - "x": 20720, - "y": 650, + "x": 18330, + "y": 1410, "width": 400, "height": 175, "isBold": false, @@ -54911,8 +54911,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserContractByFilterResponse", - "x": 20820, - "y": 880, + "x": 18780, + "y": 1340, "width": 400, "height": 118, "isBold": false, @@ -54927,8 +54927,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllUserContractByFilterResponseModel", - "x": 20820, - "y": 1040, + "x": 18780, + "y": 1510, "width": 400, "height": 175, "isBold": false, @@ -54943,8 +54943,8 @@ "type": "table", "schemaName": "CMS", "tableName": "ContractType", - "x": 8470, - "y": 5830, + "x": 6770, + "y": 9230, "width": 278, "height": 124, "isBold": false, @@ -54959,8 +54959,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Category", - "x": 10480, - "y": 6500, + "x": 7330, + "y": 6880, "width": 364, "height": 274, "isBold": false, @@ -54975,8 +54975,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CategoryService", - "x": 890, - "y": 2070, + "x": 900, + "y": 2540, "width": 431, "height": 200, "isBold": false, @@ -54991,8 +54991,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewCategoryRequest", - "x": 1670, - "y": 1410, + "x": 1680, + "y": 1880, "width": 356, "height": 220, "isBold": false, @@ -55007,8 +55007,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewCategoryResponse", - "x": 1060, - "y": 1260, + "x": 1070, + "y": 1730, "width": 300, "height": 200, "isBold": false, @@ -55024,7 +55024,7 @@ "schemaName": "CMS", "tableName": "GetAllCategoryByFilterFilter", "x": 770, - "y": 760, + "y": 1240, "width": 349, "height": 200, "isBold": false, @@ -55040,7 +55040,7 @@ "schemaName": "CMS", "tableName": "GetAllCategoryByFilterRequest", "x": 790, - "y": 1010, + "y": 1490, "width": 303, "height": 200, "isBold": false, @@ -55056,7 +55056,7 @@ "schemaName": "CMS", "tableName": "GetAllCategoryByFilterResponseModel", "x": 30, - "y": 2040, + "y": 2510, "width": 381, "height": 263, "isBold": false, @@ -55072,7 +55072,7 @@ "schemaName": "CMS", "tableName": "GetAllCategoryByFilterResponse", "x": 460, - "y": 2070, + "y": 2540, "width": 325, "height": 200, "isBold": false, @@ -55088,7 +55088,7 @@ "schemaName": "CMS", "tableName": "GetCategoryRequest", "x": 970, - "y": 2320, + "y": 2790, "width": 286, "height": 200, "isBold": false, @@ -55103,8 +55103,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetCategoryResponse", - "x": 1370, - "y": 2070, + "x": 1380, + "y": 2580, "width": 320, "height": 276, "isBold": false, @@ -55119,8 +55119,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateCategoryRequest", - "x": 1270, - "y": 1820, + "x": 1280, + "y": 2290, "width": 519, "height": 200, "isBold": false, @@ -55135,8 +55135,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteCategoryRequest", - "x": 1200, - "y": 1570, + "x": 1210, + "y": 2040, "width": 311, "height": 200, "isBold": false, @@ -55151,8 +55151,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PruductCategory", - "x": 10070, - "y": 6500, + "x": 7330, + "y": 7200, "width": 364, "height": 274, "isBold": false, @@ -55167,8 +55167,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PruductCategoryService", - "x": 29440, - "y": 15050, + "x": 1700, + "y": 18030, "width": 400, "height": 175, "isBold": false, @@ -55183,8 +55183,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPruductCategoryRequest", - "x": 1800, - "y": 14590, + "x": 1650, + "y": 16740, "width": 400, "height": 137, "isBold": false, @@ -55199,8 +55199,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPruductCategoryResponse", - "x": 29100, - "y": 14840, + "x": 1400, + "y": 17870, "width": 400, "height": 106, "isBold": false, @@ -55215,8 +55215,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdatePruductCategoryRequest", - "x": 28990, - "y": 15070, + "x": 1250, + "y": 18050, "width": 400, "height": 137, "isBold": false, @@ -55231,8 +55231,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeletePruductCategoryRequest", - "x": 29440, - "y": 15280, + "x": 1700, + "y": 18250, "width": 400, "height": 106, "isBold": false, @@ -55247,8 +55247,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPruductCategoryRequest", - "x": 29880, - "y": 15090, + "x": 2150, + "y": 18060, "width": 400, "height": 106, "isBold": false, @@ -55263,8 +55263,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPruductCategoryResponse", - "x": 29590, - "y": 13810, + "x": 2040, + "y": 17780, "width": 400, "height": 137, "isBold": false, @@ -55279,8 +55279,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductCategoryByFilterRequest", - "x": 29340, - "y": 14180, + "x": 1970, + "y": 17530, "width": 400, "height": 137, "isBold": false, @@ -55295,8 +55295,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductCategoryByFilterFilter", - "x": 29340, - "y": 14000, + "x": 1970, + "y": 17340, "width": 400, "height": 137, "isBold": false, @@ -55311,8 +55311,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductCategoryByFilterResponse", - "x": 29270, - "y": 14610, + "x": 1910, + "y": 17120, "width": 400, "height": 118, "isBold": false, @@ -55327,8 +55327,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductCategoryByFilterResponseModel", - "x": 29270, - "y": 14430, + "x": 1910, + "y": 16930, "width": 400, "height": 137, "isBold": false, @@ -55343,8 +55343,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PruductTag", - "x": 9710, - "y": 6290, + "x": 7180, + "y": 8010, "width": 200, "height": 200, "isBold": false, @@ -55359,8 +55359,8 @@ "type": "table", "schemaName": "CMS", "tableName": "Tag", - "x": 9710, - "y": 6040, + "x": 6930, + "y": 8010, "width": 200, "height": 200, "isBold": false, @@ -55375,8 +55375,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PruductTagService", - "x": 28310, - "y": 14310, + "x": 23630, + "y": 16630, "width": 400, "height": 175, "isBold": false, @@ -55391,8 +55391,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPruductTagRequest", - "x": 26530, - "y": 14590, + "x": 21910, + "y": 16740, "width": 400, "height": 137, "isBold": false, @@ -55407,8 +55407,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewPruductTagResponse", - "x": 26790, - "y": 14410, + "x": 22490, + "y": 16740, "width": 400, "height": 106, "isBold": false, @@ -55423,8 +55423,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdatePruductTagRequest", - "x": 28310, - "y": 14530, + "x": 23630, + "y": 16860, "width": 400, "height": 137, "isBold": false, @@ -55439,8 +55439,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeletePruductTagRequest", - "x": 28820, - "y": 14380, + "x": 24140, + "y": 16670, "width": 400, "height": 106, "isBold": false, @@ -55455,8 +55455,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPruductTagRequest", - "x": 28560, - "y": 14150, + "x": 23630, + "y": 16470, "width": 400, "height": 106, "isBold": false, @@ -55471,8 +55471,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetPruductTagResponse", - "x": 28160, - "y": 13970, + "x": 23120, + "y": 16490, "width": 400, "height": 137, "isBold": false, @@ -55487,8 +55487,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductTagByFilterRequest", - "x": 27800, - "y": 14180, + "x": 22550, + "y": 16330, "width": 400, "height": 137, "isBold": false, @@ -55503,8 +55503,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductTagByFilterFilter", - "x": 27350, - "y": 14180, + "x": 22100, + "y": 16300, "width": 400, "height": 137, "isBold": false, @@ -55519,8 +55519,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductTagByFilterResponse", - "x": 26850, - "y": 14180, + "x": 22550, + "y": 16510, "width": 400, "height": 118, "isBold": false, @@ -55535,8 +55535,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllPruductTagByFilterResponseModel", - "x": 26400, - "y": 14160, + "x": 22100, + "y": 16490, "width": 400, "height": 137, "isBold": false, @@ -55551,8 +55551,8 @@ "type": "table", "schemaName": "CMS", "tableName": "SubmitShopBuyOrderRequest", - "x": 5230, - "y": 8850, + "x": 9780, + "y": 12410, "width": 400, "height": 149, "isBold": false, @@ -55567,8 +55567,8 @@ "type": "table", "schemaName": "CMS", "tableName": "SubmitShopBuyOrderResponse", - "x": 6320, - "y": 7640, + "x": 8260, + "y": 10800, "width": 400, "height": 237, "isBold": false, @@ -55583,8 +55583,8 @@ "type": "table", "schemaName": "CMS", "tableName": "SubmitShopBuyOrderFactorDetail", - "x": 6760, - "y": 7640, + "x": 8260, + "y": 10510, "width": 400, "height": 237, "isBold": false, @@ -55599,8 +55599,8 @@ "type": "table", "schemaName": "CMS", "tableName": "PaymentMethod", - "x": 11120, - "y": 8130, + "x": 8740, + "y": 6620, "width": 228, "height": 200, "isBold": false, @@ -55615,8 +55615,8 @@ "type": "table", "schemaName": "CMS", "tableName": "TagService", - "x": 26090, - "y": 11540, + "x": 17590, + "y": 190, "width": 400, "height": 175, "isBold": false, @@ -55631,8 +55631,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewTagRequest", - "x": 26150, - "y": 14350, + "x": 18220, + "y": 540, "width": 400, "height": 194, "isBold": false, @@ -55647,8 +55647,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewTagResponse", - "x": 26400, - "y": 11780, + "x": 18320, + "y": 380, "width": 400, "height": 106, "isBold": false, @@ -55663,8 +55663,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateTagRequest", - "x": 26540, - "y": 11530, + "x": 18570, + "y": 140, "width": 400, "height": 194, "isBold": false, @@ -55679,8 +55679,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteTagRequest", - "x": 26090, - "y": 11410, + "x": 17590, + "y": 30, "width": 400, "height": 106, "isBold": false, @@ -55695,8 +55695,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetTagRequest", - "x": 25090, - "y": 11560, + "x": 17140, + "y": 220, "width": 400, "height": 106, "isBold": false, @@ -55711,8 +55711,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetTagResponse", - "x": 25340, - "y": 11720, + "x": 17290, + "y": 940, "width": 400, "height": 194, "isBold": false, @@ -55727,8 +55727,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTagByFilterRequest", - "x": 25790, - "y": 11820, + "x": 17740, + "y": 1040, "width": 400, "height": 137, "isBold": false, @@ -55743,8 +55743,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTagByFilterFilter", - "x": 25790, - "y": 12010, + "x": 17740, + "y": 1230, "width": 400, "height": 194, "isBold": false, @@ -55759,8 +55759,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTagByFilterResponse", - "x": 25890, - "y": 12250, + "x": 17760, + "y": 470, "width": 400, "height": 118, "isBold": false, @@ -55775,8 +55775,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTagByFilterResponseModel", - "x": 25890, - "y": 12420, + "x": 17760, + "y": 640, "width": 400, "height": 194, "isBold": false, @@ -55791,8 +55791,8 @@ "type": "table", "schemaName": "CMS", "tableName": "TransactionsService", - "x": 13530, - "y": 4880, + "x": 6720, + "y": 4450, "width": 400, "height": 175, "isBold": false, @@ -55807,8 +55807,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewTransactionsRequest", - "x": 13530, - "y": 5240, + "x": 7470, + "y": 4390, "width": 400, "height": 213, "isBold": false, @@ -55823,8 +55823,8 @@ "type": "table", "schemaName": "CMS", "tableName": "CreateNewTransactionsResponse", - "x": 12960, - "y": 4840, + "x": 6860, + "y": 5160, "width": 400, "height": 106, "isBold": false, @@ -55839,8 +55839,8 @@ "type": "table", "schemaName": "CMS", "tableName": "UpdateTransactionsRequest", - "x": 11950, - "y": 4940, + "x": 7060, + "y": 5380, "width": 400, "height": 213, "isBold": false, @@ -55855,8 +55855,8 @@ "type": "table", "schemaName": "CMS", "tableName": "DeleteTransactionsRequest", - "x": 12460, - "y": 4840, + "x": 6890, + "y": 4950, "width": 400, "height": 106, "isBold": false, @@ -55871,8 +55871,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetTransactionsRequest", - "x": 12450, - "y": 4960, + "x": 6960, + "y": 4730, "width": 400, "height": 106, "isBold": false, @@ -55887,8 +55887,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetTransactionsResponse", - "x": 12200, - "y": 4570, + "x": 6410, + "y": 5220, "width": 400, "height": 213, "isBold": false, @@ -55903,8 +55903,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTransactionsByFilterRequest", - "x": 13380, - "y": 4550, + "x": 6270, + "y": 4470, "width": 400, "height": 137, "isBold": false, @@ -55919,8 +55919,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTransactionsByFilterFilter", - "x": 13380, - "y": 4290, + "x": 5820, + "y": 4430, "width": 400, "height": 213, "isBold": false, @@ -55935,8 +55935,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTransactionsByFilterResponse", - "x": 14040, - "y": 4770, + "x": 6720, + "y": 4160, "width": 400, "height": 118, "isBold": false, @@ -55951,8 +55951,8 @@ "type": "table", "schemaName": "CMS", "tableName": "GetAllTransactionsByFilterResponseModel", - "x": 14490, - "y": 4720, + "x": 6720, + "y": 3900, "width": 400, "height": 213, "isBold": false, @@ -55967,10 +55967,10 @@ "layers": [ { "name": "Domain", - "x": 8240, - "y": 4000, - "width": 3655, - "height": 4381, + "x": 5500, + "y": 5650, + "width": 3576, + "height": 3944, "layerColor": { "r": 100, "g": 234, @@ -55996,29 +55996,29 @@ "visible": true, "vertices": [ { - "x": 9895, - "y": 5960 + "x": 6895, + "y": 8480 }, { - "x": 9920, - "y": 5960 + "x": 6920, + "y": 8480 }, { - "x": 9920, - "y": 6020 + "x": 6920, + "y": 8540 }, { - "x": 9860, - "y": 6020 + "x": 6860, + "y": 8540 }, { - "x": 9860, - "y": 6000 + "x": 6860, + "y": 8520 } ], "label": { - "x": 9885, - "y": 5922, + "x": 6885, + "y": 8442, "width": 104, "height": 32, "fontName": "Arial Unicode MS", @@ -56042,21 +56042,21 @@ "visible": true, "vertices": [ { - "x": 10525, - "y": 5500 + "x": 6955, + "y": 6790 }, { - "x": 9700, - "y": 5500 + "x": 6700, + "y": 6790 }, { - "x": 9700, - "y": 5535 + "x": 6700, + "y": 8055 } ], "label": { - "x": 10378, - "y": 5462, + "x": 6808, + "y": 6752, "width": 157, "height": 32, "fontName": "Arial Unicode MS", @@ -56080,17 +56080,17 @@ "visible": true, "vertices": [ { - "x": 9560, - "y": 5195 + "x": 6560, + "y": 6425 }, { - "x": 9560, - "y": 5175 + "x": 6560, + "y": 6405 } ], "label": { - "x": 9568, - "y": 5205, + "x": 6568, + "y": 6435, "width": 135, "height": 32, "fontName": "Arial Unicode MS", @@ -56114,17 +56114,17 @@ "visible": true, "vertices": [ { - "x": 9560, - "y": 5355 + "x": 6560, + "y": 6585 }, { - "x": 9560, - "y": 5535 + "x": 6560, + "y": 8055 } ], "label": { - "x": 9428, - "y": 5305, + "x": 6428, + "y": 6535, "width": 134, "height": 32, "fontName": "Arial Unicode MS", @@ -56148,17 +56148,21 @@ "visible": true, "vertices": [ { - "x": 11335, - "y": 7810 + "x": 7820, + "y": 6535 }, { - "x": 11355, - "y": 7810 + "x": 7820, + "y": 6410 + }, + { + "x": 7865, + "y": 6410 } ], "label": { - "x": 11157, - "y": 7772, + "x": 7654, + "y": 6505, "width": 168, "height": 32, "fontName": "Arial Unicode MS", @@ -56182,29 +56186,21 @@ "visible": true, "vertices": [ { - "x": 10995, - "y": 7670 + "x": 7545, + "y": 6620 }, { - "x": 10960, - "y": 7670 + "x": 6630, + "y": 6620 }, { - "x": 10960, - "y": 5400 - }, - { - "x": 9630, - "y": 5400 - }, - { - "x": 9630, - "y": 5535 + "x": 6630, + "y": 8055 } ], "label": { - "x": 10863, - "y": 7632, + "x": 7413, + "y": 6582, "width": 142, "height": 32, "fontName": "Arial Unicode MS", @@ -56228,21 +56224,21 @@ "visible": true, "vertices": [ { - "x": 16240, - "y": 8375 + "x": 11210, + "y": 11285 }, { - "x": 16240, - "y": 7420 + "x": 11210, + "y": 10430 }, { - "x": 16285, - "y": 7420 + "x": 11245, + "y": 10430 } ], "label": { - "x": 16248, - "y": 8385, + "x": 11218, + "y": 11295, "width": 278, "height": 32, "fontName": "Arial Unicode MS", @@ -56266,17 +56262,17 @@ "visible": true, "vertices": [ { - "x": 16170, - "y": 8375 + "x": 11140, + "y": 11285 }, { - "x": 16170, - "y": 7251 + "x": 11140, + "y": 10261 } ], "label": { - "x": 16178, - "y": 8355, + "x": 11148, + "y": 11265, "width": 288, "height": 32, "fontName": "Arial Unicode MS", @@ -56300,17 +56296,25 @@ "visible": true, "vertices": [ { - "x": 16115, - "y": 8530 + "x": 11075, + "y": 11350 }, { - "x": 16035, - "y": 8530 + "x": 11040, + "y": 11350 + }, + { + "x": 11040, + "y": 11340 + }, + { + "x": 10995, + "y": 11340 } ], "label": { - "x": 16131, - "y": 8532, + "x": 11091, + "y": 11352, "width": 254, "height": 32, "fontName": "Arial Unicode MS", @@ -56334,17 +56338,17 @@ "visible": true, "vertices": [ { - "x": 16330, - "y": 8689 + "x": 11075, + "y": 11440 }, { - "x": 16330, - "y": 8705 + "x": 10545, + "y": 11440 } ], "label": { - "x": 16338, - "y": 8649, + "x": 11091, + "y": 11412, "width": 249, "height": 32, "fontName": "Arial Unicode MS", @@ -56368,17 +56372,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8650 + "x": 11075, + "y": 11540 }, { - "x": 16565, - "y": 8650 + "x": 10995, + "y": 11540 } ], "label": { - "x": 16541, - "y": 8622, + "x": 11091, + "y": 11512, "width": 228, "height": 32, "fontName": "Arial Unicode MS", @@ -56402,17 +56406,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8550 + "x": 11140, + "y": 11599 }, { - "x": 17695, - "y": 8550 + "x": 11140, + "y": 11635 } ], "label": { - "x": 16541, - "y": 8552, + "x": 11148, + "y": 11589, "width": 238, "height": 32, "fontName": "Arial Unicode MS", @@ -56436,25 +56440,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8480 + "x": 11450, + "y": 11599 }, { - "x": 17650, - "y": 8480 - }, - { - "x": 17650, - "y": 8410 - }, - { - "x": 17695, - "y": 8410 + "x": 11450, + "y": 11685 } ], "label": { - "x": 16541, - "y": 8482, + "x": 11458, + "y": 11589, "width": 295, "height": 32, "fontName": "Arial Unicode MS", @@ -56478,25 +56474,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8460 + "x": 11505, + "y": 11560 }, { - "x": 17600, - "y": 8460 - }, - { - "x": 17600, - "y": 8040 - }, - { - "x": 17635, - "y": 8040 + "x": 11595, + "y": 11560 } ], "label": { - "x": 16541, - "y": 8462, + "x": 11501, + "y": 11562, "width": 305, "height": 32, "fontName": "Arial Unicode MS", @@ -56520,17 +56508,17 @@ "visible": true, "vertices": [ { - "x": 18125, - "y": 8390 + "x": 11590, + "y": 11852 }, { - "x": 18145, - "y": 8390 + "x": 11590, + "y": 11875 } ], "label": { - "x": 18121, - "y": 8392, + "x": 11598, + "y": 11842, "width": 357, "height": 32, "fontName": "Arial Unicode MS", @@ -56554,17 +56542,17 @@ "visible": true, "vertices": [ { - "x": 18065, - "y": 8010 + "x": 12025, + "y": 11560 }, { - "x": 18085, - "y": 8010 + "x": 12495, + "y": 11560 } ], "label": { - "x": 18061, - "y": 8012, + "x": 12021, + "y": 11562, "width": 442, "height": 32, "fontName": "Arial Unicode MS", @@ -56588,25 +56576,29 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7590 + "x": 13415, + "y": 10610 }, { - "x": 17260, - "y": 7590 + "x": 12230, + "y": 10610 }, { - "x": 17260, - "y": 7480 + "x": 12230, + "y": 10270 }, { - "x": 17215, - "y": 7480 + "x": 11970, + "y": 10270 + }, + { + "x": 11970, + "y": 10315 } ], "label": { - "x": 18451, - "y": 7592, + "x": 13431, + "y": 10612, "width": 384, "height": 32, "fontName": "Arial Unicode MS", @@ -56630,17 +56622,17 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7620 + "x": 13415, + "y": 10640 }, { - "x": 17215, - "y": 7620 + "x": 12195, + "y": 10640 } ], "label": { - "x": 18451, - "y": 7592, + "x": 13431, + "y": 10612, "width": 394, "height": 32, "fontName": "Arial Unicode MS", @@ -56664,17 +56656,17 @@ "visible": true, "vertices": [ { - "x": 18640, - "y": 7655 + "x": 13620, + "y": 10675 }, { - "x": 18640, - "y": 7675 + "x": 13620, + "y": 10695 } ], "label": { - "x": 18648, - "y": 7645, + "x": 13628, + "y": 10665, "width": 360, "height": 32, "fontName": "Arial Unicode MS", @@ -56698,17 +56690,17 @@ "visible": true, "vertices": [ { - "x": 18865, - "y": 7540 + "x": 13845, + "y": 10560 }, { - "x": 18935, - "y": 7540 + "x": 13925, + "y": 10560 } ], "label": { - "x": 18861, - "y": 7512, + "x": 13841, + "y": 10532, "width": 355, "height": 32, "fontName": "Arial Unicode MS", @@ -56732,17 +56724,17 @@ "visible": true, "vertices": [ { - "x": 18650, - "y": 7425 + "x": 13620, + "y": 10445 }, { - "x": 18650, - "y": 7411 + "x": 13620, + "y": 10421 } ], "label": { - "x": 18658, - "y": 7405, + "x": 13628, + "y": 10425, "width": 334, "height": 32, "fontName": "Arial Unicode MS", @@ -56766,25 +56758,25 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7460 + "x": 13415, + "y": 10480 }, { - "x": 18390, - "y": 7460 + "x": 13370, + "y": 10480 }, { - "x": 18390, - "y": 7390 + "x": 13370, + "y": 10410 }, { - "x": 18355, - "y": 7390 + "x": 13335, + "y": 10410 } ], "label": { - "x": 18451, - "y": 7462, + "x": 13431, + "y": 10482, "width": 344, "height": 32, "fontName": "Arial Unicode MS", @@ -56808,25 +56800,25 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7490 + "x": 13415, + "y": 10510 }, { - "x": 17880, - "y": 7490 + "x": 12860, + "y": 10510 }, { - "x": 17880, - "y": 7000 + "x": 12860, + "y": 9950 }, { - "x": 17785, - "y": 7000 + "x": 12765, + "y": 9950 } ], "label": { - "x": 18451, - "y": 7492, + "x": 13431, + "y": 10512, "width": 401, "height": 32, "fontName": "Arial Unicode MS", @@ -56850,25 +56842,25 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7520 + "x": 13415, + "y": 10540 }, { - "x": 17820, - "y": 7520 + "x": 12800, + "y": 10540 }, { - "x": 17820, - "y": 7240 + "x": 12800, + "y": 10190 }, { - "x": 17785, - "y": 7240 + "x": 12765, + "y": 10190 } ], "label": { - "x": 18451, - "y": 7522, + "x": 13431, + "y": 10542, "width": 411, "height": 32, "fontName": "Arial Unicode MS", @@ -56892,17 +56884,17 @@ "visible": true, "vertices": [ { - "x": 17355, - "y": 6950 + "x": 12335, + "y": 9910 }, { - "x": 17335, - "y": 6950 + "x": 12305, + "y": 9910 } ], "label": { - "x": 17371, - "y": 6952, + "x": 12351, + "y": 9912, "width": 463, "height": 32, "fontName": "Arial Unicode MS", @@ -56926,17 +56918,17 @@ "visible": true, "vertices": [ { - "x": 17355, - "y": 7220 + "x": 12335, + "y": 10170 }, { - "x": 17335, - "y": 7220 + "x": 12305, + "y": 10170 } ], "label": { - "x": 17371, - "y": 7222, + "x": 12351, + "y": 10172, "width": 548, "height": 32, "fontName": "Arial Unicode MS", @@ -56960,17 +56952,17 @@ "visible": true, "vertices": [ { - "x": 16620, - "y": 6090 + "x": 10940, + "y": 9020 }, { - "x": 16620, - "y": 6965 + "x": 10940, + "y": 9905 } ], "label": { - "x": 16628, - "y": 6080, + "x": 10948, + "y": 9010, "width": 330, "height": 32, "fontName": "Arial Unicode MS", @@ -56994,17 +56986,17 @@ "visible": true, "vertices": [ { - "x": 16720, - "y": 6090 + "x": 11040, + "y": 9020 }, { - "x": 16720, - "y": 6115 + "x": 11040, + "y": 9035 } ], "label": { - "x": 16728, - "y": 6050, + "x": 11048, + "y": 8980, "width": 340, "height": 32, "fontName": "Arial Unicode MS", @@ -57028,17 +57020,17 @@ "visible": true, "vertices": [ { - "x": 16775, - "y": 5990 + "x": 11105, + "y": 8920 }, { - "x": 16795, - "y": 5990 + "x": 11125, + "y": 8920 } ], "label": { - "x": 16771, - "y": 5992, + "x": 11101, + "y": 8922, "width": 306, "height": 32, "fontName": "Arial Unicode MS", @@ -57062,17 +57054,17 @@ "visible": true, "vertices": [ { - "x": 16560, - "y": 5885 + "x": 10890, + "y": 8815 }, { - "x": 16560, - "y": 5871 + "x": 10890, + "y": 8791 } ], "label": { - "x": 16568, - "y": 5865, + "x": 10898, + "y": 8795, "width": 301, "height": 32, "fontName": "Arial Unicode MS", @@ -57096,17 +57088,17 @@ "visible": true, "vertices": [ { - "x": 16345, - "y": 5960 + "x": 10675, + "y": 8890 }, { - "x": 15785, - "y": 5960 + "x": 10095, + "y": 8890 } ], "label": { - "x": 16361, - "y": 5932, + "x": 10691, + "y": 8862, "width": 280, "height": 32, "fontName": "Arial Unicode MS", @@ -57130,21 +57122,21 @@ "visible": true, "vertices": [ { - "x": 16345, - "y": 6030 + "x": 10675, + "y": 8960 }, { - "x": 15820, - "y": 6030 + "x": 10140, + "y": 8960 }, { - "x": 15820, - "y": 6075 + "x": 10140, + "y": 8995 } ], "label": { - "x": 16361, - "y": 6032, + "x": 10691, + "y": 8962, "width": 290, "height": 32, "fontName": "Arial Unicode MS", @@ -57168,17 +57160,17 @@ "visible": true, "vertices": [ { - "x": 16410, - "y": 6090 + "x": 10740, + "y": 9020 }, { - "x": 16410, - "y": 6175 + "x": 10740, + "y": 9095 } ], "label": { - "x": 16418, - "y": 6080, + "x": 10748, + "y": 9010, "width": 347, "height": 32, "fontName": "Arial Unicode MS", @@ -57202,17 +57194,17 @@ "visible": true, "vertices": [ { - "x": 16510, - "y": 6090 + "x": 10840, + "y": 9020 }, { - "x": 16510, - "y": 6585 + "x": 10840, + "y": 9515 } ], "label": { - "x": 16518, - "y": 6080, + "x": 10848, + "y": 9010, "width": 357, "height": 32, "fontName": "Arial Unicode MS", @@ -57236,17 +57228,17 @@ "visible": true, "vertices": [ { - "x": 16260, - "y": 6342 + "x": 10590, + "y": 9262 }, { - "x": 16260, - "y": 6355 + "x": 10590, + "y": 9285 } ], "label": { - "x": 16268, - "y": 6332, + "x": 10598, + "y": 9252, "width": 409, "height": 32, "fontName": "Arial Unicode MS", @@ -57270,17 +57262,17 @@ "visible": true, "vertices": [ { - "x": 16360, - "y": 6733 + "x": 10690, + "y": 9663 }, { - "x": 16360, - "y": 6745 + "x": 10690, + "y": 9675 } ], "label": { - "x": 16368, - "y": 6723, + "x": 10698, + "y": 9653, "width": 494, "height": 32, "fontName": "Arial Unicode MS", @@ -57304,17 +57296,25 @@ "visible": true, "vertices": [ { - "x": 5645, - "y": 8600 + "x": 9560, + "y": 12065 }, { - "x": 11025, - "y": 8600 + "x": 9560, + "y": 11780 + }, + { + "x": 9490, + "y": 11780 + }, + { + "x": 9490, + "y": 7002 } ], "label": { - "x": 5641, - "y": 8602, + "x": 9568, + "y": 12075, "width": 354, "height": 32, "fontName": "Arial Unicode MS", @@ -57338,17 +57338,17 @@ "visible": true, "vertices": [ { - "x": 5645, - "y": 8780 + "x": 9685, + "y": 12120 }, { - "x": 15505, - "y": 8780 + "x": 10015, + "y": 12120 } ], "label": { - "x": 5641, - "y": 8752, + "x": 9681, + "y": 12092, "width": 364, "height": 32, "fontName": "Arial Unicode MS", @@ -57372,21 +57372,25 @@ "visible": true, "vertices": [ { - "x": 5560, - "y": 8575 + "x": 9500, + "y": 12065 }, { - "x": 5560, - "y": 8350 + "x": 9500, + "y": 11840 }, { - "x": 5595, - "y": 8350 + "x": 9330, + "y": 11840 + }, + { + "x": 9330, + "y": 11807 } ], "label": { - "x": 5568, - "y": 8585, + "x": 9508, + "y": 12075, "width": 330, "height": 32, "fontName": "Arial Unicode MS", @@ -57410,17 +57414,17 @@ "visible": true, "vertices": [ { - "x": 5280, - "y": 8575 + "x": 9255, + "y": 12180 }, { - "x": 5280, - "y": 4651 + "x": 9235, + "y": 12180 } ], "label": { - "x": 5288, - "y": 8555, + "x": 9271, + "y": 12152, "width": 325, "height": 32, "fontName": "Arial Unicode MS", @@ -57444,17 +57448,17 @@ "visible": true, "vertices": [ { - "x": 5215, - "y": 8690 + "x": 9470, + "y": 12313 }, { - "x": 5135, - "y": 8690 + "x": 9470, + "y": 12335 } ], "label": { - "x": 5231, - "y": 8662, + "x": 9478, + "y": 12273, "width": 304, "height": 32, "fontName": "Arial Unicode MS", @@ -57478,21 +57482,17 @@ "visible": true, "vertices": [ { - "x": 5645, - "y": 8750 + "x": 9630, + "y": 12065 }, { - "x": 15310, - "y": 8750 - }, - { - "x": 15310, - "y": 8351 + "x": 9630, + "y": 6841 } ], "label": { - "x": 5641, - "y": 8752, + "x": 9638, + "y": 12075, "width": 314, "height": 32, "fontName": "Arial Unicode MS", @@ -57516,21 +57516,25 @@ "visible": true, "vertices": [ { - "x": 5490, - "y": 8575 + "x": 9440, + "y": 12065 }, { - "x": 5490, - "y": 8080 + "x": 9440, + "y": 11900 }, { - "x": 5695, - "y": 8080 + "x": 8870, + "y": 11900 + }, + { + "x": 8870, + "y": 11592 } ], "label": { - "x": 5498, - "y": 8585, + "x": 9448, + "y": 12075, "width": 371, "height": 32, "fontName": "Arial Unicode MS", @@ -57554,21 +57558,21 @@ "visible": true, "vertices": [ { - "x": 5350, - "y": 8575 + "x": 9310, + "y": 12065 }, { - "x": 5350, - "y": 4750 + "x": 9310, + "y": 12020 }, { - "x": 5385, - "y": 4750 + "x": 5465, + "y": 12020 } ], "label": { - "x": 5358, - "y": 8585, + "x": 9318, + "y": 12075, "width": 381, "height": 32, "fontName": "Arial Unicode MS", @@ -57592,17 +57596,17 @@ "visible": true, "vertices": [ { - "x": 6125, - "y": 8080 + "x": 8720, + "y": 11425 }, { - "x": 6145, - "y": 8080 + "x": 8720, + "y": 11402 } ], "label": { - "x": 6121, - "y": 8082, + "x": 8728, + "y": 11435, "width": 433, "height": 32, "fontName": "Arial Unicode MS", @@ -57626,21 +57630,17 @@ "visible": true, "vertices": [ { - "x": 5750, - "y": 4675 + "x": 5250, + "y": 11935 }, { - "x": 5750, - "y": 3790 - }, - { - "x": 10735, - "y": 3790 + "x": 5250, + "y": 6343 } ], "label": { - "x": 5758, - "y": 4685, + "x": 5258, + "y": 11945, "width": 518, "height": 32, "fontName": "Arial Unicode MS", @@ -57664,25 +57664,17 @@ "visible": true, "vertices": [ { - "x": 15720, - "y": 10355 + "x": 10240, + "y": 13115 }, { - "x": 15720, - "y": 9230 - }, - { - "x": 15720, - "y": 9230 - }, - { - "x": 15720, - "y": 9032 + "x": 10240, + "y": 12372 } ], "label": { - "x": 15728, - "y": 10365, + "x": 10248, + "y": 13125, "width": 280, "height": 32, "fontName": "Arial Unicode MS", @@ -57706,17 +57698,17 @@ "visible": true, "vertices": [ { - "x": 15620, - "y": 10355 + "x": 10130, + "y": 13115 }, { - "x": 15620, - "y": 9191 + "x": 10130, + "y": 13091 } ], "label": { - "x": 15628, - "y": 10335, + "x": 10138, + "y": 13095, "width": 290, "height": 32, "fontName": "Arial Unicode MS", @@ -57740,17 +57732,17 @@ "visible": true, "vertices": [ { - "x": 15555, - "y": 10450 + "x": 10075, + "y": 13220 }, { - "x": 15545, - "y": 10450 + "x": 10055, + "y": 13220 } ], "label": { - "x": 15571, - "y": 10452, + "x": 10091, + "y": 13222, "width": 256, "height": 32, "fontName": "Arial Unicode MS", @@ -57774,17 +57766,17 @@ "visible": true, "vertices": [ { - "x": 15770, - "y": 10560 + "x": 10290, + "y": 13320 }, { - "x": 15770, - "y": 10575 + "x": 10290, + "y": 13345 } ], "label": { - "x": 15778, - "y": 10520, + "x": 10298, + "y": 13280, "width": 251, "height": 32, "fontName": "Arial Unicode MS", @@ -57808,17 +57800,17 @@ "visible": true, "vertices": [ { - "x": 15985, - "y": 10450 + "x": 10505, + "y": 13220 }, { - "x": 16005, - "y": 10450 + "x": 10525, + "y": 13220 } ], "label": { - "x": 15981, - "y": 10422, + "x": 10501, + "y": 13192, "width": 230, "height": 32, "fontName": "Arial Unicode MS", @@ -57842,25 +57834,25 @@ "visible": true, "vertices": [ { - "x": 15930, - "y": 10355 + "x": 10440, + "y": 13115 }, { - "x": 15930, - "y": 10310 + "x": 10440, + "y": 13080 }, { - "x": 15960, - "y": 10310 + "x": 10470, + "y": 13080 }, { - "x": 15960, - "y": 10272 + "x": 10470, + "y": 13032 } ], "label": { - "x": 15938, - "y": 10365, + "x": 10448, + "y": 13125, "width": 240, "height": 32, "fontName": "Arial Unicode MS", @@ -57884,25 +57876,25 @@ "visible": true, "vertices": [ { - "x": 15860, - "y": 10355 + "x": 10370, + "y": 13115 }, { - "x": 15860, - "y": 10070 + "x": 10370, + "y": 12830 }, { - "x": 15890, - "y": 10070 + "x": 10790, + "y": 12830 }, { - "x": 15890, - "y": 10032 + "x": 10790, + "y": 12732 } ], "label": { - "x": 15868, - "y": 10365, + "x": 10378, + "y": 13125, "width": 297, "height": 32, "fontName": "Arial Unicode MS", @@ -57926,25 +57918,25 @@ "visible": true, "vertices": [ { - "x": 15790, - "y": 10355 + "x": 10300, + "y": 13115 }, { - "x": 15790, - "y": 9640 + "x": 10300, + "y": 12770 }, { - "x": 15820, - "y": 9640 + "x": 10340, + "y": 12770 }, { - "x": 15820, - "y": 9603 + "x": 10340, + "y": 12733 } ], "label": { - "x": 15798, - "y": 10365, + "x": 10308, + "y": 13125, "width": 307, "height": 32, "fontName": "Arial Unicode MS", @@ -57968,17 +57960,17 @@ "visible": true, "vertices": [ { - "x": 16040, - "y": 9865 + "x": 10940, + "y": 12565 }, { - "x": 16040, - "y": 9852 + "x": 10940, + "y": 12542 } ], "label": { - "x": 16048, - "y": 9875, + "x": 10948, + "y": 12575, "width": 359, "height": 32, "fontName": "Arial Unicode MS", @@ -58002,17 +57994,17 @@ "visible": true, "vertices": [ { - "x": 15970, - "y": 9455 + "x": 10490, + "y": 12585 }, { - "x": 15970, - "y": 9432 + "x": 10490, + "y": 12562 } ], "label": { - "x": 15978, - "y": 9465, + "x": 10498, + "y": 12595, "width": 444, "height": 32, "fontName": "Arial Unicode MS", @@ -58036,29 +58028,29 @@ "visible": true, "vertices": [ { - "x": 20805, - "y": 3580 + "x": 15965, + "y": 12230 }, { - "x": 20140, - "y": 3580 + "x": 15290, + "y": 12230 }, { - "x": 20140, - "y": 3510 + "x": 15290, + "y": 12170 }, { - "x": 19510, - "y": 3510 + "x": 14460, + "y": 12170 }, { - "x": 19510, - "y": 8865 + "x": 14460, + "y": 12205 } ], "label": { - "x": 20821, - "y": 3582, + "x": 15981, + "y": 12232, "width": 338, "height": 32, "fontName": "Arial Unicode MS", @@ -58082,17 +58074,17 @@ "visible": true, "vertices": [ { - "x": 20805, - "y": 3610 + "x": 15965, + "y": 12270 }, { - "x": 20095, - "y": 3610 + "x": 15255, + "y": 12270 } ], "label": { - "x": 20821, - "y": 3582, + "x": 15981, + "y": 12242, "width": 348, "height": 32, "fontName": "Arial Unicode MS", @@ -58116,17 +58108,17 @@ "visible": true, "vertices": [ { - "x": 21020, - "y": 3650 + "x": 16170, + "y": 12300 }, { - "x": 21020, - "y": 3665 + "x": 16170, + "y": 12325 } ], "label": { - "x": 21028, - "y": 3640, + "x": 16178, + "y": 12290, "width": 314, "height": 32, "fontName": "Arial Unicode MS", @@ -58150,17 +58142,17 @@ "visible": true, "vertices": [ { - "x": 21235, - "y": 3550 + "x": 16395, + "y": 12200 }, { - "x": 21305, - "y": 3550 + "x": 16475, + "y": 12200 } ], "label": { - "x": 21231, - "y": 3522, + "x": 16391, + "y": 12172, "width": 309, "height": 32, "fontName": "Arial Unicode MS", @@ -58184,17 +58176,17 @@ "visible": true, "vertices": [ { - "x": 21020, - "y": 3445 + "x": 16170, + "y": 12095 }, { - "x": 21020, - "y": 3431 + "x": 16170, + "y": 12071 } ], "label": { - "x": 21028, - "y": 3425, + "x": 16178, + "y": 12075, "width": 288, "height": 32, "fontName": "Arial Unicode MS", @@ -58218,25 +58210,25 @@ "visible": true, "vertices": [ { - "x": 20805, - "y": 3480 + "x": 15965, + "y": 12130 }, { - "x": 20760, - "y": 3480 + "x": 15920, + "y": 12130 }, { - "x": 20760, - "y": 3410 + "x": 15920, + "y": 12060 }, { - "x": 20725, - "y": 3410 + "x": 15885, + "y": 12060 } ], "label": { - "x": 20821, - "y": 3482, + "x": 15981, + "y": 12132, "width": 298, "height": 32, "fontName": "Arial Unicode MS", @@ -58260,25 +58252,25 @@ "visible": true, "vertices": [ { - "x": 20805, - "y": 3510 + "x": 15965, + "y": 12160 }, { - "x": 20260, - "y": 3510 + "x": 15410, + "y": 12160 }, { - "x": 20260, - "y": 2850 + "x": 15410, + "y": 11900 }, { - "x": 20155, - "y": 2850 + "x": 15315, + "y": 11900 } ], "label": { - "x": 20821, - "y": 3512, + "x": 15981, + "y": 12162, "width": 355, "height": 32, "fontName": "Arial Unicode MS", @@ -58302,25 +58294,25 @@ "visible": true, "vertices": [ { - "x": 20805, - "y": 3540 + "x": 15965, + "y": 12190 }, { - "x": 20200, - "y": 3540 + "x": 15350, + "y": 12190 }, { - "x": 20200, - "y": 3020 + "x": 15350, + "y": 12060 }, { - "x": 20155, - "y": 3020 + "x": 15315, + "y": 12060 } ], "label": { - "x": 20821, - "y": 3542, + "x": 15981, + "y": 12192, "width": 365, "height": 32, "fontName": "Arial Unicode MS", @@ -58344,17 +58336,17 @@ "visible": true, "vertices": [ { - "x": 19725, - "y": 2810 + "x": 14885, + "y": 11850 }, { - "x": 19715, - "y": 2810 + "x": 14865, + "y": 11850 } ], "label": { - "x": 19741, - "y": 2812, + "x": 14901, + "y": 11852, "width": 417, "height": 32, "fontName": "Arial Unicode MS", @@ -58378,17 +58370,17 @@ "visible": true, "vertices": [ { - "x": 19725, - "y": 2990 + "x": 14885, + "y": 12040 }, { - "x": 19705, - "y": 2990 + "x": 14865, + "y": 12040 } ], "label": { - "x": 19741, - "y": 2992, + "x": 14901, + "y": 12042, "width": 502, "height": 32, "fontName": "Arial Unicode MS", @@ -58412,17 +58404,17 @@ "visible": true, "vertices": [ { - "x": 19100, - "y": 3245 + "x": 5400, + "y": 3135 }, { - "x": 19100, - "y": 3485 + "x": 5400, + "y": 3445 } ], "label": { - "x": 19108, - "y": 3235, + "x": 5408, + "y": 3125, "width": 352, "height": 32, "fontName": "Arial Unicode MS", @@ -58446,17 +58438,17 @@ "visible": true, "vertices": [ { - "x": 19265, - "y": 3160 + "x": 5765, + "y": 3050 }, { - "x": 19275, - "y": 3160 + "x": 5785, + "y": 3050 } ], "label": { - "x": 19261, - "y": 3162, + "x": 5761, + "y": 3052, "width": 369, "height": 32, "fontName": "Arial Unicode MS", @@ -58480,17 +58472,17 @@ "visible": true, "vertices": [ { - "x": 19040, - "y": 3065 + "x": 5560, + "y": 2955 }, { - "x": 19040, - "y": 3043 + "x": 5560, + "y": 2943 } ], "label": { - "x": 19048, - "y": 3075, + "x": 5568, + "y": 2965, "width": 379, "height": 32, "fontName": "Arial Unicode MS", @@ -58514,17 +58506,17 @@ "visible": true, "vertices": [ { - "x": 19705, - "y": 3180 + "x": 6215, + "y": 3050 }, { - "x": 19725, - "y": 3180 + "x": 6235, + "y": 3050 } ], "label": { - "x": 19701, - "y": 3182, + "x": 6211, + "y": 3052, "width": 431, "height": 32, "fontName": "Arial Unicode MS", @@ -58548,17 +58540,17 @@ "visible": true, "vertices": [ { - "x": 19040, - "y": 2895 + "x": 5560, + "y": 2795 }, { - "x": 19040, - "y": 2878 + "x": 5560, + "y": 2768 } ], "label": { - "x": 19048, - "y": 2905, + "x": 5568, + "y": 2805, "width": 516, "height": 32, "fontName": "Arial Unicode MS", @@ -58582,17 +58574,17 @@ "visible": true, "vertices": [ { - "x": 19200, - "y": 3245 + "x": 5710, + "y": 3135 }, { - "x": 19200, - "y": 3265 + "x": 5710, + "y": 3215 } ], "label": { - "x": 19202, - "y": 3195, + "x": 5712, + "y": 3085, "width": 362, "height": 32, "fontName": "Arial Unicode MS", @@ -58616,17 +58608,17 @@ "visible": true, "vertices": [ { - "x": 18835, - "y": 3120 + "x": 5335, + "y": 3010 }, { - "x": 18755, - "y": 3120 + "x": 5255, + "y": 3010 } ], "label": { - "x": 18845, - "y": 3082, + "x": 5345, + "y": 2972, "width": 317, "height": 32, "fontName": "Arial Unicode MS", @@ -58650,25 +58642,25 @@ "visible": true, "vertices": [ { - "x": 18835, - "y": 3180 + "x": 5335, + "y": 3080 }, { - "x": 18790, - "y": 3180 + "x": 5300, + "y": 3080 }, { - "x": 18790, - "y": 3260 + "x": 5300, + "y": 3160 }, { - "x": 18755, - "y": 3260 + "x": 5255, + "y": 3160 } ], "label": { - "x": 18845, - "y": 3142, + "x": 5345, + "y": 3042, "width": 327, "height": 32, "fontName": "Arial Unicode MS", @@ -58692,25 +58684,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8430 + "x": 11505, + "y": 11450 }, { - "x": 17090, - "y": 8430 - }, - { - "x": 17090, - "y": 8360 - }, - { - "x": 17125, - "y": 8360 + "x": 12045, + "y": 11450 } ], "label": { - "x": 16535, - "y": 8392, + "x": 11495, + "y": 11412, "width": 261, "height": 32, "fontName": "Arial Unicode MS", @@ -58734,25 +58718,17 @@ "visible": true, "vertices": [ { - "x": 16545, - "y": 8410 + "x": 11505, + "y": 11340 }, { - "x": 16580, - "y": 8410 - }, - { - "x": 16580, - "y": 8330 - }, - { - "x": 16615, - "y": 8330 + "x": 11595, + "y": 11340 } ], "label": { - "x": 16535, - "y": 8372, + "x": 11495, + "y": 11302, "width": 271, "height": 32, "fontName": "Arial Unicode MS", @@ -58776,25 +58752,17 @@ "visible": true, "vertices": [ { - "x": 10995, - "y": 7740 + "x": 7545, + "y": 6790 }, { - "x": 10900, - "y": 7740 - }, - { - "x": 10900, - "y": 5630 - }, - { - "x": 10865, - "y": 5630 + "x": 7295, + "y": 6790 } ], "label": { - "x": 11005, - "y": 7702, + "x": 7555, + "y": 6752, "width": 195, "height": 32, "fontName": "Arial Unicode MS", @@ -58818,25 +58786,25 @@ "visible": true, "vertices": [ { - "x": 18435, - "y": 7550 + "x": 13415, + "y": 10570 }, { - "x": 17760, - "y": 7550 + "x": 12740, + "y": 10570 }, { - "x": 17760, - "y": 7490 + "x": 12740, + "y": 10510 }, { - "x": 17725, - "y": 7490 + "x": 12705, + "y": 10510 } ], "label": { - "x": 18445, - "y": 7512, + "x": 13425, + "y": 10532, "width": 369, "height": 32, "fontName": "Arial Unicode MS", @@ -58860,17 +58828,17 @@ "visible": true, "vertices": [ { - "x": 9065, - "y": 5600 + "x": 6115, + "y": 8290 }, { - "x": 9085, - "y": 5600 + "x": 6135, + "y": 8290 } ], "label": { - "x": 9055, - "y": 5560, + "x": 6105, + "y": 8250, "width": 268, "height": 32, "fontName": "Sans", @@ -58894,17 +58862,17 @@ "visible": true, "vertices": [ { - "x": 9425, - "y": 5600 + "x": 6475, + "y": 8290 }, { - "x": 9495, - "y": 5600 + "x": 6495, + "y": 8290 } ], "label": { - "x": 9415, - "y": 5560, + "x": 6465, + "y": 8250, "width": 150, "height": 32, "fontName": "Sans", @@ -58928,17 +58896,21 @@ "visible": true, "vertices": [ { - "x": 9975, - "y": 7860 + "x": 8420, + "y": 7925 }, { - "x": 10995, - "y": 7860 + "x": 8420, + "y": 6790 + }, + { + "x": 7885, + "y": 6790 } ], "label": { - "x": 9965, - "y": 7820, + "x": 8422, + "y": 7893, "width": 204, "height": 32, "fontName": "Sans", @@ -58954,44 +58926,6 @@ "isVisible": false } }, - { - "name": "fk_Transactions_UserOrder_1", - "sourceTableName": "Transactions", - "sourceSchemaName": "CMS", - "lineWidth": 1, - "visible": true, - "vertices": [ - { - "x": 11380, - "y": 5501 - }, - { - "x": 11380, - "y": 7670 - }, - { - "x": 11335, - "y": 7670 - } - ], - "label": { - "x": 11388, - "y": 5459, - "width": 202, - "height": 32, - "fontName": "Sans", - "fontSize": 14, - "fontColor": { - "r": 51, - "g": 51, - "b": 51, - "a": 1 - }, - "isFontBold": false, - "isFontItalic": false, - "isVisible": false - } - }, { "name": "fk_UserCarts_User_1", "sourceTableName": "UserCarts", @@ -59000,17 +58934,17 @@ "visible": true, "vertices": [ { - "x": 9560, - "y": 6645 + "x": 7415, + "y": 8460 }, { - "x": 9560, - "y": 6000 + "x": 6895, + "y": 8460 } ], "label": { - "x": 9562, - "y": 6613, + "x": 7425, + "y": 8420, "width": 143, "height": 32, "fontName": "Sans", @@ -59034,17 +58968,17 @@ "visible": true, "vertices": [ { - "x": 9625, - "y": 6770 + "x": 7580, + "y": 8335 }, { - "x": 9635, - "y": 6770 + "x": 7580, + "y": 8313 } ], "label": { - "x": 9621, - "y": 6772, + "x": 7588, + "y": 8345, "width": 171, "height": 32, "fontName": "Sans", @@ -59068,17 +59002,17 @@ "visible": true, "vertices": [ { - "x": 9800, - "y": 7805 + "x": 8245, + "y": 8080 }, { - "x": 9800, - "y": 6973 + "x": 7755, + "y": 8080 } ], "label": { - "x": 9610, - "y": 7773, + "x": 8063, + "y": 8040, "width": 192, "height": 32, "fontName": "Sans", @@ -59102,21 +59036,21 @@ "visible": true, "vertices": [ { - "x": 10020, - "y": 6985 + "x": 7625, + "y": 7710 }, { - "x": 10020, - "y": 6770 + "x": 7580, + "y": 7710 }, { - "x": 9975, - "y": 6770 + "x": 7580, + "y": 7925 } ], "label": { - "x": 10022, - "y": 6953, + "x": 7635, + "y": 7670, "width": 211, "height": 32, "fontName": "Sans", @@ -59140,17 +59074,21 @@ "visible": true, "vertices": [ { - "x": 11060, - "y": 7615 + "x": 7610, + "y": 6535 }, { - "x": 11060, - "y": 5035 + "x": 7610, + "y": 6200 + }, + { + "x": 5875, + "y": 6200 } ], "label": { - "x": 10845, - "y": 7583, + "x": 7395, + "y": 6503, "width": 217, "height": 32, "fontName": "Sans", @@ -59174,21 +59112,17 @@ "visible": true, "vertices": [ { - "x": 11270, - "y": 5175 + "x": 7645, + "y": 6130 }, { - "x": 11270, - "y": 5000 - }, - { - "x": 11235, - "y": 5000 + "x": 5875, + "y": 6130 } ], "label": { - "x": 11278, - "y": 5185, + "x": 7661, + "y": 6132, "width": 231, "height": 32, "fontName": "Sans", @@ -59212,17 +59146,17 @@ "visible": true, "vertices": [ { - "x": 11445, - "y": 5340 + "x": 7820, + "y": 5965 }, { - "x": 11455, - "y": 5340 + "x": 7820, + "y": 5945 } ], "label": { - "x": 11441, - "y": 5342, + "x": 7828, + "y": 5975, "width": 241, "height": 32, "fontName": "Sans", @@ -59246,17 +59180,17 @@ "visible": true, "vertices": [ { - "x": 10020, - "y": 7373 + "x": 7965, + "y": 7710 }, { - "x": 10020, - "y": 7395 + "x": 8045, + "y": 7710 } ], "label": { - "x": 10022, - "y": 7321, + "x": 7955, + "y": 7670, "width": 254, "height": 32, "fontName": "Sans", @@ -59280,21 +59214,21 @@ "visible": true, "vertices": [ { - "x": 3820, - "y": 10695 + "x": 3830, + "y": 6375 }, { - "x": 3820, - "y": 10220 + "x": 3830, + "y": 5900 }, { - "x": 4605, - "y": 10220 + "x": 4775, + "y": 5900 } ], "label": { - "x": 3828, - "y": 10705, + "x": 3838, + "y": 6385, "width": 369, "height": 32, "fontName": "Sans", @@ -59318,21 +59252,21 @@ "visible": true, "vertices": [ { - "x": 3750, - "y": 10695 + "x": 3760, + "y": 6375 }, { - "x": 3750, - "y": 10110 + "x": 3760, + "y": 5790 }, { - "x": 3795, - "y": 10110 + "x": 3805, + "y": 5790 } ], "label": { - "x": 3758, - "y": 10673, + "x": 3768, + "y": 6353, "width": 379, "height": 32, "fontName": "Sans", @@ -59356,17 +59290,17 @@ "visible": true, "vertices": [ { - "x": 3680, - "y": 10695 + "x": 3690, + "y": 6375 }, { - "x": 3680, - "y": 10022 + "x": 3690, + "y": 5702 } ], "label": { - "x": 3688, - "y": 10705, + "x": 3698, + "y": 6385, "width": 344, "height": 32, "fontName": "Sans", @@ -59390,17 +59324,17 @@ "visible": true, "vertices": [ { - "x": 3625, - "y": 10790 + "x": 3635, + "y": 6480 }, { - "x": 3545, - "y": 10790 + "x": 3555, + "y": 6480 } ], "label": { - "x": 3641, - "y": 10760, + "x": 3651, + "y": 6450, "width": 338, "height": 32, "fontName": "Sans", @@ -59424,17 +59358,17 @@ "visible": true, "vertices": [ { - "x": 3830, - "y": 10900 + "x": 3850, + "y": 6580 }, { - "x": 3830, - "y": 10915 + "x": 3850, + "y": 6605 } ], "label": { - "x": 3838, - "y": 10858, + "x": 3858, + "y": 6538, "width": 318, "height": 32, "fontName": "Sans", @@ -59458,17 +59392,17 @@ "visible": true, "vertices": [ { - "x": 4055, - "y": 10770 + "x": 4065, + "y": 6460 }, { - "x": 4065, - "y": 10770 + "x": 4085, + "y": 6460 } ], "label": { - "x": 4051, - "y": 10772, + "x": 4061, + "y": 6462, "width": 328, "height": 32, "fontName": "Sans", @@ -59492,21 +59426,21 @@ "visible": true, "vertices": [ { - "x": 3960, - "y": 10695 + "x": 3970, + "y": 6375 }, { - "x": 3960, - "y": 10590 + "x": 3970, + "y": 6270 }, { "x": 4005, - "y": 10590 + "y": 6270 } ], "label": { - "x": 3968, - "y": 10705, + "x": 3978, + "y": 6385, "width": 385, "height": 32, "fontName": "Sans", @@ -59530,21 +59464,21 @@ "visible": true, "vertices": [ { - "x": 3890, - "y": 10695 + "x": 3900, + "y": 6375 }, { - "x": 3890, - "y": 10400 + "x": 3900, + "y": 6080 }, { - "x": 3935, - "y": 10400 + "x": 3945, + "y": 6080 } ], "label": { - "x": 3898, - "y": 10705, + "x": 3908, + "y": 6385, "width": 395, "height": 32, "fontName": "Sans", @@ -59569,16 +59503,16 @@ "vertices": [ { "x": 4435, - "y": 10590 + "y": 6270 }, { - "x": 4505, - "y": 10590 + "x": 4525, + "y": 6270 } ], "label": { "x": 4431, - "y": 10592, + "y": 6272, "width": 447, "height": 32, "fontName": "Sans", @@ -59602,17 +59536,17 @@ "visible": true, "vertices": [ { - "x": 4365, - "y": 10400 + "x": 4375, + "y": 6080 }, { - "x": 4375, - "y": 10400 + "x": 4395, + "y": 6080 } ], "label": { - "x": 4361, - "y": 10402, + "x": 4371, + "y": 6082, "width": 530, "height": 32, "fontName": "Sans", @@ -59636,29 +59570,21 @@ "visible": true, "vertices": [ { - "x": 5200, - "y": 12415 + "x": 5250, + "y": 14825 }, { - "x": 5200, - "y": 11110 + "x": 5250, + "y": 13590 }, { - "x": 5230, - "y": 11110 - }, - { - "x": 5230, - "y": 10820 - }, - { - "x": 5195, - "y": 10820 + "x": 5205, + "y": 13590 } ], "label": { - "x": 5208, - "y": 12425, + "x": 5258, + "y": 14835, "width": 521, "height": 32, "fontName": "Sans", @@ -59682,17 +59608,17 @@ "visible": true, "vertices": [ { - "x": 5130, - "y": 12415 + "x": 5150, + "y": 14825 }, { - "x": 5130, - "y": 11071 + "x": 5150, + "y": 14791 } ], "label": { - "x": 5138, - "y": 12393, + "x": 5158, + "y": 14803, "width": 531, "height": 32, "fontName": "Sans", @@ -59716,17 +59642,17 @@ "visible": true, "vertices": [ { - "x": 5065, - "y": 12510 + "x": 5085, + "y": 14920 }, { - "x": 5045, - "y": 12510 + "x": 5065, + "y": 14920 } ], "label": { - "x": 5081, - "y": 12512, + "x": 5101, + "y": 14922, "width": 496, "height": 32, "fontName": "Sans", @@ -59750,17 +59676,17 @@ "visible": true, "vertices": [ { - "x": 5280, - "y": 12620 + "x": 5300, + "y": 15030 }, { - "x": 5280, - "y": 12635 + "x": 5300, + "y": 15045 } ], "label": { - "x": 5288, - "y": 12578, + "x": 5308, + "y": 14988, "width": 490, "height": 32, "fontName": "Sans", @@ -59784,17 +59710,17 @@ "visible": true, "vertices": [ { - "x": 5495, - "y": 12510 + "x": 5515, + "y": 14920 }, { - "x": 5515, - "y": 12510 + "x": 5535, + "y": 14920 } ], "label": { - "x": 5491, - "y": 12480, + "x": 5511, + "y": 14890, "width": 470, "height": 32, "fontName": "Sans", @@ -59818,25 +59744,25 @@ "visible": true, "vertices": [ { - "x": 5440, - "y": 12415 + "x": 5450, + "y": 14825 }, { - "x": 5440, - "y": 12370 + "x": 5450, + "y": 14780 }, { - "x": 5440, - "y": 12370 + "x": 5490, + "y": 14780 }, { - "x": 5440, - "y": 12329 + "x": 5490, + "y": 14739 } ], "label": { - "x": 5448, - "y": 12425, + "x": 5458, + "y": 14835, "width": 480, "height": 32, "fontName": "Sans", @@ -59860,25 +59786,25 @@ "visible": true, "vertices": [ { - "x": 5340, - "y": 12415 + "x": 5390, + "y": 14825 }, { - "x": 5340, - "y": 12070 + "x": 5390, + "y": 14480 }, { - "x": 5370, - "y": 12070 + "x": 5420, + "y": 14480 }, { - "x": 5370, - "y": 12032 + "x": 5420, + "y": 14442 } ], "label": { - "x": 5348, - "y": 12425, + "x": 5398, + "y": 14835, "width": 537, "height": 32, "fontName": "Sans", @@ -59902,25 +59828,25 @@ "visible": true, "vertices": [ { - "x": 5270, - "y": 12415 + "x": 5320, + "y": 14825 }, { - "x": 5270, - "y": 11580 + "x": 5320, + "y": 13990 }, { - "x": 5300, - "y": 11580 + "x": 5350, + "y": 13990 }, { - "x": 5300, - "y": 11543 + "x": 5350, + "y": 13943 } ], "label": { - "x": 5278, - "y": 12425, + "x": 5328, + "y": 14835, "width": 547, "height": 32, "fontName": "Sans", @@ -59944,17 +59870,17 @@ "visible": true, "vertices": [ { - "x": 5520, - "y": 11865 + "x": 5570, + "y": 14275 }, { - "x": 5520, - "y": 11849 + "x": 5570, + "y": 14249 } ], "label": { - "x": 5528, - "y": 11875, + "x": 5578, + "y": 14285, "width": 599, "height": 32, "fontName": "Sans", @@ -59978,17 +59904,17 @@ "visible": true, "vertices": [ { - "x": 5450, - "y": 11395 + "x": 5500, + "y": 13795 }, { - "x": 5450, - "y": 11379 + "x": 5500, + "y": 13779 } ], "label": { - "x": 5458, - "y": 11405, + "x": 5508, + "y": 13805, "width": 682, "height": 32, "fontName": "Sans", @@ -60012,29 +59938,29 @@ "visible": true, "vertices": [ { - "x": 22835, - "y": 10810 + "x": 18515, + "y": 13450 }, { - "x": 22670, - "y": 10810 + "x": 17840, + "y": 13450 }, { - "x": 22670, - "y": 10620 + "x": 17840, + "y": 13380 }, { - "x": 21850, - "y": 10620 + "x": 17090, + "y": 13380 }, { - "x": 21850, - "y": 10665 + "x": 17090, + "y": 13425 } ], "label": { - "x": 22851, - "y": 10812, + "x": 18531, + "y": 13452, "width": 355, "height": 32, "fontName": "Sans", @@ -60058,25 +59984,17 @@ "visible": true, "vertices": [ { - "x": 22835, - "y": 10840 + "x": 18515, + "y": 13490 }, { - "x": 22610, - "y": 10840 - }, - { - "x": 22610, - "y": 10740 - }, - { - "x": 22575, - "y": 10740 + "x": 17805, + "y": 13490 } ], "label": { - "x": 22851, - "y": 10810, + "x": 18531, + "y": 13460, "width": 365, "height": 32, "fontName": "Sans", @@ -60100,17 +60018,17 @@ "visible": true, "vertices": [ { - "x": 22835, - "y": 10880 + "x": 18730, + "y": 13520 }, { - "x": 22575, - "y": 10880 + "x": 18730, + "y": 13535 } ], "label": { - "x": 22851, - "y": 10882, + "x": 18738, + "y": 13510, "width": 330, "height": 32, "fontName": "Sans", @@ -60134,17 +60052,17 @@ "visible": true, "vertices": [ { - "x": 23050, - "y": 10920 + "x": 18945, + "y": 13420 }, { - "x": 23050, - "y": 10935 + "x": 19025, + "y": 13420 } ], "label": { - "x": 23058, - "y": 10878, + "x": 18941, + "y": 13390, "width": 324, "height": 32, "fontName": "Sans", @@ -60168,17 +60086,17 @@ "visible": true, "vertices": [ { - "x": 23265, - "y": 10810 + "x": 18730, + "y": 13315 }, { - "x": 23335, - "y": 10810 + "x": 18730, + "y": 13291 } ], "label": { - "x": 23261, - "y": 10780, + "x": 18738, + "y": 13293, "width": 304, "height": 32, "fontName": "Sans", @@ -60202,17 +60120,25 @@ "visible": true, "vertices": [ { - "x": 23050, - "y": 10715 + "x": 18515, + "y": 13350 }, { - "x": 23050, - "y": 10691 + "x": 18470, + "y": 13350 + }, + { + "x": 18470, + "y": 13280 + }, + { + "x": 18435, + "y": 13280 } ], "label": { - "x": 23058, - "y": 10725, + "x": 18531, + "y": 13352, "width": 314, "height": 32, "fontName": "Sans", @@ -60236,25 +60162,25 @@ "visible": true, "vertices": [ { - "x": 22835, - "y": 10750 + "x": 18515, + "y": 13380 }, { - "x": 22790, - "y": 10750 + "x": 17960, + "y": 13380 }, { - "x": 22790, - "y": 10180 + "x": 17960, + "y": 12950 }, { - "x": 22755, - "y": 10180 + "x": 17865, + "y": 12950 } ], "label": { - "x": 22851, - "y": 10752, + "x": 18531, + "y": 13382, "width": 371, "height": 32, "fontName": "Sans", @@ -60278,25 +60204,25 @@ "visible": true, "vertices": [ { - "x": 22835, - "y": 10780 + "x": 18515, + "y": 13410 }, { - "x": 22730, - "y": 10780 + "x": 17900, + "y": 13410 }, { - "x": 22730, - "y": 10520 + "x": 17900, + "y": 13280 }, { - "x": 22695, - "y": 10520 + "x": 17865, + "y": 13280 } ], "label": { - "x": 22851, - "y": 10782, + "x": 18531, + "y": 13412, "width": 381, "height": 32, "fontName": "Sans", @@ -60320,17 +60246,17 @@ "visible": true, "vertices": [ { - "x": 22325, - "y": 10140 + "x": 17435, + "y": 12900 }, { - "x": 22305, - "y": 10140 + "x": 17415, + "y": 12900 } ], "label": { - "x": 22341, - "y": 10142, + "x": 17451, + "y": 12902, "width": 433, "height": 32, "fontName": "Sans", @@ -60354,17 +60280,17 @@ "visible": true, "vertices": [ { - "x": 22265, - "y": 10510 + "x": 17435, + "y": 13270 }, { - "x": 22245, - "y": 10510 + "x": 17415, + "y": 13270 } ], "label": { - "x": 22281, - "y": 10512, + "x": 17451, + "y": 13272, "width": 516, "height": 32, "fontName": "Sans", @@ -60388,17 +60314,25 @@ "visible": true, "vertices": [ { - "x": 21780, - "y": 1710 + "x": 2810, + "y": 2310 }, { - "x": 21780, - "y": 2515 + "x": 2810, + "y": 2350 + }, + { + "x": 3180, + "y": 2350 + }, + { + "x": 3180, + "y": 2425 } ], "label": { - "x": 21788, - "y": 1700, + "x": 2818, + "y": 2300, "width": 435, "height": 32, "fontName": "Sans", @@ -60422,17 +60356,21 @@ "visible": true, "vertices": [ { - "x": 21880, - "y": 1710 + "x": 2875, + "y": 2230 }, { - "x": 21880, - "y": 1735 + "x": 3440, + "y": 2230 + }, + { + "x": 3440, + "y": 2275 } ], "label": { - "x": 21888, - "y": 1668, + "x": 2871, + "y": 2200, "width": 445, "height": 32, "fontName": "Sans", @@ -60456,17 +60394,17 @@ "visible": true, "vertices": [ { - "x": 21935, - "y": 1610 + "x": 2875, + "y": 2160 }, { - "x": 21955, - "y": 1610 + "x": 3485, + "y": 2160 } ], "label": { - "x": 21931, - "y": 1612, + "x": 2871, + "y": 2162, "width": 410, "height": 32, "fontName": "Sans", @@ -60490,17 +60428,17 @@ "visible": true, "vertices": [ { - "x": 21730, - "y": 1505 + "x": 2660, + "y": 2105 }, { - "x": 21730, - "y": 1491 + "x": 2660, + "y": 2081 } ], "label": { - "x": 21738, - "y": 1483, + "x": 2668, + "y": 2083, "width": 404, "height": 32, "fontName": "Sans", @@ -60524,17 +60462,17 @@ "visible": true, "vertices": [ { - "x": 21505, - "y": 1580 + "x": 2445, + "y": 2200 }, { - "x": 20935, - "y": 1580 + "x": 2425, + "y": 2200 } ], "label": { - "x": 21521, - "y": 1550, + "x": 2461, + "y": 2170, "width": 384, "height": 32, "fontName": "Sans", @@ -60558,21 +60496,17 @@ "visible": true, "vertices": [ { - "x": 21505, - "y": 1650 + "x": 2500, + "y": 2310 }, { - "x": 20970, - "y": 1650 - }, - { - "x": 20970, - "y": 1685 + "x": 2500, + "y": 3175 } ], "label": { - "x": 21521, - "y": 1652, + "x": 2508, + "y": 2300, "width": 394, "height": 32, "fontName": "Sans", @@ -60596,17 +60530,25 @@ "visible": true, "vertices": [ { - "x": 21570, - "y": 1710 + "x": 2570, + "y": 2310 }, { - "x": 21570, - "y": 1785 + "x": 2570, + "y": 2760 + }, + { + "x": 2600, + "y": 2760 + }, + { + "x": 2600, + "y": 2805 } ], "label": { - "x": 21578, - "y": 1700, + "x": 2578, + "y": 2300, "width": 451, "height": 32, "fontName": "Sans", @@ -60630,17 +60572,17 @@ "visible": true, "vertices": [ { - "x": 21680, - "y": 1710 + "x": 2740, + "y": 2310 }, { - "x": 21680, - "y": 2155 + "x": 2740, + "y": 2385 } ], "label": { - "x": 21688, - "y": 1700, + "x": 2748, + "y": 2300, "width": 461, "height": 32, "fontName": "Sans", @@ -60664,17 +60606,17 @@ "visible": true, "vertices": [ { - "x": 21420, - "y": 1952 + "x": 2760, + "y": 2972 }, { - "x": 21420, - "y": 1975 + "x": 2760, + "y": 2995 } ], "label": { - "x": 21428, - "y": 1942, + "x": 2768, + "y": 2962, "width": 513, "height": 32, "fontName": "Sans", @@ -60698,17 +60640,17 @@ "visible": true, "vertices": [ { - "x": 21520, - "y": 2303 + "x": 2830, + "y": 2533 }, { - "x": 21520, - "y": 2325 + "x": 2830, + "y": 2555 } ], "label": { - "x": 21528, - "y": 2293, + "x": 2838, + "y": 2523, "width": 596, "height": 32, "fontName": "Sans", @@ -60733,20 +60675,20 @@ "vertices": [ { "x": 2600, - "y": 13605 + "y": 16015 }, { "x": 2600, - "y": 12550 + "y": 14960 }, { - "x": 3015, - "y": 12550 + "x": 3025, + "y": 14960 } ], "label": { "x": 2608, - "y": 13615, + "y": 16025, "width": 397, "height": 32, "fontName": "Sans", @@ -60771,20 +60713,20 @@ "vertices": [ { "x": 2530, - "y": 13605 + "y": 16015 }, { "x": 2530, - "y": 12440 + "y": 14850 }, { - "x": 2565, - "y": 12440 + "x": 2575, + "y": 14850 } ], "label": { "x": 2538, - "y": 13583, + "y": 15993, "width": 407, "height": 32, "fontName": "Sans", @@ -60809,16 +60751,16 @@ "vertices": [ { "x": 2460, - "y": 13605 + "y": 16015 }, { "x": 2460, - "y": 12357 + "y": 14767 } ], "label": { "x": 2468, - "y": 13615, + "y": 16025, "width": 372, "height": 32, "fontName": "Sans", @@ -60842,17 +60784,17 @@ "visible": true, "vertices": [ { - "x": 2395, - "y": 13710 + "x": 2405, + "y": 16110 }, { - "x": 2315, - "y": 13710 + "x": 2325, + "y": 16110 } ], "label": { - "x": 2411, - "y": 13680, + "x": 2421, + "y": 16080, "width": 366, "height": 32, "fontName": "Sans", @@ -60876,17 +60818,17 @@ "visible": true, "vertices": [ { - "x": 2610, - "y": 13810 + "x": 2620, + "y": 16220 }, { - "x": 2610, - "y": 13825 + "x": 2620, + "y": 16235 } ], "label": { - "x": 2618, - "y": 13768, + "x": 2628, + "y": 16178, "width": 346, "height": 32, "fontName": "Sans", @@ -60910,17 +60852,17 @@ "visible": true, "vertices": [ { - "x": 2825, - "y": 13770 + "x": 2835, + "y": 16180 }, { - "x": 2845, - "y": 13770 + "x": 2855, + "y": 16180 } ], "label": { - "x": 2821, - "y": 13772, + "x": 2831, + "y": 16182, "width": 356, "height": 32, "fontName": "Sans", @@ -60945,20 +60887,20 @@ "vertices": [ { "x": 2740, - "y": 13605 + "y": 16015 }, { "x": 2740, - "y": 13490 + "y": 15900 }, { "x": 2775, - "y": 13490 + "y": 15900 } ], "label": { "x": 2748, - "y": 13615, + "y": 16025, "width": 413, "height": 32, "fontName": "Sans", @@ -60983,20 +60925,20 @@ "vertices": [ { "x": 2670, - "y": 13605 + "y": 16015 }, { "x": 2670, - "y": 13210 + "y": 15620 }, { "x": 2705, - "y": 13210 + "y": 15620 } ], "label": { "x": 2678, - "y": 13615, + "y": 16025, "width": 423, "height": 32, "fontName": "Sans", @@ -61021,16 +60963,16 @@ "vertices": [ { "x": 3205, - "y": 13490 + "y": 15900 }, { "x": 3285, - "y": 13490 + "y": 15900 } ], "label": { "x": 3201, - "y": 13492, + "y": 15902, "width": 475, "height": 32, "fontName": "Sans", @@ -61055,16 +60997,16 @@ "vertices": [ { "x": 3135, - "y": 13210 + "y": 15620 }, { "x": 3155, - "y": 13210 + "y": 15620 } ], "label": { "x": 3131, - "y": 13212, + "y": 15622, "width": 558, "height": 32, "fontName": "Sans", @@ -61088,21 +61030,21 @@ "visible": true, "vertices": [ { - "x": 3760, - "y": 14015 + "x": 3770, + "y": 16405 }, { - "x": 3760, - "y": 12880 + "x": 3770, + "y": 15290 }, { - "x": 3445, - "y": 12880 + "x": 3455, + "y": 15290 } ], "label": { - "x": 3768, - "y": 14025, + "x": 3778, + "y": 16415, "width": 341, "height": 32, "fontName": "Sans", @@ -61126,17 +61068,17 @@ "visible": true, "vertices": [ { - "x": 3660, - "y": 14015 + "x": 3670, + "y": 16405 }, { - "x": 3660, - "y": 13911 + "x": 3670, + "y": 16311 } ], "label": { - "x": 3668, - "y": 13993, + "x": 3678, + "y": 16383, "width": 351, "height": 32, "fontName": "Sans", @@ -61160,17 +61102,17 @@ "visible": true, "vertices": [ { - "x": 3595, - "y": 14110 + "x": 3615, + "y": 16510 }, { - "x": 3575, - "y": 14110 + "x": 3585, + "y": 16510 } ], "label": { - "x": 3611, - "y": 14112, + "x": 3631, + "y": 16512, "width": 316, "height": 32, "fontName": "Sans", @@ -61194,17 +61136,17 @@ "visible": true, "vertices": [ { - "x": 3810, - "y": 14220 + "x": 3830, + "y": 16610 }, { - "x": 3810, - "y": 14485 + "x": 3830, + "y": 16635 } ], "label": { - "x": 3818, - "y": 14178, + "x": 3838, + "y": 16568, "width": 310, "height": 32, "fontName": "Sans", @@ -61228,21 +61170,17 @@ "visible": true, "vertices": [ { - "x": 3880, - "y": 14220 + "x": 4045, + "y": 16510 }, { - "x": 3880, - "y": 14400 - }, - { - "x": 3915, - "y": 14400 + "x": 4065, + "y": 16510 } ], "label": { - "x": 3888, - "y": 14178, + "x": 4041, + "y": 16480, "width": 290, "height": 32, "fontName": "Sans", @@ -61266,17 +61204,25 @@ "visible": true, "vertices": [ { - "x": 4025, - "y": 14130 + "x": 3980, + "y": 16405 }, { - "x": 4045, - "y": 14130 + "x": 3980, + "y": 16370 + }, + { + "x": 4010, + "y": 16370 + }, + { + "x": 4010, + "y": 16332 } ], "label": { - "x": 4021, - "y": 14132, + "x": 3988, + "y": 16415, "width": 300, "height": 32, "fontName": "Sans", @@ -61300,17 +61246,25 @@ "visible": true, "vertices": [ { - "x": 3960, - "y": 14015 + "x": 3910, + "y": 16405 }, { - "x": 3960, - "y": 13932 + "x": 3910, + "y": 15930 + }, + { + "x": 4320, + "y": 15930 + }, + { + "x": 4320, + "y": 15832 } ], "label": { - "x": 3968, - "y": 14025, + "x": 3918, + "y": 16415, "width": 357, "height": 32, "fontName": "Sans", @@ -61334,17 +61288,25 @@ "visible": true, "vertices": [ { - "x": 3860, - "y": 14015 + "x": 3840, + "y": 16405 }, { - "x": 3860, - "y": 13373 + "x": 3840, + "y": 15870 + }, + { + "x": 3870, + "y": 15870 + }, + { + "x": 3870, + "y": 15833 } ], "label": { - "x": 3868, - "y": 14025, + "x": 3848, + "y": 16415, "width": 367, "height": 32, "fontName": "Sans", @@ -61368,17 +61330,17 @@ "visible": true, "vertices": [ { - "x": 4120, - "y": 13765 + "x": 4480, + "y": 15665 }, { - "x": 4120, - "y": 13752 + "x": 4480, + "y": 15642 } ], "label": { - "x": 4128, - "y": 13775, + "x": 4488, + "y": 15675, "width": 419, "height": 32, "fontName": "Sans", @@ -61402,17 +61364,17 @@ "visible": true, "vertices": [ { - "x": 4020, - "y": 13225 + "x": 4030, + "y": 15685 }, { - "x": 4020, - "y": 13202 + "x": 4030, + "y": 15662 } ], "label": { - "x": 4028, - "y": 13235, + "x": 4038, + "y": 15695, "width": 502, "height": 32, "fontName": "Sans", @@ -61436,29 +61398,29 @@ "visible": true, "vertices": [ { - "x": 25365, - "y": 12750 + "x": 21065, + "y": 15160 }, { - "x": 24700, - "y": 12750 + "x": 20390, + "y": 15160 }, { - "x": 24700, - "y": 12680 + "x": 20390, + "y": 15090 }, { - "x": 23960, - "y": 12680 + "x": 19640, + "y": 15090 }, { - "x": 23960, - "y": 12715 + "x": 19640, + "y": 15125 } ], "label": { - "x": 25381, - "y": 12752, + "x": 21081, + "y": 15162, "width": 427, "height": 32, "fontName": "Sans", @@ -61482,17 +61444,17 @@ "visible": true, "vertices": [ { - "x": 25365, - "y": 12780 + "x": 21065, + "y": 15190 }, { - "x": 24665, - "y": 12780 + "x": 20355, + "y": 15190 } ], "label": { - "x": 25381, - "y": 12750, + "x": 21081, + "y": 15160, "width": 437, "height": 32, "fontName": "Sans", @@ -61516,17 +61478,17 @@ "visible": true, "vertices": [ { - "x": 25580, - "y": 12820 + "x": 21280, + "y": 15220 }, { - "x": 25580, - "y": 12835 + "x": 21280, + "y": 15245 } ], "label": { - "x": 25588, - "y": 12810, + "x": 21288, + "y": 15210, "width": 402, "height": 32, "fontName": "Sans", @@ -61550,17 +61512,17 @@ "visible": true, "vertices": [ { - "x": 25795, - "y": 12710 + "x": 21495, + "y": 15120 }, { - "x": 25875, - "y": 12710 + "x": 21575, + "y": 15120 } ], "label": { - "x": 25791, - "y": 12680, + "x": 21491, + "y": 15090, "width": 396, "height": 32, "fontName": "Sans", @@ -61584,17 +61546,17 @@ "visible": true, "vertices": [ { - "x": 25590, - "y": 12615 + "x": 21280, + "y": 15015 }, { - "x": 25590, - "y": 12591 + "x": 21280, + "y": 15001 } ], "label": { - "x": 25598, - "y": 12593, + "x": 21288, + "y": 14993, "width": 376, "height": 32, "fontName": "Sans", @@ -61618,25 +61580,25 @@ "visible": true, "vertices": [ { - "x": 25365, - "y": 12650 + "x": 21065, + "y": 15060 }, { - "x": 25330, - "y": 12650 + "x": 21020, + "y": 15060 }, { - "x": 25330, - "y": 12580 + "x": 21020, + "y": 14980 }, { - "x": 25295, - "y": 12580 + "x": 20985, + "y": 14980 } ], "label": { - "x": 25381, - "y": 12652, + "x": 21081, + "y": 15062, "width": 386, "height": 32, "fontName": "Sans", @@ -61660,25 +61622,25 @@ "visible": true, "vertices": [ { - "x": 25365, - "y": 12680 + "x": 21065, + "y": 15080 }, { - "x": 24820, - "y": 12680 + "x": 20510, + "y": 15080 }, { - "x": 24820, - "y": 12410 + "x": 20510, + "y": 14820 }, { - "x": 24725, - "y": 12410 + "x": 20415, + "y": 14820 } ], "label": { - "x": 25381, - "y": 12682, + "x": 21081, + "y": 15082, "width": 443, "height": 32, "fontName": "Sans", @@ -61702,25 +61664,25 @@ "visible": true, "vertices": [ { - "x": 25365, - "y": 12710 + "x": 21065, + "y": 15120 }, { - "x": 24760, - "y": 12710 + "x": 20450, + "y": 15120 }, { - "x": 24760, - "y": 12580 + "x": 20450, + "y": 14990 }, { - "x": 24725, - "y": 12580 + "x": 20415, + "y": 14990 } ], "label": { - "x": 25381, - "y": 12712, + "x": 21081, + "y": 15122, "width": 453, "height": 32, "fontName": "Sans", @@ -61744,17 +61706,17 @@ "visible": true, "vertices": [ { - "x": 24295, - "y": 12370 + "x": 19985, + "y": 14780 }, { - "x": 24275, - "y": 12370 + "x": 19965, + "y": 14780 } ], "label": { - "x": 24311, - "y": 12372, + "x": 20001, + "y": 14782, "width": 505, "height": 32, "fontName": "Sans", @@ -61778,17 +61740,17 @@ "visible": true, "vertices": [ { - "x": 24295, - "y": 12560 + "x": 19985, + "y": 14970 }, { - "x": 24275, - "y": 12560 + "x": 19965, + "y": 14970 } ], "label": { - "x": 24311, - "y": 12562, + "x": 20001, + "y": 14972, "width": 588, "height": 32, "fontName": "Sans", @@ -61812,21 +61774,21 @@ "visible": true, "vertices": [ { - "x": 16450, - "y": 8375 + "x": 11420, + "y": 11285 }, { - "x": 16450, - "y": 8160 + "x": 11420, + "y": 11170 }, { - "x": 16495, - "y": 8160 + "x": 11455, + "y": 11170 } ], "label": { - "x": 16452, - "y": 8343, + "x": 11422, + "y": 11253, "width": 306, "height": 32, "fontName": "Sans", @@ -61850,21 +61812,21 @@ "visible": true, "vertices": [ { - "x": 16380, - "y": 8375 + "x": 11350, + "y": 11285 }, { - "x": 16380, - "y": 7990 + "x": 11350, + "y": 11010 }, { - "x": 16425, - "y": 7990 + "x": 11385, + "y": 11010 } ], "label": { - "x": 16388, - "y": 8385, + "x": 11358, + "y": 11295, "width": 316, "height": 32, "fontName": "Sans", @@ -61888,21 +61850,21 @@ "visible": true, "vertices": [ { - "x": 16310, - "y": 8375 + "x": 11280, + "y": 11285 }, { - "x": 16310, - "y": 7810 + "x": 11280, + "y": 10820 }, { - "x": 16355, - "y": 7810 + "x": 11315, + "y": 10820 } ], "label": { - "x": 15995, - "y": 8343, + "x": 10965, + "y": 11253, "width": 317, "height": 32, "fontName": "Sans", @@ -61926,17 +61888,17 @@ "visible": true, "vertices": [ { - "x": 9485, - "y": 5890 + "x": 6700, + "y": 8535 }, { - "x": 9495, - "y": 5890 + "x": 6700, + "y": 8520 } ], "label": { - "x": 9310, - "y": 5850, + "x": 6537, + "y": 8503, "width": 165, "height": 32, "fontName": "Sans", @@ -61960,17 +61922,17 @@ "visible": true, "vertices": [ { - "x": 9145, - "y": 5890 + "x": 6700, + "y": 8823 }, { - "x": 9125, - "y": 5890 + "x": 6700, + "y": 8845 } ], "label": { - "x": 9155, - "y": 5850, + "x": 6702, + "y": 8771, "width": 191, "height": 32, "fontName": "Sans", @@ -61994,21 +61956,17 @@ "visible": true, "vertices": [ { - "x": 6815, - "y": 6690 + "x": 7570, + "y": 10480 }, { - "x": 6470, - "y": 6690 - }, - { - "x": 6470, - "y": 5950 + "x": 7570, + "y": 10495 } ], "label": { - "x": 6831, - "y": 6692, + "x": 7578, + "y": 10470, "width": 337, "height": 32, "fontName": "Sans", @@ -62032,21 +61990,17 @@ "visible": true, "vertices": [ { - "x": 7040, - "y": 6545 + "x": 7420, + "y": 10275 }, { - "x": 7040, - "y": 6110 - }, - { - "x": 7085, - "y": 6110 + "x": 7420, + "y": 10241 } ], "label": { - "x": 7048, - "y": 6523, + "x": 7428, + "y": 10253, "width": 347, "height": 32, "fontName": "Sans", @@ -62070,17 +62024,17 @@ "visible": true, "vertices": [ { - "x": 7030, - "y": 6750 + "x": 7795, + "y": 10370 }, { - "x": 7030, - "y": 6765 + "x": 8305, + "y": 10370 } ], "label": { - "x": 7038, - "y": 6740, + "x": 7791, + "y": 10372, "width": 312, "height": 32, "fontName": "Sans", @@ -62104,17 +62058,17 @@ "visible": true, "vertices": [ { - "x": 6970, - "y": 6545 + "x": 7365, + "y": 10330 }, { - "x": 6970, - "y": 6021 + "x": 7285, + "y": 10330 } ], "label": { - "x": 6978, - "y": 6523, + "x": 7381, + "y": 10300, "width": 306, "height": 32, "fontName": "Sans", @@ -62138,21 +62092,25 @@ "visible": true, "vertices": [ { - "x": 6815, - "y": 6620 + "x": 7365, + "y": 10410 }, { - "x": 6720, - "y": 6620 + "x": 7320, + "y": 10410 }, { - "x": 6720, - "y": 6521 + "x": 7320, + "y": 10470 + }, + { + "x": 7285, + "y": 10470 } ], "label": { - "x": 6831, - "y": 6590, + "x": 7381, + "y": 10380, "width": 286, "height": 32, "fontName": "Sans", @@ -62176,21 +62134,17 @@ "visible": true, "vertices": [ { - "x": 7120, - "y": 6545 + "x": 7520, + "y": 10275 }, { - "x": 7120, - "y": 6300 - }, - { - "x": 7155, - "y": 6300 + "x": 7520, + "y": 10080 } ], "label": { - "x": 7128, - "y": 6555, + "x": 7528, + "y": 10285, "width": 296, "height": 32, "fontName": "Sans", @@ -62214,21 +62168,25 @@ "visible": true, "vertices": [ { - "x": 7190, - "y": 6545 + "x": 7660, + "y": 10275 }, { - "x": 7190, - "y": 6510 + "x": 7660, + "y": 10230 }, { - "x": 7265, - "y": 6510 + "x": 7670, + "y": 10230 + }, + { + "x": 7670, + "y": 10022 } ], "label": { - "x": 7198, - "y": 6555, + "x": 7668, + "y": 10285, "width": 353, "height": 32, "fontName": "Sans", @@ -62252,17 +62210,25 @@ "visible": true, "vertices": [ { - "x": 7245, - "y": 6680 + "x": 7730, + "y": 10275 }, { - "x": 7325, - "y": 6680 + "x": 7730, + "y": 10230 + }, + { + "x": 7810, + "y": 10230 + }, + { + "x": 7810, + "y": 10193 } ], "label": { - "x": 7241, - "y": 6682, + "x": 7738, + "y": 10285, "width": 363, "height": 32, "fontName": "Sans", @@ -62286,17 +62252,17 @@ "visible": true, "vertices": [ { - "x": 7695, - "y": 6490 + "x": 7670, + "y": 9855 }, { - "x": 7775, - "y": 6490 + "x": 7670, + "y": 9840 } ], "label": { - "x": 7691, - "y": 6492, + "x": 7678, + "y": 9865, "width": 415, "height": 32, "fontName": "Sans", @@ -62320,17 +62286,17 @@ "visible": true, "vertices": [ { - "x": 7755, - "y": 6680 + "x": 8120, + "y": 10045 }, { - "x": 7775, - "y": 6680 + "x": 8120, + "y": 10030 } ], "label": { - "x": 7751, - "y": 6682, + "x": 8128, + "y": 10055, "width": 498, "height": 32, "fontName": "Sans", @@ -62354,17 +62320,17 @@ "visible": true, "vertices": [ { - "x": 21280, - "y": 380 + "x": 19240, + "y": 1060 }, { - "x": 21280, - "y": 1255 + "x": 19240, + "y": 1725 } ], "label": { - "x": 21288, - "y": 370, + "x": 19248, + "y": 1050, "width": 399, "height": 32, "fontName": "Sans", @@ -62388,17 +62354,17 @@ "visible": true, "vertices": [ { - "x": 21380, - "y": 380 + "x": 19340, + "y": 1060 }, { - "x": 21380, - "y": 395 + "x": 19340, + "y": 1085 } ], "label": { - "x": 21388, - "y": 338, + "x": 19348, + "y": 1018, "width": 409, "height": 32, "fontName": "Sans", @@ -62422,17 +62388,17 @@ "visible": true, "vertices": [ { - "x": 21435, - "y": 270 + "x": 19395, + "y": 960 }, { - "x": 21455, - "y": 270 + "x": 19415, + "y": 960 } ], "label": { - "x": 21431, - "y": 272, + "x": 19391, + "y": 962, "width": 374, "height": 32, "fontName": "Sans", @@ -62456,17 +62422,17 @@ "visible": true, "vertices": [ { - "x": 21220, - "y": 175 + "x": 19190, + "y": 855 }, { - "x": 21220, - "y": 151 + "x": 19190, + "y": 841 } ], "label": { - "x": 21228, - "y": 153, + "x": 19198, + "y": 833, "width": 368, "height": 32, "fontName": "Sans", @@ -62490,17 +62456,17 @@ "visible": true, "vertices": [ { - "x": 21005, - "y": 240 + "x": 18965, + "y": 930 }, { - "x": 20435, - "y": 240 + "x": 18345, + "y": 930 } ], "label": { - "x": 21021, - "y": 210, + "x": 18981, + "y": 900, "width": 348, "height": 32, "fontName": "Sans", @@ -62524,21 +62490,21 @@ "visible": true, "vertices": [ { - "x": 21005, - "y": 310 + "x": 18965, + "y": 1000 }, { - "x": 20470, - "y": 310 + "x": 18390, + "y": 1000 }, { - "x": 20470, - "y": 355 + "x": 18390, + "y": 1045 } ], "label": { - "x": 21021, - "y": 312, + "x": 18981, + "y": 1002, "width": 358, "height": 32, "fontName": "Sans", @@ -62562,17 +62528,25 @@ "visible": true, "vertices": [ { - "x": 21070, - "y": 380 + "x": 19030, + "y": 1060 }, { - "x": 21070, - "y": 455 + "x": 19030, + "y": 1100 + }, + { + "x": 18990, + "y": 1100 + }, + { + "x": 18990, + "y": 1145 } ], "label": { - "x": 21078, - "y": 370, + "x": 19038, + "y": 1050, "width": 415, "height": 32, "fontName": "Sans", @@ -62596,17 +62570,17 @@ "visible": true, "vertices": [ { - "x": 21180, - "y": 380 + "x": 19100, + "y": 1060 }, { - "x": 21180, - "y": 865 + "x": 19100, + "y": 1325 } ], "label": { - "x": 21188, - "y": 370, + "x": 19108, + "y": 1050, "width": 425, "height": 32, "fontName": "Sans", @@ -62630,17 +62604,17 @@ "visible": true, "vertices": [ { - "x": 20920, - "y": 622 + "x": 18680, + "y": 1312 }, { - "x": 20920, - "y": 635 + "x": 18680, + "y": 1395 } ], "label": { - "x": 20928, - "y": 612, + "x": 18688, + "y": 1302, "width": 477, "height": 32, "fontName": "Sans", @@ -62664,17 +62638,17 @@ "visible": true, "vertices": [ { - "x": 21020, - "y": 1013 + "x": 18980, + "y": 1473 }, { - "x": 21020, - "y": 1025 + "x": 18980, + "y": 1495 } ], "label": { - "x": 21028, - "y": 1003, + "x": 18988, + "y": 1463, "width": 560, "height": 32, "fontName": "Sans", @@ -62698,17 +62672,21 @@ "visible": true, "vertices": [ { - "x": 8785, - "y": 5890 + "x": 6865, + "y": 9070 }, { - "x": 8763, - "y": 5890 + "x": 6910, + "y": 9070 + }, + { + "x": 6910, + "y": 9215 } ], "label": { - "x": 8603, - "y": 5850, + "x": 6663, + "y": 9030, "width": 192, "height": 32, "fontName": "Sans", @@ -62732,21 +62710,21 @@ "visible": true, "vertices": [ { - "x": 7245, - "y": 6870 + "x": 8530, + "y": 10275 }, { - "x": 8610, - "y": 6870 + "x": 8530, + "y": 9300 }, { - "x": 8610, - "y": 5969 + "x": 7063, + "y": 9300 } ], "label": { - "x": 7235, - "y": 6830, + "x": 8532, + "y": 10243, "width": 296, "height": 32, "fontName": "Sans", @@ -62770,17 +62748,21 @@ "visible": true, "vertices": [ { - "x": 6835, - "y": 5850 + "x": 7365, + "y": 10600 }, { - "x": 8455, - "y": 5850 + "x": 6810, + "y": 10600 + }, + { + "x": 6810, + "y": 9369 } ], "label": { - "x": 6504, - "y": 5810, + "x": 7054, + "y": 10560, "width": 321, "height": 32, "fontName": "Sans", @@ -62804,25 +62786,25 @@ "visible": true, "vertices": [ { - "x": 8205, - "y": 6630 + "x": 8120, + "y": 9825 }, { - "x": 8420, - "y": 6630 + "x": 8120, + "y": 9410 }, { - "x": 8420, - "y": 5930 + "x": 7000, + "y": 9410 }, { - "x": 8455, - "y": 5930 + "x": 7000, + "y": 9369 } ], "label": { - "x": 7806, - "y": 6590, + "x": 7733, + "y": 9793, "width": 389, "height": 32, "fontName": "Sans", @@ -62846,25 +62828,25 @@ "visible": true, "vertices": [ { - "x": 8205, - "y": 6400 + "x": 7360, + "y": 9635 }, { - "x": 8360, - "y": 6400 + "x": 7360, + "y": 9470 }, { - "x": 8360, - "y": 5910 + "x": 6940, + "y": 9470 }, { - "x": 8455, - "y": 5910 + "x": 6940, + "y": 9369 } ], "label": { - "x": 7879, - "y": 6360, + "x": 7046, + "y": 9603, "width": 316, "height": 32, "fontName": "Sans", @@ -62888,25 +62870,25 @@ "visible": true, "vertices": [ { - "x": 7585, - "y": 6260 + "x": 7220, + "y": 9875 }, { - "x": 8300, - "y": 6260 + "x": 7220, + "y": 9530 }, { - "x": 8300, - "y": 5880 + "x": 6880, + "y": 9530 }, { - "x": 8455, - "y": 5880 + "x": 6880, + "y": 9369 } ], "label": { - "x": 7581, - "y": 6230, + "x": 7228, + "y": 9853, "width": 280, "height": 32, "fontName": "Sans", @@ -62930,29 +62912,29 @@ "visible": true, "vertices": [ { - "x": 10859, - "y": 6750 + "x": 7709, + "y": 7130 }, { - "x": 10880, - "y": 6750 + "x": 7730, + "y": 7130 }, { - "x": 10880, - "y": 6810 + "x": 7730, + "y": 7190 }, { - "x": 10820, - "y": 6810 + "x": 7670, + "y": 7190 }, { - "x": 10820, - "y": 6789 + "x": 7670, + "y": 7169 } ], "label": { - "x": 10849, - "y": 6710, + "x": 7699, + "y": 7090, "width": 166, "height": 32, "fontName": "Sans", @@ -62977,20 +62959,20 @@ "vertices": [ { "x": 1080, - "y": 2055 + "y": 2525 }, { "x": 1080, - "y": 1520 + "y": 1990 }, { - "x": 1655, - "y": 1520 + "x": 1665, + "y": 1990 } ], "label": { "x": 1088, - "y": 2065, + "y": 2535, "width": 343, "height": 32, "fontName": "Sans", @@ -63015,20 +62997,20 @@ "vertices": [ { "x": 1010, - "y": 2055 + "y": 2525 }, { "x": 1010, - "y": 1360 + "y": 1840 }, { - "x": 1045, - "y": 1360 + "x": 1055, + "y": 1840 } ], "label": { "x": 1018, - "y": 2065, + "y": 2535, "width": 353, "height": 32, "fontName": "Sans", @@ -63052,17 +63034,17 @@ "visible": true, "vertices": [ { - "x": 940, - "y": 2055 + "x": 950, + "y": 2525 }, { - "x": 940, - "y": 1225 + "x": 950, + "y": 1705 } ], "label": { - "x": 948, - "y": 2065, + "x": 958, + "y": 2535, "width": 359, "height": 32, "fontName": "Sans", @@ -63086,17 +63068,17 @@ "visible": true, "vertices": [ { - "x": 940, - "y": 995 + "x": 950, + "y": 1475 }, { - "x": 940, - "y": 975 + "x": 950, + "y": 1455 } ], "label": { - "x": 948, - "y": 1005, + "x": 958, + "y": 1485, "width": 421, "height": 32, "fontName": "Sans", @@ -63120,17 +63102,17 @@ "visible": true, "vertices": [ { - "x": 875, - "y": 2170 + "x": 885, + "y": 2640 }, { "x": 800, - "y": 2170 + "y": 2640 } ], "label": { - "x": 891, - "y": 2172, + "x": 901, + "y": 2642, "width": 369, "height": 32, "fontName": "Sans", @@ -63155,16 +63137,16 @@ "vertices": [ { "x": 445, - "y": 2170 + "y": 2640 }, { "x": 426, - "y": 2170 + "y": 2640 } ], "label": { "x": 461, - "y": 2172, + "y": 2642, "width": 504, "height": 32, "fontName": "Sans", @@ -63188,17 +63170,17 @@ "visible": true, "vertices": [ { - "x": 1110, - "y": 2285 + "x": 1120, + "y": 2755 }, { - "x": 1110, - "y": 2305 + "x": 1120, + "y": 2775 } ], "label": { - "x": 1118, - "y": 2275, + "x": 1128, + "y": 2745, "width": 292, "height": 32, "fontName": "Sans", @@ -63222,17 +63204,17 @@ "visible": true, "vertices": [ { - "x": 1336, - "y": 2210 + "x": 1346, + "y": 2710 }, { - "x": 1355, - "y": 2210 + "x": 1365, + "y": 2710 } ], "label": { - "x": 1332, - "y": 2212, + "x": 1342, + "y": 2712, "width": 302, "height": 32, "fontName": "Sans", @@ -63257,20 +63239,20 @@ "vertices": [ { "x": 1220, - "y": 2055 + "y": 2525 }, { "x": 1220, - "y": 1920 + "y": 2390 }, { - "x": 1255, - "y": 1920 + "x": 1265, + "y": 2390 } ], "label": { "x": 1228, - "y": 2065, + "y": 2535, "width": 318, "height": 32, "fontName": "Sans", @@ -63295,20 +63277,20 @@ "vertices": [ { "x": 1150, - "y": 2055 + "y": 2525 }, { "x": 1150, - "y": 1670 + "y": 2140 }, { - "x": 1185, - "y": 1670 + "x": 1195, + "y": 2140 } ], "label": { "x": 1158, - "y": 2065, + "y": 2535, "width": 312, "height": 32, "fontName": "Sans", @@ -63332,17 +63314,17 @@ "visible": true, "vertices": [ { - "x": 10449, - "y": 6640 + "x": 7510, + "y": 7185 }, { - "x": 10465, - "y": 6640 + "x": 7510, + "y": 7169 } ], "label": { - "x": 10439, - "y": 6600, + "x": 7512, + "y": 7153, "width": 219, "height": 32, "fontName": "Sans", @@ -63366,17 +63348,17 @@ "visible": true, "vertices": [ { - "x": 10055, - "y": 6640 + "x": 7510, + "y": 7489 }, { - "x": 9975, - "y": 6640 + "x": 7510, + "y": 7925 } ], "label": { - "x": 10065, - "y": 6600, + "x": 7512, + "y": 7437, "width": 218, "height": 32, "fontName": "Sans", @@ -63400,25 +63382,17 @@ "visible": true, "vertices": [ { - "x": 29550, - "y": 15035 + "x": 1850, + "y": 18015 }, { - "x": 29550, - "y": 14790 - }, - { - "x": 2150, - "y": 14790 - }, - { - "x": 2150, - "y": 14742 + "x": 1850, + "y": 16892 } ], "label": { - "x": 29558, - "y": 15045, + "x": 1858, + "y": 18025, "width": 449, "height": 32, "fontName": "Sans", @@ -63442,25 +63416,17 @@ "visible": true, "vertices": [ { - "x": 29480, - "y": 15035 + "x": 1750, + "y": 18015 }, { - "x": 29480, - "y": 15000 - }, - { - "x": 29450, - "y": 15000 - }, - { - "x": 29450, - "y": 14961 + "x": 1750, + "y": 17991 } ], "label": { - "x": 29488, - "y": 15013, + "x": 1758, + "y": 17993, "width": 459, "height": 32, "fontName": "Sans", @@ -63484,17 +63450,17 @@ "visible": true, "vertices": [ { - "x": 29425, - "y": 15140 + "x": 1685, + "y": 18110 }, { - "x": 29405, - "y": 15140 + "x": 1665, + "y": 18110 } ], "label": { - "x": 29441, - "y": 15142, + "x": 1701, + "y": 18112, "width": 424, "height": 32, "fontName": "Sans", @@ -63518,17 +63484,17 @@ "visible": true, "vertices": [ { - "x": 29640, - "y": 15240 + "x": 1910, + "y": 18220 }, { - "x": 29640, - "y": 15265 + "x": 1910, + "y": 18235 } ], "label": { - "x": 29648, - "y": 15198, + "x": 1918, + "y": 18178, "width": 418, "height": 32, "fontName": "Sans", @@ -63552,17 +63518,17 @@ "visible": true, "vertices": [ { - "x": 29855, - "y": 15140 + "x": 2115, + "y": 18110 }, { - "x": 29865, - "y": 15140 + "x": 2135, + "y": 18110 } ], "label": { - "x": 29851, - "y": 15110, + "x": 2111, + "y": 18080, "width": 398, "height": 32, "fontName": "Sans", @@ -63586,17 +63552,25 @@ "visible": true, "vertices": [ { - "x": 29790, - "y": 15035 + "x": 2060, + "y": 18015 }, { - "x": 29790, - "y": 13962 + "x": 2060, + "y": 17970 + }, + { + "x": 2090, + "y": 17970 + }, + { + "x": 2090, + "y": 17932 } ], "label": { - "x": 29798, - "y": 15045, + "x": 2068, + "y": 18025, "width": 408, "height": 32, "fontName": "Sans", @@ -63620,25 +63594,25 @@ "visible": true, "vertices": [ { - "x": 29720, - "y": 15035 + "x": 1990, + "y": 18015 }, { - "x": 29720, - "y": 14370 + "x": 1990, + "y": 17720 }, { - "x": 29690, - "y": 14370 + "x": 2020, + "y": 17720 }, { - "x": 29690, - "y": 14332 + "x": 2020, + "y": 17682 } ], "label": { - "x": 29728, - "y": 15045, + "x": 1998, + "y": 18025, "width": 465, "height": 32, "fontName": "Sans", @@ -63662,25 +63636,25 @@ "visible": true, "vertices": [ { - "x": 29620, - "y": 15035 + "x": 1920, + "y": 18015 }, { - "x": 29620, - "y": 14780 + "x": 1920, + "y": 17290 }, { - "x": 29620, - "y": 14780 + "x": 1950, + "y": 17290 }, { - "x": 29620, - "y": 14743 + "x": 1950, + "y": 17253 } ], "label": { - "x": 29628, - "y": 15045, + "x": 1928, + "y": 18025, "width": 475, "height": 32, "fontName": "Sans", @@ -63704,17 +63678,17 @@ "visible": true, "vertices": [ { - "x": 29530, - "y": 14165 + "x": 2180, + "y": 17515 }, { - "x": 29530, - "y": 14152 + "x": 2180, + "y": 17492 } ], "label": { - "x": 29538, - "y": 14175, + "x": 2188, + "y": 17525, "width": 527, "height": 32, "fontName": "Sans", @@ -63738,17 +63712,17 @@ "visible": true, "vertices": [ { - "x": 29460, - "y": 14595 + "x": 2110, + "y": 17105 }, { - "x": 29460, - "y": 14582 + "x": 2110, + "y": 17082 } ], "label": { - "x": 29468, - "y": 14605, + "x": 2118, + "y": 17115, "width": 610, "height": 32, "fontName": "Sans", @@ -63772,17 +63746,17 @@ "visible": true, "vertices": [ { - "x": 9810, - "y": 6505 + "x": 7395, + "y": 8120 }, { - "x": 9810, - "y": 6585 + "x": 7415, + "y": 8120 } ], "label": { - "x": 9812, - "y": 6453, + "x": 7385, + "y": 8080, "width": 182, "height": 32, "fontName": "Sans", @@ -63806,17 +63780,17 @@ "visible": true, "vertices": [ { - "x": 9810, - "y": 6275 + "x": 7165, + "y": 8120 }, { - "x": 9810, - "y": 6255 + "x": 7145, + "y": 8120 } ], "label": { - "x": 9818, - "y": 6285, + "x": 7181, + "y": 8122, "width": 147, "height": 32, "fontName": "Sans", @@ -63840,29 +63814,29 @@ "visible": true, "vertices": [ { - "x": 28295, - "y": 14420 + "x": 23615, + "y": 16750 }, { - "x": 27240, - "y": 14420 + "x": 22950, + "y": 16750 }, { - "x": 27240, - "y": 14360 + "x": 22950, + "y": 16680 }, { - "x": 26730, - "y": 14360 + "x": 22110, + "y": 16680 }, { - "x": 26730, - "y": 14575 + "x": 22110, + "y": 16725 } ], "label": { - "x": 28311, - "y": 14422, + "x": 23631, + "y": 16752, "width": 377, "height": 32, "fontName": "Sans", @@ -63886,17 +63860,17 @@ "visible": true, "vertices": [ { - "x": 28295, - "y": 14460 + "x": 23615, + "y": 16790 }, { - "x": 27205, - "y": 14460 + "x": 22905, + "y": 16790 } ], "label": { - "x": 28311, - "y": 14430, + "x": 23631, + "y": 16760, "width": 387, "height": 32, "fontName": "Sans", @@ -63920,17 +63894,17 @@ "visible": true, "vertices": [ { - "x": 28510, - "y": 14500 + "x": 23830, + "y": 16820 }, { - "x": 28510, - "y": 14515 + "x": 23830, + "y": 16845 } ], "label": { - "x": 28518, - "y": 14490, + "x": 23838, + "y": 16810, "width": 352, "height": 32, "fontName": "Sans", @@ -63954,17 +63928,17 @@ "visible": true, "vertices": [ { - "x": 28725, - "y": 14440 + "x": 24045, + "y": 16720 }, { - "x": 28805, - "y": 14440 + "x": 24125, + "y": 16720 } ], "label": { - "x": 28721, - "y": 14410, + "x": 24041, + "y": 16690, "width": 346, "height": 32, "fontName": "Sans", @@ -63988,21 +63962,17 @@ "visible": true, "vertices": [ { - "x": 28510, - "y": 14295 + "x": 23830, + "y": 16615 }, { - "x": 28510, - "y": 14210 - }, - { - "x": 28545, - "y": 14210 + "x": 23830, + "y": 16591 } ], "label": { - "x": 28518, - "y": 14273, + "x": 23838, + "y": 16593, "width": 326, "height": 32, "fontName": "Sans", @@ -64026,17 +63996,25 @@ "visible": true, "vertices": [ { - "x": 28360, - "y": 14295 + "x": 23615, + "y": 16650 }, { - "x": 28360, - "y": 14122 + "x": 23580, + "y": 16650 + }, + { + "x": 23580, + "y": 16580 + }, + { + "x": 23535, + "y": 16580 } ], "label": { - "x": 28368, - "y": 14305, + "x": 23631, + "y": 16652, "width": 336, "height": 32, "fontName": "Sans", @@ -64060,25 +64038,25 @@ "visible": true, "vertices": [ { - "x": 28295, - "y": 14340 + "x": 23615, + "y": 16680 }, { - "x": 28260, - "y": 14340 + "x": 23060, + "y": 16680 }, { - "x": 28260, - "y": 14270 + "x": 23060, + "y": 16420 }, { - "x": 28215, - "y": 14270 + "x": 22965, + "y": 16420 } ], "label": { - "x": 28311, - "y": 14342, + "x": 23631, + "y": 16682, "width": 393, "height": 32, "fontName": "Sans", @@ -64102,25 +64080,25 @@ "visible": true, "vertices": [ { - "x": 28295, - "y": 14370 + "x": 23615, + "y": 16710 }, { - "x": 27300, - "y": 14370 + "x": 23010, + "y": 16710 }, { - "x": 27300, - "y": 14250 + "x": 23010, + "y": 16580 }, { - "x": 27265, - "y": 14250 + "x": 22965, + "y": 16580 } ], "label": { - "x": 28311, - "y": 14372, + "x": 23631, + "y": 16712, "width": 403, "height": 32, "fontName": "Sans", @@ -64144,17 +64122,17 @@ "visible": true, "vertices": [ { - "x": 27785, - "y": 14250 + "x": 22535, + "y": 16370 }, { - "x": 27765, - "y": 14250 + "x": 22515, + "y": 16370 } ], "label": { - "x": 27801, - "y": 14252, + "x": 22551, + "y": 16372, "width": 455, "height": 32, "fontName": "Sans", @@ -64178,17 +64156,17 @@ "visible": true, "vertices": [ { - "x": 26835, - "y": 14240 + "x": 22535, + "y": 16570 }, { - "x": 26815, - "y": 14240 + "x": 22515, + "y": 16570 } ], "label": { - "x": 26851, - "y": 14242, + "x": 22551, + "y": 16572, "width": 538, "height": 32, "fontName": "Sans", @@ -64212,17 +64190,25 @@ "visible": true, "vertices": [ { - "x": 5430, - "y": 8823 + "x": 9685, + "y": 12250 }, { - "x": 5430, - "y": 8835 + "x": 9730, + "y": 12250 + }, + { + "x": 9730, + "y": 12460 + }, + { + "x": 9765, + "y": 12460 } ], "label": { - "x": 5065, - "y": 8771, + "x": 9308, + "y": 12210, "width": 367, "height": 32, "fontName": "Sans", @@ -64246,21 +64232,25 @@ "visible": true, "vertices": [ { - "x": 5420, - "y": 8575 + "x": 9370, + "y": 12065 }, { - "x": 5420, - "y": 7760 + "x": 9370, + "y": 11960 }, { - "x": 6305, - "y": 7760 + "x": 8470, + "y": 11960 + }, + { + "x": 8470, + "y": 11052 } ], "label": { - "x": 5045, - "y": 8543, + "x": 8995, + "y": 12033, "width": 377, "height": 32, "fontName": "Sans", @@ -64284,17 +64274,17 @@ "visible": true, "vertices": [ { - "x": 6735, - "y": 7760 + "x": 8470, + "y": 10785 }, { - "x": 6745, - "y": 7760 + "x": 8470, + "y": 10762 } ], "label": { - "x": 6731, - "y": 7730, + "x": 8478, + "y": 10763, "width": 485, "height": 32, "fontName": "Sans", @@ -64318,21 +64308,21 @@ "visible": true, "vertices": [ { - "x": 6670, - "y": 7892 + "x": 8675, + "y": 10920 }, { - "x": 6670, - "y": 8160 + "x": 8780, + "y": 10920 }, { - "x": 11105, - "y": 8160 + "x": 8780, + "y": 6835 } ], "label": { - "x": 6672, - "y": 7840, + "x": 8665, + "y": 10880, "width": 368, "height": 32, "fontName": "Sans", @@ -64356,29 +64346,25 @@ "visible": true, "vertices": [ { - "x": 11165, - "y": 3790 + "x": 5250, + "y": 6005 }, { - "x": 15000, - "y": 3790 + "x": 5250, + "y": 3730 }, { - "x": 15000, - "y": 8070 + "x": 8850, + "y": 3730 }, { - "x": 11240, - "y": 8070 - }, - { - "x": 11240, - "y": 8115 + "x": 8850, + "y": 6605 } ], "label": { - "x": 10731, - "y": 3750, + "x": 4828, + "y": 5973, "width": 424, "height": 32, "fontName": "Sans", @@ -64402,25 +64388,17 @@ "visible": true, "vertices": [ { - "x": 6575, - "y": 8190 + "x": 8850, + "y": 11065 }, { - "x": 6610, - "y": 8190 - }, - { - "x": 6610, - "y": 8220 - }, - { - "x": 11105, - "y": 8220 + "x": 8850, + "y": 6835 } ], "label": { - "x": 6214, - "y": 8150, + "x": 8501, + "y": 11033, "width": 351, "height": 32, "fontName": "Sans", @@ -64444,17 +64422,17 @@ "visible": true, "vertices": [ { - "x": 15095, - "y": 8170 + "x": 9565, + "y": 6660 }, { - "x": 11363, - "y": 8170 + "x": 8983, + "y": 6660 } ], "label": { - "x": 14790, - "y": 8130, + "x": 9260, + "y": 6620, "width": 315, "height": 32, "fontName": "Sans", @@ -64478,17 +64456,17 @@ "visible": true, "vertices": [ { - "x": 11240, - "y": 8415 + "x": 9115, + "y": 6770 }, { - "x": 11240, - "y": 8345 + "x": 8983, + "y": 6770 } ], "label": { - "x": 10886, - "y": 8383, + "x": 8769, + "y": 6730, "width": 356, "height": 32, "fontName": "Sans", @@ -64512,17 +64490,25 @@ "visible": true, "vertices": [ { - "x": 6025, - "y": 8290 + "x": 9020, + "y": 11465 }, { - "x": 11105, - "y": 8290 + "x": 9020, + "y": 9530 + }, + { + "x": 8920, + "y": 9530 + }, + { + "x": 8920, + "y": 6835 } ], "label": { - "x": 6015, - "y": 8250, + "x": 9022, + "y": 11433, "width": 331, "height": 32, "fontName": "Sans", @@ -64546,17 +64532,17 @@ "visible": true, "vertices": [ { - "x": 10950, - "y": 3963 + "x": 5465, + "y": 6170 }, { - "x": 10950, - "y": 4835 + "x": 5535, + "y": 6170 } ], "label": { - "x": 10538, - "y": 3911, + "x": 5041, + "y": 6130, "width": 414, "height": 32, "fontName": "Sans", @@ -64580,21 +64566,21 @@ "visible": true, "vertices": [ { - "x": 6360, - "y": 7625 + "x": 8245, + "y": 10920 }, { - "x": 6360, - "y": 4980 + "x": 5740, + "y": 10920 }, { - "x": 10895, - "y": 4980 + "x": 5740, + "y": 6265 } ], "label": { - "x": 6362, - "y": 7593, + "x": 8255, + "y": 10880, "width": 358, "height": 32, "fontName": "Sans", @@ -64618,29 +64604,21 @@ "visible": true, "vertices": [ { - "x": 6260, - "y": 7915 + "x": 8505, + "y": 11240 }, { - "x": 6260, - "y": 4920 + "x": 5670, + "y": 11240 }, { - "x": 8360, - "y": 4920 - }, - { - "x": 8360, - "y": 4930 - }, - { - "x": 10895, - "y": 4930 + "x": 5670, + "y": 6265 } ], "label": { - "x": 5921, - "y": 7883, + "x": 8174, + "y": 11200, "width": 341, "height": 32, "fontName": "Sans", @@ -64664,25 +64642,25 @@ "visible": true, "vertices": [ { - "x": 15310, - "y": 7995 + "x": 9780, + "y": 6485 }, { - "x": 15310, - "y": 4060 + "x": 9780, + "y": 3670 }, { - "x": 11020, - "y": 4060 + "x": 5580, + "y": 3670 }, { - "x": 11020, - "y": 4835 + "x": 5580, + "y": 6065 } ], "label": { - "x": 15318, - "y": 7973, + "x": 9788, + "y": 6463, "width": 305, "height": 32, "fontName": "Sans", @@ -64706,29 +64684,21 @@ "visible": true, "vertices": [ { - "x": 5660, - "y": 8185 + "x": 8955, + "y": 11630 }, { - "x": 5660, - "y": 4860 + "x": 5600, + "y": 11630 }, { - "x": 8420, - "y": 4860 - }, - { - "x": 8420, - "y": 4880 - }, - { - "x": 10895, - "y": 4880 + "x": 5600, + "y": 6265 } ], "label": { - "x": 5662, - "y": 8153, + "x": 8965, + "y": 11590, "width": 321, "height": 32, "fontName": "Sans", @@ -64752,29 +64722,33 @@ "visible": true, "vertices": [ { - "x": 11455, - "y": 8560 + "x": 9330, + "y": 6705 }, { - "x": 15060, - "y": 8560 + "x": 9330, + "y": 3790 }, { - "x": 15060, - "y": 4120 + "x": 5640, + "y": 3790 }, { - "x": 11090, - "y": 4120 + "x": 5640, + "y": 5730 }, { - "x": 11090, - "y": 4835 + "x": 5630, + "y": 5730 + }, + { + "x": 5630, + "y": 6065 } ], "label": { - "x": 11099, - "y": 8520, + "x": 8986, + "y": 6673, "width": 346, "height": 32, "fontName": "Sans", @@ -64798,17 +64772,17 @@ "visible": true, "vertices": [ { - "x": 11170, - "y": 7930 + "x": 7885, + "y": 6720 }, { - "x": 11170, - "y": 8115 + "x": 8725, + "y": 6720 } ], "label": { - "x": 11172, - "y": 7878, + "x": 7875, + "y": 6680, "width": 227, "height": 32, "fontName": "Sans", @@ -64832,29 +64806,33 @@ "visible": true, "vertices": [ { - "x": 13945, - "y": 5350 + "x": 7670, + "y": 4375 }, { - "x": 14940, - "y": 5350 + "x": 7670, + "y": 3850 }, { - "x": 14940, - "y": 4170 + "x": 5700, + "y": 3850 }, { - "x": 11160, - "y": 4170 + "x": 5700, + "y": 5790 }, { - "x": 11160, - "y": 4835 + "x": 5670, + "y": 5790 + }, + { + "x": 5670, + "y": 6065 } ], "label": { - "x": 13935, - "y": 5310, + "x": 7672, + "y": 4343, "width": 360, "height": 32, "fontName": "Sans", @@ -64878,17 +64856,17 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 5350 + "x": 7780, + "y": 4618 }, { - "x": 11795, - "y": 5350 + "x": 7780, + "y": 5745 } ], "label": { - "x": 13525, - "y": 5310, + "x": 7782, + "y": 4566, "width": 370, "height": 32, "fontName": "Sans", @@ -64912,17 +64890,25 @@ "visible": true, "vertices": [ { - "x": 11935, - "y": 4980 + "x": 7100, + "y": 5608 }, { - "x": 11235, - "y": 4980 + "x": 7100, + "y": 6030 + }, + { + "x": 5840, + "y": 6030 + }, + { + "x": 5840, + "y": 6065 } ], "label": { - "x": 11945, - "y": 4940, + "x": 7102, + "y": 5556, "width": 335, "height": 32, "fontName": "Sans", @@ -64946,25 +64932,25 @@ "visible": true, "vertices": [ { - "x": 12150, - "y": 5168 + "x": 7475, + "y": 5490 }, { - "x": 12150, - "y": 5200 + "x": 7610, + "y": 5490 }, { - "x": 11630, - "y": 5200 + "x": 7610, + "y": 5850 }, { - "x": 11630, - "y": 5235 + "x": 7645, + "y": 5850 } ], "label": { - "x": 12152, - "y": 5116, + "x": 7465, + "y": 5450, "width": 345, "height": 32, "fontName": "Sans", @@ -64988,25 +64974,25 @@ "visible": true, "vertices": [ { - "x": 12185, - "y": 4740 + "x": 6460, + "y": 5448 }, { - "x": 11390, - "y": 4740 + "x": 6460, + "y": 5970 }, { - "x": 11390, - "y": 4900 + "x": 5790, + "y": 5970 }, { - "x": 11235, - "y": 4900 + "x": 5790, + "y": 6065 } ], "label": { - "x": 12195, - "y": 4700, + "x": 6462, + "y": 5396, "width": 319, "height": 32, "fontName": "Sans", @@ -65030,21 +65016,21 @@ "visible": true, "vertices": [ { - "x": 12400, - "y": 4798 + "x": 6825, + "y": 5330 }, { - "x": 12400, - "y": 5290 + "x": 7710, + "y": 5330 }, { - "x": 11795, - "y": 5290 + "x": 7710, + "y": 5745 } ], "label": { - "x": 12402, - "y": 4746, + "x": 6815, + "y": 5290, "width": 329, "height": 32, "fontName": "Sans", @@ -65068,25 +65054,25 @@ "visible": true, "vertices": [ { - "x": 13365, - "y": 4450 + "x": 5860, + "y": 4658 }, { - "x": 11330, - "y": 4450 + "x": 5860, + "y": 5910 }, { - "x": 11330, - "y": 4880 + "x": 5750, + "y": 5910 }, { - "x": 11235, - "y": 4880 + "x": 5750, + "y": 6065 } ], "label": { - "x": 13375, - "y": 4410, + "x": 5862, + "y": 4606, "width": 355, "height": 32, "fontName": "Sans", @@ -65110,29 +65096,25 @@ "visible": true, "vertices": [ { - "x": 13795, - "y": 4390 + "x": 6020, + "y": 4415 }, { - "x": 13980, - "y": 4390 + "x": 6020, + "y": 4330 }, { - "x": 13980, - "y": 5510 + "x": 7920, + "y": 4330 }, { - "x": 11740, - "y": 5510 - }, - { - "x": 11740, - "y": 5435 + "x": 7920, + "y": 5745 } ], "label": { - "x": 13785, - "y": 4350, + "x": 6022, + "y": 4383, "width": 365, "height": 32, "fontName": "Sans", @@ -65156,29 +65138,29 @@ "visible": true, "vertices": [ { - "x": 14690, - "y": 4705 + "x": 6705, + "y": 4010 }, { - "x": 14690, - "y": 4230 + "x": 5760, + "y": 4010 }, { - "x": 11270, - "y": 4230 + "x": 5760, + "y": 5850 }, { - "x": 11270, - "y": 4860 + "x": 5710, + "y": 5850 }, { - "x": 11235, - "y": 4860 + "x": 5710, + "y": 6065 } ], "label": { - "x": 14692, - "y": 4673, + "x": 6715, + "y": 3970, "width": 428, "height": 32, "fontName": "Sans", @@ -65202,25 +65184,25 @@ "visible": true, "vertices": [ { - "x": 14690, - "y": 4948 + "x": 7135, + "y": 4010 }, { - "x": 14690, - "y": 5570 + "x": 8020, + "y": 4010 }, { - "x": 11630, - "y": 5570 + "x": 8020, + "y": 5850 }, { - "x": 11630, - "y": 5435 + "x": 7985, + "y": 5850 } ], "label": { - "x": 14692, - "y": 4896, + "x": 7125, + "y": 3970, "width": 438, "height": 32, "fontName": "Sans", @@ -65244,17 +65226,25 @@ "visible": true, "vertices": [ { - "x": 26340, - "y": 11730 + "x": 17950, + "y": 380 }, { - "x": 26340, - "y": 14335 + "x": 17950, + "y": 420 + }, + { + "x": 18260, + "y": 420 + }, + { + "x": 18260, + "y": 525 } ], "label": { - "x": 26348, - "y": 11720, + "x": 17958, + "y": 370, "width": 271, "height": 32, "fontName": "Sans", @@ -65278,17 +65268,21 @@ "visible": true, "vertices": [ { - "x": 26450, - "y": 11730 + "x": 18005, + "y": 300 }, { - "x": 26450, - "y": 11765 + "x": 18520, + "y": 300 + }, + { + "x": 18520, + "y": 365 } ], "label": { - "x": 26458, - "y": 11688, + "x": 18001, + "y": 270, "width": 281, "height": 32, "fontName": "Sans", @@ -65312,17 +65306,17 @@ "visible": true, "vertices": [ { - "x": 26505, - "y": 11630 + "x": 18005, + "y": 230 }, { - "x": 26525, - "y": 11630 + "x": 18555, + "y": 230 } ], "label": { - "x": 26501, - "y": 11632, + "x": 18001, + "y": 232, "width": 246, "height": 32, "fontName": "Sans", @@ -65346,17 +65340,17 @@ "visible": true, "vertices": [ { - "x": 26290, - "y": 11525 + "x": 17800, + "y": 175 }, { - "x": 26290, - "y": 11531 + "x": 17800, + "y": 151 } ], "label": { - "x": 26298, - "y": 11503, + "x": 17808, + "y": 153, "width": 240, "height": 32, "fontName": "Sans", @@ -65380,17 +65374,17 @@ "visible": true, "vertices": [ { - "x": 26075, - "y": 11600 + "x": 17575, + "y": 270 }, { - "x": 25505, - "y": 11600 + "x": 17555, + "y": 270 } ], "label": { - "x": 26091, - "y": 11570, + "x": 17591, + "y": 240, "width": 220, "height": 32, "fontName": "Sans", @@ -65414,21 +65408,17 @@ "visible": true, "vertices": [ { - "x": 26075, - "y": 11670 + "x": 17640, + "y": 380 }, { - "x": 25540, - "y": 11670 - }, - { - "x": 25540, - "y": 11705 + "x": 17640, + "y": 925 } ], "label": { - "x": 26091, - "y": 11672, + "x": 17648, + "y": 370, "width": 230, "height": 32, "fontName": "Sans", @@ -65452,17 +65442,25 @@ "visible": true, "vertices": [ { - "x": 26140, - "y": 11730 + "x": 17710, + "y": 380 }, { - "x": 26140, - "y": 11805 + "x": 17710, + "y": 890 + }, + { + "x": 17780, + "y": 890 + }, + { + "x": 17780, + "y": 1025 } ], "label": { - "x": 26148, - "y": 11720, + "x": 17718, + "y": 370, "width": 287, "height": 32, "fontName": "Sans", @@ -65486,17 +65484,17 @@ "visible": true, "vertices": [ { - "x": 26240, - "y": 11730 + "x": 17880, + "y": 380 }, { - "x": 26240, - "y": 12235 + "x": 17880, + "y": 455 } ], "label": { - "x": 26248, - "y": 11720, + "x": 17888, + "y": 370, "width": 297, "height": 32, "fontName": "Sans", @@ -65520,17 +65518,17 @@ "visible": true, "vertices": [ { - "x": 25990, - "y": 11972 + "x": 17940, + "y": 1192 }, { - "x": 25990, - "y": 11995 + "x": 17940, + "y": 1215 } ], "label": { - "x": 25998, - "y": 11962, + "x": 17948, + "y": 1182, "width": 349, "height": 32, "fontName": "Sans", @@ -65554,17 +65552,17 @@ "visible": true, "vertices": [ { - "x": 26090, - "y": 12383 + "x": 17970, + "y": 603 }, { - "x": 26090, - "y": 12405 + "x": 17970, + "y": 625 } ], "label": { - "x": 26098, - "y": 12373, + "x": 17978, + "y": 593, "width": 432, "height": 32, "fontName": "Sans", @@ -65588,17 +65586,17 @@ "visible": true, "vertices": [ { - "x": 13730, - "y": 5070 + "x": 7135, + "y": 4490 }, { - "x": 13730, - "y": 5225 + "x": 7455, + "y": 4490 } ], "label": { - "x": 13738, - "y": 5060, + "x": 7131, + "y": 4492, "width": 393, "height": 32, "fontName": "Sans", @@ -65622,25 +65620,25 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 4940 + "x": 6830, + "y": 4640 }, { - "x": 13420, - "y": 4940 + "x": 6830, + "y": 5110 }, { - "x": 13420, - "y": 4880 + "x": 6910, + "y": 5110 }, { - "x": 13375, - "y": 4880 + "x": 6910, + "y": 5145 } ], "label": { - "x": 13531, - "y": 4910, + "x": 6838, + "y": 4598, "width": 403, "height": 32, "fontName": "Sans", @@ -65664,25 +65662,21 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 5030 + "x": 7135, + "y": 4560 }, { - "x": 13480, - "y": 5030 + "x": 7410, + "y": 4560 }, { - "x": 13480, - "y": 5100 - }, - { - "x": 12365, - "y": 5100 + "x": 7410, + "y": 5365 } ], "label": { - "x": 13531, - "y": 5032, + "x": 7131, + "y": 4562, "width": 368, "height": 32, "fontName": "Sans", @@ -65706,25 +65700,25 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 4970 + "x": 6900, + "y": 4640 }, { - "x": 12910, - "y": 4970 + "x": 6900, + "y": 4890 }, { - "x": 12910, - "y": 4880 + "x": 6930, + "y": 4890 }, { - "x": 12875, - "y": 4880 + "x": 6930, + "y": 4935 } ], "label": { - "x": 13531, - "y": 4940, + "x": 6908, + "y": 4598, "width": 362, "height": 32, "fontName": "Sans", @@ -65748,17 +65742,17 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 5000 + "x": 7070, + "y": 4640 }, { - "x": 12865, - "y": 5000 + "x": 7070, + "y": 4715 } ], "label": { - "x": 13531, - "y": 4970, + "x": 7078, + "y": 4598, "width": 342, "height": 32, "fontName": "Sans", @@ -65782,25 +65776,17 @@ "visible": true, "vertices": [ { - "x": 13515, - "y": 4910 + "x": 6760, + "y": 4640 }, { - "x": 13480, - "y": 4910 - }, - { - "x": 13480, - "y": 4740 - }, - { - "x": 12615, - "y": 4740 + "x": 6760, + "y": 5205 } ], "label": { - "x": 13531, - "y": 4912, + "x": 6768, + "y": 4630, "width": 352, "height": 32, "fontName": "Sans", @@ -65824,17 +65810,17 @@ "visible": true, "vertices": [ { - "x": 13580, - "y": 4865 + "x": 6705, + "y": 4540 }, { - "x": 13580, - "y": 4702 + "x": 6685, + "y": 4540 } ], "label": { - "x": 13588, - "y": 4875, + "x": 6721, + "y": 4542, "width": 409, "height": 32, "fontName": "Sans", @@ -65858,21 +65844,17 @@ "visible": true, "vertices": [ { - "x": 13730, - "y": 4865 + "x": 6920, + "y": 4435 }, { - "x": 13730, - "y": 4830 - }, - { - "x": 14025, - "y": 4830 + "x": 6920, + "y": 4293 } ], "label": { - "x": 13738, - "y": 4875, + "x": 6928, + "y": 4445, "width": 419, "height": 32, "fontName": "Sans", @@ -65896,17 +65878,17 @@ "visible": true, "vertices": [ { - "x": 13580, - "y": 4535 + "x": 6255, + "y": 4540 }, { - "x": 13580, - "y": 4518 + "x": 6235, + "y": 4540 } ], "label": { - "x": 13588, - "y": 4545, + "x": 6271, + "y": 4542, "width": 471, "height": 32, "fontName": "Sans", @@ -65930,17 +65912,17 @@ "visible": true, "vertices": [ { - "x": 14455, - "y": 4830 + "x": 6920, + "y": 4145 }, { - "x": 14475, - "y": 4830 + "x": 6920, + "y": 4128 } ], "label": { - "x": 14451, - "y": 4832, + "x": 6928, + "y": 4155, "width": 554, "height": 32, "fontName": "Sans", @@ -65955,6 +65937,40 @@ "isFontItalic": false, "isVisible": false } + }, + { + "name": "fk_UserOrder_Transactions_1", + "sourceTableName": "UserOrder", + "sourceSchemaName": "CMS", + "lineWidth": 1, + "visible": true, + "vertices": [ + { + "x": 7750, + "y": 6535 + }, + { + "x": 7750, + "y": 6291 + } + ], + "label": { + "x": 7752, + "y": 6503, + "width": 202, + "height": 32, + "fontName": "Sans", + "fontSize": 14, + "fontColor": { + "r": 51, + "g": 51, + "b": 51, + "a": 1 + }, + "isFontBold": false, + "isFontItalic": false, + "isVisible": false + } } ], "viewRelations": [] diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs b/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs index 6a05eb6..a091852 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Commands.CreateNewTransactions; public record CreateNewTransactionsCommand : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs b/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs index 4af1f38..24cfc3e 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Commands.UpdateTransactions; public record UpdateTransactionsCommand : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs index 2572ca4..2601756 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter; public record GetAllTransactionsByFilterQuery : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs index d8abcc9..f0d391c 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs @@ -18,26 +18,11 @@ public class GetAllTransactionsByFilterQueryHandler : IRequestHandler request.Filter.Id == null || x.Id == request.Filter.Id) - .Where(x => request.Filter.MerchantId == null || x.MerchantId.Contains(request.Filter.MerchantId)) .Where(x => request.Filter.Amount == null || x.Amount == request.Filter.Amount) - .Where(x => request.Filter.CallbackUrl == null || x.CallbackUrl.Contains(request.Filter.CallbackUrl)) .Where(x => request.Filter.Description == null || x.Description.Contains(request.Filter.Description)) - .Where(x => request.Filter.Mobile == null || x.Mobile.Contains(request.Filter.Mobile)) - .Where(x => request.Filter.Email == null || x.Email.Contains(request.Filter.Email)) - .Where(x => request.Filter.RequestStatusCode == null || x.RequestStatusCode == request.Filter.RequestStatusCode) - .Where(x => request.Filter.RequestStatusMessage == null || x.RequestStatusMessage.Contains(request.Filter.RequestStatusMessage)) - .Where(x => request.Filter.Authority == null || x.Authority.Contains(request.Filter.Authority)) - .Where(x => request.Filter.FeeType == null || x.FeeType.Contains(request.Filter.FeeType)) - .Where(x => request.Filter.Fee == null || x.Fee == request.Filter.Fee) - .Where(x => request.Filter.Currency == null || x.Currency == request.Filter.Currency) - .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus == request.Filter.PaymentStatus) + .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus== request.Filter.PaymentStatus) .Where(x => request.Filter.PaymentDate == null || x.PaymentDate == request.Filter.PaymentDate) - .Where(x => request.Filter.VerificationStatusCode == null || x.VerificationStatusCode == request.Filter.VerificationStatusCode) - .Where(x => request.Filter.VerificationStatusMessage == null || x.VerificationStatusMessage.Contains(request.Filter.VerificationStatusMessage)) - .Where(x => request.Filter.CardHash == null || x.CardHash.Contains(request.Filter.CardHash)) - .Where(x => request.Filter.CardPan == null || x.CardPan.Contains(request.Filter.CardPan)) .Where(x => request.Filter.RefId == null || x.RefId.Contains(request.Filter.RefId)) - .Where(x => request.Filter.OrderId == null || x.OrderId==request.Filter.OrderId) .Where(x => request.Filter.Type == null || x.Type == request.Filter.Type) ; } diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs index 78e714c..6e3937d 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter; public class GetAllTransactionsByFilterResponseDto { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs index 16b68dc..8ca81bd 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetTransactions; public class GetTransactionsResponseDto { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs index a32c5ec..ea7a34e 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.UserOrderCQ.Commands.CreateNewUserOrder; public record CreateNewUserOrderCommand : IRequest { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs index 28a839c..e13bd11 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs @@ -19,7 +19,7 @@ public class CreateNewUserOrderCommandHandler : IRequestHandler x.Id == request.PackageId, cancellationToken) ?? throw new NotFoundException(nameof(Package), request.PackageId); var entity = request.Adapt(); - entity.Price = package.Price; + entity.Amount = package.Price; await _context.UserOrders.AddAsync(entity, cancellationToken); entity.AddDomainEvent(new CreateNewUserOrderEvent(entity)); await _context.SaveChangesAsync(cancellationToken); diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs index d8d4b46..380b092 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs @@ -18,30 +18,77 @@ public class { var user = await _context.Users .Include(i => i.UserAddresss) + .Include(i => i.UserWallets) + .ThenInclude(i => i.UserWalletChangeLogs) .Include(i => i.UserCartss) .ThenInclude(i => i.Product) .FirstOrDefaultAsync(w => w.Id == request.UserId, cancellationToken: cancellationToken); if (user.UserCartss.Count == 0) throw new NotFoundException("UserCart", request.UserId); + if (user.UserCartss.Sum(s => s.Count * s.Product.Price) != request.TotalAmount) throw new Exception("مبلغ سفارش با مجموع سبد خرید مطابقت ندارد."); - await _context.UserOrders.AddAsync(new UserOrder() + + var userWallet = user.UserWallets.FirstOrDefault(); + if (userWallet == null) + throw new Exception("کیف پول کاربر یافت نشد."); + + + var newTransaction = new Transactions() { - Price = request.TotalAmount, + Amount = request.TotalAmount, + Description = "خرید از فروشگاه", + PaymentStatus = PaymentStatus.Success, + PaymentDate = DateTime.Now, + Type = TransactionType.Buy, + RefId = "localwallet-" + Guid.NewGuid().ToString() + }; + await _context.Transactionss.AddAsync(newTransaction, cancellationToken); + await _context.SaveChangesAsync(cancellationToken); + + var newWalletLog = new UserWalletChangeLog() + { + CurrentBalance = userWallet.Balance, + ChangeValue = -1*request.TotalAmount, + IsIncrease = false, + RefrenceId = newTransaction.Id + }; + userWallet.Balance -= request.TotalAmount; + + await _context.UserWalletChangeLogs.AddAsync(newWalletLog, cancellationToken); + await _context.SaveChangesAsync(cancellationToken); + + var newOrder = new UserOrder() + { + Amount = request.TotalAmount, PaymentStatus = PaymentStatus.Success, PaymentMethod = PaymentMethod.Wallet, - PaymentDate =DateTime.Now, + PaymentDate = DateTime.Now, UserId = request.UserId, - UserAddressId = user.UserAddresss.First(f=>f.IsDefault).Id - }, cancellationToken); + UserAddressId = user.UserAddresss.First(f => f.IsDefault).Id, + TransactionId = newTransaction.Id + }; + await _context.UserOrders.AddAsync(newOrder, cancellationToken); + await _context.SaveChangesAsync(cancellationToken); + await _context.FactorDetailss.AddRangeAsync(user.UserCartss.Select(s => new FactorDetails() { ProductId = s.ProductId, Count = s.Count, UnitPrice = s.Product.Price, - + OrderId = newOrder.Id }), cancellationToken); - return new SubmitShopBuyOrderResponseDto(); + user.UserCartss.Clear(); + await _context.SaveChangesAsync(cancellationToken); + return new SubmitShopBuyOrderResponseDto() + { + Id = newOrder.Id, + PaymentMethod = newOrder.PaymentMethod, + PaymentStatus = newOrder.PaymentStatus, + TotalAmount = newOrder.Amount, + UserAddressText = user.UserAddresss.First(f => f.IsDefault).Address, + Created = newOrder.PaymentDate + }; } } \ No newline at end of file diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs index f413db1..6a3d7d4 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.UserOrderCQ.Commands.UpdateUserOrder; public record UpdateUserOrderCommand : IRequest { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs index 1afe770..417c68d 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter; public record GetAllUserOrderByFilterQuery : IRequest { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs index 3f63ad3..98b0012 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs @@ -18,7 +18,7 @@ public class GetAllUserOrderByFilterQueryHandler : IRequestHandler request.Filter.Id == null || x.Id == request.Filter.Id) - .Where(x => request.Filter.Price == null || x.Price == request.Filter.Price) + .Where(x => request.Filter.Amount == null || x.Amount == request.Filter.Amount) .Where(x => request.Filter.PackageId == null || x.PackageId == request.Filter.PackageId) .Where(x => request.Filter.TransactionId == null || x.TransactionId == request.Filter.TransactionId) .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus.GetHashCode() == request.Filter.PaymentStatus.Value.GetHashCode()) diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs index 86167f9..f0dc233 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter; public class GetAllUserOrderByFilterResponseDto { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs index b4326ea..e8279fb 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetUserOrder; public class GetUserOrderResponseDto { diff --git a/src/CMSMicroservice.Domain/Entities/Transactions.cs b/src/CMSMicroservice.Domain/Entities/Transactions.cs index 684dfd6..8550f75 100644 --- a/src/CMSMicroservice.Domain/Entities/Transactions.cs +++ b/src/CMSMicroservice.Domain/Entities/Transactions.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Domain.Entities; //آدرس کاربر public class Transactions : BaseAuditableEntity diff --git a/src/CMSMicroservice.Domain/Entities/UserOrder.cs b/src/CMSMicroservice.Domain/Entities/UserOrder.cs index 3fdb149..1b3374d 100644 --- a/src/CMSMicroservice.Domain/Entities/UserOrder.cs +++ b/src/CMSMicroservice.Domain/Entities/UserOrder.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Domain.Entities; //سفارش کاربر public class UserOrder : BaseAuditableEntity diff --git a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj index 5f3096e..c25bb42 100644 --- a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj +++ b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj @@ -3,7 +3,7 @@ net9.0 enable enable - 0.0.124 + 0.0.125 None False False