--- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,21 +2,55 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common.inc.php" afterPath="$PROJECT_DIR$/common.inc.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/viewcalls.php" afterPath="$PROJECT_DIR$/viewcalls.php" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/purgeArchived.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/generateHourlys.php" afterPath="$PROJECT_DIR$/generateHourlys.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="scannr.iws" /> <ignored path=".idea/workspace.xml" /> - <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1357864234218" ignored="false" /> + <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397311316" ignored="false" /> <file path="/calllog.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356153807482" ignored="false" /> <file path="/scannr.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154551131" ignored="false" /> <file path="/start_script.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155203132" ignored="false" /> <file path="/a.java" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155211924" ignored="false" /> <file path="/a.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155216083" ignored="false" /> <file path="/calls.json.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155700744" ignored="false" /> - <file path="/generateHourlys.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1357778581260" ignored="false" /> + <file path="/generateHourlys.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358398326227" ignored="false" /> <file path="/db.sql" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1357778259550" ignored="false" /> + <file path="$PROJECT_DIR$/../busui/updatedb.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358288406484" ignored="false" /> + <file path="/common-template.inc.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358288700286" ignored="false" /> + <file path="$PROJECT_DIR$/../busui/include/common-template.inc.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358288806533" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xinclude.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/XMLSchema.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/XMLSchema-instance.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xhtml1-transitional.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xhtml1-strict.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xhtml1-frameset.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xml.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319702" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xslt-1_0.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/catalog.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xslt-2_0.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/relaxng.rng" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.2.0.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.0.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.1.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.2.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.5.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/html5/xhtml5.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.3.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.4.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.2.5.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.2.6.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319703" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.3.5.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.0.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.1.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.5.1.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.5.2.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.1.5.3.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/FlexCompilerSchema.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/flex/lib/FlexSupport.jar!/schemas/AIR_Descriptor.2.7.xsd" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397319704" ignored="false" /> + <file path="$APPLICATION_HOME_DIR$/plugins/xpath/lib/xpath.jar!/org/intellij/lang/xpath/xslt/resources/documentation.xml" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1358397320179" ignored="false" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -31,6 +65,7 @@ <disable_hints /> </component> <component name="DebuggerManager"> + <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true"> <breakpoint> <option name="NOTIFY_CAUGHT" value="true" /> @@ -65,7 +100,6 @@ <option name="LOG_MESSAGE" value="" /> </breakpoint> </breakpoint_any> - <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_rules /> <ui_properties /> </component> @@ -75,35 +109,19 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="viewcalls.php" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="viewcalls.php" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/viewcalls.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="55" selection-start="583" selection-end="583" vertical-scroll-proportion="0.31111112"> - <folding> - <element signature="n#style#0;n#span#0;n#td#0;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#td#2;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - </folding> + <state line="83" column="48" selection-start="2766" selection-end="2766" vertical-scroll-proportion="-0.625"> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="common.inc.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/common.inc.php"> + <file leaf-file-name="generateHourlys.php" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/generateHourlys.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="49" selection-start="2814" selection-end="2814" vertical-scroll-proportion="-17.5"> - <folding> - <marker date="1357865020704" expanded="true" signature="2886:3131" placeholder="..." /> - <marker date="1357865020704" expanded="true" signature="2955:2993" placeholder="..." /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="datepicker.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/datepicker.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0"> + <state line="30" column="0" selection-start="1466" selection-end="1466" vertical-scroll-proportion="0.6278366"> <folding /> </state> </provider> @@ -132,17 +150,17 @@ <option value="$PROJECT_DIR$/scannr.py" /> <option value="$PROJECT_DIR$/calls.json.php" /> <option value="$PROJECT_DIR$/db.sql" /> - <option value="$PROJECT_DIR$/generateHourlys.php" /> <option value="$PROJECT_DIR$/viewcalls.php" /> <option value="$PROJECT_DIR$/common.inc.php" /> + <option value="$PROJECT_DIR$/purgeArchived.php" /> + <option value="$PROJECT_DIR$/generateHourlys.php" /> </list> </option> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" /> <component name="ProjectFrameBounds"> - <option name="x" value="-4" /> - <option name="width" value="1608" /> - <option name="height" value="874" /> + <option name="width" value="1600" /> + <option name="height" value="871" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -188,20 +206,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="js" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> <pane id="PackagesPane" /> @@ -209,12 +213,12 @@ </panes> </component> <component name="PropertiesComponent"> - <property name="options.lastSelected" value="preferences.pluginManager" /> + <property name="options.lastSelected" value="project.propVCSSupport.Mappings" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="options.splitter.details.proportions" value="0.2" /> <property name="options.searchVisible" value="true" /> <property name="options.splitter.main.proportions" value="0.3" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../disclosr" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../busui" /> <property name="FullScreen" value="false" /> </component> <component name="PyConsoleOptionsProvider"> @@ -271,7 +275,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="-4" y="0" width="1608" height="874" extended-state="6" /> + <frame x="0" y="0" width="1600" height="871" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> @@ -280,11 +284,11 @@ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1962677" sideWeight="0.6721763" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19598965" sideWeight="0.6510345" order="0" side_tool="false" content_ui="combo" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" 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" weight="0.3278237" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34896553" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -397,40 +401,17 @@ </entry> <entry file="file://$PROJECT_DIR$/db.sql"> <provider selected="true" editor-type-id="text-editor"> - <state line="94" column="0" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="94" column="0" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.0" /> </provider> </entry> <entry file="file://$PROJECT_DIR$/trunklog.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="15" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/generateHourlys.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="5" column="15" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0" /> </provider> </entry> <entry file="file://$PROJECT_DIR$/calllog.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="93" selection-start="386" selection-end="386" vertical-scroll-proportion="0.44444445"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/common.inc.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="49" selection-start="2814" selection-end="2814" vertical-scroll-proportion="-17.5"> - <folding> - <marker date="1357865020704" expanded="true" signature="2886:3131" placeholder="..." /> - <marker date="1357865020704" expanded="true" signature="2955:2993" placeholder="..." /> - </folding> - </state> + <state line="20" column="93" selection-start="386" selection-end="386" vertical-scroll-proportion="0.44444445" /> </provider> </entry> <entry file="file://$PROJECT_DIR$/datepicker.php"> @@ -440,14 +421,31 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/common.inc.php"> + <provider selected="true" editor-type-id="text-editor"> + <state line="101" column="74" selection-start="3745" selection-end="3745" vertical-scroll-proportion="-20.916666"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/purgeArchived.php"> + <provider selected="true" editor-type-id="text-editor"> + <state line="12" column="41" selection-start="566" selection-end="566" vertical-scroll-proportion="0.4265403"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/viewcalls.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="55" selection-start="583" selection-end="583" vertical-scroll-proportion="0.31111112"> - <folding> - <element signature="n#style#0;n#span#0;n#td#0;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#td#2;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - </folding> + <state line="83" column="48" selection-start="2766" selection-end="2766" vertical-scroll-proportion="-0.625"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/generateHourlys.php"> + <provider selected="true" editor-type-id="text-editor"> + <state line="30" column="0" selection-start="1466" selection-end="1466" vertical-scroll-proportion="0.6278366"> + <folding /> </state> </provider> </entry>