@magic-xpa/cli 4.1201.0 → 4.1201.1

package/templates/themes/material/radio.ejs

@@ -1,22 +1,22 @@
-<mat-radio-group
-        (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %>)"
-
-        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/id', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-
-        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
-        required
-        <% } %>
->
-    <mat-radio-button
-            *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>);"
-            [value] = "o.index"   >
-        {{o.displayValue}}
-    </mat-radio-button >
-
-</mat-radio-group>
-
-<% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
-  <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
-<% } %>
+<mat-radio-group
+        (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %>)"
+
+        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common/base/id', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+
+        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
+        required
+        <% } %>
+>
+    <mat-radio-button
+            *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>);"
+            [value] = "o.index"   >
+        {{o.displayValue}}
+    </mat-radio-button >
+
+</mat-radio-group>
+
+<% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
+  <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
+<% } %>

package/templates/themes/material/subform.ejs

@@ -1,8 +1,8 @@
-<% if(ctrl.props.is_router_outlet != null && ctrl.props.is_router_outlet == true){ %>
-<%- include('../router_outlet', {ctrl : ctrl}) %>
-<% } else { %>
-<mat-card <%- include('../../attributes/common/base/visible', {ctrl : ctrl}) %> >
-    <magic-subform <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %> >
-    </magic-subform>
-</mat-card>
-<% } %>
+<% if(ctrl.props.is_router_outlet != null && ctrl.props.is_router_outlet == true){ %>
+<%- include('../router_outlet', {ctrl : ctrl}) %>
+<% } else { %>
+<mat-card <%- include('../../attributes/common/base/visible', {ctrl : ctrl}) %> >
+    <magic-subform <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %> >
+    </magic-subform>
+</mat-card>
+<% } %>

package/templates/themes/material/tab.ejs

@@ -1,19 +1,19 @@
-<div <%- include('../../attributes/common/base/visible', {ctrl : ctrl})%>>
-
-<mat-tab-group <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-  (selectedTabChange)="task.mgOnTabSelectionChanged(<%- ctrl.props.enum_id %>, $event.index)"
-  [selectedIndex]="mg.getTabSelectedIndex(<%- ctrl.props.enum_id %>)"
->
-  <%# extra div to add the tab style%>
-  <mat-tab *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>)"
-    <% if (ctrl.props.enabled){ %>
-           [disabled]="mg.isDisabled(<%- ctrl.props.enum_id %>)"
-    <% } %>
-           [label]="mg.getTabpageText(<%- ctrl.props.enum_id %>, o.index)"
-  >
-  </mat-tab>
-</mat-tab-group>
-<%# add tab pages after adding the buttons, so the buttons are at the top%>
-<%- include(`../container`, {child: ctrl}) %>
-
- </div>
+<div <%- include('../../attributes/common/base/visible', {ctrl : ctrl})%>>
+
+<mat-tab-group <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+  (selectedTabChange)="task.mgOnTabSelectionChanged(<%- ctrl.props.enum_id %>, $event.index)"
+  [selectedIndex]="mg.getTabSelectedIndex(<%- ctrl.props.enum_id %>)"
+>
+  <%# extra div to add the tab style%>
+  <mat-tab *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>)"
+    <% if (ctrl.props.enabled){ %>
+           [disabled]="mg.isDisabled(<%- ctrl.props.enum_id %>)"
+    <% } %>
+           [label]="mg.getTabpageText(<%- ctrl.props.enum_id %>, o.index)"
+  >
+  </mat-tab>
+</mat-tab-group>
+<%# add tab pages after adding the buttons, so the buttons are at the top%>
+<%- include(`../container`, {child: ctrl}) %>
+
+ </div>

package/templates/themes/router_outlet.ejs

@@ -1,6 +1,6 @@
-<router-outlet <%- include('../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <% if(ctrl.props.default_outlet == null || !ctrl.props.default_outlet){ %>
-        name="<%= ctrl.props.id %>"
-        <% } %>
->
+<router-outlet <%- include('../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        <% if(ctrl.props.default_outlet == null || !ctrl.props.default_outlet){ %>
+        name="<%= ctrl.props.id %>"
+        <% } %>
+>
 </router-outlet>

