Skip to content

Fix for 2915. #1914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Fix for 2915. #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607cd3b
Fix for 2915.
sumathi-thirumani Sep 11, 2024
356ab0c
Fix for 2915.
sumathi-thirumani Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions frontend/src/components/common/CustomTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
id="header"
:key="column.key"
>
<div v-if="column.title === 'select' && schoolCollection?.sdcSchoolCollectionStatusCode !== 'SUBMITTED'">
<div v-if="column.title === 'select' && schoolCollection?.sdcSchoolCollectionStatusCode !== 'SUBMITTED' && !disableSelect">
<v-checkbox
v-model="masterCheckbox"
:indeterminate="selected.length > 0 && !isAllSelected()"
Expand Down Expand Up @@ -67,7 +67,7 @@
class="td-data"
>
<v-checkbox
v-if="column.title === 'select' && schoolCollection?.sdcSchoolCollectionStatusCode !== 'SUBMITTED'"
v-if="column.title === 'select' && schoolCollection?.sdcSchoolCollectionStatusCode !== 'SUBMITTED' && !disableSelect"
:model-value="isSelected(props.item) !== undefined"
hide-details="true"
@click.prevent.stop="onClick(props)"
Expand Down Expand Up @@ -226,6 +226,11 @@ export default {
type: Object,
required: false,
default: null
},
disableSelect: {
type: Boolean,
required: false,
default: false
}
},
emits: ['reload', 'editSelectedRow', 'selections'],
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/components/common/SignOffSignatures.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
width="90%"
:text="data.buttonText"
class="mt-3 mb-3"
:disabled="data.isDisabled"
:disabled="data.isDisabled || !isCollectionActive"
@click="submit(data)"
/>
</td>
Expand Down Expand Up @@ -93,6 +93,10 @@ export default {
required: true,
default: null
},
isCollectionActive: {
type: Boolean,
required: true
}
},
emits: [],
data() {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/StudentDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</v-col>

<v-col cols="3">
<span class="label">Special Ed Category:</span>
<span class="label">Inclusive Ed Category:</span>
</v-col>
<v-col cols="3">
{{ student?.mappedSpedCode }}
Expand Down
1 change: 1 addition & 0 deletions ...mponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/AllStudentsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
:district="district"
:show-export-btn="true"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...nents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/CareerProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
6 changes: 6 additions & 0 deletions ...rc/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/DetailComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@
:total-elements="totalElements"
:is-loading="isLoading"
:reset="resetFlag"
:disable-select="!isCollectionActive"
@reload="reload"
@editSelectedRow="editStudent"

Check warning on line 59 in frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

v-on event '@editSelectedRow' must be hyphenated

Check warning on line 59 in frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

v-on event '@editSelectedRow' must be hyphenated
@selections="selectedStudents = $event"
/>
</v-col>
Expand Down Expand Up @@ -161,6 +162,11 @@
isFinalSignOff: {
type: Boolean,
required: false
},
isCollectionActive: {
type: Boolean,
required: true,
default: false
}
},
emits: [],
Expand Down
1 change: 1 addition & 0 deletions ...mponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/EnglishLangComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...nents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/FrenchProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...s/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/IndSupportProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...c/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/RefugeeComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/SpecialEduComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
:config="config"
:district="district"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
<SignOffSignatures
:district="district"
:district-collection-object="districtCollectionObject"
:is-collection-active="isCollectionActive"
/>
</v-window-item>
</v-window>
Expand Down
1 change: 1 addition & 0 deletions ...ponents/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/CareerProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
10 changes: 9 additions & 1 deletion .../src/components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/DetailComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
class="d-flex justify-end"
>
<v-btn
v-if="isCollectionActive"
id="add"
color="#003366"
text="Add Student"
Expand All @@ -42,6 +43,7 @@
@click="addStudent"
/>
<v-btn
v-if="isCollectionActive"
id="remove"
color="#003366"
class="mr-1 mb-1"
Expand Down Expand Up @@ -80,9 +82,10 @@
:total-elements="totalElements"
:is-loading="isLoading"
:reset="resetFlag"
:school-collection="schoolCollection"
:school-collection="schoolCollection"
:disable-select="!isCollectionActive"
@reload="reload"
@editSelectedRow="editStudent"

Check warning on line 88 in frontend/src/components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

v-on event '@editSelectedRow' must be hyphenated

Check warning on line 88 in frontend/src/components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

v-on event '@editSelectedRow' must be hyphenated
@selections="selectedStudents = $event"
/>
</v-col>
Expand Down Expand Up @@ -187,6 +190,11 @@
isFinalSignOff: {
type: Boolean,
required: false
},
isCollectionActive: {
type: Boolean,
required: true,
default: false
}
},
emits: [],
Expand Down
1 change: 1 addition & 0 deletions ...components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/EnglishLangComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...end/src/components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/FTEComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
:config="config"
:show-export-btn="true"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...ponents/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/FrenchProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...nts/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/IndSupportProgramsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
1 change: 1 addition & 0 deletions ...src/components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/RefugeeComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
</v-container>
Expand Down
1 change: 1 addition & 0 deletions .../components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/SpecialEduComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
:config="config"
:school="school"
:is-final-sign-off="isFinalSignOff"
:is-collection-active="isCollectionActive"
/>
</div>
<div v-if="reportView === 'summary'">
Expand Down
Loading