|
@@ -2,15 +2,12 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="c6f02f4e-af06-43d1-8bc0-507af01d0573" name="Default Changelist" comment="">
|
|
<list default="true" id="c6f02f4e-af06-43d1-8bc0-507af01d0573" name="Default Changelist" comment="">
|
|
- <change afterPath="$PROJECT_DIR$/course/src/app/types.ts" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/course/src/app/base-report.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/base-report.component.ts" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/course/src/app/create-report.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/create-report.component.ts" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/course/src/app/edit-report.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/edit-report.component.ts" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/reports.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/reports.component.ts" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/reports.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/reports.component.ts" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/course/src/app/services/reportData.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/services/reportData.service.ts" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/course/src/app/types.ts" beforeDir="false" afterPath="$PROJECT_DIR$/course/src/app/types.ts" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -34,31 +31,33 @@
|
|
<entry key="css" value="1" />
|
|
<entry key="css" value="1" />
|
|
<entry key="gitignore" value="2" />
|
|
<entry key="gitignore" value="2" />
|
|
<entry key="groovy" value="1" />
|
|
<entry key="groovy" value="1" />
|
|
|
|
+ <entry key="html" value="1" />
|
|
<entry key="json" value="16" />
|
|
<entry key="json" value="16" />
|
|
- <entry key="ts" value="59" />
|
|
|
|
|
|
+ <entry key="ts" value="65" />
|
|
<entry key="txt" value="1" />
|
|
<entry key="txt" value="1" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
<usages-collector id="statistics.file.types.open">
|
|
<usages-collector id="statistics.file.types.open">
|
|
<counts>
|
|
<counts>
|
|
<entry key="CSS" value="1" />
|
|
<entry key="CSS" value="1" />
|
|
|
|
+ <entry key="HTML" value="1" />
|
|
<entry key="JSON" value="3" />
|
|
<entry key="JSON" value="3" />
|
|
<entry key="PLAIN_TEXT" value="2" />
|
|
<entry key="PLAIN_TEXT" value="2" />
|
|
<entry key="Scratch" value="3" />
|
|
<entry key="Scratch" value="3" />
|
|
- <entry key="TypeScript" value="59" />
|
|
|
|
|
|
+ <entry key="TypeScript" value="65" />
|
|
<entry key="tsconfig" value="13" />
|
|
<entry key="tsconfig" value="13" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
<counts>
|
|
<counts>
|
|
<entry key="json" value="62" />
|
|
<entry key="json" value="62" />
|
|
- <entry key="ts" value="3768" />
|
|
|
|
|
|
+ <entry key="ts" value="4529" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
<usages-collector id="statistics.file.types.edit">
|
|
<usages-collector id="statistics.file.types.edit">
|
|
<counts>
|
|
<counts>
|
|
<entry key="JSON" value="5" />
|
|
<entry key="JSON" value="5" />
|
|
- <entry key="TypeScript" value="3768" />
|
|
|
|
|
|
+ <entry key="TypeScript" value="4529" />
|
|
<entry key="tsconfig" value="57" />
|
|
<entry key="tsconfig" value="57" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
@@ -77,19 +76,10 @@
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
- <entry file="file://$PROJECT_DIR$/course/src/app/types.ts">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="413">
|
|
|
|
- <caret line="58" column="37" selection-start-line="58" selection-start-column="37" selection-end-line="58" selection-end-column="37" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/reports.component.ts">
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/reports.component.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="352">
|
|
|
|
- <caret line="46" column="45" lean-forward="true" selection-start-line="46" selection-start-column="45" selection-end-line="46" selection-end-column="45" />
|
|
|
|
|
|
+ <state relative-caret-position="135">
|
|
|
|
+ <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -131,15 +121,15 @@
|
|
<option value="$PROJECT_DIR$/course/src/app/app-routing.module.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/app-routing.module.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/app.module.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/app.module.ts" />
|
|
<option value="$PROJECT_DIR$/course/tsconfig.json" />
|
|
<option value="$PROJECT_DIR$/course/tsconfig.json" />
|
|
- <option value="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" />
|
|
|
|
- <option value="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" />
|
|
|
|
<option value="$PROJECT_DIR$/course/src/app/create-report.component.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/create-report.component.ts" />
|
|
- <option value="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" />
|
|
|
|
<option value="$PROJECT_DIR$/course/src/app/base-report.component.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/base-report.component.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/edit-report.component.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/edit-report.component.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/services/reportData.service.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/services/reportData.service.ts" />
|
|
- <option value="$PROJECT_DIR$/course/src/app/reports.component.ts" />
|
|
|
|
|
|
+ <option value="$PROJECT_DIR$/course/src/app/services/messenger.service.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/types.ts" />
|
|
<option value="$PROJECT_DIR$/course/src/app/types.ts" />
|
|
|
|
+ <option value="$PROJECT_DIR$/course/src/app/services/reportItem.service.ts" />
|
|
|
|
+ <option value="$PROJECT_DIR$/course/src/app/create-report-item.component.ts" />
|
|
|
|
+ <option value="$PROJECT_DIR$/course/src/app/reports.component.ts" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -333,12 +323,12 @@
|
|
<updated>1535304175302</updated>
|
|
<updated>1535304175302</updated>
|
|
<workItem from="1535304176395" duration="75000" />
|
|
<workItem from="1535304176395" duration="75000" />
|
|
<workItem from="1535304274687" duration="6343000" />
|
|
<workItem from="1535304274687" duration="6343000" />
|
|
- <workItem from="1535393199806" duration="10540000" />
|
|
|
|
|
|
+ <workItem from="1535393199806" duration="11991000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="16958000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="18409000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="23" width="1440" height="877" extended-state="6" />
|
|
<frame x="0" y="23" width="1440" height="877" extended-state="6" />
|
|
@@ -366,9 +356,9 @@
|
|
<window_info anchor="right" id="Commander" order="2" weight="0.4" />
|
|
<window_info anchor="right" id="Commander" order="2" weight="0.4" />
|
|
<window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
|
|
<window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
|
|
- <window_info active="true" anchor="right" content_ui="combo" id="Project" order="5" sideWeight="0.49582636" visible="true" weight="0.25894135" />
|
|
|
|
|
|
+ <window_info anchor="right" content_ui="combo" id="Project" order="5" sideWeight="0.49582636" visible="true" weight="0.25894135" />
|
|
<window_info anchor="right" id="Remote Host" order="6" show_stripe_button="false" />
|
|
<window_info anchor="right" id="Remote Host" order="6" show_stripe_button="false" />
|
|
- <window_info anchor="right" x="0" y="0" width="310" height="677" id="Documentation" order="7" sideWeight="0.50417364" side_tool="true" weight="0.27110156" />
|
|
|
|
|
|
+ <window_info anchor="right" x="0" y="0" width="310" height="677" id="Documentation" order="7" sideWeight="0.50417364" side_tool="true" weight="0.25894135" />
|
|
</layout>
|
|
</layout>
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -455,13 +445,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/course/src/app/services/messenger.service.ts">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="240">
|
|
|
|
- <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/services/window.service.ts">
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/services/window.service.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="45">
|
|
<state relative-caret-position="45">
|
|
@@ -469,13 +452,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/course/src/app/create-report-item.component.ts">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="300">
|
|
|
|
- <caret line="21" column="34" lean-forward="true" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/create-report.component.ts">
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/create-report.component.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="295">
|
|
<state relative-caret-position="295">
|
|
@@ -483,13 +459,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/course/src/app/services/reportItem.service.ts">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="15">
|
|
|
|
- <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/base-report.component.ts">
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/base-report.component.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="525">
|
|
<state relative-caret-position="525">
|
|
@@ -553,17 +522,45 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/course/src/app/reports.component.ts">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/course/src/app/create-report-item.component.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="285">
|
|
|
|
+ <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/course/src/app/services/reportItem.service.ts">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="153">
|
|
|
|
+ <caret line="35" column="1" lean-forward="true" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/course/src/app/services/messenger.service.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="352">
|
|
|
|
- <caret line="46" column="45" lean-forward="true" selection-start-line="46" selection-start-column="45" selection-end-line="46" selection-end-column="45" />
|
|
|
|
|
|
+ <state relative-caret-position="213">
|
|
|
|
+ <caret line="30" column="38" lean-forward="true" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/course/src/app/create-report-item.component.ts">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="345">
|
|
|
|
+ <caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/types.ts">
|
|
<entry file="file://$PROJECT_DIR$/course/src/app/types.ts">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="413">
|
|
|
|
- <caret line="58" column="37" selection-start-line="58" selection-start-column="37" selection-end-line="58" selection-end-column="37" />
|
|
|
|
|
|
+ <state relative-caret-position="144">
|
|
|
|
+ <caret line="45" column="1" lean-forward="true" selection-start-line="45" selection-start-column="1" selection-end-line="45" selection-end-column="1" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/course/src/app/reports.component.ts">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="135">
|
|
|
|
+ <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|