feat:task,content,agenda setting,Spit
This commit is contained in:
commit
39dd1e71bf
|
|
@ -415,6 +415,7 @@ const CalendarView = ({ categories }: CalendarViewProps) => {
|
||||||
mabes: "bg-yellow-500",
|
mabes: "bg-yellow-500",
|
||||||
polda: "bg-blue-400",
|
polda: "bg-blue-400",
|
||||||
polres: "bg-slate-400",
|
polres: "bg-slate-400",
|
||||||
|
satker: "bg-orange-500",
|
||||||
international: "bg-green-400",
|
international: "bg-green-400",
|
||||||
};
|
};
|
||||||
return colors[type];
|
return colors[type];
|
||||||
|
|
@ -635,7 +636,7 @@ const CalendarView = ({ categories }: CalendarViewProps) => {
|
||||||
if (selectedCategory?.length === categories?.length) {
|
if (selectedCategory?.length === categories?.length) {
|
||||||
setSelectedCategory([]);
|
setSelectedCategory([]);
|
||||||
} else {
|
} else {
|
||||||
setSelectedCategory(categories.map((c) => c.value));
|
setSelectedCategory(categories?.map((c) => c.value));
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,6 @@ export const categories = [
|
||||||
{
|
{
|
||||||
label: "Polda",
|
label: "Polda",
|
||||||
value: "polda",
|
value: "polda",
|
||||||
|
|
||||||
className:
|
className:
|
||||||
"data-[state=checked]:bg-blue-400 data-[state=checked]:ring-blue-400",
|
"data-[state=checked]:bg-blue-400 data-[state=checked]:ring-blue-400",
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -396,7 +396,7 @@ const EventModal = ({
|
||||||
setStartDate(event?.event?.start);
|
setStartDate(event?.event?.start);
|
||||||
setEndDate(event?.event?.end);
|
setEndDate(event?.event?.end);
|
||||||
const eventCalendar = event?.event?.extendedProps?.calendar;
|
const eventCalendar = event?.event?.extendedProps?.calendar;
|
||||||
setAgendaType(eventCalendar || categories[0].value);
|
setAgendaType(eventCalendar || categories?.length > 0 && categories[0].value);
|
||||||
}
|
}
|
||||||
setValue("title", event?.event?.title || "");
|
setValue("title", event?.event?.title || "");
|
||||||
setValue("description", event?.event?.description || "");
|
setValue("description", event?.event?.description || "");
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,49 @@
|
||||||
|
"use client"
|
||||||
|
|
||||||
import { getEvents, getCategories } from "./utils";
|
import { getEvents, getCategories } from "./utils";
|
||||||
import { calendarEvents, Category } from "./data";
|
import { calendarEvents, Category } from "./data";
|
||||||
import CalendarView from "./calender-view";
|
import CalendarView from "./calender-view";
|
||||||
|
import { getCookiesDecrypt } from "@/lib/utils";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { CalendarCategory } from "./data";
|
||||||
|
|
||||||
|
const CalenderPage = () => {
|
||||||
|
|
||||||
|
const [categories, setCategories] = useState<CalendarCategory[]>([]);
|
||||||
|
const userLevelNumber = Number(getCookiesDecrypt("ulne")) || 0;
|
||||||
|
const userLevelId = Number(getCookiesDecrypt("ulie")) || 0;
|
||||||
|
const userParentLevelId = Number(getCookiesDecrypt("uplie")) || 0;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
initData();
|
||||||
|
|
||||||
|
async function initData() {
|
||||||
|
const events = await getEvents();
|
||||||
|
const categories = await getCategories();
|
||||||
|
let valueShowed : string[] = [];
|
||||||
|
if (userLevelNumber == 1) {
|
||||||
|
valueShowed = ['mabes', 'polda', 'polres', 'satker', 'international'];
|
||||||
|
} else if (userLevelNumber == 2 && userLevelId != 761) {
|
||||||
|
valueShowed = ['polda', 'polres'];
|
||||||
|
} else if ((userLevelNumber == 2 && userLevelId == 761) || (userLevelNumber == 3 && userParentLevelId == 761)) {
|
||||||
|
valueShowed = ['satker'];
|
||||||
|
} else if (userLevelNumber == 3 && userParentLevelId != 761) {
|
||||||
|
valueShowed = ['polres'];
|
||||||
|
}
|
||||||
|
|
||||||
|
const formattedCategories = categories.filter((category: Category) => valueShowed.includes(category.value))
|
||||||
|
.map((category: Category) => ({
|
||||||
|
...category,
|
||||||
|
activeClass: "",
|
||||||
|
}));
|
||||||
|
console.log(formattedCategories);
|
||||||
|
setCategories(formattedCategories);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
const CalenderPage = async () => {
|
|
||||||
const events = await getEvents();
|
|
||||||
const categories = await getCategories();
|
|
||||||
const formattedCategories = categories.map((category: Category) => ({
|
|
||||||
...category,
|
|
||||||
activeClass: "",
|
|
||||||
}));
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<CalendarView categories={formattedCategories} />
|
{categories && <CalendarView categories={categories} />}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -177,6 +177,7 @@ interface UploadResult {
|
||||||
fileType: { name: string };
|
fileType: { name: string };
|
||||||
uploadStatus: { name: string };
|
uploadStatus: { name: string };
|
||||||
creatorName: string;
|
creatorName: string;
|
||||||
|
creatorGroup: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface FileUploaded {
|
interface FileUploaded {
|
||||||
|
|
@ -395,6 +396,7 @@ export default function FormTaskDetail() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
initState();
|
initState();
|
||||||
|
// fetchFilteredData();
|
||||||
}, [id, refresh]);
|
}, [id, refresh]);
|
||||||
|
|
||||||
const handleUrlChange = (index: number, newUrl: string) => {
|
const handleUrlChange = (index: number, newUrl: string) => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue