{"Message":"修改工时的逻辑，支持工时分配模式\r\n修改工时中心页面","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/子任务视图"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":23,"Name":"TableView/人员工时统计视图"},{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":1,"Type":23,"Name":"TableView/View_项目统计信息"},{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":1,"Name":"PCPage/修改报工"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/工时详情"},{"State":1,"Type":1,"Name":"PCPage/FGC_维护中"},{"State":1,"Type":1,"Name":"PCPage/预算申请"},{"State":1,"Type":1,"Name":"PCPage/项目信息"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":15,"Name":"ServerCommand/修改工时"},{"State":2,"Type":15,"Name":"ServerCommand/新增工时"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":15,"Name":"ServerCommand/同步项目参与人字段"},{"State":1,"Type":15,"Name":"ServerCommand/新增或修改项目"},{"State":1,"Type":1,"Name":"PCPage/反馈与建议"},{"State":1,"Type":23,"Name":"TableView/项目匿名视图"},{"State":2,"Type":1,"Name":"PCPage/工时报表"},{"State":1,"Type":18,"Name":"RdlReport/工时报表"},{"State":1,"Type":7,"Name":"Table/工时分配方式"},{"State":3,"Type":1,"Name":"PCPage/分配计划工时"},{"State":3,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":3,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":3,"Type":1,"Name":"PCPage/任务工时统计"},{"State":3,"Type":1,"Name":"PCPage/人员工时统计"},{"State":3,"Type":1,"Name":"PCPage/工时中心"}],"Version":"v1"}

Pages/任务/工时/修改报工.json

@@ -201,7 +201,7 @@
   "Values": {
     "1,1": "工时执行者",
     "1,10": "执行时间",
-    "5,1": "实际工时数",
+    "5,1": "工时数",
     "9,1": "任务时薪",
     "13,1": "工作进展",
     "20,1": "取消",
@@ -563,7 +563,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "73b5b0ab-2b6c-47c3-ad1e-473e25e3b230"
+                "ID": "eead3c6f-13d5-4006-a34e-da44f3993867"
               },
               {
                 "CommandList": [
@@ -578,7 +578,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "5197d6e2-88cf-48df-974c-47aef06a6c70"
+                "ID": "e990dc04-0449-4a61-8f61-8a49749a224a"
               }
             ]
           }
@@ -877,7 +877,7 @@
                 ]
               }
             ],
-            "ID": "838cc4e1-b8f5-4184-aed6-065b7e418d69"
+            "ID": "e8d59345-60cc-4458-be55-cd68a661aeb2"
           },
           {
             "CommandList": [
@@ -894,7 +894,7 @@
                 ]
               }
             ],
-            "ID": "0f043355-9fcf-46c2-9454-d730f07ccaf3"
+            "ID": "044e8362-aff2-4612-9ec2-2bc6bad4d4e9"
           }
         ]
       },
@@ -951,7 +951,7 @@
                 ]
               }
             ],
-            "ID": "0c6692e8-b039-4748-8717-b03e721d13af"
+            "ID": "d950b1c5-3b12-47ee-95fb-3e33851bceda"
           },
           {
             "CommandList": [
@@ -968,7 +968,7 @@
                 ]
               }
             ],
-            "ID": "e0d0d9fb-0c20-4d9d-84c2-4464e7dd3d4c"
+            "ID": "ed91d773-31d5-4814-8318-55731c3ec17f"
           }
         ]
       }
@@ -1001,4 +1001,4 @@
       "Formula": "修改报工!$B$23"
     }
   ]
