From cf6cccffa5ae8d88d73ef11fa9674b7d28194120 Mon Sep 17 00:00:00 2001 From: nugroho Date: Thu, 26 Jun 2025 15:37:27 +0700 Subject: [PATCH] Worked up to Supervisor response --- APIHandler.cs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/APIHandler.cs b/APIHandler.cs index 9d4d1df..ec60227 100644 --- a/APIHandler.cs +++ b/APIHandler.cs @@ -431,7 +431,7 @@ public static partial class APIHandler CreateJournal.Parameters.AddWithValue("@pkid", ProkerID); CreateJournal.Parameters.AddWithValue("@agid", AgentID); CreateJournal.Parameters.AddWithValue("@stts", 0); - CreateJournal.Parameters.AddWithValue("@nots", string.Empty); + CreateJournal.Parameters.AddWithValue("@nots", "Draft"); CreateJournal.Parameters.AddWithValue("@docs", DBNull.Value); CreateJournal.Parameters.AddWithValue("@tstp", Now); _ = await CreateJournal.ExecuteNonQueryAsync(CTS.Token); @@ -463,7 +463,7 @@ public static partial class APIHandler } byte? StartDay = InElement["startDay"].ValueKind == JsonValueKind.Null ? null : InElement["startDay"].GetByte(); bool TargetUnit = targetUnit == 1; - _ = await RunNonQueryAsync(CS, "UPDATE [proker] SET [kegiatan] = @kgtn, [sasaran] = @ssrn, startday = @stdy, startmonth = @stmh, year = @year, timetarget = @tmtg, timeunit = @tmun, enttarget = @entg, indicators = @indc, actions = @actn WHERE [prokerid] = @pkid", UpdateProker => + _ = await RunNonQueryAsync(CS, "UPDATE [proker] SET [kegiatan] = @kgtn, [sasaran] = @ssrn, startday = @stdy, startmonth = @stmh, year = @year, timetarget = @tmtg, timeunit = @tmun, enttarget = @entg, indicators = @indc, actions = @actn FROM [proker] JOIN [LatestJournal] ON [proker].[prokerid] = [LatestJournal].[prokerid] WHERE [proker].[prokerid] = @pkid AND [LatestJournal].[status] < 2", UpdateProker => { UpdateProker.Parameters.AddWithValue("@pkid", ProkerID); UpdateProker.Parameters.AddWithValue("@kgtn", Kegiatan); @@ -510,7 +510,8 @@ public static partial class APIHandler PKIDFetch.CommandText = "SELECT [prokerid] FROM [LatestJournal] WHERE [ownerid] = @oi AND [year] = @yr AND [status] = 2 ORDER BY [kegiatan]"; PKIDFetch.Parameters.AddWithValue("@oi", AgentID); PKIDFetch.Parameters.AddWithValue("@yr", Year); - PKIDList = await (await PKIDFetch.ExecuteReaderAsync(CTS.Token)).ToListAsync(PKID => (string)PKID["prokerid"], CTS.Token); + using SqlDataReader PKRd = await PKIDFetch.ExecuteReaderAsync(CTS.Token); + PKIDList = await PKRd.ToListAsync(PKID => (string)PKID["prokerid"], CTS.Token); } foreach (string PKID in PKIDList) { @@ -524,19 +525,9 @@ public static partial class APIHandler PJUpdate.Parameters.AddWithValue("@st", Status); PJUpdate.Parameters.AddWithValue("@nots", Notes); PJUpdate.Parameters.AddWithValue("@tstp", Now); + _ = await PJUpdate.ExecuteNonQueryAsync(CTS.Token); } }, CTS.Token); - // await RunNonQueryAsync(CS, "INSERT INTO [proker_journal] SELECT @pjid, [prokerid], @agid, @st, @nots, null, @tstp FROM [LatestJournal] WHERE [ownerid] = @oi AND [year] = @yr AND [status] = 2 ORDER BY [kegiatan]", Query => - // { - // DateTime Now = DateTime.Now; - // Query.Parameters.AddWithValue("@pjid", GenerateUuidV7(Now)); - // Query.Parameters.AddWithValue("@agid", CurrUser.AgentID); - // Query.Parameters.AddWithValue("@st", Status); - // Query.Parameters.AddWithValue("@nots", Notes); - // Query.Parameters.AddWithValue("@tstp", Now); - // Query.Parameters.AddWithValue("@oi", AgentID); - // Query.Parameters.AddWithValue("@yr", Year); - // }, CTS.Token); await runner.WriteJsonResponse(StatusCodes.Status202Accepted, "Proker submission processed."); }); })