Merge branch 'develop' into 'master'

Courses edit improvements

See merge request !74

courses_legacy/static/js/activities/controllers.js

@@ -40,7 +40,7 @@
       'AnswerNotification',
       'ContentFile',
       function ($scope, $sce, $routeParams, $anchorScroll, $document, uiTinymceConfig, Forum, Topic, Comment, TopicLike, TopicFile, CommentLike, CommentFile, Progress, ClassActivity, CurrentUser, AnswerNotification, ContentFile) {
-            $scope.$watch('currentActivity', function(currentActivity) {
+        $scope.$watch('currentActivity', function(currentActivity) {
             $scope.activity_open = true;
             $scope.activity_expired = false;
             var now = Date.now();
@@ -217,11 +217,12 @@
                 exclude_cur_user: true,
                 page: 1
             }, function(response){
-                // Check if there are any activities to show
-                if (response.results.length > 0) {
-                    $scope.hasTopic = true;
-                }           
-              });
+                    // Check if there are any activities to show
+                    if (response.results.length > 0) {
+                        $scope.hasTopic = true;
+                        $scope.totalPage = response.results.length;
+                    }           
+                });
 
             function fetchAnswersPage(page) {
                 const params = { };
@@ -237,6 +238,8 @@
                     if ($scope.classes_activities.results.length > 0) {
                         $scope.hasTopic = true;
                     }
+
+                    $scope.totalPage = $scope.classes_activities.results.length + ((page - 1) * 10);
                 });
             }
     

courses_legacy/static/js/course-permissions/controllers.js

@@ -47,10 +47,10 @@
                 $scope.professors_before_changes = angular.copy(professors);
             });
 
-            // CourseGroup.get({id: $scope.courseId}, function(course){
-            //     $scope.course_groups = course;
-            // });
-            // $scope.groups = Groups.query();
+            CourseGroup.get({id: $scope.courseId}, function(course){
+                $scope.course_groups = course;
+            });
+            $scope.groups = Groups.query();
 
             $scope.get_as_safe_html = function(value) {
                 return $sce.trustAsHtml(value);
@@ -102,7 +102,7 @@
                     }
                 );
 
-                // $scope.course_groups.$update({id: $scope.courseId});
+                $scope.course_groups.$update({id: $scope.courseId});
             };
 
             $scope.cancel_permissions_changes = function() {

courses_legacy/static/js/main-nav/controller.js

@@ -3,17 +3,11 @@
     var app = angular.module('main-nav.controllers', []);
 
     app.controller('MainNavCtrl', [
-        '$scope', 'Message',
-        function ($scope, Message) {
+        '$scope', 'Message', 'MessageCount',
+        function ($scope, Message, MessageCount) {
 
             // Count unread messages for display in the main navigation
-            $scope.messages_unread_count = 0;
-            Message.query({}, function(message){
-                for (var i = 0; i < message.length; i++) {
-                    if (message[i].is_read === false)
-                        $scope.messages_unread_count++;
-                }
-            })
+            $scope.messages_unread_count = MessageCount.get({unread: true})
 
             // Listens to 'message' events triggered by the Rocket Chat iframe
             $scope.chat = {

courses_legacy/static/js/main-nav/services.js

@@ -8,4 +8,9 @@
             });
     });
 
+    module.factory('MessageCount', function($resource){
+        return $resource(BASE_API_URL + '/professor_message/count_message', {}, {
+        });
+    });
+
 })(angular);

courses_legacy/urls.py

@@ -36,7 +36,7 @@ from .reports.views import (UserCourseStats, CourseStatsByLessonViewSet, UserCou
 from courses.views import (
     CourseViewSet, BaseCourseProfessorViewSet,
     ProfessorMessageViewSet, ProfessorGlobalMessageViewSet,
-    ProfessorMessageReadViewSet
+    ProfessorMessageReadViewSet, CourseGroupViewSet
 )
 from courses.course_material.views import CourseMaterialViewSet, CourseMaterialFileViewSet
 from courses.certification.views import (
@@ -67,6 +67,7 @@ router = routers.DefaultRouter(trailing_slash=False)
 
 router.register(r'profile', ProfileViewSet, base_name='profile')
 router.register(r'user_admin', TimtecUserAdminViewSet, base_name='user_admin')
+router.register(r'course_group', CourseGroupViewSet, base_name='course_group')
 
 router.register(r'course_carousel', CarouselCourseView, base_name='course_carousel')
 router.register(r'course_professor', CourseProfessorViewSet, base_name='course_professor')