An error occured...
;
+ // if (mutation.isError) return An error occured...
;
//questionid in answers uuid in surveys needs to be matched
- const answers = mutation?.data?.answers;
+ const answers = selecedSurveyData.Service[0].attributes;
+ answers?.map((element)=>{
+ element.uuid = element.id;
+ element.questionId = element.attributeCode;
+ element.answer = [JSON.parse(element.value)];
+ element.citizenId = selecedSurveyData.Service.accountId;
+ })
const formDefaultValues = {};
answers?.map((ans) => {
if (ans?.answer.length === 1) formDefaultValues[ans?.questionId] = ans?.answer[0];
@@ -48,7 +64,7 @@ const ShowSurvey = ({ location }) => {
// }
// })
- return
-
{`${t("CS_COMMON_SURVEYS")} (${data?.activeSurveysList.length})`}
+
{`${t("CS_COMMON_SURVEYS")} (${data?.activeSurveysList?.length})`}
{data?.activeSurveysList && data.activeSurveysList.length ? (
data.activeSurveysList.map((data, index) => {
return (
handleCardClick(data)}
/>
@@ -93,19 +197,19 @@ const SurveyList = () => {
)}
-
{`${t("CS_COMMON_INACTIVE_SURVEYS")} (${data.inactiveSurveysList.length})`}
+
{`${t("CS_COMMON_INACTIVE_SURVEYS")} (${data?.inactiveSurveysList?.length})`}
{data?.inactiveSurveysList && data.inactiveSurveysList.length ? (
data.inactiveSurveysList.map((data, index) => {
return (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/index.js
index 007447839d2..0a74d65916a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/index.js
@@ -17,11 +17,19 @@ const Inbox = ({ parentRoute }) => {
.filter((ulb) => userInfo?.roles?.some((role) => role?.tenantId === ulb?.code))
const statuses = [
- { code: "ALL", name: `${t("ES_COMMON_ALL")}` },
- { code: "ACTIVE", name: `${t("ES_COMMON_ACTIVE")}` },
- { code: "INACTIVE", name: `${t("ES_COMMON_INACTIVE")}` }
+ { code: "All", name: `${t("ES_COMMON_ALL")}` },
+ { code: "Active", name: `${t("ES_COMMON_ACTIVE")}` },
+ { code: "Inactive", name: `${t("ES_COMMON_INACTIVE")}` }
]
+ const isActive = (startDate, endDate) => {
+ const currentDate = new Date().getTime();
+ if (startDate < currentDate && currentDate <= endDate) {
+ return true;
+ }
+ return false;
+ };
+
const searchFormDefaultValues = {
// tenantIds: tenantId,
tenantIds:userUlbs[0],
@@ -39,23 +47,58 @@ const Inbox = ({ parentRoute }) => {
sortOrder: "DESC"
}
+ const ServiceDefinitionCriteria = {
+ "tenantId": tenantId,
+ "code": [],
+ "module": ["engagement"],
+ "postedBy":""
+ }
+
function formReducer(state, payload) {
switch (payload.action) {
case "mutateSearchForm":
- Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, searchForm: payload.data })
- return { ...state, searchForm: payload.data };
+ Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, searchForm: payload.data , ServiceDefinitionCriteria:{
+ "code": [],
+ "postedBy": null,
+ "module": ["engagement"],
+ }})
+ return { ...state, searchForm: payload.data,ServiceDefinitionCriteria: {"tenantId": tenantId,
+ "code": [],
+ "postedBy": null,
+ "module": ["engagement"],
+ } };
case "mutateFilterForm":
- Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, filterForm: payload.data })
- return { ...state, filterForm: payload.data };
+ // Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, filterForm: payload.data })
+ // return { ...state, filterForm: payload.data };
+ Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, filterForm: payload.data, ServiceDefinitionCriteria:{
+ "code": [state.searchForm.title],
+ "postedBy": state.searchForm.postedBy,
+ "module": ["engagement"],
+ "status": payload.data.status.code
+ }})
+ return { ...state, filterForm: payload.data, ServiceDefinitionCriteria: {"tenantId": tenantId,
+ "code": [state.searchForm.title],
+ "postedBy": state.searchForm.postedBy,
+ "module": ["engagement"],
+ "status": payload.data.status.code
+ } };
case "mutateTableForm":
Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, tableForm: payload.data })
return { ...state, tableForm: payload.data };
+ case "mutateSearchDefinationForm":
+ Digit.SessionStorage.set("CITIZENSURVEY.INBOX", { ...state, searchForm: payload.data, ServiceDefinitionCriteria: {"tenantId": tenantId,
+ "code": [payload.data.title],
+ "postedBy": payload.data.postedBy,
+ "module": ["engagement"]} })
+ return { ...state, searchForm: payload.data, ServiceDefinitionCriteria: {"tenantId": tenantId,
+ "code": [payload.data.title],
+ "postedBy": payload.data.postedBy,
+ "module": ["engagement"]} };
default:
break;
}
}
const InboxObjectInSessionStorage = Digit.SessionStorage.get("CITIZENSURVEY.INBOX")
-
const onSearchFormReset = (setSearchFormValue) => {
setSearchFormValue("postedBy", "")
setSearchFormValue("title", "")
@@ -72,18 +115,61 @@ const Inbox = ({ parentRoute }) => {
return InboxObjectInSessionStorage || {
filterForm: filterFormDefaultValues,
searchForm: searchFormDefaultValues,
- tableForm: tableOrderFormDefaultValues
+ tableForm: tableOrderFormDefaultValues,
+ ServiceDefinitionCriteria:ServiceDefinitionCriteria,
}
}
- , [Object.values(InboxObjectInSessionStorage?.filterForm || {}), Object.values(InboxObjectInSessionStorage?.searchForm || {}), Object.values(InboxObjectInSessionStorage?.tableForm || {})])
+ , [Object.values(InboxObjectInSessionStorage?.ServiceDefinitionCriteria || {}),Object.values(InboxObjectInSessionStorage?.filterForm || {}), Object.values(InboxObjectInSessionStorage?.searchForm || {}), Object.values(InboxObjectInSessionStorage?.tableForm || {})])
const [formState, dispatch] = useReducer(formReducer, formInitValue)
+
const onPageSizeChange = (e) => {
dispatch({ action: "mutateTableForm", data: { ...formState.tableForm, limit: e.target.value } })
}
+ let ServiceCriteria = {
+ tenantId: userUlbs[0].code,
+ ids: [],
+ serviceDefIds: [],
+ referenceIds: [],
+ }
+ const { data: selecedSurveyData } = Digit.Hooks.survey.useSelectedSurveySearch({ServiceCriteria},{})
- const { data: { Surveys, TotalCount } = {}, isLoading: isInboxLoading, } = Digit.Hooks.survey.useSurveyInbox(formState)
+ // const { data: { Surveys, TotalCount } = {}, isLoading: isInboxLoading, } = Digit.Hooks.survey.useSurveyInbox(formState)
+ const { data: surveyList, isLoading: isSurveyListLoading } = Digit.Hooks.survey.useCfdefinitionsearch({ServiceDefinitionCriteria:formState.ServiceDefinitionCriteria, Pagination:formState.tableForm})
+
+ if (surveyList?.ServiceDefinition){
+ surveyList?.ServiceDefinition.map((element,index)=>{
+ element.uuid = element.code;
+ element.tenantIds = null;
+ element.title = element.code;
+ element.status = isActive(element.additionalDetails.startDate,element.additionalDetails.endDate)?"ACTIVE":"INACTIVE";;
+ element.description = element.additionalDetails.description;
+ element.startDate = element.additionalDetails.startDate || null;
+ element.endDate = element.additionalDetails.endDate || null;
+ element.active = true;
+ element.insertQuestionsForUpdate = null;
+ element.postedBy = element.postedBy || "";
+ element.answersCount = 0;
+ element.hasResponded = "";
+
+ })
+ }
+
+ ( async() => {
+ if (surveyList && selecedSurveyData){
+ surveyList?.ServiceDefinition?.map((element)=>{
+ selecedSurveyData?.Service?.map((ele)=>{
+ if (element.code === ele.referenceId){
+ element.answersCount ++;
+ }
+ })
+ })
+ }
+
+
+ })();
+
const PropsForInboxLinks = {
logoIcon:
,
@@ -111,26 +197,30 @@ const Inbox = ({ parentRoute }) => {
const onSearchFormSubmit = (data) => {
//setting the offset to 0(In case searched from page other than 1)
- dispatch({ action: "mutateTableForm", data: { ...formState.tableForm, offset:0 } })
+ // dispatch({ action: "mutateTableForm", data: { ...formState.tableForm, offset:0 } })
+
+ // data.hasOwnProperty("") ? delete data?.[""] : null
+ // dispatch({ action: "mutateSearchForm", data })
+ dispatch({ action: "mutateSearchDefinationForm", data });
- data.hasOwnProperty("") ? delete data?.[""] : null
- dispatch({ action: "mutateSearchForm", data })
- }
+ }
const onFilterFormSubmit = (data) => {
- data.hasOwnProperty("") ? delete data?.[""] : null
- dispatch({ action: "mutateFilterForm", data })
+ // data.hasOwnProperty("") ? delete data?.[""] : null
+ // dispatch({ action: "mutateFilterForm", data })
+ dispatch({ action: "mutateFilterForm", data });
}
- const propsForSearchForm = { SearchFormFields, onSearchFormSubmit, searchFormDefaultValues: formState?.searchForm, resetSearchFormDefaultValues: searchFormDefaultValues, onSearchFormReset }
+
+ const propsForSearchForm = { SearchFormFields, onSearchFormSubmit, searchFormDefaultValues: formState?.ServiceDefinitionCriteria?.code[0], resetSearchFormDefaultValues: searchFormDefaultValues, onSearchFormReset }
const propsForFilterForm = { FilterFormFields, onFilterFormSubmit, filterFormDefaultValues: formState?.filterForm, resetFilterFormDefaultValues: filterFormDefaultValues, onFilterFormReset }
- const propsForInboxTable = useInboxTableConfig({ ...{ parentRoute, onPageSizeChange, formState, totalCount: TotalCount, table: Surveys, noResultsMessage: "CS_SURVEYS_NOT_FOUND", dispatch, inboxStyles:{overflowX:"scroll", overflowY:"hidden"} } })
+ const propsForInboxTable = useInboxTableConfig({ ...{ parentRoute, onPageSizeChange, formState, totalCount: "", table: surveyList?.ServiceDefinition||[], noResultsMessage: "CS_SURVEYS_NOT_FOUND", dispatch, inboxStyles:{overflowX:"scroll", overflowY:"hidden"} } })
- const propsForInboxMobileCards = useInboxMobileCardsData({parentRoute, table:Surveys})
+ const propsForInboxMobileCards = useInboxMobileCardsData({parentRoute, table:surveyList?.ServiceDefinition||[]})
- return
+ return
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxMobileDataCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxMobileDataCard.js
index 1962cd67755..cb4d405c300 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxMobileDataCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxMobileDataCard.js
@@ -15,7 +15,9 @@ const useInboxMobileCardsData = ({parentRoute, table }) => {
[t("EVENTS_POSTEDBY_LABEL")]: postedBy,
}))
- return ({ data:dataForMobileInboxCards, linkPrefix:`${parentRoute}/inbox/`, serviceRequestIdKey:t("TL_COMMON_TABLE_COL_APP_NO")})
+
+
+ return ({ data:dataForMobileInboxCards, linkPrefix:`${parentRoute}/surveys/inbox/details/`, serviceRequestIdKey:t("CS_SURVEY_TITLE")})
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxTableConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxTableConfig.js
index 7fe37529e5e..6c2787ff956 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxTableConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/Inbox/useInboxTableConfig.js
@@ -58,7 +58,7 @@ const useInboxTableConfig = ({ parentRoute, onPageSizeChange, formState, totalCo
},
{
Header: t("EVENTS_POSTEDBY_LABEL"),
- accessor: (row) => row.postedBy,
+ accessor: (row) => row.additionalDetails.postedBy,
},
{
Header: t("CS_SURVEY_RESULTS"),
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/NewSurvey.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/NewSurvey.js
index dbd9663e177..fd16d51db42 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/NewSurvey.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/NewSurvey.js
@@ -62,21 +62,66 @@ const NewSurveys = () => {
const onSubmit = (data) => {
const { collectCitizenInfo, title, description, tenantIds, fromDate, toDate, fromTime, toTime, questions } = data;
const mappedQuestions = mapQuestions(questions);
+ let serveyMappedQuestions = [];
+ let userToken = window.localStorage.getItem("token");
+ let userInfo = JSON.parse(window.localStorage.getItem("user-info"));
+ questions && questions.length && questions.map((element,index)=>{
+ serveyMappedQuestions.push({
+ "tenantId": tenantIds?.[0]?.code,
+ "code": element.formConfig.questionStatement,
+ "dataType": "String",
+ "values": null,
+ "required": element.formConfig.required,
+ "isActive": true,
+ "reGex": null,
+ "order": index++,
+ "additionalDetails": {
+ type: element.formConfig.type.i18Key,
+ options: element.formConfig.options || ["NA"]
+ }
+ })
+ })
const details = {
- SurveyEntity: {
- tenantIds: tenantIds.map(({code})=>(code)),
- title,
- description,
- startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
- endDate: new Date(`${toDate} ${toTime}`).getTime(),
- questions:mappedQuestions
+ // SurveyEntity: {
+ // tenantIds: tenantIds.map(({code})=>(code)),
+ // title,
+ // description,
+ // startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ // endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ // questions:mappedQuestions
+ // },
+
+ ServiceDefinition: {
+ tenantId:tenantIds?.[0]?.code,
+ module:"engagement",
+ code: title,
+ isActive: true,
+ additionalDetails:{
+ title: title,
+ description: description,
+ startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ postedBy: userInfo.name,
+ },
+ clientId:userInfo.uuid,
+ attributes:serveyMappedQuestions
},
+
};
-
+
try{
- let filters = {tenantIds : tenantIds?.[0]?.code, title : title}
- Digit.Surveys.search(filters).then((ob) => {
- if(ob?.Surveys?.length>0)
+ // let filters = {tenantIds : tenantIds?.[0]?.code, title : title}
+ let searchDetails = {
+ ServiceDefinitionCriteria:{
+ "tenantId": tenantId,
+ "code": [title],
+ "module": ["engagement"]
+ }
+
+ }
+
+ Digit.Surveys.cfdefinitionsearch(searchDetails).then((ob) => {
+ if(ob?.ServiceDefinition?.length>0)
{
setShowToast({ key: true, label: "SURVEY_SAME_NAME_SURVEY_ALREADY_PRESENT" });
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
index 308bf79ed49..f83c413530f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
@@ -31,6 +31,30 @@ const TypeAnswerEnum = {
TIME_ANSWER_TYPE: "Time",
};
+const isActive = (startDate, endDate) => {
+ const currentDate = new Date().getTime();
+ if (startDate < currentDate && currentDate <= endDate) {
+ return true;
+ }
+ return false;
+};
+
+const setSurveyQuestion = (surveyObj) =>{
+ let questions = [];
+ surveyObj.attributes.map((element)=>{
+ questions.push({
+ questionStatement : element.code,
+ type : element.additionalDetails.type,
+ required : element.required,
+ options : element.additionalDetails.options,
+ uuid : element.code,
+ surveyId : surveyObj.code,
+ status: "ACTIVE"
+ })
+ })
+ return questions;
+}
+
const SurveyDetails = ({ location, match }) => {
let isMobile = window.Digit.Utils.browser.isMobile();
const { id } = useParams();
@@ -65,36 +89,66 @@ const SurveyDetails = ({ location, match }) => {
return (sHours + ":" + sMinutes);
}
- const { isLoading, data: surveyData } = Digit.Hooks.survey.useSearch(
- { tenantIds: tenantIdForInboxSearch, uuid: id },
- {
- select: (data) => {
- const surveyObj = data?.Surveys?.[0];
- return {
- //tenantIds: { code: surveyObj.tenantId },
- uuid: surveyObj.uuid,
- title: surveyObj.title,
- description: surveyObj.description,
- fromDate: format(new Date(surveyObj.startDate), "yyyy-MM-dd"),
- toDate: format(new Date(surveyObj.endDate), "yyyy-MM-dd"),
- fromTime: convertTime12To24(new Date(surveyObj.startDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
- toTime: convertTime12To24(new Date(surveyObj.endDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
- questions: surveyObj.questions.map(({ questionStatement, type, required, options, uuid, surveyId, qorder, status }) => ({
- questionStatement,
- type: /*TypeAnswerEnum[type]*/type,
- required,
- options,
- uuid,
- surveyId,
- qorder,
- status
- })),
- status: surveyObj.status,
- tenantId: { code: surveyObj.tenantId },
- };
- },
- }
- );
+ let ServiceDefinitionCriteria = {
+ tenantId: Digit.ULBService.getCurrentTenantId(),
+ code: [id],
+ // code:["test 2406231131"],
+ module: ["engagement"]
+ }
+
+ const { isLoading, data: surveyData } = Digit.Hooks.survey.useCfdefinitionsearchresult({ServiceDefinitionCriteria},{
+ select: (data) => {
+ const surveyObj = data?.ServiceDefinition?.[0];
+ return {
+ uuid: surveyObj.code,
+ title: surveyObj.code,
+ description: surveyObj.additionalDetails.description,
+ fromDate: format(new Date(surveyObj.additionalDetails.startDate), "yyyy-MM-dd"),
+ toDate: format(new Date(surveyObj.additionalDetails.endDate), "yyyy-MM-dd"),
+ fromTime: convertTime12To24(new Date(surveyObj.additionalDetails.startDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
+ toTime: convertTime12To24(new Date(surveyObj.additionalDetails.endDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
+ questions: setSurveyQuestion(surveyObj),
+ status: isActive(surveyObj.additionalDetails.startDate,surveyObj.additionalDetails.endDate)?"ACTIVE":"INACTIVE",
+ tenantId: { code: surveyObj.tenantId },
+ additionalDetails: surveyObj.additionalDetails,
+ attributes: surveyObj.attributes,
+ clientId: surveyObj.clientId,
+ code: surveyObj.code,
+ id: surveyObj.id
+ };
+ },
+ })
+
+ // const { data: surveyData } = Digit.Hooks.survey.useSearch(
+ // { tenantIds: tenantIdForInboxSearch, uuid: id },
+ // {
+ // select: (data) => {
+ // const surveyObj = data?.Surveys?.[0];
+ // return {
+ // //tenantIds: { code: surveyObj.tenantId },
+ // uuid: surveyObj.uuid,
+ // title: surveyObj.title,
+ // description: surveyObj.description,
+ // fromDate: format(new Date(surveyObj.startDate), "yyyy-MM-dd"),
+ // toDate: format(new Date(surveyObj.endDate), "yyyy-MM-dd"),
+ // fromTime: convertTime12To24(new Date(surveyObj.startDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
+ // toTime: convertTime12To24(new Date(surveyObj.endDate).toLocaleString("en-IN",{hour: "numeric", minute:"numeric",hour12:true})),
+ // questions: surveyObj.questions.map(({ questionStatement, type, required, options, uuid, surveyId, qorder, status }) => ({
+ // questionStatement,
+ // type: /*TypeAnswerEnum[type]*/type,
+ // required,
+ // options,
+ // uuid,
+ // surveyId,
+ // qorder,
+ // status
+ // })),
+ // status: surveyObj.status,
+ // tenantId: { code: surveyObj.tenantId },
+ // };
+ // },
+ // }
+ // );
const isSurveyActive = useMemo(() => {
const surveyStartTime = new Date(`${surveyData?.fromDate} ${surveyData?.fromTime}`).getTime();
@@ -133,24 +187,59 @@ const SurveyDetails = ({ location, match }) => {
const onEdit = (data) => {
const { collectCitizenInfo, title, description, tenantIds, fromDate, toDate, fromTime, toTime, questions } = data;
const mappedQuestions = mapQuestions(questions,surveyData);
+ let serveyMappedQuestions = [];
+ let userToken = window.localStorage.getItem("token")
+ questions && questions.length && questions.map((element,index)=>{
+ serveyMappedQuestions.push({
+ "tenantId": tenantIds?.[0]?.code,
+ "code": element.formConfig.questionStatement,
+ "dataType": "String",
+ "values": null,
+ "required": element.formConfig.required,
+ "isActive": true,
+ "reGex": null,
+ "order": index++,
+ "additionalDetails": {
+ type: element.formConfig.type.i18Key,
+ options: element.formConfig.options || ["NA"]
+ }
+ })
+ })
const details = {
- SurveyEntity: {
- uuid: surveyData.uuid,
- //tenantIds: tenantIds.map(({ code }) => code),
- tenantId: tenantIds[0]?.code ? tenantIds[0]?.code : surveyData.tenantId.code,
- title,
- description,
- startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
- endDate: new Date(`${toDate} ${toTime}`).getTime(),
- questions: mappedQuestions,
- status:isSurveyActive?"ACTIVE":"INACTIVE",
- // active:true,
- // answersCount:0,
- // postedBy:"BPAREG Approver",
- //lastmodifiedby:"BPAREG Approver",
- //lastmodifiedtime:"1645074240234"
- //These are not required to update, only status was required that we were not sending..
- },
+ // SurveyEntity: {
+ // uuid: surveyData.uuid,
+ // //tenantIds: tenantIds.map(({ code }) => code),
+ // tenantId: tenantIds[0]?.code ? tenantIds[0]?.code : surveyData.tenantId.code,
+ // title,
+ // description,
+ // startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ // endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ // questions: mappedQuestions,
+ // status:isSurveyActive?"ACTIVE":"INACTIVE",
+ // // active:true,
+ // // answersCount:0,
+ // // postedBy:"BPAREG Approver",
+ // //lastmodifiedby:"BPAREG Approver",
+ // //lastmodifiedtime:"1645074240234"
+ // //These are not required to update, only status was required that we were not sending..
+ // },
+
+ ServiceDefinition: {
+ tenantId: surveyData.tenantId.code,
+ code: title,
+ module: "engagement",
+ isActive: true,
+ attributes:serveyMappedQuestions,
+ additionalDetails:{
+ title: title,
+ description: description,
+ startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ postedBy: surveyData.additionalDetails.postedBy
+ },
+ clientId: surveyData.clientId,
+ id: surveyData.id,
+ }
};
try{
@@ -171,8 +260,29 @@ const SurveyDetails = ({ location, match }) => {
};
const handleDelete = () => {
+ // const details = {
+ // SurveyEntity: { ...surveyData, tenantId: tenantId?.code ? tenantId?.code : tenantId },
+ // };
+ // history.push("/digit-ui/employee/engagement/surveys/delete-response", details);
const details = {
- SurveyEntity: { ...surveyData, tenantId: tenantId?.code ? tenantId?.code : tenantId },
+ // SurveyEntity: { ...surveyData,
+ // tenantId,
+ // questions: surveyData.questions.map(filterQuestion),
+ // status: "INACTIVE",
+ // },
+ ServiceDefinition: {
+ tenantId: surveyData.tenantId.code,
+ code: surveyData.code,
+ module: "engagement",
+ isActive: false,
+ attributes: surveyData.attributes,
+ additionalDetails: {
+ ...surveyData.additionalDetails,
+ },
+ clientId: surveyData.clientId,
+ id: surveyData.id
+
+ }
};
history.push("/digit-ui/employee/engagement/surveys/delete-response", details);
};
@@ -181,25 +291,55 @@ const SurveyDetails = ({ location, match }) => {
const handleMarkActive = (data) => {
const { fromDate, toDate, fromTime, toTime } = data;
const details = {
- SurveyEntity: {
- ...surveyData,
- status: "ACTIVE",
- startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
- endDate: new Date(`${toDate} ${toTime}`).getTime(),
- questions: surveyData.questions.map(filterQuestion),
- tenantId,
- },
+ // SurveyEntity: {
+ // ...surveyData,
+ // status: "ACTIVE",
+ // startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ // endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ // questions: surveyData.questions.map(filterQuestion),
+ // tenantId,
+ // },
+ ServiceDefinition: {
+ tenantId: surveyData.tenantId.code,
+ code: surveyData.code,
+ module: "engagement",
+ isActive: true,
+ attributes: surveyData.attributes,
+ additionalDetails: {
+ ...surveyData.additionalDetails,
+ endDate: new Date(`${toDate} ${toTime}`).getTime(),
+ startDate: new Date(`${fromDate} ${fromTime}`).getTime(),
+ },
+ clientId: surveyData.clientId,
+ id: surveyData.id,
+ }
+
};
history.push("/digit-ui/employee/engagement/surveys/update-response", details);
};
const handleMarkInactive = () => {
const details = {
- SurveyEntity: { ...surveyData,
- tenantId,
- questions: surveyData.questions.map(filterQuestion),
- status: "INACTIVE",
- },
+ // SurveyEntity: { ...surveyData,
+ // tenantId,
+ // questions: surveyData.questions.map(filterQuestion),
+ // status: "INACTIVE",
+ // },
+ ServiceDefinition: {
+ tenantId: surveyData.tenantId.code,
+ code: surveyData.code,
+ module: "engagement",
+ isActive: true,
+ attributes: surveyData.attributes,
+ additionalDetails: {
+ ...surveyData.additionalDetails,
+ startDate:null,
+ endDate:null
+
+ },
+ clientId: surveyData.clientId,
+ id: surveyData.id,
+ }
};
history.push("/digit-ui/employee/engagement/surveys/update-response", details);
};
@@ -216,7 +356,6 @@ const SurveyDetails = ({ location, match }) => {
if (isLoading) return
;
-
return (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyResults.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyResults.js
index 05750696848..a907bfebdea 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyResults.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyResults.js
@@ -6,6 +6,28 @@ import { ActionBar, Card, SubmitBar, Menu,Loader } from "@egovernments/digit-ui-
import { format } from "date-fns";
import SurveyResultsView from '../../../components/Surveys/ResultsView/SurveyResultsView';
+const isActive = (startDate, endDate) => {
+ const currentDate = new Date().getTime();
+ if (startDate < currentDate && currentDate <= endDate) {
+ return true;
+ }
+ return false;
+};
+
+const setSurveyQuestion = (surveyObj) =>{
+ let questions = [];
+ surveyObj.attributes.map((element)=>{
+ questions.push({
+ questionStatement : element.code,
+ type : TypeAnswerEnum[element.additionalDetails.type],
+ required : element.required,
+ options : element?.additionalDetails?.options || ["NA"],
+ uuid : element.code,
+ surveyId : surveyObj.code
+ })
+ })
+ return questions;
+}
const TypeAnswerEnum = {
SHORT_ANSWER_TYPE: "Short Answer",
@@ -19,54 +41,108 @@ const TypeAnswerEnum = {
const SurveyResults = () => {
const tenantId = Digit.ULBService.getCurrentTenantId();
const params = useParams();
- const mutation = Digit.Hooks.survey.useShowResults();
+ // const mutation = Digit.Hooks.survey.useShowResults();
const queryClient = useQueryClient();
+ const user = Digit.UserService.getUser();
+
+ let ServiceDefinitionCriteria = {
+ tenantId: Digit.ULBService.getCurrentTenantId(),
+ code: [params.id],
+ module: ["engagement"]
+ }
+
+ let ServiceCriteria = {
+ tenantId: Digit.ULBService.getCurrentTenantId(),
+ ids: [],
+ serviceDefIds: [],
+ referenceIds: [params.id],
+ }
+
+ const { data: selecedSurveyresults } = Digit.Hooks.survey.useSelectedSurveySearch({ServiceCriteria},{})
+ if (selecedSurveyresults?.Service?.length){
+ let questions = []
+ selecedSurveyresults?.Service.map((element)=>{
+ element.attributes.map((ele)=>{
+ questions.push({
+ answer: typeof(JSON.parse(ele.value)) === "string" ? [JSON.parse(ele.value)] : JSON.parse(ele.value),
+ citizenId: element.accountId,
+ questionId: ele.attributeCode,
+ uuid: ele.id,
+ auditDetails: element.auditDetails
+ })
+ })
+
+ })
+ selecedSurveyresults.answers = questions;
+
+ }
+
+ const { data: selecedSurveyData, isLoading } = Digit.Hooks.survey.useCfdefinitionsearchresult({ServiceDefinitionCriteria},{
+ select: (data) => {
+ const surveyObj = data?.ServiceDefinition?.[0];
+ return{
+ // uuid: surveyObj.code,
+ title: surveyObj.code,
+ description: surveyObj.additionalDetails.description,
+ fromDate: format(new Date(surveyObj.additionalDetails.startDate), "yyyy-MM-dd"),
+ toDate: format(new Date(surveyObj.additionalDetails.endDate), "yyyy-MM-dd"),
+ fromTime: format(new Date(surveyObj.additionalDetails.startDate), "hh:mm"),
+ toTime: format(new Date(surveyObj.additionalDetails.endDate), "hh:mm"),
+ questions:setSurveyQuestion(surveyObj),
+ status: isActive(surveyObj.additionalDetails.startDate,surveyObj.additionalDetails.endDate)?"ACTIVE":"INACTIVE",
+ answersCount:1,
+ }
+
+ }
+ })
+
+
useEffect(() => {
- const onSuccess = () => {
- queryClient.clear();
- };
- mutation.mutate({
- surveyId:params.id
- }, {
- onSuccess,
- });
+ // const onSuccess = () => {
+ // queryClient.clear();
+ // };
+ // mutation.mutate({
+ // surveyId:params.id
+ // }, {
+ // onSuccess,
+ // });
}, []);
- const { isLoading, data: surveyData } = Digit.Hooks.survey.useSearch(
- { tenantIds: tenantId, uuid: params.id },
- {
- select: (data) => {
- const surveyObj = data?.Surveys?.[0];
- return {
- //tenantIds: { code: surveyObj.tenantId },
- uuid: surveyObj.uuid,
- title: surveyObj.title,
- description: surveyObj.description,
- fromDate: format(new Date(surveyObj.startDate), "yyyy-MM-dd"),
- toDate: format(new Date(surveyObj.endDate), "yyyy-MM-dd"),
- fromTime: format(new Date(surveyObj.startDate), "hh:mm"),
- toTime: format(new Date(surveyObj.endDate), "hh:mm"),
- questions: surveyObj.questions.map(({ questionStatement, type, required, options, uuid, surveyId }) => ({
- questionStatement,
- type: TypeAnswerEnum[type],
- required,
- options,
- uuid,
- surveyId
- })),
- status: surveyObj.status,
- answersCount:surveyObj.answersCount,
- };
- },
- }
- );
+ // const { data: surveyData } = Digit.Hooks.survey.useSearch(
+ // { tenantIds: tenantId, uuid: params.id },
+ // {
+ // select: (data) => {
+ // const surveyObj = data?.Surveys?.[0];
+ // return {
+ // //tenantIds: { code: surveyObj.tenantId },
+ // // uuid: surveyObj.uuid,
+ // title: surveyObj.title,
+ // description: surveyObj.description,
+ // fromDate: format(new Date(surveyObj.startDate), "yyyy-MM-dd"),
+ // toDate: format(new Date(surveyObj.endDate), "yyyy-MM-dd"),
+ // fromTime: format(new Date(surveyObj.startDate), "hh:mm"),
+ // toTime: format(new Date(surveyObj.endDate), "hh:mm"),
+ // questions: surveyObj.questions.map(({ questionStatement, type, required, options, uuid, surveyId }) => ({
+ // questionStatement,
+ // type: TypeAnswerEnum[type],
+ // required,
+ // options,
+ // uuid,
+ // surveyId
+ // })),
+ // status: surveyObj.status,
+ // answersCount:surveyObj.answersCount,
+ // };
+ // },
+ // }
+ // );
+
if(isLoading) return
// else if(mutation.isLoading) return
// //if(mutation.isError) return An error occured...
-
- return
+ return
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/create.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/create.js
index 32d6e8be529..d177932def1 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/create.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/create.js
@@ -4,7 +4,7 @@ import React, { useEffect,useState } from "react";
import { useTranslation } from "react-i18next";
import { Link,useHistory } from "react-router-dom";
const getMessage = (mutation) => {
- if (mutation.isSuccess) return mutation.data?.Surveys?.[0]?.uuid;
+ if (mutation.isSuccess) return mutation.data?.ServiceDefinition?.[0]?.id;
return "";
};
@@ -24,7 +24,7 @@ const Acknowledgement = (props) => {
const queryClient = useQueryClient();
const { t } = useTranslation();
const tenantId = Digit.ULBService.getCurrentTenantId();
- const mutation = Digit.Hooks.survey.useCreate();
+ const mutation = Digit.Hooks.survey.useServeyCreateDef();
const { state } = props.location;
const history = useHistory();
const [isActionClicked,setIsActionClicked] = useState(false)
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/delete.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/delete.js
index 15cba08d0ed..9ff39c9d5a1 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/delete.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/delete.js
@@ -34,7 +34,8 @@ const Response = (props) => {
const queryClient = useQueryClient();
const { t } = useTranslation();
const tenantId = Digit.ULBService.getCurrentTenantId();
- const mutation = Digit.Hooks.survey.useDelete();
+ // const mutation = Digit.Hooks.survey.useDelete();
+ const mutation = Digit.Hooks.survey.useUpdateSurvey();
const { state } = props.location;
useEffect(() => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/update.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/update.js
index 00f5e1f22a8..9085106fe79 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/update.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/responses/update.js
@@ -5,10 +5,7 @@ import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
const getMessage = (mutation) => {
- if (mutation.isSuccess && mutation?.data?.Surveys?.[0]?.uuid){
- return mutation?.data?.Surveys?.[0]?.uuid
- }
- if (mutation.isSuccess) return mutation.data?.Documents?.[0]?.uuid;
+ if (mutation.isSuccess) return mutation.data?.ServiceDefinition?.[0]?.id;
return "";
};
@@ -16,10 +13,10 @@ const BannerPicker = (props) => {
const { t } = useTranslation();
return (
);
};
@@ -28,7 +25,7 @@ const Response = (props) => {
const queryClient = useQueryClient();
const { t } = useTranslation();
const tenantId = Digit.ULBService.getCurrentTenantId();
- const mutation = Digit.Hooks.survey.useUpdate();
+ const mutation = Digit.Hooks.survey.useUpdateSurvey();
const { state } = props.location;
useEffect(() => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/README.md
deleted file mode 100644
index a8831d99042..00000000000
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# digit-ui-module-fsm
-
-## Install
-
-```bash
-npm install --save @egovernments/digit-ui-module-fsm
-```
-
-## Limitation
-
-```bash
-This Package is more specific to DIGIT-UI's can be used across mission's
-```
-
-## Usage
-
-After adding the dependency make sure you have this dependency in
-
-```bash
-frontend/micro-ui/web/package.json
-```
-
-```json
-"@egovernments/digit-ui-module-fsm":"^1.5.0",
-```
-
-then navigate to App.js
-
-```bash
- frontend/micro-ui/web/src/App.js
-```
-
-
-```jsx
-/** add this import **/
-
-import { initfsmComponents } from "@egovernments/digit-ui-module-fsm";
-
-/** inside enabledModules add this new module key **/
-
-const enabledModules = ["fsm"];
-
-/** inside init Function call this function **/
-
-const initDigitUI = () => {
- initfsmComponents();
-};
-```
-
-
-
-
-### Changelog
-
-```bash
-1.7.1 UPYOG Base version
-```
-
-### Contributors
-
-[jagankumar-egov] [Tulika-eGov] [vamshikrishnakole-wtt-egov]
-
-## Documentation
-
-Documentation Site (https://core.digit.org/guides/developer-guide/ui-developer-guide/digit-ui)
-
-## Maintainer
-
-- [jagankumar-egov](https://www.github.com/jagankumar-egov)
-
-
-### Published from DIGIT Frontend
-DIGIT Frontend Repo (https://github.com/upyog/UPYOG/tree/develop)
-
-
-
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
index 41a0afc746b..72ead973433 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
{
"name": "@upyog/digit-ui-module-fsm",
- "version": "1.7.2",
+ "version": "1.7.3",
"license": "MIT",
"main": "dist/index.js",
"description": "Digit FSM Module",
@@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
- "@egovernments/digit-ui-react-components": "1.7.2",
- "microbundle-crl": "0.13.11",
+ "@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
+ "microbundle-crl": "0.13.11",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
index b77e725dd76..ec6be4dfc49 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
@@ -21,12 +21,13 @@ import SelectRoadDetails from "./pageComponents/SelectRoadDetails";
import SelectPropertySubtype from "./pageComponents/SelectPropertySubtype";
import SelectPropertyType from "./pageComponents/SelectPropertyType";
import SelectPropertyID from "./pageComponents/SelectPropertyID";
+import SelectTripNo from "./pageComponents/SelectTripNo";
import SelectSlumName from "./pageComponents/SelectSlumName";
// import SelectStreet from "./pageComponents/SelectStreet";
import FSMSelectStreet from "./pageComponents/FSMSelectStreet";
import SelectTankSize from "./pageComponents/SelectTankSize";
import SelectTripData from "./pageComponents/SelectTripData";
-import SelectTripNo from "./pageComponents/SelectTripNo";
+// import SelectTripNo from "./pageComponents/SelectTripNo";
import SelectPaymentPreference from "./pageComponents/SelectPaymentPreference";
import SelectVehicle from "./pageComponents/SelectVehicleType";
import CitizenApp from "./pages/citizen";
@@ -60,6 +61,7 @@ import AdvanceCollection from "./pageComponents/AdvanceCollection";
import SelectTrips from "./pageComponents/SelectTrips";
import PlusMinusInput from "./pageComponents/PlusMinusInput";
import ConfirmationBox from "./components/Confirmation";
+import SelectLocalityOrGramPanchayat from "./pageComponents/SelectLocalityOrGramPanchayat";
const FSMModule = ({ stateCode, userType, tenants }) => {
const moduleCode = "FSM";
@@ -216,6 +218,7 @@ const componentsToRegister = {
SelectTrips,
PlusMinusInput,
ConfirmationBox,
+ SelectLocalityOrGramPanchayat,
};
export const initFSMComponents = () => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
index 476133bc5cf..61e49d3bb69 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
@@ -2,19 +2,19 @@ import React, { Fragment } from "react";
import { useTranslation } from "react-i18next";
import { Link, useHistory, useParams } from "react-router-dom";
import {
- Header,
+ // Header,
ActionLinks,
- Card,
+ // Card,
CardSectionHeader,
ConnectingCheckPoints,
CheckPoint,
- KeyNote,
+ // KeyNote,
SubmitBar,
- LinkButton,
+ // LinkButton,
Loader,
Rating,
} from "@egovernments/digit-ui-react-components";
-import _ from "lodash";
+// import _ from "lodash";
import TLCaption from "./TLCaption";
export const ApplicationTimeline = (props) => {
@@ -85,15 +85,15 @@ export const ApplicationTimeline = (props) => {
if (checkpoint?.numberOfTrips) caption.comment = `${t("NUMBER_OF_TRIPS")}: ${checkpoint?.numberOfTrips}`;
return ;
}
- else if (checkpoint.status === "PENDING_PAYYY") {
+ /* else if (checkpoint.status === "PENDING_PAYYY") {
const caption = {
name: checkpoint?.assigner,
mobileNumber: checkpoint?.assigner?.mobileNumber,
date: `${t("CS_FSM_EXPECTED_DATE")} ${Digit.DateUtils.ConvertTimestampToDate(props.application?.possibleServiceDate)}`,
};
- return ;
+ return ; */
};
-}
+// }
const showNextActions = (nextAction) => {
switch (nextAction?.action) {
@@ -106,7 +106,7 @@ export const ApplicationTimeline = (props) => {
state: { tenantId: props.application.tenantId },
}}
>
- {window.location.href.includes("citizen/fsm/") && }
+