From 7a07bf5b07eee0b9320bf2fd39ac07c51c302d80 Mon Sep 17 00:00:00 2001 From: Fuzi_fauzia Date: Thu, 13 Jun 2024 17:14:14 +0700 Subject: [PATCH] penyesuaian UI list room --- src/app/_layout/footer/footer.component.html | 2 +- .../_layout/settings/menu-settings.config.ts | 1432 ++++++++--------- .../cost-management.component.ts | 19 +- .../add-edit-device.component.html | 557 ++++--- .../hemat-app/device/device.component.html | 78 +- .../add-edit-master.component.html | 20 +- .../add-edit-master-building.component.html | 34 +- .../add-edit-master-room.component.html | 97 +- .../building/building.component.html | 4 +- .../monitoring/detail/detail.component.html | 4 +- .../monitoring/detail/detail.component.ts | 3 + .../monitoring/room/room.component.css | 4 +- .../monitoring/room/room.component.html | 27 +- src/app/login/login.component.html | 2 +- 14 files changed, 1162 insertions(+), 1121 deletions(-) diff --git a/src/app/_layout/footer/footer.component.html b/src/app/_layout/footer/footer.component.html index 4414779..f3e7c3e 100644 --- a/src/app/_layout/footer/footer.component.html +++ b/src/app/_layout/footer/footer.component.html @@ -13,7 +13,7 @@ href="https://allbestsistem.com/" target="_blank" style="background-color: #000000 !important;" - >Smart Building Management Systems (V@2024-06-12.01) + >Smart Building Management Systems (V@2024-06-13.01)

