- Import jetzt mit Überprüfung der Gaps.bat.log

- Fehler rot markiert

.idea/workspace.xml

@@ -23,97 +23,78 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="overview.js" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
+      <file leaf-file-name="import.php" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/import.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="254" column="26" selection-start="8217" selection-end="8217" vertical-scroll-proportion="0.0" vertical-offset="3967" max-vertical-offset="7395">
-              <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="89" column="120" selection-start="3712" selection-end="3712" vertical-scroll-proportion="0.0" vertical-offset="1513" max-vertical-offset="2720">
-              <folding>
-                <marker date="1427386414241" expanded="true" signature="653:889" placeholder="SELECT sm.*,..status_meldung..." />
-                <marker date="1427386414241" expanded="true" signature="1191:1326" placeholder="UPDATE kunde..." />
-                <marker date="1427386414241" expanded="true" signature="1590:1957" placeholder="UPDATE kunde..." />
-                <marker date="1427386414241" expanded="true" signature="1997:2017" placeholder="SELECT * FRO..kunden..." />
-                <marker date="1427386414241" expanded="true" signature="2111:2149" placeholder="SELECT kunde..kunden_config..." />
-                <marker date="1427386414241" expanded="true" signature="2460:2559" placeholder="SELECT * FRO..kunden_config..." />
-                <marker date="1427386414241" expanded="true" signature="2597:2689" placeholder="SELECT * FRO..kunden_config..." />
-                <marker date="1427386414241" expanded="true" signature="2882:2904" placeholder="SELECT * FRO..benutzer..." />
-                <marker date="1427386414241" expanded="true" signature="3137:3400" placeholder="INSERT INTO ..." />
-                <marker date="1427386414241" expanded="true" signature="3137:3264" placeholder="INSERT INTO ..." />
-                <marker date="1427386414241" expanded="true" signature="3137:3263" placeholder="INSERT INTO ..." />
-                <marker date="1427386414241" expanded="true" signature="3137:3251" placeholder="INSERT INTO ..." />
-                <marker date="1427386414241" expanded="true" signature="3521:3753" placeholder="INSERT INTO ..." />
-                <marker date="1427386414241" expanded="true" signature="3818:3987" placeholder="UPDATE statu..." />
-                <marker date="1427386414241" expanded="true" signature="4026:4241" placeholder="UPDATE statu..." />
-                <marker date="1427386414241" expanded="true" signature="4026:4246" placeholder="UPDATE statu..." />
-                <marker date="1427386414241" expanded="true" signature="4280:4406" placeholder="SELECT * FRO..status_kommentar..." />
-                <marker date="1427386414241" expanded="true" signature="4812:5813" placeholder="SELECT a.dat..arbeitstage..." />
-              </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="406" column="0" selection-start="20361" selection-end="20361" vertical-scroll-proportion="0.80697054" vertical-offset="6300" max-vertical-offset="7378">
+            <state line="46" column="37" selection-start="1889" selection-end="1889" vertical-scroll-proportion="0.19894598" vertical-offset="631" max-vertical-offset="2499">
               <folding>
-                <element signature="n#style#0;n#th#0;n#tr#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#2;n#!!top" expanded="true" />
+                <marker date="1432016255088" expanded="true" signature="1678:1702" placeholder="SELECT kunde..kunden..." />
+                <marker date="1432016255088" expanded="true" signature="4350:4487" placeholder="INSERT INTO ..." />
+                <marker date="1432016255088" expanded="true" signature="4564:4645" placeholder="SELECT * FRO..kunden_config..." />
+                <marker date="1432016255088" expanded="true" signature="4796:4887" placeholder="INSERT INTO ..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/index.html">
+      <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="91" column="45" selection-start="2681" selection-end="2681" vertical-scroll-proportion="0.0" vertical-offset="1122" max-vertical-offset="2822">
+            <state line="27" column="0" selection-start="1144" selection-end="1144" vertical-scroll-proportion="-11.769231" vertical-offset="153" max-vertical-offset="2720">
               <folding>
