(@interaction.Date.ToShortDateString())
- @if ((Prospect is not { Complete: true } || interaction.Type == InteractionType.Complete) && AllowAddInteraction)
+ @if ((Prospect is not { Complete: true } || interaction.Type == InteractionType.Complete) && AllowInteraction)
{
}
@@ -35,7 +35,7 @@
}
}
- @if (Prospect is not {Complete: true } && (Interactions.Count == 0 || Multiple) && AllowAddInteraction)
+ @if (Prospect is not {Complete: true } && (Interactions.Count == 0 || Multiple) && AllowInteraction)
{
if (Multiple) ButtonIconClass = "fa-solid fa-plus";
diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
index b5b6d07..72b5378 100644
--- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
+++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
@@ -20,7 +20,7 @@ namespace FoodsharingSiegen.Server.Controls
/// Gets or sets the value of the allow add interaction (ab)
///
[Parameter]
- public bool AllowAddInteraction { get; set; }
+ public bool AllowInteraction { get; set; }
///
/// Gets or sets the value of the button text (ab)
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
index 6adea54..420f33b 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
@@ -1,11 +1,8 @@
-@using FoodsharingSiegen.Contracts.Entity
-@using FoodsharingSiegen.Contracts.Helper
-@using FoodsharingSiegen.Server.BaseClasses
-@inherits FsBase
+@inherits FsBase
@{
var divClass = $"{CssClass} pc-main";
- if (Prospect is {Complete: true }) divClass += " complete";
+ if (Prospect is { Complete: true }) divClass += " complete";
}
@@ -14,30 +11,30 @@
{
ProspectModal.Show(Prospect)" @onclick:preventDefault>
}
-
+
@Prospect?.Name
Profil öffnen
-
+
@if (!string.IsNullOrWhiteSpace(Prospect?.Memo) || Prospect?.Warning is true)
{
var alertColor = Prospect?.Warning is true ? Color.Warning : Color.Info;
var alertIconClass = Prospect?.Warning is true ? "fa-solid fa-triangle-exclamation" : "fa-solid fa-circle-info";
-
+
@Prospect?.Memo
}
-
-
+
+
+
+
+
-
-
-
-
-
+ @if (CurrentUser.IsInGroup(UserGroup.Ambassador))
+ {
+
+
+ }
-
-
-
-
-
-
-
-
+ @if (StateFilter > ProspectStateFilter.OnBoarding)
+ {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
index 562e7e4..93f4983 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
@@ -14,6 +14,8 @@ namespace FoodsharingSiegen.Server.Controls
[Parameter] public EventCallback
RemoveInteraction { get; set; }
+ [Parameter] public ProspectStateFilter StateFilter { get; set; }
+
[Parameter] public string? CssClass { get; set; }
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.css b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.css
index e29ba55..fe35b97 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.css
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.css
@@ -18,7 +18,7 @@
flex-grow: 1;
max-width: 480px;
border: 1px solid #533a20;
- border-radius: 7px;
+ border-radius: 3px;
margin: 5px;
padding: 16px;
}
diff --git a/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor b/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor
index 37d93c1..9258e6c 100644
--- a/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor
+++ b/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor
@@ -53,7 +53,7 @@
Abbrechen
- Speichern
+ OK
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor.cs b/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor.cs
index 35a8265..3d1a4c3 100644
--- a/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor.cs
+++ b/FoodsharingSiegen.Server/Dialogs/AddInteractionModal.razor.cs
@@ -72,6 +72,14 @@ namespace FoodsharingSiegen.Server.Dialogs
_header = "Als fertig markieren";
_showInfo = true;
break;
+ case InteractionType.StepInBriefing:
+ _header = "Neulingstreffen absolviert";
+ break;
+ case InteractionType.ReleasedForVerification:
+ _header = "Zur Verifizierung freigegeben";
+ _showInfo = true;
+ _infoName = "Hinweis";
+ break;
}
Interaction = new Interaction
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor b/FoodsharingSiegen.Server/Pages/Prospects.razor
index 17f30ef..888bceb 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor
@@ -4,8 +4,8 @@
@inherits FsBase
-@AppSettings.Title - Aktuelle Einarbeitungen
-Aktuelle Einarbeitungen
+@AppSettings.Title - Neue Foodsaver
+Neue Foodsaver
-
+
}
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
index df7524c..3fc0238 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
@@ -94,7 +94,7 @@ namespace FoodsharingSiegen.Server.Pages
{
var parameter = new GetProspectsParameter
{
- CannotHaveInteractions = [InteractionType.Complete, InteractionType.Verify]
+ CannotHaveInteractions = [InteractionType.Complete, InteractionType.Verify, InteractionType.ReleasedForVerification]
};
var prospectsR = await ProspectService.GetProspectsAsync(parameter);
if (prospectsR.Success) ProspectList = prospectsR.Data;
diff --git a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs
index 088b02d..1d5d49a 100644
--- a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs
@@ -64,7 +64,7 @@ namespace FoodsharingSiegen.Server.Pages
///
private async Task LoadProspects()
{
- var parameter = new GetProspectsParameter { MustHaveInteractions = new() { InteractionType.Complete } };
+ var parameter = new GetProspectsParameter { MustHaveInteractions = [InteractionType.Complete] };
var prospectsR = await ProspectService.GetProspectsAsync(parameter);
if (prospectsR.Success) ProspectList = prospectsR.Data;
diff --git a/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor b/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor
index 743a043..469794a 100644
--- a/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor
+++ b/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor
@@ -2,9 +2,9 @@
@inherits FsBase
-
@AppSettings.Title - Wartende Einarbeitungen
+
@AppSettings.Title -
-
Wartende Einarbeitungen
+
Freischalten
@{
var filterList = ProspectList;
@@ -21,10 +21,9 @@
@if (filterList?.Any() == true)
{
-
Bereits verifiziert, aber noch nicht abgeschlossen. Zum Beispiel, wenn noch der Druck-Ausweis fehlt o.ä.
}
diff --git a/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor.cs b/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor.cs
index 4e4f631..28107dd 100644
--- a/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/ProspectsTodo.razor.cs
@@ -92,7 +92,7 @@ namespace FoodsharingSiegen.Server.Pages
var parameter = new GetProspectsParameter
{
CannotHaveInteractions = [InteractionType.Complete],
- MustHaveInteractions = [InteractionType.Verify]
+ MustHaveInteractions = [InteractionType.ReleasedForVerification]
};
var prospectsR = await ProspectService.GetProspectsAsync(parameter);
if (prospectsR.Success) ProspectList = prospectsR.Data;
diff --git a/FoodsharingSiegen.Server/Shared/NavMenu.razor b/FoodsharingSiegen.Server/Shared/NavMenu.razor
index 0cda9b6..c2b0836 100644
--- a/FoodsharingSiegen.Server/Shared/NavMenu.razor
+++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor
@@ -4,50 +4,54 @@
Einarbeitungen
@(AppSettings.SidebarTitle ?? AppSettings.Title)
-
-
+
+ Hallo @CurrentUser.Name!
+
+
+
- Neue Foodsaver
+ Einarbeiten
- ToDo
+ Freischalten
- Abgeschlossen
+ Fertig
+
+
@if (CurrentUser.IsAdmin())
{
-
+
- Benutzer
+ Benutzer
}
+
+
+
+ Profil
+
+
- Aktivitäten
+ Aktivitäten
+
+
+
+
+
+ Ausloggen
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/config/appsettings.json b/FoodsharingSiegen.Server/config/appsettings.json
index 4d82398..a17c3de 100644
--- a/FoodsharingSiegen.Server/config/appsettings.json
+++ b/FoodsharingSiegen.Server/config/appsettings.json
@@ -7,6 +7,6 @@
}
},
"Settings": {
- "Title": "Foodsharing Olpe-Wenden"
+ "Title": "Andres Superduperbezirk"
}
}
\ No newline at end of file