package/templates/themes/table/HTMLTable/table.ejs

@@ -1,37 +1,37 @@
-<div
-     <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-     <% if(ctrl.props.scroll_bar) {%>
-        infiniteScroll
-        [infiniteScrollDistance]="2"
-        [infiniteScrollThrottle]="500"
-        (scrolled)="tableService.onScrollDown()"
-        [scrollWindow]="false"
-     <%}%>
->
-    <table>
-        <% if (ctrl.children) { %>
-            <% ctrl.children.forEach(child =>{ %>
-               <%- include(`./columnHeader`, {ctrl: child}) %>
-        <%})} %>
-
-        <%# pass on the no_modifiable_descendants flag to the columns %>
-        <% if (ctrl.props.no_modifiable_descendants && ctrl.children) { %>
-           <% ctrl.children.forEach(child =>{ %>
-              <% child.props.no_modifiable_descendants = ctrl.props.no_modifiable_descendants; %>
-        <%})} %>
-        <ng-container *ngFor="let row of task.Records.list">
-            <tr *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()"  id="row"
-                <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
-                   [formGroup]="mg.getFormGroupByRow(row.rowId)"
-                <%}%>
-                class="table_row"
-                [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}"
-                [class.selected]="tableService.getSelectedRow() === row.rowId"
-                (click)="tableService.selectRow(row.rowId)"
-                [magicRow]="row?.rowId"
-            >
-                <%- include(`../../container`, {ctrl: ctrl}) %>
-            </tr>
-        </ng-container>
-    </table>
-</div>
+<div
+     <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+     <% if(ctrl.props.scroll_bar) {%>
+        infiniteScroll
+        [infiniteScrollDistance]="2"
+        [infiniteScrollThrottle]="500"
+        (scrolled)="tableService.onScrollDown()"
+        [scrollWindow]="false"
+     <%}%>
+>
+    <table>
+        <% if (ctrl.children) { %>
+            <% ctrl.children.forEach(child =>{ %>
+               <%- include(`./columnHeader`, {ctrl: child}) %>
+        <%})} %>
+
+        <%# pass on the no_modifiable_descendants flag to the columns %>
+        <% if (ctrl.props.no_modifiable_descendants && ctrl.children) { %>
+           <% ctrl.children.forEach(child =>{ %>
+              <% child.props.no_modifiable_descendants = ctrl.props.no_modifiable_descendants; %>
+        <%})} %>
+        <ng-container *ngFor="let row of task.Records.list">
+            <tr *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()"  id="row"
+                <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
+                   [formGroup]="mg.getFormGroupByRow(row.rowId)"
+                <%}%>
+                class="table_row"
+                [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}"
+                [class.selected]="tableService.getSelectedRow() === row.rowId"
+                (click)="tableService.selectRow(row.rowId)"
+                [magicRow]="row?.rowId"
+            >
+                <%- include(`../../container`, {ctrl: ctrl}) %>
+            </tr>
+        </ng-container>
+    </table>
+</div>

package/templates/themes/table/grid/additionalComponentCode.ejs

