@magic-xpa/cli 4.1201.0-dev4121.306 → 4.1201.0-dev4121.308

package/templates/themes/basicHTML/edit.ejs

@@ -1,169 +1,179 @@
-<% if(ctrl.props.is_table_child){ %>
-   <div [formGroup]="mg.getFormGroupByRow(row.rowId)">
-<%}%>
-
-  <% if (typeof ctrl.props.dataexp === "undefined" && (typeof ctrl.props.modifiable === "undefined" || ctrl.props.modifiable === true || ctrl.props.modifiable.has_exp)){ %>
-    <% switch (ctrl.props.attribute) {
-        default: %>
-                <div  >
-                <% if (ctrl.style &&  ctrl.style.multiline_edit ){ %>
-
-                <textarea *ngIf="mg.isRowInRowEditing(row)"
-                        type="text"
-                        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-                        <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
-                        <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %><%}%>
-                        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
-                        <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>
-                        <%- ' '%>
-                        <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
-                >
-                </textarea>
-
-                <% } else { %>
-                <input
-                  <% if (ctrl.props.show_zoom_button  ){ %>
-                  style="width: 70%"
-                  <% } %>
-                  <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                  <% if(ctrl.props.is_table_child){ %>
-                    *ngIf="mg.isRowInRowEditing(row)"
-                  <%}%>
-
-                  <% if (ctrl.props.attribute == StorageAttributeType.Numeric) { %>
-                    <% if (ctrl.props.currency) { %>
-                      currencyMask [options]="mg.getNumericPicture(mg.getPicture(<%- ctrl.props.enum_id %>))"
-                    <% } else { %>
-                      type='number'
-                    <% } %>
-                  <% }else { %>
-                        <% } %>
-
-                        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-                        <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
-                        <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %> <%}%>
-                        <% if (ctrl.props.mask) { %>
-                           [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>)"
-                           [showMaskTyped]='true'
-                        <% } %>
-                        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
-                        <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>
-                        <%- ' '%>
-                        <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
-                />
-                <% } %>
-                  <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
-
-                  <% if(ctrl.props.is_table_child){ %>
-
-                  <label
-                      *ngIf="!mg.isRowInRowEditing(row)"
-                     <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
-                     <% if (ctrl.props.currency  ) { %>
-                       {{mg.getFormattedValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
-                       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
-
-                     <% } else { %>
-                       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
-                       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
-                     <% } %>
-
-
-                  </label>
-                  <%}%>
-                  <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
-                </div>
-        <% break;
-        case StorageAttributeType.Date: %>
-
-     <% if(ctrl.props.is_table_child){ %>
-     <div
-       *ngIf="mg.isRowInRowEditing(row)"
-       style="display: flex; flex-direction: row">
-       <%}%>
-
-       <input
-       <% if (ctrl.props.show_zoom_button  ){ %>
-         style="width: 70%"
-         <% } %>
-          type="date"
-          <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-          <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-          <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
-          dateInput
-          <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
-          <% if (ctrl.props.validator === "rangevalidator") { %><%- ctrl.props.validator %><%}%>
-        />
-
-        <% if(ctrl.props.validator){ %>
-           <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
-        <% } %>
-
-       <% if(ctrl.props.is_table_child){ %>
-     </div>
-     <%}%>
-
-
-     <% if(ctrl.props.is_table_child){ %>
-     <label
-       *ngIf="!mg.isRowInRowEditing(row)"
-       <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
-       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
-       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
-     </label>
-     <%}%>
-       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
-        <% break;
-
-        case StorageAttributeType.Time: %>
-     <% if(ctrl.props.is_table_child){ %>
-     <div
-       *ngIf="mg.isRowInRowEditing(row)"
-       style="display: flex; flex-direction: row">
-       <%}%>
-
-        <input
-        <% if (ctrl.props.show_zoom_button  ){ %>
-          style="width: 70%"
-          <% } %>
-                type="time"
-                <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-                <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
-                <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
-                <% if (ctrl.props.validator === "rangevalidator") { %><%- ctrl.props.validator %><%}%>
-                <% if (ctrl.props.showsecs) { %><%- 'step=1' %> <%}%>
-        />
-        <% if(ctrl.props.validator){ %>
-            <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
-        <% } %>
-
-       <% if(ctrl.props.is_table_child){ %>
-     </div>
-     <%}%>
-
-     <% if(ctrl.props.is_table_child){ %>
-     <label
-       *ngIf="!mg.isRowInRowEditing(row)"
-       <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
-       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
-       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
-     </label>
-     <%}%>
-       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
-        <% break;
-    } %>
-    <% } else { %>
-    <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
-        {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
-        <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
-
-    </label>
-
-       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
-    <%}%>
-
-<% if(ctrl.props.is_table_child){ %>
-   </div>
-<%}%>
+<% if(ctrl.props.is_table_child){ %>
+   <div [formGroup]="mg.getFormGroupByRow(row.rowId)">
+<%}%>
+
+  <% if (typeof ctrl.props.dataexp === "undefined" && (typeof ctrl.props.modifiable === "undefined" || ctrl.props.modifiable === true || ctrl.props.modifiable.has_exp)){ %>
+    <% switch (ctrl.props.attribute) {
+        default: %>
+                <div  >
+                <% if (ctrl.style &&  ctrl.style.multiline_edit ){ %>
+
+                @if (mg.isRowInRowEditing(row)) {
+                <textarea
+                        type="text"
+                        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+                        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+                        <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
+                        <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %><%}%>
+                        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+                        <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>
+                        <%- ' '%>
+                        <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
+                >
+                </textarea>
+                }
+
+                <% } else { %>
+                <% if(ctrl.props.is_table_child){ %>
+                  @if (mg.isRowInRowEditing(row)) {
+                <%}%>
+                <input
+                  <% if (ctrl.props.show_zoom_button  ){ %>
+                  style="width: 70%"
+                  <% } %>
+                  <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+
+                  <% if (ctrl.props.attribute == StorageAttributeType.Numeric) { %>
+                    <% if (ctrl.props.currency) { %>
+                      currencyMask [options]="mg.getNumericPicture(mg.getPicture(<%- ctrl.props.enum_id %>))"
+                    <% } else { %>
+                      type='number'
+                    <% } %>
+                  <% }else { %>
+                        <% } %>
+
+                        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+                        <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
+                        <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %> <%}%>
+                        <% if (ctrl.props.mask) { %>
+                           [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>)"
+                           [showMaskTyped]='true'
+                        <% } %>
+                        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+                        <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>
+                        <%- ' '%>
+                        <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
+                />
+                <% if(ctrl.props.is_table_child){ %>
+                  }
+                <%}%>
+                <% } %>
+                  <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
+
+                  <% if(ctrl.props.is_table_child){ %>
+
+                  @if (!mg.isRowInRowEditing(row)) {
+                  <label
+                     <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+                     <% if (ctrl.props.currency  ) { %>
+                       {{mg.getFormattedValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
+                       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
+
+                     <% } else { %>
+                       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
+                       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
+                     <% } %>
+
+
+                  </label>
+                  }
+                  <%}%>
+                  <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
+                </div>
+        <% break;
+        case StorageAttributeType.Date: %>
+
+     <% if(ctrl.props.is_table_child){ %>
+     @if (mg.isRowInRowEditing(row)) {
+     <div
+       style="display: flex; flex-direction: row">
+       <%}%>
+
+       <input
+       <% if (ctrl.props.show_zoom_button  ){ %>
+         style="width: 70%"
+         <% } %>
+          type="date"
+          <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+          <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+          <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
+          dateInput
+          <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+          <% if (ctrl.props.validator === "rangevalidator") { %><%- ctrl.props.validator %><%}%>
+        />
+
+        <% if(ctrl.props.validator){ %>
+           <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
+        <% } %>
+
+       <% if(ctrl.props.is_table_child){ %>
+     </div>
+     }
+     <%}%>
+
+
+     <% if(ctrl.props.is_table_child){ %>
+     @if (!mg.isRowInRowEditing(row)) {
+     <label
+       <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
+       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
+     </label>
+     }
+     <%}%>
+       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
+        <% break;
+
+        case StorageAttributeType.Time: %>
+     <% if(ctrl.props.is_table_child){ %>
+     @if (mg.isRowInRowEditing(row)) {
+     <div
+       style="display: flex; flex-direction: row">
+       <%}%>
+
+        <input
+        <% if (ctrl.props.show_zoom_button  ){ %>
+          style="width: 70%"
+          <% } %>
+                type="time"
+                <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+                <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+                <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
+                <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+                <% if (ctrl.props.validator === "rangevalidator") { %><%- ctrl.props.validator %><%}%>
+                <% if (ctrl.props.showsecs) { %><%- 'step=1' %> <%}%>
+        />
+        <% if(ctrl.props.validator){ %>
+            <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
+        <% } %>
+
+       <% if(ctrl.props.is_table_child){ %>
+     </div>
+     }
+     <%}%>
+
+     <% if(ctrl.props.is_table_child){ %>
+     @if (!mg.isRowInRowEditing(row)) {
+     <label
+       <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+       {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
+       <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
+     </label>
+     }
+     <%}%>
+       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
+        <% break;
+    } %>
+    <% } else { %>
+    <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+        {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
+        <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
+
+    </label>
+
+       <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
+    <%}%>
+
+<% if(ctrl.props.is_table_child){ %>
+   </div>
+<%}%>

package/templates/themes/basicHTML/form.ejs

@@ -1,4 +1,4 @@
-<form
-        <%- include('../attributes/base_attributes', {ctrl : ctrl}) %>
-        <%- include('../attributes/input_attributes', {ctrl : ctrl})%>
-></form>
+<form
+        <%- include('../attributes/base_attributes', {ctrl : ctrl}) %>
+        <%- include('../attributes/input_attributes', {ctrl : ctrl})%>
+></form>

package/templates/themes/basicHTML/group.ejs

@@ -1,5 +1,5 @@
-<div <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-    <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
-        style="display: flex; flex-direction: column">
-    <%- include(`../container`, {ctrl: ctrl}) %>
+<div <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+    <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
+        style="display: flex; flex-direction: column">
+    <%- include(`../container`, {ctrl: ctrl}) %>
 </div>

package/templates/themes/basicHTML/image.ejs

@@ -1,6 +1,7 @@
-
-<div *ngIf="mg.isImageExists(<%- ctrl.props.enum_id %>)">
-    <img    <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-            <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
-            [src]="mg.getImage(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)" />
-</div>
+@if (mg.isImageExists(<%- ctrl.props.enum_id %>)) {
+<div>
+    <img    <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+            <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
+            [src]="mg.getImage(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)" />
+</div>
+}

package/templates/themes/basicHTML/label.ejs

@@ -1,11 +1,11 @@
-<label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
->
-<%if(ctrl.props.text) { %>
-    <%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.replace(/@/g, '&#64;') %>
-    <%}%>
-<% } %>
-</label>
+<label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
+>
+<%if(ctrl.props.text) { %>
+    <%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.replace(/@/g, '&#64;') %>
+    <%}%>
+<% } %>
+</label>

package/templates/themes/basicHTML/listbox.ejs

@@ -1,21 +1,20 @@
-<div>
-<select
-        <%# attributes of the listbox itself %>
-        multiple
-        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common//input_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
->
-    <%# build of items in listbox %>
-    <option
-            *ngFor="let o of mg.getItemListValues(<%-ctrl.props.enum_id%>);"
-            [value] = "o.index"
-    >
-        {{o.displayValue}}
-    </option>
-</select>
-    <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
-      <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
-    <%}%>
-</div>
+<div>
+<select
+        <%# attributes of the listbox itself %>
+        multiple
+        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common//input_attributes', {ctrl : ctrl}) %>
+        <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
+        <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
+>
+    <%# build of items in listbox %>
+    @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%>); track $index) {
+    <option [value] = "o.index">
+        {{o.displayValue}}
+    </option>
+    }
+</select>
+    <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
+      <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
+    <%}%>
+</div>

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

