Browse Source

Package/Projekt angepasst

Robert Bedner 10 years ago
parent
commit
c86bc379ad
9 changed files with 458 additions and 71 deletions
  1. 1 1
      .idea/.name
  2. 2 1
      .idea/Fehlerbericht.iml
  3. 45 0
      .idea/dataSources.ids
  4. 20 0
      .idea/dataSources.xml
  5. 1 1
      .idea/jsLibraryMappings.xml
  6. 1 1
      .idea/modules.xml
  7. 364 44
      .idea/workspace.xml
  8. 23 22
      bower.json
  9. 1 1
      package.json

+ 1 - 1
.idea/.name

@@ -1 +1 @@
-Kasse
+Fehlerbericht

+ 2 - 1
.idea/Kasse.iml → .idea/Fehlerbericht.iml

@@ -26,7 +26,8 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Node.js Dependencies for Kasse" level="project" />
+    <orderEntry type="library" name="Node.js Dependencies for Fehlerbericht" level="project" />
+    <orderEntry type="library" name="Node.js Dependencies for Fehlerbericht" level="project" />
   </component>
 </module>
 

+ 45 - 0
.idea/dataSources.ids

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="dataSourceStorage">
+  <data-source source="LOCAL" name="MySQL - tasks@localhost" uuid="c2a557d7-ac30-4c20-8f83-36bdbba56509">
+    <database-info product="MySQL" version="5.5.27" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.31 ( Revision: alexander.soklakov@oracle.com-20140520065950-groqzzbvxprqdmnz )">
+      <extra-name-characters>#@</extra-name-characters>
+      <identifier-quote-string>`</identifier-quote-string>
+    </database-info>
+    <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower"/>
+    <schema name="" catalog="tasks"/>
+    <table name="arbeitstage" schema="" catalog="tasks" type="TABLE">
+      <column name="bundesland" sqlType="VARCHAR" length="5" precision="0" nullable="false" jdbcType="12" def="Jyc="/>
+      <column name="datum" sqlType="DATE" length="10" precision="0" nullable="false" jdbcType="91" def="JzAwMDAtMDAtMDAn"/>
+      <column name="wochentag" sqlType="VARCHAR" length="5" precision="0" nullable="false" jdbcType="12" def="Jyc="/>
+      <column name="feiertag" sqlType="VARCHAR" length="50" precision="0" nullable="false" jdbcType="12" def="Jyc="/>
+      <column name="mofr" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6" def="MA=="/>
+      <column name="mosa" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6" def="MA=="/>
+      <column name="moso" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6" def="MA=="/>
+      <column name="diso" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6" def="MA=="/>
+      <primary-key name="PRIMARY" columns="bundesland,datum"/>
+    </table>
+    <table name="kunden" schema="" catalog="tasks" type="TABLE">
+      <column name="kunde" sqlType="VARCHAR" length="50" precision="0" nullable="false" jdbcType="12"/>
+      <column name="system" sqlType="VARCHAR" length="50" precision="0" nullable="false" jdbcType="12"/>
+      <column name="start" sqlType="TIME" length="8" precision="0" nullable="false" jdbcType="92"/>
+      <column name="ende" sqlType="TIME" length="8" precision="0" nullable="false" jdbcType="92"/>
+      <column name="erster_status" sqlType="DATE" length="10" precision="0" nullable="false" jdbcType="91"/>
+      <column name="aktiv" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6" def="MQ=="/>
+      <column name="woche" sqlType="VARCHAR" length="10" precision="0" nullable="false" jdbcType="12" def="J01vLVNhJw=="/>
+      <column name="bundesland" sqlType="VARCHAR" length="5" precision="0" nullable="false" jdbcType="12" def="J0hFJw=="/>
+      <primary-key name="PRIMARY" columns="kunde"/>
+    </table>
+    <table name="statusmail" schema="" catalog="tasks" type="TABLE">
+      <column name="kunde" sqlType="VARCHAR" length="50" precision="0" nullable="false" jdbcType="12"/>
+      <column name="datum" sqlType="DATE" length="10" precision="0" nullable="false" jdbcType="91"/>
+      <column name="start" sqlType="TIME" length="8" precision="0" nullable="false" jdbcType="92"/>
+      <column name="ende" sqlType="TIME" length="8" precision="0" nullable="false" jdbcType="92"/>
+      <column name="logdatei" sqlType="TEXT" length="65535" precision="0" nullable="false" jdbcType="-1"/>
+      <column name="fehlerbericht" sqlType="TEXT" length="65535" precision="0" nullable="false" jdbcType="-1"/>
+      <column name="anzahl" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6"/>
+      <column name="bearbeitet" sqlType="TINYINT" length="3" precision="0" nullable="false" jdbcType="-6"/>
+      <column name="kommentar" sqlType="TEXT" length="65535" precision="0" nullable="false" jdbcType="-1"/>
+      <primary-key name="PRIMARY" columns="kunde,datum,start"/>
+    </table>
+  </data-source>
+</component>

+ 20 - 0
.idea/dataSources.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" hash="1620145237">
+    <data-source source="LOCAL" name="MySQL - tasks@localhost" uuid="c2a557d7-ac30-4c20-8f83-36bdbba56509">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/tasks</jdbc-url>
+      <user-name>root</user-name>
+      <user-password>dfcddfc9df9adf9bdfc7dfd3dfd9dfdbdfc6</user-password>
+      <schema-pattern>tasks.*</schema-pattern>
+      <driver-properties>
+        <property name="zeroDateTimeBehavior" value="convertToNull" />
+        <property name="tinyInt1isBit" value="false" />
+      </driver-properties>
+      <libraries />
+    </data-source>
+  </component>
+</project>
+

+ 1 - 1
.idea/jsLibraryMappings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Dependencies for Kasse}" />
+    <file url="file://$PROJECT_DIR$" libraries="{Node.js Dependencies for Fehlerbericht, Node.js Dependencies for Kasse}" />
   </component>
 </project>
 

+ 1 - 1
.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Kasse.iml" filepath="$PROJECT_DIR$/.idea/Kasse.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Fehlerbericht.iml" filepath="$PROJECT_DIR$/.idea/Fehlerbericht.iml" />
     </modules>
   </component>
 </project>

+ 364 - 44
.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e6a1298f-f559-449e-a74b-e7d36fe3b7cd" name="Default" comment="" />
-    <ignored path="Kasse.iws" />
+    <ignored path="Fehlerbericht.iws" />
     <ignored path=".idea/workspace.xml" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -19,14 +19,32 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
-    <favorites_list name="Kasse" />
+    <favorites_list name="Fehlerbericht" />
   </component>
   <component name="FileEditorManager">
     <leaf>
       <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="67" column="28" selection-start="2417" selection-end="2417" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="2040">
+            <state line="95" column="56" selection-start="3497" selection-end="3497" vertical-scroll-proportion="0.0" vertical-offset="1456" max-vertical-offset="2057">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="29" column="0" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="595">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="overview.html" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/overview.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="174" column="106" selection-start="8094" selection-end="8094" vertical-scroll-proportion="0.69863015" vertical-offset="2550" max-vertical-offset="4590">
               <folding />
             </state>
           </provider>
@@ -35,7 +53,7 @@
       <file leaf-file-name="overview.js" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="23" column="43" selection-start="709" selection-end="714" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="561">
+            <state line="90" column="10" selection-start="2553" selection-end="2553" vertical-scroll-proportion="0.0" vertical-offset="1071" max-vertical-offset="2040">
               <folding />
             </state>
           </provider>
@@ -44,30 +62,70 @@
       <file leaf-file-name="main.html" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/views/main.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="1173">
+            <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="-7.8461537" vertical-offset="0" max-vertical-offset="1173">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.js" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
+      <file leaf-file-name="package.json" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="18" column="34" selection-start="403" selection-end="403" vertical-scroll-proportion="0.50163937" vertical-offset="0" max-vertical-offset="1870">
+            <state line="29" column="41" selection-start="948" selection-end="948" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="782">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
+      <file leaf-file-name="bower.json" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bower.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="31" column="15" selection-start="697" selection-end="697" vertical-scroll-proportion="0.0" vertical-offset="53" max-vertical-offset="663">
+            <state line="23" column="1" selection-start="646" selection-end="646" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="493">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="bower.json" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/bower_components/bootstrap/bower.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="22" column="50" selection-start="642" selection-end="642" vertical-scroll-proportion="-8.076923" vertical-offset="164" max-vertical-offset="748">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="import.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/import.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="91" column="40" selection-start="2968" selection-end="2968" vertical-scroll-proportion="-14.615385" vertical-offset="1167" max-vertical-offset="1751">
+              <folding>
+                <marker date="1411657879733" expanded="true" signature="392:416" placeholder="SELECT kunde..kunden..." />
+                <marker date="1411657879733" expanded="true" signature="2806:2930" placeholder="INSERT INTO ..." />
+                <marker date="1411657879733" expanded="true" signature="2806:2887" placeholder="INSERT INTO ..." />
+                <marker date="1411657879733" expanded="true" signature="2806:2886" placeholder="INSERT INTO ..." />
+                <marker date="1411657879733" expanded="true" signature="2806:2884" placeholder="INSERT INTO ..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="db.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/db.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="16" column="194" selection-start="900" selection-end="900" vertical-scroll-proportion="-6.5384617" vertical-offset="102" max-vertical-offset="765">
+              <folding>
+                <marker date="1412006026713" expanded="true" signature="207:261" placeholder="SELECT * FRO..statusmail..." />
+                <marker date="1412006026713" expanded="true" signature="207:292" placeholder="SELECT * FRO..statusmail..." />
+                <marker date="1412006026713" expanded="true" signature="207:303" placeholder="SELECT * FRO..statusmail..." />
+                <marker date="1412006026713" expanded="true" signature="610:630" placeholder="SELECT * FRO..kunden..." />
+                <marker date="1412006026713" expanded="true" signature="728:1568" placeholder="SELECT *, ti..arbeitstage..." />
+                <marker date="1412006026713" expanded="true" signature="728:1249" placeholder="SELECT a.dat..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -78,13 +136,17 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/bower.json" />
         <option value="$PROJECT_DIR$/app/views/main.html" />
+        <option value="$PROJECT_DIR$/app/index.html" />
+        <option value="$PROJECT_DIR$/app/scripts/controllers/main.js" />
+        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/app/scripts/app.js" />
+        <option value="$PROJECT_DIR$/app/import.php" />
+        <option value="$PROJECT_DIR$/bower.json" />
+        <option value="$PROJECT_DIR$/app/bower_components/bootstrap/bower.json" />
+        <option value="$PROJECT_DIR$/app/db.php" />
         <option value="$PROJECT_DIR$/app/scripts/controllers/overview.js" />
         <option value="$PROJECT_DIR$/app/views/overview.html" />
-        <option value="$PROJECT_DIR$/app/index.html" />
-        <option value="$PROJECT_DIR$/app/scripts/controllers/main.js" />
       </list>
     </option>
   </component>
@@ -133,17 +195,18 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Kasse" />
+              <option name="myItemId" value="Fehlerbericht" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Kasse" />
+              <option name="myItemId" value="Fehlerbericht" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -151,14 +214,125 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="views" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scripts" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scripts" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controllers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="bower_components" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Fehlerbericht" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="bower_components" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="bootstrap" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="options.lastSelected" value="tasks" />
+    <property name="options.lastSelected" value="preferences.externalResources" />
     <property name="last_opened_file_path" value="D:/dev/msysgit/cmd/git.exe" />
     <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.searchVisible" value="true" />
@@ -166,6 +340,10 @@
     <property name="LayoutCode.rearrangeEntriesHTML" value="false" />
     <property name="LayoutCode.rearrangeEntriesJavaScript" value="false" />
     <property name="FullScreen" value="false" />
+    <property name="LayoutCode.rearrangeEntriesPHP" value="false" />
+    <property name="dynamic.classpath" value="false" />
+    <property name="SearchEverywhereHistory" value="$" />
+    <property name="LayoutCode.rearrangeEntriesJSON" value="false" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
@@ -189,6 +367,12 @@
     <configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server" server_id="a1abbac4-cd22-4815-a449-74c0820d3842" server_name="localhost">
       <method />
     </configuration>
+    <configuration default="true" type="com.intellij.persistence.run.ConsoleRunConfigurationType" factoryName="Query Language Console">
+      <option name="VM_PARAMETERS" value="" />
+      <option name="USER_CFG_CLASS" />
+      <option name="CONTEXT_PROVIDER" />
+      <method />
+    </configuration>
     <list size="0" />
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
@@ -201,15 +385,15 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="false" />
+    <frame x="-8" y="-8" width="1936" height="1056" 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" />
       <window_info id="Terminal" 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="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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" 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.13541667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32911393" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -217,11 +401,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="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" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" 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" weight="0.32911393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -241,6 +425,82 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/app/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="98" column="56" selection-start="3711" selection-end="3711" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2091">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="0" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0" vertical-offset="493" max-vertical-offset="595">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/overview.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="62" column="64" selection-start="2735" selection-end="2735" vertical-scroll-proportion="0.0" vertical-offset="612" max-vertical-offset="1564">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="69" column="7" selection-start="2069" selection-end="2069" vertical-scroll-proportion="0.0" vertical-offset="1173" max-vertical-offset="1275">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="41" selection-start="948" selection-end="948" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="782">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bower.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="23" column="1" selection-start="646" selection-end="646" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="493">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/bower_components/bootstrap/bower.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="50" selection-start="642" selection-end="642" vertical-scroll-proportion="0.0" vertical-offset="164" max-vertical-offset="748">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/import.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="42" selection-start="873" selection-end="873" vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="1751">
+          <folding>
+            <marker date="1411657879733" expanded="true" signature="392:416" placeholder="SELECT kunde..kunden..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2930" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2887" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2886" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2884" placeholder="INSERT INTO ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/db.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="151" selection-start="388" selection-end="388" vertical-scroll-proportion="0.0" vertical-offset="79" max-vertical-offset="663">
+          <folding>
+            <marker date="1412006026713" expanded="true" signature="207:261" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="207:292" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="207:303" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="610:630" placeholder="SELECT * FRO..kunden..." />
+            <marker date="1412006026713" expanded="true" signature="728:1568" placeholder="SELECT *, ti..arbeitstage..." />
+            <marker date="1412006026713" expanded="true" signature="728:1249" placeholder="SELECT a.dat..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="64" column="41" selection-start="2338" selection-end="2338" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2040">
@@ -271,9 +531,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870">
-          <folding />
-        </state>
+        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
@@ -313,9 +571,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870">
-          <folding />
-        </state>
+        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
@@ -355,9 +611,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870">
-          <folding />
-        </state>
+        <state line="24" column="49" selection-start="568" selection-end="586" vertical-scroll-proportion="0.0" vertical-offset="948" max-vertical-offset="1870" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
@@ -374,49 +628,115 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="18" column="34" selection-start="403" selection-end="403" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1870" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.jshintrc">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitattributes">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.editorconfig">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.bowerrc">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="41" selection-start="948" selection-end="948" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="782">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/bower.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="0" selection-start="541" selection-end="541" vertical-scroll-proportion="0.43638393" vertical-offset="0" max-vertical-offset="896" />
+        <state line="23" column="1" selection-start="646" selection-end="646" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="493">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/main.html">
+    <entry file="file://$PROJECT_DIR$/app/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="1173">
+        <state line="95" column="56" selection-start="3497" selection-end="3497" vertical-scroll-proportion="0.0" vertical-offset="1456" max-vertical-offset="2057">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
+    <entry file="file://$PROJECT_DIR$/app/views/main.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="43" selection-start="709" selection-end="714" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="561">
+        <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="-7.8461537" vertical-offset="0" max-vertical-offset="1173">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/overview.html">
+    <entry file="file://$PROJECT_DIR$/app/bower_components/bootstrap/bower.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="0" selection-start="483" selection-end="483" vertical-scroll-proportion="0.17465754" vertical-offset="0" max-vertical-offset="584">
+        <state line="22" column="50" selection-start="642" selection-end="642" vertical-scroll-proportion="-8.076923" vertical-offset="164" max-vertical-offset="748">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="15" selection-start="697" selection-end="697" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="663">
+        <state line="29" column="0" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="595">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/index.html">
+    <entry file="file://$PROJECT_DIR$/app/import.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="91" column="40" selection-start="2968" selection-end="2968" vertical-scroll-proportion="-14.615385" vertical-offset="1167" max-vertical-offset="1751">
+          <folding>
+            <marker date="1411657879733" expanded="true" signature="392:416" placeholder="SELECT kunde..kunden..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2930" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2887" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2886" placeholder="INSERT INTO ..." />
+            <marker date="1411657879733" expanded="true" signature="2806:2884" placeholder="INSERT INTO ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/db.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="67" column="28" selection-start="2417" selection-end="2417" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="2040">
+        <state line="16" column="194" selection-start="900" selection-end="900" vertical-scroll-proportion="-6.5384617" vertical-offset="102" max-vertical-offset="765">
+          <folding>
+            <marker date="1412006026713" expanded="true" signature="207:261" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="207:292" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="207:303" placeholder="SELECT * FRO..statusmail..." />
+            <marker date="1412006026713" expanded="true" signature="610:630" placeholder="SELECT * FRO..kunden..." />
+            <marker date="1412006026713" expanded="true" signature="728:1568" placeholder="SELECT *, ti..arbeitstage..." />
+            <marker date="1412006026713" expanded="true" signature="728:1249" placeholder="SELECT a.dat..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="90" column="10" selection-start="2553" selection-end="2553" vertical-scroll-proportion="0.0" vertical-offset="1071" max-vertical-offset="2040">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/main.js">
+    <entry file="file://$PROJECT_DIR$/app/views/overview.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="34" selection-start="403" selection-end="403" vertical-scroll-proportion="0.50163937" vertical-offset="0" max-vertical-offset="1870">
+        <state line="174" column="106" selection-start="8094" selection-end="8094" vertical-scroll-proportion="0.69863015" vertical-offset="2550" max-vertical-offset="4590">
           <folding />
         </state>
       </provider>

+ 23 - 22
bower.json

@@ -1,23 +1,24 @@
 {
-  "name": "kasse",
-  "version": "0.0.0",
-  "dependencies": {
-    "angular": "1.2.16",
-    "json3": "~3.3.1",
-    "es5-shim": "~3.1.0",
-    "bootstrap": "~3.2.0",
-    "angular-resource": "1.2.16",
-    "angular-cookies": "1.2.16",
-    "angular-sanitize": "1.2.16",
-    "angular-animate": "1.2.16",
-    "angular-touch": "1.2.16",
-    "angular-route": "1.2.16",
-    "angular-bootstrap": "~0.11.0",
-    "underscore": "~1.6.0"
-  },
-  "devDependencies": {
-    "angular-mocks": "1.2.16",
-    "angular-scenario": "1.2.16"
-  },
-  "appPath": "app"
-}
+    "name": "fehlerbericht",
+    "version": "0.0.0",
+    "dependencies": {
+        "angular": "1.2.16",
+        "json3": "~3.3.1",
+        "es5-shim": "~3.1.0",
+        "bootstrap": "~3.2.0",
+        "angular-resource": "1.2.16",
+        "angular-cookies": "1.2.16",
+        "angular-sanitize": "1.2.16",
+        "angular-animate": "1.2.16",
+        "angular-touch": "1.2.16",
+        "angular-route": "1.2.16",
+        "angular-bootstrap": "~0.11.0",
+        "moment": "~2.8.3",
+        "underscore": "~1.6.0"
+    },
+    "devDependencies": {
+        "angular-mocks": "1.2.16",
+        "angular-scenario": "1.2.16"
+    },
+    "appPath": "app"
+}

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "kasse",
+  "name": "fehlerbericht",
   "version": "0.0.0",
   "dependencies": {},
   "devDependencies": {