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

Storyelement #494

Merged
merged 51 commits into from
Feb 28, 2024
Merged

Storyelement #494

merged 51 commits into from
Feb 28, 2024

Conversation

niklasstich
Copy link
Member

Fixes #449

andreasweishaupt and others added 30 commits December 20, 2023 14:27
@andreasweishaupt
- move unplaced learning elements to bottom container
32afa52 
- separate learning elements and adaptivity elements in two different tabs
@e01118
CenterContainer - optimized width
a42d999
@e01118
Full width for ElementFormContainer
75f091a
@e01118
Changed display of 3d representation
f477034
@splican
implemented fully fluid layout and styled UnplacedElementsDropZone.razor
541deca
@splican
Merge remote-tracking branch 'origin/issue-448-dialog-windows-arrange…
3fc76c8 
…ment' into issue-448-dialog-windows-arrangement
@splican
fixed initial scrollbar behaviour of LearningSpaceLayoutView.razor in…
27b3de2 
… smallest screen size possible
@niklasstich
Refactor Create and Edit element forms to use Enum for mode instead o…
ebc7912 
…f bool
@niklasstich
Started work on StoryElement dialog
89d592e
@niklasstich
Began Refactoring ElementFormModel to contain ContentFormModel instea…
d87c841 
…d of ContentViewModel
@niklasstich
- Fixed serialization
2c6ea2d 
- Added missing mappings
- Fixed a bug where selecting an element with a different content type would crash during mapping in EditElementForm
@niklasstich
Added slots for StoryElements to LearningSpaceLayout.cs
d4bd37a
@niklasstich
Commands for drag-droppping story element into slot (something is sti…
9743659 
…ll wrong with parent mapping for story element)
@niklasstich
- StoryElement now draggable into the layout
0bb52b6 
- Able to drag it back to unplaced
- Gets rendered correctly
@MarvinHo64
Added ISpaceStoryJson.cs and sub classes
d1c279b
@MarvinHo64
Change type of StoryText from string to List<string>
7f9e54a
@MarvinHo64
Updated CreateAtf.cs to consider story elements
4543d2c
@niklasstich
Update unplaced elements component on undo and redo
9febba4
@niklasstich
Fix LearningSpaceLayout memento
eb02a42
@niklasstich
Adapt forms and validation to StoryContent text as list of strings
85068fd
@niklasstich
Fix bug where clicking story element doesn't open the story element t…
3f7de01 
…ab but instead the normal element tab
@niklasstich
Fix crash when opening ElementModel collapsable but no content is se…
84f65f2 
…lected yet
@niklasstich
Fixed problem where it was impossible to set 3D representation in Edi…
f3db00d 
…tLearningElement
@niklasstich
Remove random from story element 3d representation and set it to defa…
f584e24 
…ult to male npc
@niklasstich
Added "create in slot" functionality for story element
0e567d5
@niklasstich
Sort 3d representations in story element by theme
6fd7514
@niklasstich
Added story elements to LearningWorldTreeView.razor
58018e0
@niklasstich
Replaced story icon in MasterLayout and WorldTreeView
63d61a7
@niklasstich
Add story icon to drag drop element
2ec6868
@niklasstich
Fix compilation errors in tests
8021b64
@niklasstich niklasstich self-assigned this Feb 21, 2024
@niklasstich niklasstich added the enhancement New feature or request label Feb 21, 2024
@niklasstich
Merge branch 'main' into issue-449
7784372 
# Conflicts:
#	Presentation/Components/ContentFiles/ContentFilesContainer.razor
#	Presentation/Components/Forms/BaseForm.razor
#	Presentation/Components/Forms/Element/CreateElementForm.razor
#	Presentation/Components/Forms/Element/EditElementForm.razor
#	Presentation/Components/Forms/Element/ElementFormContainer.razor
#	Presentation/Components/Forms/Element/ElementModelHandler.cs
#	Presentation/Components/Forms/Element/UnplacedElementsDropZone.razor
#	Presentation/Components/Forms/ElementModelGridSelect.razor
#	Presentation/Components/Forms/Models/LearningElementFormModel.cs
#	Presentation/PresentationLogic/LearningSpace/LearningSpacePresenter.cs
#	Presentation/PresentationLogic/LearningWorld/LearningWorldPresenter.cs
#	Presentation/PresentationLogic/Mediator/IMediator.cs
#	Presentation/PresentationLogic/Mediator/Mediator.cs
#	Presentation/Resources/Components/ContentFiles/ContentFilesAdd.en.resx
#	Presentation/View/LearningSpace/LearningSpaceLayoutView.razor
#	Presentation/View/LearningWorld/LearningWorldTreeView.razor
#	Presentation/View/MasterLayout.razor
#	PresentationTest/Components/Forms/Element/ElementModelHandlerUt.cs
@niklasstich
Fixed merge conflicts
123ec93
@coveralls
Copy link