@@ -1,26 +1,26 @@
-<%let table; -%>
-<%-initTable(ctrl); -%>
-<% if(table) { -%>                      <%# table was found - loop on columns and get their ids%>
-MgDisplayedColumns = [
-<%    table.children.forEach(child=> { -%>
-'<%= child.props.id %>',
-<%}) -%>
-];
-<%}-%>
-<%# function to look for and initialize the table variable %>
-<% function initTable (parent) {-%>
-<%_    if(parent.children){ -%>
-<%_         parent.children.forEach(child=> { -%>
-<%_            if(child.controlType === MgControlType.CTRL_TYPE_TABLE) { -%>
-<%_               table = child; -%>
-<%_               return;-%>
-<%_           }-%>
-<%_         }) -%>
-<%_       parent.children.forEach(child=> {-%>
-<%-            initTable(child);-%>
-<%            if(table !== "undefined") {-%>
-<%_                 return;-%>
-<%            }-%>
-<%         })-%>
-<%      } -%>
-<% } -%>
+<%let table; -%>
+<%-initTable(ctrl); -%>
+<% if(table) { -%>                      <%# table was found - loop on columns and get their ids%>
+MgDisplayedColumns = [
+<%    table.children.forEach(child=> { -%>
+'<%= child.props.id %>',
+<%}) -%>
+];
+<%}-%>
+<%# function to look for and initialize the table variable %>
+<% function initTable (parent) {-%>
+<%_    if(parent.children){ -%>
+<%_         parent.children.forEach(child=> { -%>
+<%_            if(child.controlType === MgControlType.CTRL_TYPE_TABLE) { -%>
+<%_               table = child; -%>
+<%_               return;-%>
+<%_           }-%>
+<%_         }) -%>
+<%_       parent.children.forEach(child=> {-%>
+<%-            initTable(child);-%>
+<%            if(table !== "undefined") {-%>
+<%_                 return;-%>
+<%            }-%>
+<%         })-%>
+<%      } -%>
+<% } -%>

package/templates/themes/table/grid/additionalIncludes.ejs

@@ -1 +1 @@
-import { BaseMatTableMagicComponent, matMagicProviders } from "@magic-xpa/angular-material-core";
+import { BaseMatTableMagicComponent, matMagicProviders } from "@magic-xpa/angular-material-core";

package/templates/themes/table/grid/table.ejs

@@ -1,37 +1,37 @@
-
-<div class="example-container mat-elevation-z8 <%- ctrl.props.id %>TableContainerProps"
-  <%- include('../../../attributes/common/base/visible', {ctrl : ctrl}) %>
-  <%- include('../../../attributes/common/base/tooltip', {ctrl : ctrl})%>
-  <%- include('../../../attributes/common/base/testingId', {ctrl : ctrl}) %>
-  <%- include('../../../attributes/common/base/control_type', {ctrl : ctrl}) %>
->
-  <mat-table #table [dataSource]="dataSource"
-    <%- include('../../../attributes/common/base/class', {ctrl : ctrl})%>
-             matSort
-             matSortDisableClear
-             (matSortChange)="tableService.sortData($event)"
-  >
-
-    <%- include(`../../container`, {ctrl: ctrl}) %>
-
-    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
-    <mat-row *matRowDef="let row; columns: displayedColumns;"
-             class="table_row"
-             [ngClass]="{ 'selected': selection.isSelected(row)}" [magicRow]="row?.rowId"
-      <% if(magicConfig.allow_testing) { %>
-             MgControlType="MgRow"
-      <% } %>
-      <% if(ctrl.style && ctrl.style.line_divider && ctrl.style.line_divider.has_exp) { %>
-             [ngStyle]="{'border-bottom-style': mg.getStyle(<%- ctrl.props.enum_id %>, magicProperties.LineDivider)}"
-      <%}%>
-             (click)="row? tableService.selectRow(row.rowId) : null"
-    >
-    </mat-row>
-  </mat-table>
-  <mat-paginator #paginator
-                 [pageSize]="10"
-                 [pageSizeOptions]="[5, 10, 20]"
-                 (page)="tableService.mgOnPaginateChange($event)"
-  >
-  </mat-paginator>
-</div>
+
+<div class="example-container mat-elevation-z8 <%- ctrl.props.id %>TableContainerProps"
+  <%- include('../../../attributes/common/base/visible', {ctrl : ctrl}) %>
+  <%- include('../../../attributes/common/base/tooltip', {ctrl : ctrl})%>
+  <%- include('../../../attributes/common/base/testingId', {ctrl : ctrl}) %>
+  <%- include('../../../attributes/common/base/control_type', {ctrl : ctrl}) %>
+>
+  <mat-table #table [dataSource]="dataSource"
+    <%- include('../../../attributes/common/base/class', {ctrl : ctrl})%>
+             matSort
+             matSortDisableClear
+             (matSortChange)="tableService.sortData($event)"
+  >
+
+    <%- include(`../../container`, {ctrl: ctrl}) %>
+
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"
+             class="table_row"
+             [ngClass]="{ 'selected': selection.isSelected(row)}" [magicRow]="row?.rowId"
+      <% if(magicConfig.allow_testing) { %>
+             MgControlType="MgRow"
+      <% } %>
+      <% if(ctrl.style && ctrl.style.line_divider && ctrl.style.line_divider.has_exp) { %>
+             [ngStyle]="{'border-bottom-style': mg.getStyle(<%- ctrl.props.enum_id %>, magicProperties.LineDivider)}"
+      <%}%>
+             (click)="row? tableService.selectRow(row.rowId) : null"
+    >
+    </mat-row>
+  </mat-table>
+  <mat-paginator #paginator
+                 [pageSize]="10"
+                 [pageSizeOptions]="[5, 10, 20]"
+                 (page)="tableService.mgOnPaginateChange($event)"
+  >
+  </mat-paginator>
+</div>

