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

Pictograms #98

Merged
merged 45 commits into from
Nov 15, 2024
Merged

Pictograms #98

merged 45 commits into from
Nov 15, 2024

Conversation

ronaldhej
Copy link
Contributor

@ronaldhej ronaldhej commented Nov 14, 2024

Description

Pictograms can now be created, deleted and data about them can be fetched by id or by organisation
The pictograms are statically served on the backend at the url outlined in the pictogramDTO
Pictograms can be assigned to activities and if an activity has an assigned pictogram, its info will be included

Related issues

#34

Checklist

  • My code is in the right place.
  • My code fully addresses the issue I was working on.
  • My code follows the style guidelines.
  • I have added relevant comments explaining the purpose and function of my code (if necessary).
  • I have created a pull request and notified the teams.

…nd pictogram model, added fileutil for getting a IFormFile by filepath
…inding them due to incompatibility between multipart forms and mapping to DTOs
…ograms to make it easier to test endpoints in between container restarts
…nd pictogram model, added fileutil for getting a IFormFile by filepath
…inding them due to incompatibility between multipart forms and mapping to DTOs
…ograms to make it easier to test endpoints in between container restarts
ronaldhej and others added 15 commits November 14, 2024 20:12
# Conflicts:
#	Dockerfile
#	GirafAPI/Data/GirafDbContext.cs
#	GirafAPI/GirafAPI.csproj
#	GirafAPI/Program.cs
Removed config files accidentally added
Getting activities now includes the associated pictogram info if one is assigned to it
Removed accidentally added pictograms folder
Removed accidentally added migration directory
Removed accidentally added migrations directory
# Conflicts:
#	GirafAPI/Data/Migrations/20241114212357_initialMigration.Designer.cs
#	GirafAPI/Data/Migrations/20241114212357_initialMigration.cs
#	GirafAPI/Data/Migrations/GirafDbContextModelSnapshot.cs
Copy link
Contributor

@LokeSGJ LokeSGJ left a comment

Choose a reason for hiding this comment

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

Looks pretty good overall, only minor comments. I'm not 100% sure what the docker changes do and why they were made as part of this PR, but I trust that it still works so I'm giving you the approve 😄

@@ -26,6 +26,8 @@
</ItemGroup>

<ItemGroup>
<Folder Include="DataMigrations\" />
<Folder Include="Data\Migrations\" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Is one of these an unnecessary duplicate?

@LokeSGJ LokeSGJ merged commit 2b2a829 into main Nov 15, 2024
1 check passed
@LokeSGJ LokeSGJ deleted the pictograms branch November 15, 2024 10:27
@MertzAndreas MertzAndreas restored the pictograms branch November 15, 2024 10:45
@MertzAndreas MertzAndreas deleted the pictograms branch November 15, 2024 10:54
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.

3 participants