finishing data page + fixed #658

convertigo · Oct 31, 2023 · 625b0c9 · 625b0c9
1 parent e6a5bc5
commit 625b0c9
Show file tree

Hide file tree

Showing 11 changed files with 576 additions and 788 deletions.
diff --git a/_c8oProject/mobileApplication.yaml b/_c8oProject/mobileApplication.yaml
diff --git a/_c8oProject/mobilePages/dataPage.yaml b/_c8oProject/mobilePages/dataPage.yaml
@@ -708,6 +708,14 @@ title: Title for dataPage
  - xmlizable: 
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
  - MobileSmartSourceType: script:('version' | translate) + local?.versions?.[local?.currentIndex]
+ ↓Style [ngx.components.UIStyle-1698680616958]: 
+ styleContent: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
+ - com.twinsoft.convertigo.beans.common.FormatedContent: 
+  →: |
+ ' font-size: 16px;
+ '
  ↓DivArrowRight [ngx.components.UIDynamicElement-1698308721063]: 
  beanData: '{"ionBean":"DivTag"}'
  tagName: div
@@ -758,6 +766,14 @@ title: Title for dataPage
  - xmlizable: 
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
  - MobileSmartSourceType: script:(local?.responses?.[local?.currentIndex]?.length ?? '...' ) + ' ' + ('answer_s' | translate)
+ ↓Style1 [ngx.components.UIStyle-1698680728756]: 
+ styleContent: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
+ - com.twinsoft.convertigo.beans.common.FormatedContent: 
+  →: |
+ ' --color: black;
+ '
  ↓Directive2 [ngx.components.UIControlDirective-1698309099889]: 
  directiveItemName: item1
  directiveSource: 
@@ -816,7 +832,6 @@ title: Title for dataPage
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
  - MobileSmartSourceType: script:item1
  ↓UseSharedComponent41 [ngx.components.UIUseShared-1698309099922]: 
- isEnabled: false
  sharedcomponent: C8Oforms.MobileApplication.Application.sharedStatsImg
  ↓element [ngx.components.UIUseVariable-1698309099925]: 
  varValue: 

diff --git a/_c8oProject/mobileSharedComponents/SharedHeaderStats.yaml b/_c8oProject/mobileSharedComponents/SharedHeaderStats.yaml
@@ -1,102 +1,97 @@
 ↓element [ngx.components.UICompVariable-1613996791505]: 
