@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

package/templates/attributes/common/input/multiline_edit.ejs

@@ -1,3 +1,3 @@
-<% if (ctrl.props.multiline_edit){ %>
-<% } %>
-
+<% if (ctrl.props.multiline_edit){ %>
+<% } %>
+

package/templates/attributes/common/input/must_input.ejs

@@ -1,8 +1,8 @@
-<% if (ctrl.props.must_input && ctrl.props.must_input.has_exp){ %>
-[required]="mg.getMustInput(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<%}%>)"
-<% } %>
-
-<% if (ctrl.props.password_edit && !ctrl.props.password_edit.has_exp){ %>
-[attr.required]="<%=ctrl.props.password_edit.value ? 'true' : null%>"
-<% } %>
-
+<% if (ctrl.props.must_input && ctrl.props.must_input.has_exp){ %>
+[required]="mg.getMustInput(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<%}%>)"
+<% } %>
+
+<% if (ctrl.props.password_edit && !ctrl.props.password_edit.has_exp){ %>
+[attr.required]="<%=ctrl.props.password_edit.value ? 'true' : null%>"
+<% } %>
+

package/templates/attributes/common/input/password_edit.ejs

@@ -1,7 +1,7 @@
-<% if (ctrl.props.password_edit && !(ctrl.style && ctrl.style.multiline_edit)) { %>
-    <% if (ctrl.props.password_edit.has_exp){ %>
-        [type]="mg.getType(<%= ctrl.props.enum_id %>)"
-    <% } else { %>
-        type="password"
-    <% } %>
-<% } %>
+<% if (ctrl.props.password_edit && !(ctrl.style && ctrl.style.multiline_edit)) { %>
+    <% if (ctrl.props.password_edit.has_exp){ %>
+        [type]="mg.getType(<%= ctrl.props.enum_id %>)"
+    <% } else { %>
+        type="password"
+    <% } %>
+<% } %>

package/templates/attributes/common/input/row_editing_input_attributes.ejs

@@ -1,6 +1,6 @@
-<% if ( child.props.is_table_child ) {%>
-<%# display attribute for if row editing %>
-<%# need to be check if row is editing now and then add InputPropsForRowEditing and set readonly  %>
-[ngClass]="mg.isRowInRowEditing(row) ? 'InputPropsForRowEditing' : 'hidden_border'"
-[readonly]="!mg.isRowInRowEditing(row)"
-<%}%>
+<% if ( child.props.is_table_child ) {%>
+<%# display attribute for if row editing %>
+<%# need to be check if row is editing now and then add InputPropsForRowEditing and set readonly  %>
+[ngClass]="mg.isRowInRowEditing(row) ? 'InputPropsForRowEditing' : 'hidden_border'"
+[readonly]="!mg.isRowInRowEditing(row)"
+<%}%>

package/templates/attributes/common/input/validation.ejs

@@ -1,5 +1,5 @@
-<% if(ctrl.props.is_table_child){ %>
-<mgError [magic]=<%- ctrl.props.directive_id %> [rowId]="row.rowId"> </mgError>
-<% } else { %>
-<mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
-<% } %>
+<% if(ctrl.props.is_table_child){ %>
+<mgError [magic]=<%- ctrl.props.directive_id %> [rowId]="row.rowId"> </mgError>
+<% } else { %>
+<mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
+<% } %>

package/templates/attributes/common/input_attributes.ejs

@@ -1,4 +1,4 @@
-<%- include('./input/multiline_edit', {ctrl : ctrl})%>
-<%- include('./input/must_input', {ctrl : ctrl})%>
-<%- include('./input/password_edit', {ctrl : ctrl})%>
-<%- include('./input/hint', {ctrl : ctrl})%>
+<%- include('./input/multiline_edit', {ctrl : ctrl})%>
+<%- include('./input/must_input', {ctrl : ctrl})%>
+<%- include('./input/password_edit', {ctrl : ctrl})%>
+<%- include('./input/hint', {ctrl : ctrl})%>

package/templates/attributes/common/no_control_base_attributes.ejs

@@ -1,4 +1,4 @@
-<%- include('./base/no_control_id', {ctrl : ctrl})%>
-<%- include('./base/no_control_class', {ctrl : ctrl})%>
-
-
+<%- include('./base/no_control_id', {ctrl : ctrl})%>
+<%- include('./base/no_control_class', {ctrl : ctrl})%>
+
+

package/templates/attributes/common/row_editing_button_attributes.ejs

@@ -1,10 +1,10 @@
-<% if (ctrl.props.is_table_child && ctrl.controlType === MgControlType.CTRL_TYPE_BUTTON) {%>
-  <% if ( ctrl.props.row_editing_type && ctrl.props.row_editing_type !== RowEditingTypes.NoneRowEditing) {%>
-    <% if ( ctrl.props.row_editing_type === RowEditingTypes.EnterRowEditing) {%>
-      *ngIf="!mg.isRowInRowEditing(row)"
-    <%}%>
-    <% if ( ctrl.props.row_editing_type === RowEditingTypes.SaveRowEditing || ctrl.props.row_editing_type === RowEditingTypes.CancelRowEditing) {%>
-*ngIf="mg.isRowInRowEditing(row)"
-<%}%>
-  <%}%>
-<%}%>
+<% if (ctrl.props.is_table_child && ctrl.controlType === MgControlType.CTRL_TYPE_BUTTON) {%>
+  <% if ( ctrl.props.row_editing_type && ctrl.props.row_editing_type !== RowEditingTypes.NoneRowEditing) {%>
+    <% if ( ctrl.props.row_editing_type === RowEditingTypes.EnterRowEditing) {%>
+      *ngIf="!mg.isRowInRowEditing(row)"
+    <%}%>
+    <% if ( ctrl.props.row_editing_type === RowEditingTypes.SaveRowEditing || ctrl.props.row_editing_type === RowEditingTypes.CancelRowEditing) {%>
+*ngIf="mg.isRowInRowEditing(row)"
+<%}%>
+  <%}%>
+<%}%>

package/templates/component/view.component.html

@@ -1,14 +1,14 @@
-<div novalidate [formGroup]="screenFormGroup">
-	<div style="display: flex; flex-direction: column"
-
-  <%- include(`../themes/helperProperties`, {ctrl: ctrl}) %>
-
-  <% if(magicConfig.exposed_functionality) { %>
-	  <%- include('../attributes/common/base_attributes', {ctrl : ctrl, app:app}) %>
-	<% } else { %>
-		<%- include('../attributes/common/no_control_base_attributes', {ctrl : ctrl, app:app}) %>
-	<%}%>
-	>
-		<%- include('../themes/container', {ctrl: ctrl, app:app }) %>
-	</div>
-</div>
+<div novalidate [formGroup]="screenFormGroup">
+	<div style="display: flex; flex-direction: column"
+
+  <%- include(`../themes/helperProperties`, {ctrl: ctrl}) %>
+
+  <% if(magicConfig.exposed_functionality) { %>
+	  <%- include('../attributes/common/base_attributes', {ctrl : ctrl, app:app}) %>
+	<% } else { %>
+		<%- include('../attributes/common/no_control_base_attributes', {ctrl : ctrl, app:app}) %>
+	<%}%>
+	>
+		<%- include('../themes/container', {ctrl: ctrl, app:app }) %>
+	</div>
+</div>

package/templates/component/view.component.ts

@@ -1,122 +1,123 @@
-<%
-var
-   id = ctrl.props.id,
-   selector = app.suffix + '-' + id,
-   useMatGrid  = false;
-   isModal = (ctrl.props.window_type && ctrl.props.window_type == WindowType.Overlay);
-%>
-<%= isUsingMatGrid(ctrl, theme); %>
-
-import {Component} from '@angular/core';
-<% if(!magicConfig.no_controls_accessor) { %>
-import {  FormGroup } from "@angular/forms";
-
-import { MgFormControlsAccessor, MgControlName, MgCustomProperties} from "./<%- id %>.mg.controls.g";
-<% if(useMatGrid) { -%>
-import { MgDisplayedColumns} from "./<%- id %>.mg.controls.g";
-<%}-%>
-<%}%>
-
-<% if(useMatGrid) { %>
-    <%- include(`../themes/table/grid/additionalIncludes`) %>
- <% } else {%>
-  import {TaskBaseMagicComponent, magicProviders} from  "@magic-xpa/angular";
-<%}%>
-<% if(isModal) { %>
-  import {MagicModalInterface} from  "@magic-xpa/angular";
-<%}%>
-
-@Component({
-    selector: '<%= selector %>',
-    providers: [... <% if(useMatGrid) { %>  matMagicProviders <% } else {%> magicProviders     <%}%> ],
-    templateUrl: './<%- id %>.component.html'
-})
-
-export class <%- id %> extends <% if(useMatGrid) { %>  BaseMatTableMagicComponent <% } else {%> TaskBaseMagicComponent     <%}%> <% if(isModal) { %> implements MagicModalInterface <% }%>
-
-{
-  <% if(!magicConfig.no_controls_accessor) { %>
-  mgc = MgControlName;
-  mgcp = MgCustomProperties;
-  mgfc!: MgFormControlsAccessor;
-
-  <% if(useMatGrid) { -%>
-  mgdp= MgDisplayedColumns;
-  <%}-%>
-
-
-  override createFormControlsAccessor(formGroup: FormGroup)
-  {
-    this.mgfc = new MgFormControlsAccessor(formGroup, this.magicServices);
-  }
-  <%}-%>
-
-  <% if(isModal) { -%>
-    private static readonly formName: string = "<%- id %>";
-    private static readonly showTitleBar: boolean = true;
-    private static readonly x: number = 0;
-    private static readonly y: number = 0;
-    private static readonly width: string = "300px";
-    private static readonly height: string = "300px";
-    private static readonly isCenteredToWindow: boolean = true;
-    private static readonly shouldCloseOnBackgroundClick = true;
-
-    X() {
-        return <%- id %>.x;
-    }
-
-    Y() {
-        return <%- id %>.y;
-    }
-
-    Width(): string {
-        return <%- id %>.width;
-    }
-
-    Height(): string {
-        return <%- id %>.height;
-    }
-
-    IsCenteredToWindow() {
-        return <%- id %>.isCenteredToWindow;
-    }
-
-    FormName() {
-        return <%- id %>.formName;
-    }
-
-    ShowTitleBar() {
-        return <%- id %>.showTitleBar;
-    }
-
-    ShouldCloseOnBackgroundClick() {
-      return <%- id %>.shouldCloseOnBackgroundClick;
-    }
-    <%}-%>
-    <% if(useMatGrid) { -%>
-    override displayedColumns = this.mgdp;
-    <%}-%>
-}
-
-
-<%# A function used to decide if we need to use the material theme code or the basic HTML code.
-material code is needed if we are in material design theme or if we have a table with the MatGrid style %>
-<% function isUsingMatGrid(parent, theme) {                             %>
-<%   if(parent.children){                                                          %>
-<%       parent.children.forEach(child=> {                                         %>
-<%           if(child.controlType === MgControlType.CTRL_TYPE_TABLE) {             %>
-<%               if(typeof child.props.web_style === "undefined" ||
-                     child.props.web_style === TableWebStyle.MatGrid) {            %>
-<%                    useMatGrid = true;                                          %>
-<%                    return;                                                      %>
-<%               }                                                                 %>
-<%           }                                                                     %>
-<%       })                                                                        %>
-
-<%        parent.children.forEach(child=> {                                        %>
-<%            isUsingMatGrid(child);                                    %>
-<%            if(useMatGrid);                                                     %>
-<%                 return;                                                         %>
-<%         })                                                                      %>
-<%     }                                                                           %>
-<% }                                                                               %>
+<%
+var
+   id = ctrl.props.id,
+   uniqueComponent = ctrl.props.component_uniquename,
+   selector = app.suffix + '-' + uniqueComponent,
+   useMatGrid  = false;
+   isModal = (ctrl.props.window_type && ctrl.props.window_type == WindowType.Overlay);
+%>
+<%= isUsingMatGrid(ctrl, theme); %>
+
+import {Component} from '@angular/core';
+<% if(!magicConfig.no_controls_accessor) { %>
+import {  FormGroup } from "@angular/forms";
+
+import { MgFormControlsAccessor, MgControlName, MgCustomProperties} from "./<%- id %>.mg.controls.g";
+<% if(useMatGrid) { -%>
+import { MgDisplayedColumns} from "./<%- id %>.mg.controls.g";
+<%}-%>
+<%}%>
+
+<% if(useMatGrid) { %>
+    <%- include(`../themes/table/grid/additionalIncludes`) %>
+ <% } else {%>
+  import {TaskBaseMagicComponent, magicProviders} from  "@magic-xpa/angular";
+<%}%>
+<% if(isModal) { %>
+  import {MagicModalInterface} from  "@magic-xpa/angular";
+<%}%>
+
+@Component({
+    selector: '<%= selector %>',
+    providers: [... <% if(useMatGrid) { %>  matMagicProviders <% } else {%> magicProviders     <%}%> ],
+    templateUrl: './<%- id %>.component.html'
+})
+
+export class <%- id %> extends <% if(useMatGrid) { %>  BaseMatTableMagicComponent <% } else {%> TaskBaseMagicComponent     <%}%> <% if(isModal) { %> implements MagicModalInterface <% }%>
+
+{
+  <% if(!magicConfig.no_controls_accessor) { %>
+  mgc = MgControlName;
+  mgcp = MgCustomProperties;
+  mgfc!: MgFormControlsAccessor;
+
+  <% if(useMatGrid) { -%>
+  mgdp= MgDisplayedColumns;
+  <%}-%>
+
+
+  override createFormControlsAccessor(formGroup: FormGroup)
+  {
+    this.mgfc = new MgFormControlsAccessor(formGroup, this.magicServices);
+  }
+  <%}-%>
+
+  <% if(isModal) { -%>
+    private static readonly formName: string = "<%- id %>";
+    private static readonly showTitleBar: boolean = true;
+    private static readonly x: number = 0;
+    private static readonly y: number = 0;
+    private static readonly width: string = "300px";
+    private static readonly height: string = "300px";
+    private static readonly isCenteredToWindow: boolean = true;
+    private static readonly shouldCloseOnBackgroundClick = true;
+
+    X() {
+        return <%- id %>.x;
+    }
+
+    Y() {
+        return <%- id %>.y;
+    }
+
+    Width(): string {
+        return <%- id %>.width;
+    }
+
+    Height(): string {
+        return <%- id %>.height;
+    }
+
+    IsCenteredToWindow() {
+        return <%- id %>.isCenteredToWindow;
+    }
+
+    FormName() {
+        return <%- id %>.formName;
+    }
+
+    ShowTitleBar() {
+        return <%- id %>.showTitleBar;
+    }
+
+    ShouldCloseOnBackgroundClick() {
+      return <%- id %>.shouldCloseOnBackgroundClick;
+    }
+    <%}-%>
+    <% if(useMatGrid) { -%>
+    override displayedColumns = this.mgdp;
+    <%}-%>
+}
+
+
+<%# A function used to decide if we need to use the material theme code or the basic HTML code.
+material code is needed if we are in material design theme or if we have a table with the MatGrid style %>
+<% function isUsingMatGrid(parent, theme) {                             %>
+<%   if(parent.children){                                                          %>
+<%       parent.children.forEach(child=> {                                         %>
+<%           if(child.controlType === MgControlType.CTRL_TYPE_TABLE) {             %>
+<%               if(typeof child.props.web_style === "undefined" ||
+                     child.props.web_style === TableWebStyle.MatGrid) {            %>
+<%                    useMatGrid = true;                                          %>
+<%                    return;                                                      %>
+<%               }                                                                 %>
+<%           }                                                                     %>
+<%       })                                                                        %>
+
+<%        parent.children.forEach(child=> {                                        %>
+<%            isUsingMatGrid(child);                                    %>
+<%            if(useMatGrid);                                                     %>
+<%                 return;                                                         %>
+<%         })                                                                      %>
+<%     }                                                                           %>
+<% }                                                                               %>

