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

Feature: Angular result selection (merged) #196

Merged
merged 57 commits into from May 16, 2019

Conversation

Projects
None yet
5 participants
@finnmartens
Copy link
Contributor

commented May 16, 2019

Merges the following PRs so that a uniform status is achieved:

  • Measurands Selection as Angular component (Result Selection)
  • Feature: Angular page browser connectivity result selection
  • Feature/angular module for job group selection
  • [IT-2649] Time Frame Selection as Angular component

finnmartens and others added some commits Mar 4, 2019

[IT-2647] Added models for the result selection service and methods f…
…or communication with the ResultSelectionController.
[IT-2647] Only include used parameters in the service and added model…
…s for charts and jobgroups with pages.
Merge develop into feature/angularModuleForResultSelection
# Conflicts:
#	frontend/src/app/modules/result-selection/result-selection.module.ts
#	frontend/src/app/modules/result-selection/services/result-selection.service.spec.ts
#	frontend/src/app/modules/result-selection/services/result-selection.service.ts
#	grails-app/i18n/messages.properties
#	grails-app/i18n/messages_de.properties
jiayi
[IT-2651] Added ng-select dependency for having a searchable and modi…
…fiable dropdown menu and upgraded other dependencies to resolve some security issues.
jiayi
Finn Martens
[IT-2651] Added filter mechanism so that the selectable sub-category …
…items are correctly related to their parent.
Merge remote-tracking branch 'origin/develop' into feature/angularPag…
…eBrowserConnectivityResultSelection

# Conflicts:
#	grails-app/i18n/messages.properties
#	grails-app/i18n/messages_de.properties

finnmartens and others added some commits May 7, 2019

Merge remote-tracking branch 'origin/develop' into feature/angularMod…
…uleForResultSelection

# Conflicts:
#	grails-app/i18n/messages.properties
#	grails-app/i18n/messages_de.properties
jiayi
Update frontend/src/app/modules/result-selection/components/result-se…
…lection-job-group/result-selection-job-group.component.ts

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Update frontend/src/app/modules/result-selection/components/result-se…
…lection-job-group/result-selection-job-group.component.ts

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Update frontend/src/app/modules/result-selection/components/result-se…
…lection-job-group/result-selection-job-group.component.ts

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Update frontend/src/app/modules/result-selection/result-selection.com…
…ponent.html

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Update frontend/src/app/modules/result-selection/components/result-se…
…lection-job-group/result-selection-job-group.component.html

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Update frontend/src/app/modules/result-selection/components/result-se…
…lection-job-group/result-selection-job-group.component.html

Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Apply suggestions from code review
Co-Authored-By: jiayiw5 <32901577+jiayiw5@users.noreply.github.com>
Fix typo
Co-Authored-By: Finn Martens <36506629+finnmartens@users.noreply.github.com>
Merge remote-tracking branch 'origin/feature/angularModuleForJobGroup…
…Selection' into feature/angularResultSelection

# Conflicts:
#	frontend/src/app/modules/result-selection/components/result-selection-application/result-selection-application.component.html
#	frontend/src/app/modules/result-selection/components/result-selection-application/result-selection-application.component.spec.ts
#	frontend/src/app/modules/result-selection/components/result-selection-application/result-selection-application.component.ts
#	frontend/src/app/modules/result-selection/components/result-selection-time-frame/result-selection-time-frame.component.spec.ts
#	frontend/src/app/modules/result-selection/components/result-selection-time-frame/result-selection-time-frame.component.ts
#	frontend/src/app/modules/result-selection/result-selection.component.html
#	frontend/src/app/modules/result-selection/result-selection.component.spec.ts
#	frontend/src/app/modules/result-selection/result-selection.module.ts
#	frontend/src/app/modules/result-selection/services/result-selection.service.ts
#	grails-app/i18n/messages.properties
#	grails-app/i18n/messages_de.properties
Merge branch 'feature/angularPageBrowserConnectivityResultSelection' …
…into feature/angularResultSelection

# Conflicts:
#	frontend/src/app/modules/result-selection/result-selection.component.html
#	frontend/src/app/modules/result-selection/result-selection.component.spec.ts
#	frontend/src/app/modules/result-selection/result-selection.module.ts
#	grails-app/i18n/messages_de.properties
Merge remote-tracking branch 'origin/feature/angularMeasurandsResultS…
…election' into feature/angularResultSelection

# Conflicts:
#	frontend/src/app/modules/result-selection/result-selection.component.html
#	frontend/src/app/modules/result-selection/result-selection.component.spec.ts
#	frontend/src/app/modules/result-selection/result-selection.module.ts
#	grails-app/i18n/messages.properties
#	grails-app/i18n/messages_de.properties
@sburnicki

This comment has been minimized.

Copy link
Member

commented May 16, 2019

This includes #179, #184, #186 and #191

@sburnicki sburnicki merged commit f7137f4 into develop May 16, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@sburnicki sburnicki deleted the feature/angularResultSelection branch May 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.