Browse Source

avalonia: Final tweaks to assignments screen

Kenric Nugteren 4 days ago
parent
commit
0661ccb92a

+ 4 - 2
PRS.Avalonia/PRS.Avalonia/Modules/Assignments/AssignmentEditViewModel.cs

@@ -157,7 +157,7 @@ public partial class AssignmentEditViewModel : ModuleViewModel
         CanEditBookings = open && Security.IsAllowed<CanEditAssignmentBookings>();
         CanEditActual = open && Security.IsAllowed<CanEditAssignmentActualTimes>();
 
-        CanComplete = open || Security.CanEdit<Assignment>();
+        CanComplete = (open || Security.CanEdit<Assignment>()) && Shell.ID != Guid.Empty;
 
         var changed = Shell.ID == Guid.Empty || Shell.IsChanged();
         SaveButton.IsVisible = changed;
@@ -221,7 +221,9 @@ public partial class AssignmentEditViewModel : ModuleViewModel
     private async Task<bool> Save()
     {
         Shell.Save("Saved on Mobile Device");
-        await Documents.RefreshAsync(false);
+        await Task.WhenAll(
+            Documents.RefreshAsync(false),
+            Forms.RefreshAsync(true));
         Changed();
         return true;
     }