This commit is contained in:
person 2018-03-04 09:04:09 -08:00
parent 3ad3ecb0c9
commit 490477fca4
2 changed files with 58 additions and 52 deletions

View File

@ -1,16 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="40b9626d-5f4f-46c4-8096-7de331aaa15a" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/entity/User.js" afterPath="$PROJECT_DIR$/entity/User.js" />
<change beforePath="$PROJECT_DIR$/pages/MetaMask.js" afterPath="$PROJECT_DIR$/pages/MetaMask.js" />
<change beforePath="$PROJECT_DIR$/pages/Page.js" afterPath="$PROJECT_DIR$/pages/Page.js" />
<change beforePath="$PROJECT_DIR$/pages/TierPage.js" afterPath="$PROJECT_DIR$/pages/TierPage.js" />
<change beforePath="$PROJECT_DIR$/pages/WizardStep4.js" afterPath="$PROJECT_DIR$/pages/WizardStep4.js" />
<change beforePath="$PROJECT_DIR$/tests/Test1.js" afterPath="$PROJECT_DIR$/tests/Test1.js" />
<change beforePath="$PROJECT_DIR$/utils/Utils.js" afterPath="$PROJECT_DIR$/utils/Utils.js" />
</list>
<list default="true" id="40b9626d-5f4f-46c4-8096-7de331aaa15a" name="Default" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
@ -25,7 +16,7 @@
<favorites_list name="wizardAutomation" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5419776">
<splitter split-orientation="horizontal" split-proportion="0.44496268">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.js" pinned="false" current-in-tab="false">
@ -71,13 +62,23 @@
<file leaf-file-name="Page.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<state relative-caret-position="2145">
<caret line="143" column="10" lean-forward="false" selection-start-line="143" selection-start-column="10" selection-end-line="143" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="13" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="simple.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scenarios/simple.json">
<provider selected="true" editor-type-id="text-editor">
@ -88,7 +89,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="testSuite1.json" pinned="false" current-in-tab="true">
<file leaf-file-name="testSuite1.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scenarios/testSuite1.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
@ -98,7 +99,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="testSuite1.js" pinned="false" current-in-tab="false">
<file leaf-file-name="testSuite1.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
@ -125,8 +126,8 @@
<file leaf-file-name="User.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1574">
<caret line="445" column="48" lean-forward="false" selection-start-line="445" selection-start-column="48" selection-end-line="445" selection-end-column="48" />
<state relative-caret-position="-114">
<caret line="360" column="32" lean-forward="false" selection-start-line="360" selection-start-column="32" selection-end-line="360" selection-end-column="32" />
<folding />
</state>
</provider>
@ -193,8 +194,8 @@
<find>add network</find>
<find>doTr</find>
<find>modal</find>
<find>isEle</find>
<find>deployment</find>
<find>isEle</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$/temp</dir>
@ -414,7 +415,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="382282000" />
<option name="totallyTimeSpent" value="382645000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -428,6 +429,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24453841" sideWeight="0.49213484" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32970452" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -437,7 +439,7 @@
<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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20029455" sideWeight="0.5" order="9" 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.24947146" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27860695" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="134" y="236" width="1254" height="290" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27860695" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="134" y="236" width="1254" height="290" />
<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" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27391976" sideWeight="0.5078652" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -522,14 +524,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="13" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scenarios/T2RyWyMy_0020.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
@ -705,14 +699,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="143" column="10" lean-forward="false" selection-start-line="143" selection-start-column="10" selection-end-line="143" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scenarios/simple.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
@ -721,22 +707,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="96" column="44" lean-forward="false" selection-start-line="96" selection-start-column="44" selection-end-line="96" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<caret line="391" column="31" lean-forward="false" selection-start-line="391" selection-start-column="31" selection-end-line="391" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/TierPage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
@ -761,6 +731,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2145">
<caret line="143" column="10" lean-forward="false" selection-start-line="143" selection-start-column="10" selection-end-line="143" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="13" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scenarios/testSuite1.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
@ -769,5 +755,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="96" column="44" lean-forward="false" selection-start-line="96" selection-start-column="44" selection-end-line="96" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-114">
<caret line="360" column="32" lean-forward="false" selection-start-line="360" selection-start-column="32" selection-end-line="360" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

View File

@ -75,6 +75,7 @@ return s[0]+":"+s[1].substring(0,2);
var d=new Date(Date.now()+adj);
var r="am";
var h=d.getHours();
var min=d.getMinutes();
if (format=='mdy')
if (h>12) {h=h-12;r="pm";}
@ -82,8 +83,11 @@ return s[0]+":"+s[1].substring(0,2);
h=""+h;
if (h.length<2) h="0"+h;
var min=""+(d.getMinutes()+1);
var min=""+min;
if (min.length<2) min="0"+min;
var q=h+":"+min+r;
return q;
}