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

package/templates/themes/material/edit.ejs

@@ -10,13 +10,14 @@
 default: %>
 
     <div>
+    <% if(ctrl.props.is_table_child){ %>
+      @if (mg.isRowInRowEditing(row)) {
+    <% } %>
     <mat-form-field
     <% if (ctrl.props.show_zoom_button  ){ %>
       style="width: 65%"
       <% } %>
       <%- include(`../../attributes/common/container_attributes`, {ctrl : ctrl})  %>
-      <% if(ctrl.props.is_table_child){ %>
-        *ngIf="mg.isRowInRowEditing(row)"   <%}%>
     >
   <div>
 
@@ -47,10 +48,6 @@ default: %>
     <% } else { %>
 
       <input
-        <% if(ctrl.props.is_table_child){ %>
-          *ngIf="mg.isRowInRowEditing(row)"
-        <%}%>
-
       matInput
       <% if (ctrl.props.attribute == StorageAttributeType.Numeric) { %>
         <% if (ctrl.props.currency) { %>
@@ -93,25 +90,26 @@ default: %>
     <% if (ctrl.props.auto_complete_mode) { %>
     <mat-autocomplete #<%- ctrl.props.id %>="matAutocomplete"
       <%- include('../../attributes/common/base/id', {ctrl : ctrl}) %>>
-        <mat-option
-                *ngFor="let o of mg.getFilteredList(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>);"
-
-                [value]="o.displayValue"
-        >
+        @for (o of mg.getFilteredList(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
+        <mat-option [value]="o.displayValue">
             {{o.displayValue}}
         </mat-option>
+        }
     </mat-autocomplete>
     <% } %>
   </div>
 
     </mat-form-field>
+    <% if(ctrl.props.is_table_child){ %>
+      }
+    <% } %>
 
      <% if(ctrl.props.is_table_child){ %>
+     @if (!mg.isRowInRowEditing(row)) {
      <label
      <% if (ctrl.props.show_zoom_button  ){ %>
        style="width: 65%"
        <% } %>
-         *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<%}%>)
@@ -122,6 +120,7 @@ default: %>
        <%}%>
 
      </label>
+     }
      <%}%>
          <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
        </div>
@@ -129,6 +128,9 @@ default: %>
 
 case StorageAttributeType.Date: %>
        <div>
+     <% if(ctrl.props.is_table_child){ %>
+       @if (mg.isRowInRowEditing(row)) {
+     <%}%>
      <mat-form-field
      <% if (ctrl.props.show_zoom_button  ){ %>
        style="width: 65%"
@@ -136,9 +138,6 @@ case StorageAttributeType.Date: %>
        <%- include(`../../attributes/common/container_attributes`, {ctrl : ctrl}) %>
                      <%- include('../../attributes/common/base/id', {ctrl : ctrl})  %>
                     [eventsOnly]=true
-       <% if(ctrl.props.is_table_child){ %>
-          *ngIf="mg.isRowInRowEditing(row)"
-       <%}%>
      >
 
        <% if(ctrl.props.is_table_child){ %>
@@ -154,35 +153,40 @@ case StorageAttributeType.Date: %>
         <%- ctrl.props.validator %>
         <% } %>
       >
-      <mat-datepicker-toggle matSuffix
-                             [for]="<%- ctrl.props.id %>"
-                             <% if ( child.props.is_table_child ) {%>
-                                 *ngIf="!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>) &&  mg.isRowInRowEditing(row)"
-                             <%} else { %>
-                                 *ngIf="!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>)"
-                             <%}%>
-                              >
-
-      </mat-datepicker-toggle>
+      <% if ( child.props.is_table_child ) {%>
+        @if (!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>) &&  mg.isRowInRowEditing(row)) {
+        <mat-datepicker-toggle matSuffix [for]="<%- ctrl.props.id %>">
+        </mat-datepicker-toggle>
+        }
+      <%} else { %>
+        @if (!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>)) {
+        <mat-datepicker-toggle matSuffix [for]="<%- ctrl.props.id %>">
+        </mat-datepicker-toggle>
+        }
+      <%}%>
       <mat-datepicker #<%- ctrl.props.id %>></mat-datepicker>
 
       <% if(ctrl.props.is_table_child){ %>
       </div>
       <%}%>
      </mat-form-field>
+     <% if(ctrl.props.is_table_child){ %>
+       }
+     <%}%>
          <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
 
        </div>
 <% if(ctrl.props.is_table_child){ %>
+@if (!mg.isRowInRowEditing(row)) {
 <label
 <% if (ctrl.props.show_zoom_button  ){ %>
   style="width: 65%"
   <% } %>
-  *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>
+}
 <%}%>
 
 <% if(ctrl.props.validator){ %>

package/templates/themes/material/listbox.ejs

@@ -9,12 +9,11 @@
         <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
 >
     <%# build of items in listbox %>
-    <mat-list-option
-            *ngFor="let o of mg.getItemListValues(<%-ctrl.props.enum_id%>);"
-            [value] = "o.index"
-    >
+    @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%>); track $index) {
+    <mat-list-option [value] = "o.index">
         {{o.displayValue}}
     </mat-list-option>
+    }
 </mat-selection-list>
     <% if (ctrl.props.must_input  || ctrl.props.validator != null) {%>
       <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>

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

@@ -25,4 +25,3 @@ case CtrlButtonTypeGui.Hypertext : %>
         <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
 </button>
 <% } %> %>
-

package/templates/themes/material/radio.ejs

@@ -9,11 +9,11 @@
         required
         <% } %>
 >
-    <mat-radio-button
-            *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>);"
-            [value] = "o.index"   >
+    @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %>); track $index) {
+    <mat-radio-button [value] = "o.index"   >
         {{o.displayValue}}
     </mat-radio-button >
+    }
 
 </mat-radio-group>
 

package/templates/themes/material/tab.ejs

@@ -5,13 +5,15 @@
   [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 %>)"
+  @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %>); track $index) {
+  <mat-tab
     <% 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}) %>

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

@@ -19,8 +19,10 @@
            <% 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"
+        @for (row of task.Records.list; track $index) {
+            <ng-container>
+            @if (mg.ifRowCreated(row) && !mg.isDataviewEmpty()) {
+            <tr id="row"
                 <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
                    [formGroup]="mg.getFormGroupByRow(row.rowId)"
                 <%}%>
@@ -32,6 +34,8 @@
             >
                 <%- include(`../../container`, {ctrl: ctrl}) %>
             </tr>
-        </ng-container>
+            }
+            </ng-container>
+        }
     </table>
 </div>

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

@@ -9,8 +9,10 @@
      [scrollWindow]="false"
         <%}%>
 >
-    <div *ngFor="let row of task.Records.list">
-        <div *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()" id="row"
+    @for (row of task.Records.list; track $index) {
+        <div>
+        @if (mg.ifRowCreated(row) && !mg.isDataviewEmpty()) {
+        <div id="row"
                 <% if(magicConfig.allow_testing) { %>
              MgControlType="MgRow"
                 <% } %>
@@ -24,5 +26,7 @@
              [magicRow]="row?.rowId">
             <%- include(`../../container`, {ctrl: ctrl}) %>
         </div>
-    </div>
+        }
+        </div>
+    }
 </div>