-                <marker date="1426582695479" expanded="true" signature="2089:2242" placeholder="..." />
+                <marker date="1432015321798" expanded="true" signature="653:889" placeholder="SELECT sm.*,..status_meldung..." />
+                <marker date="1432015321798" expanded="true" signature="1191:1326" placeholder="UPDATE kunde..." />
+                <marker date="1432015321798" expanded="true" signature="1590:1957" placeholder="UPDATE kunde..." />
+                <marker date="1432015321798" expanded="true" signature="1997:2017" placeholder="SELECT * FRO..kunden..." />
+                <marker date="1432015321798" expanded="true" signature="2111:2149" placeholder="SELECT kunde..kunden_config..." />
+                <marker date="1432015321798" expanded="true" signature="2460:2559" placeholder="SELECT * FRO..kunden_config..." />
+                <marker date="1432015321798" expanded="true" signature="2597:2689" placeholder="SELECT * FRO..kunden_config..." />
+                <marker date="1432015321798" expanded="true" signature="2882:2904" placeholder="SELECT * FRO..benutzer..." />
+                <marker date="1432015321798" expanded="true" signature="3137:3400" placeholder="INSERT INTO ..." />
+                <marker date="1432015321798" expanded="true" signature="3521:3753" placeholder="INSERT INTO ..." />
+                <marker date="1432015321798" expanded="true" signature="3818:3987" placeholder="UPDATE statu..." />
+                <marker date="1432015321798" expanded="true" signature="4026:4246" placeholder="UPDATE statu..." />
+                <marker date="1432015321798" expanded="true" signature="4280:4406" placeholder="SELECT * FRO..status_kommentar..." />
+                <marker date="1432015321798" expanded="true" signature="4812:5813" placeholder="SELECT a.dat..arbeitstage..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bower.json" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bower.json">
+      <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="17" column="27" selection-start="541" selection-end="541" vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="527">
+            <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="-0.65384614" vertical-offset="187" max-vertical-offset="1173">
               <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="overview.html" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/overview.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="19" column="35" selection-start="552" selection-end="552" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="1309">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="7378">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Gruntfile.js" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Gruntfile.js">
+      <file leaf-file-name="main.css" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/styles/main.css">
           <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="1020" max-vertical-offset="7106">
+            <state line="79" column="0" selection-start="1411" selection-end="1411" vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1445">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="package.json" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/package.json">
+      <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="29" column="41" selection-start="948" selection-end="948" vertical-scroll-proportion="0.0" vertical-offset="493" max-vertical-offset="782">
-              <folding />
+            <state line="77" column="38" selection-start="2050" selection-end="2050" vertical-scroll-proportion="-22.0" vertical-offset="737" max-vertical-offset="2890">
+              <folding>
+                <marker date="1431936960583" expanded="true" signature="2155:2308" placeholder="..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -146,13 +127,13 @@
         <option value="$PROJECT_DIR$/app/scripts/controllers/config.js" />
         <option value="$PROJECT_DIR$/app/scripts/controllers/customers.js" />
         <option value="$PROJECT_DIR$/app/scripts/controllers/stats.js" />
-        <option value="$PROJECT_DIR$/app/index.html" />
         <option value="$PROJECT_DIR$/app/views/stats.html" />
-        <option value="$PROJECT_DIR$/app/import.php" />
-        <option value="$PROJECT_DIR$/app/db.php" />
         <option value="$PROJECT_DIR$/app/scripts/app.js" />
-        <option value="$PROJECT_DIR$/app/views/overview.html" />
         <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/db.php" />
+        <option value="$PROJECT_DIR$/app/import.php" />
       </list>
     </option>
   </component>
@@ -217,6 +198,7 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -267,6 +249,24 @@
               <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="styles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="Fehlerbericht" />
