Skip to content

Commit 841e38f

Browse files
authored
I can remove todo list items by simply marking them done and NuGet updates (#130)
1 parent 2078e2c commit 841e38f

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

src/NuttyTree.NetDaemon.Application/Announcements/AnnouncementsService.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public void DisableAnnouncements(int minutes)
100100
nextAnnouncementAvailable.TrySetResult();
101101
});
102102
logger.LogInformation("Announcements disabled until {DisabledUntil}", disabledUntil);
103-
haContext?.SetEntityState("binary_sensor.announcments_enabled", "off", new { until = $"{(minutes == int.MaxValue ? "Indefinitely" : disabledUntil)}" });
104103
}
105104
}
106105

@@ -110,7 +109,6 @@ public void EnableAnnouncements()
110109
disabledUntil = null;
111110
nextAnnouncementAvailable.TrySetResult();
112111
logger.LogInformation("Announcements enabled");
113-
haContext?.SetEntityState("binary_sensor.announcments_enabled", "on", new { });
114112
}
115113

116114
public void SendAnnouncement(

src/NuttyTree.NetDaemon.Application/ElectronicsTime/ElectronicsTimeApp.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,18 @@ private async Task HandleToDoListChangeAsync(StateChange<TodoEntity, EntityState
116116
Name = completedItem.Summary,
117117
});
118118

119-
var reviewItem = todoList.EntityId == maysonsToDoList.EntityId
120-
? await maysonsReviewList.AddItemAsync($"{incompleteItem.Name}", description: $"{DateTime.Now:ddd h:mm tt}")
121-
: await maysonsOptionalReviewList.AddItemAsync($"{incompleteItem.Name}", $"{DateTime.Now:ddd h:mm tt}");
122-
incompleteItem.ReviewUid = reviewItem.Uid;
123-
incompleteItem.CompletedAt = DateTime.UtcNow;
119+
if (stateChange.New?.Context?.UserId == chrisUserId)
120+
{
121+
dbContext.ToDoListItems.Remove(incompleteItem);
122+
}
123+
else
124+
{
125+
var reviewItem = todoList.EntityId == maysonsToDoList.EntityId
126+
? await maysonsReviewList.AddItemAsync($"{incompleteItem.Name}", description: $"{DateTime.Now:ddd h:mm tt}")
127+
: await maysonsOptionalReviewList.AddItemAsync($"{incompleteItem.Name}", $"{DateTime.Now:ddd h:mm tt}");
128+
incompleteItem.ReviewUid = reviewItem.Uid;
129+
incompleteItem.CompletedAt = DateTime.UtcNow;
130+
}
124131

125132
todoList.RemoveItem(completedItem.Uid);
126133
}

src/NuttyTree.NetDaemon.Application/NuttyTree.NetDaemon.Application.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<ItemGroup>
1010
<PackageReference Include="FluentDateTime" Version="3.0.0" />
1111
<PackageReference Include="Grpc.AspNetCore" Version="2.65.0" />
12-
<PackageReference Include="NetDaemon.AppModel" Version="24.12.0" />
13-
<PackageReference Include="NetDaemon.Runtime" Version="24.12.0" />
14-
<PackageReference Include="NetDaemon.Client" Version="24.12.0" />
15-
<PackageReference Include="NetDaemon.Extensions.Scheduling" Version="24.12.0" />
16-
<PackageReference Include="NetDaemon.Extensions.Logging" Version="24.12.0" />
17-
<PackageReference Include="NetDaemon.Extensions.Tts" Version="24.12.0" />
12+
<PackageReference Include="NetDaemon.AppModel" Version="24.28.1" />
13+
<PackageReference Include="NetDaemon.Runtime" Version="24.28.1" />
14+
<PackageReference Include="NetDaemon.Client" Version="24.28.1" />
15+
<PackageReference Include="NetDaemon.Extensions.Scheduling" Version="24.28.1" />
16+
<PackageReference Include="NetDaemon.Extensions.Logging" Version="24.28.1" />
17+
<PackageReference Include="NetDaemon.Extensions.Tts" Version="24.28.1" />
1818
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.5" />
1919
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
2020
<PackageReference Include="System.Reactive" Version="6.0.1" />

src/NuttyTree.NetDaemon.Infrastructure/NuttyTree.NetDaemon.Infrastructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
11-
<PackageReference Include="NetDaemon.HassModel" Version="24.12.0" />
11+
<PackageReference Include="NetDaemon.HassModel" Version="24.28.1" />
1212
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)