Organisation der Angular Dateien anpassen

Author: András Németh

index.html

@@ -31,8 +31,9 @@
 
     <!-- AngularJS base and data scripts -->
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
-    <script src="js-angular/webApp.js"></script>
-    <script src="js-angular/eventController.js"></script>
+    <script src="js/angular/webApp.js"></script>
+    <script src="js/data/eventList.js"></script>
+    <script src="js/angular/eventController.js"></script>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

js-data/events.json

@@ -1,22 +1,6 @@
 app.controller('eventController', function($scope) {
 
-    /*
-    Expected structure for "eventList" entries:
-    (Time values must be integers.)
-    {
-        "year" : 2000,
-        "month" : 1,
-        "day" : 1,
-        "startHour" : 17,
-        "startMin" : 0,
-        "endHour" : 19,
-        "endMin" : 0,
-        "location" : "Raum",
-        "isIntroEvent" : false
-    }
-    */
-
-    $scope.eventList = null; // initialized in init
+    $scope.eventList = eventList; // from global var in data script
     $scope.pastEventList = []; // filled in init
     $scope.nextEvent = null; // initialized in init
     $scope.futureEventList = []; // filled in init
@@ -56,9 +40,7 @@ app.controller('eventController', function($scope) {
         }
     };
 
-    $scope.init = function(argEventList) {
-
-        $scope.eventList = argEventList;
+    $scope.init = function() {
 
         // fill split event lists
 
@@ -92,8 +74,6 @@ app.controller('eventController', function($scope) {
 
     };
 
-    $.getJSON("js-data/events.json", function (data) {
-            $scope.init(data.eventList);
-        });
+    $scope.init();
 
 });

js-angular/eventController.js js/angular/eventController.jsjs-angular/eventController.js renamed to js/angular/eventController.js

@@ -0,0 +1,84 @@
+eventList = [
+    /*
+    Expected structure for "eventList" entries:
+    (Time values must be integers.)
+    {
+        "year" : 2000,
+        "month" : 1,
+        "day" : 1,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Raum",
+        "isIntroEvent" : false
+    }
+    */
+    {
+        "year" : 2016,
+        "month" : 9,
+        "day" : 16,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : true
+    },
+    {
+        "year" : 2016,
+        "month" : 9,
+        "day" : 30,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : false
+    },
+    {
+        "year" : 2016,
+        "month" : 10,
+        "day" : 14,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : false
+    },
+    {
+        "year" : 2016,
+        "month" : 10,
+        "day" : 28,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : true
+    },
+    {
+        "year" : 2016,
+        "month" : 11,
+        "day" : 11,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : false
+    },
+    {
+        "year" : 2016,
+        "month" : 11,
+        "day" : 25,
+        "startHour" : 17,
+        "startMin" : 0,
+        "endHour" : 19,
+        "endMin" : 0,
+        "location" : "Seminarraum 236",
+        "isIntroEvent" : true
+    }
+
+];