@@ -309,7 +309,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -406,11 +405,11 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="316" width="1936" height="1216" extended-state="6" />
-    <editor active="false" />
+    <frame x="1912" y="316" width="1936" height="1216" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26805055" 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="true" weight="0.26805055" 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" />
@@ -422,11 +421,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="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="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="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="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" />
+      <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="Command Line Tools Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -447,16 +446,11 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <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" />
-      </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">
           <folding>
-            <marker date="1426582695479" expanded="true" signature="2089:2242" placeholder="..." />
+            <marker date="1431936960583" expanded="true" signature="2155:2308" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -464,17 +458,13 @@
     <entry file="file://$PROJECT_DIR$/app/views/overview.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="6" column="0" selection-start="483" selection-end="483" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="255">
-          <folding>
-            <element signature="n#style#0;n#th#0;n#tr#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#2;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <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">
-          <folding />
-        </state>
+        <state line="23" column="43" selection-start="709" selection-end="714" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="561" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/main.html">
@@ -496,7 +486,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state line="64" column="41" selection-start="2336" selection-end="2336" vertical-scroll-proportion="0.0" vertical-offset="923" max-vertical-offset="2023">
           <folding>
-            <marker date="1426582695479" expanded="true" signature="2089:2242" placeholder="..." />
+            <marker date="1431936960583" expanded="true" signature="2155:2308" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -504,17 +494,13 @@
     <entry file="file://$PROJECT_DIR$/app/views/overview.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="9" column="0" selection-start="492" selection-end="492" vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="255">
-          <folding>
-            <element signature="n#style#0;n#th#0;n#tr#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#2;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <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">
-          <folding />
-        </state>
+        <state line="23" column="43" selection-start="709" selection-end="714" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="561" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/main.html">
@@ -536,7 +522,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state line="64" column="41" selection-start="2336" selection-end="2336" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2023">
           <folding>
-            <marker date="1426582695479" expanded="true" signature="2089:2242" placeholder="..." />
+            <marker date="1431936960583" expanded="true" signature="2155:2308" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -544,17 +530,13 @@
     <entry file="file://$PROJECT_DIR$/app/views/overview.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="9" column="0" selection-start="492" selection-end="492" vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="255">
-          <folding>
-            <element signature="n#style#0;n#th#0;n#tr#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#2;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <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">
-          <folding />
-        </state>
+        <state line="23" column="43" selection-start="709" selection-end="714" vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="561" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/main.html">
@@ -607,11 +589,6 @@
         <state line="22" column="50" selection-start="642" selection-end="642" vertical-scroll-proportion="0.0" vertical-offset="164" max-vertical-offset="748" />
       </provider>
     </entry>
-    <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="-7.8461537" vertical-offset="0" max-vertical-offset="1173" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/calendar.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="20" selection-start="20" selection-end="20" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="584" />
@@ -667,106 +644,111 @@
         <state line="15" column="83" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1139" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/stats.html">
+    <entry file="file://$PROJECT_DIR$/app/import.bat">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="10" selection-start="661" selection-end="661" vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="425" />
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="785" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/import.bat">
+    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/customers.js">
       <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="785" />
+        <state line="14" column="23" selection-start="376" selection-end="376" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1632" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/import.php">
+    <entry file="file://$PROJECT_DIR$/Gruntfile.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="0" selection-start="624" selection-end="624" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="1972" />
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.299363" vertical-offset="1020" max-vertical-offset="7106" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/customers.html">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="49" selection-start="833" selection-end="833" vertical-scroll-proportion="-11.115385" vertical-offset="51" max-vertical-offset="4573" />
+        <state line="29" column="41" selection-start="948" selection-end="948" vertical-scroll-proportion="0.6192358" vertical-offset="23" max-vertical-offset="782" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/customers.js">
+    <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="23" selection-start="376" selection-end="376" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="1632" />
+        <state line="19" column="35" selection-start="552" selection-end="552" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1309" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Gruntfile.js">
+    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
       <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="7106">
