isite 2023.1.4 → 2023.1.5

package/apps/client-side/site_files/html/directive/i-date.html

@@ -7,13 +7,13 @@
   </div>
   <div class="row dashed padding margin" ng-show="editOnly">
     <div class="col3">
-      <i-list label="{{dayTitle}}" v="{{v}}" items="days" ng-model="model.selectedDay"></i-list>
+      <i-list label="{{dayTitle}}" v="{{v}}" items="days" ng-search="$selectedDay" ng-model="model.selectedDay"></i-list>
     </div>
     <div class="col4">
-      <i-list label="{{monthTitle}}" v="{{v}}" items="monthes" ng-model="model.selectedMonth"></i-list>
+      <i-list label="{{monthTitle}}" v="{{v}}" items="monthes" ng-search="$selectedMonth" ng-model="model.selectedMonth"></i-list>
     </div>
     <div class="col3">
-      <i-list label="{{yearTitle}}" v="{{v}}" items="years" ng-search="searchYear" ng-model="model.selectedYear"></i-list>
+      <i-list label="{{yearTitle}}" v="{{v}}" items="years" ng-search="$selectedYear" ng-model="model.selectedYear" active-value="model.activeYear"></i-list>
     </div>
 
     <div class="col2">

package/apps/client-side/site_files/html/directive/i-datetime.html

@@ -8,20 +8,20 @@
   </div>
   <div class="row dashed padding margin" ng-show="editOnly">
     <div class="col2">
-      <i-list label="{{dayTitle}}"  items="days" ng-model="model.selectedDay"></i-list>
+      <i-list label="{{dayTitle}}"  items="days" ng-search="$selectedDay" ng-model="model.selectedDay"></i-list>
     </div>
     <div class="col3">
-      <i-list label="{{monthTitle}}"  items="monthes" ng-model="model.selectedMonth"></i-list>
+      <i-list label="{{monthTitle}}"  items="monthes" ng-search="$selectedMonth" ng-model="model.selectedMonth"></i-list>
     </div>
     <div class="col3">
-      <i-list label="{{yearTitle}}"  items="years" ng-search="searchYear" ng-model="model.selectedYear"></i-list>
+      <i-list label="{{yearTitle}}"  items="years" ng-search="$selectedYear" ng-model="model.selectedYear"></i-list>
     </div>
 
     <div class="col2">
-      <i-list label="{{hourTitle}}"  items="hours" ng-model="model.selectedHour"></i-list>
+      <i-list label="{{hourTitle}}"  items="hours" ng-search="$selectedHour" ng-model="model.selectedHour"></i-list>
     </div>
     <div class="col2">
-      <i-list label="{{minuteTitle}}"  items="minutes" ng-model="model.selectedMinute"></i-list>
+      <i-list label="{{minuteTitle}}"  items="minutes" ng-search="$selectedMinute" ng-model="model.selectedMinute"></i-list>
     </div>
     <div class="row">
       <br />

package/apps/client-side/site_files/html/directive/i-list.html

@@ -5,8 +5,8 @@
   </div>
 
   <div class="dropdown-content">
-    <div class="padding" ng-show="showSearch">
-      <input class="full-width search form-control"  />
+    <div class="dropdown-search" ng-show="showSearch">
+      <input class="full-width search form-control" />
     </div>
 
     <div class="dropdown-item row" ng-repeat="item in items | filter:{ $display : $filter}" ng-click="updateModel(item)">

package/apps/client-side/site_files/js/bootstrap-5-directive.js

