gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +5 -5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90f1802611 - Show all commits

2
apps/backend/src/drizzle/schema/assessments.ts
View File

@ -20,4 +20,4 @@ export const assessments = pgTable("assessments", {
createdAt: timestamp("createdAt", { mode: "date" }).defaultNow(), createdAt: timestamp("createdAt", { mode: "date" }).defaultNow(),
}); });
// Query Tools in PosgreSQL // Query Tools in PosgreSQL
// CREATE TYPE status AS ENUM ('menunggu konfirmasi', 'diterima', 'ditolak', 'selesai'); // CREATE TYPE status AS ENUM ('menunggu konfirmasi', 'diterima', 'ditolak', 'dalam pengerjaan', 'belum diverifikasi', 'selesai');

4
apps/backend/src/routes/assessmentRequestManagement/route.ts
View File

@ -13,7 +13,7 @@ import authInfo from "../../middlewares/authInfo";
export const assessmentFormSchema = z.object({ export const assessmentFormSchema = z.object({
respondentId: z.string().min(1), respondentId: z.string().min(1),
status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "selesai"]), status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "dalam pengerjaan", "belum diverifikasi", "selesai"]),
reviewedBy: z.string().min(1), reviewedBy: z.string().min(1),
verifiedBy: z.string().min(1), verifiedBy: z.string().min(1),
verifiedAt: z.string().optional(), verifiedAt: z.string().optional(),
@ -169,7 +169,7 @@ const assessmentsRequestManagementRoutes = new Hono<HonoEnv>()
requestValidator( requestValidator(
"json", "json",
z.object({ z.object({
status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "selesai"]), status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "dalam pengerjaan", "belum diverifikasi", "selesai"]),
}) })
), ),
async (c) => { async (c) => {

2
apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx
View File

@ -11,7 +11,7 @@ import { useEffect } from "react";
const routeApi = getRouteApi("/_dashboardLayout/assessmentRequestManagements/"); const routeApi = getRouteApi("/_dashboardLayout/assessmentRequestManagements/");
// Define allowed status values // Define allowed status values
type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "selesai"; type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "dalam pengerjaan" | "belum diverifikasi" | "selesai";
interface AssessmentRequestManagementFormModalProps { interface AssessmentRequestManagementFormModalProps {
assessmentId: string | null; assessmentId: string | null;

2
apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestManagementQueries.ts
View File

@ -3,7 +3,7 @@ import fetchRPC from "@/utils/fetchRPC";
import { queryOptions } from "@tanstack/react-query"; import { queryOptions } from "@tanstack/react-query";
// Define allowed status values // Define allowed status values
type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "selesai"; type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "dalam pengerjaan" | "belum diverifikasi" | "selesai";
export const assessmentRequestManagementQueryOptions = (page: number, limit: number, q?: string) => export const assessmentRequestManagementQueryOptions = (page: number, limit: number, q?: string) =>
queryOptions({ queryOptions({