From 86befffee27d84d349507cf51b71c121fc2cf8c9 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:57:11 +0530
Subject: [PATCH] Revert "POC for single form Approach"
---
apps/wrapper/assessor-app/src/api/index.js | 9 ---
.../src/constants/apiConstants.js | 6 --
.../assessor-app/src/constants/index.js | 1 -
.../assessor-app/src/pages/AssessmentType.jsx | 6 +-
.../src/pages/forms/GenericOdkForm.jsx | 67 ++-----------------
5 files changed, 6 insertions(+), 83 deletions(-)
delete mode 100644 apps/wrapper/assessor-app/src/constants/apiConstants.js
delete mode 100644 apps/wrapper/assessor-app/src/constants/index.js
diff --git a/apps/wrapper/assessor-app/src/api/index.js b/apps/wrapper/assessor-app/src/api/index.js
index fb8380ef..46444c8b 100644
--- a/apps/wrapper/assessor-app/src/api/index.js
+++ b/apps/wrapper/assessor-app/src/api/index.js
@@ -2,7 +2,6 @@ import axios from "axios";
import { getCookie, makeHasuraCalls } from "../utils";
import customPost from "./customPost";
import customPostPdf from "./customPostPdf";
-import {APIS} from "../constants/index";
//nconst BASE_URL = process.env.REACT_APP_USER_SERVICE_URL;
const KEYCLOAK_BASE_URL =
@@ -501,11 +500,3 @@ export const editUserKeycloak = async (postData) => {
);
return res;
};
-
-export const getFormData = async (postData) => {
- const res = await customPost.post(
- APIS.groundAnalysis.viewForm,
- postData
- );
- return res;
-};
diff --git a/apps/wrapper/assessor-app/src/constants/apiConstants.js b/apps/wrapper/assessor-app/src/constants/apiConstants.js
deleted file mode 100644
index 1e540928..00000000
--- a/apps/wrapper/assessor-app/src/constants/apiConstants.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const APIS = {
- groundAnalysis: {
- viewForm: `/rest/getFormData`,
- }
-};
-
\ No newline at end of file
diff --git a/apps/wrapper/assessor-app/src/constants/index.js b/apps/wrapper/assessor-app/src/constants/index.js
deleted file mode 100644
index 2a97774c..00000000
--- a/apps/wrapper/assessor-app/src/constants/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { APIS } from './apiConstants';
\ No newline at end of file
diff --git a/apps/wrapper/assessor-app/src/pages/AssessmentType.jsx b/apps/wrapper/assessor-app/src/pages/AssessmentType.jsx
index 0a3a9ea3..b03a9eb8 100644
--- a/apps/wrapper/assessor-app/src/pages/AssessmentType.jsx
+++ b/apps/wrapper/assessor-app/src/pages/AssessmentType.jsx
@@ -142,13 +142,10 @@ const AssessmentType = () => {
let courses_data = response?.data?.institute_form;
if (courses_data?.length) {
courses_data = courses_data.map((obj) => {
- console.log("obj=>", obj.applicant_form_id);
if (obj?.course?.formObject) {
obj.course.formObject = obj.course.formObject?.replace(/\\/g, "");
obj.course.formObject = JSON.parse(obj.course.formObject);
obj.course.formObject.forEach((eachObj) => {
- // appended form id
- eachObj.form_id = obj.applicant_form_id;
if (
formNames.includes(
eachObj.name.substring(0, eachObj.name.lastIndexOf(".xml"))
@@ -206,7 +203,6 @@ const AssessmentType = () => {
};
const handleNavigateToForms = (formObj) => {
- console.log("formObj =>", formObj);
if (formObj?.status !== "completed" || !formObj?.status) {
let form_name = "";
if (formObj.name.includes(".xml")) {
@@ -215,7 +211,7 @@ const AssessmentType = () => {
form_name = formObj.path?.trim();
}
- navigate(`${ROUTE_MAP.otherforms_param_formName}${form_name}/${formObj?.form_id}`);
+ navigate(`${ROUTE_MAP.otherforms_param_formName}${form_name}`);
} else {
setError("The form has already completed!");
setTimeout(() => {
diff --git a/apps/wrapper/assessor-app/src/pages/forms/GenericOdkForm.jsx b/apps/wrapper/assessor-app/src/pages/forms/GenericOdkForm.jsx
index 099386a2..c20b38d6 100644
--- a/apps/wrapper/assessor-app/src/pages/forms/GenericOdkForm.jsx
+++ b/apps/wrapper/assessor-app/src/pages/forms/GenericOdkForm.jsx
@@ -12,11 +12,10 @@ import {
saveFormSubmission,
updateFormStatus,
getPrefillXML,
- getFormData,
} from "../../api";
import {
getCookie,
- // getFormData,
+ getFormData,
handleFormEvents,
updateFormData,
removeItemFromLocalForage,
@@ -38,7 +37,7 @@ let previewFlag = false;
const GenericOdkForm = (props) => {
const user = getCookie("userData");
- let { formName, date, formID } = useParams();
+ let { formName, date } = useParams();
const scheduleId = useRef();
const [isPreview, setIsPreview] = useState(false);
const [surveyUrl, setSurveyUrl] = useState("");
@@ -91,11 +90,6 @@ const GenericOdkForm = (props) => {
const [errorModal, setErrorModal] = useState(false);
const [previewModal, setPreviewModal] = useState(false);
const { state } = useContext(StateContext);
- const userDetails = getCookie("userData");
- const userId = userDetails?.userRepresentation?.id;
- const [formDataFromApi, setFormDataFromApi] = useState();
- const [formStatus, setFormStatus] = useState("");
- const [onSubmit, setOnSubmit] = useState(false);
let courseObj = undefined;
const loading = useRef(false);
@@ -114,10 +108,7 @@ const GenericOdkForm = (props) => {
let formData = await getFromLocalForage(
`${formName}_${new Date().toISOString().split("T")[0]}`
);
- if(formData == null) {
- fetchFormData();
- }
- else {
+
let fileGCPPath = GCP_URL + formName + ".xml";
let formURI = await getPrefillXML(
@@ -128,48 +119,6 @@ const GenericOdkForm = (props) => {
);
setEncodedFormURI(formURI);
- }
- };
-
- const fetchFormData = async () => {
- let formData = {};
- let filePath =
- process.env.REACT_APP_GCP_AFFILIATION_LINK + formName + ".xml";
-
- let data = await getFromLocalForage(
- `${userId}_${formName}_${new Date().toISOString().split("T")[0]}`
- );
-
- const postData = { form_id: date };
- try {
- const res = await getFormData(postData);
- formData = res.data.form_submissions[0];
- console.log("formData ===>", formData);
-
- const postDataEvents = { id: formID };
- const events = await getStatusOfForms(postDataEvents);
- setFormStatus(events?.events);
- setFormDataFromApi(res.data.form_submissions[0]);
- await setToLocalForage(
- `${userId}_${startingForm}_${new Date().toISOString().split("T")[0]}`,
- {
- formData: formData?.form_data,
- imageUrls: { ...data?.imageUrls },
- }
- );
-
- let formURI = await getPrefillXML(
- `${filePath}`,
- formSpec.onSuccess,
- formData?.form_data,
- formData?.imageUrls
- );
- setEncodedFormURI(formURI);
- } catch (error) {
- console.log(error);
- } finally {
- // setSpinner(false);
- }
};
const updateSubmissionForms = async (course_id) => {
@@ -316,6 +265,7 @@ const GenericOdkForm = (props) => {
if (window.location.host.includes("localhost")) {
return;
}
+
const iframeElem = document.getElementById("enketo-form");
var iframeContent =
iframeElem?.contentDocument || iframeElem?.contentWindow.document;
@@ -323,17 +273,12 @@ const GenericOdkForm = (props) => {
var section = iframeContent?.getElementsByClassName("or-group");
if (!section) return;
for (var i = 0; i < section?.length; i++) {
- console.log(section[i]);
var inputElements = section[i].querySelectorAll("input");
inputElements.forEach((input) => {
input.disabled = true;
- // hide admin remarks and label in assessor form
- if(input.name.toLowercase().includes('admin')) {
- input.previousSibling.style.display = 'none';
- input.style.display = 'none';
- }
});
}
+
iframeContent.getElementById("submit-form").style.display = "none";
iframeContent.getElementById("save-draft").style.display = "none";
}
@@ -345,7 +290,6 @@ const GenericOdkForm = (props) => {
};
const handleRenderPreview = () => {
- alert("1");
setPreviewModal(true);
previewFlag = true;
@@ -384,7 +328,6 @@ const GenericOdkForm = (props) => {
useEffect(() => {
bindEventListener();
getSurveyUrl();
- getDataFromLocal();
getCourseFormDetails();
getFormData({
loading,
--
GitLab