-}//zZAMsKY7LRnbBVajJ4uBiNQuO41ULIy2D9y07KEejUB2SVO7LNydKHg4A1y2bW6OwJDbrEa2fvLQejYwIilUGqQgi+iruP0yKoX7zEwBZvfbBc7vfRgorbF2rgu63gfaVR+0AWw/cwTDNcVdNA+og+RxEe7TjMeWOZXzTqo/ZebMmGjLHcVCZI5Px9z5pvgsA71u2EUDsL0cMIooW1ZG7psRI58qb67put56GKyv50QBOJekwcscCSBONYxo1yzzzp0U0guBrNb0sPhnf5GuiBEXApICR3w52J1JAfWjVLGWDTW5QBxjJe2CqNtjoSMisSITDcjTlReyDjF/0PdtF0Vau4OSrlYTLfe6/SiJIJxKHFJIpmn9xQKKNMQHu0XfBOCAOJer+RQMqkaT77kV1yguHA4Gg5E08zws7bQVImYOzScLlrVd7EWZrNEnhtaM051oFGhiPzi6xhB2T77RzxtXlHdP93e5z+669QqYA9ptkHz7IeW1kNt4e3AKJKMdbLofY4LBGDwkTGSjrczltUd94g3Y3i1w9vXPrH9bWwZ0iwlNCsOM2eu8XYMYmbo6CMrArSETJbiktcMACsJduJQkx5kT4bwt9LDXmAwScHao8efptQ4qYNtelKZsNdDyTVGwXdzaKqUazIHKSBtCLXQphyf61yE235d7r130pPYnqWGDa+15urzdpSorCEPcHY25fSlBhnfToVt3BJDpneMMHWKaiLJiD0cMEuYwOFDVKB4Vrqr2dhdlGVVfp6mAS/hZD1vEaetiOMNEtcaBjFwbARw46h3c0K/4LM2GN+JwOjFpHV6yA7B0b15pOEdanADlp6fDtlzu4UmG1EUtPY4H1RTy7NHtDDBN6c2PINeFEu+j+ThRmZxfIOAusVFAAeyWDo2/XMsrDXSZVaUkEg==|920
+}////t3zz3fx4mA41KKbw5AvVR4jB3/hKm7R+y7HwPI6R/vA6SDZ24ZvFH+aQLH43Yp7sY6uDjM16NvWR7uQQcdBGeTr9gdwE3qXLAK0gaVKEs66359ClTu1iaw7CPh7BFti+Q4RygyIaHuQglXk6+vB9uapmUHJULw0STJJXEOJ2ft0Ns4n0ww12NfF///Fv3VTitA7sOUassd8SYzPEY8SyWezvBw7/3wIC/aOUsElDjnCBuZkgf9VtPWsIXUZtQdLS5iv9s6FOHU/KcbsnbCi5NvStpQGf856bxhr/qDM9NgWdg+EhcT2F1kukoao+rCJ8atdR1l6AmQa15bd+TfxPwnA8C9tpZOhSDaKks/g+dyjpVURBw5ocvbMCLGxoV+oTlq1ulnm7v6djLX8Q5y6Gl9zYveiaP0CTK/Al0XeakZhWzRUPf/cODCRFmypEdA44Z6gxPy6YFT6qmjVIJyLrntJ5ie55FWBGHJk9KGABrTFySx/4Fcdb2Z4PZ4BGRTM55Ohql2hX5IxISeYJhGF9FtL12buEWVnUEM7CJbE0pSGxD8tIJooJCMS6ZJDFHBGl4NfCNCvhER0cj94zN27otnik68xLPaNAMURuBarU12Z11DZZG7vgYdOaSsdfupzranMMQl9vbuYVvr6mSt1LUdLAPgz20XkwoXNHmeThKRRwfKsCoKF2US3y4pT189Sj5tVHxqLlBRXUCy+6BRQoUNWmaPPXimYgESuajDvjeWEh28B1qdK5nbDefJ0QnHVe67MXonz2QPQOAU6AbPCBwNc4ffjIHZ1A2dxZvSXRvG3lfv/aPYjULRrlZXX/7R8f2Tu8FL7cL9tCRbbeQB0fgl0lve+bQJ6gsU00uV3+6bkTggmCP3u7M8/UD6js9nyqXpcmG8Bke9d95LHVi4Zw==|920

Pages/任务/工时/分配计划工时.rd

@@ -0,0 +1,18 @@
+{
+  "PageType": 0,
+  "ColumnCount": 24,
+  "RowCount": 24,
+  "Formulas": {
+    "7,1": "TODAY()&\",\"&TODAY()"
+  },
+  "CustomNames": [
+    {
+      "Name": "任务ID",
+      "Formula": "分配计划工时!$B$23"
+    },
+    {
+      "Name": "工时类型",
+      "Formula": "分配计划工时!$L$4"
+    }
+  ]
+}

Pages/任务/工时/新增报工.json

@@ -245,8 +245,6 @@
   },
   "Values": {
     "1,1": "工时执行者",
-    "1,11": "工时类型",
-    "3,11": "计划",
     "5,1": "分配日期",
     "9,1": "工时数",
     "13,1": "特定时薪",
@@ -455,7 +453,7 @@
                     }
                   }
                 ],
