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

Merge Staging into Main branch #510

Merged
merged 246 commits into from
Aug 9, 2024
Merged

Merge Staging into Main branch #510

merged 246 commits into from
Aug 9, 2024

Conversation

alireza-dhp
Copy link
Member

No description provided.

iaigner and others added 30 commits November 10, 2023 09:06
…2-10-smf-add-new-information-to-study-elements
…ion-to-study-elements

MORE2-10: add information to observation list and intervention dialog
…ervation-dialog

More2 12 smf adapt create observation dialog
…e-scheduler-concept-based-on-wireframing-datastructure

MORE2-9: Relative Scheduler Dialog + small adaptations
…add-new-information-to-study-dialog

# Conflicts:
#	openapi/RelativeEvent.yaml
#	openapi/StudyManagerAPI.yaml
…ion-to-study-dialog

More2 14 smf add new information to study dialog
…Add-duration-properties-to-study-group-list

# Conflicts:
#	openapi/RelativeEvent.yaml
#	openapi/StudyManagerAPI.yaml
…art' into Feature_MORE2-1_dynamic-study-start
benitsch and others added 28 commits July 3, 2024 10:41
* Add missing translations
* Use vue i18n $d for date format
* Remove dayjs, because we use $d instead
* Use pluralization
* Use template literal instead of string concatenation.
* Add more specific alert message when study update request fails (from old PR-476)
* Introduce TS interfaces for Timeline.
* Do not save custom data on vue-cal Event object (only cId).
* Use mapper and EventDetail object for more detailed information on e.g. dialog.
* Avoid using class names in conditions for display information.
…se it should only do what it is designed/named to do.

* Move logic to caller to set FE dates.
* Remove logic for plannedStart date, because this logic is not running/saved in BE as well, therefore a new website refresh would undo the FE changes.
* Primevue update changes the icon to its own slot.
* Move tableActions to a slot, to reduce the complexity within the MoreTable component.
* Change props setup to TS "Typing Component Props".
* Rename variables to be more precise.
* Move general functions to common utils.
* Introduce new interfaces for better typing.
* Use more typing for objects.
* Remove unused CSS.
* Unify repeated CSS.
* Use tooltips across all action buttons (rowActions) to be consistent.
* Use template literals instead of concatenations to be consistent over the code.
* Use Nullish coalescing operator instead of ternary operator where it is possible, to be short and precise.
* Remove complexity by removing features we do not use.
* Remove unused interfaces.
* To better know what value is returned by a function, without looking into the function body logic.
…t/plannedStart/end Date in the UI immediately.
* Reduce height of Header and Footer.
* Adjust MoreTabNav for better breakpoints.
* Adjust buttons to be the same (especially the height) over all pages.
* Fix integration container for white background.
* Use Columns filter slot to translate "Apply" and "Cancel" button.
* Use Buttons prop "label" for text instead of writing the text within the tags.
* Add missing translation.
* Explicitly define icon for FileUpload component.
* Add missing ":innen" in german "Teilnehmer" translation, to be consistent over all texts.
* Do not highlight row on hover, when row is not clickable.
* To have the same behavior over all categories (observations, interventions, etc.)
…led this rule in the eslint config on global level.
…ble.

* Add new dateUtils function to cut off seconds in a time string.
* Add Unit test for new implemented function.
* Remove vitest types, because TS throws an error not finding the types.
* Color changes to better differentiate between each state.
* Add bottom border to header, to clearly see in which state the study is.
* Border style dashed for preview mode and solid line for non preview states.
* We do not cut (with .split) the locale of the country anymore ("en" vs "en-GB"), because we need it to show dates.
* With the country-specific locale, we can display the correct order of the date parts (day, month & year).
* As we have defined English and German as languages, all country-specific languages are now defined for the date format.
…y has a margin-left.

* This ensures the same margin over all dialogs with submit/cancel buttons.
…ponent

* Otherwise an error is thrown that the translation json of the missing locale is missing (e.g. en-GB).
* Active states are green and pause states are red.
* Do not show the status color on header as border-bottom when on dashboard view.
Add staging branch to build-and-push-image
Copy link

github-actions bot commented Aug 9, 2024

Test Results

0 tests  ±0   0 ✅ ±0   0s ⏱️ ±0s
0 suites ±0   0 💤 ±0 
0 files   ±0   0 ❌ ±0 

Results for commit 16d9bc8. ± Comparison against base commit 8e04fdf.

@alireza-dhp alireza-dhp merged commit 04c8613 into main Aug 9, 2024
6 checks passed
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.

7 participants