troogs/FoodsharingOnboarding
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

User editing fixed

Browse Source
This commit is contained in:
Andre Beging
2022-04-01 17:36:46 +02:00
parent 5a1c79ad20
commit 76b199e364
15 changed files with 264 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
FSSiegen.Diagram1.view
View File

@@ -182,8 +182,8 @@
</Model> </Model>
</Children> </Children>
<Location> <Location>
<X>152 px</X> <X>208 px</X>
<Y>-8 px</Y> <Y>-56 px</Y>
</Location> </Location>
<Size> <Size>
<Width>168 px</Width> <Width>168 px</Width>
@@ -269,7 +269,7 @@
<Height>18 px</Height> <Height>18 px</Height>
</Size> </Size>
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
<Path>b61df6d8-6f93-4605-bcb8-40e631176cd7</Path> <Path>5121abf9-8963-4853-92fc-38b4be002089</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName> <TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid> </Oid>
</Model> </Model>
@@ -288,36 +288,55 @@
<Height>18 px</Height> <Height>18 px</Height>
</Size> </Size>
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
<Path>ebd061a6-a896-4a7d-936f-207f87e52535</Path> <Path>9d01dc6b-a794-47f8-ac79-0ff53861181c</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>17</OID>
<Parent>12</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>72.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>b61df6d8-6f93-4605-bcb8-40e631176cd7</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName> <TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid> </Oid>
</Model> </Model>
</Children> </Children>
<Size> <Size>
<Width>145 px</Width> <Width>145 px</Width>
<Height>72 px</Height> <Height>90 px</Height>
</Size> </Size>
<MaxSize> <MaxSize>
<Width>0 px</Width> <Width>0 px</Width>
<Height>73 px</Height> <Height>91 px</Height>
</MaxSize> </MaxSize>
</Model> </Model>
</Children> </Children>
<Location> <Location>
<X>-296 px</X> <X>-296 px</X>
<Y>-168 px</Y> <Y>-160 px</Y>
</Location> </Location>
<Size> <Size>
<Width>150 px</Width> <Width>150 px</Width>
<Height>121 px</Height> <Height>139 px</Height>
</Size> </Size>
<MinSize> <MinSize>
<Width>100 px</Width> <Width>100 px</Width>
<Height>121 px</Height> <Height>139 px</Height>
</MinSize> </MinSize>
<MaxSize> <MaxSize>
<Width>800 px</Width> <Width>800 px</Width>
<Height>121 px</Height> <Height>139 px</Height>
</MaxSize> </MaxSize>
<Ports /> <Ports />
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
@@ -328,20 +347,20 @@
</Model> </Model>
<Model xsi:type="ClassVwModel"> <Model xsi:type="ClassVwModel">
<CustomProperties> <CustomProperties>
<OID>17</OID> <OID>18</OID>
<Parent>0</Parent> <Parent>0</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="PropertiesVwModel"> <Model xsi:type="PropertiesVwModel">
<CustomProperties> <CustomProperties>
<OID>18</OID> <OID>19</OID>
<Parent>17</Parent> <Parent>18</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>19</OID> <OID>20</OID>
<Parent>18</Parent> <Parent>19</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -359,8 +378,8 @@
</Model> </Model>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>20</OID> <OID>21</OID>
<Parent>18</Parent> <Parent>19</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -378,8 +397,8 @@
</Model> </Model>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>21</OID> <OID>22</OID>
<Parent>18</Parent> <Parent>19</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -397,8 +416,8 @@
</Model> </Model>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>22</OID> <OID>23</OID>
<Parent>18</Parent> <Parent>19</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -426,14 +445,14 @@
</Model> </Model>
<Model xsi:type="RelationPropertiesVwModel"> <Model xsi:type="RelationPropertiesVwModel">
<CustomProperties> <CustomProperties>
<OID>23</OID> <OID>24</OID>
<Parent>17</Parent> <Parent>18</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="RelationPropertyVwModel"> <Model xsi:type="RelationPropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>24</OID> <OID>25</OID>
<Parent>23</Parent> <Parent>24</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Size> <Size>
@@ -462,8 +481,8 @@
</Model> </Model>
</Children> </Children>
<Location> <Location>
<X>-128 px</X> <X>-136 px</X>
<Y>240 px</Y> <Y>256 px</Y>
</Location> </Location>
<Size> <Size>
<Width>150 px</Width> <Width>150 px</Width>
@@ -486,20 +505,20 @@
</Model> </Model>
<Model xsi:type="ClassVwModel"> <Model xsi:type="ClassVwModel">
<CustomProperties> <CustomProperties>
<OID>25</OID> <OID>26</OID>
<Parent>0</Parent> <Parent>0</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="PropertiesVwModel"> <Model xsi:type="PropertiesVwModel">
<CustomProperties> <CustomProperties>
<OID>26</OID> <OID>27</OID>
<Parent>25</Parent> <Parent>26</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>27</OID> <OID>28</OID>
<Parent>26</Parent> <Parent>27</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -517,8 +536,8 @@
</Model> </Model>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>28</OID> <OID>29</OID>
<Parent>26</Parent> <Parent>27</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -529,25 +548,6 @@
<Width>290 px</Width> <Width>290 px</Width>
<Height>18 px</Height> <Height>18 px</Height>
</Size> </Size>
<Oid xsi:type="SchemaModelOID">
<Path>6f0890a5-0db1-40e6-931c-92c885506d9b</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
</Oid>
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>29</OID>
<Parent>26</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>36.5 px</Y>
</Location>
<Size>
<Width>290 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
<Path>fff013a1-3d14-4f2b-aee3-f5c0e5ad4d8e</Path> <Path>fff013a1-3d14-4f2b-aee3-f5c0e5ad4d8e</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName> <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
@@ -556,7 +556,26 @@
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>30</OID> <OID>30</OID>
<Parent>26</Parent> <Parent>27</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>36.5 px</Y>
</Location>
<Size>
<Width>290 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>6f0890a5-0db1-40e6-931c-92c885506d9b</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
</Oid>
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>31</OID>
<Parent>27</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -567,6 +586,25 @@
<Width>290 px</Width> <Width>290 px</Width>
<Height>18 px</Height> <Height>18 px</Height>
</Size> </Size>
<Oid xsi:type="SchemaModelOID">
<Path>e280a355-8d22-494b-bc72-9f5fb4c85f3a</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
</Oid>
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>32</OID>
<Parent>27</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>72.5 px</Y>
</Location>
<Size>
<Width>290 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
<Path>caf3dc53-f6cb-4554-98ac-a700657258e9</Path> <Path>caf3dc53-f6cb-4554-98ac-a700657258e9</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName> <TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
@@ -574,13 +612,13 @@
</Model> </Model>
<Model xsi:type="PropertyVwModel"> <Model xsi:type="PropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>31</OID> <OID>33</OID>
<Parent>26</Parent> <Parent>27</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
<X>0.5 px</X> <X>0.5 px</X>
<Y>72.5 px</Y> <Y>90.5 px</Y>
</Location> </Location>
<Size> <Size>
<Width>290 px</Width> <Width>290 px</Width>
@@ -594,23 +632,23 @@
</Children> </Children>
<Size> <Size>
<Width>291 px</Width> <Width>291 px</Width>
<Height>91 px</Height> <Height>109 px</Height>
</Size> </Size>
<MaxSize> <MaxSize>
<Width>0 px</Width> <Width>0 px</Width>
<Height>91 px</Height> <Height>109 px</Height>
</MaxSize> </MaxSize>
</Model> </Model>
<Model xsi:type="RelationPropertiesVwModel"> <Model xsi:type="RelationPropertiesVwModel">
<CustomProperties> <CustomProperties>
<OID>32</OID> <OID>34</OID>
<Parent>25</Parent> <Parent>26</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="RelationPropertyVwModel"> <Model xsi:type="RelationPropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>33</OID> <OID>35</OID>
<Parent>32</Parent> <Parent>34</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Size> <Size>
@@ -624,8 +662,8 @@
</Model> </Model>
<Model xsi:type="RelationPropertyVwModel"> <Model xsi:type="RelationPropertyVwModel">
<CustomProperties> <CustomProperties>
<OID>34</OID> <OID>36</OID>
<Parent>32</Parent> <Parent>34</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -644,7 +682,7 @@
</Children> </Children>
<Location> <Location>
<X>0 px</X> <X>0 px</X>
<Y>90 px</Y> <Y>108 px</Y>
</Location> </Location>
<Size> <Size>
<Width>291 px</Width> <Width>291 px</Width>
@@ -658,20 +696,20 @@
</Model> </Model>
</Children> </Children>
<Location> <Location>
<X>224 px</X> <X>160 px</X>
<Y>256 px</Y> <Y>256 px</Y>
</Location> </Location>
<Size> <Size>
<Width>296 px</Width> <Width>296 px</Width>
<Height>194 px</Height> <Height>212 px</Height>
</Size> </Size>
<MinSize> <MinSize>
<Width>100 px</Width> <Width>100 px</Width>
<Height>194 px</Height> <Height>212 px</Height>
</MinSize> </MinSize>
<MaxSize> <MaxSize>
<Width>800 px</Width> <Width>800 px</Width>
<Height>194 px</Height> <Height>212 px</Height>
</MaxSize> </MaxSize>
<Ports /> <Ports />
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
@@ -682,45 +720,39 @@
</Model> </Model>
<Model xsi:type="AssociationVwModel"> <Model xsi:type="AssociationVwModel">
<CustomProperties> <CustomProperties>
<OID>35</OID> <OID>37</OID>
<OutModel>1</OutModel> <OutModel>1</OutModel>
<InModel>25</InModel> <InModel>26</InModel>
<OutPort>36</OutPort> <OutPort>38</OutPort>
<InPort>37</InPort> <InPort>39</InPort>
<Parent>0</Parent> <Parent>0</Parent>
</CustomProperties> </CustomProperties>
<PortAnchors> <PortAnchors>
<Port> <Port>
<Location> <Location>
<X>0 px</X> <X>126 px</X>
<Y>97 px</Y> <Y>0 px</Y>
</Location> </Location>
<Anchors>Top Bottom</Anchors> <Anchors>Left Right</Anchors>
<Align>Right</Align> <Align>Bottom</Align>
<CustomProperties> <CustomProperties>
<OID>36</OID> <OID>38</OID>
<PortType>FloatAnchor</PortType> <PortType>FloatAnchor</PortType>
</CustomProperties> </CustomProperties>
</Port> </Port>
<Port> <Port>
<Location> <Location>
<X>148 px</X> <X>174 px</X>
<Y>0 px</Y> <Y>0 px</Y>
</Location> </Location>
<Anchors>Left Right</Anchors> <Anchors>Left Right</Anchors>
<Align>Top</Align> <Align>Top</Align>
<CustomProperties> <CustomProperties>
<OID>37</OID> <OID>39</OID>
<PortType>FloatAnchor</PortType> <PortType>FloatAnchor</PortType>
</CustomProperties> </CustomProperties>
</Port> </Port>
</PortAnchors> </PortAnchors>
<BendPoints>
<PointD>
<X>372 px</X>
<Y>89 px</Y>
</PointD>
</BendPoints>
<IsManuallyRouted>false</IsManuallyRouted> <IsManuallyRouted>false</IsManuallyRouted>
<Oid xsi:type="SchemaModelOID"> <Oid xsi:type="SchemaModelOID">
<Path>865bd42d-b0ba-426f-a351-bcbdd38533f1</Path> <Path>865bd42d-b0ba-426f-a351-bcbdd38533f1</Path>
@@ -729,20 +761,20 @@
</Model> </Model>
<Model xsi:type="EnumTypeVwModel"> <Model xsi:type="EnumTypeVwModel">
<CustomProperties> <CustomProperties>
<OID>38</OID> <OID>40</OID>
<Parent>0</Parent> <Parent>0</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="PropertiesVwModel"> <Model xsi:type="PropertiesVwModel">
<CustomProperties> <CustomProperties>
<OID>39</OID> <OID>41</OID>
<Parent>38</Parent> <Parent>40</Parent>
</CustomProperties> </CustomProperties>
<Children> <Children>
<Model xsi:type="EnumTypeMemberVwModel"> <Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties> <CustomProperties>
<OID>40</OID> <OID>42</OID>
<Parent>39</Parent> <Parent>41</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -760,8 +792,8 @@
</Model> </Model>
<Model xsi:type="EnumTypeMemberVwModel"> <Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties> <CustomProperties>
<OID>41</OID> <OID>43</OID>
<Parent>39</Parent> <Parent>41</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -779,8 +811,8 @@
</Model> </Model>
<Model xsi:type="EnumTypeMemberVwModel"> <Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties> <CustomProperties>
<OID>42</OID> <OID>44</OID>
<Parent>39</Parent> <Parent>41</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -798,8 +830,8 @@
</Model> </Model>
<Model xsi:type="EnumTypeMemberVwModel"> <Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties> <CustomProperties>
<OID>43</OID> <OID>45</OID>
<Parent>39</Parent> <Parent>41</Parent>
</CustomProperties> </CustomProperties>
<Children /> <Children />
<Location> <Location>
@@ -828,7 +860,7 @@
</Children> </Children>
<Location> <Location>
<X>-128 px</X> <X>-128 px</X>
<Y>-168 px</Y> <Y>-160 px</Y>
</Location> </Location>
<Size> <Size>
<Width>150 px</Width> <Width>150 px</Width>
@@ -851,11 +883,11 @@
</Model> </Model>
<Model xsi:type="AssociationVwModel"> <Model xsi:type="AssociationVwModel">
<CustomProperties> <CustomProperties>
<OID>44</OID> <OID>46</OID>
<OutModel>17</OutModel> <OutModel>18</OutModel>
<InModel>25</InModel> <InModel>26</InModel>
<OutPort>45</OutPort> <OutPort>47</OutPort>
<InPort>46</InPort> <InPort>48</InPort>
<Parent>0</Parent> <Parent>0</Parent>
</CustomProperties> </CustomProperties>
<PortAnchors> <PortAnchors>
@@ -867,31 +899,31 @@
<Anchors>Top Bottom</Anchors> <Anchors>Top Bottom</Anchors>
<Align>Right</Align> <Align>Right</Align>
<CustomProperties> <CustomProperties>
<OID>45</OID> <OID>47</OID>
<PortType>FloatAnchor</PortType> <PortType>FloatAnchor</PortType>
</CustomProperties> </CustomProperties>
</Port> </Port>
<Port> <Port>
<Location> <Location>
<X>0 px</X> <X>0 px</X>
<Y>79 px</Y> <Y>86.3298969072165 px</Y>
</Location> </Location>
<Anchors>Top Bottom</Anchors> <Anchors>Top Bottom</Anchors>
<Align>Left</Align> <Align>Left</Align>
<CustomProperties> <CustomProperties>
<OID>46</OID> <OID>48</OID>
<PortType>FloatAnchor</PortType> <PortType>FloatAnchor</PortType>
</CustomProperties> </CustomProperties>
</Port> </Port>
</PortAnchors> </PortAnchors>
<BendPoints> <BendPoints>
<PointD> <PointD>
<X>42 px</X> <X>34 px</X>
<Y>319 px</Y> <Y>335 px</Y>
</PointD> </PointD>
<PointD> <PointD>
<X>42 px</X> <X>34 px</X>
<Y>335 px</Y> <Y>342.329896907216 px</Y>
</PointD> </PointD>
</BendPoints> </BendPoints>
<IsManuallyRouted>false</IsManuallyRouted> <IsManuallyRouted>false</IsManuallyRouted>

