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

package/templates/themes/basicHTML/tabpage.ejs

@@ -1,5 +1,5 @@
-<div class="tab_content"
-     [style.display]="mg.isTabPageLayerSelected(<%- ctrl.props.enum_id %>, <%-ctrl.props.layer %>) ? 'flex' : 'none' "
-      style="flex-direction: column">
-    <%- include(`../container`, {ctrl: ctrl }) %>
-</div>
+<div class="tab_content"
+     [style.display]="mg.isTabPageLayerSelected(<%- ctrl.props.enum_id %>, <%-ctrl.props.layer %>) ? 'flex' : 'none' "
+      style="flex-direction: column">
+    <%- include(`../container`, {ctrl: ctrl }) %>
+</div>

package/templates/themes/basicHiddenHTML/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/basicHiddenHTML/combobox.ejs

@@ -1,5 +1,5 @@
-<select
-        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
-      
->
-</select>
+<select
+        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+      
+>
+</select>

package/templates/themes/basicHiddenHTML/form.ejs

@@ -1,3 +1,3 @@
-<form
-        <%- include('../attibutes/no_control_base_attributes', {ctrl : ctrl}) %>
-></form>
+<form
+        <%- include('../attibutes/no_control_base_attributes', {ctrl : ctrl}) %>
+></form>

package/templates/themes/basicHiddenHTML/group.ejs

@@ -1,3 +1,3 @@
-<div <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
-    <%- include(`../container`, {ctrl: ctrl}) %>
+<div <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
+    <%- include(`../container`, {ctrl: ctrl}) %>
 </div>

package/templates/themes/basicHiddenHTML/image.ejs

@@ -1,5 +1,5 @@
-
-<div >
-    <img <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
-    />
+
+<div >
+    <img <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+    />
 </div>

package/templates/themes/basicHiddenHTML/label.ejs

@@ -1,2 +1,2 @@
-<label <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
+<label <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
 </label>

package/templates/themes/basicHiddenHTML/listbox.ejs

@@ -1,8 +1,8 @@
-<select
-        <%# attributes of the listbox itself %>
-        multiple
-        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
->
-
-</select>
+<select
+        <%# attributes of the listbox itself %>
+        multiple
+        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+>
+
+</select>

package/templates/themes/basicHiddenHTML/push-button.ejs

@@ -1,26 +1,26 @@
-
-
-<% if (ctrl.props.button_style && ctrl.props.button_style != CtrlButtonTypeGui.Push) {%>
-<%# if button has a style, it is not a pushbutton%>
-    <% switch ((ctrl.props.button_style)) {
-        case CtrlButtonTypeGui.Image : %>
-            <input
-                    type="button"
-                    <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
-            />
-        <% break;
-
-        case CtrlButtonTypeGui.Hypertext : %>
-            <a  href="#" <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
-            </a>
-
-        <% break;
-
-    } %>
-
-<% } else {%> <%# button is a pushbutton %>
-    <button
-        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %> >
-    </button>
-<% } %>%>
-
+
+
+<% if (ctrl.props.button_style && ctrl.props.button_style != CtrlButtonTypeGui.Push) {%>
+<%# if button has a style, it is not a pushbutton%>
+    <% switch ((ctrl.props.button_style)) {
+        case CtrlButtonTypeGui.Image : %>
+            <input
+                    type="button"
+                    <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+            />
+        <% break;
+
+        case CtrlButtonTypeGui.Hypertext : %>
+            <a  href="#" <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>>
+            </a>
+
+        <% break;
+
+    } %>
+
+<% } else {%> <%# button is a pushbutton %>
+    <button
+        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %> >
+    </button>
+<% } %>%>
+

package/templates/themes/basicHiddenHTML/radio.ejs

@@ -1,17 +1,17 @@
-<div
-        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
-        magicMark="magicRadio"
->
-    <div
-            *ngFor="let o of mgGetListboxValues(<%-ctrl.props.enum_id%>);">
-        <label>
-            <input
-                    type="radio"
-                    <%- include('../../attributes/common/base/no_control_id', {ctrl : ctrl}) %>
-                    <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                    [value] = "o.index"
-            />
-            {{o.displayValue}}
-        </label>
-    </div>
-</div>
+<div
+        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+        magicMark="magicRadio"
+>
+    <div
+            *ngFor="let o of mgGetListboxValues(<%-ctrl.props.enum_id%>);">
+        <label>
+            <input
+                    type="radio"
+                    <%- include('../../attributes/common/base/no_control_id', {ctrl : ctrl}) %>
+                    <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+                    [value] = "o.index"
+            />
+            {{o.displayValue}}
+        </label>
+    </div>
+</div>