-                "ID": "c5b9e99e-2dc3-43e6-93ac-18e027a0c928"
+                "ID": "23b613d1-ff23-4279-b737-744dabf1d873"
               },
               {
                 "CommandList": [
@@ -464,7 +462,7 @@
                     "ErrorCode": "0"
                   }
                 ],
-                "ID": "b085c68b-479f-40be-968b-41ce014911c3"
+                "ID": "c11d047c-2c87-4262-867a-cd798346cd0b"
               }
             ]
           }
@@ -680,7 +678,7 @@
                                         },
                                         {
                                           "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-                                          "ServerCommandName": "新增工时",
+                                          "ServerCommandName": "上报实际工时",
                                           "Parameters": [
                                             {
                                               "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
@@ -730,14 +728,6 @@
                                                 "SerializeProperty": "=新增报工!B20"
                                               }
                                             },
-                                            {
-                                              "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                                              "ParamName": "工时类型",
-                                              "Value": {
-                                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                "SerializeProperty": "=新增报工!L4"
-                                              }
-                                            },
                                             {
                                               "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
                                               "ParamName": "指定时薪单价"
@@ -786,7 +776,7 @@
                                                   "ReloadData": true
                                                 }
                                               ],
-                                              "ID": "1a9d18d7-f5f3-4837-9131-12dc012a155f"
+                                              "ID": "7b5236b2-65b3-4d63-87d5-266f170e3d98"
                                             },
                                             {
                                               "CommandList": [
@@ -801,12 +791,12 @@
                                                   "BtnText": "知道了"
                                                 }
                                               ],
-                                              "ID": "ae008719-f61d-4faf-9684-e3265681f99b"
+                                              "ID": "98a1b8c2-3f0b-4db1-9e32-c827988e2954"
                                             }
                                           ]
                                         }
                                       ],
-                                      "ID": "967231d9-b243-4ee4-9682-8990b72d262e"
+                                      "ID": "a21d3218-9ed3-4cda-a34a-81e69bf9f417"
                                     },
                                     {
                                       "CommandList": [
@@ -816,7 +806,7 @@
                                           "Message": "用户已取消"
                                         }
                                       ],
-                                      "ID": "2f3c1d23-a307-421d-a8de-aee1839b8756"
+                                      "ID": "013185f7-e451-47b5-874d-01cc6d21bbe9"
                                     }
                                   ]
                                 }
@@ -859,12 +849,12 @@
                             "LoadBindingDataOption": 2
                           }
                         ],
-                        "ID": "4ae581c7-702b-4490-a00b-4245dde0621c"
+                        "ID": "1f4884a4-ad2f-4284-83f7-7a2ecd1a9d84"
                       }
                     ]
                   }
                 ],
-                "ID": "9df9717f-cedc-4e8e-8bbb-db2a9deed9c6"
+                "ID": "5e92c583-45d0-4e41-8300-b4eebca98dfd"
               },
               {
                 "CommandList": [
@@ -892,7 +882,7 @@
                   },
                   {
                     "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-                    "ServerCommandName": "新增工时",
+                    "ServerCommandName": "上报实际工时",
                     "Parameters": [
                       {
                         "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
@@ -942,14 +932,6 @@
                           "SerializeProperty": "=新增报工!B20"
                         }
                       },
-                      {
-                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                        "ParamName": "工时类型",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=新增报工!L4"
-                        }
-                      },
                       {
                         "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
                         "ParamName": "指定时薪单价",
@@ -1002,7 +984,7 @@
                             "ReloadData": true
                           }
                         ],
-                        "ID": "3768a935-1059-4259-8b15-b2157894514c"
+                        "ID": "02ac04c1-dd3b-4690-b073-594d50d5be28"
                       },
                       {
                         "CommandList": [
@@ -1017,12 +999,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "a42f8909-7cd1-48e8-8fb4-8bfabc3d806d"
+                        "ID": "9d4acb92-3e3d-4371-9a8e-9439a3d2d886"
                       }
                     ]
                   }
                 ],
-                "ID": "4e3e42b6-4322-4ea4-af85-6bf7034d123a"
+                "ID": "8ab6095e-c474-441c-8d9a-ff177aa4cf51"
               }
             ]
           }
@@ -1119,7 +1101,6 @@
       "2,15": 2,
       "2,16": 2,
       "2,17": 2,
-      "3,11": 2,
       "4,0": 2,
       "4,1": 2,
       "4,2": 2,
@@ -1433,10 +1414,9 @@
     "24,20,1,3",
     "24,1,1,3",
     "7,1,1,22",