coveralls commented Feb 23, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build 8081936020

Details

  • -334 of 1029 (67.54%) changed or added relevant lines in 51 files are covered.
  • 20 unchanged lines in 9 files lost coverage.
  • Overall coverage decreased (-1.4%) to 86.9%
Changes Missing Coverage Covered Lines Changed/Added Lines %
Presentation/Components/Forms/Models/ILearningContentFormModel.cs 5 6 83.33%
Presentation/View/LearningElement/DragDropLearningElement.razor 0 1 0.0%
AuthoringTool/Mapping/CachingMapper.cs 5 9 55.56%
Presentation/Components/Forms/PseudoFormFieldGrouping.razor 0 4 0.0%
BusinessLogic/Commands/Element/CreateStoryElementInSlot.cs 50 55 90.91%
BusinessLogic/Commands/Element/DeleteStoryElementInSpace.cs 32 37 86.49%
BusinessLogic/Commands/Layout/PlaceStoryElementInLayoutFromLayout.cs 41 46 89.13%
Presentation/Components/Forms/Models/StoryContentFormModel.cs 0 5 0.0%
Presentation/Components/Forms/Models/FileContentFormModel.cs 14 20 70.0%
Presentation/PresentationLogic/API/PresentationLogic.cs 58 64 90.63%
Files with Coverage Reduction New Missed Lines %
Presentation/Components/Forms/Element/ElementFormContainer.razor 1 0.0%
Presentation/Components/Forms/Element/UnplacedElementsDropZone.razor 1 0.0%
Presentation/PresentationLogic/DropZone/LearningElementDropZoneHelper.cs 1 72.73%
Presentation/PresentationLogic/LearningSpace/LearningSpacePresenter.cs 1 51.6%
Presentation/PresentationLogic/LearningSpace/SpaceLayout/LearningSpaceLayoutViewModel.cs 1 63.64%
Presentation/View/LearningWorld/LearningWorldTreeView.razor 1 0.0%
Presentation/PresentationLogic/SelectedViewModels/SelectedViewModelsProvider.cs 2 86.33%
Presentation/PresentationLogic/LearningContent/ILearningContentViewModel.cs 5 0.0%
Presentation/Components/Forms/Element/ElementModelHandler.cs 7 85.84%
Totals Coverage Status
Change from base Build 8018070531: -1.4%
Covered Lines: 12750
Relevant Lines: 14672
💛 - Coveralls

@niklasstich niklasstich marked this pull request as ready for review February 26, 2024 18:29
@niklasstich niklasstich merged commit da60cdc into main Feb 28, 2024
14 of 15 checks passed
@niklasstich niklasstich deleted the issue-449 branch April 16, 2024 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@niklasstich niklasstich

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Storyelement erstellen
6 participants
@niklasstich @coveralls @andreasweishaupt @e01118 @splican @MarvinHo64