diff --git a/src/app/_layout/settings/menu-settings.config.ts b/src/app/_layout/settings/menu-settings.config.ts index b2bb914..0f1c490 100644 --- a/src/app/_layout/settings/menu-settings.config.ts +++ b/src/app/_layout/settings/menu-settings.config.ts @@ -1067,736 +1067,736 @@ export const MenuSettingsConfig: MenuConfig = { } }, - { section: 'APPS', icon: 'la-ellipsis-h' }, - { - title: 'Dashboard', - icon: 'la-home', - page: 'null', - badge: { type: 'badge-info', value: '3' }, - submenu: { - items: [ - { - title: 'Sales', - page: '/dashboard/sales' - }, - { - title: 'Ecommerce', - page: '/dashboard/ecommerce' - }, - { - title: 'Hospital', - page: '/dashboard/hospital' - } - ] - } - }, - { - title: 'Templates', - icon: 'la-television', - page: 'null', - submenu: { - items: [ - { - title: 'Horizontal', - page: 'null' - }, - { - title: 'Vertical', - page: 'null' - }, - ] - } - }, - { - title: 'To Do', - icon: 'la-edit', - page: '/todo-app' - }, - { - title: 'Contacts', - icon: 'la-users', - page: '/contacts' - }, - { - title: 'Email Application', - icon: 'la-envelope', - page: '/email' - }, - { - title: 'Chat Application', - icon: 'la-comments', - page: '/chats' - }, - { - title: 'Calenders', - icon: 'la-calendar', - page: 'null', - submenu: { - items: [ - { - title: 'Basic', - page: '/calender/basic' - }, - { - title: 'Events', - page: '/calender/events' - }, + // { section: 'APPS', icon: 'la-ellipsis-h' }, + // { + // title: 'Dashboard', + // icon: 'la-home', + // page: 'null', + // badge: { type: 'badge-info', value: '3' }, + // submenu: { + // items: [ + // { + // title: 'Sales', + // page: '/dashboard/sales' + // }, + // { + // title: 'Ecommerce', + // page: '/dashboard/ecommerce' + // }, + // { + // title: 'Hospital', + // page: '/dashboard/hospital' + // } + // ] + // } + // }, + // { + // title: 'Templates', + // icon: 'la-television', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Horizontal', + // page: 'null' + // }, + // { + // title: 'Vertical', + // page: 'null' + // }, + // ] + // } + // }, + // { + // title: 'To Do', + // icon: 'la-edit', + // page: '/todo-app' + // }, + // { + // title: 'Contacts', + // icon: 'la-users', + // page: '/contacts' + // }, + // { + // title: 'Email Application', + // icon: 'la-envelope', + // page: '/email' + // }, + // { + // title: 'Chat Application', + // icon: 'la-comments', + // page: '/chats' + // }, + // { + // title: 'Calenders', + // icon: 'la-calendar', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Basic', + // page: '/calender/basic' + // }, + // { + // title: 'Events', + // page: '/calender/events' + // }, - { - title: 'Addevent', - page: '/calender/addevent' - }, - ] - } - }, - { - title: 'KanBan', - icon: 'la-comments', - page: '/kanban' - }, - { section: 'PAGES', icon: 'la-ellipsis-h' }, - { - title: 'News Feed', - icon: 'la-newspaper-o', - page: '/news-feed/news-feed' - }, - { - title: 'Social Feed', - icon: 'la-share-alt', - page: '/social-feed/social-feed' - }, - { - title: 'Invoice', - icon: 'la-clipboard', - page: 'null', - submenu: { - items: [ - { - title: 'Invoice Summary', - page: '/invoice/invoice-summary', - }, - { - title: 'Invoice Template', - page: '/invoice/invoice-template', - }, - { - title: 'Invoice List', - page: '/invoice/invoice-list', - }, - ] - } - }, - { - title: 'Timelines', - icon: 'la-film', - page: 'null', - submenu: { - items: [ - { - title: 'Timelines Center', - page: '/timelines/timelines-center', - }, - { - title: 'Timelines Left ', - page: '/timelines/timelines-left', - }, - { - title: 'Timelines Right ', - page: '/timelines/timelines-right', - }, - { - title: 'Timelines Horizontal', - page: '/timelines/timelines-horizontal', - } - ] - } - }, - { - title: 'User', - icon: 'la-user', - page: 'null', - submenu: { - items: [ - { - title: 'User Profile', - page: '/user/user-profile', - }, - { - title: 'User Cards', - page: '/user/user-cards', - }, - ] - } - }, - { - title: 'Gallery', - icon: 'la-image', - page: 'null', - submenu: { - items: [ - { - title: 'Gallery Grid', - page: '/gallery/gallery-grid', - }, - { - title: 'Gallery Grid with Desc', - page: '/gallery/gallery-grid-desc', - }, - { - title: 'Masonry Gallery', - page: '/gallery/masonry-gallery', - }, - { - title: 'Hover Effect', - page: '/gallery/hover-effect', - }, - ] - } - }, - { - title: 'File Uploader', - icon: 'la la-cloud-upload', - page: 'null', - submenu: { - items: [ - { - title: 'Dropzone', - page: '/dropzone/dropzone', - } - ] - } - }, - { - title: 'Search', - icon: 'la-search', - page: 'null', - submenu: { - items: [ - { - title: 'Search Page', - page: '/others/searchPage', - }, - { - title: 'Search Website', - page: '/search/searchWebsite', - }, - { - title: 'Search Images', - page: '/search/searchImages', - }, - { - title: 'Search Videos', - page: '/search/searchVideos', - }, - ] - } - }, - { - title: 'Authentication', - icon: 'la-unlock', - page: 'null', - submenu: { - items: [ - { - title: 'Login Simple', - page: '/authentication/loginSimple', - }, - { - title: 'Login With Bg', - page: '/authentication/loginWithBg', - }, - { - title: 'Login With Bg Image', - page: '/authentication/loginWithBgImage', - }, - { - title: 'Login With Navbar', - page: '/authentication/loginWithNavbar', - }, - { - title: 'Login Advanced', - page: '/authentication/loginAdvanced', - }, - { - title: 'Register Simple', - page: '/authentication/registerSimple', - }, - { - title: 'Register With Bg', - page: '/authentication/registerWithBg', - }, - { - title: 'Register With Bg Image', - page: '/authentication/registerWithBgImage', - }, - { - title: 'Register With Navbar', - page: '/authentication/registerWithNavbar', - }, - { - title: 'Register Advanced', - page: '/authentication/registerAdvanced', - }, - { - title: 'Unlock User', - page: '/authentication/unlockUser', - }, - { - title: 'recover-password', - page: '/authentication/recoverPassword', - }, - ] - } - }, - { - title: 'Error', - icon: 'la-warning', - page: 'null', - submenu: { - items: [ - { - title: 'Error 400', - page: '/error/error400', - }, - { - title: 'Error 400 with Navbar', - page: '/error/error400WithNavbar', - }, - { - title: 'Error 401', - page: '/error/error401', - }, - { - title: 'Error 401 with Navbar', - page: '/error/error401WithNavbar', - }, - { - title: 'Error 403', - page: '/error/error403', - }, - { - title: 'Error 403 with Navbar', - page: '/error/error403WithNavbar', - }, - { - title: 'Error 404', - page: '/error/error404', - }, - { - title: 'Error 404 with Navbar', - page: '/error/error404WithNavbar', - }, - { - title: 'Error 500', - page: '/error/error500', - }, - { - title: 'Error 500 with Navbar', - page: '/error/error500WithNavbar', - }, - ] - } - }, - { - title: 'Others', - icon: 'la-file-text', - page: 'null', - submenu: { - items: [ - { - title: 'Coming Soon', - page: 'null', - submenu: { - items: [ - { - title: 'Flat', - page: '/others/flat' - }, - { - title: 'Bg image', - page: '/others/bgImage' - }, - // { - // title: 'Bg video', - // page: '/others/bgVideo' - // }, - ] - } - }, - { - title: 'Maintenance', - page: '/others/maintenance' - }, - ] - } - }, - { section: 'USER INTERFACE', icon: 'la-ellipsis-h' }, - { - title: 'Cards', - page: '/cards/bootstrap', - icon: 'la-tablet' - }, - { - title: 'Advance Cards', - icon: 'la-fire', - page: 'null', - submenu: { - items: [ - { - title: 'Statistics', - page: '/advanceCards/statistics' - }, - { - title: 'Social', - page: '/advanceCards/social' - }, - { - title: 'Charts', - page: '/advanceCards/charts' - }, - ] - } - }, - { - title: 'Components', - icon: 'la-server', - page: 'null', - submenu: { - items: [ - { - title: 'Alerts', - page: '/components/alerts' - }, - { - title: 'Callout', - page: '/components/callout' - }, - { - title: 'Buttons', - page: 'null', - submenu: { - items: [ - { - title: 'Basic Buttons', - page: '/components/basic-buttons' - }, - { - title: 'Extended Buttons', - page: '/components/extended-buttons' - } - ] - } - }, - { - title: 'Carousel', - page: '/components/carousel' - }, - { - title: 'Collapse', - page: '/components/collapse' - }, - { - title: 'Dropdowns', - page: '/components/dropdowns' - }, - { - title: 'List Group', - page: '/components/list-group' - }, - { - title: 'Modals', - page: '/components/modals' - }, - { - title: 'Pagination', - page: '/components/pagination' - }, - { - title: 'Navs Component', - page: '/components/navs' - }, - { - title: 'Pills Component', - page: '/components/pills' - }, - { - title: 'Tooltips', - page: '/components/tooltips' - }, - { - title: 'Popovers', - page: '/components/popovers' - }, - { - title: 'Badges', - page: '/components/badges' - }, - { - title: 'Pill Badges', - page: '/components/pill-badges' - }, - { - title: 'Progress', - page: '/components/progress' - }, - { - title: 'Media Objects', - page: '/components/mediaobjects' - }, - { - title: 'Scrollable', - page: '/components/scrollable' - }, - { - title: 'Spinners', - page: '/components/spinners' - }, - ] - } - }, - { - title: 'Extra Components', - icon: 'la-diamond', - page: 'null', - submenu: { - items: [ - { - title: 'Date Time Picker', - page: '/extraComponents/dateTimePicker' - }, - { - title: 'TypeAhead', - page: '/extraComponents/typeAhead' - }, - { - title: 'Text Editer', - page: '/extraComponents/text-editor' - } - ] - } - }, - { - title: 'Icons', + // { + // title: 'Addevent', + // page: '/calender/addevent' + // }, + // ] + // } + // }, + // { + // title: 'KanBan', + // icon: 'la-comments', + // page: '/kanban' + // }, + // { section: 'PAGES', icon: 'la-ellipsis-h' }, + // { + // title: 'News Feed', + // icon: 'la-newspaper-o', + // page: '/news-feed/news-feed' + // }, + // { + // title: 'Social Feed', + // icon: 'la-share-alt', + // page: '/social-feed/social-feed' + // }, + // { + // title: 'Invoice', + // icon: 'la-clipboard', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Invoice Summary', + // page: '/invoice/invoice-summary', + // }, + // { + // title: 'Invoice Template', + // page: '/invoice/invoice-template', + // }, + // { + // title: 'Invoice List', + // page: '/invoice/invoice-list', + // }, + // ] + // } + // }, + // { + // title: 'Timelines', + // icon: 'la-film', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Timelines Center', + // page: '/timelines/timelines-center', + // }, + // { + // title: 'Timelines Left ', + // page: '/timelines/timelines-left', + // }, + // { + // title: 'Timelines Right ', + // page: '/timelines/timelines-right', + // }, + // { + // title: 'Timelines Horizontal', + // page: '/timelines/timelines-horizontal', + // } + // ] + // } + // }, + // { + // title: 'User', + // icon: 'la-user', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'User Profile', + // page: '/user/user-profile', + // }, + // { + // title: 'User Cards', + // page: '/user/user-cards', + // }, + // ] + // } + // }, + // { + // title: 'Gallery', + // icon: 'la-image', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Gallery Grid', + // page: '/gallery/gallery-grid', + // }, + // { + // title: 'Gallery Grid with Desc', + // page: '/gallery/gallery-grid-desc', + // }, + // { + // title: 'Masonry Gallery', + // page: '/gallery/masonry-gallery', + // }, + // { + // title: 'Hover Effect', + // page: '/gallery/hover-effect', + // }, + // ] + // } + // }, + // { + // title: 'File Uploader', + // icon: 'la la-cloud-upload', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Dropzone', + // page: '/dropzone/dropzone', + // } + // ] + // } + // }, + // { + // title: 'Search', + // icon: 'la-search', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Search Page', + // page: '/others/searchPage', + // }, + // { + // title: 'Search Website', + // page: '/search/searchWebsite', + // }, + // { + // title: 'Search Images', + // page: '/search/searchImages', + // }, + // { + // title: 'Search Videos', + // page: '/search/searchVideos', + // }, + // ] + // } + // }, + // { + // title: 'Authentication', + // icon: 'la-unlock', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Login Simple', + // page: '/authentication/loginSimple', + // }, + // { + // title: 'Login With Bg', + // page: '/authentication/loginWithBg', + // }, + // { + // title: 'Login With Bg Image', + // page: '/authentication/loginWithBgImage', + // }, + // { + // title: 'Login With Navbar', + // page: '/authentication/loginWithNavbar', + // }, + // { + // title: 'Login Advanced', + // page: '/authentication/loginAdvanced', + // }, + // { + // title: 'Register Simple', + // page: '/authentication/registerSimple', + // }, + // { + // title: 'Register With Bg', + // page: '/authentication/registerWithBg', + // }, + // { + // title: 'Register With Bg Image', + // page: '/authentication/registerWithBgImage', + // }, + // { + // title: 'Register With Navbar', + // page: '/authentication/registerWithNavbar', + // }, + // { + // title: 'Register Advanced', + // page: '/authentication/registerAdvanced', + // }, + // { + // title: 'Unlock User', + // page: '/authentication/unlockUser', + // }, + // { + // title: 'recover-password', + // page: '/authentication/recoverPassword', + // }, + // ] + // } + // }, + // { + // title: 'Error', + // icon: 'la-warning', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Error 400', + // page: '/error/error400', + // }, + // { + // title: 'Error 400 with Navbar', + // page: '/error/error400WithNavbar', + // }, + // { + // title: 'Error 401', + // page: '/error/error401', + // }, + // { + // title: 'Error 401 with Navbar', + // page: '/error/error401WithNavbar', + // }, + // { + // title: 'Error 403', + // page: '/error/error403', + // }, + // { + // title: 'Error 403 with Navbar', + // page: '/error/error403WithNavbar', + // }, + // { + // title: 'Error 404', + // page: '/error/error404', + // }, + // { + // title: 'Error 404 with Navbar', + // page: '/error/error404WithNavbar', + // }, + // { + // title: 'Error 500', + // page: '/error/error500', + // }, + // { + // title: 'Error 500 with Navbar', + // page: '/error/error500WithNavbar', + // }, + // ] + // } + // }, + // { + // title: 'Others', + // icon: 'la-file-text', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Coming Soon', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Flat', + // page: '/others/flat' + // }, + // { + // title: 'Bg image', + // page: '/others/bgImage' + // }, + // // { + // // title: 'Bg video', + // // page: '/others/bgVideo' + // // }, + // ] + // } + // }, + // { + // title: 'Maintenance', + // page: '/others/maintenance' + // }, + // ] + // } + // }, + // { section: 'USER INTERFACE', icon: 'la-ellipsis-h' }, + // { + // title: 'Cards', + // page: '/cards/bootstrap', + // icon: 'la-tablet' + // }, + // { + // title: 'Advance Cards', + // icon: 'la-fire', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Statistics', + // page: '/advanceCards/statistics' + // }, + // { + // title: 'Social', + // page: '/advanceCards/social' + // }, + // { + // title: 'Charts', + // page: '/advanceCards/charts' + // }, + // ] + // } + // }, + // { + // title: 'Components', + // icon: 'la-server', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Alerts', + // page: '/components/alerts' + // }, + // { + // title: 'Callout', + // page: '/components/callout' + // }, + // { + // title: 'Buttons', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Basic Buttons', + // page: '/components/basic-buttons' + // }, + // { + // title: 'Extended Buttons', + // page: '/components/extended-buttons' + // } + // ] + // } + // }, + // { + // title: 'Carousel', + // page: '/components/carousel' + // }, + // { + // title: 'Collapse', + // page: '/components/collapse' + // }, + // { + // title: 'Dropdowns', + // page: '/components/dropdowns' + // }, + // { + // title: 'List Group', + // page: '/components/list-group' + // }, + // { + // title: 'Modals', + // page: '/components/modals' + // }, + // { + // title: 'Pagination', + // page: '/components/pagination' + // }, + // { + // title: 'Navs Component', + // page: '/components/navs' + // }, + // { + // title: 'Pills Component', + // page: '/components/pills' + // }, + // { + // title: 'Tooltips', + // page: '/components/tooltips' + // }, + // { + // title: 'Popovers', + // page: '/components/popovers' + // }, + // { + // title: 'Badges', + // page: '/components/badges' + // }, + // { + // title: 'Pill Badges', + // page: '/components/pill-badges' + // }, + // { + // title: 'Progress', + // page: '/components/progress' + // }, + // { + // title: 'Media Objects', + // page: '/components/mediaobjects' + // }, + // { + // title: 'Scrollable', + // page: '/components/scrollable' + // }, + // { + // title: 'Spinners', + // page: '/components/spinners' + // }, + // ] + // } + // }, + // { + // title: 'Extra Components', + // icon: 'la-diamond', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Date Time Picker', + // page: '/extraComponents/dateTimePicker' + // }, + // { + // title: 'TypeAhead', + // page: '/extraComponents/typeAhead' + // }, + // { + // title: 'Text Editer', + // page: '/extraComponents/text-editor' + // } + // ] + // } + // }, + // { + // title: 'Icons', - icon: 'la-eye', - page: 'null', - submenu: { - items: [ - { - title: 'Feather', - page: '/icons/feather' - }, - { - title: 'Line Awesome', - page: '/icons/line-awesome' - }, - { - title: 'Meteocons', - page: '/icons/meteocons' - }, - { - title: 'Simple Line Icons', - page: '/icons/simple-line-icons' - } - ] - } - }, - { section: 'FORMS', icon: 'la-ellipsis-h' }, - { - title: 'Form Elements', + // icon: 'la-eye', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Feather', + // page: '/icons/feather' + // }, + // { + // title: 'Line Awesome', + // page: '/icons/line-awesome' + // }, + // { + // title: 'Meteocons', + // page: '/icons/meteocons' + // }, + // { + // title: 'Simple Line Icons', + // page: '/icons/simple-line-icons' + // } + // ] + // } + // }, + // { section: 'FORMS', icon: 'la-ellipsis-h' }, + // { + // title: 'Form Elements', - icon: 'la-terminal', - page: 'null', - submenu: { - items: [ - { - title: 'Form Inputs', - page: '/form-elements/form-inputs' - }, - { - title: 'Input Groups', - page: '/form-elements/input-groups' - }, - { - title: 'Input Grid', - page: '/form-elements/input-grid' - }, - { - title: 'Checkboxes & Radios', - page: '/form-elements/checkboxes-radios' - }, - { - title: 'Switch', - page: '/form-elements/switch' - }, - { - title: 'Select', - page: '/form-elements/select' - }, - { - title: 'Extended Inputs', - page: '/form-elements/extendedinputs' - }, - ] - } - }, - { - title: 'Form Layouts', + // icon: 'la-terminal', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Form Inputs', + // page: '/form-elements/form-inputs' + // }, + // { + // title: 'Input Groups', + // page: '/form-elements/input-groups' + // }, + // { + // title: 'Input Grid', + // page: '/form-elements/input-grid' + // }, + // { + // title: 'Checkboxes & Radios', + // page: '/form-elements/checkboxes-radios' + // }, + // { + // title: 'Switch', + // page: '/form-elements/switch' + // }, + // { + // title: 'Select', + // page: '/form-elements/select' + // }, + // { + // title: 'Extended Inputs', + // page: '/form-elements/extendedinputs' + // }, + // ] + // } + // }, + // { + // title: 'Form Layouts', - icon: 'la-file-text', - page: 'null', - submenu: { - items: [ - { - title: 'Basic Forms', - page: '/form-layouts/basic-forms' - }, - { - title: 'Horizontal Forms', - page: '/form-layouts/horizontal-forms' - }, - { - title: 'Hidden Labels', - page: '/form-layouts/hidden-labels' - }, - { - title: 'Form Actions', - page: '/form-layouts/form-actions' - }, - { - title: 'Row Separator', - page: '/form-layouts/row-separator' - }, - { - title: 'Bordered', - page: '/form-layouts/bordered' - }, - { - title: 'Striped Rows', - page: '/form-layouts/striped-rows' - }, - { - title: 'Striped Labels', - page: '/form-layouts/striped-labels' - }, - ] - } - }, - { - title: 'Form Wizard', + // icon: 'la-file-text', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Basic Forms', + // page: '/form-layouts/basic-forms' + // }, + // { + // title: 'Horizontal Forms', + // page: '/form-layouts/horizontal-forms' + // }, + // { + // title: 'Hidden Labels', + // page: '/form-layouts/hidden-labels' + // }, + // { + // title: 'Form Actions', + // page: '/form-layouts/form-actions' + // }, + // { + // title: 'Row Separator', + // page: '/form-layouts/row-separator' + // }, + // { + // title: 'Bordered', + // page: '/form-layouts/bordered' + // }, + // { + // title: 'Striped Rows', + // page: '/form-layouts/striped-rows' + // }, + // { + // title: 'Striped Labels', + // page: '/form-layouts/striped-labels' + // }, + // ] + // } + // }, + // { + // title: 'Form Wizard', - icon: 'la-paste', - page: '/form-wizard', - // submenu: { - // items: [ - // { - // title: 'Circle Style', - // page: '/form-wizard/circle-style' - // }, - // ] - // } - }, - { - title: 'Form Repeater', + // icon: 'la-paste', + // page: '/form-wizard', + // // submenu: { + // // items: [ + // // { + // // title: 'Circle Style', + // // page: '/form-wizard/circle-style' + // // }, + // // ] + // // } + // }, + // { + // title: 'Form Repeater', - icon: 'la-repeat', - page: '/form-repeater' - }, - { section: 'TABLE', icon: 'la-ellipsis-h' }, - { - title: 'Boostrap Tables', + // icon: 'la-repeat', + // page: '/form-repeater' + // }, + // { section: 'TABLE', icon: 'la-ellipsis-h' }, + // { + // title: 'Boostrap Tables', - icon: 'la-table', - page: 'null', - submenu: { - items: [ - { - title: 'Basic Table', - page: '/boostraptables/basictable' - }, - { - title: 'Table Border', - page: '/boostraptables/tableborder' - }, - { - title: 'Table Sizing', - page: '/boostraptables/tablesizing' - }, - { - title: 'Table Styling', - page: '/boostraptables/tablestyling' - }, - { - title: 'Table Components', - page: '/boostraptables/tablecomponents' - }, - { - title: 'Ngx BoostrapTables', - page: '/boostraptables/ngxboostraptables' - }, - ] - } - }, - { - title: 'Data Tables', + // icon: 'la-table', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Basic Table', + // page: '/boostraptables/basictable' + // }, + // { + // title: 'Table Border', + // page: '/boostraptables/tableborder' + // }, + // { + // title: 'Table Sizing', + // page: '/boostraptables/tablesizing' + // }, + // { + // title: 'Table Styling', + // page: '/boostraptables/tablestyling' + // }, + // { + // title: 'Table Components', + // page: '/boostraptables/tablecomponents' + // }, + // { + // title: 'Ngx BoostrapTables', + // page: '/boostraptables/ngxboostraptables' + // }, + // ] + // } + // }, + // { + // title: 'Data Tables', - icon: 'la-th', - page: 'null', - submenu: { - items: [ - { - title: 'Basic Installation', - page: '/datatables/basicinitialisation' + // icon: 'la-th', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Basic Installation', + // page: '/datatables/basicinitialisation' - }, - { - title: 'Styling', - page: '/datatables/styling' - }, - { - title: 'API', - page: '/datatables/api' + // }, + // { + // title: 'Styling', + // page: '/datatables/styling' + // }, + // { + // title: 'API', + // page: '/datatables/api' - }, - ] - } - }, - { - title: 'DataTables Ext', + // }, + // ] + // } + // }, + // { + // title: 'DataTables Ext', - icon: 'la-th-large', - page: 'null', - submenu: { - items: [ - { - title: 'Buttons', - page: '/datatablesext/buttons' + // icon: 'la-th-large', + // page: 'null', + // submenu: { + // items: [ + // { + // title: 'Buttons', + // page: '/datatablesext/buttons' - }, - { - title: 'HTML5 Data Export', - page: '/datatablesext/html5dataexport' + // }, + // { + // title: 'HTML5 Data Export', + // page: '/datatablesext/html5dataexport' - }, - { - title: 'Hidden On load', - page: '/datatablesext/hiddentable' + // }, + // { + // title: 'Hidden On load', + // page: '/datatablesext/hiddentable' - }, - ] - } - }, - { section: 'CHARTS', icon: 'la-ellipsis-h' }, - { - title: 'Chartjs', - icon: 'la-bar-chart', - page: '/chartjs/charts', - }, - { - title: 'Chartist', - icon: 'la-pie-chart', - page: '/ngchartist/linecharts' - }, + // }, + // ] + // } + // }, + // { section: 'CHARTS', icon: 'la-ellipsis-h' }, + // { + // title: 'Chartjs', + // icon: 'la-bar-chart', + // page: '/chartjs/charts', + // }, + // { + // title: 'Chartist', + // icon: 'la-pie-chart', + // page: '/ngchartist/linecharts' + // }, // { // title: 'Starter Kit', // icon: 'la-puzzle-piece', diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.ts b/src/app/content/hemat-app/cost-management/cost-management.component.ts index 8489183..a7d40e9 100644 --- a/src/app/content/hemat-app/cost-management/cost-management.component.ts +++ b/src/app/content/hemat-app/cost-management/cost-management.component.ts @@ -28,6 +28,7 @@ export class CostManagementComponent implements OnInit { dataMasterCategori: any; dataBuildingList: any; public focucedElement = ""; + spinnerActive = false; spinnerActiveActual = false; spinnerFilterActive = false; @@ -245,12 +246,12 @@ export class CostManagementComponent implements OnInit { } doFilter() { - const requestData = { - building: this.buildingSelected, - category: this.categorySelected, - date: this.dateSelected, - searchTerm: this.searchTerm, - }; + // const requestData = { + // building: this.buildingSelected, + // category: this.categorySelected, + // date: this.dateSelected, + // searchTerm: this.searchTerm, + // }; this.spinnerFilterActive = true; setTimeout(() => { this.spinnerFilterActive = false; @@ -259,9 +260,9 @@ export class CostManagementComponent implements OnInit { this.dateSelected, this.categorySelected ); - this.dataCompWaterElectCost(this.buildingSelected); - this.dataCompPrevMonthCost(this.buildingSelected); - this.dataCompActEstCost(this.buildingSelected); + // this.dataCompWaterElectCost(this.buildingSelected); + // this.dataCompPrevMonthCost(this.buildingSelected); + // this.dataCompActEstCost(this.buildingSelected); }, 3000); } diff --git a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html index fe6bd51..991e53f 100644 --- a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html +++ b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html @@ -1,4 +1,4 @@ -
+
@@ -7,331 +7,318 @@
- - -

- {{ - isEditMode() - ? "Edit Device" - : isViewMode() - ? "View Device" - : "Add New Device" - }} -

- - -
+
+
-
-

- General Information -

-
-
-
- - - -
- Device Name is required +

+ {{ + isEditMode() + ? "Edit Device" + : isViewMode() + ? "View Device" + : "Add New Device" + }} +

+
+
+ +
+

+ + General Information +

+
+
+
+ + + +
+ Device Name is required +
+ +
+
+
+
+ +
+
- + +
+ Category is required +
+ +
-
-
- -
+
+
+
+ +
+ +
+ +
+ Voltage is required +
+ +
+
+
+
+ -
- -
+ +
+ Type is required +
+
- -
- Category is required -
-
-
-
-
-
- -
+
+
+
+ -
- -
+ +
+ Duration is required +
+ +
+
+
+
+ + + +
+ Status is required +
+
- -
- Voltage is required -
-
-
-
- - - -
- Type is required -
- + + +
+ location room is required +
+ +
+
+
+
+ + + +
+ watt is required +
+ +
-
-
-
- - - -
- Duration is required -
- -
-
-
-
- - - -
- Status is required -
- -
-
-
-
-
-
- - - -
- location room is required -
- -
-
-
-
- - - -
- watt is required -
- -
-
-
- - -
-
- - -
- - - + Save + +
+ +
+
+
- diff --git a/src/app/content/hemat-app/device/device.component.html b/src/app/content/hemat-app/device/device.component.html index 486d16f..0ed0a46 100644 --- a/src/app/content/hemat-app/device/device.component.html +++ b/src/app/content/hemat-app/device/device.component.html @@ -85,9 +85,7 @@
-
+
@@ -95,6 +93,7 @@
-
-
- -
-
-
+
+ +
@@ -238,7 +240,9 @@ ngx-datatable-cell-template let-value="value" > -

{{ value.name }}

+

+ {{ value.name }} +

-

{{ value }}

+

{{ value }}

 -

{{ value.name }}

+

+ {{ value.name }} +

-

{{ value.name }}

+

+ {{ value.name }} +

-

{{ value.name }}

+

+ {{ value.name }} +

-
- -
-
- - -
- \ No newline at end of file +
+ +
+
+ + +
diff --git a/src/app/content/hemat-app/monitoring/building/building.component.html b/src/app/content/hemat-app/monitoring/building/building.component.html index a6dc9f9..32c7b79 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.html +++ b/src/app/content/hemat-app/monitoring/building/building.component.html @@ -29,7 +29,7 @@ class="text-muted mb-1 font-weight-bold" style="font-family: Montserrat, sans-serif; color: #ffffff !important;" > - Building Name + Building

{{ data.total }} kWh

-
Consumtion
+
Consumption
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 4380feb..4f6f80a 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.html +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.html @@ -88,7 +88,7 @@ color: #ffffff; " class="barchart" - height="328" + height="400" width="1900" baseChart [datasets]="barChartData" @@ -247,7 +247,7 @@ {{ item.value }}%{{ item.value.toFixed(1) }}%

+
@@ -10,34 +10,34 @@
-
+
-
+
-
+
- Room Name + Room

{{ data.name }}

@@ -49,12 +49,13 @@
-

265 kWh

-
Consumtion
+

{{data.totalKwh}} kWh

+
Consumption
@@ -63,12 +64,12 @@ height="7px" width="100%" type="warning" - value="75" + value="{{data.totalKwh}}" >
-
+
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index e528ac3..8b9332c 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -136,7 +136,7 @@

- (v@2024.06.12.01) + (v@2024.06.13.01)