better hourly record
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/js/flotr2" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pynma" vcs="Git" />
</component>
</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,27 +2,55 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/README.md" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/README.txt" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/cron.php" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/generateConvos.php" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/run.bat" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sql" afterPath="$PROJECT_DIR$/db.sql" />
+ <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="1357777493718" 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" />
@@ -37,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" />
@@ -71,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>
@@ -81,46 +109,19 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="trunklog.php" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/trunklog.php">
+ <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="5" column="15" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0">
+ <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="88" column="47" selection-start="3147" selection-end="3147" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="db.sql" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state line="93" column="0" selection-start="1887" selection-end="2009" vertical-scroll-proportion="-13.16">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="generateHourlys.php" pinned="false" current="false" current-in-tab="false">
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="calllog.php" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/calllog.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="18" column="63" selection-start="368" selection-end="368" vertical-scroll-proportion="0.38626608">
+ <state line="30" column="0" selection-start="1466" selection-end="1466" vertical-scroll-proportion="0.6278366">
<folding />
</state>
</provider>
@@ -145,21 +146,21 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/common.inc.php" />
- <option value="$PROJECT_DIR$/viewcalls.php" />
<option value="$PROJECT_DIR$/calllog.php" />
<option value="$PROJECT_DIR$/scannr.py" />
<option value="$PROJECT_DIR$/calls.json.php" />
<option value="$PROJECT_DIR$/db.sql" />
+ <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" />
@@ -187,8 +188,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -209,16 +208,18 @@
</PATH>
</subPane>
</pane>
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
</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="WebServerToolWindowFactoryState" value="false" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.main.proportions" value="0.3" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../busui" />
<property name="FullScreen" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../disclosr" />
- <property name="options.splitter.main.proportions" value="0.3" />
</component>
<component name="PyConsoleOptionsProvider">
<option name="myPythonConsoleState">
@@ -234,6 +235,9 @@
</key>
</component>
<component name="RunManager">
+ <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
+ <method />
+ </configuration>
<configuration default="true" type="JavascriptDebugSession" factoryName="Local" singleton="true">
<JSDebuggerConfigurationSettings>
<option name="engineId" value="embedded" />
@@ -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" />
@@ -380,11 +384,6 @@
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/viewcalls.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="69" selection-start="1388" selection-end="1388" vertical-scroll-proportion="1.2659575" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/scannr.py">
<provider selected="true" editor-type-id="text-editor">
<state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="0.0" />
@@ -402,35 +401,50 @@
</entry>
<entry file="file://$PROJECT_DIR$/db.sql">
<provider selected="true" editor-type-id="text-editor">
- <state line="93" column="0" selection-start="1887" selection-end="2009" vertical-scroll-proportion="-13.16">
+ <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" />
+ </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" />
+ </provider>
+ </entry>
+ <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">
<folding />
</state>
</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">
+ <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$/common.inc.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="88" column="47" selection-start="3147" selection-end="3147" vertical-scroll-proportion="0.0">
+ <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$/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">
+ <entry file="file://$PROJECT_DIR$/viewcalls.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/calllog.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="18" column="63" selection-start="368" selection-end="368" vertical-scroll-proportion="0.38626608">
+ <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>
--- a/common.inc.php
+++ b/common.inc.php
@@ -57,12 +57,20 @@
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
+
+ <link href="css/daterangepicker.css" rel="stylesheet">
<script src="js/vendor/modernizr-2.6.1.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
<!--<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.0.min.js"><\/script>')</script>-->
<script type="text/javascript" src="<?php echo $basePath ?>js/flotr2/flotr2.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
+ <!-- xcharts includes -->
+ <script src="//cdnjs.cloudflare.com/ajax/libs/d3/2.10.0/d3.v2.js"></script>
+
+ <!-- The daterange picker bootstrap plugin -->
+ <script src="js/sugar.min.js"></script>
+ <script src="js/daterangepicker.js"></script>
</head>
<body>
<!--[if lt IE 7]>
--- /dev/null
+++ b/css/daterangepicker.css
@@ -1,1 +1,196 @@
+.daterangepicker.dropdown-menu {
+ max-width: none;
+}
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+ float: left;
+ margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
+ float: right;
+ margin: 4px;
+}
+
+.daterangepicker .ranges {
+ width: 160px;
+ text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+ float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+ padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+ display: none;
+ max-width: 230px;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ white-space: nowrap;
+ text-align: center;
+}
+
+.daterangepicker .ranges label {
+ color: #333;
+ font-size: 11px;
+ margin-bottom: 2px;
+ text-transform: uppercase;
+ text-shadow: 1px 1px 0 #fff;
+}
+
+.daterangepicker .ranges input {
+ font-size: 11px;
+}
+
+.daterangepicker .ranges ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+.daterangepicker .ranges li {
+ font-size: 13px;
+ background: #f5f5f5;
+ border: 1px solid #f5f5f5;
+ color: #08c;
+ padding: 3px 12px;
+ margin-bottom: 8px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+ background: #08c;
+ border: 1px solid #08c;
+ color: #fff;
+}
+
+.daterangepicker .calendar {
+ border: 1px solid #ddd;
+ padding: 4px;
+ border-radius: 4px;
+ background: #fff;
+}
+
+.daterangepicker {
+ position: absolute;
+ background: #fff;
+ top: 100px;
+ left: 20px;
+ padding: 4px;
+ margin-top: 1px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+ position: absolute;
+ top: -7px;
+ right: 9px;
+ display: inline-block;
+ border-right: 7px solid transparent;
+ border-bottom: 7px solid #ccc;
+ border-left: 7px solid transparent;
+ border-bottom-color: rgba(0, 0, 0, 0.2);
+ content: '';
+}
+
+.daterangepicker.opensleft:after {
+ position: absolute;
+ top: -6px;
+ right: 10px;
+ display: inline-block;
+ border-right: 6px solid transparent;
+ border-bottom: 6px solid #fff;
+ border-left: 6px solid transparent;
+ content: '';
+}
+
+.daterangepicker.opensright:before {
+ position: absolute;
+ top: -7px;
+ left: 9px;
+ display: inline-block;
+ border-right: 7px solid transparent;
+ border-bottom: 7px solid #ccc;
+ border-left: 7px solid transparent;
+ border-bottom-color: rgba(0, 0, 0, 0.2);
+ content: '';
+}
+
+.daterangepicker.opensright:after {
+ position: absolute;
+ top: -6px;
+ left: 10px;
+ display: inline-block;
+ border-right: 6px solid transparent;
+ border-bottom: 6px solid #fff;
+ border-left: 6px solid transparent;
+ content: '';
+}
+
+.daterangepicker table {
+ width: 100%;
+ margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+ text-align: center;
+ width: 20px;
+ height: 20px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ cursor: pointer;
+ white-space: nowrap;
+}
+
+.daterangepicker td.off {
+ color: #999;
+}
+.daterangepicker td.disabled {
+ color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+ background: #eee;
+}
+
+.daterangepicker td.in-range {
+ background: #ebf4f8;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+ background-color: #006dcc;
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+ background-image: linear-gradient(top, #0088cc, #0044cc);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+ border-color: #0044cc #0044cc #002a80;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ color: #fff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+ font-size: 80%;
+ color: #ccc;
+}
+
--- /dev/null
+++ b/datepicker.php
@@ -1,1 +1,46 @@
+bri<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8" />
+ <title>Pretty Charts with jQuery and AJAX | Tutorialzine Demo</title>
+ <!-- Include bootstrap css -->
+ <link href="css/daterangepicker.css" rel="stylesheet">
+
+ </head>
+ <body>
+ <div id="content">
+
+ <form class="form-horizontal">
+ <fieldset>
+ <div class="input-prepend">
+ <span class="add-on"><i class="icon-calendar"></i></span><input type="text" name="range" id="range" />
+ </div>
+ </fieldset>
+ </form>
+
+ <div id="placeholder">
+ <figure id="chart"></figure>
+ </div>
+
+ </div>
+
+ <footer>
+ <h2><i>Tutorial:</i> Pretty Charts with jQuery and AJAX</h2>
+ <a class="tzine" href="http://tutorialzine.com/2013/01/charts-jquery-ajax/">Head on to <i>Tutorial<b>zine</b></i> to read and download</a>
+ </footer>
+
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+
+ <!-- xcharts includes -->
+ <script src="//cdnjs.cloudflare.com/ajax/libs/d3/2.10.0/d3.v2.js"></script>
+
+ <!-- The daterange picker bootstrap plugin -->
+ <script src="js/sugar.min.js"></script>
+ <script src="js/daterangepicker.js"></script>
+
+ <!-- Our main script file -->
+ <script src="js/script.js"></script>
+ </body>
+</html>
+
--- a/db.sql
+++ b/db.sql
@@ -52,10 +52,11 @@
CREATE TABLE tgids (
tgid text NOT NULL,
subfleet smallint,
+ alpha_tag text NOT NULL,
mode character(1) DEFAULT 'D'::bpchar NOT NULL,
- alpha_tag text NOT NULL,
+ description text,
service_tag text,
- category smallint
+ category text
);
@@ -109,3 +110,4 @@
"channel" smallint NOT NULL,
"calltype" text NOT NULL
);
+
--- a/generateHourlys.php
+++ b/generateHourlys.php
@@ -1,43 +1,46 @@
<?php
include(