-          <folding />
-        </state>
+        <state line="254" column="26" selection-start="8217" selection-end="8217" vertical-scroll-proportion="0.0" vertical-offset="3967" max-vertical-offset="7395" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/stats.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="19" column="6" selection-start="668" selection-end="668" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="425" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/customers.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="18" selection-start="859" selection-end="1355" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="4573" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/bower.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="27" selection-start="541" selection-end="541" vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="527">
-          <folding />
-        </state>
+        <state line="17" column="27" selection-start="541" selection-end="541" vertical-scroll-proportion="0.38076416" vertical-offset="0" max-vertical-offset="759" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/app/views/main.html">
       <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="493" max-vertical-offset="782">
+        <state line="12" column="20" selection-start="649" selection-end="657" vertical-scroll-proportion="-0.65384614" vertical-offset="187" max-vertical-offset="1173">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/scripts/app.js">
+    <entry file="file://$PROJECT_DIR$/app/styles/main.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="35" selection-start="552" selection-end="552" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1309">
+        <state line="79" column="0" selection-start="1411" selection-end="1411" vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1445">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/db.php">
+    <entry file="file://$PROJECT_DIR$/app/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="89" column="120" selection-start="3712" selection-end="3712" vertical-scroll-proportion="0.0" vertical-offset="1513" max-vertical-offset="2720">
+        <state line="77" column="38" selection-start="2050" selection-end="2050" vertical-scroll-proportion="-22.0" vertical-offset="737" max-vertical-offset="2890">
           <folding>