@@ -1,28 +1,27 @@
-<% 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 : %>
-<button
-        type="button"
-        <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>
->
-    <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
-</button>
-<% break;
-
-case CtrlButtonTypeGui.Hypertext : %>
-<a href="javascript:;"
-        <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>>
-    <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
-</a>
-<% break;
-
-} %>
-<% } else { %> <%# button is a pushbutton %>
-<button
-  <%- include('../../attributes/common/row_editing_button_attributes.ejs', {ctrl : ctrl}) %>
-  <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>>
-  <%- include('../../attributes/common/format.ejs', {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 : %>
+<button
+        type="button"
+        <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>
+>
+    <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
+</button>
+<% break;
+
+case CtrlButtonTypeGui.Hypertext : %>
+<a href="javascript:;"
+        <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>>
+    <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
+</a>
+<% break;
+
+} %>
+<% } else { %> <%# button is a pushbutton %>
+<button
+  <%- include('../../attributes/common/row_editing_button_attributes.ejs', {ctrl : ctrl}) %>
+  <%- include('../../attributes/button_attributes.ejs', {ctrl : ctrl}) %>>
+  <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
+</button>
+<% } %> %>

package/templates/themes/basicHTML/radio.ejs

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

package/templates/themes/basicHTML/subform.ejs

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