diff --git a/frontend-js/.idea/workspace.xml b/frontend-js/.idea/workspace.xml
index 32c1527a699106351feab24fd79ff47391793a11..fc209a9c34080f88de96c1b1847c47ba7de4ed70 100644
--- a/frontend-js/.idea/workspace.xml
+++ b/frontend-js/.idea/workspace.xml
@@ -7,10 +7,8 @@
<component name="ChangeListManager">
<list default="true" id="c119f0dd-fdda-4d02-a51e-86bc6ef7e50c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/Admin.js" afterPath="$PROJECT_DIR$/src/main/js/Admin.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" afterPath="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" afterPath="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/minerva-test.js" afterPath="$PROJECT_DIR$/src/test/js/minerva-test.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/map/window/AliasInfoWindow.js" afterPath="$PROJECT_DIR$/src/main/js/map/window/AliasInfoWindow.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js" afterPath="$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@@ -38,7 +36,7 @@
<entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/EditProjectDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
- <caret line="581" column="32" lean-forward="true" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
+ <caret line="581" column="32" lean-forward="false" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
<folding>
<marker date="1503577627579" expanded="true" signature="6500:6506" ph="Â " />
<marker date="1503577627579" expanded="true" signature="6861:6867" ph="Â " />
@@ -47,11 +45,51 @@
</provider>
</entry>
</file>
- <file leaf-file-name="EditProjectDialog-test.js" pinned="false" current-in-tab="true">
+ <file leaf-file-name="EditProjectDialog-test.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="671">
- <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
+ <state relative-caret-position="365">
+ <caret line="75" column="29" lean-forward="false" selection-start-line="75" selection-start-column="29" selection-end-line="75" selection-end-column="29" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AliasInfoWindow-test.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="434">
+ <caret line="316" column="41" lean-forward="false" selection-start-line="316" selection-start-column="41" selection-end-line="316" selection-end-column="41" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="TouchMap.js" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/TouchMap.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="306">
+ <caret line="18" column="11" lean-forward="true" selection-start-line="18" selection-start-column="11" selection-end-line="18" selection-end-column="11" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AliasInfoWindow.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/window/AliasInfoWindow.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="320">
+ <caret line="84" column="40" lean-forward="false" selection-start-line="84" selection-start-column="40" selection-end-line="84" selection-end-column="40" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="LayoutAlias.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/data/LayoutAlias.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="187">
+ <caret line="11" column="23" lean-forward="false" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
<folding />
</state>
</provider>
@@ -90,21 +128,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="promise.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/node_modules/bluebird/js/release/promise.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="216">
- <caret line="681" column="45" lean-forward="false" selection-start-line="681" selection-start-column="45" selection-end-line="681" selection-end-column="45" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>showOverviewButton</find>
<find>TopMen</find>
<find>getProject</find>
<find>touch</find>
@@ -134,6 +161,7 @@
<find>(window).tri</find>
<find>resize</find>
<find>init</find>
+ <find>createCha</find>
</findStrings>
<dirStrings>
<dir>C:\Users\piotr.gawron\workspace\MapViewer-parent\frontend-js\src\main\js\gui\leftPanel</dir>
@@ -168,7 +196,6 @@
<option value="$PROJECT_DIR$/src/test/js/gui/leftPanel/PublicationListDialog-test.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/leftPanel/LeftPanel-test.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/admin/EditProjectDialog.js" />
- <option value="$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/admin/MapsAdminPanel-test.js" />
<option value="$PROJECT_DIR$/src/test/js/mocha-config.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/leftPanel/ProjectInfoPanel.js" />
@@ -184,6 +211,10 @@
<option value="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" />
<option value="$PROJECT_DIR$/src/main/js/Admin.js" />
<option value="$PROJECT_DIR$/src/test/js/minerva-test.js" />
+ <option value="$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js" />
+ <option value="$PROJECT_DIR$/src/main/js/map/window/AliasInfoWindow.js" />
+ <option value="$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js" />
+ <option value="$PROJECT_DIR$/src/main/js/map/TouchMap.js" />
</list>
</option>
</component>
@@ -230,6 +261,17 @@
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
<item name="frontend-js" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="coverage" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="coverage" type="462c0819:PsiDirectoryNode" />
+ <item name="lcov-report" type="462c0819:PsiDirectoryNode" />
+ </path>
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
<item name="frontend-js" type="462c0819:PsiDirectoryNode" />
@@ -254,7 +296,7 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
- <item name="gui" type="462c0819:PsiDirectoryNode" />
+ <item name="map" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
@@ -262,8 +304,8 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
- <item name="gui" type="462c0819:PsiDirectoryNode" />
- <item name="admin" type="462c0819:PsiDirectoryNode" />
+ <item name="map" type="462c0819:PsiDirectoryNode" />
+ <item name="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
@@ -284,7 +326,7 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
- <item name="gui" type="462c0819:PsiDirectoryNode" />
+ <item name="map" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
@@ -292,8 +334,8 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
- <item name="gui" type="462c0819:PsiDirectoryNode" />
- <item name="admin" type="462c0819:PsiDirectoryNode" />
+ <item name="map" type="462c0819:PsiDirectoryNode" />
+ <item name="window" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -329,7 +371,22 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Node.js.Unnamed">
+ <component name="RunManager" selected="Mocha.AliasInfoWindow.createChartDiv ">
+ <configuration name="AliasInfoWindow.createChartDiv " type="mocha-javascript-test-runner" factoryName="Mocha" temporary="true" nameIsGenerated="true">
+ <node-interpreter>project</node-interpreter>
+ <node-options />
+ <working-directory>$PROJECT_DIR$</working-directory>
+ <pass-parent-env>true</pass-parent-env>
+ <envs />
+ <ui>bdd</ui>
+ <extra-mocha-options />
+ <test-kind>TEST</test-kind>
+ <test-file>$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js</test-file>
+ <test-names>
+ <name value="AliasInfoWindow" />
+ <name value="createChartDiv " />
+ </test-names>
+ </configuration>
<configuration name="MapsAdminPanel" type="mocha-javascript-test-runner" factoryName="Mocha" temporary="true" nameIsGenerated="true">
<node-interpreter>project</node-interpreter>
<node-options />
@@ -464,20 +521,22 @@
<node-interpreter value="project" />
<envs />
</configuration>
- <list size="6">
+ <list size="7">
<item index="0" class="java.lang.String" itemvalue="Node.js.Unnamed" />
<item index="1" class="java.lang.String" itemvalue="npm.test" />
<item index="2" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
<item index="3" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel" />
<item index="4" class="java.lang.String" itemvalue="Mocha.minerva global" />
<item index="5" class="java.lang.String" itemvalue="Mocha.src\test\js\GuiConnector-test.js" />
+ <item index="6" class="java.lang.String" itemvalue="Mocha.AliasInfoWindow.createChartDiv " />
</list>
<recent_temporary>
- <list size="4">
- <item index="0" class="java.lang.String" itemvalue="Mocha.src\test\js\GuiConnector-test.js" />
- <item index="1" class="java.lang.String" itemvalue="Mocha.minerva global" />
- <item index="2" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel" />
- <item index="3" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
+ <list size="5">
+ <item index="0" class="java.lang.String" itemvalue="Mocha.AliasInfoWindow.createChartDiv " />
+ <item index="1" class="java.lang.String" itemvalue="Mocha.src\test\js\GuiConnector-test.js" />
+ <item index="2" class="java.lang.String" itemvalue="Mocha.minerva global" />
+ <item index="3" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel" />
+ <item index="4" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
</list>
</recent_temporary>
</component>
@@ -497,44 +556,44 @@
<workItem from="1503501472332" duration="132000" />
<workItem from="1503501772627" duration="21000" />
<workItem from="1503502231792" duration="5017000" />
- <workItem from="1503560609163" duration="18006000" />
+ <workItem from="1503560609163" duration="19206000" />
</task>
<servers />
</component>
<component name="TestHistory">
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 15h 57m 17s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 16m 50s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 15h 57m 26s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 17m 24s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 15h 58m 28s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 17m 37s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 15h 58m 45s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 18m 09s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 05m 05s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 18m 29s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 05m 29s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 19m 11s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 05m 36s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 20m 35s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 05m 56s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 21m 56s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 07m 48s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 22m 16s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
- <history-entry file="src_test_js_GuiConnector-test_js - 2017.08.24 at 16h 08m 14s.xml">
- <configuration name="src\test\js\GuiConnector-test.js" configurationId="mocha-javascript-test-runner" />
+ <history-entry file="AliasInfoWindow_createChartDiv_ - 2017.08.24 at 17h 22m 49s.xml">
+ <configuration name="AliasInfoWindow.createChartDiv " configurationId="mocha-javascript-test-runner" />
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="23176000" />
+ <option name="totallyTimeSpent" value="24376000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
@@ -543,13 +602,13 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5679475" sideWeight="0.33802083" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33833176" sideWeight="0.49791667" order="10" side_tool="false" content_ui="tabs" x="-170" y="502" width="1920" height="493" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33833176" sideWeight="0.49791667" order="10" side_tool="false" content_ui="tabs" x="-170" y="502" width="1920" height="493" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18020834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="V8 CPU Profiling" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34489223" sideWeight="0.66197914" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="V8 CPU Profiling" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34489223" sideWeight="0.66197914" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -572,42 +631,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/AddOverlayDialog-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="249">
- <caret line="45" column="2" lean-forward="false" selection-start-line="45" selection-start-column="2" selection-end-line="45" selection-end-column="2" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/AddOverlayDialog.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="20">
- <caret line="161" column="0" lean-forward="false" selection-start-line="161" selection-start-column="0" selection-end-line="161" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/Header.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="412">
- <caret line="115" column="5" lean-forward="false" selection-start-line="115" selection-start-column="5" selection-end-line="115" selection-end-column="5" />
- <folding>
- <marker date="1503506348214" expanded="true" signature="1550:1564" ph="..." />
- <marker date="1503506348214" expanded="true" signature="1570:1576" ph="Â " />
- <marker date="1503506348214" expanded="true" signature="1890:1904" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/AbstractDbPanel.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/ChemicalPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1224">
@@ -817,14 +840,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/coverage/lcov-report/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="uml://JavaScript-modules-diagram/C:/Users/piotr.gawron/workspace/MapViewer-parent/frontend-js/coverage/lcov-report/index.html">
<provider selected="true" editor-type-id="UmlEditorProvider">
<state>
@@ -1001,7 +1016,7 @@
<entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/EditProjectDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
- <caret line="581" column="32" lean-forward="true" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
+ <caret line="581" column="32" lean-forward="false" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
<folding>
<marker date="1503577627579" expanded="true" signature="6500:6506" ph="Â " />
<marker date="1503577627579" expanded="true" signature="6861:6867" ph="Â " />
@@ -1009,10 +1024,50 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/coverage/lcov-report/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="671">
- <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
+ <state relative-caret-position="365">
+ <caret line="75" column="29" lean-forward="false" selection-start-line="75" selection-start-column="29" selection-end-line="75" selection-end-column="29" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/data/LayoutAlias.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="187">
+ <caret line="11" column="23" lean-forward="false" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/window/AliasInfoWindow.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="320">
+ <caret line="84" column="40" lean-forward="false" selection-start-line="84" selection-start-column="40" selection-end-line="84" selection-end-column="40" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/map/window/AliasInfoWindow-test.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="434">
+ <caret line="316" column="41" lean-forward="false" selection-start-line="316" selection-start-column="41" selection-end-line="316" selection-end-column="41" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/TouchMap.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="306">
+ <caret line="18" column="11" lean-forward="true" selection-start-line="18" selection-start-column="11" selection-end-line="18" selection-end-column="11" />
<folding />
</state>
</provider>
diff --git a/frontend-js/src/main/js/map/window/AliasInfoWindow.js b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
index fa365c47efe5b7f774ab054f04289ede9056c7a7..4fb18d9a557c48e5e46b237784ba0c8c480eea53 100644
--- a/frontend-js/src/main/js/map/window/AliasInfoWindow.js
+++ b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
@@ -72,7 +72,7 @@ AliasInfoWindow.prototype.createChartDiv = function() {
var result = document.createElement("div");
var rows = [];
var self = this;
- return Promise.each(this.layoutAliases, function(data, i) {
+ return Promise.each(self.layoutAliases, function(data, i) {
var rowDiv = document.createElement("div");
if (i % 2 === 0) {
rowDiv.className = "mapChartRowEvenDiv";
diff --git a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
index 8559d76ad1ff18fff31471ed623829383214dd22..e48b205a9f9620f97b2532804187a536dba4a459 100644
--- a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
+++ b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
@@ -1,10 +1,12 @@
"use strict";
+require("../../mocha-config");
var Promise = require("bluebird");
var functions = require('../../../../main/js/Functions');
var Alias = require('../../../../main/js/map/data/Alias');
+var LayoutAlias = require('../../../../main/js/map/data/LayoutAlias');
var Drug = require('../../../../main/js/map/data/Drug');
var AliasInfoWindow = require('../../../../main/js/map/window/AliasInfoWindow');
var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
@@ -14,9 +16,9 @@ var assert = require('assert');
var logger = require('../../logger');
-describe('AliasInfoWindow', function() {
- describe('constructor', function() {
- it("default", function() {
+describe('AliasInfoWindow', function () {
+ describe('constructor', function () {
+ it("default", function () {
var map = helper.createCustomMap();
var alias = helper.createAlias();
@@ -26,8 +28,8 @@ describe('AliasInfoWindow', function() {
map.getModel().addAlias(alias);
var aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
assert.equal(alias, aliasWindow.getAlias());
@@ -35,28 +37,28 @@ describe('AliasInfoWindow', function() {
assert.ok(aliasWindow.getContent().innerHTML.indexOf("loading") >= 0);
assert.equal(logger.getWarnings().length, 0);
});
- it("loading data", function() {
+ it("loading data", function () {
var map = helper.createCustomMap();
- map.getOverlayDataForAlias = function() {
+ map.getOverlayDataForAlias = function () {
return Promise.resolve([]);
};
var javaObject = {
- bounds : {
- x : 190,
- y : 44,
- width : 80,
- height : 40
+ bounds: {
+ x: 190,
+ y: 44,
+ width: 80,
+ height: 40
},
- modelId : map.getId(),
- idObject : 30001
+ modelId: map.getId(),
+ idObject: 30001
};
var alias = new Alias(javaObject);
map.getModel().addAlias(alias);
var aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
assert.equal(alias, aliasWindow.alias);
@@ -65,29 +67,29 @@ describe('AliasInfoWindow', function() {
});
});
- it("createOverlayInfoDiv", function() {
+ it("createOverlayInfoDiv", function () {
var map = helper.createCustomMap();
var oc = helper.createDrugDbOverlay(map);
var alias = helper.createAlias(map);
var aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
- oc.searchNamesByTarget = function() {
- return Promise.resolve([ "xField" ]);
+ oc.searchNamesByTarget = function () {
+ return Promise.resolve(["xField"]);
};
- oc.getElementsByQueryFromServer = function() {
- return Promise.resolve([ new Drug({
- name : "xField",
- references : [],
- targets : [],
- }) ]);
+ oc.getElementsByQueryFromServer = function () {
+ return Promise.resolve([new Drug({
+ name: "xField",
+ references: [],
+ targets: [],
+ })]);
};
- return oc.getDetailDataByIdentifiedElement(new IdentifiedElement(alias), true).then(function(data) {
+ return oc.getDetailDataByIdentifiedElement(new IdentifiedElement(alias), true).then(function (data) {
var overlayDiv = aliasWindow.createOverlayInfoDiv(oc, data);
assert.ok(functions.isDomElement(overlayDiv));
assert.ok(overlayDiv.innerHTML.indexOf('xField') >= 0);
@@ -95,29 +97,29 @@ describe('AliasInfoWindow', function() {
});
- it("createDrugOverlayInfoDiv", function() {
+ it("createDrugOverlayInfoDiv", function () {
helper.setUrl("http://test/?id=drug_target_sample");
var map, ie, aliasWindow, oc;
- return ServerConnector.getProject().then(function(project) {
+ return ServerConnector.getProject().then(function (project) {
map = helper.createCustomMap(project);
oc = helper.createDrugDbOverlay(map);
ie = new IdentifiedElement({
- id : 436152,
- modelId : map.getId(),
- type : "ALIAS"
+ id: 436152,
+ modelId: map.getId(),
+ type: "ALIAS"
});
return map.getModel().getByIdentifiedElement(ie, true);
- }).then(function(alias) {
+ }).then(function (alias) {
aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
return oc.getDetailDataByIdentifiedElement(ie, true);
- }).then(function(data) {
+ }).then(function (data) {
var overlayDiv = aliasWindow.createOverlayInfoDiv(oc, data);
assert.ok(functions.isDomElement(overlayDiv));
assert.ok(overlayDiv.innerHTML.indexOf('NADH') >= 0);
@@ -125,33 +127,33 @@ describe('AliasInfoWindow', function() {
});
});
- it("createChemicalOverlayInfoDiv", function() {
+ it("createChemicalOverlayInfoDiv", function () {
var map, ie, aliasWindow, oc;
- return ServerConnector.getProject().then(function(project) {
+ return ServerConnector.getProject().then(function (project) {
map = helper.createCustomMap(project);
oc = helper.createChemicalDbOverlay(map);
ie = new IdentifiedElement({
- id : 329170,
- modelId : map.getId(),
- type : "ALIAS"
+ id: 329170,
+ modelId: map.getId(),
+ type: "ALIAS"
});
return map.getModel().getByIdentifiedElement(ie, true);
- }).then(function(alias) {
+ }).then(function (alias) {
aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
return oc.getDetailDataByIdentifiedElement(ie, true);
- }).then(function(data) {
+ }).then(function (data) {
var overlayDiv = aliasWindow.createOverlayInfoDiv(oc, data);
assert.ok(functions.isDomElement(overlayDiv));
});
});
- it("createCommentOverlayInfoDiv", function() {
+ it("createCommentOverlayInfoDiv", function () {
var map = helper.createCustomMap();
var oc = helper.createCommentDbOverlay(map);
@@ -163,11 +165,11 @@ describe('AliasInfoWindow', function() {
map.getModel().addAlias(alias);
var aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
- return oc.getDetailDataByIdentifiedElement(new IdentifiedElement(alias), true).then(function(data) {
+ return oc.getDetailDataByIdentifiedElement(new IdentifiedElement(alias), true).then(function (data) {
var comment = helper.createComment(alias);
comment.setContent("test comment Content");
@@ -183,32 +185,32 @@ describe('AliasInfoWindow', function() {
});
- it("createGeneticsDiv", function() {
+ it("createGeneticsDiv", function () {
var map;
var overlay;
var layoutAlias;
var win;
- return ServerConnector.getProject().then(function(project) {
+ return ServerConnector.getProject().then(function (project) {
map = helper.createCustomMap(project);
overlay = new LayoutData(18077, "xxx");
return overlay.init();
- }).then(function() {
+ }).then(function () {
return overlay.getFullAliasById(overlay.getAliases()[0].getId());
- }).then(function(data) {
+ }).then(function (data) {
layoutAlias = data;
return map.getModel().getAliasById(layoutAlias.getId());
- }).then(function(alias) {
+ }).then(function (alias) {
win = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
return win.init();
- }).then(function() {
- win.layoutAliases = [ layoutAlias ];
+ }).then(function () {
+ win.layoutAliases = [layoutAlias];
return win.createGenomicDiv();
- }).then(function(div) {
+ }).then(function (div) {
assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") === -1);
win.destroy();
@@ -216,28 +218,28 @@ describe('AliasInfoWindow', function() {
});
- it("createGeneticsDiv with no genetic data", function() {
+ it("createGeneticsDiv with no genetic data", function () {
var map;
var win;
var aliasId = 329173;
- return ServerConnector.getProject().then(function(project) {
+ return ServerConnector.getProject().then(function (project) {
map = helper.createCustomMap(project);
var overlay = new LayoutData(18077, "xxx");
return overlay.init();
- }).then(function() {
+ }).then(function () {
return map.getModel().getAliasById(aliasId);
- }).then(function(alias) {
+ }).then(function (alias) {
win = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
return win.init();
- }).then(function() {
- win.layoutAliases = [ undefined ];
+ }).then(function () {
+ win.layoutAliases = [undefined];
return win.createGenomicDiv();
- }).then(function(div) {
+ }).then(function (div) {
assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") === -1);
win.destroy();
@@ -245,36 +247,36 @@ describe('AliasInfoWindow', function() {
});
- it("createGeneticsDivForUnknownOrganism", function() {
+ it("createGeneticsDivForUnknownOrganism", function () {
var map;
var overlay;
var layoutAlias;
var win;
- return ServerConnector.getProject().then(function(project) {
+ return ServerConnector.getProject().then(function (project) {
project.setOrganism({
- type : "TAXONOMY",
- resource : "123456"
+ type: "TAXONOMY",
+ resource: "123456"
});
map = helper.createCustomMap(project);
overlay = new LayoutData(18077, "xxx");
return overlay.init();
- }).then(function() {
+ }).then(function () {
return overlay.getFullAliasById(overlay.getAliases()[0].getId());
- }).then(function(data) {
+ }).then(function (data) {
layoutAlias = data;
return map.getModel().getAliasById(layoutAlias.getId());
- }).then(function(alias) {
+ }).then(function (alias) {
win = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
return win.init();
- }).then(function() {
- win.layoutAliases = [ layoutAlias ];
+ }).then(function () {
+ win.layoutAliases = [layoutAlias];
return win.createGenomicDiv();
- }).then(function(div) {
+ }).then(function (div) {
assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") >= -1);
win.destroy();
@@ -282,16 +284,41 @@ describe('AliasInfoWindow', function() {
});
- it("createWaitingContentDiv", function() {
+ it("createWaitingContentDiv", function () {
var map = helper.createCustomMap();
var alias = helper.createAlias(map);
alias.setIsComplete(true);
var aliasWindow = new AliasInfoWindow({
- alias : alias,
- map : map
+ alias: alias,
+ map: map
});
assert.ok(functions.isDomElement(aliasWindow.createWaitingContentDiv()));
});
+
+ it("createChartDiv ", function () {
+ var map, ie, aliasWindow;
+ return ServerConnector.getProject().then(function (project) {
+ map = helper.createCustomMap(project);
+ ie = new IdentifiedElement({
+ id: 329170,
+ modelId: map.getId(),
+ type: "ALIAS"
+ });
+
+ return map.getModel().getByIdentifiedElement(ie, true);
+ }).then(function (alias) {
+ aliasWindow = new AliasInfoWindow({
+ alias: alias,
+ map: map
+ });
+ aliasWindow.layoutAliases = [helper.createLayoutAlias(alias), null];
+ aliasWindow.layoutNames = ["x", "y"];
+ return aliasWindow.createChartDiv();
+ }).then(function (div) {
+ assert.ok(div);
+ });
+ });
+
});