Skip to content
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.

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

Date input fix #598

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 23 additions & 20 deletions frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,29 @@
<v-stepper-window>
<v-stepper-window-item value="1">
<v-row>
<v-select
v-model="reportType"
:items="[
{
text: 'NONGRADPRJ - Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)',
value: 'NONGRADPRJ',
},
{
text: 'GRADREG - Graduated Students (MM YYYY to MM YYYY) Report',
value: 'GRADREG',
},
{
text: 'NONGRADREG - Not-Yet Graduated Students (MM YYYY to MM YYYY) Report',
value: 'NONGRADREG',
},
]"
item-title="text"
item-value="value"
label="Select a report type"
></v-select>
<v-col sm="2"> Report Type </v-col>
<v-col sm="10">
<v-select
v-model="reportType"
:items="[
{
text: 'NONGRADPRJ - Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)',
value: 'NONGRADPRJ',
},
{
text: 'GRADREG - Graduated Students (MM YYYY to MM YYYY) Report',
value: 'GRADREG',
},
{
text: 'NONGRADREG - Not-Yet Graduated Students (MM YYYY to MM YYYY) Report',
value: 'NONGRADREG',
},
]"
item-title="text"
item-value="value"
label="Select a report type"
></v-select>
</v-col>
</v-row>
<v-row>
<v-select
Expand Down
51 changes: 27 additions & 24 deletions frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,39 @@
<v-stepper-window>
<v-stepper-window-item value="1">
<v-row>
<v-col sm="2">
<v-select
v-model="reportType"
:items="[
{
text: 'Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)',
value: 'NONGRADPRJ',
},
{
text: 'Graduated Students (MM YYYY to MM YYYY) Report and Not-Yet Graduated Students (MM YYYY to MM YYYY) Report',
value: 'GRADREG and NONGRADREG',
},
]"
item-title="text"
item-value="value"
label="Select a report type"
></v-select>
</v-col>
<v-col>
Shaiu
<v-col sm="2"> Report Type </v-col>
<v-col sm="10">
<v-select
v-model="reportType"
:items="[
{
text: 'Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)',
value: 'NONGRADPRJ',
},
{
text: 'Graduated Students (MM YYYY to MM YYYY) Report and Not-Yet Graduated Students (MM YYYY to MM YYYY) Report',
value: 'GRADREG and NONGRADREG',
},
]"
item-title="text"
item-value="value"
label="Select a report type"
></v-select>
</v-col>
<v-col> </v-col>
</v-row>
<v-row>
<v-select
v-model="group"
item-title="title"
item-value="value"
:items="['School', 'School Category', {title:'All', value="All Schools"} ]"
:item-title="title"
:item-value="value"
:items="[
'School',
'School Category',
{ title: 'All', value: 'All Schools' },
]"
label="Select a group"
></v-select>
/>
</v-row>
<v-row v-if="group == 'School'">
<SchoolInput>
Expand Down
Loading