From 2b51a07e28af6d50780a55381e5d59dd3062519b Mon Sep 17 00:00:00 2001 From: Abhilash Dubey <124042593+AbhilashKD@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:25:10 +0530 Subject: [PATCH 1/8] Update dev-pratham-deployment.yaml --- .github/workflows/dev-pratham-deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/dev-pratham-deployment.yaml b/.github/workflows/dev-pratham-deployment.yaml index e7495da3..bfd3fafe 100644 --- a/.github/workflows/dev-pratham-deployment.yaml +++ b/.github/workflows/dev-pratham-deployment.yaml @@ -1,8 +1,6 @@ name: Deployment on the Pratham-dev Frontend Server on: - push: - branches: - - main + workflow_dispatch: jobs: PRATHAM-DEV-DEPLOYMENT: runs-on: ubuntu-latest From 7db3e86de66d989b787c3e90d4bfce6c5bade7cd Mon Sep 17 00:00:00 2001 From: Abhilash Dubey <124042593+AbhilashKD@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:25:34 +0530 Subject: [PATCH 2/8] Update tekdi-server-deployment.yaml --- .github/workflows/tekdi-server-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tekdi-server-deployment.yaml b/.github/workflows/tekdi-server-deployment.yaml index 56be1b7a..a4f543cf 100644 --- a/.github/workflows/tekdi-server-deployment.yaml +++ b/.github/workflows/tekdi-server-deployment.yaml @@ -2,7 +2,7 @@ name: Deployment on the Tekdi Frontend Server on: push: branches: - - main + - release-1.0.0 jobs: TEKDI-QA-DEPLOYMENT: runs-on: ubuntu-latest From 8f81028bf298b5c336a744f8931893a655d605a7 Mon Sep 17 00:00:00 2001 From: AbhilashKD Date: Mon, 14 Oct 2024 15:33:55 +0530 Subject: [PATCH 3/8] Removed production for tag base deployment --- .../workflows/prod-pratham-deployment.yaml | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/prod-pratham-deployment.yaml diff --git a/.github/workflows/prod-pratham-deployment.yaml b/.github/workflows/prod-pratham-deployment.yaml deleted file mode 100644 index 2e6da92b..00000000 --- a/.github/workflows/prod-pratham-deployment.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: Deployment on the Pratham-PROD Frontend Server -on: - push: - branches: - - main -jobs: - PROD-PRAHAM-DEPLOYMENT: - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - name: Deploy Stack - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST_NAME_PROD }} - username: ${{ secrets.USERNAME_PROD }} - key: ${{ secrets.EC2_SSH_KEY_PROD }} - port: ${{ secrets.PORT_PROD }} - script: | - cd ${{ secrets.TARGET_DIR_PROD }} - if [ -f .env ]; then - rm .env - fi - echo "${{ secrets.PROD_ENV }}" > .env - ls -ltra - ./deploy.sh From 41c468d2513342dbef27eccc2caf02834d77c277 Mon Sep 17 00:00:00 2001 From: Arif-tekdi-technologies Date: Mon, 14 Oct 2024 17:51:34 +0530 Subject: [PATCH 4/8] Issue #1817 feat: View course planner on admin app UI development --- public/Sample.csv | 10 ++++++++++ public/locales/en/common.json | 3 ++- src/pages/importCsv.tsx | 18 ++++++++++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 public/Sample.csv diff --git a/public/Sample.csv b/public/Sample.csv new file mode 100644 index 00000000..fd37d57b --- /dev/null +++ b/public/Sample.csv @@ -0,0 +1,10 @@ +name,externalId,description,type,hasAParentTask,parentTaskOperator,parentTaskValue,parentTaskId,isDeletable,learningResources1-name,learningResources1-link,learningResources1-app,learningResources1-type,learningResources1-id,learningResources2-name,learningResources2-link,learningResources2-app,learningResources2-type,minNoOfSubmissionsRequired,sequenceNumber,startDate,endDate,solutionType,solutionSubType,solutionId +Maths-Chapter 1,1,,content,NO,,,,FALSE,,,,,,,,,,,1,09-01-2024,10/31/24,,, +Arithmetic,2,,content,YES,EQUALS,started,1,FALSE,Chemical reaction,https://www.youtube.com/watch?v=TStjgUmL1RQ,Youtube,postrequisite,,,https://www.youtube.com/watch?v=CqN-XIPhMpo,,,subTask1,2,09-01-2024,10/31/24,,, +Polynomials,3,,content,YES,EQUALS,started,1,FALSE,Acid and Base,https://www.youtube.com/watch?v=ja7p_tzTTEA,Youtube,postrequisite,,,https://www.youtube.com/watch?v=rDjWrNRKfvg,,,subTask1,4,09-01-2024,10/31/24,,, +Coordinate geometry,4,,content,YES,EQUALS,started,1,FALSE,Equation of Motion,https://www.youtube.com/watch?v=80gApHJd3iY,Youtube,prerequisite,,,,,,subTask1,3,09-01-2024,10/31/24,,, +Maths-Chapter 2,5,,content,NO,,,,FALSE,,,,,,,,,,,5,09-01-2024,10/31/24,,, +Circles,6,,content,YES,EQUALS,started,5,FALSE,Human Organs,https://www.youtube.com/watch?v=YE2peDF4Zqg,Youtube,prerequisite,,,,,,subTask1,6,09-01-2024,10/31/24,,, +Trigonometry,7,,content,YES,EQUALS,started,5,FALSE,CardioVascular,https://www.youtube.com/watch?v=Vi1JK6IYVt8,Youtube,prerequisite,,,,,,subTask1,7,09-01-2024,10/31/24,,, +Statistics,8,,content,YES,EQUALS,started,5,FALSE,Liver and Kidney,https://www.youtube.com/watch?v=rDjWrNRKfvg,Youtube,postrequisite,,,,,,subTask1,8,09-01-2024,10/31/24,,, +Quadratic Equation,9,,content,YES,EQUALS,started,5,FALSE,Kaade Kess Resource,https://www.youtube.com/watch?v=CqN-XIPhMpo,Youtube,postrequisite,,,https://www.youtube.com/watch?v=CqN-XIPhMpo,,,subTask1,9,09-01-2024,10/31/24,,, \ No newline at end of file diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 4f20b65e..3b136006 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -229,7 +229,8 @@ "LEARNERS_POSTREQISITE":"Learners Post-requisites", "NO_DATA_POST":"No data available for Learners Post-requisites", "FACILITATORS":"Facilitators Requisites", - "NO_DATA":"No data available for Facilitators Requisites" + "NO_DATA":"No data available for Facilitators Requisites", + "DOWNLOAD_SAMPLE_CSV":"Download Sample CSV" }, diff --git a/src/pages/importCsv.tsx b/src/pages/importCsv.tsx index 77754a20..bc8f5fa2 100644 --- a/src/pages/importCsv.tsx +++ b/src/pages/importCsv.tsx @@ -191,6 +191,16 @@ const ImportCsv = () => { setSelectedFile(null); }; + const handleDownloadCSV = () => { + const link = document.createElement("a"); + link.href = "/Sample.csv"; + link.download = "Sample.csv"; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + }; + + const handleUpload = async () => { if (selectedFile) { const metaData: CoursePlannerMetaData = { @@ -350,7 +360,7 @@ const ImportCsv = () => { > {t("COURSE_PLANNER.IMPORT_PLANNER")} - {/* */} + {t("COURSE_PLANNER.DOWNLOAD_SAMPLE_CSV")} +