diff --git a/.example.env b/.example.env index 848dd4bee93..f3f303bc1e3 100644 --- a/.example.env +++ b/.example.env @@ -58,7 +58,6 @@ REACT_KASP_FULL_STRING=Karunya Arogya Suraksha Padhathi # Sample format file paths REACT_SAMPLE_FORMAT_ASSET_IMPORT=/asset-import-template.xlsx -REACT_SAMPLE_FORMAT_EXTERNAL_RESULT_IMPORT=/External-Results-Template.csv # Camera feed, still watching idle timeout (in seconds; default: 180) REACT_STILL_WATCHING_IDLE_TIMEOUT= diff --git a/care.config.ts b/care.config.ts index f4f7d708ed0..c032ba613f3 100644 --- a/care.config.ts +++ b/care.config.ts @@ -61,9 +61,6 @@ const careConfig = { sampleFormats: { assetImport: env.REACT_SAMPLE_FORMAT_ASSET_IMPORT || "/asset-import-template.xlsx", - externalResultImport: - env.REACT_SAMPLE_FORMAT_EXTERNAL_RESULT_IMPORT || - "/External-Results-Template.csv", }, wartimeShifting: env.REACT_WARTIME_SHIFTING === "true", diff --git a/cypress/e2e/external_results_spec/ExternalResultsAdvanceFilters.ts b/cypress/e2e/external_results_spec/ExternalResultsAdvanceFilters.ts deleted file mode 100644 index 45c050cad8c..00000000000 --- a/cypress/e2e/external_results_spec/ExternalResultsAdvanceFilters.ts +++ /dev/null @@ -1,41 +0,0 @@ -describe("External Results Filters", () => { - before(() => { - cy.loginByApi("devdistrictadmin", "Coronasafe@123"); - cy.saveLocalStorage(); - }); - - beforeEach(() => { - cy.restoreLocalStorage(); - cy.clearLocalStorage(/filters--.+/); - cy.awaitUrl("/external_results"); - cy.contains("Filters").click(); - }); - - it("Advance Filter", () => { - cy.clickAndSelectOption("#local_bodies", "Aluva"); - cy.get("#local_bodies").click(); - cy.clickAndSelectOption("#wards", "4"); - cy.get("#wards").click(); - cy.contains("Apply").click(); - }); - - it("filter by date", () => { - cy.get("input[name='created_date_start']").click(); - cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b").click(); - cy.get("div[id='date-1']").click(); - cy.get("div[id='date-8']").click(); - cy.get("input[name='result_date_start']").click(); - cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b").click(); - cy.get("div[id='date-1']").click(); - cy.get("div[id='date-8']").click(); - cy.get("input[name='sample_collection_date_start']").click(); - cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b").click(); - cy.get("div[id='date-1']").click(); - cy.get("div[id='date-8']").click(); - cy.contains("Apply").click(); - }); - - afterEach(() => { - cy.saveLocalStorage(); - }); -}); diff --git a/cypress/e2e/external_results_spec/ExternalResultsHomepage.cy.ts b/cypress/e2e/external_results_spec/ExternalResultsHomepage.cy.ts deleted file mode 100644 index 6a37d8fb2d0..00000000000 --- a/cypress/e2e/external_results_spec/ExternalResultsHomepage.cy.ts +++ /dev/null @@ -1,68 +0,0 @@ -describe("Edit Profile Testing", () => { - before(() => { - cy.loginByApi("devdistrictadmin", "Coronasafe@123"); - cy.saveLocalStorage(); - }); - - beforeEach(() => { - cy.restoreLocalStorage(); - cy.clearLocalStorage(/filters--.+/); - cy.awaitUrl("/external_results"); - }); - - it("Search by Sample name", () => { - cy.intercept(/\/api\/v1\/external_result/).as("external_result"); - cy.get("[name='name']").type("akhil"); - cy.wait("@external_result").then((interception) => { - expect(interception.response.statusCode).to.equal(200); - }); - cy.url().should("include", "akhil"); - }); - - it("Search by phone number", () => { - cy.intercept(/\/api\/v1\/external_result/).as("external_result"); - cy.get("[placeholder='Search by Phone Number']").type("7387434255"); - cy.wait("@external_result").then((interception) => { - expect(interception.response.statusCode).to.equal(200); - }); - cy.url().should("include", "%2B917387434255"); - }); - - it("import", () => { - cy.intercept("POST", "/api/v1/external_result/bulk_upsert").as("import"); - cy.get("div").contains("Import/Export").click(); - cy.get("div").contains("Import Results").click(); - cy.get("[data-testid=import-file]") - .selectFile("cypress/fixtures/external-result-sample.csv", { - force: true, - }) - .wait(100); - cy.submitButton("Import"); - cy.wait("@import").then((interception) => { - expect(interception.response.statusCode).to.equal(202); - }); - }); - - it("export", () => { - cy.intercept("**", (req) => { - const url = new URL(req.url); - const params = new URLSearchParams(url.search); - if ( - req.method === "GET" && - url.pathname === "/api/v1/external_result/" && - params.get("csv") === "true" - ) { - req.alias = "export"; - } - }); - cy.contains("Import/Export").click().wait(100); - cy.contains("Export Results").click(); - cy.wait("@export").then((interception) => { - expect(interception.response.statusCode).to.equal(200); - }); - }); - - afterEach(() => { - cy.saveLocalStorage(); - }); -}); diff --git a/src/Common/hooks/useActiveLink.ts b/src/Common/hooks/useActiveLink.ts index 0d02d33d0b1..b52b15600dd 100644 --- a/src/Common/hooks/useActiveLink.ts +++ b/src/Common/hooks/useActiveLink.ts @@ -15,7 +15,6 @@ const activeLinkPriority = { "/sample": "/sample", "/shifting": "/shifting", "/resource": "/resource", - "/external_results": "/external_results", "/users": "/users", "/notice_board": "/notice_board", "/facility": "/facility", diff --git a/src/Locale/kn.json b/src/Locale/kn.json index 6d440ae951b..ee808b5ebc3 100644 --- a/src/Locale/kn.json +++ b/src/Locale/kn.json @@ -364,7 +364,6 @@ "Sample Test": "ಮಾದರಿ ಪರೀಕ್ಷೆ", "Shifting": "ಸ್ಥಳಾಂತರ", "Resource": "ಸಂಪನ್ಮೂಲ", - "External Results": "ಬಾಹ್ಯ ಫಲಿತಾಂಶಗಳು", "Users": "ಬಳಕೆದಾರರು", "Profile": "ಪ್ರೊಫೈಲ್", "Dashboard": "ಡ್ಯಾಶ್‌ಬೋರ್ಡ್", @@ -810,4 +809,4 @@ "search_by_username": "ಬಳಕೆದಾರ ಹೆಸರಿನ ಮೂಲಕ ಹುಡುಕಿ", "last_online": "ಕೊನೆಯ ಆನ್‌ಲೈನ್", "total_users": "ಒಟ್ಟು ಬಳಕೆದಾರರು" -} +} \ No newline at end of file diff --git a/src/Locale/ml.json b/src/Locale/ml.json index 1de33212062..00f649c6952 100644 --- a/src/Locale/ml.json +++ b/src/Locale/ml.json @@ -364,7 +364,6 @@ "Sample Test": "സാമ്പിൾ ടെസ്റ്റ്", "Shifting": "ഫെസിലിറ്റി മാറ്റല്‍ ", "Resource": "സഹായം", - "External Results": "ബാഹ്യ ഫലങ്ങൾ", "Users": "ഉപയോക്താക്കൾ", "Profile": "പ്രൊഫൈൽ", "Dashboard": "ഡാഷ്ബോർഡ്", @@ -810,4 +809,4 @@ "search_by_username": "ഉപയോക്തൃനാമം ഉപയോഗിച്ച് തിരയുക", "last_online": "അവസാനമായി ഓൺലൈൻ", "total_users": "മൊത്തം ഉപയോക്താക്കൾ" -} +} \ No newline at end of file diff --git a/src/Locale/mr.json b/src/Locale/mr.json index 835d0524792..180e7df8391 100644 --- a/src/Locale/mr.json +++ b/src/Locale/mr.json @@ -52,7 +52,6 @@ "Sample Test": "नमुना तपासणी ", "Shifting": "शिफ्टिंग", "Resource": "संसाधन", - "External Results": "बाह्य परिणाम", "Users": "युजर्स", "Profile": "प्रोफाइल", "Dashboard": "डॅशबोर्ड", diff --git a/src/Locale/ta.json b/src/Locale/ta.json index 03decb02818..ddaebbe2183 100644 --- a/src/Locale/ta.json +++ b/src/Locale/ta.json @@ -364,7 +364,6 @@ "Sample Test": "மாதிரி சோதனை", "Shifting": "மாற்றுதல்", "Resource": "வளம்", - "External Results": "வெளி முடிவு", "Users": "பயனர்கள்", "Profile": "சுயவிவரம்", "Dashboard": "டாஷ்போர்டு", @@ -810,4 +809,4 @@ "search_by_username": "பயனர்பெயர் மூலம் தேடவும்", "last_online": "கடைசியாக ஆன்லைன்", "total_users": "மொத்த பயனர்கள்" -} +} \ No newline at end of file diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts index a14b5cd2122..7657f7da19e 100644 --- a/src/vite-env.d.ts +++ b/src/vite-env.d.ts @@ -25,7 +25,6 @@ interface ImportMetaEnv { readonly REACT_KASP_STRING?: string; readonly REACT_KASP_FULL_STRING?: string; readonly REACT_SAMPLE_FORMAT_ASSET_IMPORT?: string; - readonly REACT_SAMPLE_FORMAT_EXTERNAL_RESULT_IMPORT?: string; readonly REACT_WARTIME_SHIFTING?: string; readonly REACT_STILL_WATCHING_IDLE_TIMEOUT?: string; readonly REACT_STILL_WATCHING_PROMPT_DURATION?: string;