@magic-xpa/cli 4.1300.0-dev4130.201 → 4.1300.0-dev4130.202

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/templates/themes/basicHTML/radio.ejs +22 -2
  3. package/templates/themes/material/radio.ejs +27 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@magic-xpa/cli",
3
- "version": "4.1300.0-dev4130.201",
3
+ "version": "4.1300.0-dev4130.202",
4
4
  "license": "SEE LICENSE IN EULA.pdf",
5
5
  "description": "Magic CLI for MagicWeb applications",
6
6
  "keywords": [
package/templates/themes/basicHTML/radio.ejs CHANGED
@@ -1,8 +1,19 @@
1
+ <%# Wrap in a row-specific formGroup if this radio control is child of a table %>
1
2
  <div
3
+ <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
4
+ [formGroup]="mg.getFormGroupByRow(row.rowId)"
5
+ <%}%>
6
+ >
7
+ <%# Render radio buttons group if in edit mode, otherwise render a static display label %>
8
+ <% if (ctrl.props.is_table_child) { %>
9
+ @if (mg.isRowInRowEditing(row)) {
10
+ <% } %>
11
+ <div
2
12
  <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
3
- (change)="task.mgOnRadioSelectionChanged(<%-ctrl.props.enum_id%>)"
13
+ (change)="task.mgOnRadioSelectionChanged(<%-ctrl.props.enum_id%><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
4
14
  >
5
- @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%>); track $index) {
15
+ <%# Get the options and display values, passing the row.rowId if it is a table control %>
16
+ @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
6
17
  <div>
7
18
  <label>
8
19
  <input
@@ -18,4 +29,13 @@
18
29
  <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
19
30
  <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
20
31
  <%}%>
32
+ </div>
33
+ <% if (ctrl.props.is_table_child) { %>
34
+ }
35
+ @if (!mg.isRowInRowEditing(row)) {
36
+ <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
37
+ {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
38
+ </label>
39
+ }
40
+ <% } %>
21
41
  </div>
package/templates/themes/material/radio.ejs CHANGED
@@ -1,22 +1,39 @@
1
- <mat-radio-group
2
- (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %>)"
3
-
1
+ <%# Wrap in a row-specific formGroup if this radio control is child of a table %>
2
+ <div <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
3
+ [formGroup]="mg.getFormGroupByRow(row.rowId)"
4
+ <%}%>
5
+ >
6
+ <%# Render radio buttons group if in edit mode, otherwise render a static display label %>
7
+ <% if (ctrl.props.is_table_child) { %>
8
+ @if (mg.isRowInRowEditing(row)) {
9
+ <% } %>
10
+ <mat-radio-group
11
+ (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
4
12
  <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
5
- <%- include('../../attributes/common/base/id', {ctrl : ctrl}) %>
6
13
  <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
7
14
 
8
15
  <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
9
16
  required
10
17
  <% } %>
11
- >
12
- @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %>); track $index) {
18
+ >
19
+ <%# Get the options and display values, passing the row.rowId if it is a table control %>
20
+ @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
13
21
  <mat-radio-button [value] = "o.index" >
14
22
  {{o.displayValue}}
15
23
  </mat-radio-button >
16
24
  }
17
25
 
18
- </mat-radio-group>
26
+ </mat-radio-group>
27
+ <% if (ctrl.props.is_table_child) { %>
28
+ }
29
+ @if (!mg.isRowInRowEditing(row)) {
30
+ <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
31
+ {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
32
+ </label>
33
+ }
34
+ <% } %>
19
35
 
20
- <% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
21
- <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
22
- <% } %>
36
+ <% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
37
+ <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
38
+ <% } %>
39
+ </div>