Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MG-93 - Add bootstraps charts support #122

Merged
merged 10 commits into from
Feb 15, 2024

Conversation

Musilah
Copy link
Contributor

@Musilah Musilah commented Feb 7, 2024

What type of PR is this?

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update
  • Dependency Update

What does this do?

This adds more charts from bootstrap

Which issue(s) does this PR fix/relate to?

Have you included tests for your changes?

  • Yes
  • No

Did you document any new/modified functionality?

  • Yes
  • No

Notes

The charts being added include:

  • value card
  • value and chart card
  • alarm count
  • entity count
  • alarm table
  • entity table
  • label card
  • progress bar

Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
@Musilah Musilah marked this pull request as ready for review February 13, 2024 16:58
@ianmuchyri
Copy link
Contributor

Fix the height styling. There is too much unnecessary space at the bottom

image

});
} else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only works for widgets with cards in them. For the rest with the tables and progress bar it does not work well check on that

image

@@ -124,4 +132,4 @@ <h5 id="widgetsCanvasLabel">Widgets</h5>
<script src="/js/singleDashboard.js"></script>
</body>
</html>
{{ end }}
{{ end }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add empty line

Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Copy link
Contributor

@felixgateru felixgateru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resizing of the widgets is still not optimal but is being handled by issue #129

@dborovcanin dborovcanin merged commit 2169d9a into absmach:dashboards Feb 15, 2024
dborovcanin added a commit that referenced this pull request Feb 15, 2024
* NOISSUE - Add support for dashboards (#91)

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* NOISSUE - Add placeholder to the canvas with no widget (#127)

* add a widget placeholder to the dashboard

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* remove vh-50 on nowidgetplaceholder

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* make add widget add widgets

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

---------

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* NOISSUE - Fix nowidget placeholder (#150)

* check items length to determine if items present

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* remove comments

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* fix lint error

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

---------

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* NOISSUE - Fix chart CSS (#154)

* fix card css

this will prevent the css from affecting
all card elements that will be added in the future

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* move styles to the styles file

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* remove unused parameter in transport.go

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

---------

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* MG-93 - Add more Apache Echarts (#117)

* add billboard.js files

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* add multigauge

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix gauge charts

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix: format documents

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix: size issues

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* capitalise line chart

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix multiple line chart tag

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix resizing

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* replace bbcharts

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix spelling error

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

---------

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* MG-111- Modify Chart modals (#123)

* Modify chart modals

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

* Add apperance tab to charts

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

* Rename form inputs

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

* Refactor code

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

* Add spacing between nav tab and form

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

---------

Signed-off-by: felix.gateru <felix.gateru@gmail.com>

* MG-93 - Add bootstraps charts support (#122)

* fix edit widgets

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix save layout

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* add config

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix all charts addwidget function

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix all charts save

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix resize

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix resizing

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix gauges sizes

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* fix height issue

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

* remove valueandbarchart

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

---------

Signed-off-by: Musilah <nataleigh.nk@gmail.com>

---------

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>
Signed-off-by: Musilah <nataleigh.nk@gmail.com>
Signed-off-by: felix.gateru <felix.gateru@gmail.com>
Co-authored-by: Ian Ngethe Muchiri <100555904+ianmuchyri@users.noreply.github.com>
Co-authored-by: Nataly Musilah <115026536+Musilah@users.noreply.github.com>
Co-authored-by: Felix Gateru <felix.gateru@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants