evo/EvoCalculator.Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix calculation

Browse Source
This commit is contained in:
vchikalkin 2020-11-16 15:02:59 +03:00
parent 25f82b3347
commit c86c59c790
8 changed files with 155 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
.idea/.idea.EvoCalculator.Core/.idea/workspace.xml generated
View File

@ -14,12 +14,15 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2c3b0650-5589-43d4-b4b7-2979612bb30f" name="Default Changelist" comment=""> <list default="true" id="2c3b0650-5589-43d4-b4b7-2979612bb30f" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Request/RequestCalculation.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Request/RequestCalculation.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -30,9 +33,9 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="mock:///Dummy.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core/Controllers/v1/CalculationController.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Constants/Calculation.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Constants/Calculation.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/E4D853CB-655E-40DD-9699-00D48477D6C9/87/683d251b/IServiceCollection.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/E4D853CB-655E-40DD-9699-00D48477D6C9/87/683d251b/IServiceCollection.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/441B1F1D-0007-4533-BF4B-294EFD4F790B/136/ActionFilterAttribute.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/441B1F1D-0007-4533-BF4B-294EFD4F790B/136/ActionFilterAttribute.cs" root0="SKIP_HIGHLIGHTING" />
@ -40,20 +43,19 @@
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year_PR.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year_PR.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/7EC34705-F546-47B9-970A-53DBFB87C6FB/1/MvcServiceCollectionExtensions.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/7EC34705-F546-47B9-970A-53DBFB87C6FB/1/MvcServiceCollectionExtensions.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/1E0/ExceptionDispatchInfo.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/1E0/ExceptionDispatchInfo.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/168/Future.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/168/Future.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core/Controllers/v1/CalculationController.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/441B1F1D-0007-4533-BF4B-294EFD4F790B/FE/ControllerActionInvoker.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" root0="SKIP_HIGHLIGHTING" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Post/BasePostValue.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/PostValues/BaseCost.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedParams.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/PostValues/BasePostValue.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/PostValues/BonusBase.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/PostValues/BaseCost.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/PostValues/BaseCost.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/PostValues/BonusBase.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/PostValues/BonusBase.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PostValues.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PostValues.cs" />
@ -64,9 +66,6 @@
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/BasePostValue.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/BasePostValue.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowLeasingTests.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowLeasingTests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowMSFOTests.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowMSFOTests.cs" />
@ -96,9 +95,17 @@
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/Test.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/Test.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Request/RequestCalculation.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Request/RequestCalculation.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" /> <option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" />
</list> </list>
</option> </option>
@ -113,8 +120,8 @@
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.34989995" /> <property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.34994584" />
<property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.30020013" /> <property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.30010834" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="XThreadsFramesViewSplitterKey" value="0.86973685" /> <property name="XThreadsFramesViewSplitterKey" value="0.86973685" />
@ -202,6 +209,7 @@
<workItem from="1605168996296" duration="78000" /> <workItem from="1605168996296" duration="78000" />
<workItem from="1605195180317" duration="3232000" /> <workItem from="1605195180317" duration="3232000" />
<workItem from="1605201387598" duration="7501000" /> <workItem from="1605201387598" duration="7501000" />
<workItem from="1605524458430" duration="3397000" />
</task> </task>
<task id="LOCAL-00001" summary="rename: flow"> <task id="LOCAL-00001" summary="rename: flow">
<created>1602593830686</created> <created>1602593830686</created>
@ -309,128 +317,170 @@
<screen x="0" y="0" width="2560" height="1400" /> <screen x="0" y="0" width="2560" height="1400" />
</state> </state>
<state x="1027" y="545" key="ANALYSIS_DLG_com.jetbrains.rider.actions.impl.cleanup.RiderCodeCleanupAction$actionPerformed$dlg$1/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603798988775" /> <state x="1027" y="545" key="ANALYSIS_DLG_com.jetbrains.rider.actions.impl.cleanup.RiderCodeCleanupAction$actionPerformed$dlg$1/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603798988775" />
<state width="2131" height="1245" key="DebuggerActiveHint" timestamp="1605208598306"> <state width="1332" height="768" key="DebuggerActiveHint" timestamp="1605526668030">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1332" height="768" key="DebuggerActiveHint/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605526668030" />
<state width="888" height="502" key="DebuggerActiveHint/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526030871" />
<state width="2131" height="1245" key="DebuggerActiveHint/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208598306" /> <state width="2131" height="1245" key="DebuggerActiveHint/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208598306" />
<state width="535" height="702" key="DebuggerActiveHint/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603889948136" /> <state width="535" height="702" key="DebuggerActiveHint/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603889948136" />
<state width="3029" height="496" key="GridCell.Tab.0.bottom" timestamp="1605208216865"> <state width="1877" height="220" key="GridCell.Tab.0.bottom" timestamp="1605527453299">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.0.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" /> <state width="3029" height="496" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.0.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.0.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="496" key="GridCell.Tab.0.center" timestamp="1605208216865"> <state width="1877" height="220" key="GridCell.Tab.0.center" timestamp="1605527453299">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.0.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" /> <state width="3029" height="496" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" /> <state width="1493" height="321" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" />
<state width="2517" height="481" key="GridCell.Tab.0.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.0.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="496" key="GridCell.Tab.0.left" timestamp="1605208216865"> <state width="1877" height="220" key="GridCell.Tab.0.left" timestamp="1605527453299">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.0.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" /> <state width="3029" height="496" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" /> <state width="1493" height="321" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" />
<state width="2517" height="481" key="GridCell.Tab.0.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.0.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="496" key="GridCell.Tab.0.right" timestamp="1605208216865"> <state width="1877" height="220" key="GridCell.Tab.0.right" timestamp="1605527453299">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.0.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" /> <state width="3029" height="496" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.0.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.0.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.1.bottom" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.1.bottom" timestamp="1605527460229">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.1.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.1.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.1.center" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.1.center" timestamp="1605527460229">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.1.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.1.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.1.left" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.1.left" timestamp="1605527460229">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.1.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.1.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.1.right" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.1.right" timestamp="1605527460229">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.1.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.1.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.2.bottom" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.2.bottom" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.2.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.2.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.2.center" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.2.center" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.2.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.2.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.2.left" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.2.left" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.2.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.2.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.2.right" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.2.right" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.2.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.2.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.3.bottom" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.3.bottom" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.3.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.3.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.3.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.3.center" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.3.center" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.3.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.3.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.3.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.3.left" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.3.left" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.3.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" /> <state width="1493" height="321" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.3.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.3.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.3.right" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.3.right" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.3.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.3.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.3.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.4.bottom" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.4.bottom" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.4.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254034" /> <state width="2517" height="481" key="GridCell.Tab.4.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254034" />
<state width="3029" height="495" key="GridCell.Tab.4.center" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.4.center" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.4.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.4.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.4.left" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.4.left" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.4.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.4.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="3029" height="495" key="GridCell.Tab.4.right" timestamp="1605208200096"> <state width="1877" height="220" key="GridCell.Tab.4.right" timestamp="1605527452930">
<screen x="-3840" y="-1059" width="3072" height="1688" /> <screen x="0" y="-1080" width="1920" height="1040" />
</state> </state>
<state width="1877" height="220" key="GridCell.Tab.4.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" /> <state width="3029" height="495" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" /> <state width="1493" height="321" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" /> <state width="2517" height="481" key="GridCell.Tab.4.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
@ -494,22 +544,30 @@
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" type="DotNet Breakpoints"> <line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs</url> <url>file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs</url>
<line>56</line> <line>10</line>
<properties documentPath="C:\Users\Chika\Projects\EvoCalculator.Core\EvoCalculator.Core.Tests\Calculation\Columns\InsuranceBonusExpensesTests.cs" initialLine="56" /> <properties documentPath="C:\Users\vchikalkin\Projects\EvoCalculator.Core\EvoCalculator.Core.Calculation\Columns\RevenueColumn.cs" initialLine="10">
<option name="timeStamp" value="3" /> <startOffsets>
<option value="356" />
</startOffsets>
<endOffsets>
<option value="357" />
</endOffsets>
</properties>
<option name="timeStamp" value="27" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints"> <line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs</url> <url>file://$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs</url>
<line>256</line> <line>201</line>
<properties documentPath="C:\Users\Chika\Projects\EvoCalculator.Core\EvoCalculator.Core.Tests\Calculation\Columns\InsuranceBonusExpensesTests.cs" initialLine="256" /> <properties documentPath="C:\Users\vchikalkin\Projects\EvoCalculator.Core\EvoCalculator.Core\Controllers\v1\CalculationController.cs" initialLine="197">
<option name="timeStamp" value="7" /> <startOffsets>
</line-breakpoint> <option value="10746" />
<line-breakpoint enabled="true" type="DotNet Breakpoints"> </startOffsets>
<url>file://$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/SumCurrentTLM.cs</url> <endOffsets>
<line>85</line> <option value="10828" />
<properties documentPath="C:\Users\Chika\Projects\EvoCalculator.Core\EvoCalculator.Core.Tests\Calculation\Columns\SumCurrentTLM.cs" initialLine="86" /> </endOffsets>
<option name="timeStamp" value="14" /> </properties>
<option name="timeStamp" value="29" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>

2
EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs
View File

@ -8,7 +8,7 @@ namespace EvoCalculator.Core.Calculation.Columns
{ {
} }
protected decimal Sum public decimal Sum
{ {
get { return Values.Skip(1).Sum(x => x); } get { return Values.Skip(1).Sum(x => x); }
} }

2
EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs
View File

@ -13,7 +13,7 @@ namespace EvoCalculator.Core.Calculation.Columns
{ {
Values[2] = -postValues.BonusBase.Value * (decimal) preparedValues.DirectorBonus * Values[2] = -postValues.BonusBase.Value * (decimal) preparedValues.DirectorBonus *
(decimal) (1 + preparedValues.SalaryRate) * (decimal) (1 + preparedValues.SalaryRate) *
(decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate); (decimal) preparedValues.MarketRate * (decimal) preparedValues.DistrictRate;
Values[0] = Sum; Values[0] = Sum;
} }
} }

2
EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs
View File

@ -16,7 +16,7 @@ namespace EvoCalculator.Core.Calculation.Columns
? -1 * postValues.BonusBase.Value * ? -1 * postValues.BonusBase.Value *
(decimal) (cashflowMsfoColumn.Nominal / preparedValues.IRR_MSFO_Plan - 1) * (decimal) (cashflowMsfoColumn.Nominal / preparedValues.IRR_MSFO_Plan - 1) *
(decimal) preparedValues.ExtraBonus * (decimal) (1 + preparedValues.SalaryRate) * (decimal) preparedValues.ExtraBonus * (decimal) (1 + preparedValues.SalaryRate) *
(decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate) (decimal) preparedValues.MarketRate * (decimal) preparedValues.DistrictRate
: 0; : 0;
Values[0] = Sum; Values[0] = Sum;
} }

