create code to submit new lessons from admin page, refs #158

hacklabr · Nov 11, 2013 · 4a18580 · 4a18580
1 parent 662f760
commit 4a18580
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 20 deletions.
diff --git a/core/templates/admin/_base.html b/core/templates/admin/_base.html
@@ -555,7 +555,7 @@ <h3 class="top">{{selectedUnit().title}}</h3>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="selectedLesson.restore()">Cancel</button>
-            <button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="selectedLesson.$update()">Save changes</button>
+            <button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="saveLesson()">Save changes</button>
           </div>
         </div>
       </div>

diff --git a/lesson/serializers.py b/lesson/serializers.py
@@ -49,6 +49,7 @@ class Meta:
 
 
 class LessonSerializer(serializers.HyperlinkedModelSerializer):
+    course = serializers.SlugRelatedField(slug_field='slug')
     units = UnitSerializer(many=True, allow_add_remove=True)
     url = serializers.HyperlinkedIdentityField(
         view_name='lesson',
@@ -57,4 +58,4 @@ class LessonSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = Lesson
-        fields = ('id', 'course', 'slug', 'desc', 'notes', 'name', 'url', 'published', 'units',)
+        fields = ('id', 'course', 'desc', 'name', 'notes', 'position', 'published', 'slug', 'units', 'url',)
diff --git a/static/js/admin/admin.js b/static/js/admin/admin.js
@@ -12,15 +12,14 @@
                 /^https?:\/\/(www\.)?youtube\.com\/.*/,
                 'data:text/html, <html style="background: white">'
             ]);
-            window.sce = $sceDelegateProvider;
         }
     ]);
 
-    app.filter('markdown', ['$window', function($window) {
+    app.filter('markdown', function() {
         return function(text) {
             return text ? Markdown.getSanitizingConverter().makeHtml(text) : "";
         };
-    }]);
+    });
 
     app.directive('contenteditable', function(){
         return {
@@ -128,26 +127,34 @@
         }
     ]);
 
-    app.controller('LessonList',['$scope', '$rootScope', 'LessonListFactory', '$http',
-        function($scope, $rootScope, LessonListFactory, $http){
+    app.controller('LessonList',['$scope', '$rootScope', 'LessonListFactory', 'Lesson',
+        function($scope, $rootScope, LessonListFactory, Lesson){
+
+            $scope.newLesson = function() {
+                var newLesson = new Lesson({'units': []});
+                newLesson.position = $scope.lessons.length;
+                $scope.lessons.push(newLesson);
+                $rootScope.selectedLesson = newLesson;
+            };
 
             $scope.select = function (lesson) {
                 $rootScope.selectedLesson = lesson;
                 return lesson;
             };
             $scope.countActivities = function(l) {
-                if( l.units ) {
-                    return l.units.reduce(function(p,s){return p + (s.activity ? 1 : 0); }, 0);
+                if( !l.units ){
+                    l.units = [];
+                    return 0;
                 }
-                return 0;
+                return l.units.reduce(function(p,s){return p + (s.activity ? 1 : 0); }, 0);
             };
             $scope.countVideos = function(l) {
-                if( l.units ) {
-                    return l.units.reduce(function(p,s){return p + (s.video ? 1 : 0); }, 0);
+                if( !l.units ) {
+                    l.units = [];
+                    return 0;
                 }
-                return 0;
+                return l.units.reduce(function(p,s){return p + (s.video ? 1 : 0); }, 0);
             };
-
             LessonListFactory.then(function(lessons){
                 $scope.lessons = lessons;
             });
@@ -180,8 +187,12 @@
                 });
             };
             $scope.selectedUnit = function() {
-                if($rootScope.selectedLesson)
-                    return $rootScope.selectedLesson.units[selectedUnitIndex];
+                if($rootScope.selectedLesson && 'units' in $rootScope.selectedLesson)
+                    if($rootScope.selectedLesson.units.length > 0){
+                        return $rootScope.selectedLesson.units[selectedUnitIndex];
+                    } else {
+                        return {};
+                    }
             };
             $scope.activity = function() {
                 if($scope.selectedUnit() && $scope.selectedUnit().activity){
@@ -220,6 +231,13 @@
                     act.expected.push(false);
                 }
             };
+            $scope.saveLesson = function(){
+                if('id' in $rootScope.selectedLesson){
+                    $rootScope.selectedLesson.$update();
+                } else {
+                    $rootScope.selectedLesson.$create();
+                }
+            };
             LessonListFactory.then(function(lessons){
                 $scope.lessons = lessons;
             });
@@ -231,7 +249,7 @@
      * Factories
      */
     app.factory('CourseDataFactory', ['$rootScope', '$q', '$resource',
-        function($rootScope, $q, $resource, $window) {
+        function($rootScope, $q, $resource) {
             var Course = $resource('/api/course/:courseSlug/',{'courseSlug': courseSlug});
             var deferred = $q.defer();
 
@@ -242,8 +260,8 @@
         }
     ]);
 
-    app.factory('LessonListFactory', ['$rootScope', '$q', '$resource',
-        function($rootScope, $q, $resource, $window) {
+    app.factory('LessonListFactory', ['$q', '$resource',
+        function($q, $resource) {
             var resourceConfig = {
                 'get':  {
                     'method':'GET',
@@ -267,5 +285,25 @@
             return deferred.promise;
         }
     ]);
-
+    app.factory('Lesson',['$resource',
+        function($resource){
+            var resourceConfig = {
+                'get':  {
+                    'method':'GET',
+                    'params':{'course__slug': courseSlug}
+                },
+                'create':{
+                    'method':'POST',
+                    'transformRequest': function(data, getter){
+                        data.course = courseSlug;
+                        return JSON.stringify(data);
+                    }
+                },
+                'update':{
+                    'method': 'PUT'
+                }
+            };
+            return $resource('/api/lessons/:id', {'id':'@id'}, resourceConfig);
+        }
+    ]);
 })(angular);