diff --git a/src/app/_layout/header/horizontal/horizontal.component.html b/src/app/_layout/header/horizontal/horizontal.component.html index 091a8c8..a731ced 100644 --- a/src/app/_layout/header/horizontal/horizontal.component.html +++ b/src/app/_layout/header/horizontal/horizontal.component.html @@ -8,7 +8,7 @@
    • -

  • {{_themeSettingsConfig.brand.brand_name}}

    • @@ -20,7 +20,7 @@
    diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.html b/src/app/content/hemat-app/monitoring/detail/detail.component.html index 183c647..e37d497 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.html +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.html @@ -4,6 +4,117 @@
    +
    +
    +
    +
    + Card image cap +
    +

    Basic

    +

    + Some quick example text to build on the card title and make up + the bulk of the card's content. +

    +     Go somewhere +
    +
    +
    +
    +
    +
    +
    +
    +

    List Group

    +

    + Some quick example text to build on the card title and make up + the bulk of the card's content. +

    +
    +
      +
    • + 4 + Cras justo odio +
      • +
    • + 2 + Dapibus ac facilisis in +
      • +
    • + 1 + Morbi leo risus +
      • +
    • + 3 + Porta ac consectetur ac +
      • +
    • + 8 + Vestibulum at eros +
      • +
    +
    + Card link + Another link +
    +
    +
    +
    +
    +
    +
    +
    +

    Carousel

    +
    Support card subtitle
    +
    + +
    +

    + Some quick example text to build on the card title and make up + the bulk of the card's content. +

    +
    +
    +
    +
    +
    +

    Sales and Expenses

    diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.ts b/src/app/content/hemat-app/monitoring/detail/detail.component.ts index 907e9e3..3c9dc2a 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.ts +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts @@ -28,6 +28,60 @@ export class DetailComponent { ) {} @BlockUI("totalReceivables") blockUITotalReceivables: NgBlockUI; @BlockUI("salesRecieptsDues") blockUISalesRecieptsDues: NgBlockUI; + carouselOne = [ + '../../../assets/images/carousel/02.jpg', + '../../../assets/images/carousel/03.jpg', + '../../../assets/images/carousel/01.jpg' + ]; + + ngOnInit() { + this.route.data.subscribe((data) => { + this.mode = data.mode; + }); + if (this.mode === "room") { + this.breadcrumb = { + mainlabel: "Detail Monitoring", + linkBack: "/monitoring/monitoring-room", + isLinkBack: true, + links: [ + { + name: "Home", + isLink: false, + link: "", + }, + { + name: "Detail Monitoring", + isLink: false, + link: "", + }, + ], + }; + } else { + this.breadcrumb = { + mainlabel: "Detail Monitoring", + linkBack: "/monitoring", + isLinkBack: true, + links: [ + { + name: "Home", + isLink: false, + link: "", + }, + { + name: "Detail Monitoring", + isLink: false, + link: "", + }, + ], + }; + } + + this.chartApiservice.getInvoiceData().subscribe((Response) => { + this.data = Response; + this.getInvoicechart(); + }); + } + getInvoicechart() { this.Sales = this.data["sales"]; this.chartOption = { @@ -153,53 +207,6 @@ export class DetailComponent { ], }; } - ngOnInit() { - this.route.data.subscribe((data) => { - this.mode = data.mode; - }); - if (this.mode === "room") { - this.breadcrumb = { - mainlabel: "Detail Monitoring", - linkBack: "/monitoring/monitoring-room", - isLinkBack: true, - links: [ - { - name: "Home", - isLink: false, - link: "", - }, - { - name: "Detail Monitoring", - isLink: false, - link: "", - }, - ], - }; - } else { - this.breadcrumb = { - mainlabel: "Detail Monitoring", - linkBack: "/monitoring", - isLinkBack: true, - links: [ - { - name: "Home", - isLink: false, - link: "", - }, - { - name: "Detail Monitoring", - isLink: false, - link: "", - }, - ], - }; - } - - this.chartApiservice.getInvoiceData().subscribe((Response) => { - this.data = Response; - this.getInvoicechart(); - }); - } reloadTotalReceivables() { this.blockUITotalReceivables.start("Loading.."); diff --git a/src/app/content/hemat-app/monitoring/monitoring.module.ts b/src/app/content/hemat-app/monitoring/monitoring.module.ts index cda61af..f4b58cf 100644 --- a/src/app/content/hemat-app/monitoring/monitoring.module.ts +++ b/src/app/content/hemat-app/monitoring/monitoring.module.ts @@ -19,6 +19,8 @@ import { AddNewBuildingRoomComponent } from './add-new-building-room/add-new-bui import { ArchwizardModule } from 'angular-archwizard'; import { DetailComponent } from './detail/detail.component'; import { NgxEchartsModule } from 'ngx-echarts'; +import { NgxPhotoswipeModule } from '@fnxone/ngx-photoswipe'; +import { NgxMasonryModule } from 'ngx-masonry'; @NgModule({ declarations: [ @@ -41,10 +43,11 @@ import { NgxEchartsModule } from 'ngx-echarts'; ArchwizardModule, BreadcrumbModule, NgbModule, + NgxPhotoswipeModule, + NgxMasonryModule, NgxEchartsModule.forRoot({ echarts: () => import('echarts') }), - BlockUIModule.forRoot({ template: BlockTemplateComponent }), diff --git a/src/app/content/hemat-app/user-access/user-access.component.html b/src/app/content/hemat-app/user-access/user-access.component.html index d6e39fb..a05456d 100644 --- a/src/app/content/hemat-app/user-access/user-access.component.html +++ b/src/app/content/hemat-app/user-access/user-access.component.html @@ -35,7 +35,7 @@