package/templates/themes/table/repeatable/column.ejs

@@ -1,11 +1,11 @@
-<div
-    <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        style="display: flex; flex-direction: column"
-        [magicRow]="row?.rowId"
-        <% if(magicConfig.allow_testing) { %>
-            MgControlType="MgCell"
-        <% } %>
->
-    <%- include(`../../container`, {ctrl: ctrl}) %>
-
-</div>
+<div
+    <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        style="display: flex; flex-direction: column"
+        [magicRow]="row?.rowId"
+        <% if(magicConfig.allow_testing) { %>
+            MgControlType="MgCell"
+        <% } %>
+>
+    <%- include(`../../container`, {ctrl: ctrl}) %>
+
+</div>

package/templates/themes/table/repeatable/table.ejs

@@ -1,28 +1,28 @@
-
-<div
-        <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <% if(ctrl.props.scroll_bar) {%>
-     infiniteScroll
-     [infiniteScrollDistance]="2"
-     [infiniteScrollThrottle]="500"
-     (scrolled)="tableService.onScrollDown()"
-     [scrollWindow]="false"
-        <%}%>
->
-    <div *ngFor="let row of task.Records.list">
-        <div *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()" id="row"
-                <% if(magicConfig.allow_testing) { %>
-             MgControlType="MgRow"
-                <% } %>
-             class="table_row"
-             <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
-                [formGroup]="mg.getFormGroupByRow(row.rowId)"
-             <%}%>
-             [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}"
-             [class.selected]="tableService.getSelectedRow() === row.rowId"
-             (click)="tableService.selectRow(row.rowId)"
-             [magicRow]="row?.rowId">
-            <%- include(`../../container`, {ctrl: ctrl}) %>
-        </div>
-    </div>
-</div>
+
+<div
+        <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        <% if(ctrl.props.scroll_bar) {%>
+     infiniteScroll
+     [infiniteScrollDistance]="2"
+     [infiniteScrollThrottle]="500"
+     (scrolled)="tableService.onScrollDown()"
+     [scrollWindow]="false"
+        <%}%>
+>
+    <div *ngFor="let row of task.Records.list">
+        <div *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()" id="row"
+                <% if(magicConfig.allow_testing) { %>
+             MgControlType="MgRow"
+                <% } %>
+             class="table_row"
+             <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
+                [formGroup]="mg.getFormGroupByRow(row.rowId)"
+             <%}%>
+             [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}"
+             [class.selected]="tableService.getSelectedRow() === row.rowId"
+             (click)="tableService.selectRow(row.rowId)"
+             [magicRow]="row?.rowId">
+            <%- include(`../../container`, {ctrl: ctrl}) %>
+        </div>
+    </div>
+</div>

package/templates/themes/tableTypeSelector.ejs

