isite 2023.1.8 → 2023.1.10

package/apps/charts/site_files/js/custom.js

@@ -1,161 +1,159 @@
-;
 ((w, d) => {
-
-    const YXChart = {
-
-        "data": [{
-            "country": "USA",
-            "visits": 3025
-        }],
-
-        "colors": {
-            "saturation": 0.4,
-            "list" : [
-                "#ff5722"
-            ]
+  const YXChart = {
+    data: [
+      {
+        country: 'USA',
+        visits: 3025,
+      },
+    ],
+
+    colors: {
+      saturation: 0.4,
+      list: ['#ff5722'],
+    },
+
+    yAxes: [
+      {
+        type: 'CategoryAxis',
+        renderer: {
+          minGridDistance: 20,
+          grid: {
+            location: 0,
+          },
         },
-
-        "yAxes": [{
-            "type": "CategoryAxis",
-            "renderer": {
-                "minGridDistance": 20,
-                "grid": {
-                    "location": 0
-                }
-            },
-            "dataFields": {
-                "category": "country"
-            }
-        }],
-
-
-        "xAxes": [{
-            "type": "ValueAxis",
-            "renderer": {
-                "maxLabelPosition": 0.98
-            }
-        }],
-
-
-        "series": [{
-            "name": "test name",
-            "type": "ColumnSeries",
-
-
-            "dataFields": {
-                "categoryY": "country",
-                "valueX": "visits"
-            },
-
-
-            "defaultState": {
-                "ransitionDuration": 1000
-            },
-
-
-            "sequencedInterpolation": !0,
-            "sequencedInterpolationDelay": 100,
-
-
-            "columns": {
-                "template": {
-                    "tooltipText": "",
-                    "fill": "#0000ff"
-                },
-                "strokeOpacity": 0
-            }
-        }],
-
-
-        "cursor": {
-            "type": "XYCursor",
-            "behavior": "zoomY"
-        }
-    };
-
-    const XYChart = {
-        "colors": {
-            "saturation": 0.4,
-            "list" : [
-                "#ff5722"
-            ]
+        dataFields: {
+          category: 'country',
         },
-        "data": [{
-            "country": "USA",
-            "visits": 3025
-        }],
-        "yAxes": [{
-            "type": "ValueAxis",
-            "renderer": {
-                "maxLabelPosition": 0.98
-            }
-        }],
-        "xAxes": [{
-            "type": "CategoryAxis",
-            "renderer": {
-                "minGridDistance": 20,
-                "grid": {
-                    "location": 0
-                }
-            },
-            "dataFields": {
-                "category": "country"
-            }
-        }],
-        "series": [{
-            "name": "test name",
-            "type": "ColumnSeries",
-            "dataFields": {
-                "categoryX": "country",
-                "valueY": "visits"
-            },
-            "columns": {
-                "template": {
-                    "tooltipText": "",
-                    "fill": "#0000ff"
-                },
-                "strokeOpacity": 0
-            },
-            "defaultState": {
-                "ransitionDuration": 1000
-            },
-            "sequencedInterpolation": !0,
-            "sequencedInterpolationDelay": 100
-        }],
-        
+      },
+    ],
+
+    xAxes: [
+      {
+        type: 'ValueAxis',
+        renderer: {
+          maxLabelPosition: 0.98,
+        },
+      },
+    ],
 
-        "cursor": {
-            "type": "XYCursor",
-            "behavior": "zoomX"
-        }
-    };
+    series: [
+      {
+        name: 'test name',
+        type: 'ColumnSeries',
 
-    w.site = w.site || {};
-    w.site.create_chart = function (options) {
-        am4core.useTheme(am4themes_animated);
+        dataFields: {
+          categoryY: 'country',
+          valueX: 'visits',
+        },
 
-        if (options.type == 'xy') {
-            XYChart.xAxes[0].dataFields.category = options.x;
-            XYChart.series[0].dataFields.categoryX = options.x;
-            XYChart.series[0].dataFields.valueY = options.y;
-            if(options.color){
-                XYChart.colors.list[0] = options.color;
-            }
-           
-            XYChart.data = options.data;
-            am4core.createFromConfig(XYChart, document.querySelector(options.selector), am4charts.XYChart);
-        } else if (options.type == 'yx') {
-            YXChart.yAxes[0].dataFields.category = options.y;
-            YXChart.series[0].dataFields.categoryY = options.y;
-            YXChart.series[0].dataFields.valueX = options.x;
-            if(options.color){
-                YXChart.colors.list[0] = options.color;
-            }
-            YXChart.data = options.data;
-            am4core.createFromConfig(YXChart, document.querySelector(options.selector), am4charts.XYChart);
-        }
+        defaultState: {
+          ransitionDuration: 1000,
+        },
 
-      
-    };
+        sequencedInterpolation: !0,
+        sequencedInterpolationDelay: 100,
 
-})(window, document);
+        columns: {
+          template: {
+            tooltipText: '',
+            fill: '#0000ff',
+          },
+          strokeOpacity: 0,
+        },
+      },
+    ],
+
+    cursor: {
+      type: 'XYCursor',
+      behavior: 'zoomY',
+    },
+  };
+
+  const XYChart = {
+    colors: {
+      saturation: 0.4,
+      list: ['#ff5722'],
+    },
+    data: [
+      {
+        country: 'USA',
+        visits: 3025,
+      },
+    ],
+    yAxes: [
+      {
+        type: 'ValueAxis',
+        renderer: {
+          maxLabelPosition: 0.98,
+        },
+      },
+    ],
+    xAxes: [
+      {
+        type: 'CategoryAxis',
+        renderer: {
+          minGridDistance: 20,
+          grid: {
+            location: 0,
+          },
+        },
+        dataFields: {
+          category: 'country',
+        },
+      },
+    ],
+    series: [
+      {
+        name: 'test name',
+        type: 'ColumnSeries',
+        dataFields: {
+          categoryX: 'country',
+          valueY: 'visits',
+        },
+        columns: {
+          template: {
+            tooltipText: '',
+            fill: '#0000ff',
+          },
+          strokeOpacity: 0,
+        },
+        defaultState: {
+          ransitionDuration: 1000,
+        },
+        sequencedInterpolation: !0,
+        sequencedInterpolationDelay: 100,
+      },
+    ],
+
+    cursor: {
+      type: 'XYCursor',
+      behavior: 'zoomX',
+    },
+  };
+
+  w.site = w.site || {};
+  w.site.create_chart = function (options) {
+    am4core.useTheme(am4themes_animated);
+
+    if (options.type == 'xy') {
+      XYChart.xAxes[0].dataFields.category = options.x;
+      XYChart.series[0].dataFields.categoryX = options.x;
+      XYChart.series[0].dataFields.valueY = options.y;
+      if (options.color) {
+        XYChart.colors.list[0] = options.color;
+      }
+
+      XYChart.data = options.data;
+      am4core.createFromConfig(XYChart, document.querySelector(options.selector), am4charts.XYChart);
+    } else if (options.type == 'yx') {
+      YXChart.yAxes[0].dataFields.category = options.y;
+      YXChart.series[0].dataFields.categoryY = options.y;
+      YXChart.series[0].dataFields.valueX = options.x;
+      if (options.color) {
+        YXChart.colors.list[0] = options.color;
+      }
+      YXChart.data = options.data;
+      am4core.createFromConfig(YXChart, document.querySelector(options.selector), am4charts.XYChart);
+    }
+  };
+})(window, document);

