Merge pull request #849 from moodlehq/integration

Integration

Author: jleyva

bower.json

@@ -19,5 +19,9 @@
   },
   "resolutions": {
     "angular": "1.5.3"
+  },
+  "dependencies": {
+    "chart.js": "^2.4.0",
+    "angular-chart.js": "^1.0.2"
   }
 }

upgrade.txt

@@ -6,6 +6,7 @@ information provided here is intended especially for developers.
  * mmaGrades addon has been moved to core with mmGrades name (and derivatives).
  * The promise returned by $mmaMessages#sendMessage is now resolved with an object instead of a boolean.
  * mm-format-text directive is now depending on height so new parameter max-height has been added and parameters shorten and expand-on-click have been deprecated.
+ * Now mmUser#formatRoleList is returning a String instead of a Promise.
 
 === 3.2 ===
 

www/addons/badges/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.badges')
  * @ngdoc service
  * @name $mmaBadgesHandlers
  */
-.factory('$mmaBadgesHandlers', function($mmaBadges, $mmUtil, $q, $mmContentLinksHelper) {
+.factory('$mmaBadgesHandlers', function($mmaBadges, $mmUtil, $q, $mmContentLinksHelper, mmUserProfileHandlersTypeNewPage) {
 
     var self = {};
 
@@ -36,7 +36,9 @@ angular.module('mm.addons.badges')
      */
     self.userProfile = function() {
 
-        var self = {};
+        var self = {
+            type: mmUserProfileHandlersTypeNewPage
+        };
 
         /**
          * Check if handler is enabled.

www/addons/competency/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.competency')
  * @ngdoc service
  * @name $mmaCompetencyHandlers
  */
-.factory('$mmaCompetencyHandlers', function($log, $mmaCompetency, mmCoursesAccessMethods) {
+.factory('$mmaCompetencyHandlers', function($log, $mmaCompetency, mmCoursesAccessMethods, mmUserProfileHandlersTypeNewPage) {
     $log = $log.getInstance('$mmaCompetencyHandlers');
 
     var self = {},
@@ -201,7 +201,9 @@ angular.module('mm.addons.competency')
      */
     self.learningPlan = function() {
 
-        var self = {};
+        var self = {
+            type: mmUserProfileHandlersTypeNewPage
+        };
 
         /**
          * Check if handler is enabled.

www/addons/coursecompletion/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.coursecompletion')
  * @ngdoc service
  * @name $mmaCourseCompletionHandlers
  */
-.factory('$mmaCourseCompletionHandlers', function($mmaCourseCompletion, $state, mmCoursesAccessMethods) {
+.factory('$mmaCourseCompletionHandlers', function($mmaCourseCompletion, $state, mmCoursesAccessMethods, mmUserProfileHandlersTypeNewPage) {
 
     // We use "caches" to decrease network usage.
     var self = {},
@@ -79,7 +79,9 @@ angular.module('mm.addons.coursecompletion')
      */
     self.viewCompletion = function() {
 
-        var self = {};
+        var self = {
+            type: mmUserProfileHandlersTypeNewPage
+        };
 
         /**
          * Check if handler is enabled.
@@ -135,8 +137,9 @@ angular.module('mm.addons.coursecompletion')
             return function($scope) {
 
                 // Button title.
-                $scope.title = 'mma.coursecompletion.viewcoursereport';
+                $scope.title = 'mma.coursecompletion.coursecompletion';
                 $scope.class = 'mma-coursecompletion-user-handler';
+                $scope.icon = 'ion-android-checkbox-outline';
 
                 $scope.action = function($event) {
                     $event.preventDefault();

www/addons/frontpage/directives/frontpageitemnews.js

@@ -21,7 +21,7 @@ angular.module('mm.addons.frontpage')
  * @ngdoc directive
  * @name mmaFrontpageItemNews
  */
-.directive('mmaFrontpageItemNews', function($mmCourse, $state, $mmSite, $mmAddonManager) {
+.directive('mmaFrontpageItemNews', function($mmCourse, $state, $mmSite, $mmAddonManager, $mmCourseDelegate) {
     return {
         restrict: 'A',
         priority: 100,
@@ -49,10 +49,10 @@ angular.module('mm.addons.frontpage')
                         if (forum) {
                             return $mmCourse.getModuleBasicInfo(forum.cmid).then(function(module) {
                                 scope.show = true;
-                                scope.icon = $mmCourse.getModuleIconSrc('forum');
-                                scope.action = function() {
-                                    $state.go('site.mod_forum', {module: module, courseid: courseId});
-                                };
+                                scope.module = module;
+                                scope.module._controller =
+                                    $mmCourseDelegate.getContentHandlerControllerFor(module.modname, module, courseId,
+                                        module.section);
                             });
                         }
                     });

www/addons/frontpage/scss/styles.scss

@@ -8,4 +8,16 @@
             left: 11px;
         }
     }
+
+    .mm-frontpageitemnews {
+        img {
+            max-width: 30px;
+            max-height: 30px;
+        }
+
+        .mm-module-buttons {
+            width: 30px;
+            height: 22px;
+        }
+    }
 }

www/addons/frontpage/templates/frontpage.html

@@ -6,49 +6,21 @@
         <mm-loading hide-until="frontpageLoaded" loading-padding-top="loadingPaddingTop">
 
             <section class="card" ng-if="section && sectionHasContent(section)">
-                <div class="item item-text-wrap" ng-if="section.summary">
+                <div class="item item-text-wrap clearfix" ng-if="section.summary">
                     <mm-format-text>{{ section.summary }}</mm-format-text>
                 </div>
 
-                <a class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-repeat="module in section.modules" ng-click="action($event)" ng-class="{'item-media': icon}" ng-controller="module._controller" title="{{ module.name }}">
-
-                    <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
-
-                    <div class="buttons mm-module-buttons" ng-if="(buttons && buttons.length > 0) || spinner">
-
-                        <button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon" aria-label="{{ button.label | translate }}">
-                            <i class="icon positive" ng-class="{'{{button.icon}}': button.icon}"></i>
-                        </button>
-
-                        <ion-spinner ng-if="spinner"></ion-spinner>
-                    </div>
-
-                    <mm-format-text watch="true">{{ title }}</mm-format-text>
-                </a>
+                <mm-course-module class="item item-complex" ng-repeat="module in section.modules" module="module"></mm-course-module>
             </section>
 
             <mma-frontpage-item ng-repeat="item in items" name="{{item}}"></mma-frontpage-item>
 
             <section class="card" ng-if="block && sectionHasContent(block)">
-                <div class="item item-text-wrap" ng-if="block.summary">
+                <div class="item item-text-wrap clearfix" ng-if="block.summary">
                     <mm-format-text>{{ block.summary }}</mm-format-text>
                 </div>
 
-                <a class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-repeat="module in block.modules" ng-click="action($event)" ng-class="{'item-media': icon}" ng-controller="module._controller" title="{{ module.name }}">
-
-                    <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
-
-                    <div class="buttons mm-module-buttons" ng-if="(buttons && buttons.length > 0) || spinner">
-
-                        <button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon" aria-label="{{ button.label | translate }}">
-                            <i class="icon positive" ng-class="{'{{button.icon}}': button.icon}"></i>
-                        </button>
-
-                        <ion-spinner ng-if="spinner"></ion-spinner>
-                    </div>
-
-                    <mm-format-text watch="true">{{ title }}</mm-format-text>
-                </a>
+                <mm-course-module class="item item-complex" ng-repeat="module in block.modules" module="module"></mm-course-module>
             </section>
 
             <p class="padding" ng-if="!hasContent">{{ 'mm.course.nocontentavailable' | translate }}</p>

www/addons/frontpage/templates/frontpageitemnews.html

@@ -1,5 +1 @@
-<a ng-if="show" ng-click="action($event)" class="item item-text-wrap item-media item-icon-right">
-    <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
-    <h2>{{ 'mma.frontpage.sitenews' | translate}}</h2>
-    <i class="icon icon-accessory ion-chevron-right"></i>
-</a>
+<mm-course-module class="mm-frontpageitemnews" ng-if="show" module="module"></mm-course-module>

www/addons/grades/scss/styles.scss

@@ -0,0 +1,3 @@
+.mm-site_coursesgrades .item .badge {
+  right: 16px;
+}