merge sprint 7 and resolve conflict

This commit is contained in:
MacBook Air M1
2025-12-18 15:33:06 +07:00
66 changed files with 3628 additions and 1081 deletions
+17 -1
View File
@@ -177,17 +177,33 @@ var ProjectFlockApprovalSteps = map[approvalutils.ApprovalStep]string{
}
// -------------------------------------------------------------------
// Project Flock Kandang Approval
// Chickin Approval
// -------------------------------------------------------------------
const (
ApprovalWorkflowChickin approvalutils.ApprovalWorkflowKey = approvalutils.ApprovalWorkflowKey("CHICKINS")
ChickinStepPengajuan approvalutils.ApprovalStep = 1
ChickinStepDisetujui approvalutils.ApprovalStep = 2
)
var ChickinApprovalSteps = map[approvalutils.ApprovalStep]string{
ChickinStepPengajuan: "Pengajuan",
ChickinStepDisetujui: "Disetujui",
}
// -------------------------------------------------------------------
// Project-Flock kandang Approval
// -------------------------------------------------------------------
const (
ApprovalWorkflowProjectFlockKandang approvalutils.ApprovalWorkflowKey = approvalutils.ApprovalWorkflowKey("PROJECT_FLOCK_KANDANGS")
ProjectFlockKandangStepPengajuan approvalutils.ApprovalStep = 1
ProjectFlockKandangStepDisetujui approvalutils.ApprovalStep = 2
ProjectFlockKandangStepClosed approvalutils.ApprovalStep = 3
)
var ProjectFlockKandangApprovalSteps = map[approvalutils.ApprovalStep]string{
ProjectFlockKandangStepPengajuan: "Pengajuan",
ProjectFlockKandangStepDisetujui: "Disetujui",
ProjectFlockKandangStepClosed: "Selesai",
}
// -------------------------------------------------------------------