package/apps/client-side/site_files/css/bootstrap5-addon.css

@@ -42,6 +42,7 @@ body {
 }
 label {
   float: left;
+  color: var(--label-color);
 }
 .ar label {
   float: right;
@@ -66,7 +67,7 @@ fieldset legend {
   width: auto;
   padding: 5px;
 }
-.ar fieldset legend{
+.ar fieldset legend {
   float: right;
 }
 legend::after {
@@ -124,19 +125,30 @@ i-file button {
 i-upload {
   display: inline-block;
 }
-i-date .fa {
+i-date .left-10,
+i-datetime .left-10 {
+  margin-left: 10px;
+}
+i-date .fas,
+i-datetime .fas {
   font-size: 24px;
   vertical-align: middle;
   margin-top: 5px;
+  cursor: pointer;
+}
+i-date .fas:hover,
+i-datetime .fas:hover {
+  font-size: 26px;
 }
 i-date p,
 i-datetime p {
-  margin-top: 10px !important;
+  margin: 0 !important;
 }
-i-datetime.is-invalid .row {
-  border: 1px solid #dc3545 !important;
-  border-radius: 10px !important;
+i-date input,
+i-datetime input {
+  margin: 0 !important;
 }
+
 .modal-content {
   width: 75vw;
   height: 100vh;

package/apps/client-side/site_files/css/print.css

@@ -54,6 +54,7 @@ body.a4 {
 body.print-mode {
   padding: 0px !important;
   margin: 2mm !important;
+  display: contents;
 }
 body.print-mode .hide {
   visibility: visible;

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

@@ -0,0 +1,24 @@
+<div class="mb-3">
+  <label> {{label}} </label>
+  <div class="row" ng-hide="editOnly">
+    <p ng-click="editOnly = true" class="blue border padding pointer">
+      <span>{{model.selectedDay.name || '__'}} </span> / <span>{{model.selectedMonth.name || '______'}}</span> / <span>{{model.selectedYear.name || '____'}}</span> 
+    </p>
+  </div>
+  <div class="row dashed padding margin" ng-show="editOnly">
+    <div class="col3">
+      <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-search="$selectedMonth" ng-model="model.selectedMonth"></i-list>
+    </div>
+    <div class="col3">
+      <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">
+      <br />
+      <i-button type="save default" ng-click="updateDate()"></i-button>
+    </div>
+  </div>
+</div>

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

@@ -1,24 +1,28 @@
 <div class="mb-3">
-  <label> {{label}} </label>
+  <label for="{{id2}}" class="form-label"> <span class="red bold"> {{requird}} </span> {{label}}</label>
   <div class="row" ng-hide="editOnly">
-    <p ng-click="editOnly = true" class="blue border padding pointer">
-      <span>{{model.selectedDay.name || '__'}} </span> / <span>{{model.selectedMonth.name || '______'}}</span> / <span>{{model.selectedYear.name || '____'}}</span> 
+    <p ng-click="editOnly = true" class="blue bold border padding pointer">
+      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span> <span class="bold">{{model.selectedYear || '____'}}</span>
     </p>
   </div>
-  <div class="row dashed padding margin" ng-show="editOnly">
-    <div class="col3">
-      <i-list label="{{dayTitle}}" v="{{v}}" items="days" ng-search="$selectedDay" ng-model="model.selectedDay"></i-list>
+  <div class="row" ng-show="editOnly">
+    <div class="col10">
+      <input
+        id="{{id2}}"
+        ng-disabled="disabled"
+        autofocus
+        type="date"
+        ng-model="ngModel1"
+        ng-change="ngChange()"
+        ngKeydown="ngKeydown()"
+        class="form-control"
+        placeholder="{{placeholder}}"
+        aria-label="{{label}}"
+      />
     </div>
-    <div class="col4">
-      <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="$selectedYear" ng-model="model.selectedYear" active-value="model.activeYear"></i-list>
-    </div>
-
     <div class="col2">
-      <br />
-      <i-button type="save default" ng-click="updateDate()"></i-button>
+      <i class="fas fa-save" ng-click="updateDate()"></i>
     </div>
+    <div class="invalid-feedback"></div>
   </div>
 </div>

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

@@ -1,32 +1,21 @@
 <div class="mb-3">
-  <label> {{label}} </label>
+  <label for="{{id2}}" class="form-label"> <span class="red bold"> {{requird}} </span> {{label}}</label>
   <div class="row" ng-hide="editOnly">
-    <p ng-click="editOnly = true" class="blue border padding pointer">
-      <span>{{model.selectedDay.name || '__'}} </span> / <span>{{model.selectedMonth.name || '______'}}</span> / <span>{{model.selectedYear.name || '____'}}</span> <span class="bold green">{{model.selectedHour.name || '--'}} </span> :
-      <span class="bold green">{{model.selectedMinute.name || '--'}}</span>
+    <p ng-click="editOnly = true" class="blue  border padding pointer">
+      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span> <span class="bold">{{model.selectedYear || '____'}}</span>
+      <span class="black left-10"> ( </span> <span class="bold green">{{model.selectedHour || '__'}}</span> <span class="orange"> : </span> <span class="green bold">{{model.selectedMinute || '__'}} </span> <span class="black"> ) </span>
     </p>
   </div>
-  <div class="row dashed padding margin" ng-show="editOnly">
-    <div class="col2">
-      <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-search="$selectedMonth" ng-model="model.selectedMonth"></i-list>
+  <div class="row" ng-show="editOnly">
+    <div class="col6">
+      <input id="date_{{id2}}" ng-disabled="disabled" autofocus type="date" ng-model="ngModel1" class="form-control" aria-label="{{label}}" />
     </div>
-    <div class="col3">
-      <i-list label="{{yearTitle}}"  items="years" ng-search="$selectedYear" ng-model="model.selectedYear"></i-list>
+    <div class="col4">
+      <input id="time_{{id2}}" ng-disabled="disabled" autofocus min="00:00" max="23:59" type="time" ng-model="ngModel2" class="form-control" aria-label="{{label}}" />
     </div>
-
     <div class="col2">
-      <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-search="$selectedMinute" ng-model="model.selectedMinute"></i-list>
-    </div>
-    <div class="row">
-      <br />
-      <i-button type="save default" ng-click="updateDate()"></i-button>
+      <i class="fas fa-save" ng-click="updateDate()"></i>
     </div>
+    <div class="invalid-feedback"></div>
   </div>
-  <div class="invalid-feedback"></div>
 </div>