-            <marker date="1427386414241" expanded="true" signature="653:889" placeholder="SELECT sm.*,..status_meldung..." />
-            <marker date="1427386414241" expanded="true" signature="1191:1326" placeholder="UPDATE kunde..." />
-            <marker date="1427386414241" expanded="true" signature="1590:1957" placeholder="UPDATE kunde..." />
-            <marker date="1427386414241" expanded="true" signature="1997:2017" placeholder="SELECT * FRO..kunden..." />
-            <marker date="1427386414241" expanded="true" signature="2111:2149" placeholder="SELECT kunde..kunden_config..." />
-            <marker date="1427386414241" expanded="true" signature="2460:2559" placeholder="SELECT * FRO..kunden_config..." />
-            <marker date="1427386414241" expanded="true" signature="2597:2689" placeholder="SELECT * FRO..kunden_config..." />
-            <marker date="1427386414241" expanded="true" signature="2882:2904" placeholder="SELECT * FRO..benutzer..." />
-            <marker date="1427386414241" expanded="true" signature="3137:3400" placeholder="INSERT INTO ..." />
-            <marker date="1427386414241" expanded="true" signature="3137:3264" placeholder="INSERT INTO ..." />
-            <marker date="1427386414241" expanded="true" signature="3137:3263" placeholder="INSERT INTO ..." />
-            <marker date="1427386414241" expanded="true" signature="3137:3251" placeholder="INSERT INTO ..." />
-            <marker date="1427386414241" expanded="true" signature="3521:3753" placeholder="INSERT INTO ..." />
-            <marker date="1427386414241" expanded="true" signature="3818:3987" placeholder="UPDATE statu..." />
-            <marker date="1427386414241" expanded="true" signature="4026:4241" placeholder="UPDATE statu..." />
-            <marker date="1427386414241" expanded="true" signature="4026:4246" placeholder="UPDATE statu..." />
-            <marker date="1427386414241" expanded="true" signature="4280:4406" placeholder="SELECT * FRO..status_kommentar..." />
-            <marker date="1427386414241" expanded="true" signature="4812:5813" placeholder="SELECT a.dat..arbeitstage..." />
+            <marker date="1431936960583" expanded="true" signature="2155:2308" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/index.html">
+    <entry file="file://$PROJECT_DIR$/app/views/overview.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="91" column="45" selection-start="2681" selection-end="2681" vertical-scroll-proportion="0.0" vertical-offset="1122" max-vertical-offset="2822">
-          <folding>
-            <marker date="1426582695479" expanded="true" signature="2089:2242" placeholder="..." />
-          </folding>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="7378">
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/scripts/controllers/overview.js">
+    <entry file="file://$PROJECT_DIR$/app/db.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="254" column="26" selection-start="8217" selection-end="8217" vertical-scroll-proportion="0.0" vertical-offset="3967" max-vertical-offset="7395">
-          <folding />
+        <state line="27" column="0" selection-start="1144" selection-end="1144" vertical-scroll-proportion="-11.769231" vertical-offset="153" max-vertical-offset="2720">
+          <folding>
+            <marker date="1432015321798" expanded="true" signature="653:889" placeholder="SELECT sm.*,..status_meldung..." />
+            <marker date="1432015321798" expanded="true" signature="1191:1326" placeholder="UPDATE kunde..." />
+            <marker date="1432015321798" expanded="true" signature="1590:1957" placeholder="UPDATE kunde..." />
+            <marker date="1432015321798" expanded="true" signature="1997:2017" placeholder="SELECT * FRO..kunden..." />
+            <marker date="1432015321798" expanded="true" signature="2111:2149" placeholder="SELECT kunde..kunden_config..." />
+            <marker date="1432015321798" expanded="true" signature="2460:2559" placeholder="SELECT * FRO..kunden_config..." />
+            <marker date="1432015321798" expanded="true" signature="2597:2689" placeholder="SELECT * FRO..kunden_config..." />
+            <marker date="1432015321798" expanded="true" signature="2882:2904" placeholder="SELECT * FRO..benutzer..." />
+            <marker date="1432015321798" expanded="true" signature="3137:3400" placeholder="INSERT INTO ..." />
+            <marker date="1432015321798" expanded="true" signature="3521:3753" placeholder="INSERT INTO ..." />
+            <marker date="1432015321798" expanded="true" signature="3818:3987" placeholder="UPDATE statu..." />
+            <marker date="1432015321798" expanded="true" signature="4026:4246" placeholder="UPDATE statu..." />
+            <marker date="1432015321798" expanded="true" signature="4280:4406" placeholder="SELECT * FRO..status_kommentar..." />
+            <marker date="1432015321798" expanded="true" signature="4812:5813" placeholder="SELECT a.dat..arbeitstage..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/overview.html">
+    <entry file="file://$PROJECT_DIR$/app/import.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="406" column="0" selection-start="20361" selection-end="20361" vertical-scroll-proportion="0.80697054" vertical-offset="6300" max-vertical-offset="7378">
+        <state line="46" column="37" selection-start="1889" selection-end="1889" vertical-scroll-proportion="0.19894598" vertical-offset="631" max-vertical-offset="2499">
           <folding>
-            <element signature="n#style#0;n#th#0;n#tr#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#2;n#!!top" expanded="true" />
+            <marker date="1432016255088" expanded="true" signature="1678:1702" placeholder="SELECT kunde..kunden..." />
+            <marker date="1432016255088" expanded="true" signature="4350:4487" placeholder="INSERT INTO ..." />
+            <marker date="1432016255088" expanded="true" signature="4564:4645" placeholder="SELECT * FRO..kunden_config..." />
+            <marker date="1432016255088" expanded="true" signature="4796:4887" placeholder="INSERT INTO ..." />
           </folding>
         </state>
       </provider>

app/import.php

@@ -10,6 +10,36 @@ $server = "{imap.1und1.de:993/imap/ssl}INBOX";
 $user = "status@global-cube.de";
 $passwd = "gc01smtp";
 