-    "3,11,1,12",
-    "3,1,1,8",
     "26,1,1,5",
-    "15,1,1,22"
+    "15,1,1,22",
+    "3,1,1,22"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1471,7 +1451,7 @@
                 ]
               }
             ],
-            "ID": "97d420f3-81dc-44b5-9960-a2bb58035967"
+            "ID": "21e3f441-1567-40f7-ada7-c2560ad20590"
           },
           {
             "CommandList": [
@@ -1488,7 +1468,7 @@
                 ]
               }
             ],
-            "ID": "2bd5203a-7db4-4cdb-bff3-33bc2e058482"
+            "ID": "ae04e0b7-1d3d-4101-b590-0ca5d3c41eac"
           }
         ]
       }
@@ -1525,4 +1505,4 @@
       "Formula": "新增报工!$L$4"
     }
   ]
-}//CIRnT83cZS51EU3CVyO1IzADub6fbAVkaWlKIq002Esa9+KsMU3/3aCvkxRvLcI9yjQqGq/BO9Xk6qYzkp3f3rkoF15k9B4ClP5oV3t+MJFrU3PBotw1kA1/pMKt+CUEkMTaKEkVmcovzD5Fw+lQ4OE7sx2pa5Ht3c0S+FVI6aBJMhD1NT127nq7RBmJKEZSKKVI6+Ri/xpaFoL9+VYFI7CNSyiVKPT1Fppe5SjKmWe18cfIAQ1uiKKNZm6XdVxqJgRqCJ4NjTqRCi8sj61ImzTmKoKqvcpA033Clgd0BllsmbRP4w43Q/Q8484LssNui+VtporUZ1FxkzrVjw+aK8m4VHE/DW+ncGFHuxGCe1Kqk5NqLh50Y3qhhxmg/07XrO6b/V1z+n6+e65oGp6Ho4pta2diSeTtv+F4v0MsN57oXB2xVsi+n+140O5siafzM2FjpyPKHp6WG/0BtpMqELmNGZYB2wzBstd28Jwc5Gyv+HfKfaDqrMiVkAwUrObAGxOm5k9vMu6iFQN4VeWVHbyigL7lNMiaID/v9QdksJq6Hk7+hcrUQuTpiqVLJOYtVpu4x/aej2BKfYJrjUj8B9JT+aTdFT1L199aklv7HAVFWYSq9x3dqouI9QH41JuVbauz/DP8rzA0W/UXRGXTH8wCr2GgaAtArhdIj3Zx2rPQ5ctiFdnnCthKmidYZH+Qqf9/JyRQXOMq1qPmPSVcg5ZHN3FyZ0iLDaEb7+lmP9rhR6QT3+5Lf/Fmm3qlEhegW8GDSPs7pbJNXBlC0/e2bkn+fYbU5DJfA4S21EID83/3tGlDJ0x/KR/k5FwCCYOch7/PWGLQinSpRcYk4g0RS0FFl6TB3/MSq2N91CrjNfav7ALwf7CUafjpRCkgpFvG2IEgZvoK7xozBqgBHaMUbA==|920
+}//U985xwSR1sgPDFOD6HaQwaYVeE1LtfQvcKCulUH0gmCvP3ZHx19MsCTlI8Ls+UlHpJXBsBjcZKsdDaGgltpSYQ/O9Hbx0K2ECUexPZb7zKHZKuwfaWxkqfiqvicTjdPA/V+J94TWG0POYtvGxCWwKJEkWZ0XyY3LR4kNfg++hbnx0Gz3Wb9BT6HYn0AJqmYWhTppi1njaTYkw7ppQVXSzRJe10a1VUPrFZ6v8SVb66Nyb5dV+SqU6+eK2WnuYyp0MgrwBDlMd4AhG1mWu5DiVeRH5p73brB3ihMz48x5sugM9yyPjaDCIki9g80vw228IRjK+/A10+2Z5UWOC3UU++1toBM8CdR2K3yEpwPbJBavNSmbf8ecyr1i0mhy6hnRMQCK6cv3/wX8G+X+A2903Pdg7m9cIROZGf68cg30FXnik2uskr6Y+rK67ZNg01kWWlpTejgKCDUqw/gJ1eHvwPWvfEOnIz/u8qGWS7PlIYEJPbaaMfP3OfWgyNxtQHKm64lboOiSZAdqB07b2hgo5alMt9eZeOkeuY8Py03vWAThHZqeqLETKPwxSnTSQw/BYc3VYjTnZOQZ/mnHr/oA7J3spDeoRsoGLyS+NuNuhy/REveg7Dd27ZDnydvL3gOzRm7WzWeazbaqft6tsfPXUitHVOhuz2f3POxWl3Azrv55U66jPQMSXSC5gk6ZMo7jNK0YHwBVDzlPCwnTKAMGlAzRAYWcMvmwC7AphTTVLU/jEWcbl6sSHSHODNh+CmhiNwGL49Wx6TOwolLMmKYI+sVX7b/G7XfRfOyTL5wNOea3pI/MMTzhcbubVqQ/khKegUp+TBy52D3gmCLGu2B04/hE3IUnu2fnWqWUqGQz5mSsYJvRvYXCos558GyUsWxiOluCC7faNW9qDIWlHvwJVQ==|920