package/templates/themes/basicHiddenHTML/tab.ejs

@@ -1,13 +1,13 @@
-<div
-        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
->
-<div class="tab_control" magicMark="magicTabControl">                       <%# extra div to add the tab style%>
-    <%# add buttons for each tab page%>
-<% ctrl.children.forEach(child =>{ %>
-    <button class="tab_button" layer=<%-child.props.layer%>></button>
-<%   } ) %>
-<%# add tab pages%>
-<%- include(`../container`, {child: ctrl}) %>
-</div>
-</div>
-
+<div
+        <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
+>
+<div class="tab_control" magicMark="magicTabControl">                       <%# extra div to add the tab style%>
+    <%# add buttons for each tab page%>
+<% ctrl.children.forEach(child =>{ %>
+    <button class="tab_button" layer=<%-child.props.layer%>></button>
+<%   } ) %>
+<%# add tab pages%>
+<%- include(`../container`, {child: ctrl}) %>
+</div>
+</div>
+

package/templates/themes/basicHiddenHTML/table.ejs

@@ -1,18 +1,18 @@
-
-<div
-        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-     infinite-scroll
-     [infiniteScrollDistance]="2"
-     [infiniteScrollThrottle]="500"
-     (scrolled)="tableService.onScrollDown()"
-     [scrollWindow]="false"
->
-    <div *ngFor="let row of task.Records.list">
-        <div *ngIf="mg.ifRowCreated(row)" id="row">
-            <form [formGroup]="mg.getFormGroupByRow(row.rowId)" class="table_row"
-                  [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}">
-                <%- include(`../container`, {ctrl: ctrl}) %>
-            </form>
-        </div>
-    </div>
-</div>
+
+<div
+        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+     infinite-scroll
+     [infiniteScrollDistance]="2"
+     [infiniteScrollThrottle]="500"
+     (scrolled)="tableService.onScrollDown()"
+     [scrollWindow]="false"
+>
+    <div *ngFor="let row of task.Records.list">
+        <div *ngIf="mg.ifRowCreated(row)" id="row">
+            <form [formGroup]="mg.getFormGroupByRow(row.rowId)" class="table_row"
+                  [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}">
+                <%- include(`../container`, {ctrl: ctrl}) %>
+            </form>
+        </div>
+    </div>
+</div>

package/templates/themes/basicHiddenHTML/tabpage.ejs

@@ -1,3 +1,3 @@
-<div class="tab_content" layer=<%-ctrl.props.layer%> >
-    <%- include(`../container`, {ctrl: ctrl }) %>
+<div class="tab_content" layer=<%-ctrl.props.layer%> >
+    <%- include(`../container`, {ctrl: ctrl }) %>
 </div>

package/templates/themes/container.ejs

@@ -1,26 +1,26 @@
-<% if (ctrl.children) { %>
-    <% let line_id = null;%>  <%# hold the id of the current line-wrapping div %>
-    <% ctrl.children.forEach(child =>{ %>
-
-        <%# check if we need to close the line-wrapping div %>
-        <% if (line_id !== null) {%>
-            <% if( typeof child.props.common_line_id === "undefined" || child.props.common_line_id !== line_id) {%>
-                </div>
-                <% line_id = null;%>
-        <%}}%>
-
-        <%# check if we need to start a new line-wrapping div %>
-            <% if (line_id === null && typeof child.props.common_line_id !== "undefined" &&
-                    child.controlType !== MgControlType.CTRL_TYPE_TAB) { %>
-                         <% line_id = child.props.common_line_id; %>
-                        <div style="display: flex; flex-direction: row"  <% if (  ctrl.props.web_style === TableWebStyle.MatGrid) { %>*ngIf="mg.ifRowCreated(row)" <%}%>   >
-            <%}%>
-
-                <%- include(`./control`, {child: child}) %>
-
-    <% }) %>
-
-    <%# close the line-wrapping div, in case it was left open %>
-    <%if (line_id !== null) {%>
-        </div>
-<%}} %>
+<% if (ctrl.children) { %>
+    <% let line_id = null;%>  <%# hold the id of the current line-wrapping div %>
+    <% ctrl.children.forEach(child =>{ %>
+
+        <%# check if we need to close the line-wrapping div %>
+        <% if (line_id !== null) {%>
+            <% if( typeof child.props.common_line_id === "undefined" || child.props.common_line_id !== line_id) {%>
+                </div>
+                <% line_id = null;%>
+        <%}}%>
+
+        <%# check if we need to start a new line-wrapping div %>
+            <% if (line_id === null && typeof child.props.common_line_id !== "undefined" &&
+                    child.controlType !== MgControlType.CTRL_TYPE_TAB) { %>
+                         <% line_id = child.props.common_line_id; %>
+                        <div style="display: flex; flex-direction: row"  <% if (  ctrl.props.web_style === TableWebStyle.MatGrid) { %>*ngIf="mg.ifRowCreated(row)" <%}%>   >
+            <%}%>
+
+                <%- include(`./control`, {child: child}) %>
+
+    <% }) %>
+
+    <%# close the line-wrapping div, in case it was left open %>
+    <%if (line_id !== null) {%>
+        </div>
+<%}} %>

