From bc1df963cf4f0c30907b10b96d6c50b93f0e6eef Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Fri, 1 Mar 2024 20:22:01 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=AE=8C=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E4=B8=8A=E6=8A=A5=E5=8A=9F=E8=83=BD","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":11,"Name":"UserService"},{"State":?= =?UTF-8?q?1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=AD=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":23,?= =?UTF-8?q?"Name":"TableView/=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E7=94=A8=E6=88=B7=E7=BB=84=E7=BB=87=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E8=A7=92=E8=89=B2=E5=88=86=E7=B1=BB=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":23,"Name":"TableView/=E8=A7=92=E8=89=B2=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"Stat?= =?UTF-8?q?e":1,"Type":23,"Name":"TableView/=E8=A7=92=E8=89=B2=E6=8B=A5?= =?UTF-8?q?=E6=9C=89=E6=9D=83=E9=99=90=E8=A7=86=E5=9B=BE","ExclusiveType":?= =?UTF-8?q?0},{"State":1,"Type":23,"Name":"TableView/=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"Stat?= =?UTF-8?q?e":1,"Type":23,"Name":"TableView/=E7=BB=84=E7=BB=87=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E8=A7=86=E5=9B=BE","ExclusiveType":0},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E5=B7=A5=E6=97=B6=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E5=B7=A5=E6=97=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E5=88=97=E5=A4=B4"},{"State":1,"Type":31,"Name":"Use?= =?UTF-8?q?rControlPage/=E5=B7=A5=E6=97=B6=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":23,"Name":"TableView/View=5F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=97=B6"},{"State":3,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E5=AD=90=E4=BB=BB=E5=8A=A1=E8=A7=86=E5=9B=BE"},?= =?UTF-8?q?{"State":3,"Type":1,"Name":"PCPage/=E5=8F=B3=E9=94=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=951"},{"State":3,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=87=E5=AE=9A=E4=BA=BA=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 213 +-------------- ForguncyDB.sqlite3 | Bin 22528 -> 22528 bytes Pages/31a709cea02e45ad83bb92336a6d829.json | 236 +++++++++++++++-- Pages/36d33d0079644f28b16bd0fec90394c.json | 163 +++++++++++- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 69 ++++- Pages/任务/任务-工时.json | 8 +- Pages/任务/工时/新增报工.json | 13 +- Pages/任务/工时详情-列头.json | 21 +- Pages/任务/工时详情.json | 31 +-- Pages/共用/右键菜单1.json | 170 ++++++++++++ ServerCommands/工时/删除指定人员工时.json | 202 ++++++++++++++ ServerCommands/工时/新增工时.json | 294 ++++++++++++--------- Tables/工时/View_任务工时统计.json | 14 + Tables/用户/用户信息视图.json | 23 +- Tables/项目任务/子任务视图.json | 162 ++++++++++++ UserControlPages/工时记录列表.json | 22 +- UserServiceDB.sqlite3 | Bin 253952 -> 253952 bytes 17 files changed, 1235 insertions(+), 406 deletions(-) create mode 100644 Pages/共用/右键菜单1.json create mode 100644 ServerCommands/工时/删除指定人员工时.json create mode 100644 Tables/项目任务/子任务视图.json diff --git a/.collaboration b/.collaboration index 55abdcd8..d09f143c 100644 --- a/.collaboration +++ b/.collaboration @@ -237,18 +237,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:23:45.9009924+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -296,17 +285,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:11:32.5963774+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -314,17 +293,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:36:11.5499696+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -344,137 +313,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261285+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261307+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261319+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261331+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261354+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261366+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261378+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261389+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:15.6261402+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -491,57 +370,19 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:22:33.7467453+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T20:11:36.0053946+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情-列头.json" - ] + "ModuleType": 1 }, { "ModuleName": "UserControlPage/工时记录列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:14:26.0413177+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\工时记录列表.json", - "Pages\\36d33d0079644f28b16bd0fec90394c.json" - ] + "ModuleType": 31 }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:22:00.5777167+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "Image/更多.svg", @@ -553,16 +394,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:20:29.5425118+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommands/工时", @@ -570,45 +402,18 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:12:32.530953+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:11:20.0585979+08:00", "ModuleType": 23 }, { "ModuleName": "PCPage/右键菜单1", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T19:46:46.3169751+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/删除指定人员工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-01T20:05:51.2590423+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 3966e59a262d2f147cb1f99841f7c5c6c0fd69fb..e411ce858a5696f21ea0b752e85d723b4ed8250c 100644 GIT binary patch delta 2126 zcmcIlZ){Ul6u;-5*Y>@w+iTZ#U7538x6&<}j;)Mnq8q~iPQsso^UE@HK*yG_jfHw5Wm$0fXDJ)xCwHZFFtT8J~S@s(QTgVADcTiri<}2Ly3u3Npz)qy=7j~8jBCV zPV1Z?trADcpwmf1b`}j;Dh*aE4Q4Y9Cdi;s;*AVX;WB=eH^%JJD&E&EsUA;(QmSU; zJzNtRW+|v&(nyqFaG`z1-8AlV^b)6 z-=_}qt?`M(>Cxan1D#*41dOpIEuTeOkwORkjzRzQ3ENaDpFPjXaaUC4zsOn z5$ucB=Ex9m6&6C3nHqMnN!eRuvWT+W0&&8hE8fn%1ClrhUa*J}ze`NQ_(Pp7Nqd)b z(aU{+u@M?GH4liB4DS$Rlayl&OS60?=Ffn6a0y$J(`#a-w3pgoCUHm2&6cr=;cfgD zzr>I6IQC;ZHj$;}*q13&!DI%e*$0kF=XoY4j>_Kowh(tcF00Pudw7#VF_>IprR$Kq zF6p#>aE0qsHq4>8SGd3iJ$y4;1Izd<{{%1djfbUt{v|Gd__%;u zm`4HSiTPvxsJ;U%%q=U-Z5$-uDT*6e8RPq5iYDzBUExma&rvPTiVAt4F&2AiF>EaJ zHX0wZCU5PAd6{;N@0zijlr>%b?M>Wtd7n?V23pGV* zGR385ec;gH=GFTN_`zx~*tK=+t7;2~%Yh}T&FH}!jQIBp-XNr|V!49I+=erSlW0Vs zfVQiDd-Y3fn(+&8olOh7^c_ZevPAKkKgoX4+8=Rmtt~e8d@UH}AT6cbIOq9{-{AQakDX(r#wA+TO+rqrxc+hY E3%38%$N&HU delta 840 zcma)3OH30{6utM|p`B?vZHN9)5-EkIF?d%|B8CDR7bI+aGinSwUvlrudH3_~Id^6iXI62c zR3iWg3j2E~U)_L|zqXQJNV29P?#4>q=l4oBeT;ZM5JrhF)`a+G;3ef!$X^E|$iz#~ z_!)E|Yht3H?38F0Fq`^)!udSHc~#*Y4&m(5i#kcRAr*iMhE}&lyii&q@Gj7a8IJGBNdLM&n0t}62Ik-V3Eb+nZJPl%d636iX{sJlMT`y(4H9P z8}YqZNHEw3+8216_szIt2%;CQ!+kZ{R$N!Sd(@^`5SYSt{6euyqUpAMtP#KwAB7VC6c zLmb4t%&i*ONRnW=2DD~quIF^+Ji21B1|_Ddng(!eTgO25-r&gCaQ5t5$9UVBK*y}#Z4brcIM>g6F^0v)ecVD{IDFbHksu3H&Z2k$ zvU$Ci^sJ93yT4;Gue$t!^eK&RcO0RYf4T74tx^dPWPqhH3K=WAHORw#>nvb5x-OL= t`uTX*dr7q2;qBeq4r|M78Q8L+$&1X9>j~Kd_4V>>ztP;@h=分配天数,待分配工时,ROUNDDOWN(工时数/分配天数,1))" - }, - "ID": "4f5d9e30584c4ae79cfd818467975213" + "ID": "1a7c7a0561d24027953d7057ac3caa93" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -348,102 +339,154 @@ } } ], - "ID": "98b50752-349a-4f25-b57a-5ce140ac2ce4" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "fd71f2a5-845b-4775-a877-0649e37ba693" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "05e48271-1a3d-4795-bdd5-cb1c645293ac" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "6691a7d6-6d9e-4b5d-baf8-49b9124edd82" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "21286054-452a-4a3b-aea7-994254804b38" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "7c4c1809-a688-4564-b5c7-3fcb4083324f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行者" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "92d5bc0e-8bb8-4a90-a896-c8dcf5c37edc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "429a69c0-101e-411c-b38e-854c0adf2657" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } - } - ] - } - ], - "ID": "ac35628d-4bd0-4163-905e-a627bdd70880" + "ID": "b539d26d-1d71-4ce6-b60b-527c90f86132" } ] } ], - "ID": "5f045248-1e2c-4eb1-b457-bd29b481c4b0" + "ID": "d6558544-652c-44af-81eb-31dec04f33b2" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=index" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配天数" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" + }, + "ID": "cb78ce7bdd4c440b9b449d7af1470fd9" + } + ], + "ID": "52096b70-4bfb-4135-9f7c-a3a984edea0b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待分配工时" + }, + "ID": "308e266c05e3417f9d13962caff1095b" + } + ], + "ID": "60f32b23-a3f2-4b49-b84a-11eb342d4799" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "待分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" + }, + "ID": "0a0b3c873fcf4de9b94766fc7c44005e" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "62460558-f2bd-4b87-8cea-6fc0dadf3b39" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "acc1cf0b-5748-40bc-b1b2-5bb59df509a1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d8afca37-aace-413f-8d57-1fba6d54b77c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "1dd01750-f4f3-4c1d-9afb-37c8caa80b30" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "29749b4c-60d8-4963-9ced-4fc1c4d52d67" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行者" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "3e99bd55-10d7-4f5d-9dd8-a866365961a2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "d9623657-4a05-4e47-a927-0e188c5fa69a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + } } ] } @@ -457,7 +500,7 @@ "Message": "提交工时成功" } ], - "ID": "53b4c905-c899-4ff9-bcf9-99a3a4fb830e" + "ID": "67983164-51fb-452a-ad85-bab842928a39" }, { "CommandList": [ @@ -470,11 +513,26 @@ } } ], - "ID": "8a07858b-3d0d-40f4-8514-d8915cf1cf0e" + "ID": "876ca00c-e70e-4e57-beb3-7f440cb828b8" } ] } ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] } } ] diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 32c5e3e5..672815f3 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -42,6 +42,20 @@ "MaxLength": -1, "Name": "实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "AggregateFunction": 4, + "DataColumnName": "计划工时", + "Name": "总计划工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "AggregateFunction": 4, + "DataColumnName": "实际工时", + "Name": "总实际工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { diff --git a/Tables/用户/用户信息视图.json b/Tables/用户/用户信息视图.json index 5d101973..b08ca343 100644 --- a/Tables/用户/用户信息视图.json +++ b/Tables/用户/用户信息视图.json @@ -56,12 +56,33 @@ "MaxLength": -1, "Name": "负荷", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "公司", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "部门", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "小组", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "BuiltInViewInfo": { "ViewName": "用户信息视图", "SourceTableName": "FGC_UserInfoTable", - "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [头像] AS [头像], [负荷] AS [负荷] FROM [FGC_UserInfoTable]", + "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [头像] AS [头像], [负荷] AS [负荷], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]", "ViewType": 1 }, "PrimaryKey": [ diff --git a/Tables/项目任务/子任务视图.json b/Tables/项目任务/子任务视图.json new file mode 100644 index 00000000..d9f670ca --- /dev/null +++ b/Tables/项目任务/子任务视图.json @@ -0,0 +1,162 @@ +{ + "Name": "子任务视图", + "Columns": [ + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "任务名称", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "执行者", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "参与者", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "开始时间", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "结束时间", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "任务类型", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "版本", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "任务说明", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "备注", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "父任务ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "任务状态", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "分组ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "工时核定方式", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "关联资源", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "FGC_Creator", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "FGC_CreateDate", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "FGC_LastModifier", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "FGC_LastModifyDate", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + } + ], + "ExternalDatabaseInfo": { + "ConnectionId": "业务表", + "SourceTableName": "子任务视图", + "SourceTableSchema": "dbo", + "CreateViewSql": "SELECT * FROM \"任务表\"\r\nWHERE \"父任务ID\" is not NULL", + "ViewInfo": { + "ViewName": "子任务视图", + "IsUpdatable": true, + "QueryColumns": [ + "ID" + ] + } + }, + "Indexes": [], + "Relations": [] +} \ No newline at end of file diff --git a/UserControlPages/工时记录列表.json b/UserControlPages/工时记录列表.json index 168e92d3..9cd24277 100644 --- a/UserControlPages/工时记录列表.json +++ b/UserControlPages/工时记录列表.json @@ -19,13 +19,7 @@ "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 362.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "Mode": 1 } }, "4": { @@ -291,15 +285,5 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "CustomNames": [ - { - "Name": "执行者", - "Formula": "工时记录列表!$B$6" - }, - { - "Name": "属性任务ID", - "Formula": "工时记录列表!$E$6" - } - ] -}//dcrT93P0Vq3dnRpeXPXnD3qRuQ/Wo3vB7h/kRNi1luoBpiVX+b2FOdFUlnvhZlfnJ1Dn+b5kTbl+L897hqDb04oxy5uTuFkXI2UK2jYi8RvWgRJ75S0fDaFiaRpf4xQ7C2WZ2hUsn7vgbkqbfUkTElP3w5FTOObpSkb7pw+j5V7B8qLqV7eGpqSioHiWTtlO4Y2yvd9vqRbhcMPC7EsZSUd58w1/Y7Afgma1awOZJmvEoWOQsJjsoksuI1gYqtZG1D0Y7A6NZvAQ/4MTLj7xM9o3IAd4t+xr0XRhDsk/q3kCwngEdIsVrKeJ6CJ73J0iQCFTSEHotvA+iYzp8KJFDo/07O6RnYf59xJM57oXX3plDN9jYNXzFrJm92x7Dg+psgDwthxH2s/73YLdeg4DxIV4hRODnyQFl50V46jlK1Q73gISkqHqvrjlp68UJouulUVRFWaDzrPn3QjIPVJfp2WJSUMdsw4JTZ9ng8b0jNgQ9+hk+brpdE144kBmaMyKErWsL4ecY8WR0wHvzWRIp6SfWESXj2JTH+rWKmck8WeKQbBmXQZYIo5nh3QjIw8um/c/rLEeKEfdtHZSgThUHl+CHHIMxD8QhKZG7oHsU4qgt4CTJ9q0mZS/yBAsmzurC7C/mR6GzpX67RCFOHRbOvIH7+qf2vdxuX7MunAzSbDv5psy27Zwsj0VGlMd2jgPMeDtTcmWWlkWNFc7gpEXXG9QIfPFj9ITcs43d3TD2Q03WGZWgECedvMmK/WMHX8LMc+X0fo2ZDt+eBDCBDJniwi56ZlMdNL0YUtJmNc9WOKW9D2vaFBAYblGcY7PgHN5ZdR/upW7asWLRf8gYN/yNgmd/Jjjnj9NM1HRZqLrJ2YWQ2ZsqMFG0T/z0xEfBkwXC0YkT5oFcSsW+19V7/dI+w==|920 \ No newline at end of file + } +}//SSlCpxXKhzmmLrwOln3P5oMYYILDUaUoDmVA3d7mNJCX9yg/s0DX47MsS6Z6DLDbr9+LTsIAWUJu9JXsVXC/4DWAt4e+7hwQsMMnCPoGljvwILdY0PR2HEtBeZ/XqvOsDdU7oj7CybZBnF54+9UvJMM22mjbL/Zftg7gzPf0pI//yeY7KgAko3Ycs7mS9JhPdDtAS+yI7GnHj/Olt1+XeuazJ/We8fyyBC3WOr0XFZISj2S6dZZvnvW1b6rBMgmTyt3irhjwqH2R9d3FY0b3sXHwtnmyr6oA/rpNpH/cys5iqxLT+EIHhEuaO6OSz+HxBR7ApDfZJXYZR5+/B9fYNkXQCN5KSg3TAIl1VtIWeRU/p0n5IO9z992J8vDDkFmuQ3Ym85ryBhTnaYpGXniXQf4mhu1fUg9lT4uV5guXJeDhpt4SYNX8AeG0j/KF64ilW+WgLT6ZtigoLuM4qPnXTrWUj5FiN2H/JkLaL4gtnYxns9aFf2UW/zXirZFL0PZyPfCMsqp+cepMzudE5OH+LFuihgZ5OTtFSqrhdC1eg31mX+Rlw8ofWeoIQ0GrtkFQvMSJOvijLpSmaXNsYtafrjyJ3W4cnOJs1i91rw8p0tNMzovEXrsgPon8/84VP5JIkvLiEY1fU5jhcGshclsBVH3RjfcRiCAM+WBIe1HxiwjqyySlAtOrm10tfymT93nuOqLLA2NlvU8dhvQcYXC+s1rKiV+RART+8U+RUhl0oort4w1yHkwuL+BX/rE+I/1cDDf7DGd4pLOf3vmh+PwDIhnuLTSkmQTzQ4zXnVLXcWAp6eU/MFpW0uYJ+n7g3L2U7Ii7ellu+5eRQkB2fT8AeDR6vuLVekr5xLUVucgLqQyMF//3Lt+SgrL37h+MoHq/aT3SpMew/kbBGWUNuFZTGg==|920 \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 3913bd24870c0223001554a9cc18ab2f32025c6b..0b4e209c06b2dbb7c3832c4572a51885597b8870 100644 GIT binary patch delta 2499 zcmZ`*Yiv|i5I*Ogd-vW`DAR(1tHE9uySuRheQdYg#0pD`AP?K>B2;6bkL|K_+b!J| zsDFScMwHlMO^_Ikgoh*`k&={0OVS@kV!=ld0WkuBZnp(_`V5-roO9a>sch0Sr_-4; z-^_e7+jZTrt{Yk(Nj*jgc^ZF)KgTvdnM055U$z6rst_XZHSC2=5IT^WvKZD*aqA>4 z?J+_cqjjO?rs`lgv1e!EosEOrKWc2Qp1E@6w907hqb{9HvZoUg3D>O&_kXk{erS`t z4*lJ9>cnn$5fWQoUfUFl?`Rq5*igSbS`n-pvdC0);!4X&CjP40a9udo*ihaWZAk3X zwTX7;Fk{h(>}-tD}*sU;|6inVnj9?O_}9(Y9hX zaWZ>QW7BC#L$p5F(Ac~HAqL7TB0*)cichuepJAu0t!KvL4hK+tZ&57RfVS1)NYE|7 zsL7`Z)QsyJ_e%0!@zZ+^BfH_PKM_2Xx@ z-(Og1-HH}Azf`$!Rk$+J5LvzG*}1i=3rotE*EBs-G2g$qKCsx65m->?^ZH(`ZjRP^ zJQ=grESNoKR#{%4uE>-BQtbIqLBVj0wZlQytFHUv$j!>h_vYq}!r?D0_U0Fr%qd^# z3#|6}BE>7J=U0`7<_0o7H5r)!e>7u7*1YUh&4Jvxq2;A3n(E8EOBVV(rSq%&q1n-_ zg{1`rYlne&hk~qEo%h9&?aj~eczmO96gFp6cys2(yxFswa>LKn$6kn)2Ey|yUoBs> zq_)T(TI4A!tf~*i>KDX3tDalZoHuuNC{X-jUD@jFhkVsF6?YfJI~1g?rg-aUri~xX zv;%jRCYebLx(Qr`Q_ziVZHJ8U4jV})MsobKmPF_4eTO;|`?fu3+DL}bb*+oHY>pq? znb`ey{Lq_iS6l4pf0Mx9@H^Z@MqdI`#Bn&pX_}02F3AIN!TVp}XNaTK_mH6p1E)h% zQMk|th1*mqqg+W6Y=cX};Wk`>OXzSCChIB{CQM3~sY;0tXe#CWz&}f=*NkrzVT6 zs^ZR=I2A>7q+=abOOPS`!#(N8luyGGDmH_owJs5D8TjPgfsO5{ zD*lqrk=FfNI{H6+ZE$OADwC?d&d&H-+lEw%R1I!BocLg$r5Z!!E7mUpmIi$zu%J&8 zNdmiHCj>l2%+H^4dio&6##DlxbJ(bqX2(o=2W$*KoVPDiO+oO3YO8{sIZxm`hByTd zlTJVIg5ghpyu0cOsKz{Z@4+dz5 zBFPoU7%5DS!l0TVg{nz`FojZKNFPphJPm3S^XZ&Tep7Z$OO6a04W!}1)*c%3jMnWfPY zV!FjHuxRMyY!a3HbRE1tolQ)^i8^8Vo`Vw>)_Z*A^00hIT$NPjqW27gIzsQi#7>1P z_|iFR!Y!;!5o5|!oJ(nIK(AHv8!(8Y_7j|eUaa|HC=e6xmYcvWH-SrT0+-wbPWg)U z&xTwaif)zYjM##4ID=uogglYJeGbZh%Z%=>?=8XpKj0QRUj~pHM*_vQWAI(A GtmI#7`(&p8 delta 444 zcmZ9GO-lk%6o&8D3{4=%Au}XlhCXl;Xt+<>2fC=WV>E$iIgD=FiT!}AL84VqL7O%; z&}=8#=}%}=&`L@7qSaBb(8E1k?t9PsoVV&j)rb1BS|fyPVNa@dzLBK0N8=7;3M~RH zSJhu&CCOwGizNfw2S@qie7R!hDkXdB;e2UJXz3H^yQJHK2Tz?v+g&M-THwbA804 zP#{o1P7a(x`f7Ho`<<0_6gvbu807<;&RN70J{y8EcK>BmiJ+V+Y<^mni6p3^xIbB{ zKUpGpD-3M1kp2b0%YWwp