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.

Sign up for GitHub

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

Jump to bottom

Updated git-ignore with .vs-folder #664

Merged
merged 6 commits into from
Sep 12, 2024
Merged

Updated git-ignore with .vs-folder #664

merged 6 commits into from
Sep 12, 2024

Conversation

stalehaugenes
Copy link
Collaborator

No description provided.

@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

proand
proand reviewed Sep 12, 2024
View reviewed changes
projects/fhi-angular-highcharts/src/lib/services/diagram-type-group.service.ts Outdated
case DiagramTypeIdValues.line:
diagramType.disabled = this.disableLine();
break;
// case DiagramTypeIdValues.line:
Copy link
Member

Choose a reason for hiding this comment

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

Lets remove this commented block

projects/fhi-angular-highcharts/src/lib/services/diagram-type-group.service.ts Outdated
@@ -241,7 +241,8 @@ export class DiagramTypeGroupService {
}

private disableLine(): boolean {
if (this.disableBar()) {
console.log('this.flaggedSeries', this.flaggedSeries);
Copy link
Member

Choose a reason for hiding this comment

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

And remove log

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@proand Skal vi beholde metoden selv om den aldri blir brukt?

Copy link
Member

@proand proand Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Nei! Den tenker jeg bør fjernes @stalehaugenes

.../views/shared/dynamic-library-examples/example-components/highcharts/highcharts.component.ts Outdated
text: 'Folkehelseinstituttet',
},
disclaimer: 'Disse dataene kan inneholde feil.',
flags: [{ symbol: '.', label: 'Lar seg ikke beregne pga. ingen observasjoner' }],
Copy link
Member

Choose a reason for hiding this comment

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

Lets only write "Lar seg ikke beregne", since this is an generic example

@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

stalehaugenes
stalehaugenes commented Sep 12, 2024
View reviewed changes
projects/fhi-angular-highcharts/src/lib/services/options.service.ts Outdated
const newSeries = cloneDeep(series);
newSeries.forEach((serie) => {
serie.data.forEach((dataPoint) => {
if (typeof dataPoint.y === 'string' && this.diagramOptions.activeDiagramType === 'line') {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@proand Do we need this check (this.diagramOptions.activeDiagramType === 'line')?

Copy link
Member

Choose a reason for hiding this comment

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

But of course not 😉

@stalehaugenes stalehaugenes marked this pull request as ready for review September 12, 2024 12:48
@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

proand
proand reviewed Sep 12, 2024
View reviewed changes
projects/fhi-angular-highcharts/CHANGELOG.md
@@ -2,7 +2,7 @@

> Sep 12, 2024

* :tada: **Enhancement** Add support for showing diagram type line with multiple series even if flagged
* :tada: **Enhancement** Add support for showing diagram type line with multiple series even if flagged. This will also affect diagram type line with single series: data points will no longer be removed, instead the line will be broken.
Copy link
Member

Choose a reason for hiding this comment

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

Heads up @stalehaugenes, I added some more to the changelog.

@github-actions GitHub Actions
Copy link

Azure Static Web Apps: Your stage site is ready! Visit it here: https://nice-bush-002d75103-664.westeurope.2.azurestaticapps.net

@stalehaugenes stalehaugenes merged commit 3201e9f into dev Sep 12, 2024
2 checks passed
@proand proand linked an issue Sep 12, 2024 that may be closed by this pull request
FHI Angular Highcharts: Enable chart type line with multiple series even if flagged data #638
Closed
@proand proand deleted the enhancement/highcharts-line-flagged-data branch September 12, 2024 13:55
proand pushed a commit that referenced this pull request Sep 12, 2024
Merge branch 'dev' into bugfix/dynamically-add-diagram-types-to-nav
c331a5d 
* dev:
  Add support for showing diagram type line with multiple series even if flagged.  (#664)
proand pushed a commit that referenced this pull request Sep 12, 2024
Merge branch 'dev' into bugfix/dynamically-add-diagram-types-to-nav
a4b02ef 
* dev:
  Add support for showing diagram type line with multiple series even if flagged.  (#664)
proand pushed a commit that referenced this pull request Sep 12, 2024
Merge branch 'dev' into bugfix/decimal-mismatch
079cf54 
* dev:
  Add support for showing diagram type line with multiple series even if flagged.  (#664)
  Release/fhi-angular-highcharts/4.3.0 (#661)
  Release/fhi-angular-components/4.4.1 (#660)
proand pushed a commit that referenced this pull request Sep 17, 2024
Merge branch 'dev' into enhancement/update-angular-v18--bernt
d732ea8 
* dev:
  Bugfix/fhi-tree-view-selection (#679)
  Add test for undefined in FhiTreeViewNavigationComponent (#680)
  Release/fhi-angular-highcharts/4.4.0 (#681)
  Bugfix/highcharts dynamically add diagram types to nav (#665)
  enhancement/highcharts Add support for showing a description below the title in (#673)
  Adjust allowed max widths on the Highcharts (#672)
  Update documentation for Interface FhiDiagramUnit (#670)
  Reduce max decimal places to 9 (#669)
  Don't remove decimals if they end with zero (#668)
  Add null check for unit.decimals (#667)
  Add support for showing diagram type line with multiple series even if flagged.  (#664)
proand pushed a commit that referenced this pull request Sep 18, 2024
Merge branch 'dev' into enhancement/update-angular-v18--bernt
b17c52e 
* dev:
  Release/fhi-angular-components/4.4.2 (#683)
  Bugfix/fhi-tree-view-selection (#679)
  Add test for undefined in FhiTreeViewNavigationComponent (#680)
  Release/fhi-angular-highcharts/4.4.0 (#681)
  Bugfix/highcharts dynamically add diagram types to nav (#665)
  enhancement/highcharts Add support for showing a description below the title in (#673)
  Adjust allowed max widths on the Highcharts (#672)
  Update documentation for Interface FhiDiagramUnit (#670)
  Reduce max decimal places to 9 (#669)
  Don't remove decimals if they end with zero (#668)
  Add null check for unit.decimals (#667)
  Add support for showing diagram type line with multiple series even if flagged.  (#664)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@proand proand proand approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FHI Angular Highcharts: Enable chart type line with multiple series even if flagged data
2 participants
@stalehaugenes @proand