package/templates/themes/basicHTML/Code/theme.module.ts

@@ -1,10 +1,10 @@
-import {NgModule} from "@angular/core";
-
-@NgModule({
-})
-
-export class ThemeModule
-{
-    constructor() {}
-   static openEditDialog(dialog:any, dim: any, val:any, cb: any){}
-}
+import {NgModule} from "@angular/core";
+
+@NgModule({
+})
+
+export class ThemeModule
+{
+    constructor() {}
+   static openEditDialog(dialog:any, dim: any, val:any, cb: any){}
+}

package/templates/themes/basicHTML/checkbox.ejs

@@ -22,7 +22,7 @@
       <%if(ctrl.props.text.has_exp) { %>
       {{mg.getText(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
       <% } else {%>
-      <%=ctrl.props.text%>
+        <%- ctrl.props.text.replace(/@/g, '&#64;') %>
       <%}%>
       <% } %>
     </label>

package/templates/themes/basicHTML/combobox.ejs

@@ -1,37 +1,37 @@
-<div
-  <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
-  [formGroup]="mg.getFormGroupByRow(row.rowId)"
-  <%}%>
->
-
-  <%# show combo box in table only while we on row edit  %>
-  <% if (ctrl.props.is_table_child) { %>
-  <div *ngIf="mg.isRowInRowEditing(row)">
-    <%}%>
-        <select
-                <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-                <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
-        >
-            <option
-                    *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>);"
-                    [selected]="o.index == mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
-                    [value] = "o.index"
-            >
-                {{o.displayValue}}
-            </option>
-        </select>
-            <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
-    <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
-            <%}%>
-  <% if (ctrl.props.is_table_child) { %>
-     </div>
-
-     <%# show lable in table only while we on row read only  %>
-     <div *ngIf="!mg.isRowInRowEditing(row)">
-          <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
-          {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
-          </label>
-     </div>
-  <%}%>
-</div>
+<div
+  <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
+  [formGroup]="mg.getFormGroupByRow(row.rowId)"
+  <%}%>
+>
+
+  <%# show combo box in table only while we on row edit  %>
+  <% if (ctrl.props.is_table_child) { %>
+  <div *ngIf="mg.isRowInRowEditing(row)">
+    <%}%>
+        <select
+                <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+                <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+                <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+        >
+            <option
+                    *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>);"
+                    [selected]="o.index == mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
+                    [value] = "o.index"
+            >
+                {{o.displayValue}}
+            </option>
+        </select>
+            <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
+    <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
+            <%}%>
+  <% if (ctrl.props.is_table_child) { %>
+     </div>
+
+     <%# show lable in table only while we on row read only  %>
+     <div *ngIf="!mg.isRowInRowEditing(row)">
+          <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+          {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
+          </label>
+     </div>
+  <%}%>
+</div>