diff --git a/cypress/pages/notice/NoticePage.js b/cypress/pages/notice/NoticePage.js index 330f94ec..01de4a86 100644 --- a/cypress/pages/notice/NoticePage.js +++ b/cypress/pages/notice/NoticePage.js @@ -43,7 +43,8 @@ class Notice { // Form Filling fillIdentificationDataForm(formData) { - const { noticeNup, instrumentType, totalAmount, noticeManager, managerEmail, quotaNumber } = formData; + const { noticeNup, instrumentType, totalAmount, noticeManager, managerEmail, quotaNumber, publicPolicy } = + formData; // Fill NUP field cy.get(el.noticeNupInput).should('be.visible').type(noticeNup); @@ -65,6 +66,11 @@ class Notice { // Fill quota number cy.get(el.quotaNumberInput).should('be.visible').type(quotaNumber); + this.selectDropdownOption( + '[data-cy=monitoring-report-request-deadline-identification-data-form-select]', + publicPolicy + ); + // Submit form cy.get(el.submitFormButton).should('be.visible').click(); } diff --git a/resources/js/Pages/Notices/NupDialog.vue b/resources/js/Pages/Notices/NupDialog.vue index aec47870..379a7914 100644 --- a/resources/js/Pages/Notices/NupDialog.vue +++ b/resources/js/Pages/Notices/NupDialog.vue @@ -33,7 +33,7 @@ const form = useForm({ budget_allocation_request_date: '', creditor_registration_nup: '', creditor_registration_request_date: '', - monitoring_report_request_deadline: 'PNAB', + monitoring_report_request_deadline: null, }); watch( @@ -41,7 +41,13 @@ watch( (notice) => { if (!notice) return; form.nup = notice.mae ?? ''; - form.monitoring_report_request_deadline = notice.monitoring_report_request_deadline ?? 'PNAB'; + } +); + +watch( + () => props.modelValue, + (isOpen) => { + if (isOpen) form.monitoring_report_request_deadline = null; } ); @@ -176,7 +182,7 @@ const valorExtenso = computed(() => { @@ -185,7 +191,7 @@ const valorExtenso = computed(() => { :items="monitoringReportRequestDeadlines" item-title="label" item-value="value" - placeholder="Selecione o prazo" + placeholder="Selecione uma Política Pública" required data-cy="monitoring-report-request-deadline-identification-data-form-select" /> diff --git a/resources/js/Pages/Projects/Partials/ProjectNoticeEdit.vue b/resources/js/Pages/Projects/Partials/ProjectNoticeEdit.vue index bb00b078..89861100 100644 --- a/resources/js/Pages/Projects/Partials/ProjectNoticeEdit.vue +++ b/resources/js/Pages/Projects/Partials/ProjectNoticeEdit.vue @@ -152,7 +152,7 @@ const saveAll = () => {