Skip to content

Commit

Permalink
Merge branch 'release-1.0.0' into workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aar-if
Aar-if authored Oct 22, 2024
2 parents 073980b + f7d64a2 commit dd8e0a6
Show file tree
Hide file tree
Showing 16 changed files with 786 additions and 104 deletions.
5 changes: 4 additions & 1 deletion public/locales/en/common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,10 @@
"LANGUAGE": "Language",
"SCIENCE": "Science",
"SOCIAL_SCIENCE": "Social Science",
"LIFE_SKILLS": "Life Skills"
"LIFE_SKILLS": "Life Skills",
"BOARD":"Board",
"MEDIUM":"Medium",
"GRADE":"Grade"
},
"FORM_ERROR_MESSAGES": {
"INVALID_INPUT": "Invalid Input.",
Expand Down
259 changes: 251 additions & 8 deletions public/locales/hi/common.json
View file

Large diffs are not rendered by default.

259 changes: 251 additions & 8 deletions public/locales/mr/common.json
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions public/locales/or/common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"NO_DATA_FOUND": "ତଥ୍ୟ ମିଳିଲା ନାହିଁ",
"SUBMIT": "ଦାଖଲ କରନ୍ତୁ",
"BACK": "ପଛକୁ ଯାଆନ୍ତୁ"

},
"LOGIN_PAGE": {
"USERNAME": "ଉପଭୋକ୍ତା ନାମ",
Expand All @@ -49,12 +50,14 @@
"TEAM_LEADERS": "ଦଳ ନେତାମାନେ",
"CREATE_PLAN": "ଯୋଜନା ସୃଷ୍ଟି କରନ୍ତୁ",
"VIEW_PLANS": "ଯୋଜନାଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"

},
"FACILITATORS": {
"ALL_STATES": "ସମସ୍ତ ରାଜ୍ୟ",
"ALL_DISTRICTS": "ସମସ୍ତ ଜିଲ୍ଲା",
"ALL_BLOCKS": "ସମସ୍ତ ବ୍ଲକ୍",
"SEARCHBAR_PLACEHOLDER": "ସହଜକାରୀମାନଙ୍କୁ ଖୋଜନ୍ତୁ.."

},
"NAVBAR": {
"SEARCHBAR_PLACEHOLDER": "ପାଠ୍ୟକ୍ରମ, ବିଷୟ, ଛାତ୍ର, ପିଡ଼ଏଫ୍ ଇତ୍ୟାଦି ଖୋଜନ୍ତୁ.."
Expand All @@ -63,9 +66,11 @@
"SEARCHBAR_PLACEHOLDER": "ଶିକ୍ଷାର୍ଥୀମାନଙ୍କୁ ଖୋଜନ୍ତୁ..",
"NEW_LEARNER": "ନୂତନ ଶିକ୍ଷାର୍ଥୀ",
"FIRST_SELECT_REQUIRED_FIELDS": "ପ୍ରଥମେ ଆବଶ୍ୟକ ତଥ୍ୟଗୁଡ଼ିକୁ ଚୟନ କରନ୍ତୁ"

},
"TEAM_LEADERS": {
"SEARCHBAR_PLACEHOLDER": "ଦଳ ନେତାମାନଙ୍କୁ ଖୋଜନ୍ତୁ.."

},
"COHORTS": {
"SEARCHBAR_PLACEHOLDER": "ଗୋଷ୍ଠୀମାନଙ୍କୁ ଖୋଜନ୍ତୁ.."
Expand All @@ -82,6 +87,7 @@
"SEARCHBAR_PLACEHOLDER_DISTRICT": "ଜିଲ୍ଲାମାନଙ୍କୁ ଖୋଜନ୍ତୁ",
"SEARCHBAR_PLACEHOLDER_BLOCK": "ବ୍ଲକ୍ ଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ",
"BLOCKS": "ବ୍ଲକ୍ମାନେ"

},
"CENTERS": {
"CENTERS": "କେନ୍ଦ୍ରଗୁଡ଼ିକ",
Expand All @@ -103,6 +109,7 @@
"CENTER_RENAMED": "କେନ୍ଦ୍ର ଶୁଭକାମନାର ସହିତ ପୁନର୍ନାମ କରାଯାଇଛି!",
"SEND_REQUEST": "ଅନୁରୋଧ ପଠାନ୍ତୁ",
"REQUEST_TO_DELETE_HAS_BEEN_SENT": "ମିଟିବା ପାଇଁ ଅନୁରୋଧ ପଠାଇ ଦିଆଯାଇଛି"

},
"FORM": {
"FULL_NAME": "ପୂର୍ଣ୍ଣ ନାମ",
Expand Down Expand Up @@ -158,5 +165,9 @@
"EMAIL": "ଇମେଲ୍",
"YEAR_OF_ JOINING_SCP": "SCP ମଧ୍ୟରେ ସାମିଲ ହେବାର ବର୍ଷ",
"ASSIGN_CENTERS": "କେନ୍ଦ୍ର ସୁପର୍ଦ୍ଦ କରନ୍ତୁ"

}



}
18 changes: 16 additions & 2 deletions src/components/AddNewCenters.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,27 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
);
const [stateDefaultValueForCenter, setStateDefaultValueForCenter] =
useState<string>("");