4
EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs
View File

@ -14,13 +14,13 @@ namespace EvoCalculator.Core.Calculation.Columns
{ {
Values[1] = -1 * (preparedValues.RatBonus + preparedValues.NsBonus + preparedValues.NsibBonus) * Values[1] = -1 * (preparedValues.RatBonus + preparedValues.NsBonus + preparedValues.NsibBonus) *
(decimal) (1 + preparedValues.SalaryRate) * (decimal) (1 + preparedValues.SalaryRate) *
(decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate); (decimal) preparedValues.MarketRate * (decimal) preparedValues.DistrictRate;
Values[2] = preparedValues.BonusFix > 0 Values[2] = preparedValues.BonusFix > 0
? -preparedValues.BonusFix ? -preparedValues.BonusFix
: -1 * postValues.BonusBase.Value * Convert.ToDecimal(preparedValues.Bonus) * : -1 * postValues.BonusBase.Value * Convert.ToDecimal(preparedValues.Bonus) *
(decimal) (1 + preparedValues.SalaryRate) * (decimal) (1 + preparedValues.SalaryRate) *
(decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate); (decimal) preparedValues.MarketRate * (decimal) preparedValues.DistrictRate;
for (var i = 3; i < Values.Length; i++) Values[i] = 0; for (var i = 3; i < Values.Length; i++) Values[i] = 0;

16
EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs
View File

@ -9,9 +9,19 @@
public void ComputeValues(NSIBBruttoGrColumn nsibBruttoGrColumn, NSIBExpensesColumn nsibExpensesColumn, public void ComputeValues(NSIBBruttoGrColumn nsibBruttoGrColumn, NSIBExpensesColumn nsibExpensesColumn,
CashflowNSIBColumn cashflowNsibColumn) CashflowNSIBColumn cashflowNsibColumn)
{ {
Values[1] = nsibBruttoGrColumn.Values[1] - cashflowNsibColumn.Values[1]; if (nsibBruttoGrColumn.Sum == 0)
for (var i = 2; i < Values.Length; i++) {
Values[i] = Values[1] * nsibExpensesColumn.Values[i] / nsibExpensesColumn.Values[1]; for (var i = 0; i < Values.Length; i++)
{
Values[i] = 0;
}
}
else
{
Values[1] = nsibBruttoGrColumn.Values[1] - cashflowNsibColumn.Values[1];
for (var i = 2; i < Values.Length; i++)
Values[i] = Values[1] * nsibExpensesColumn.Values[i] / nsibExpensesColumn.Values[1];
}
} }
} }
} }