-↓Label [ngx.components.UIDynamicElement-1646922901500]: 
- beanData: '{"ionBean":"Label"}'
- tagName: ion-label
- ↓TextItem [ngx.components.UIDynamicElement-1646922921142]: 
- beanData: '{"ionBean":"TextItem"}'
- tagName: ion-text
- ↓Directive [ngx.components.UIControlDirective-1613996780906]: 
- directiveName: If
- directiveSource: 
+↓total [ngx.components.UICompVariable-1698417009912]: 
+ value: null
+↓Directive [ngx.components.UIControlDirective-1613996780906]: 
+ directiveName: If
+ directiveSource: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:this.element.labelHtml != undefined else ElseBlock_1613990532739
+ ↓DivContentInnerHTML [ngx.components.UIDynamicElement-1613996780909]: 
+ beanData: '{"ionBean":"DivTag"}'
+ tagName: div
+ ↓Attr [ngx.components.UIAttribute-1613996780915]: 
+ attrName: '[innerHTML]'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:this.router.sanitizer.bypassSecurityTrustHtml(this.element.labelHtml)
+↓Tag [ngx.components.UIElement-1613996780918]: 
+ identifier: ElseBlock_1613990532739
+ tagName: ng-template
+ ↓Label [ngx.components.UIDynamicElement-1613996780921]: 
+ beanData: '{"ionBean":"Label"}'
+ tagName: ion-label
+ ↓Attr [ngx.components.UIAttribute-1613996780924]: 
+ attrName: '[attr.stacked]'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:(this.element.config.position == 'stacked')?'':null
+ ↓Attr1 [ngx.components.UIAttribute-1613996780927]: 
+ attrName: '[attr.floating]'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:(this.element.config.position == 'floating')?'':null
+ ↓Attr2 [ngx.components.UIAttribute-1613996780930]: 
+ attrName: '[attr.fixed]'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:(this.element.config.position == 'fixed')?'':null
+ ↓Attr3 [ngx.components.UIAttribute-1613996780933]: 
+ attrName: '[style.color]'
+ attrValue: 
  - xmlizable: 
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:this.element.labelHtml != undefined else ElseBlock_1613990532739
- ↓DivContentInnerHTML [ngx.components.UIDynamicElement-1613996780909]: 
- beanData: '{"ionBean":"DivTag"}'
- tagName: div
- ↓Attr2 [ngx.components.UIAttribute-1613996780912]: 
- attrName: '[ngClass]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:['styledivnormal34']
- isEnabled: false
- ↓Attr [ngx.components.UIAttribute-1613996780915]: 
- attrName: '[innerHTML]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:this.router.sanitizer.bypassSecurityTrustHtml(this.element.labelHtml)
- ↓Tag [ngx.components.UIElement-1613996780918]: 
- identifier: ElseBlock_1613990532739
- tagName: ng-template
- ↓Label [ngx.components.UIDynamicElement-1613996780921]: 
- beanData: '{"ionBean":"Label"}'
- tagName: ion-label
- ↓Attr [ngx.components.UIAttribute-1613996780924]: 
- attrName: '[attr.stacked]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:(this.element.config.position == 'stacked')?'':null
- ↓Attr1 [ngx.components.UIAttribute-1613996780927]: 
- attrName: '[attr.floating]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:(this.element.config.position == 'floating')?'':null
- ↓Attr2 [ngx.components.UIAttribute-1613996780930]: 
- attrName: '[attr.fixed]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:(this.element.config.position == 'fixed')?'':null
- ↓Attr3 [ngx.components.UIAttribute-1613996780933]: 
- attrName: '[style.color]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: 'script:(this.element.config.label_color != ''unset'')? this.element.config.label_color : null'
- ↓Attr4 [ngx.components.UIAttribute-1613996780936]: 
- attrName: 
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: plain:text-wrap
- ↓Style [ngx.components.UIStyle-1613996780939]: 
- styleContent: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
- - com.twinsoft.convertigo.beans.common.FormatedContent: 
-  →: |
- margin-bottom:0px;
- 
- ↓Attr5 [ngx.components.UIAttribute-1613996780942]: 
- attrName: '*ngIf'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: plain:this.element.config.disabled ==false
- ↓Attr21 [ngx.components.UIAttribute-1613996780945]: 
- attrName: '[ngClass]'
- attrValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: 'script:params1573663157513.setStyle ?[''styledivnormal34''] : ['''']'
- ↓Text [ngx.components.UIText-1613996780948]: 
- i18n: true
- textValue: 
- - xmlizable: 
- - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:this.element.label
- ↓Paragraph [ngx.components.UIDynamicElement-1614000146450]: 
- beanData: '{"ionBean":"Paragraph"}'
- tagName: p
- ↓Text [ngx.components.UIText-1614000146453]: 
+ - MobileSmartSourceType: 'script:(this.element.config.label_color != ''unset'')? this.element.config.label_color : null'
+ ↓Attr4 [ngx.components.UIAttribute-1613996780936]: 
+ attrName: 
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: plain:text-wrap
+ ↓Style [ngx.components.UIStyle-1613996780939]: 
+ styleContent: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
+ - com.twinsoft.convertigo.beans.common.FormatedContent: 
+  →: |
+ margin-bottom:0px;
+ 
+ ↓Attr5 [ngx.components.UIAttribute-1613996780942]: 
+ attrName: '*ngIf'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: plain:this.element.config.disabled ==false
+ ↓Attr21 [ngx.components.UIAttribute-1613996780945]: 
+ attrName: '[ngClass]'
+ attrValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: 'script:params1573663157513.setStyle ?[''styledivnormal34''] : ['''']'
+ ↓Text [ngx.components.UIText-1613996780948]: 
  i18n: true
  textValue: 
  - xmlizable: 
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:(this.total ?? this?.element?.value.length) + ' ' + translate.instant('answer_s')
-↓total [ngx.components.UICompVariable-1698417009912]: 
- value: null
+ - MobileSmartSourceType: script:this.element.label
+↓Paragraph [ngx.components.UIDynamicElement-1614000146450]: 
+ beanData: '{"ionBean":"Paragraph"}'
+ tagName: p
+ ↓Text [ngx.components.UIText-1614000146453]: 
+ i18n: true
+ textValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: script:(this.total ?? this?.element?.value.length) + ' ' + translate.instant('answer_s')
+ ↓Style [ngx.components.UIStyle-1698680075141]: 
+ styleContent: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
+ - com.twinsoft.convertigo.beans.common.FormatedContent: 
+  →: |
+ ' font-size: 14px;
+ '
diff --git a/_c8oProject/mobileSharedComponents/sharedStatsCheckbox.yaml b/_c8oProject/mobileSharedComponents/sharedStatsCheckbox.yaml
@@ -8,6 +8,7 @@ scriptContent:
  /*Begin_c8o_CompDeclaration*/
  /*End_c8o_CompDeclaration*/
  /*Begin_c8o_CompConstructor*/
+ this.local.direction = ''horizontal'';
  this.local.xAxisFormatter = (v)=>{
  if(this.element.value.includes(+v)){
  return v;
@@ -17,7 +18,7 @@ scriptContent:
  return val + '' ('' + ((+val) / (+this.total) * 100) + '' %)'';
  }
  this.local.getHeight = ()=>{
- let v = (85.2 + (this.element?.sets?.length * 58.89));
+ let v = (85.2 + (this.element?.categories?.length * 58.89));
  v = (!Number.isNaN(v)) ? v : 85.2;
  return v
  }
@@ -87,6 +88,71 @@ scriptContent:
  padding-top:0px !important;
  padding-bottom:0px !important;
  
+ ↓RadioGroup [ngx.components.UIDynamicElement-1698674795313]: 
+ beanData: |
+ '{
+ "ionBean": "RadioGroup",
+ "ControlName": "plain",
+ "DoubleBinding": "script:this.local.direction"
+ }'
+ isEnabled: false
+ tagName: ion-radio-group
+ ↓GenericItem1 [ngx.components.UIDynamicElement-1698674736776]: 
+ beanData: '{"ionBean":"GenericItem","Lines":"plain:none"}'
+ tagName: ion-item
+ ↓RadioButton1 [ngx.components.UIDynamicElement-1698674862415]: 
+ beanData: |
+ '{
+ "ionBean": "RadioButton",
+ "IonSlot": "plain:start",
+ "Value": "plain:horizontal"
+ }'
+ tagName: ion-radio
+ ↓Label [ngx.components.UIDynamicElement-1698674736773]: 
+ beanData: '{"ionBean":"Label"}'
+ tagName: ion-label
+ ↓some_text [ngx.components.UIText-1698674736775]: 
+ textValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: plain:horizontal
+ ↓GenericItem2 [ngx.components.UIDynamicElement-1698674934873]: 
+ beanData: '{"ionBean":"GenericItem","Lines":"plain:none"}'
+ tagName: ion-item
+ ↓RadioButton1 [ngx.components.UIDynamicElement-1698674934882]: 
+ beanData: |
+ '{
+ "ionBean": "RadioButton",
+ "IonSlot": "plain:start",
+ "Value": "plain:vertical"
+ }'
+ tagName: ion-radio
+ ↓Label [ngx.components.UIDynamicElement-1698674934876]: 
+ beanData: '{"ionBean":"Label"}'
+ tagName: ion-label
+ ↓some_text [ngx.components.UIText-1698674934879]: 
+ textValue: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
+ - MobileSmartSourceType: plain:vertical
+ ↓Style [ngx.components.UIStyle-1698674986769]: 
+ styleContent: 
+ - xmlizable: 
+ - ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
+ - com.twinsoft.convertigo.beans.common.FormatedContent: 
+  →: |
+ ' display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ ion-radio{
+ width: 12px;
+ height: 12px;
+ margin-right:5px;
+ }
+ ion-label{
+ font-size: 12px;
+ }
+ '
  ↓CardContent [ngx.components.UIDynamicElement-1581589785254]: 
  beanData: '{"ionBean":"CardContent"}'
  tagName: ion-card-content
@@ -95,7 +161,7 @@ scriptContent:
  directiveSource: 
  - xmlizable: 
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- - MobileSmartSourceType: script:this.element.value != undefined && this.element.sets != undefined
+ - MobileSmartSourceType: script:this.element.value != undefined && this.element.categories != undefined
  ↓tag [ngx.components.UIUseShared-1698399684360]: 
  sharedcomponent: libApexCharts.Application.NgxApp.apxChart
  ↓chart [ngx.components.UIUseVariable-1698399713311]: 
@@ -176,7 +242,7 @@ scriptContent:
  'script:{
  bar: {
  borderRadius: 4,
- horizontal: true
+ horizontal: local.direction == ''horizontal''
  }
  }'
  ↓responsive [ngx.components.UIUseVariable-1698399713333]: 
@@ -190,7 +256,7 @@ scriptContent:
  - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
  - MobileSmartSourceType: |
  'script:{
- categories: this.element.sets,
+ categories: this.element.categories,
  labels:{ formatter: local?.xAxisFormatter}
  }'
  ↓yaxis [ngx.components.UIUseVariable-1698399713337]: