isite 2022.8.1 → 2022.8.4

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

@@ -15,6 +15,7 @@ app.directive('iControl', function () {
     },
     link: function ($scope, element, attrs, ctrl) {
       attrs.type = attrs.type || 'text';
+      $scope.id2 = $scope.id2 || 'input_' + Math.random().toString().replace('0.', '');
 
       if (typeof attrs.disabled !== 'undefined') {
         attrs.disabled = 'disabled';
@@ -30,8 +31,8 @@ app.directive('iControl', function () {
     },
     template: `
         <div class="mb-3 {{class2}}">
-        <label for="id2" class="form-label">{{label}}</label>
-        <input id="id2" ng-disabled="disabled" autofocus v="{{v}}"  type="{{type}}" ng-model="ngModel" ng-change="ngChange()" ngKeydown="ngKeydown()" class="form-control"  placeholder="{{placeholder}}" aria-label="{{label}}"  />
+        <label for="{{id2}}" class="form-label">{{label}}</label>
+        <input id="{{id2}}" ng-disabled="disabled" autofocus v="{{v}}"  type="{{type}}" ng-model="ngModel" ng-change="ngChange()" ngKeydown="ngKeydown()" class="form-control"  placeholder="{{placeholder}}" aria-label="{{label}}"  />
         <div class="invalid-feedback">
         
         </div>   
@@ -40,7 +41,43 @@ app.directive('iControl', function () {
   };
 });
 
-app.directive('iCheckbox', function () {
+app.directive('iTextarea', function () {
+  return {
+    restrict: 'E',
+    require: 'ngModel',
+    scope: {
+      v: '@',
+      label: '@',
+      id2: '@',
+      disabled: '@',
+      rows: '@',
+      ngModel: '=',
+      ngChange: '&',
+    },
+    link: function ($scope, element, attrs, ctrl) {
+      if (typeof attrs.disabled !== 'undefined') {
+        attrs.disabled = 'disabled';
+      } else {
+        attrs.disabled = '';
+      }
+      $scope.rows = $scope.rows || 4;
+      $scope.id2 = $scope.id2 || 'input_' + Math.random().toString().replace('0.', '');
+      $(element)
+        .find('textarea')
+        .focus(() => {
+          $('.popup').hide();
+        });
+    },
+    template: `
+        <div class="mb-3">
+          <label for="{{id2}}" class="form-label">{{label}}</label>
+          <textarea ng-disabled="disabled" class="form-control" id="{{id2}}" ng-model="ngModel" ng-change="ngChange()" v="{{v}}" rows="{{rows}}"></textarea>
+        </div>
+        `,
+  };
+});
+
+app.directive('iCheckbox', function ($timeout) {
   return {
     restrict: 'E',
     require: 'ngModel',
@@ -57,10 +94,17 @@ app.directive('iCheckbox', function () {
         $scope.disabled = '';
       }
       $scope.id2 = $scope.id2 || 'input_' + Math.random().toString().replace('0.', '');
+      $scope.changed = function () {
+        $timeout(() => {
+          if ($scope.ngChange) {
+            $scope.ngChange();
+          }
+        }, 100);
+      };
     },
     template: `
         <div class="form-check">
-          <input ng-change="ngChange()" ng-disabled="disabled" class="form-check-input" type="checkbox" ng-model="ngModel" id="{{id2}}">
+          <input ng-change="changed()" ng-disabled="disabled" class="form-check-input" type="checkbox" ng-model="ngModel" id="{{id2}}">
           <label class="form-check-label" for="{{id2}}">
             {{label}}
           </label>
@@ -108,234 +152,469 @@ app.directive('iButton', function () {
     scope: {
       label: '@',
       type: '@',
-      ngClick: '&',
+      loading: '@',
+      click: '&',
       fa: '@',
     },
     link: function ($scope, element, attrs, ctrl) {
-      attrs.type = attrs.type || '';
-      if (attrs.type.like('*exit*') || attrs.type.like('*close*')) {
-        attrs.fa = 'times';
-      } else if (attrs.type.like('*view*') || attrs.type.like('*details*')) {
-        attrs.fa = 'file';
-      } else if (attrs.type.like('*add*') || attrs.type.like('*new*')) {
-        attrs.fa = 'plus-circle';
-      } else if (attrs.type.like('*update*') || attrs.type.like('*edit*')) {
-        attrs.fa = 'edit';
-      } else if (attrs.type.like('*save*')) {
-        attrs.fa = 'save';
-      } else if (attrs.type.like('*delete*') || attrs.type.like('*remove*')) {
-        attrs.fa = 'trash';
-      } else if (attrs.type.like('*print*')) {
-        attrs.fa = 'print';
-      } else if (attrs.type.like('*search*')) {
-        attrs.fa = 'search';
-      } else if (attrs.type.like('*export*') || attrs.type.like('*excel*')) {
-        attrs.fa = 'table';
-      } else {
+      $scope.type = $scope.type || '';
+      $scope.class = $scope.class = 'btn-dark';
+      $scope.fa = $scope.fa || $scope.label ? '' : 'fas fa-play';
+
+      if ($scope.type.like('*add*') || $scope.type.like('*new*')) {
+        $scope.fa = 'fas fa-plus';
         $scope.class = 'btn-primary';
+      } else if ($scope.type.like('*update*') || $scope.type.like('*edit*')) {
+        $scope.fa = 'fas fa-edit';
+        $scope.class = 'btn-warning';
+      } else if ($scope.type.like('*save*')) {
+        $scope.fa = 'fas fa-save';
+        $scope.class = 'btn-success';
+      } else if ($scope.type.like('*view*') || $scope.type.like('*details*')) {
+        $scope.fa = 'fas fa-eye';
+        $scope.class = 'btn-info';
+      } else if ($scope.type.like('*delete*') || $scope.type.like('*remove*')) {
+        $scope.fa = 'fas fa-trash';
+        $scope.class = 'btn-danger';
+      } else if ($scope.type.like('*exit*') || $scope.type.like('*close*')) {
+        $scope.fa = 'fas fa-times-circle';
+        $scope.class = 'btn-danger';
+      } else if ($scope.type.like('*print*')) {
+        $scope.fa = 'fas fa-print';
+        $scope.class = 'btn-secondary';
+      } else if ($scope.type.like('*search*')) {
+        $scope.fa = 'search';
+      } else if ($scope.type.like('*export*') || $scope.type.like('*excel*')) {
+        $scope.fa = 'fas fa-file-export';
+        $scope.class = 'btn-secondary';
       }
+      $scope.$watch('loading', (loading) => {
+        if (loading === 'true') {
+          $scope.busy = true;
+        } else {
+          $scope.busy = false;
+        }
+      });
     },
     template: `
-        <a type="button" class="btn {{class}}"  ng-click="ngClick()">{{label}}</a>
+        <button class="btn {{class}}" type="button" ng-click="click()" ng-disabled="busy">
+          <span ng-show="busy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+          {{label}}
+          <i class="{{fa}}"></i>
+        </button>
         `,
   };
 });
+app.directive('iList', [
+  '$interval',
+  '$timeout',
+  'isite',
+  function ($interval, $timeout, isite) {
+    return {
+      restrict: 'E',
+      require: 'ngModel',
+      scope: {
+        v: '@',
+        label: '@',
+        display: '@',
+        display2: '@',
+        disabled: '@',
+        css: '@',
+        space: '@',
+        primary: '@',
+        ngValue: '@',
+        ngModel: '=',
+        ngSearch: '=',
+        ngChange: '&',
+        ngAdd: '&',
+        items: '=',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.primary = $scope.primary || 'id';
+        $scope.display = $scope.display || 'name';
+        $scope.display2 = $scope.display2 || '';
+        $scope.space = $scope.space || ' - ';
+        attrs.ngValue = attrs.ngValue || '';
 
-app.directive('iDate', function () {
-  return {
-    link: function (scope, element, attrs) {
-      if (typeof attrs.disabled !== 'undefined') {
-        attrs.disabled = 'disabled';
-      } else {
-        attrs.disabled = '';
-      }
-
-      $(element)
-        .find('select')
-        .focus(() => {
-          $('.popup').hide();
-        });
-
-      scope.days1 = [];
-      for (let i = 1; i < 32; i++) {
-        scope.days1.push(i);
-      }
-      scope.years1 = [];
-      for (let i = 1900; i < 2100; i++) {
-        scope.years1.push(i);
-      }
-      scope.monthes1 = ['يناير', 'فبراير', 'مارس', 'ابريل', 'مايو', 'يونيو', 'يوليو', 'اغسطس', 'سبتمبر', 'اكتوبر', 'نوفمبر', 'ديسمبر'];
-    },
-    restrict: 'E',
-    require: 'ngModel',
-    scope: {
-      v: '@',
-      label: '@',
-      disabled: '@',
-      ngModel: '=',
-    },
-    template: `
-      <div class="row i-date">
-  
-        <div class=" control">
-          <label> {{label}} </label>
-          <div class="row">
-            <div class="col3 day"> 
-              <select ng-disabled="disabled" v="{{v}}" ng-model="ngModel.day" class="appearance-none no-border-left no-border-radius" >
-              <option ng-repeat="d1 in days1" ng-value="d1"> {{d1}} </option>
-              </select>
-            </div>
-            <div class="col5 month"> 
-              <select ng-disabled="disabled" v="{{v}}" ng-model="ngModel.month" class="appearance-none no-border-left no-border-right no-border-radius" >
-              <option ng-repeat="m1 in monthes1" ng-value="$index"> {{m1}} </option>
-              </select>
-            </div>
-            <div class="col4 year"> 
-              <select ng-disabled="disabled" v="{{v}}" ng-model="ngModel.year" class="appearance-none no-border-right no-border-radius" >
-              <option ng-repeat="y1 in years1" ng-value="y1"> {{y1}} </option>
-              </select>
-            </div>
-          </div>
-        </div>
-    
-  
-      </div>
-      `,
-  };
-});
-
-app.directive('iDate2', function () {
-  return {
-    link: function ($scope, element, attrs) {
-      if (typeof attrs.disabled !== 'undefined') {
-        attrs.disabled = 'disabled';
-      } else {
-        attrs.disabled = '';
-      }
-
-      $scope.y_search = attrs.year || '202';
-      $scope.m_search = attrs.month || '';
-      $scope.d_search = attrs.day || '';
-
-      $scope.days1 = [];
-      for (let i = 1; i < 32; i++) {
-        $scope.days1.push({
-          id: i,
-          name: i,
-        });
-      }
-      $scope.years1 = [];
-      for (let i = 1900; i < 2100; i++) {
-        $scope.years1.push({
-          id: i,
-          name: i,
-        });
-      }
-
-      $scope.monthes1 = [
-        { id: 0, name: 'يناير / Jan' },
-        { id: 1, name: 'فبراير / Feb' },
-        { id: 2, name: 'مارس / Mar' },
-        { id: 3, name: 'ابريل / Aper' },
-        { id: 4, name: 'مايو / May' },
-        { id: 5, name: 'يونيو / June' },
-        { id: 6, name: 'يوليو / Jule' },
-        { id: 7, name: 'اغسطس / Aug' },
-        { id: 8, name: 'سبتمبر / Sep' },
-        { id: 9, name: 'اكتوبر / Oct' },
-        { id: 10, name: 'نوفمبر / Nov' },
-        { id: 11, name: 'ديسمبر / Des' },
-      ];
-
-      $scope.model = null;
+        $scope.searchElement = $(element).find('.dropdown .search');
+        $scope.popupElement = $(element).find('.dropdown .dropdown-content');
 
-      $scope.$watch('ngModel', function (ngModel) {
-        if (ngModel) {
-          ngModel = new Date(ngModel);
-          $scope.model = $scope.model || {};
-          $scope.model.day = ngModel.getDate();
-          $scope.model.day_name = $scope.model.day;
-          $scope.model.month = ngModel.getMonth();
-          $scope.model.month_name = $scope.monthes1.find((m) => m.id == $scope.model.month).name;
-          $scope.model.year = ngModel.getFullYear();
-          $scope.model.year_name = $scope.model.year;
+        if (typeof attrs.disabled !== 'undefined') {
+          attrs.disabled = 'disabled';
         } else {
-          $scope.model = $scope.model || {};
-          $scope.model.day = 0;
-          $scope.model.day_name = '';
-          $scope.model.month = -1;
-          $scope.model.month_name = '';
-          $scope.model.year = 0;
-          $scope.model.year_name = '';
+          attrs.disabled = '';
         }
-      });
 
-      $scope.setDay = function () {
-        $scope.ngModel = new Date();
-      };
-      $scope.updateDate = function (date) {
-        if (date.year) {
-          $scope.model.year = date.year.id;
-          $scope.model.year_name = date.year.name;
-        } else if (date.month) {
-          $scope.model.month = date.month.id;
-          $scope.model.month_name = date.month.name;
-        } else if (date.day) {
-          $scope.model.day = date.day.id;
-          $scope.model.day_name = date.day.name;
+        if (typeof attrs.ngAdd == 'undefined') {
+          $scope.fa_add = 'fa-search';
+        } else {
+          $scope.fa_add = 'fa-plus';
         }
 
-        if ($scope.model && $scope.model.year && $scope.model.day && $scope.model.month > -1) {
-          $scope.ngModel = new Date($scope.model.year, $scope.model.month, $scope.model.day, 0, 0, 0);
+        if (typeof attrs.ngSearch == 'undefined') {
+          $scope.showSearch = !1;
         } else {
-          delete $scope.ngModel;
+          $scope.showSearch = !0;
         }
-      };
-    },
-    restrict: 'E',
-    require: 'ngModel',
-    scope: {
-      v: '@',
-      disabled: '@',
-      label: '@',
-      ngModel: '=',
-    },
-    template: `/*##client-side/sub/i-date2.content.html*/`,
-  };
-});
 
-app.directive('iTime', function () {
-  return {
-    link: function ($scope, element, attrs) {
-      if (typeof attrs.disabled !== 'undefined') {
-        attrs.disabled = 'disabled';
-      } else {
-        attrs.disabled = '';
-      }
+        let input = $(element).find('input');
+        $(element).hover(
+          () => {
+            $scope.popupElement.css('display', 'block');
+          },
+          () => {
+            $scope.popupElement.css('display', 'none');
+          }
+        );
+        $scope.focus = function () {
+          $('.i-list .dropdown-content').css('display', 'none');
+          $scope.popupElement.css('display', 'block');
+          $scope.searchElement.focus();
+        };
+        $scope.hide = function () {
+          $scope.popupElement.css('display', 'none');
+        };
 
-      $scope.model = {};
+        $scope.getValue = function (item) {
+          let v = isite.getValue(item, $scope.display);
+          return v || '';
+        };
 
-      $scope.hours = [];
-      for (let i = 1; i < 25; i++) {
-        $scope.hours.push(i);
-      }
+        $scope.getValue2 = function (item) {
+          if ($scope.display2) {
+            return isite.getValue(item, $scope.display2) || '';
+          }
+          return '';
+        };
 
-      $scope.minutes = [];
-      for (let i = 0; i < 60; i++) {
-        $scope.minutes.push(i);
-      }
+        $scope.getNgModelValue = function (ngModel) {
+          if (ngModel && $scope.display && $scope.ngValue) {
+            return isite.getValue(ngModel, $scope.display.replace($scope.ngValue + '.', '')) || '';
+          } else if (ngModel && $scope.display) {
+            return isite.getValue(ngModel, $scope.display) || '';
+          }
+          return '';
+        };
 
-      $(element)
-        .find('select')
-        .focus(() => {
-          $('.popup').hide();
-        });
+        $scope.getNgModelValue2 = function (ngModel) {
+          if (ngModel && $scope.display2 && $scope.ngValue) {
+            return isite.getValue(ngModel, $scope.display2.replace($scope.ngValue + '.', '')) || '';
+          } else if (ngModel && $scope.display2) {
+            return isite.getValue(ngModel, $scope.display2) || '';
+          }
+          return '';
+        };
 
-      $scope.$watch('ngModel', function (ngModel) {
-        if (ngModel) {
-          ngModel.date = new Date(ngModel.date);
-          $scope.model = $scope.model || {};
-          $scope.model.hour = ngModel.hour;
+        $scope.getNgValue = function (item) {
+          if (item && $scope.ngValue) {
+            return isite.getValue(item, $scope.ngValue);
+          }
+          return item;
+        };
+
+        $scope.$watch('items', (items) => {
+          input.val('');
+
+          if (items) {
+            items.forEach((item) => {
+              if ($scope.display2) {
+                item.$display = $scope.getValue(item) + $scope.space + $scope.getValue2(item);
+              } else {
+                item.$display = $scope.getValue(item);
+              }
+            });
+          }
+
+          if (items && $scope.ngModel) {
+            items.forEach((item) => {
+              if (isite.getValue(item, $scope.primary) == isite.getValue($scope.ngModel, $scope.primary)) {
+                $scope.ngModel = item;
+                if ($scope.display2) {
+                  item.$display = $scope.getValue(item) + $scope.space + $scope.getValue2(item);
+                } else {
+                  item.$display = $scope.getValue(item);
+                }
+
+                input.val(item.$display);
+              }
+            });
+          }
+        });
+
+        $scope.$watch('ngModel', (ngModel) => {
+          input.val('');
+
+          $scope.ngModel = ngModel;
+
+          if (ngModel) {
+            if ($scope.display2) {
+              input.val(' ' + $scope.getNgModelValue(ngModel) + $scope.space + $scope.getNgModelValue2(ngModel));
+            } else {
+              input.val(' ' + $scope.getNgModelValue(ngModel));
+            }
+          }
+        });
+
+        $scope.updateModel = function (item) {
+          $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
+          if ($scope.display2) {
+            input.val($scope.getNgModelValue($scope.ngModel) + $scope.space + $scope.getNgModelValue2($scope.ngModel));
+          } else {
+            input.val($scope.getNgModelValue($scope.ngModel));
+          }
+          $timeout(() => {
+            if ($scope.ngChange) {
+              $scope.ngChange();
+            }
+          }, 100);
+          $scope.hide();
+        };
+      },
+      template: `/*##client-side/sub/i-list2.content.html*/`,
+    };
+  },
+]);
+app.directive('iChecklist', [
+  '$interval',
+  '$timeout',
+  function ($interval, $timeout) {
+    return {
+      restrict: 'E',
+      required: 'ngModel',
+      scope: {
+        label: '@',
+        primary: '@',
+        display: '@',
+        class2: '@',
+        ngModel: '=',
+        items: '=',
+        like: '&',
+        ngChange: '&',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.primary = $scope.primary || 'id';
+        $scope.display = $scope.display || 'name';
+        $scope.class2 = $scope.class2 || 'col';
+        $scope.selectedItems = [];
+
+        $scope.$watch('ngModel', (ngModel) => {
+          $scope.reload();
+        });
+
+        $scope.reload = function () {
+          $scope.selectedItems = [];
+
+          if ($scope.ngModel) {
+            $scope.ngModel.forEach((mitem) => {
+              $scope.selectedItems.push(mitem);
+            });
+
+            if ($scope.items) {
+              $scope.items.forEach((mitem) => {
+                let exist = !1;
+                $scope.selectedItems.forEach((sitem) => {
+                  if (mitem[$scope.primary] === sitem[$scope.primary]) {
+                    exist = !0;
+                  }
+                });
+                if (exist) {
+                  mitem.$selected = !0;
+                } else {
+                  mitem.$selected = !1;
+                }
+              });
+            }
+          }
+          if (!$scope.ngModel) {
+            $scope.selectedItems = [];
+            if ($scope.items) {
+              $scope.items.forEach((mitem) => {
+                mitem.$selected = !1;
+              });
+            }
+          }
+        };
+
+        $scope.change = function (item) {
+          if (item.$selected) {
+            let exsits = !1;
+            $scope.selectedItems.forEach((sitem) => {
+              if (sitem[$scope.primary] === item[$scope.primary]) {
+                exsits = !0;
+              }
+            });
+            if (!exsits) {
+              let nitem = { ...item };
+              delete nitem.$selected;
+              delete nitem.$$hashKey;
+              $scope.selectedItems.push(nitem);
+            }
+          } else {
+            $scope.selectedItems.forEach((sitem, index) => {
+              if (sitem[$scope.primary] === item[$scope.primary]) {
+                $scope.selectedItems.splice(index, 1);
+              }
+            });
+          }
+
+          $scope.ngModel = $scope.selectedItems;
+          $timeout(() => {
+            if ($scope.ngChange) {
+              $scope.ngChange();
+            }
+          }, 100);
+        };
+      },
+      template: `
+       <div class="check-list">
+            <label class="title margin"> {{label}} </label>
+            <div class="row">
+              <i-checkbox class="{{class2}}" label="{{item[display]}}" ng-repeat="item in items" ng-model="item.$selected" ng-change="change(item);"></i-checkbox>
+            </div>
+        </div>
+        `,
+    };
+  },
+]);
+
+app.directive('iDate', function () {
+  return {
+    restrict: 'E',
+    required: 'ngModel',
+    scope: {
+      label: '@',
+      year: '@',
+      ngModel: '=',
+      ngChange: '&',
+    },
+    link: function ($scope, element, attrs) {
+      if (typeof attrs.disabled !== 'undefined') {
+        attrs.disabled = 'disabled';
+      } else {
+        attrs.disabled = '';
+      }
+      $scope.year = $scope.year ? parseInt($scope.year) : 1960;
+
+      $scope.model = {};
+
+      $scope.days = [];
+      for (let i = 1; i < 32; i++) {
+        $scope.days.push({
+          id: i,
+          name: i,
+        });
+      }
+      $scope.years = [];
+      for (let i = $scope.year; i < 2100; i++) {
+        $scope.years.push({
+          id: i,
+          name: i,
+        });
+      }
+      $scope.lang = site.session ? site.session.lang : 'en';
+      if ($scope.lang === 'ar') {
+        $scope.monthes = [
+          { id: 0, name: 'يناير' },
+          { id: 1, name: 'فبراير' },
+          { id: 2, name: 'مارس' },
+          { id: 3, name: 'ابريل' },
+          { id: 4, name: 'مايو' },
+          { id: 5, name: 'يونيو' },
+          { id: 6, name: 'يوليو' },
+          { id: 7, name: 'اغسطس' },
+          { id: 8, name: 'سبتمبر' },
+          { id: 9, name: 'اكتوبر' },
+          { id: 10, name: 'نوفمبر' },
+          { id: 11, name: 'ديسمبر' },
+        ];
+      } else {
+        $scope.monthes = [
+          { id: 0, name: 'Jan' },
+          { id: 1, name: 'Feb' },
+          { id: 2, name: 'Mar' },
+          { id: 3, name: 'Aper' },
+          { id: 4, name: 'May' },
+          { id: 5, name: 'June' },
+          { id: 6, name: 'Jule' },
+          { id: 7, name: 'Aug' },
+          { id: 8, name: 'Sep' },
+          { id: 9, name: 'Oct' },
+          { id: 10, name: 'Nov' },
+          { id: 11, name: 'Des' },
+        ];
+      }
+
+      $scope.$watch('ngModel', function (ngModel) {
+        if (ngModel) {
+          ngModel = new Date(ngModel);
+          $scope.model = $scope.model || {};
+          $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());
+        } else {
+          $scope.model = $scope.model || {};
+          $scope.model.selectedDay = null;
+          $scope.model.selectedMonth = null;
+          $scope.model.selectedYear = null;
+        }
+      });
+
+      $scope.setDay = function () {
+        $scope.ngModel = new Date();
+      };
+      $scope.updateDate = function (date) {
+        if ($scope.model.selectedDay && $scope.model.selectedMonth && $scope.model.selectedYear) {
+          $scope.ngModel = new Date($scope.model.selectedYear.id, $scope.model.selectedMonth.id, $scope.model.selectedDay.id, 0, 0, 0);
+          if ($scope.ngChange) {
+            $scope.ngChange();
+          }
+        }
+      };
+    },
+    restrict: 'E',
+    require: 'ngModel',
+    scope: {
+      v: '@',
+      disabled: '@',
+      label: '@',
+      ngModel: '=',
+    },
+    template: `/*##client-side/directive/i-date.html*/`,
+  };
+});
+
+app.directive('iTime', function () {
+  return {
+    link: function ($scope, element, attrs) {
+      if (typeof attrs.disabled !== 'undefined') {
+        attrs.disabled = 'disabled';
+      } else {
+        attrs.disabled = '';
+      }
+
+      $scope.model = {};
+
+      $scope.hours = [];
+      for (let i = 1; i < 25; i++) {
+        $scope.hours.push(i);
+      }
+
+      $scope.minutes = [];
+      for (let i = 0; i < 60; i++) {
+        $scope.minutes.push(i);
+      }
+
+      $(element)
+        .find('select')
+        .focus(() => {
+          $('.popup').hide();
+        });
+
+      $scope.$watch('ngModel', function (ngModel) {
+        if (ngModel) {
+          ngModel.date = new Date(ngModel.date);
+          $scope.model = $scope.model || {};
+          $scope.model.hour = ngModel.hour;
           $scope.model.minute = ngModel.minute;
         } else {
           $scope.model = $scope.model || {};
@@ -609,456 +888,178 @@ app.directive('iFulldate', [
         if (typeof attrs.disabled !== 'undefined') {
           attrs.disabled = 'disabled';
         } else {
-          attrs.disabled = '';
-        }
-
-        $(element)
-          .find('select')
-          .focus(() => {
-            $('.popup').hide();
-          });
-
-        $scope.days1 = [];
-        for (let i = 1; i < 32; i++) {
-          $scope.days1.push(i);
-        }
-        $scope.years1 = [];
-        for (let i = 1950; i < 2030; i++) {
-          $scope.years1.push(i);
-        }
-
-        $scope.monthes1 = ['يناير', 'فبراير', 'مارس', 'ابريل', 'مايو', 'يونيو', 'يوليو', 'اغسطس', 'سبتمبر', 'اكتوبر', 'نوفمبر', 'ديسمبر'];
-
-        $scope.days2 = [];
-        for (let i = 1; i < 31; i++) {
-          $scope.days2.push(i);
-        }
-        $scope.years2 = [];
-        for (let i = 1370; i < 1450; i++) {
-          $scope.years2.push(i);
-        }
-        $scope.monthes2 = ['محرم', 'صفر', 'ربيع اول', 'ربيع ثان', 'جمادى اول', 'جمادى ثان', 'رجب', 'شعبان', 'رمضان', 'شوال', 'ذى القعدة', 'ذى الحجة'];
-
-        $scope.model = {};
-
-        $scope.$watch('ngModel', function (ngModel) {
-          if (ngModel) {
-            $scope.model = ngModel;
-          } else {
-            $scope.model = {};
-          }
-        });
-
-        $scope.$watch('ngModel.date', function (date) {
-          if (date) {
-            if (typeof date == 'string') {
-              date = new Date(date);
-            }
-            $scope.model = $scope.model || {};
-            $scope.model.date = date;
-            $scope.model.day = date.getDate();
-            $scope.model.month = date.getMonth();
-            $scope.model.year = date.getFullYear();
-            $scope.get_hijri_date();
-          }
-        });
-
-        $scope.get_hijri_date = function () {
-          if ($scope.model && $scope.model.year && $scope.model.day) {
-            ngModel.$setViewValue($scope.model);
-            if (_busy) {
-              return;
-            }
-            _busy = !0;
-            $scope.model.date = new Date($scope.model.year, $scope.model.month, $scope.model.day);
-            $http({
-              method: 'POST',
-              url: '/api/get_hijri_date',
-              data: {
-                date: $scope.model.year + '/' + ($scope.model.month + 1) + '/' + $scope.model.day,
-              },
-            })
-              .then((response) => {
-                if (response.data.done) {
-                  $scope.model.hijri = response.data.hijri;
-                  $scope.model.day2 = parseInt($scope.model.hijri.split('/')[2]);
-                  $scope.model.month2 = parseInt($scope.model.hijri.split('/')[1]) - 1;
-                  $scope.model.year2 = parseInt($scope.model.hijri.split('/')[0]);
-                  ngModel.$setViewValue($scope.model);
-                  _busy = !1;
-                }
-              })
-              .catch(() => {
-                _busy = !1;
-              });
-          }
-        };
-
-        $scope.get_normal_date = function () {
-          if ($scope.model && $scope.model.year2 && $scope.model.day2) {
-            ngModel.$setViewValue($scope.model);
-            if (_busy) {
-              return;
-            }
-            _busy = !0;
-            $http({
-              method: 'POST',
-              url: '/api/get_normal_date',
-              data: {
-                hijri: $scope.model.year2 + '/' + ($scope.model.month2 + 1) + '/' + $scope.model.day2,
-              },
-            })
-              .then((response) => {
-                if (response.data.done) {
-                  $scope.model.date = new Date(response.data.date);
-                  $scope.model.day = parseInt(response.data.date.split('/')[2]);
-                  $scope.model.month = parseInt(response.data.date.split('/')[1]) - 1;
-                  $scope.model.year = parseInt(response.data.date.split('/')[0]);
-                  ngModel.$setViewValue($scope.model);
-                  _busy = !1;
-                }
-              })
-              .catch(() => {
-                _busy = !1;
-              });
-          }
-        };
-      },
-      restrict: 'E',
-      require: 'ngModel',
-      scope: {
-        v: '@',
-        label1: '@',
-        label2: '@',
-        disabled: '@',
-        ngModel: '=',
-        ngChange: '&',
-      },
-      template: `
-      <div class="row i-date">
-  
-        <div class="col6 control">
-          <label> {{label1}} </label>
-          <div class="row">
-            <div class="col3 day"> 
-              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.day" class="appearance-none no-border-left no-border-radius">
-              <option ng-repeat="d1 in days1" ng-value="d1"> {{d1}} </option>
-              </select>
-            </div>
-            <div class="col5 month"> 
-              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.month" class="appearance-none no-border-left no-border-right no-border-radius">
-              <option ng-repeat="m1 in monthes1" ng-value="$index"> {{m1}} </option>
-              </select>
-            </div>
-            <div class="col4 year"> 
-              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.year" class="appearance-none no-border-right no-border-radius">
-              <option ng-repeat="y1 in years1" ng-value="y1"> {{y1}} </option>
-              </select>
-            </div>
-          </div>
-        </div>
-     
-        <div class="col6 control">
-          <label> {{label2}} </label>
-          <div class="row">
-            <div class="col3 day"> 
-              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.day2" class="appearance-none no-border-left no-border-radius">
-              <option ng-repeat="d2 in days2" ng-value="d2"> {{d2}} </option>
-              </select>
-            </div>
-            <div class="col5 month"> 
-              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.month2" class="appearance-none no-border-left no-border-right no-border-radius">
-              <option ng-repeat="m2 in monthes2" ng-value="$index"> {{m2}} </option>
-              </select>
-            </div>
-            <div class="col4 year"> 
-              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.year2" class="appearance-none no-border-right no-border-radius">
-              <option ng-repeat="y2 in years2" ng-value="y2"> {{y2}} </option>
-              </select>
-            </div>
-          </div>
-        </div>
-  
-      </div>
-      `,
-    };
-  },
-]);
-
-app.directive('iTextarea', function () {
-  return {
-    restrict: 'E',
-    require: 'ngModel',
-    scope: {
-      v: '@',
-      label: '@',
-      disabled: '@',
-      rows: '@',
-      ngModel: '=',
-      ngChange: '&',
-    },
-    link: function (scope, element, attrs, ctrl) {
-      if (typeof attrs.disabled !== 'undefined') {
-        attrs.disabled = 'disabled';
-      } else {
-        attrs.disabled = '';
-      }
-      scope.rows = scope.rows || 4;
-
-      $(element)
-        .find('textarea')
-        .focus(() => {
-          $('.popup').hide();
-        });
-    },
-    template: `
-        <div class="control">
-            <label> {{label}} </label>
-            <textarea ng-disabled="disabled" rows="{{rows}}" v="{{v}}" ng-model="ngModel" ng-change="ngChange()"></textarea>
-        </div>
-        `,
-  };
-});
-
-app.directive('iList', [
-  '$interval',
-  '$timeout',
-  'isite',
-  function ($interval, $timeout, isite) {
-    return {
-      restrict: 'E',
-      require: 'ngModel',
-      scope: {
-        v: '@',
-        label: '@',
-        display: '@',
-        display2: '@',
-        disabled: '@',
-        css: '@',
-        space: '@',
-        primary: '@',
-        ngValue: '@',
-        ngModel: '=',
-        ngSearch: '=',
-        ngChange: '&',
-        ngAdd: '&',
-        items: '=',
-      },
-      link: function ($scope, element, attrs, ctrl) {
-        $scope.display = attrs.display = attrs.display || 'name';
-        $scope.primary = attrs.primary = attrs.primary || 'id';
-        attrs.space = attrs.space || ' ';
-        attrs.ngValue = attrs.ngValue || '';
-
-        $scope.searchElement = $(element).find('.dropdown .search');
-        $scope.popupElement = $(element).find('.dropdown .dropdown-content');
-
-        if (typeof attrs.disabled !== 'undefined') {
-          attrs.disabled = 'disabled';
-        } else {
-          attrs.disabled = '';
-        }
-
-        if (typeof attrs.ngAdd == 'undefined') {
-          $scope.fa_add = 'fa-search';
-        } else {
-          $scope.fa_add = 'fa-plus';
-        }
-
-        if (typeof attrs.ngSearch == 'undefined') {
-          $scope.showSearch = !1;
-        } else {
-          $scope.showSearch = !0;
-        }
-
-        let input = $(element).find('input');
-        $(element).hover(
-          () => {
-            $scope.popupElement.css('display', 'block');
-          },
-          () => {
-            $scope.popupElement.css('display', 'none');
-          }
-        );
-        $scope.focus = function () {
-          $('.i-list .dropdown-content').css('display', 'none');
-          $scope.popupElement.css('display', 'block');
-          $scope.searchElement.focus();
-        };
-        $scope.hide = function () {
-          $scope.popupElement.css('display', 'none');
-        };
-
-        $scope.getValue = function (item) {
-          let v = isite.getValue(item, $scope.display);
-          return v || '';
-        };
-
-        $scope.getValue2 = function (item) {
-          if ($scope.display2) {
-            return isite.getValue(item, $scope.display2) || '';
-          }
-          return '';
-        };
-
-        $scope.getNgModelValue = function (ngModel) {
-          if (ngModel && $scope.display && $scope.ngValue) {
-            return isite.getValue(ngModel, $scope.display.replace($scope.ngValue + '.', '')) || '';
-          } else if (ngModel && $scope.display) {
-            return isite.getValue(ngModel, $scope.display) || '';
-          }
-          return '';
-        };
-
-        $scope.getNgModelValue2 = function (ngModel) {
-          if (ngModel && $scope.display2 && $scope.ngValue) {
-            return isite.getValue(ngModel, $scope.display2.replace($scope.ngValue + '.', '')) || '';
-          } else if (ngModel && $scope.display2) {
-            return isite.getValue(ngModel, $scope.display2) || '';
-          }
-          return '';
-        };
-
-        $scope.getNgValue = function (item) {
-          if (item && $scope.ngValue) {
-            return isite.getValue(item, $scope.ngValue);
-          }
-          return item;
-        };
-
-        $scope.$watch('items', (items) => {
-          input.val('');
-
-          if (items) {
-            items.forEach((item) => {
-              item.$display = $scope.getValue(item) + attrs.space + $scope.getValue2(item);
-            });
-          }
-
-          if (items && $scope.ngModel) {
-            items.forEach((item) => {
-              if (isite.getValue(item, $scope.primary) == isite.getValue($scope.ngModel, $scope.primary)) {
-                $scope.ngModel = item;
-                item.$display = $scope.getValue(item) + attrs.space + $scope.getValue2(item);
-                input.val(item.$display);
-              }
-            });
-          }
-        });
-
-        $scope.$watch('ngModel', (ngModel) => {
-          input.val('');
-
-          $scope.ngModel = ngModel;
-
-          if (ngModel) {
-            input.val(' ' + $scope.getNgModelValue(ngModel) + attrs.space + $scope.getNgModelValue2(ngModel));
-          }
-        });
-
-        $scope.updateModel = function (item) {
-          $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
-          input.val($scope.getNgModelValue($scope.ngModel) + attrs.space + $scope.getNgModelValue2($scope.ngModel));
-          $timeout(() => {
-            $scope.ngChange();
-          });
-          $scope.hide();
-        };
-      },
-      template: `/*##client-side/sub/i-list2.content.html*/`,
-    };
-  },
-]);
-
-app.directive('iChecklist', [
-  '$interval',
-  function ($interval) {
-    return {
-      restrict: 'E',
-      required: 'ngModel',
-      scope: {
-        label: '@',
-        primary: '@',
-        display: '@',
-        ngModel: '=',
-        items: '=',
-        like: '&',
-      },
-      link: function ($scope, element, attrs, ctrl) {
-        attrs.primary = attrs.primary || 'id';
+          attrs.disabled = '';
+        }
 
-        $scope.selectedItems = [];
+        $(element)
+          .find('select')
+          .focus(() => {
+            $('.popup').hide();
+          });
 
-        $scope.$watch('ngModel', (ngModel) => {
-          $scope.reload();
-        });
+        $scope.days1 = [];
+        for (let i = 1; i < 32; i++) {
+          $scope.days1.push(i);
+        }
+        $scope.years1 = [];
+        for (let i = 1950; i < 2030; i++) {
+          $scope.years1.push(i);
+        }
 
-        $scope.reload = function () {
-          $scope.selectedItems = [];
+        $scope.monthes1 = ['يناير', 'فبراير', 'مارس', 'ابريل', 'مايو', 'يونيو', 'يوليو', 'اغسطس', 'سبتمبر', 'اكتوبر', 'نوفمبر', 'ديسمبر'];
 
-          if ($scope.ngModel) {
-            $scope.ngModel.forEach((mitem) => {
-              $scope.selectedItems.push(mitem);
-            });
+        $scope.days2 = [];
+        for (let i = 1; i < 31; i++) {
+          $scope.days2.push(i);
+        }
+        $scope.years2 = [];
+        for (let i = 1370; i < 1450; i++) {
+          $scope.years2.push(i);
+        }
+        $scope.monthes2 = ['محرم', 'صفر', 'ربيع اول', 'ربيع ثان', 'جمادى اول', 'جمادى ثان', 'رجب', 'شعبان', 'رمضان', 'شوال', 'ذى القعدة', 'ذى الحجة'];
 
-            if ($scope.items) {
-              $scope.items.forEach((mitem) => {
-                let exist = !1;
-                $scope.selectedItems.forEach((sitem) => {
-                  if (mitem[$scope.primary] === sitem[$scope.primary]) {
-                    exist = !0;
-                  }
-                });
-                if (exist) {
-                  mitem.$selected = !0;
-                } else {
-                  mitem.$selected = !1;
-                }
-              });
+        $scope.model = {};
+
+        $scope.$watch('ngModel', function (ngModel) {
+          if (ngModel) {
+            $scope.model = ngModel;
+          } else {
+            $scope.model = {};
+          }
+        });
+
+        $scope.$watch('ngModel.date', function (date) {
+          if (date) {
+            if (typeof date == 'string') {
+              date = new Date(date);
             }
+            $scope.model = $scope.model || {};
+            $scope.model.date = date;
+            $scope.model.day = date.getDate();
+            $scope.model.month = date.getMonth();
+            $scope.model.year = date.getFullYear();
+            $scope.get_hijri_date();
           }
-          if (!$scope.ngModel) {
-            $scope.selectedItems = [];
-            if ($scope.items) {
-              $scope.items.forEach((mitem) => {
-                mitem.$selected = !1;
-              });
+        });
+
+        $scope.get_hijri_date = function () {
+          if ($scope.model && $scope.model.year && $scope.model.day) {
+            ngModel.$setViewValue($scope.model);
+            if (_busy) {
+              return;
             }
+            _busy = !0;
+            $scope.model.date = new Date($scope.model.year, $scope.model.month, $scope.model.day);
+            $http({
+              method: 'POST',
+              url: '/api/get_hijri_date',
+              data: {
+                date: $scope.model.year + '/' + ($scope.model.month + 1) + '/' + $scope.model.day,
+              },
+            })
+              .then((response) => {
+                if (response.data.done) {
+                  $scope.model.hijri = response.data.hijri;
+                  $scope.model.day2 = parseInt($scope.model.hijri.split('/')[2]);
+                  $scope.model.month2 = parseInt($scope.model.hijri.split('/')[1]) - 1;
+                  $scope.model.year2 = parseInt($scope.model.hijri.split('/')[0]);
+                  ngModel.$setViewValue($scope.model);
+                  _busy = !1;
+                }
+              })
+              .catch(() => {
+                _busy = !1;
+              });
           }
         };
 
-        $scope.change = function (item) {
-          item.$selected = !item.$selected;
-
-          if (item.$selected) {
-            let exsits = !1;
-            $scope.selectedItems.forEach((sitem) => {
-              if (sitem[$scope.primary] === item[$scope.primary]) {
-                exsits = !0;
-              }
-            });
-            if (!exsits) {
-              $scope.selectedItems.push(item);
+        $scope.get_normal_date = function () {
+          if ($scope.model && $scope.model.year2 && $scope.model.day2) {
+            ngModel.$setViewValue($scope.model);
+            if (_busy) {
+              return;
             }
-          } else {
-            $scope.selectedItems.forEach((sitem, index) => {
-              if (sitem[$scope.primary] === item[$scope.primary]) {
-                $scope.selectedItems.splice(index, 1);
-              }
-            });
+            _busy = !0;
+            $http({
+              method: 'POST',
+              url: '/api/get_normal_date',
+              data: {
+                hijri: $scope.model.year2 + '/' + ($scope.model.month2 + 1) + '/' + $scope.model.day2,
+              },
+            })
+              .then((response) => {
+                if (response.data.done) {
+                  $scope.model.date = new Date(response.data.date);
+                  $scope.model.day = parseInt(response.data.date.split('/')[2]);
+                  $scope.model.month = parseInt(response.data.date.split('/')[1]) - 1;
+                  $scope.model.year = parseInt(response.data.date.split('/')[0]);
+                  ngModel.$setViewValue($scope.model);
+                  _busy = !1;
+                }
+              })
+              .catch(() => {
+                _busy = !1;
+              });
           }
-
-          $scope.ngModel = $scope.selectedItems;
         };
       },
+      restrict: 'E',
+      require: 'ngModel',
+      scope: {
+        v: '@',
+        label1: '@',
+        label2: '@',
+        disabled: '@',
+        ngModel: '=',
+        ngChange: '&',
+      },
       template: `
-       <div class="row padding check-list">
-            <label class="title"> {{label}} </label>
-                <div ng-repeat="item in items" ng-click="change(item);ngChange($event , item);" class="selector" ng-class="{'selected' : item.$selected , 'un-selected' : !item.$selected  }" >
-                    <i ng-show="!item.$selected" class="fa fa-square"></i>  <i ng-show="item.$selected" class="fa fa-check"></i> {{item[display]}}
-                </div>
+      <div class="row i-date">
+  
+        <div class="col6 control">
+          <label> {{label1}} </label>
+          <div class="row">
+            <div class="col3 day"> 
+              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.day" class="appearance-none no-border-left no-border-radius">
+              <option ng-repeat="d1 in days1" ng-value="d1"> {{d1}} </option>
+              </select>
+            </div>
+            <div class="col5 month"> 
+              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.month" class="appearance-none no-border-left no-border-right no-border-radius">
+              <option ng-repeat="m1 in monthes1" ng-value="$index"> {{m1}} </option>
+              </select>
+            </div>
+            <div class="col4 year"> 
+              <select ng-change="get_hijri_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.year" class="appearance-none no-border-right no-border-radius">
+              <option ng-repeat="y1 in years1" ng-value="y1"> {{y1}} </option>
+              </select>
+            </div>
+          </div>
         </div>
-        `,
+     
+        <div class="col6 control">
+          <label> {{label2}} </label>
+          <div class="row">
+            <div class="col3 day"> 
+              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.day2" class="appearance-none no-border-left no-border-radius">
+              <option ng-repeat="d2 in days2" ng-value="d2"> {{d2}} </option>
+              </select>
+            </div>
+            <div class="col5 month"> 
+              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.month2" class="appearance-none no-border-left no-border-right no-border-radius">
+              <option ng-repeat="m2 in monthes2" ng-value="$index"> {{m2}} </option>
+              </select>
+            </div>
+            <div class="col4 year"> 
+              <select ng-change="get_normal_date()" ng-disabled="disabled" v="{{v}}" ng-model="model.year2" class="appearance-none no-border-right no-border-radius">
+              <option ng-repeat="y2 in years2" ng-value="y2"> {{y2}} </option>
+              </select>
+            </div>
+          </div>
+        </div>
+  
+      </div>
+      `,
     };
   },
 ]);
@@ -1211,41 +1212,62 @@ app.directive('iFile', [
       required: 'ngModel',
       scope: {
         label: '@',
-        type: '@',
+        folder: '@',
         ngModel: '=',
         ngClick: '&',
         onSelected: '&',
       },
-      link: function (scope, element, attrs, ctrl) {
-        scope.type = scope.type || 'bg-green';
-
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.label = $scope.label || 'Select File to Upload';
         let input = $(element).find('input')[0];
-        let a = $(element).find('a')[0];
-
+        let button = $(element).find('button')[0];
+        if (attrs.view === '') {
+          $scope.viewOnly = !0;
+        }
+        let progress = $(element).find('.progress')[0];
+        $(progress).hide();
+        $scope.folder = $scope.folder || 'default';
+        $scope.id = Math.random().toString().replace('.', '_');
         if (attrs.view !== '') {
-          a.addEventListener('click', function () {
+          button.addEventListener('click', function () {
             input.click();
           });
         }
 
         input.addEventListener('change', function () {
-          scope.ngModel = this.files[0].path;
-          scope.onSelected(this.files[0].path);
-          scope.$applyAsync();
+          isite.uploadFile(
+            this.files,
+            {
+              folder: $scope.folder,
+            },
+            (err, file, e) => {
+              if (e) {
+                $(progress).show();
+                $scope.value = (e.loaded / e.total) * 100;
+                $scope.max = e.total;
+                if ($scope.value === 100) {
+                  $(progress).hide();
+                }
+              }
+
+              if (file) {
+                $scope.ngModel = file;
+                console.log(file);
+              }
+            }
+          );
+          $scope.ngModel = this.files[0].path;
+          $scope.onSelected(this.files[0].path);
+          $scope.$applyAsync();
         });
 
-        scope.$watch('ngModel', (ngModel) => {
+        $scope.$watch('ngModel', (ngModel) => {
           if (ngModel) {
             a.setAttribute('url', ngModel);
           }
         });
       },
-      template: `
-        <form class="form text-center pointer">
-            <input  class="hidden" type="file" name="file" />
-            <a class="btn {{type}}" ngClick="ngClick()" url="{{ngModel}}"> {{label}} </a>
-        </form>
-        `,
+      template: `/*##client-side/sub/i-file.content.html*/`,
     };
   },
 ]);
@@ -1258,16 +1280,16 @@ app.directive('iImage', [
       restrict: 'E',
       required: 'ngModel',
       scope: {
-        category: '@',
+        folder: '@',
         ngModel: '=',
         ngClick: '&',
       },
-      link: function (scope, element, attrs, ctrl) {
-        scope.category = scope.category || 'default';
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.folder = $scope.folder || 'default';
 
         let input = $(element).find('input')[0];
         let img = $(element).find('img')[0];
-        let progress = $(element).find('progress')[0];
+        let progress = $(element).find('.progress')[0];
         $(progress).hide();
 
         if (attrs.view !== '') {
@@ -1280,34 +1302,39 @@ app.directive('iImage', [
           isite.uploadImage(
             this.files,
             {
-              category: scope.category,
+              folder: $scope.folder,
             },
-            (err, image_url, e) => {
+            (err, image, e) => {
               if (e) {
                 $(progress).show();
-                progress.value = e.loaded;
-                progress.max = e.total;
+                $scope.value = (e.loaded / e.total) * 100;
+                $scope.max = e.total;
+                if ($scope.value === 100) {
+                  $(progress).hide();
+                }
               }
 
-              if (image_url) {
-                scope.ngModel = image_url;
+              if (image) {
+                $scope.ngModel = image;
               }
             }
           );
         });
 
-        scope.$watch('ngModel', (ngModel) => {
+        $scope.$watch('ngModel', (ngModel) => {
           if (ngModel) {
-            img.setAttribute('src', ngModel);
+            img.setAttribute('src', ngModel.url);
           }
         });
       },
       template: `
-        <form class="form text-center pointer">
-            <input  class="hidden" type="file" name="file" />
-            <img class="bg-white"  ng-src="{{ngModel}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" />
-            <progress class="row"></progress>
-        </form>
+        <div class=" text-center pointer">
+            <input  class="hidden" type="file" name="fileToUpload" accept="image/*"/>
+            <img class="rounded"  ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" />
+            <div class="progress row">
+               <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" style="width: {{value}}%"></div>
+            </div>
+        </div>
         `,
     };
   },