2
EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs
View File

@ -12,7 +12,7 @@ namespace EvoCalculator.Core.Calculation.Columns
SumCurrentColumn sumCurrentColumn, SumCurrentNegativeColumn sumCurrentNegativeColumn, SumCurrentColumn sumCurrentColumn, SumCurrentNegativeColumn sumCurrentNegativeColumn,
SumCurrentInterestColumn sumCurrentInterestColumn, SumCurrentTLMColumn sumCurrentTlmColumn) SumCurrentInterestColumn sumCurrentInterestColumn, SumCurrentTLMColumn sumCurrentTlmColumn)
{ {
for (var i = 2; i < Values.Length; i++) for (var i = 7; i < Values.Length; i++)
Values[i] = sumCurrentColumn.Values[i] + sumCurrentNegativeColumn.Values[i] - Values[i] = sumCurrentColumn.Values[i] + sumCurrentNegativeColumn.Values[i] -
sumCurrentTlmColumn.Values[i] * (1 + (decimal) calculation.VatValue) - sumCurrentTlmColumn.Values[i] * (1 + (decimal) calculation.VatValue) -
sumCurrentInterestColumn.Values[i] * (1 + (decimal) calculation.VatValue) * sumCurrentInterestColumn.Values[i] * (1 + (decimal) calculation.VatValue) *

4
EvoCalculator.Core/Controllers/v1/CalculationController.cs
View File

@ -168,7 +168,9 @@ namespace EvoCalculator.Core.Controllers.V1
var cashflowNsibColumn = new CashflowNSIBColumn(preparedValues.Nmper + 1, dateTempColumn, var cashflowNsibColumn = new CashflowNSIBColumn(preparedValues.Nmper + 1, dateTempColumn,
nsibBruttoGrColumn, nsibExpensesColumn); nsibBruttoGrColumn, nsibExpensesColumn);
cashflowNsibColumn.ComputeValues((decimal) cashflowLeasingColumn.IRR);
if (nsibBruttoGrColumn.Sum != 0)
cashflowNsibColumn.ComputeValues((decimal) cashflowLeasingColumn.IRR);
var revenueColumn = new RevenueColumn(preparedValues.Nmper + 1); var revenueColumn = new RevenueColumn(preparedValues.Nmper + 1);
revenueColumn.ComputeValues(nsibBruttoGrColumn, nsibExpensesColumn, cashflowNsibColumn); revenueColumn.ComputeValues(nsibBruttoGrColumn, nsibExpensesColumn, cashflowNsibColumn);