Locosoft

app/scripts/controllers/customers.js

@@ -2,7 +2,7 @@
 
 angular.module('fehlerberichtApp')
     .controller('CustomersCtrl', function ($scope, $http) {
-        var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+        var webservice = 'db.php?';
 
         $scope.info = [];
         $scope.error = -1;
@@ -20,6 +20,7 @@ angular.module('fehlerberichtApp')
                 'EDS',
                 'Filaks',
                 'GlobalCube',
+                'Locosoft',
                 'Navision',
                 'Optima',
                 'Optima-Light'

app/scripts/controllers/overview.js

@@ -9,7 +9,7 @@
  */
 angular.module('fehlerberichtApp')
     .controller('OverviewCtrl', function ($scope, $http, $routeParams, $interval) {
-        var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+        var webservice = 'db.php?';
 
         var PERIOD_VISIBLE = 60 * 1000;
         var PERIOD_NOT_VISIBLE = 5 * 60 * 1000;
@@ -58,6 +58,7 @@ angular.module('fehlerberichtApp')
                 'EDS',
                 'Filaks',
                 'GlobalCube',
+                'Locosoft',
                 'Navision',
                 'Optima',
                 'Optima-Light'
@@ -139,6 +140,11 @@ angular.module('fehlerberichtApp')
             $scope.domain.benutzer = _.unique(_.pluck(data, 'benutzer'));
         });
 
+        $http.get(webservice + 'a=kommentar&kunde=' + $scope.Filter.kunde + '&datum=' + $scope.DatumFilter.von + '&datum_bis=' + $scope.DatumFilter.bis).success(function (data) {
+            $scope.comments = _.groupBy(data, 'kunde');
+            $scope.comments2 = _.indexBy(data, 'id');
+        });
+
         $scope.refresh = function () {
             $http.get(webservice + 'a=liste&kunde=' + $scope.Filter.kunde + '&datum=' + $scope.DatumFilter.von + '&datum_bis=' + $scope.DatumFilter.bis).success(function (data) {
                 if (JSON.stringify($scope.overview) !== JSON.stringify(data)) {
@@ -146,11 +152,6 @@ angular.module('fehlerberichtApp')
                 }
                 //$scope.domain.benutzer = _.unique(_.pluck(data, 'benutzer'));
             });
-			
-			$http.get(webservice + 'a=kommentar&kunde=' + $scope.Filter.kunde + '&datum=' + $scope.DatumFilter.von + '&datum_bis=' + $scope.DatumFilter.bis).success(function (data) {
-				$scope.comments = _.groupBy(data, 'kunde');
-				$scope.comments2 = _.indexBy(data, 'id');
-			});
         };
 
         $scope.importData = function () {
@@ -391,18 +392,12 @@ angular.module('fehlerberichtApp')
             return false;
         };
 
-        $scope.getCommentsInfo = function (comment_id, kunde, datum) {
+        $scope.getCommentsInfo = function (comment_id) {
             if ($scope.comments2[comment_id] !== undefined) {
                 var c = $scope.comments2[comment_id];
                 return '<i>' + $scope.domain.bearbeitet[c.status] + '</i><br/>' + c.kommentar;
-            } else {
-				var comments = _.filter($scope.comments[kunde], function (row) { return row.datum <= datum && row.status > 0; });
-                var result = '';
-				_.each(comments, function (c) {
-					result += '<i>' + $scope.domain.bearbeitet[c.status] + '</i><br/>' + c.kommentar + '<br/>';
-				});
-				return result;
-			}
+            }
+            return 'blubb';
         };
 
         $scope.getCommentIcon = function (c) {

app/styles/main.css

@@ -1,3 +1,81 @@
+.table tr.middle > td, .table tr.middle > th {
+  vertical-align: middle;
+}
+
+.label-Autosys {
+  background-color: #da3;
+  color: #000;
+}
+
+.label-Autosys-Light {
+  background-color: #eca;
+  color: #000;
+}
+
+.label-CarIT-Audev {
+  background-color: #57c;
+  color: #fff;
+}
+
+.label-EDS {
+  background-color: #a33;
+  color: #fff;
+}
+
+.label-Filaks {
+  background-color: #883;
+  color: #fff;
+}
+
+.label-GlobalCube {
+  background-color: #aaa;
+  color: #fff;
+}
+
+.label-Locosoft {
+  background-color: #62b;
+  color: #fff;
+}
+
+.label-Navision {
+  background-color: #35d;
+  color: #fff;
+}
+
+.label-Optima {
+  background-color: #080;
+  color: #fff;
+}
+
+.label-Optima-Light {
+  background-color: #5b5;
+  color: #fff;
+}
+
+.closed-tab {
+  display: none;
+}
+
+.caret-up {
+  border-bottom: 10px solid #000000;
+  border-left: 6px solid rgba(0, 0, 0, 0);
+  border-right: 6px solid rgba(0, 0, 0, 0);
+  content: "";
+  display: inline-block;
+  height: 0;
+  vertical-align: top;
+  width: 0;
+}
+
+.red {
+  color: #cc0000;
+}
+
+pre b {
+  background-color: #ee5555;
+}
+
+
 /* Space out content a bit */
 body {
   padding-top: 20px;