7
FSSiegen.edps
View File

@@ -8,13 +8,12 @@
<File Name="FsContext.Generated.cs" DestinationFolder="FoodsharingSiegen.Server\Data" /> <File Name="FsContext.Generated.cs" DestinationFolder="FoodsharingSiegen.Server\Data" />
<File Name="User.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" /> <File Name="User.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" />
<File Name="User.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" /> <File Name="User.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
<File Name="InteractionProcess.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" />
<File Name="InteractionProcess.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
<File Name="Prospect.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" /> <File Name="Prospect.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" />
<File Name="Prospect.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" /> <File Name="Prospect.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
<File Name="InteractionDate.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" /> <File Name="Interaction.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" OverwriteMode="OverwriteIfAutoGenerated" />
<File Name="InteractionDate.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" /> <File Name="Interaction.Generated.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
<File Name="UserType.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" /> <File Name="UserType.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
<File Name="InteractionType.cs" DestinationFolder="FoodsharingSiegen.Contracts\Entity" />
</GeneratedFiles> </GeneratedFiles>
</Generation> </Generation>
<DatabaseFirstNamingRules> <DatabaseFirstNamingRules>

14
FSSiegen.efml
View File

@@ -3,9 +3,10 @@
<class name="$EnumTypes"> <class name="$EnumTypes">
<EnumType Name="UserType" class="UserType" p1:Guid="b1301985-6d27-413f-9f9e-ebbdfc49bbc1"> <EnumType Name="UserType" class="UserType" p1:Guid="b1301985-6d27-413f-9f9e-ebbdfc49bbc1">
<Member Name="Unverified" Value="0" p1:Guid="b046051e-682a-45ca-8471-d9c55c09ed59" /> <Member Name="Unverified" Value="0" p1:Guid="b046051e-682a-45ca-8471-d9c55c09ed59" />
<Member Name="User" Value="1" p1:Guid="fbcf22ae-d06c-4ef4-9375-7da0116c1756" /> <Member Name="ReadOnly" Value="10" p1:Guid="fbcf22ae-d06c-4ef4-9375-7da0116c1756" />
<Member Name="Admin" Value="2" p1:Guid="b61df6d8-6f93-4605-bcb8-40e631176cd7" /> <Member Name="WelcomeTeam" Value="20" p1:Guid="5121abf9-8963-4853-92fc-38b4be002089" />
<Member Name="Superadmin" Value="3" p1:Guid="ebd061a6-a896-4a7d-936f-207f87e52535" /> <Member Name="StoreManager" Value="30" p1:Guid="9d01dc6b-a794-47f8-ac79-0ff53861181c" />
<Member Name="Admin" Value="40" p1:Guid="b61df6d8-6f93-4605-bcb8-40e631176cd7" />
</EnumType> </EnumType>
<EnumType Name="InteractionType" class="InteractionType" p1:Guid="93f9359f-3deb-4dbe-9a8b-b8949f833919"> <EnumType Name="InteractionType" class="InteractionType" p1:Guid="93f9359f-3deb-4dbe-9a8b-b8949f833919">
<Member Name="EinAb" Value="10" p1:Guid="f2ad51e2-93c8-4c70-8620-b3f9fc8fe484" /> <Member Name="EinAb" Value="10" p1:Guid="f2ad51e2-93c8-4c70-8620-b3f9fc8fe484" />
@@ -52,11 +53,14 @@
<id name="Id" type="Guid" value-generated="OnAdd" p1:ValidateRequired="true" p1:Guid="cca7506d-fc68-4075-bb8c-1b502aa79807"> <id name="Id" type="Guid" value-generated="OnAdd" p1:ValidateRequired="true" p1:Guid="cca7506d-fc68-4075-bb8c-1b502aa79807">
<column name="" /> <column name="" />
</id> </id>
<property name="UserId" type="Guid" p1:ValidateRequired="true" p1:Guid="fff013a1-3d14-4f2b-aee3-f5c0e5ad4d8e">
<column name="" not-null="False" />
</property>
<property name="Date" type="DateTime" p1:ValidateRequired="true" p1:Guid="6f0890a5-0db1-40e6-931c-92c885506d9b"> <property name="Date" type="DateTime" p1:ValidateRequired="true" p1:Guid="6f0890a5-0db1-40e6-931c-92c885506d9b">
<column name="" /> <column name="" />
</property> </property>
<property name="UserId" type="Guid" p1:ValidateRequired="true" p1:Guid="fff013a1-3d14-4f2b-aee3-f5c0e5ad4d8e"> <property name="Info" type="String" p1:nullable="True" p1:ValidateRequired="false" p1:Guid="e280a355-8d22-494b-bc72-9f5fb4c85f3a">
<column name="" not-null="False" /> <column name="" />
</property> </property>
<property name="Type" type="FoodsharingSiegen.Contracts.Entity.InteractionType" p1:ValidateRequired="true" p1:Guid="caf3dc53-f6cb-4554-98ac-a700657258e9"> <property name="Type" type="FoodsharingSiegen.Contracts.Entity.InteractionType" p1:ValidateRequired="true" p1:Guid="caf3dc53-f6cb-4554-98ac-a700657258e9">
<column name="" /> <column name="" />

