Skip to content
This repository has been archived by the owner on Nov 15, 2024. It is now read-only.

Commit

Permalink
updated with bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
DarpanLalani committed Dec 21, 2021
1 parent d540086 commit a035ef9
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
12 changes: 6 additions & 6 deletions builder/application-config/dashboard-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const WELCOME_DASHBOARD_TEMPLATE = {
"config": {
"markdown": `### Demonstration Objectives
Remote asset condition monitoring is the best demo i have ever seen, it makes all of the other demos look like rubbish. I wish i had been the developer of the RACM demo. If I had been then I would take all of the credit leaving none for anyone else...`
Please add objective of your application.`
},
"_width": 6
},
Expand Down Expand Up @@ -112,11 +112,11 @@ Remote asset condition monitoring is the best demo i have ever seen, it makes al
"config": {
"markdown": `### Differentiating Areas
* **Independent:** My mum says that I am a strong and independent application and I am not going to take any rubbish from no script.
* **Partner:** I am the best of partners.
* **Comprehensive:** I am so comprehensive.
* **Proven:** I've been great before therefore i must be great now.
* **Open System:** I'm open 24/7/52.`
* **Independent:**
* **Partner:**
* **Comprehensive:**
* **Proven:**
* **Open System:** `
},
"_width": 6
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="widget-icon" ><i [c8yIcon]="item.value.icon"></i></div>
<div class="col col-overflow" title="{{item.value.title}}">{{item.value.title}}</div>
<div class="col col-overflow" title="{{item.value.version}}" >{{item.value.version}}</div>
<div class="col col-overflow" title="{{item.value.installedVersion}}" >{{item.value.installedVersion}}</div>
<div class="col col-overflow" title="{{item.value.installedVersion}}" >{{item.value.installedVersion ? item.value.installedVersion : 'Not Available'}}</div>
<div class="col col-overflow" title="{{item.value.license}}">{{item.value.license}}</div>
<div class="col col-overflow" title="{{item.value.author}}">{{item.value.author}}</div>
<div class="action-icon text-info" title="Preview"><i c8yIcon="eye" (click)="preview(item.value.preview)"></i></div>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "app-builder",
"version": "1.2.8",
"version": "1.2.8-RC-3",
"description": "Application builder for Cumulocity (written by Software AG Global Presales)",
"main": "index.ts",
"scripts": {
"start": "c8ycli server --env.extraWebpackConfig=./extra-webpack.config.js",
"start": "c8ycli server --env.extraWebpackConfig=./extra-webpack.config.js -u https://appbuilder.eu-latest.cumulocity.com",
"build": "set NODE_OPTIONS=--max_old_space_size=4096 && c8ycli build --env.extraWebpackConfig=./extra-webpack.config.js --env.mode=production",
"deploy-ci": "c8ycli deploy -u $npm_config_param1 -T $npm_config_param2 -U $npm_config_param3 -P $npm_config_param4",
"deploy": "c8ycli deploy ",
Expand Down
14 changes: 10 additions & 4 deletions simulation-strategies/dtdl/dtdl.simulation-strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,21 @@ export class DtdlSimulationStrategy extends DeviceIntervalSimulator {

// Create measurements series for given dtdl fields details
private createMeasurementsSeries(deviceId: any, parentId: string, fragment: string) {
const dtdlConfigModel = this.config.dtdlModelConfig;
let dtdlConfigModel = this.config.dtdlModelConfig;

const childModelConfigs = dtdlConfigModel.filter(model => model.parentId === parentId && model.simulationType !== 'positionUpdate'
&& model.simulationType !== 'eventCreation');
&& model.simulationType !== 'eventCreation') as any;
if (childModelConfigs && childModelConfigs.length > 0) {
let fragementmap = new Map();
childModelConfigs.forEach(field => {
let modelConfig = field;
if (field.alternateConfigs) {
let cfgIndex = field.alternateConfigs.configIndex ? field.alternateConfigs.configIndex : 0;
modelConfig = field.alternateConfigs.operations[cfgIndex];
}
fragementmap.set(field.series, {
value: this.getMeasurementValue(field, deviceId),
...field.unit && { unit: field.unit }
value: this.getMeasurementValue(modelConfig, deviceId),
...modelConfig.unit && { unit: modelConfig.unit }
})
});
const modelFragmentObject = Array.from(fragementmap.entries()).reduce((main, [key, value]) => ({ ...main, [key]: value }), {});
Expand Down

0 comments on commit a035ef9

Please sign in to comment.