cronapp-framework-js 2.9.3 → 2.9.4

package/img/cron-icon/crn-infinite-scroll.svg

@@ -0,0 +1 @@
+<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#c9c9c9;}</style></defs><path class="cls-1" d="M20,0H4A4,4,0,0,0,0,4V20a4,4,0,0,0,4,4H20a4,4,0,0,0,4-4V4A4,4,0,0,0,20,0Zm.67,16.67a1.33,1.33,0,0,1,.94,2.27h0l-2.67,2.67h0a1.33,1.33,0,0,1-1.88,0h0l-2.67-2.67h0a1.33,1.33,0,0,1,.94-2.27H16V7.33h-.67a1.33,1.33,0,0,1-.94-2.27h0l2.67-2.67h0a1.33,1.33,0,0,1,1.88,0h0l2.67,2.67h0a1.33,1.33,0,0,1-.94,2.27H20v9.34Z"/></svg>

package/js/app.js

@@ -19,7 +19,8 @@ var cronappModules = [
   'upload.services',
   'ui.tinymce',
   'ngCookies',
-  'kendo.directives'
+  'kendo.directives',
+  'sync.service'
 ];
 
 if (window.customModules) {

package/js/controllers.js

@@ -78,7 +78,7 @@
 
   });
 
-  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache, DashboardService) {
+  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache, DashboardService, SyncService) {
 
     $http.get(window.NotificationProviderOptions.templateUrl, {cache: true})
         .then((response) => $templateCache.put(window.NotificationProviderOptions.templateUrl, response.data));
@@ -259,7 +259,7 @@
 
   });
 