const createCenterStatus = useSubmittedButtonStore(
(state: any) => state.createCenterStatus
);
const setCreateCenterStatus = useSubmittedButtonStore(
(state: any) => state.setCreateCenterStatus
);
function removeHiddenFields(formResponse: any) {
return {
...formResponse,
fields: formResponse.fields.filter((field: any) => !field.isHidden),
};
}

useEffect(() => {
if (!open) {
setShowForm(false)
}
else
{

}
}, [onClose, open]);
useEffect(() => {
const getAddLearnerFormData = async () => {
const admin = localStorage.getItem("adminInfo");
Expand Down Expand Up @@ -204,6 +217,7 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
const cohortData = await createCohort(cohortDetails);
if (cohortData) {
showToastMessage(t("CENTERS.CENTER_CREATED_SUCCESSFULLY"), "success");
createCenterStatus? setCreateCenterStatus(false):setCreateCenterStatus(true)
setOpenAddNewCohort(false);
onClose();
localStorage.removeItem("BMGSData");
Expand Down
2 changes: 1 addition & 1 deletion src/components/FrameworkCategories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const FrameworkCategories: React.FC<FrameworkCategoriesProps> = ({

useEffect(() => {
const handleBMGS = async () => {
const userStateName = localStorage.getItem('userStateName');
const userStateName = localStorage.getItem('stateName');
try {
const url = `${process.env.NEXT_PUBLIC_SUNBIRDSAAS_API_URL}/api/framework/v1/read/${frameworkId}`;
const boardData = await fetch(url).then((res) => res.json());
Expand Down
91 changes: 55 additions & 36 deletions src/pages/block.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,18 @@ const Block: React.FC = () => {
sort: sortBy,
};

const response = await queryClient.fetchQuery({
queryKey: [
QueryKeys.FIELD_OPTION_READ,
reqParams.limit,
reqParams.offset,
searchKeyword || "",
CohortTypes.DISTRICT,
reqParams.sort.join(","),
],
queryFn: () => getCohortList(reqParams),
});
// const response = await queryClient.fetchQuery({
// queryKey: [
// QueryKeys.FIELD_OPTION_READ,
// reqParams.limit,
// reqParams.offset,
// searchKeyword || "",
// CohortTypes.DISTRICT,
// reqParams.sort.join(","),
// ],
// queryFn: () => getCohortList(reqParams),
// });
const response= await getCohortList(reqParams)

const cohortDetails = response?.results?.cohortDetails || [];

Expand Down Expand Up @@ -275,21 +276,37 @@ const Block: React.FC = () => {
}
}, [isFirstVisit, searchKeyword, pageLimit, pageOffset, stateCode]);


useEffect(() => {
if(districtData[0]?.value && isFirstVisit)
{
setSelectedDistrict(districtData[0]?.value);
setIsFirstVisit(false);
}

}, [districtData]);
const fetchBlocks = async () => {
try {
const response = await queryClient.fetchQuery({
queryKey: [
QueryKeys.FIELD_OPTION_READ,
// const response = await queryClient.fetchQuery({
// queryKey: [
// QueryKeys.FIELD_OPTION_READ,
// selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict,
// "blocks",
// ],
// queryFn: () =>
// getBlocksForDistricts({
// controllingfieldfk:
// selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict,
// fieldName: "blocks",
// }),
// });


const response=await getBlocksForDistricts({
controllingfieldfk:
selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict,
"blocks",
],
queryFn: () =>
getBlocksForDistricts({
controllingfieldfk:
selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict,
fieldName: "blocks",
}),
});
fieldName: "blocks",
})
const blocks = response?.result?.values || [];
setBlocksOptionRead(blocks);

Expand Down Expand Up @@ -335,19 +352,21 @@ const Block: React.FC = () => {
sort: sortBy,
};

const response = await queryClient.fetchQuery({
queryKey: [
QueryKeys.FIELD_OPTION_READ,
reqParams.limit,
reqParams.offset,
searchKeyword || "",
stateCode,
reqParams.filters.districts,
CohortTypes.BLOCK,
reqParams.sort.join(","),
],
queryFn: () => getCohortList(reqParams),
});
// const response = await queryClient.fetchQuery({
// queryKey: [
// QueryKeys.FIELD_OPTION_READ,
// reqParams.limit,
// reqParams.offset,
// searchKeyword || "",
// stateCode,
// reqParams.filters.districts,
// CohortTypes.BLOCK,
// reqParams.sort.join(","),
// ],
// queryFn: () => getCohortList(reqParams),
// });
const response= await getCohortList(reqParams)


const cohortDetails = response?.results?.cohortDetails || [];
const filteredBlockData = cohortDetails
Expand Down
33 changes: 19 additions & 14 deletions src/pages/centers.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
CohortTypes,
Numbers,
QueryKeys,
Role,
SORT,
Status,
Storage,
Expand All @@ -34,15 +35,14 @@ import { showToastMessage } from "@/components/Toastify";
import AddNewCenters from "@/components/AddNewCenters";
import { getCenterTableData } from "@/data/tableColumns";
import { Theme } from "@mui/system";
import { firstLetterInUpperCase, mapFields } from "@/utils/Helper";
import { firstLetterInUpperCase, mapFields , transformLabel} from "@/utils/Helper";
import SimpleModal from "@/components/SimpleModal";
import { IChangeEvent } from "@rjsf/core";
import { RJSFSchema } from "@rjsf/utils";
import DynamicForm from "@/components/DynamicForm";
import useSubmittedButtonStore from "@/utils/useSharedState";
import { useQueryClient } from "@tanstack/react-query";
import { useRouter } from "next/router";

type cohortFilterDetails = {
type?: string;
status?: any;
Expand Down Expand Up @@ -142,7 +142,12 @@ const Center: React.FC = () => {
const setAdminInformation = useSubmittedButtonStore(
(state: any) => state.setAdminInformation
);

const createCenterStatus = useSubmittedButtonStore(
(state: any) => state.createCenterStatus
);
const setCreateCenterStatus = useSubmittedButtonStore(
(state: any) => state.setCreateCenterStatus
);
const [filters, setFilters] = useState<cohortFilterDetails>({
type: CohortTypes.COHORT,
states: selectedStateCode,
Expand Down Expand Up @@ -259,8 +264,8 @@ finalResult?.forEach((item: any, index: number) => {
createdAt: item?.createdAt,
updatedAt: item?.updatedAt,
cohortId: item?.cohortId,
customFieldValues: cohortType[0] ? cohortType : "-",
totalActiveMembers: counts?.totalActiveMembers,
customFieldValues: cohortType[0] ? transformLabel(cohortType) : "-",
totalActiveMembers: counts?.totalActiveMembers,
totalArchivedMembers: counts?.totalArchivedMembers,
};
resultData?.push(requiredData);
Expand Down Expand Up @@ -333,13 +338,11 @@ const response= await fetchCohortMemberList(data);
if (response?.result) {
const userDetails = response.result.userDetails;
const getActiveMembers = userDetails?.filter(
(member: any) => member?.status === Status.ACTIVE
);
(member: any) => member?.status === Status.ACTIVE && member?.role === Role.STUDENT );
const totalActiveMembers = getActiveMembers?.length || 0;

const getArchivedMembers = userDetails?.filter(
(member: any) => member?.status === Status.ARCHIVED
);
(member: any) => member?.status === Status.ARCHIVED && member?.role === Role.STUDENT );
const totalArchivedMembers = getArchivedMembers?.length || 0;

return {
Expand Down Expand Up @@ -372,9 +375,11 @@ const response= await fetchCohortMemberList(data);
};

useEffect(() => {
fetchUserList();
if ((selectedBlockCode !== "") || (selectedDistrictCode !== "" && selectedBlockCode === "") ){
fetchUserList();
}
getFormData();
}, [pageOffset, pageLimit, sortBy, filters, filters.states, filters.status]);
}, [pageOffset, pageLimit, sortBy, filters, filters.states, filters.status, createCenterStatus]);

// handle functions
const handleChange = (event: SelectChangeEvent<typeof pageSize>) => {
Expand Down Expand Up @@ -990,9 +995,9 @@ const response= await fetchCohortMemberList(data);


if (urlData) {
router.push(
`learners?state=${urlData.stateCode}&district=${urlData.districtCode}&block=${urlData.blockCode}&status=${urlData.type}`
);
// router.push(
// `learners?state=${urlData.stateCode}&district=${urlData.districtCode}&block=${urlData.blockCode}&status=${urlData.type}`
// );
}

console.log("urlData", urlData);
Expand Down
49 changes: 25 additions & 24 deletions src/pages/district.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,19 @@ const District: React.FC = () => {
sort: sortBy,
};

const response = await queryClient.fetchQuery({
queryKey: [
QueryKeys.FIELD_OPTION_READ,
reqParams.limit,
reqParams.offset,
searchKeyword || "",
stateCode,
CohortTypes.DISTRICT,
reqParams.sort.join(","),
],
queryFn: () => getCohortList(reqParams),
});

// const response = await queryClient.fetchQuery({
// queryKey: [
// QueryKeys.FIELD_OPTION_READ,
// reqParams.limit,
// reqParams.offset,
// searchKeyword || "",
// stateCode,
// CohortTypes.DISTRICT,
// reqParams.sort.join(","),
// ],
// queryFn: () => getCohortList(reqParams),
// });
const response= await getCohortList(reqParams)
const cohortDetails = response?.results?.cohortDetails || [];

const filteredDistrictData = cohortDetails
Expand Down Expand Up @@ -302,17 +302,18 @@ const District: React.FC = () => {
},
sort: sortBy,
};
const response = await queryClient.fetchQuery({
queryKey: [
QueryKeys.FIELD_OPTION_READ,
reqParams.limit,
reqParams.offset,
reqParams.filters.districts || "",
CohortTypes.BLOCK,
reqParams.sort.join(","),
],
queryFn: () => getCohortList(reqParams),
});
// const response = await queryClient.fetchQuery({
// queryKey: [
// QueryKeys.FIELD_OPTION_READ,
// reqParams.limit,
// reqParams.offset,
// reqParams.filters.districts || "",
// CohortTypes.BLOCK,
// reqParams.sort.join(","),
// ],
// queryFn: () => getCohortList(reqParams),
// });
const response= await getCohortList(reqParams)

const activeBlocks = response?.results?.cohortDetails || [];

Expand Down
Loading

0 comments on commit dd8e0a6

Please sign in to comment.