Merge pull request #1084 from moodlehq/desktop

Desktop

Author: jleyva

.gitignore

@@ -9,3 +9,4 @@ www/build
 .sass-cache/
 www/lib
 e2e/build
+/desktop

AppXManifest.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="3312ADB7.MoodleDesktop"
+    ProcessorArchitecture="x64"
+    Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
+    Version="3.3.0.0" />
+  <Properties>
+    <DisplayName>Moodle Desktop</DisplayName>
+    <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
+    <Description>The official app for Moodle.</Description>
+    <Logo>assets\StoreLogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+  </Capabilities>
+  <Applications>
+    <Application Id="com.moodle.moodlemobile" Executable="app\MoodleDesktop.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+       BackgroundColor="#464646"
+       DisplayName="Moodle Desktop"
+       Square150x150Logo="assets\Square150x150Logo.png"
+       Square44x44Logo="assets\Square44x44Logo.png"
+       Description="Moodle Desktop: The official desktop app for Moodle.">
+        <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
+      </uap:VisualElements>
+      <Extensions>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="moodlemobile">
+            <uap:DisplayName>Moodle Mobile URI Scheme</uap:DisplayName>
+          </uap:Protocol>
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>

package.json

@@ -1,7 +1,11 @@
 {
-  "name": "mm2",
-  "version": "1.0.0",
-  "description": "Moodle Mobile 2: The official mobile app for Moodle.",
+  "name": "com.moodle.moodlemobile",
+  "version": "3.3.0",
+  "description": "The official app for Moodle.",
+  "author": {
+    "name": "Moodle Pty Ltd.",
+    "email": "[email protected]"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/moodlehq/moodlemobile2.git"
@@ -14,22 +18,25 @@
     }
   ],
   "dependencies": {
+    "electron-windows-notifications": "^1.1.13",
+    "electron-builder-squirrel-windows": "^19.3.0"
   },
   "devDependencies": {
     "appium": "^1.6.0",
     "bower": "^1.3.3",
+    "electron-rebuild": "^1.5.11",
     "gulp": "^3.9.1",
-    "gulp-clean-css": "^3.0.3",
-    "gulp-concat": "^2.6.0",
-    "gulp-rename": "^1.2.0",
-    "gulp-sass": "^2.3.2",
     "gulp-clean": "^0.3.2",
+    "gulp-clean-css": "^3.0.3",
     "gulp-clip-empty-files": "^0.1.1",
+    "gulp-concat": "^2.6.0",
     "gulp-concat-util": "^0.5.2",
     "gulp-file": "^0.3.0",
     "gulp-insert": "^0.5.0",
     "gulp-ng-annotate": "^2.0.0",
     "gulp-remove-empty-lines": "0.0.8",
+    "gulp-rename": "^1.2.0",
+    "gulp-sass": "^2.3.2",
     "gulp-slash": "^1.1.3",
     "gulp-strip-comments": "^2.4.3",
     "gulp-tap": "^0.1.3",
@@ -121,6 +128,45 @@
     "android": "ionic run android",
     "serve.e2e": "ionic serve -b -a",
     "serve.dev": "ionic serve",
-    "e2e": "protractor e2e/build/protractor.conf.js"
+    "e2e": "protractor e2e/build/protractor.conf.js",
+    "desktop.pack": "build --dir",
+    "desktop.dist": "build",
+    "windows.store": "electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store --flatten true -a .\\resources\\desktop -m .\\AppXManifest.xml --package-version 0.0.0.0 --package-name MoodleDesktop"
+  },
+  "main": "www/electron.js",
+  "build": {
+    "appId": "com.moodle.moodlemobile",
+    "productName": "MoodleDesktop",
+    "files": [
+      "!desktop",
+      "!**/e2e",
+      "!hooks",
+      "!platforms",
+      "!plugins",
+      "!resources",
+      "!**/*.scss"
+    ],
+    "directories": {
+      "output": "desktop/dist"
+    },
+    "protocols": [
+      {
+        "name": "Moodle Mobile URL",
+        "schemes": [
+          "moodlemobile"
+        ],
+        "role": "Viewer"
+      }
+    ],
+    "compression": "maximum",
+    "electronVersion": "1.6.11",
+    "mac": {
+      "category": "public.app-category.education",
+      "icon": "resources/desktop/icon.icns"
+    },
+    "win": {
+      "target": "appx",
+      "icon": "resources/desktop/icon.ico"
+    }
   }
 }