-  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, DashboardService) {
+  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, DashboardService, SyncService) {
 
     $scope.$http = $http;
     $scope.params = $stateParams;

package/js/directives.js

@@ -1552,9 +1552,82 @@
           getSchedulerProperties: function(options, datasource, scope) {
             let schedulerStartDate = (options.initialDateStrategy === 'Expression' ? scope.$eval(generateBlocklyCall(options.initialDateBlocklyInfo)) : options.initialDate);
             let lastSearchedPeriod = {start: null, end: null};
+
             let needsToFetchData = function(searchablePeriod) {
               return !angular.equals(lastSearchedPeriod, searchablePeriod);
             };
+
+            let customDaysOfWeek = (e) => {
+              let view = e.sender.view();
+              let alreadyChanged = e.sender.element.find('.k-scheduler-header.k-state-default.changed').length;
+              if (view.name === 'month' && !alreadyChanged && options.useCustomDaysOfWeek) {
+                e.sender.element.find('.k-scheduler-header.k-state-default').html(`<div class="k-scheduler-header k-state-default">
+                  <div class="k-scheduler-header-wrap">
+                    <table class="k-scheduler-table">
+                      <tbody>
+                        <tr>
+                          <th colspan="1" class="">${options.daysOfWeek.sunday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.monday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.tuesday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.wednesday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.thursday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.friday}</th>
+                          <th colspan="1" class="">${options.daysOfWeek.saturday}</th>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>`);
+                e.sender.element.find('.k-scheduler-header.k-state-default').addClass('changed');
+              }
+            };
+
+            let hookSeeAllEventsClick = (e) => {
+              let alreadyHooked = e.sender.element.find('.k-more-events.k-button.hooked').length;
+              
+              if (!alreadyHooked) {
+                let view = e.sender.view();
+                let optionView = options.views.find(v => v.type === view.name);
+                let randomId = app.common.generateId();
+                e.sender.element.find('.k-more-events.k-button').attr('data-id', randomId);
+                let blocklyCall = generateBlocklyCall(optionView.moreEventsBlockly);
+                if (blocklyCall) {
+                  handleBlockAfterRender(randomId, (e) => {
+                    
+                    let lastEvent = $(e.currentTarget).prev();
+                    let uid = lastEvent.data('uid');
+                    let dataLastEvent = options.refComponent.dataItems().find((f) => { return f.uid == uid });
+
+                    let contextVars = { 
+                      scheduleData: {
+                        type: 'seeAll',
+                        selectedDate: dataLastEvent.start
+                      } 
+                    };
+                    scope.$eval(blocklyCall, contextVars);
+                  });
+                }
+                e.sender.element.find('.k-more-events.k-button').addClass('hooked');
+              }
+            }
+
+            let handleBlockAfterRender = (randomId, func) => {
+              return new Promise((resolve) => {
+                let waitRender = setInterval(() => {
+                  let $objClick = $(`[data-id="${randomId}"]`); 
+                  if ($objClick.length) {
+                    clearInterval(waitRender);
+                    $objClick.off('click');
+                    $objClick.on('click', (e) => {
+                      func(e);
+                      e.stopImmediatePropagation();
+                    });
+                    resolve();
+                  }
+                }, 100);
+              });
+            };
+
             let visibleViews = [];
             if(options.views) {
               for(let viewIndex in options.views) {
@@ -1584,7 +1657,6 @@
               }
             }
 
-
             let cronSchedulerProperties = {
               dateHeaderTemplate: kendo.template(`#=kendo.toString(date, ${kendo.culture().name.toLowerCase().includes('pt')?'\'ddd dd/M\'':'\'ddd M/dd\''})#`),
               showWorkHours: options.showWorkHours,
@@ -1621,7 +1693,40 @@
                 // An endDate method which returns the end date of the view.
 
                 //kendo.format("view:: start: {0:d}; end: {1:d};", view.startDate(), view.endDate())
-              },
+                customDaysOfWeek(e);
+                hookSeeAllEventsClick(e);
+              },       
+              eventTemplate: (data) => {
+                let contextVars = { scheduleData: data };
+                let getDescriptionContent = (withIfen) => {
+                  if (!data.description)  return '';
+                  return (withIfen? ' - ' : '') + data.description;
+                }
+                
+                let randomId = app.common.generateId();
+                let currentView = options.refComponent.view().name;
+                let view = options.views.find(v => v.type === currentView);
+
+                let result = [];
+                result.push(`<div class='k-event-template' data-id='${randomId}'>`);
+                
+                if (currentView !== 'agenda') {
+                  result.push(`<div class='k-event-title'>${data.title}${view.showDescription? getDescriptionContent(true) :''}  </div>`);
+                }
+                else {
+                  result.push(`<div class='k-event-title'>${data.title}</div>`);
+                  !view.showDescription || result.push(`<div class='k-event-description'>${getDescriptionContent(false)}</div>`);
+                }
+                result.push('</div>');
+
+                let blocklyCall = generateBlocklyCall(view.blockly);
+                if (blocklyCall) {
+                  handleBlockAfterRender(randomId, () => {
+                    scope.$eval(blocklyCall, contextVars);
+                  });
+                }
+                return result.join('');
+              },     
               change: (e) => {
                 if (e && e.events && e.events.length) {
                   this.setDatasourceActiveItem(datasource, e.events[0], 'id');
@@ -1634,7 +1739,7 @@
                 if (options && options.allowCustomAction) {
                   let container = e.container;
 
-                  let btnLabel = options.customActionLabel ? options.customActionLabel : $translate.instant(Details);
+                  let btnLabel = options.customActionLabel ? options.customActionLabel : $translate.instant('Details');
                   /* ACTION: ADD custom button */
                   let detailButton = $('<a class="k-button">' + btnLabel + '</a>');
 
@@ -3642,12 +3747,41 @@
             options.close = attrs.ngClose ? function (){scope.$eval(attrs.ngClose)}: undefined;
             options.dataBound = attrs.ngDataBound ? function (){scope.$eval(attrs.ngDataBound)}: undefined;
             options.filtering = attrs.ngFiltering ? function (){scope.$eval(attrs.ngFiltering)}: undefined;
-            options.select = attrs.ngSelect ? function (){scope.$eval(attrs.ngSelect);}: undefined;
-            options.change = function() {
-              _scope.$apply(function () {
-                _ngModelCtrl.$setViewValue(this.value());
-              }.bind(combobox));
-            }
+            
+            options.select = attrs.ngSelect ? function (e) {
+              scope.safeApply(() => {
+                var contextVars = { 
+                    'selected' : e.dataItem,
+                    'selectedKey' : e.dataItem[options.dataValueField],
+                    'selectedValue' : e.dataItem[options.dataTextField]
+                };
+                scope.$eval(attrs.ngSelect, contextVars); 
+              });
+            }: undefined;
+            options.change = attrs.ngChange ? function(e) {
+              var dataItem = this.dataItem();
+              scope.safeApply(() => {
+                if (attrs['ngModel']) {
+                  _ngModelCtrl.$$parse(attrs['ngModel']).assign(scope, this.value(), attrs['ngModel'].split("."));
+                }
+                var contextVars = { 
+                    'selected' : dataItem,
+                    'selectedKey' : dataItem[options.dataValueField],
+                    'selectedValue' : dataItem[options.dataTextField]
+                };
+                scope.$eval(attrs.ngChange, contextVars);
+              });
+            }: function(e) {
+              scope.safeApply(() => {
+                if (attrs['ngModel']) {
+                  _ngModelCtrl.$$parse(attrs['ngModel']).assign(scope, this.value(), attrs['ngModel'].split("."));
+                }
+              });
+            };
+
+            options.messages =  {
+              noData: attrs.noResultsMessage ? attrs.noResultsMessage : "NO DATA FOUND"
+            };
 
             var combobox;
             if (select.dontAllowOutsideList === true) {
@@ -3696,23 +3830,13 @@
             var _scope = scope;
             var _ngModelCtrl = ngModelCtrl;
 
-            var initializing = true;
             if (ngModelCtrl) {
               ngModelCtrl.$formatters.push(function (value) {
                 var result = '';
-
                 if ((typeof value === 'boolean') || (value)) {
                   result = value;
                 }
                 combobox.value(result);
-
-                if (!initializing) {
-                  if (attrs.ngChange) scope.$eval(attrs.ngChange);
-                }
-
-
-                initializing = false;
-                combobox.value(result);
                 return result;
               });
               ngModelCtrl.$parsers.push(function (value) {
@@ -5662,6 +5786,47 @@
         }
       })
 
+  .directive('crnInfiniteScroll', ['$compile', function($compile){
+    'use strict';
+    return {
+      restrict: 'EA',
+      link: function(scope, element, attrs) {
+        var dataSource = attrs.crnInfiniteScroll ? eval(attrs.crnInfiniteScroll) : attrs.crnDatasource ? eval(attrs.crnDatasource): undefined;
+        if (dataSource) {
+          let nextPageInfinite = {
+            isVisible: false,
+            checkVisibility: function(visible) {
+              if (nextPageInfinite.isVisible !== visible) {
+                nextPageInfinite.isVisible = visible;
+                if (nextPageInfinite.isVisible) {
+                  if (dataSource.loaded && dataSource.loadedFinish) {
+                      dataSource.nextPage();
+                  } else {
+                    let intervalNextPage = setInterval(function() {
+                      if (dataSource.loaded && dataSource.loadedFinish) {
+                        dataSource.nextPage();
+                        clearInterval(intervalNextPage);
+                      }
+                    }, 250);
+                  }
+                }
+              }
+            },
+            eventScroll: function() {
+              var topElem = element.offset().top;
+              var botElem = element.offset().top + element.outerHeight();
+              var botScrn = $(window).scrollTop() + $(window).innerHeight();
+              var topScrn = $(window).scrollTop();
+              nextPageInfinite.checkVisibility((botScrn > topElem) && (topScrn < botElem));
+            }
+          };
+          $(window).scroll(nextPageInfinite.eventScroll);
+          $(window).ready(nextPageInfinite.eventScroll);
+        }
+      }
+    }
+  }])
+
 }(app));
 
 function maskDirectiveAsDate($compile, $translate, $parse) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {