first calendar view

Gruntfile_luticate.js

@@ -1,37 +0,0 @@
-/**
- * Created by robin on 11/10/15.
- */
-
-module.exports = function(grunt) {
-
-    grunt.loadNpmTasks('grunt-contrib-copy');
-
-    var path = require('path');
-
-    grunt.initConfig({
-        globals: {
-            releasePath: 'build/release/luticate',
-            appFolder: 'luticate',
-            staticFiles: [
-                '**'
-            ]
-        },
-        copy: {
-            release: {
-                files: [
-                    {
-                        expand: true,
-                        cwd:'<%= globals.appFolder %>/',
-                        src: ['<%= globals.staticFiles %>'],
-                        dest: '<%= globals.releasePath %>'
-                    }
-                ]
-            }
-        }
-    });
-    grunt.registerTask('default', [
-        'copy:release'
-    ]);
-
-
-};

app/controllers/home.controller.js

@@ -41,7 +41,7 @@ angular.module('app')
                 }
             };
 
-            $scope.getCourseListByDay = function(date)
+            $scope.getDayListByDay = function(date)
             {
                 if ($scope.courses == null || date == null) {
                     return null;
@@ -55,11 +55,11 @@ angular.module('app')
 
             $scope.getCoursesByDate = function(date)
             {
-                var courses = $scope.getCourseListByDay(date);
+                var courses = $scope.getDayListByDay(date);
                 if (courses == null) {
                     return [];
                 }
-                return ["42", "24"];
+                return courses.CourseList;
             };
 
             $scope.$watch(function(){return DataShareBusiness.CurrentGroups}, function()

app/less/app.less

@@ -82,3 +82,9 @@ footer {
 .day-column-header-date {
   padding-bottom: 5px;
 }
+
+.day-column-course {
+  position: absolute;
+  background-color: cadetblue;
+  width: 100%;
+}

app/views/home.html

@@ -12,11 +12,10 @@
         <div ng-repeat="day in days" class="col-sm-1 day-column">
             <div class="day-column-header day-column-header-day">{{ day.day }}</div>
             <div class="day-column-header day-column-header-date">{{ day.date | date : dateFormat }}</div>
-            <div ng-repeat="course in getCoursesByDate(day.date)" ng-style="{'heigth': '0'}">
-                {{course}}
+            <div class="day-column-course" ng-repeat="course in getCoursesByDate(day.date)" ng-style="{'height': (course.EndPercent - course.BeginPercent) + '%', 'top' : course.BeginPercent + '%'}">
+                {{ course.Name }}
             </div>
         </div>
-        {{ courses }}
     </div>
 
 </div>

sdk/Business/WeeksBusiness.js

@@ -1,13 +1,50 @@
 (function()
 {
     angular.module('appSdk')
-        .factory('WeeksBusiness', ['WeeksDataAccess', function (WeeksDataAccess) {
+        .factory('WeeksBusiness', ['WeeksDataAccess', '$q', function (WeeksDataAccess, $q) {
 
             var Business = {};
 
-            Business.getWeek = WeeksDataAccess.getWeek;
+            Business.formatWeek = function(data)
+            {
+                data.DayList.forEach(function(day) {
+                    day.CourseList.forEach(function (course) {
+                        var dt = new Date(course.BeginDate);
+                        var secs = dt.getSeconds() + (60 * dt.getMinutes()) + (60 * 60 * dt.getHours());
+                        course.BeginPercent = secs / (60 * 60 * 24) * 100;
+                        course.BeginSeconds = secs;
 
-            Business.getCurrentWeek = WeeksDataAccess.getCurrentWeek;
+                        dt = new Date(course.EndDate);
+                        secs = dt.getSeconds() + (60 * dt.getMinutes()) + (60 * 60 * dt.getHours());
+                        course.EndPercent = secs / (60 * 60 * 24) * 100;
+                        course.EndSeconds = secs;
+                    });
+                });
+            };
+
+            Business.getWeek = function(data, promise)
+            {
+                var defer = $q.defer();
+                WeeksDataAccess.getWeek(data, promise)
+                    .then(function(data)
+                    {
+                        Business.formatWeek(data);
+                        defer.resolve(data);
+                    }, defer.reject);
+                return defer.promise;
+            };
+
+            Business.getCurrentWeek = function(data, promise)
+            {
+                var defer = $q.defer();
+                WeeksDataAccess.getCurrentWeek(data, promise)
+                    .then(function(data)
+                    {
+                        Business.formatWeek(data);
+                        defer.resolve(data);
+                    }, defer.reject);
+                return defer.promise;
+            };
 
             return Business;
         }]);