@@ -1,21 +1,21 @@
-<% switch (ctrl.controlType){
-    case MgControlType.CTRL_TYPE_TABLE: %>
-    <% if (ctrl.props.web_style)%>
-            <% if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.RepeatableItems){ %>
-                <%- include(`./table/repeatable/table`, {ctrl: ctrl}) %>
-            <% } else if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.HTMLTable) {%>
-                <%- include(`./table/HTMLTable/table`, {ctrl: ctrl}) %>
-            <% } else {%>
-                <%- include(`./table/grid/table`, {ctrl: ctrl}) %>
-            <%}%>
-        <% break
-    case MgControlType.CTRL_TYPE_COLUMN: %>
-        <% if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.RepeatableItems) { %>
-            <%- include(`./table/repeatable/column`, {ctrl: ctrl}) %>
-        <% } else if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.HTMLTable){%>
-            <%- include(`./table/HTMLTable/column`, {ctrl: ctrl}) %>
-        <% } else {%>
-            <%- include(`./table/grid/column`, {ctrl: ctrl}) %>
-        <%}%>
-        <% break
-}%>
+<% switch (ctrl.controlType){
+    case MgControlType.CTRL_TYPE_TABLE: %>
+    <% if (ctrl.props.web_style)%>
+            <% if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.RepeatableItems){ %>
+                <%- include(`./table/repeatable/table`, {ctrl: ctrl}) %>
+            <% } else if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.HTMLTable) {%>
+                <%- include(`./table/HTMLTable/table`, {ctrl: ctrl}) %>
+            <% } else {%>
+                <%- include(`./table/grid/table`, {ctrl: ctrl}) %>
+            <%}%>
+        <% break
+    case MgControlType.CTRL_TYPE_COLUMN: %>
+        <% if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.RepeatableItems) { %>
+            <%- include(`./table/repeatable/column`, {ctrl: ctrl}) %>
+        <% } else if (typeof ctrl.props.web_style !== "undefined" && ctrl.props.web_style === TableWebStyle.HTMLTable){%>
+            <%- include(`./table/HTMLTable/column`, {ctrl: ctrl}) %>
+        <% } else {%>
+            <%- include(`./table/grid/column`, {ctrl: ctrl}) %>
+        <%}%>
+        <% break
+}%>

package/tsconfig.json

@@ -1,36 +1,36 @@
-{
-  "compilerOptions": {
-    "outDir": ".",
-    "baseUrl":".",
-
-    "target": "es6",
-    "module": "commonjs",
-    "moduleResolution": "node",
-
-    "noEmitOnError"       : false,
-    "skipLibCheck"        : true,
-
-    "declaration"         : true,
-    "sourceMap"           : true,
-    "inlineSources"       : true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers"       : true,
-    "types": [
-      "jasmine",
-      "node"
-    ],
-    "lib": [
-      "dom",
-      "es2017"
-    ]
-  },
-  "exclude": [
-    "templates/**",
-    "src/schematics/*/files/**/*",
-    "**/*.spec.ts",
-    "*/files/**/*",
-    "src/schematics/*/webModule/**/*",
-    "*/webModule/**/*"
-  ]
-}
+{
+  "compilerOptions": {
+    "outDir": ".",
+    "baseUrl":".",
+
+    "target": "es6",
+    "module": "commonjs",
+    "moduleResolution": "node",
+
+    "noEmitOnError"       : false,
+    "skipLibCheck"        : true,
+
+    "declaration"         : true,
+    "sourceMap"           : true,
+    "inlineSources"       : true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers"       : true,
+    "types": [
+      "jasmine",
+      "node"
+    ],
+    "lib": [
+      "dom",
+      "es2017"
+    ]
+  },
+  "exclude": [
+    "templates/**",
+    "src/schematics/*/files/**/*",
+    "**/*.spec.ts",
+    "*/files/**/*",
+    "src/schematics/*/webModule/**/*",
+    "*/webModule/**/*"
+  ]
+}