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

Add preset save button #118 #147

Merged
merged 35 commits into from
Jan 18, 2023
Merged

Add preset save button #118 #147

merged 35 commits into from
Jan 18, 2023

Conversation

jandegen
Copy link
Collaborator

@jandegen jandegen commented Dec 15, 2022 •
edited
Loading

This PR includes the complete preset feature set.
You can now create and select presets, which are stored inside the backend

image

(The dropdown list is just empty because of not running backend during the screenshot)

@jandegen jandegen linked an issue Dec 15, 2022 that may be closed by this pull request
Preset Save - 'Save preset' button and Text box #118
Closed
15 tasks
@cypress
Copy link

cypress bot commented Dec 15, 2022 •
edited
Loading


Test summary

30 • 0 • 0 • 0

Run details
Project sosci-frontend
Status Passed
Commit 4eafd0a
Started Jan 17, 2023 9:31 PM
Ended Jan 17, 2023 9:33 PM
Duration 02:12 💡
OS Linux Ubuntu - 22.04
Browser Chrome 108

View run in Cypress Dashboard ➡️

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

nicolaskolbenschlag
nicolaskolbenschlag suggested changes Dec 18, 2022
View reviewed changes
Copy link
Contributor

@nicolaskolbenschlag nicolaskolbenschlag left a comment

Choose a reason for hiding this comment

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

I am unable to run this branch. In docker-compose up --build an error occurs. Did not change anything in the configuration. Running the command on other branches works.

@nicolaskolbenschlag
Copy link
Contributor

Screenshot from 2022-12-18 15-41-34

@jandegen
Copy link
Collaborator Author

Screenshot from 2022-12-18 15-41-34

This PR is still a draft :) So you probably checked out a work in progress.

It should be fixed now, I only need to fix the test cases

jenswaechtler and others added 3 commits December 20, 2022 17:31
@jenswaechtler @rabbit-zero
Add a button for dispatching distributeOffset events
dedd22a 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@jenswaechtler @rabbit-zero
Include button to page
490bf7c 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@jenswaechtler @rabbit-zero
Add test for button
87204cb 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@nicolaskolbenschlag
Copy link
Contributor

I see, sorry. I thought you already want it to be reviewd :)

jenswaechtler and others added 6 commits December 21, 2022 09:49
@jenswaechtler @rabbit-zero
Changed order of distributed waves
76565de 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@jandegen
Run precommit
2f42b47
@jandegen
Fixed amplitude slider
161d516
@jenswaechtler
Merge remote-tracking branch 'origin/dev' into feature/#117-distribut…
c831297 
…e-button

# Conflicts:
#	Apps/frontend/src/views/Oscilloscope.svelte
@jenswaechtler @rabbit-zero
Merged changes
5c4998b 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@jandegen
Fixed test execution
d842168
@jandegen jandegen marked this pull request as ready for review December 21, 2022 10:51
jenswaechtler and others added 8 commits December 21, 2022 11:51
@jenswaechtler @rabbit-zero
Slider change value accordingly to distribute value
f940291 
Co-authored-by: Ingrid Münch <[email protected]>
Signed-off-by: Jens Wächtler <[email protected]>
@PhlppKrmr
Improved channelConfig store implementation
249d2bc 
Signed-off-by: Philipp Kramer <[email protected]>
@jandegen
Merge remote-tracking branch 'origin/dev' into feature/#118-preset-sa…
35fa5a6 
…ve-save-preset-button-and-text-box
@rabbit-zero
by deactivating a channel, the corresponding wave gets invisible, als…
4271201 
…o distributing of waves adapts to number of current active channels
@rabbit-zero
all channels are deactivated now on start up
25a3877
@motschel123
Fixed Button to only distribute once on click
44b58f1 
Signed-off-by: Marcel Schöckel <[email protected]>
@motschel123
Remove no longer used OffsetSlider.svelte
8496971 
Signed-off-by: Marcel Schöckel <[email protected]>
@motschel123
Refactor so Offset uses stores.js as a single source of truth and red…
eb9744b 
…uce clutter

Signed-off-by: Marcel Schöckel <[email protected]>
@jandegen jandegen self-assigned this Jan 17, 2023
@jandegen jandegen linked an issue Jan 17, 2023 that may be closed by this pull request
Preset access - Dropdown list #119
Closed
15 tasks
PhlppKrmr
PhlppKrmr requested changes Jan 17, 2023
View reviewed changes
Copy link
Collaborator

@PhlppKrmr PhlppKrmr left a comment

Choose a reason for hiding this comment

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

First rough review, might add more later on.
I didn't mention some of the stuff regarding the DistributeButton cause it should be fixed when you pull dev when the button is merged in there.

Apps/frontend/src/components/StartStopButton.svelte Outdated Show resolved Hide resolved
Apps/frontend/src/components/DistributeOffsetButton.svelte Outdated Show resolved Hide resolved
Apps/frontend/src/components/StartStopButton.svelte Show resolved Hide resolved
Apps/frontend/src/components/WaveControls.svelte Outdated Show resolved Hide resolved
Apps/frontend/src/main.js Outdated Show resolved Hide resolved
Apps/frontend/src/main.js Show resolved Hide resolved
Apps/frontend/src/views/ChannelConfigControlPanel.svelte Show resolved Hide resolved
Apps/frontend/src/views/ControlPanelSide.svelte Outdated Show resolved Hide resolved
@jandegen jandegen mentioned this pull request Jan 17, 2023
Open
@jandegen jandegen requested a review from PhlppKrmr January 17, 2023 21:46
@jandegen
Copy link
Collaborator Author

jandegen commented Jan 17, 2023 •
edited
Loading

I am unable to run this branch. In docker-compose up --build an error occurs. Did not change anything in the configuration. Running the command on other branches works.

I cannot close your conversion.

motschel123
motschel123 approved these changes Jan 17, 2023
View reviewed changes
Copy link
Collaborator

@motschel123 motschel123 left a comment

Choose a reason for hiding this comment

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

Can't fully test with generator, but the config save&restore works so far without it.
Would be a nice addition to auto hide the view after save/restore

PhlppKrmr
PhlppKrmr approved these changes Jan 18, 2023
View reviewed changes
Copy link
Collaborator

@PhlppKrmr PhlppKrmr left a comment

Choose a reason for hiding this comment

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

Functionality LGTM, some UX not as I'd have expected.

@jandegen jandegen merged commit a373917 into dev Jan 18, 2023
@jandegen jandegen mentioned this pull request Jan 18, 2023
Merged
@motschel123 motschel123 mentioned this pull request Jan 18, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhlppKrmr PhlppKrmr PhlppKrmr approved these changes

@motschel123 motschel123 motschel123 approved these changes

@nicolaskolbenschlag nicolaskolbenschlag Awaiting requested review from nicolaskolbenschlag

Assignees

@jandegen jandegen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Preset access - Dropdown list Preset Save - 'Save preset' button and Text box
6 participants
@jandegen @nicolaskolbenschlag @motschel123 @PhlppKrmr @jenswaechtler @rabbit-zero