Merge branch 'Dev' of https://github.com/SoftwareAG/Cumulocity-Amber-…

…Boon-Logic into Dev
Cumulocity-IoT · Aug 4, 2023 · e50891c · e50891c
2 parents 26d5f75 + 8634b86
commit e50891c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/frontend/cumulocity-amber-boonlogic/package.json b/frontend/cumulocity-amber-boonlogic/package.json
@@ -3,7 +3,7 @@
  "version": "2.0.2",
  "description": "This is the Cumulocity module federation plugin which used to configure/reconfigure/delete/start - stop stream any device with Amber and is designed to display device model and streaming status on real time basis.",
  "scripts": {
- "start": "c8ycli server ",
+ "start": "c8ycli server", 
  "build": "c8ycli build --env.mode=production",
  "deploy": "c8ycli deploy",
  "postinstall": "ngcc",

diff --git a/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.css b/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.css
@@ -23,9 +23,10 @@
  width: 20px;
  background-color: #bbb;
  border-radius: 50%;
- display: inline-block;
+ display: inline-block !important;
 }
 
+
 .boonlogictable {
  background-color: var(--component-background, #fff);
 }

diff --git a/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.html b/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.html
@@ -193,7 +193,7 @@ <h4 class="m-l-24 p-t-8 text-truncate" translate="">Device Configuration</h4>
  class="modal"
  tabindex="-1"
  role="dialog"
- [ngStyle]="{ display: displayDeRegisterStyle }"
+ [ngStyle]="{ display:displayDeRegisterStyle }"
  >
  >
 

diff --git a/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.ts b/frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.ts
@@ -232,6 +232,7 @@ export class GpBoonlogicComponent implements OnInit, DoCheck, OnDestroy {
  async manageRealtime(device: any): Promise<void> {
  if (this.realtimeState) {
  const index = this.pagedItems.findIndex((element: { id: any }) => element.id === device.id);
+ if(device.c8y_AmberSensorConfiguration){
  const isStreaming = String(device.c8y_AmberSensorConfiguration.isStreaming);
  const arr = {
  id: device.id,
@@ -257,6 +258,8 @@ export class GpBoonlogicComponent implements OnInit, DoCheck, OnDestroy {
  }
  }
  }
+}
+
 
  openModal(template: TemplateRef<any>): void {
  this.modalRef = this.modalService.show(template);

diff --git a/...ty-amberBoonLogic-config-widget/projects/gp-boonlogic/src/lib/gp-boonlogic.component.html b/...ty-amberBoonLogic-config-widget/projects/gp-boonlogic/src/lib/gp-boonlogic.component.html
@@ -149,7 +149,7 @@ <h4 class="m-l-24 p-t-8 text-truncate" translate="">Device Configuration</h4>
  <span
  title="Learning"
  style="margin-right: 5px; background-color: yellowgreen"
- class="dot"
+ class="dot badge badge-success"
  ></span>
  <span title="Monitoring" style="margin-right: 5px" class="dot"></span>
  </div>
@@ -167,7 +167,7 @@ <h4 class="m-l-24 p-t-8 text-truncate" translate="">Device Configuration</h4>
  <span
  title="Learning"
  style="margin-right: 5px"
- class="dot badge badge-success"
+ class="dot"
  ></span>
  <span
  title="Monitoring"