Pages/任务/工时详情.json

@@ -225,8 +225,8 @@
     "3,18": "完成比例",
     "6,1": "明细进展",
     "7,1": "工时详情-列头",
-    "10,9": "计划工时",
-    "10,14": "实际工时"
+    "10,9": "分配工时",
+    "10,14": "工时上报"
   },
   "Formulas": {
     "3,20": "O4/D4*100"
@@ -322,9 +322,10 @@
               "ColumnName": "总实际工时"
             },
             {
-              "Formula": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=(工时详情!总实际工时/工时详情!总计划工时)*100"
+              "BindingInfo": {
+                "TableName": "View_任务工时统计",
+                "ColumnName": "工时完成比例",
+                "GUID": "d710b31b-c612-4de9-b6be-1f60bc47ef01"
               },
               "ColumnName": "完成比例"
             }
@@ -354,19 +355,11 @@
         "CommandList": [
           {
             "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PageName": "新增报工",
-            "PassValues": [
-              {
-                "Source": "计划",
-                "TargetCell": {
-                  "SerializeProperty": "=新增报工!工时类型"
-                }
-              }
-            ],
+            "PageName": "分配计划工时",
             "LoadBindingDataOption": 1
           }
         ],
-        "Text": "计划工时",
+        "Text": "分配工时",
         "TemplateKey": "圆角浮动",
         "Icon": {
           "Name": "Application/005_add_5.svg",
@@ -375,7 +368,10 @@
           "UseCellTypeForeColor": true
         },
         "IconSize": 14.0
-      }
+      },
+      "RulesGuidList": [
+        "a8e409dd-908f-46da-9e04-493e23e6f6ff"
+      ]
     },
     "10,14": {
       "CellType": {
@@ -384,18 +380,10 @@
           {
             "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
             "PageName": "新增报工",
-            "PassValues": [
-              {
-                "Source": "实际",
-                "TargetCell": {
-                  "SerializeProperty": "=新增报工!工时类型"
-                }
-              }
-            ],
             "LoadBindingDataOption": 1
           }
         ],
-        "Text": "实际工时",
+        "Text": "工时上报",
         "TemplateKey": "圆角浮动",
         "Icon": {
           "Name": "Application/005_add_5.svg",
@@ -412,6 +400,18 @@
         "ColumnName": "ID",
         "GUID": "a480c8d8-43fc-4d8f-a19e-554d2c55d49a"
       }
+    },
+    "12,7": {
+      "BindingInfo": {
+        "TableName": "任务表",
+        "ColumnName": "项目ID",
+        "GUID": "9c81a94c-e07a-4f8e-82c1-2004e9ecaf2d",
+        "RelationBinding": {
+          "RelatedTable": "项目表",
+          "RelatedColumn": "ID",
+          "DisplayColumn": "工时分配方式"
+        }
+      }
     }
   },
   "StyleDatas": {
@@ -629,7 +629,8 @@
     "3,7,1,2",
     "3,9,1,2",
     "3,18,1,2",
-    "3,20,1,6"
+    "3,20,1,6",
+    "12,7,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -657,7 +658,26 @@
     },
     "RowBreakLines": [],
     "RepeatRangeSettings": [],
-    "RelatedDataTableName": "任务表"
+    "RelatedDataTableName": "任务表",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=工时详情!$H$13=3"
+          },
+          "GUID": "a8e409dd-908f-46da-9e04-493e23e6f6ff",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": true,
+          "IsInvisible": false,
+          "IsReadOnly": true
+        }
+      ]
+    }
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -673,4 +693,4 @@
       "Formula": "工时详情!$E$13"
     }
   ]
-}//0A4t65d1c+/Htjba9YuwALruutUmVJ3wJFBmQutCvJwCjfdBdY1VruRyHvGUe5Aw5U9zZHkef7j+L59pPiG/EH1iS5FXsQPRrxlOY6/qzvybTtNQDp63R9DyeniYXgUaozDGgwyjWMItdgtfWMD73r6Vy/GfSrnxQJjGPHVz9caPlFg3lfV4sPP1uKs35iNmC5I3fnmoEc0u9sYDvCqL54Azr8CYLpwKWylkxRQJhslkvqwZdaeocsmyR01/ZTGsQ0GHMljIG/bp1yN0yi8z5MUr1ncnlQ0QydhL0I8ajoGdhjcvoMveQcWQTutu+/YAyRG9RNAV6FB3oTTLy4IwQ9ABsJXucTIF5Bb99mHNnh9frGYexxmZ+a42CsQQfxtQKP094nafXCeQTFBMR+0RaPNvxZjdm9JUpJ22Bfb0FKzzJu7cODiSSaN4D2+m2IO8E04oMc55BI59tLKsGXH/YC80ZshU1vh52TSjCQUrR0zUmiqGnY9fZ661gWENHa9s1EVqLdn1y60mhuf4DZVkcFjufjA9dUfULGc2MylZI03+Hlfm5reOHxAXMEIu/SS1VAI7C0qSNsYzPzajewqrfUfbQWr1zQx5v/JRa4K/M0UTy9MolXi4aqi8rSQM+FrPUy+kho2+K4o7ZiGoksCuegxuDpy3/xEoLupHlT2iDkvPVe9oxcTEEucQv50/oLCOhBXWiTx7Z7yJ1nMX/GLyXVVVJwvnm2P2+q6VkaGgoYjY1HmLkHOpsV4ZJLcoeQjfJo4j3dH5wWwEjbqkCBgCnOvtYoUR81eIa3XNY2RKvViO7zhoLcz4vxLBE6K5uiGTZIXsfQ9Q/ohBLgzX2Pt3niV+EH3wRMnUpI5jdyM6h7zDoD5de8NjK0TkwDKdTHGSlSFkTEFxlTcx+O3d0AhIjQ==|920
+}//XBiWrd0avZYou4JlEVczK+UtKEttD1Uh9JWTOX+W6lfXD+pzjm8cy4Qxnn562ACWTw0EtvbxRpslgqsI0HV8wjxDzImNkxgGdWtvFzyo0Vk2CQcWIM6Qvo+AMbdVr0lmrmMQFdGlrnj7K7mc4oddIjILYTtUQPdpZQGE0rzLMruvvjzvLG1z1ioYMXXq6P9YV8OozPN0ZOm95rUqoFMC9L43KtkcrWMwPe3hBrTI39QFwE2THHgTk/kFH7vbslxnW1IWOj+D+lNMv9G1eDR4A++gJIoVyIpdtQT92LD3LW2nqhGiG8134fBzZFiNQewkyYDF/4BL1Byu12uY4rxB1o+1hj8RHg3lwknaCtbZGmHXHq+fl6yo1RqtzUZjF344eLIYP+6gMmzHzvDCoKJTBxG3KxOsZdQdNJfgrAhxo0Dh6kBVkTyLc7uxOT8nbcvrjOV8m39IPW4eaoA8WVr+59WVbc8YXUEJI/Lrz8kscJiEqVFCs5idYDhFMAX7+K2BGycH0YiBVFLy6EpptjDm9IThU7mE6Z/oHoaeGSQRyKmmkV46JNxpV0VqFlUl3b8qse2ytbY9UMUHIg1seRx/l6iYksM/o3HojRWitBhWYgiXdaEM59WAdEODHXb3PUJE3Xk7o34NzABU1g1hfkZdlGLca36AYUb1V5u5nPVlrV5sIWNpAfzic+OVuyG3IwZAcpWpnPjIJe3rTalTvOG0Se4mXkx2vHzA8H3wFfyHsxsjRammEd58CMKXcktX7LTvO0R91pgBGyd091XNnTTkg9wZb8mBcGbgysDSoU+dQUmcHqOC2iZKkpBmIoOtpMsnVVk4fgTehy9sS+reXpGrDCHK6SFHBRh6jo7+svLAMfkYDsGM1p370Pfscys0C9uLsDVX/D1YnSRka4X7Obgmjw==|920