package/templates/themes/control.ejs

@@ -1,52 +1,52 @@
-<%- include(`./helperProperties`, {ctrl: child}) %>
-
-    <% switch (child.controlType){
-    case MgControlType.CTRL_TYPE_TEXT: %>
-    <%- include(`./editTypeSelector`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_LABEL: %>
-    <%- include(`./${theme}/label`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_BUTTON: %>
-    <%- include(`./${theme}/push-button`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_IMAGE: %>
-    <%- include(`./${theme}/image`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_SUBFORM: %>
-    <%- include(`./${theme}/subform`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_NONE : %>
-    <%- include(`container`, {ctrl: child}) %>
-    <% break;
-    case MgControlType.CTRL_TYPE_CHECKBOX: %>
-    <%- include(`./${theme}/checkbox`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_COMBO: %>
-    <%- include(`./${theme}/combobox`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_LIST: %>
-    <%- include(`./${theme}/listbox`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_RADIO: %>
-    <%- include(`./${theme}/radio`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_TABLE: %>
-    <%- include(`./tableTypeSelector`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_GROUP: %>
-    <%- include(`./${theme}/group`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_COLUMN: %>
-    <%- include(`./tableTypeSelector`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_TAB: %>
-    <%- include(`./${theme}/tab`, {ctrl: child}) %>
-    <% break
-    case MgControlType.CTRL_TYPE_TABPAGE: %>
-    <%- include(`./${theme}/tabpage`, {ctrl: child}) %>
-    <% break
-    default: %>
-    <%- include(`../component/view.component.html`, {ctrl: child}) %>
-    <% break
-    } %>
+<%- include(`./helperProperties`, {ctrl: child}) %>
+
+    <% switch (child.controlType){
+    case MgControlType.CTRL_TYPE_TEXT: %>
+    <%- include(`./editTypeSelector`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_LABEL: %>
+    <%- include(`./${theme}/label`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_BUTTON: %>
+    <%- include(`./${theme}/push-button`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_IMAGE: %>
+    <%- include(`./${theme}/image`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_SUBFORM: %>
+    <%- include(`./${theme}/subform`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_NONE : %>
+    <%- include(`container`, {ctrl: child}) %>
+    <% break;
+    case MgControlType.CTRL_TYPE_CHECKBOX: %>
+    <%- include(`./${theme}/checkbox`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_COMBO: %>
+    <%- include(`./${theme}/combobox`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_LIST: %>
+    <%- include(`./${theme}/listbox`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_RADIO: %>
+    <%- include(`./${theme}/radio`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_TABLE: %>
+    <%- include(`./tableTypeSelector`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_GROUP: %>
+    <%- include(`./${theme}/group`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_COLUMN: %>
+    <%- include(`./tableTypeSelector`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_TAB: %>
+    <%- include(`./${theme}/tab`, {ctrl: child}) %>
+    <% break
+    case MgControlType.CTRL_TYPE_TABPAGE: %>
+    <%- include(`./${theme}/tabpage`, {ctrl: child}) %>
+    <% break
+    default: %>
+    <%- include(`../component/view.component.html`, {ctrl: child}) %>
+    <% break
+    } %>

package/templates/themes/editTypeSelector.ejs

@@ -1 +1 @@
-<%- include(`./${theme}/edit`, {ctrl: ctrl}) %>
+<%- include(`./${theme}/edit`, {ctrl: ctrl}) %>

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

@@ -1,68 +1,68 @@
-import {NgModule} from '@angular/core';
-
-import {
-   MatButtonModule,
-   MatMenuModule,
-   MatToolbarModule,
-   MatIconModule,
-   MatCheckboxModule,
-
-   MatCardModule, MatListModule, MatSliderModule,
-   MatSelectModule, MatSidenavModule, MatSlideToggleModule, MatSnackBarModule,
-   MatSortModule, MatTabsModule, MatStepperModule, MatPaginatorModule
-
-} from '@angular/material';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {MagicNoControlDirective} from '../nocontrol.magic.directive';
-import {MagicFullControlDirective} from '../fullcontrol.magic.directive';
-import {MagicDefaultValueAccessor, MagicFormControlNameDirective} from '../form-control-name.magic.directive';
-
-import {FormsModule} from '@angular/forms';
-import {CommonModule} from '@angular/common';
-
-@NgModule({
-   imports: [
-      CommonModule,
-      FormsModule,
-      MatButtonModule,
-      MatMenuModule,
-      MatToolbarModule,
-      MatIconModule,
-      MatCardModule,
-      MatListModule,
-      MatSliderModule,
-      MatCheckboxModule,
-      MatSelectModule,
-      MatSidenavModule,
-      MatPaginatorModule,
-
-      MatSlideToggleModule,
-      MatSnackBarModule,
-      MatSortModule,
-      MatTabsModule,
-      MatStepperModule,
-      BrowserAnimationsModule
-
-   ],
-   exports: [
-      MatButtonModule,
-      MatMenuModule,
-      MatToolbarModule,
-      MatIconModule,
-      MatCardModule,
-      MatListModule,
-      MatSliderModule,
-      MatCheckboxModule,
-      MatSelectModule,
-      MatSidenavModule,
-      MatSlideToggleModule,
-      MatSnackBarModule,
-      MatSortModule,
-      MatTabsModule,
-      MatStepperModule,
-   ],
-})
-export class ThemeModule
-{
-   constructor() {}
-}
+import {NgModule} from '@angular/core';
+
+import {
+   MatButtonModule,
+   MatMenuModule,
+   MatToolbarModule,
+   MatIconModule,
+   MatCheckboxModule,
+
+   MatCardModule, MatListModule, MatSliderModule,
+   MatSelectModule, MatSidenavModule, MatSlideToggleModule, MatSnackBarModule,
+   MatSortModule, MatTabsModule, MatStepperModule, MatPaginatorModule
+
+} from '@angular/material';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {MagicNoControlDirective} from '../nocontrol.magic.directive';
+import {MagicFullControlDirective} from '../fullcontrol.magic.directive';
+import {MagicDefaultValueAccessor, MagicFormControlNameDirective} from '../form-control-name.magic.directive';
+
+import {FormsModule} from '@angular/forms';
+import {CommonModule} from '@angular/common';
+
+@NgModule({
+   imports: [
+      CommonModule,
+      FormsModule,
+      MatButtonModule,
+      MatMenuModule,
+      MatToolbarModule,
+      MatIconModule,
+      MatCardModule,
+      MatListModule,
+      MatSliderModule,
+      MatCheckboxModule,
+      MatSelectModule,
+      MatSidenavModule,
+      MatPaginatorModule,
+
+      MatSlideToggleModule,
+      MatSnackBarModule,
+      MatSortModule,
+      MatTabsModule,
+      MatStepperModule,
+      BrowserAnimationsModule
+
+   ],
+   exports: [
+      MatButtonModule,
+      MatMenuModule,
+      MatToolbarModule,
+      MatIconModule,
+      MatCardModule,
+      MatListModule,
+      MatSliderModule,
+      MatCheckboxModule,
+      MatSelectModule,
+      MatSidenavModule,
+      MatSlideToggleModule,
+      MatSnackBarModule,
+      MatSortModule,
+      MatTabsModule,
+      MatStepperModule,
+   ],
+})
+export class ThemeModule
+{
+   constructor() {}
+}

package/templates/themes/material/base_attributes_date.ejs

@@ -1,8 +1,8 @@
-<%- include('../../attributes/common/base/rtol',          {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/visible',       {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/tabindex',      {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/class',         {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/wallpaper',     {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/imageFileName', {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/testingId',     {ctrl : ctrl})%>
-<%- include('../../attributes/common/base/control_type',  {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/rtol',          {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/visible',       {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/tabindex',      {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/class',         {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/wallpaper',     {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/imageFileName', {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/testingId',     {ctrl : ctrl})%>
+<%- include('../../attributes/common/base/control_type',  {ctrl : ctrl})%>

package/templates/themes/material/checkbox.ejs

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