@@ -99,9 +99,9 @@ app.directive('iContent', function ($timeout, $interval) {
             ['outdent', 'indent'],
             ['align', 'horizontalRule', 'list', 'table'],
             ['link', 'image', 'video'],
+            ['preview', 'print'],
             /* ['fullScreen', 'showBlocks', 'codeView'],
-             ['preview', 'print'],
-             ['save', 'template'], */
+            ['save', 'template'],*/
           ],
           width: '100%',
           minHeight: '300px',
@@ -248,6 +248,12 @@ app.directive('iButton', function () {
       } else if ($scope.type.like('*logout*') || $scope.type.like('*signout*')) {
         $scope.fa = 'fas fa-sign-out-alt';
         $scope.class = 'btn-light';
+      } else if ($scope.type.like('*push*')) {
+        $scope.fa = 'fas fa-long-arrow-alt-down';
+        $scope.class = 'btn-primary';
+      } else if ($scope.type.like('*cancel*')) {
+        $scope.fa = 'fas fa-minus-circle';
+        $scope.class = 'btn-danger';
       }
       if ($scope.type.like('*default*')) {
         $scope.class = '';
@@ -290,6 +296,7 @@ app.directive('iList', [
         ngGet: '&',
         ngAdd: '&',
         items: '=',
+        activeValue: '=',
       },
       link: function ($scope, element, attrs, ctrl) {
         $scope.primary = $scope.primary || 'id';
@@ -323,7 +330,9 @@ app.directive('iList', [
         let input = $(element).find('input.dropdown-text');
         $(element).hover(
           () => {
-            $scope.popupElement.css('display', 'block');
+            if (attrs.disabled !== 'disabled') {
+              $scope.popupElement.css('display', 'block');
+            }
           },
           () => {
             $scope.popupElement.css('display', 'none');
@@ -402,6 +411,8 @@ app.directive('iList', [
               }
             });
           }
+
+                
         });
 
         $scope.$watch('ngModel', (ngModel) => {
@@ -420,9 +431,9 @@ app.directive('iList', [
 
         $scope.searchElement.on('input', () => {
           $timeout(() => {
-            if ($scope.ngGet) {
+            if (attrs.ngGet) {
               $scope.ngGet({ $search: $scope.searchElement.val() });
-            } else if ($scope.ngSearch) {
+            } else if (attrs.ngSearch) {
               $scope.$filter = $scope.searchElement.val();
             }
           }, 100);
@@ -583,6 +594,7 @@ app.directive('iDate', function () {
       $scope.dayTitle = 'Day';
       $scope.monthTitle = 'Month';
       $scope.yearTitle = 'Year';
+     
 
       $scope.lang = site.session ? site.session.lang : 'en';
       if ($scope.lang === 'ar') {
@@ -627,11 +639,13 @@ app.directive('iDate', function () {
           $scope.model.selectedDay = $scope.days.find((d) => d.id == ngModel.getDate());
           $scope.model.selectedMonth = $scope.monthes.find((m) => m.id == ngModel.getMonth());
           $scope.model.selectedYear = $scope.years.find((y) => y.id == ngModel.getFullYear());
+          $scope.model.$selectedYear = 2023;
         } else {
           $scope.model = $scope.model || {};
           $scope.model.selectedDay = null;
           $scope.model.selectedMonth = null;
           $scope.model.selectedYear = null;
+          $scope.model.activeYear = 2023;
         }
       });
 

package/apps/client-side/site_files/js/site.js

@@ -1247,7 +1247,7 @@
       console.error('qrcode need {selector , text}');
       return;
     }
-    return JsBarcode(options.selector, options.selector, options.options);
+    return JsBarcode(options.selector, options.text, options.options);
   };
   site.qrcode = function (options) {
     if (!options || !options.selector || !options.text) {
@@ -1272,5 +1272,13 @@
       });
     }
   };
+
+  site.export = function (table, type = 'xlsx') {
+    var data = typeof table === 'string' ? document.querySelector(table) : table;
+    var excelFile = XLSX.utils.table_to_book(data, { sheet: 'sheet1' });
+    XLSX.write(excelFile, { bookType: type, bookSST: true, type: 'base64' });
+    XLSX.writeFile(excelFile, (data.id || data.tagName) + '.' + type);
+  };
+
   window.site = site;
 })(window, document, 'undefined', jQuery);