diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58f9e185..916d3cf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,9 +38,9 @@ jobs: - name: Set Branch run: | - export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]' + export APPS_JSON='[{"url": "https://github.com/frappe/payments","branch": "version-15"},{"url": "https://github.com/frappe/lms","branch": "main"}]' echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV - echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV + echo "FRAPPE_BRANCH=version-16" >> $GITHUB_ENV - name: Set Image Tag run: | @@ -61,4 +61,4 @@ jobs: ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} build-args: | "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}" - "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}" \ No newline at end of file + "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}" diff --git a/codecov.yml b/codecov.yml index 4f6dfa59..fa61467a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,2 +1,9 @@ +coverage: + status: + project: + default: + target: auto + threshold: 1% + ignore: - "**/test_helper.py" \ No newline at end of file diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js index 8a8e0f2d..8d9f577c 100644 --- a/cypress/e2e/course_creation.cy.js +++ b/cypress/e2e/course_creation.cy.js @@ -176,7 +176,10 @@ describe("Course Creation", () => { cy.get("div").contains("Test Course").click(); cy.get("button").contains("Settings").click(); cy.get("header").within(() => { - cy.get("svg.lucide.lucide-trash2-icon").click(); + cy.get("svg.lucide.lucide-ellipsis-icon").click(); + }); + cy.get("div[role=menu]").within(() => { + cy.get("span").contains("Delete").click(); }); cy.get("span").contains("Delete").click(); cy.wait(500); diff --git a/docker/init.sh b/docker/init.sh index ed74f101..edba3170 100644 --- a/docker/init.sh +++ b/docker/init.sh @@ -24,6 +24,7 @@ bench set-redis-socketio-host redis://redis:6379 sed -i '/redis/d' ./Procfile sed -i '/watch/d' ./Procfile +bench get-app payments bench get-app lms bench new-site lms.localhost \ @@ -32,6 +33,7 @@ bench new-site lms.localhost \ --admin-password admin \ --no-mariadb-socket +bench --site lms.localhost install-app payments bench --site lms.localhost install-app lms bench --site lms.localhost set-config developer_mode 1 bench --site lms.localhost clear-cache diff --git a/frontend/src/components/Modals/Event.vue b/frontend/src/components/Modals/Event.vue index c5577bb5..2e16a0a8 100644 --- a/frontend/src/components/Modals/Event.vue +++ b/frontend/src/components/Modals/Event.vue @@ -247,7 +247,7 @@ const evaluationResource = createResource({ member: props.event.member, course: props.event.course, batch_name: props.event.batch_name, - date: props.event.date, + date_value: props.event.date, start_time: props.event.start_time, end_time: props.event.end_time, status: evaluation.status, diff --git a/frontend/src/components/Settings/Evaluators.vue b/frontend/src/components/Settings/Evaluators.vue index 8e4ded97..01840017 100644 --- a/frontend/src/components/Settings/Evaluators.vue +++ b/frontend/src/components/Settings/Evaluators.vue @@ -137,6 +137,7 @@ import NewMemberModal from '@/components/Modals/NewMemberModal.vue' import AddEvaluatorModal from '@/components/Modals/AddEvaluatorModal.vue' const search = ref('') +const show = defineModel('show') const showExistingUser = ref(false) const showNewEvaluator = ref(false) const router = useRouter() @@ -173,6 +174,7 @@ watch(search, () => { }) const openProfile = (username: string) => { + show.value = false router.push({ name: 'Profile', params: { diff --git a/frontend/src/components/Settings/PaymentGatewayDetails.vue b/frontend/src/components/Settings/PaymentGatewayDetails.vue index b6d5cb0d..43c4c59a 100644 --- a/frontend/src/components/Settings/PaymentGatewayDetails.vue +++ b/frontend/src/components/Settings/PaymentGatewayDetails.vue @@ -6,7 +6,7 @@ }" >