resources/desktop/Square150x150Logo.png

@@ -21,9 +21,9 @@ angular.module('mm.addons.calendar')
  * @ngdoc controller
  * @name mmaCalendarListCtrl
  */
-.controller('mmaCalendarListCtrl', function($scope, $stateParams, $log, $state, $mmaCalendar, $mmUtil, $ionicHistory, $mmEvents,
+.controller('mmaCalendarListCtrl', function($scope, $stateParams, $log, $state, $mmaCalendar, $mmUtil, $timeout, $mmEvents,
         mmaCalendarDaysInterval, $ionicScrollDelegate, $mmLocalNotifications, $mmCourses, mmaCalendarDefaultNotifTimeChangedEvent,
-        $ionicPopover, $q, $translate) {
+        $ionicPopover, $q, $translate, $ionicPlatform) {
 
     $log = $log.getInstance('mmaCalendarListCtrl');
 
@@ -38,10 +38,10 @@ angular.module('mm.addons.calendar')
         };
 
     $scope.events = [];
+    $scope.eventToLoad = 1;
 
-    if ($stateParams.eventid) {
-        // We arrived here via notification click, let's clear history and redirect to event details.
-        $ionicHistory.clearHistory();
+    if ($stateParams.eventid && !$ionicPlatform.isTablet()) {
+        // There is an event to load and it's a phone device, open the event in a new state.
         $state.go('site.calendar-event', {id: $stateParams.eventid});
     }
 
@@ -69,7 +69,6 @@ angular.module('mm.addons.calendar')
                 emptyEventsTimes++;
                 if (emptyEventsTimes > 5) { // Stop execution if we retrieve empty list 6 consecutive times.
                     $scope.canLoadMore = false;
-                    $scope.eventsLoaded = true;
                     if (refresh) {
                         $scope.events = [];
                     }
@@ -90,7 +89,6 @@ angular.module('mm.addons.calendar')
                     // Filter events with same ID. Repeated events are returned once per WS call, show them only once.
                     $scope.events = $mmUtil.mergeArraysWithoutDuplicates($scope.events, events, 'id');
                 }
-                $scope.eventsLoaded = true;
                 $scope.canLoadMore = true;
 
                 // Schedule notifications for the events retrieved (might have new events).
@@ -101,7 +99,6 @@ angular.module('mm.addons.calendar')
             scrollView.resize();
         }, function(error) {
             $mmUtil.showErrorModalDefault(error, 'mma.calendar.errorloadevents', true);
-            $scope.eventsLoaded = true;
             $scope.canLoadMore = false; // Set to false to prevent infinite calls with infinite-loading.
         });
     }
@@ -121,7 +118,30 @@ angular.module('mm.addons.calendar')
     $scope.notificationsEnabled = $mmLocalNotifications.isAvailable();
 
     // Get first events.
-    fetchData();
+    fetchData().then(function() {
+        if ($stateParams.eventid && $ionicPlatform.isTablet()) {
+            // There is an event to load and it's a tablet device. Search the position of the event in the list and load it.
+            var found = false;
+
+            for (var i = 0; i < $scope.events.length; i++) {
+                if ($scope.events[i].id == $stateParams.eventid) {
+                    $scope.eventToLoad = i + 1;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                // Event not found in the list, open it in a new state. Use a $timeout to open the state after the
+                // split view is loaded.
+                $timeout(function() {
+                    $state.go('site.calendar-event', {id: $stateParams.eventid});
+                });
+            }
+        }
+    }).finally(function() {
+        $scope.eventsLoaded = true;
+    });
 
     // Init popover.
     $ionicPopover.fromTemplateUrl('addons/calendar/templates/course_picker.html', {