Merge pull request #51 from gadael/feature-calendar-month-view

New month by month calendar navigation
gadael · Jul 9, 2020 · 321aca2 · 321aca2
2 parents bef19ec + c39e92d
commit 321aca2
Show file tree

Hide file tree

Showing 11 changed files with 185 additions and 333 deletions.
diff --git a/api/services/user/personalevents/list.js b/api/services/user/personalevents/list.js
@@ -2,6 +2,7 @@
 
 
 const requestdateparams = require('../../../../modules/requestdateparams');
+const periodCriterion = require('../../../../modules/periodcriterion');
 
 /**
  * The personal events list service
@@ -35,11 +36,8 @@ function getEvents(service, params)
 
     find.where('user.id').equals(params.user);
     find.where('status').in(params.status);
-
-    var periodCriterion = require('../../../../modules/periodcriterion');
     periodCriterion(find, params.dtstart, params.dtend);
 
-
     find.populate('absenceElem');
     find.populate('request');
 

diff --git a/modules/periodcriterion.js b/modules/periodcriterion.js
@@ -22,7 +22,7 @@ exports = module.exports = function periodCriterion(find, dtstart, dtend) {
 
     find.or([
         { rrule: { $exists: true } },
-        { rdate: { $exists: true } },
+        { rdate: { $exists: true, $ne: [] } },
         { $and:
             [
                 { rrule: { $exists: false } },

diff --git a/public/css/merged.min.css b/public/css/merged.min.css
diff --git a/public/js/controllers/account/calendar-view.js b/public/js/controllers/account/calendar-view.js
@@ -6,29 +6,19 @@ define([], function() {
         '$scope',
         '$routeParams',
         'Calendar',
-        '$anchorScroll',
         '$location',
         'Rest',
         'gettext',
-        function($scope, $routeParams, Calendar, $anchorScroll, $location, Rest, gettext) {
+        function($scope, $routeParams, Calendar, $location, Rest, gettext) {
 
             $scope.who = 'account';
             $scope.setPageTitle(gettext('Personal calendar'));
 
-
-
             var calendarEventsResource = Rest.user.calendarevents.getResource();
             var personalEventsResource = Rest.account.personalevents.getResource();
             var requestsResource = Rest.account.requests.getResource();
 
-
-            Calendar.initLoadMoreData($scope, calendarEventsResource, personalEventsResource, requestsResource);
-
-            $scope.loadPreviousYear = function() {
-                $location.path('/account/calendar/'+$scope.previousYear+'/0');
-            };
-
-
+            Calendar.initNextPrevious($scope, calendarEventsResource, personalEventsResource, requestsResource);
 	    }
     ];
 });
diff --git a/public/js/controllers/admin/calendar-view.js b/public/js/controllers/admin/calendar-view.js
@@ -20,19 +20,10 @@ define([], function() {
             var requestsResource = Rest.admin.requests.getResource();
 
             $scope.user.$promise.then(function() {
-
                 $scope.setPageTitle($scope.user.lastname+' '+$scope.user.firstname+' '+gettext('calendar'));
 
-                Calendar.initLoadMoreData($scope, calendarEventsResource, personalEventsResource, requestsResource);
-
-                $scope.loadPreviousYear = function() {
-                    $location.path('/admin/users/'+$scope.user._id+'/calendar/'+$scope.previousYear+'/0');
-                };
-
-
+                Calendar.initNextPrevious($scope, calendarEventsResource, personalEventsResource, requestsResource);
             });
-
-
 	    }
     ];
 });