+function fehlerberichtAufbereiten ($fehlerbericht, &$fehlerAnzahl) {
+	$fehlerbericht = str_replace("\r\`", "`", str_replace("\r\"", "\"", str_replace("\r\n", "", $fehlerbericht)));
+	$fehlerbericht = json_decode($fehlerbericht, true);
+
+	foreach ($fehlerbericht as $i => $log) {
+		if (preg_match("/\.bat$/", $log['Name'])) {
+			$fehlerbericht[$i]['Errors'][0] = preg_replace("/!! Bitte E-Mailadresse fuer Statusbericht angeben !!/im", "! Bitte E-Mailadresse fuer Statusbericht angeben !", $fehlerbericht[$i]['Errors'][0]);
+			$fehlerbericht[$i]['Errors'][0] = preg_replace("/!! SMTP-Konfiguration bitte anpassen !!/im", "! SMTP-Konfiguration bitte anpassen !", $fehlerbericht[$i]['Errors'][0]);
+
+			$count = 0;
+			$fehlerbericht[$i]['Errors'][0] = preg_replace("/(!![^\n]*!!)/im", "<b>$1</b>",$fehlerbericht[$i]['Errors'][0], -1, $count);
+			$count2 = 0;
+			$fehlerbericht[$i]['Errors'][0] = preg_replace("/(\(\w{2}\d{4}\) [^\r]*)/im", "<b>$1</b>", $fehlerbericht[$i]['Errors'][0], -1, $count2);
+			//die(print($log['Errors'][0]));
+			if ($count > 0 || $count2 > 0) {
+				$fehlerbericht[$i]['ErrorLevel'] = 2;
+				for ($j = 1; $j < $count; $j++) {
+					$fehlerbericht[$i]['Errors'][] = "";
+				}
+				$fehlerAnzahl += 1;
+			}
+		}
+	}
+	return addslashes(json_encode($fehlerbericht));
+}
+
+
+
+
+
 $q = $dbh->query("SELECT kunde FROM kunden");
 $customers = $q->fetchAll(PDO::FETCH_COLUMN, 0);
 
@@ -18,7 +48,8 @@ $message_count = imap_num_msg($mbox);
 
 $result = array();
 
-for ($m = 1; $m <= $message_count; ++$m) {
+for ($m = 1; $m <= $message_count; $m++) {
+	$fehlerAnzahl = 0;
 	$header = imap_headerinfo($mbox, $m);
 	$rec = explode(";", $header->Subject);
 	if (count($rec) < 3) continue;
@@ -77,12 +108,12 @@ for ($m = 1; $m <= $message_count; ++$m) {
 				$info = addslashes($attachment['attachment']);
 			}
 			if ($attachment['filename'] == "fehlerbericht.json") {
-				$fehlerbericht = addslashes($attachment['attachment']);
+				$fehlerbericht = fehlerberichtAufbereiten($attachment['attachment'], $fehlerAnzahl);
 			}
 		}
 	}
 	$rec[] = $fehlerbericht;
-
+	$rec[4] += $fehlerAnzahl;
 	$insertQuery = "INSERT INTO status_meldung (kunde, start, ende, datum, anzahl, fehlerbericht) VALUES ('" . implode("','", $rec) . "')";
 	$c = $dbh->query($insertQuery);
 	if ($c) {

app/index.html

@@ -73,6 +73,10 @@
         .red {
             color: #cc0000;
         }
+
+        pre b {
+            background-color: #ee5555;
+        }
     </style>
 </head>
 <body ng-app="fehlerberichtApp">

app/views/overview.html

@@ -253,7 +253,7 @@
                             <li ng-repeat="error in e.Errors"><a href="http://wiki.global-cube.de/{{error.Number}}">{{error.Number}}</a>:
                                 ({{error.Level}}) {{error.Message}}</li>
                         </ul>
-                        <pre class="fehler" ng-show="e.Type=='Workflow'">{{e.Errors[0]}}</pre>
+                        <pre class="fehler" ng-show="e.Type=='Workflow'" ng-bind-html="e.Errors[0]"></pre>
                         <table class="ft" ng-show="e.Type=='Portal'||e.Type=='Versand'">
                             <tbody ng-repeat="error in e.Errors">
                                 <tr>