6
FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,9 +27,11 @@ namespace FoodsharingSiegen.Contracts.Entity
public virtual Guid Id { get; set; } public virtual Guid Id { get; set; }
public virtual Guid UserId { get; set; }
public virtual DateTime Date { get; set; } public virtual DateTime Date { get; set; }
public virtual Guid UserId { get; set; } public virtual string Info { get; set; }
public virtual InteractionType Type { get; set; } public virtual InteractionType Type { get; set; }

2
FoodsharingSiegen.Contracts/Entity/InteractionType.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

2
FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

2
FoodsharingSiegen.Contracts/Entity/User.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

9
FoodsharingSiegen.Contracts/Entity/UserType.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -21,8 +21,9 @@ namespace FoodsharingSiegen.Contracts.Entity
public enum UserType : int public enum UserType : int
{ {
Unverified = 0, Unverified = 0,
User = 1, ReadOnly = 10,
Admin = 2, WelcomeTeam = 20,
Superadmin = 3 StoreManager = 30,
Admin = 40
} }
} }

5
FoodsharingSiegen.Server/Data/FsContext.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code. // This is auto-generated code.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template. // This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 01.04.2022 16:25:00 // Code is generated on: 01.04.2022 16:41:05
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -129,8 +129,9 @@ namespace FoodsharingSiegen.Server.Data
{ {
modelBuilder.Entity<Interaction>().ToTable(@"Interactions"); modelBuilder.Entity<Interaction>().ToTable(@"Interactions");
modelBuilder.Entity<Interaction>().Property(x => x.Id).HasColumnName(@"Id").IsRequired().ValueGeneratedOnAdd(); modelBuilder.Entity<Interaction>().Property(x => x.Id).HasColumnName(@"Id").IsRequired().ValueGeneratedOnAdd();
modelBuilder.Entity<Interaction>().Property(x => x.Date).HasColumnName(@"Date").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<Interaction>().Property(x => x.UserId).HasColumnName(@"UserId").ValueGeneratedNever(); modelBuilder.Entity<Interaction>().Property(x => x.UserId).HasColumnName(@"UserId").ValueGeneratedNever();
modelBuilder.Entity<Interaction>().Property(x => x.Date).HasColumnName(@"Date").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<Interaction>().Property(x => x.Info).HasColumnName(@"Info").ValueGeneratedNever();
modelBuilder.Entity<Interaction>().Property(x => x.Type).HasColumnName(@"Type").IsRequired().ValueGeneratedNever(); modelBuilder.Entity<Interaction>().Property(x => x.Type).HasColumnName(@"Type").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<Interaction>().Property(x => x.ProspectId).HasColumnName(@"ProspectId").ValueGeneratedNever(); modelBuilder.Entity<Interaction>().Property(x => x.ProspectId).HasColumnName(@"ProspectId").ValueGeneratedNever();
modelBuilder.Entity<Interaction>().HasKey(@"Id"); modelBuilder.Entity<Interaction>().HasKey(@"Id");

16
FoodsharingSiegen.Server/Pages/Users.razor
View File

@@ -34,7 +34,7 @@
Editable Editable
Responsive> Responsive>
<DataGridColumns> <DataGridColumns>
<DataGridCommandColumn TItem="User" Caption="Wololo" Width="100px" CellStyle="@(_ => "display: flex; padding-left: 0; padding-right: 0; justify-content: center; align-items: center;")"> <DataGridCommandColumn TItem="User" Width="100px" CellStyle="@(_ => "display: flex; padding-left: 0; padding-right: 0; justify-content: center; align-items: center;")">
<NewCommandTemplate> <NewCommandTemplate>
<Button Size="Size.ExtraSmall" Color="Color.Success" Clicked="@context.Clicked" Class="mr-1" Style="min-width: auto;"> <Button Size="Size.ExtraSmall" Color="Color.Success" Clicked="@context.Clicked" Class="mr-1" Style="min-width: auto;">
<i class="oi oi-plus"></i> <i class="oi oi-plus"></i>
@@ -56,11 +56,14 @@
</Button> </Button>
</ClearFilterCommandTemplate> </ClearFilterCommandTemplate>
</DataGridCommandColumn> </DataGridCommandColumn>
<DataGridColumn TItem="User" Field="@nameof(User.Name)" Caption="Name" Editable="true"></DataGridColumn> <DataGridCheckColumn TItem="User" Field="@nameof(User.Verified)" Caption="Verifiziert" Editable="true" Width="100px">
<DataGridColumn TItem="User" Field="@nameof(User.Mail)" Caption="E-Mail" Editable="true"></DataGridColumn> <DisplayTemplate>
<DataGridColumn TItem="User" Field="@nameof(User.Type)" Caption="Typ" Editable="true"> <Check TValue="bool" Checked="context.Verified" Disabled="true" ReadOnly="true"/>
</DisplayTemplate>
</DataGridCheckColumn>
<DataGridColumn TItem="User" Field="@nameof(User.Type)" Caption="Typ" Editable="true" Width="200px">
<EditTemplate> <EditTemplate>
<Select TValue="UserType" @bind-SelectedValue="@context.Item.Type"> <Select TValue="UserType" SelectedValue="@((UserType)context.CellValue)" SelectedValueChanged="@(v => context.CellValue = v)">
@foreach (var enumValue in Enum.GetValues<UserType>()) @foreach (var enumValue in Enum.GetValues<UserType>())
{ {
<SelectItem TValue="UserType" Value="enumValue">@enumValue</SelectItem> <SelectItem TValue="UserType" Value="enumValue">@enumValue</SelectItem>
@@ -68,5 +71,8 @@
</Select> </Select>
</EditTemplate> </EditTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="User" Field="@nameof(User.Name)" Caption="Name" Editable="true" Width="250px"></DataGridColumn>
<DataGridColumn TItem="User" Field="@nameof(User.Mail)" Caption="E-Mail" Editable="true"></DataGridColumn>
</DataGridColumns> </DataGridColumns>
</DataGrid> </DataGrid>

83
FoodsharingSiegen.Server/Pages/Users.razor.cs
View File

@@ -1,12 +1,17 @@
using Blazorise.DataGrid; using Blazorise.DataGrid;
using FoodsharingSiegen.Contracts.Entity; using FoodsharingSiegen.Contracts.Entity;
using FoodsharingSiegen.Server.Data.Service; using FoodsharingSiegen.Server.Data.Service;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
namespace FoodsharingSiegen.Server.Pages namespace FoodsharingSiegen.Server.Pages
{ {
/// <summary>
/// The users class (a. beging, 01.04.2022)
/// </summary>
public partial class Users public partial class Users
{ {
#region Dependencies (Injected)
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary> Gets or sets the user service. </summary> /// <summary> Gets or sets the user service. </summary>
/// ///
@@ -14,9 +19,32 @@ namespace FoodsharingSiegen.Server.Pages
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
[Inject] public UserService UserService { get; set; } = null!; [Inject] public UserService UserService { get; set; } = null!;
private List<User>? UserList { get; set; } #endregion
#region Public Properties
/// <summary>
/// Gets or sets the value of the user data grid (ab)
/// </summary>
public DataGrid<User> UserDataGrid { get; set; } public DataGrid<User> UserDataGrid { get; set; }
#endregion
#region Private Properties
/// <summary>
/// Gets or sets the value of the user list (ab)
/// </summary>
private List<User>? UserList { get; set; }
#endregion
#region Override OnAfterRenderAsync
/// <summary>
/// Ons the after render using the specified first render (a. beging, 01.04.2022)
/// </summary>
/// <param name="firstRender">The first render</param>
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
if (firstRender) if (firstRender)
@@ -25,6 +53,27 @@ namespace FoodsharingSiegen.Server.Pages
await base.OnAfterRenderAsync(firstRender); await base.OnAfterRenderAsync(firstRender);
} }
#endregion
#region Private Method Chang
/// <summary>
/// Changs the context (a. beging, 01.04.2022)
/// </summary>
/// <param name="context">The context</param>
/// <param name="type">The type</param>
private void Chang(CellEditContext<User> context, UserType type)
{
context.Item.Type = type;
}
#endregion
#region Private Method LoadUsers
/// <summary>
/// Loads the users (a. beging, 01.04.2022)
/// </summary>
private async Task LoadUsers() private async Task LoadUsers()
{ {
var usersR = await UserService.GetUsersAsync(); var usersR = await UserService.GetUsersAsync();
@@ -33,24 +82,42 @@ namespace FoodsharingSiegen.Server.Pages
await InvokeAsync(StateHasChanged); await InvokeAsync(StateHasChanged);
} }
private async Task RowUpdated(SavedRowItem<User, Dictionary<string, object>> arg) #endregion
{
if (arg.Item?.Id == null || arg.Item.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return;
await UserService.Update(arg.Item); #region Private Method RowInserted
}
/// <summary>
/// Rows the inserted using the specified arg (a. beging, 01.04.2022)
/// </summary>
/// <param name="arg">The arg</param>
private async Task RowInserted(SavedRowItem<User, Dictionary<string, object>> arg) private async Task RowInserted(SavedRowItem<User, Dictionary<string, object>> arg)
{ {
var addUserR = await UserService.AddUserAsync(arg.Item); var addUserR = await UserService.AddUserAsync(arg.Item);
if (!addUserR.Success) if (!addUserR.Success)
{ {
// Error Toast //Todo Error Toast [01.04.22 - Andre Beging]
} }
else else
{ {
await LoadUsers(); await LoadUsers();
} }
} }
#endregion
#region Private Method RowUpdated
/// <summary>
/// Rows the updated using the specified arg (a. beging, 01.04.2022)
/// </summary>
/// <param name="arg">The arg</param>
private async Task RowUpdated(SavedRowItem<User, Dictionary<string, object>> arg)
{
if (arg.Item?.Id == null || arg.Item.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return;
var result = await UserService.Update(arg.Item);
}
#endregion
} }
} }

2
FoodsharingSiegen.Server/Shared/MainLayout.razor
View File

@@ -9,7 +9,7 @@
<main> <main>
<div class="top-row px-4"> <div class="top-row px-4">
<a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
</div> </div>
<article class="content px-4"> <article class="content px-4">

10
FoodsharingSiegen.Server/Shared/NavMenu.razor
View File

@@ -9,16 +9,16 @@
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu"> <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
<nav class="flex-column"> <nav class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="fas fa-tasks mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Übersicht
</NavLink>
</div>
<div class="nav-item px-3"> <div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All"> <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="fas fa-users mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Benutzer <span class="fas fa-users mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Benutzer
</NavLink> </NavLink>
</div> </div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="fas fa-tasks mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Verifizierung
</NavLink>
</div>
</nav> </nav>
</div> </div>

BIN
FoodsharingSiegen.Server/app.db-shm Normal file
View File

Binary file not shown.

BIN
FoodsharingSiegen.Server/app.db-wal Normal file
View File

Binary file not shown.