r15-software-dev/scholarships-rs
1
0 Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 20 Wiki Activity

chore: pc change 1/8/26

Browse Source
This commit is contained in:
alphafetus committed 2026-01-08 08:40:31 -05:00
1 parent af1250350a
commit 247d0dfa73
2 files changed
+40 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pages/api/comparisons.rs
+1
View File
@@ -299,6 +299,7 @@ fn make_comp_list() -> Vec<ComparisonData> {
let mut major_comps = Vec::<ComparisonData>::new(); let mut major_comps = Vec::<ComparisonData>::new();
let mut comp_list = vec![ let mut comp_list = vec![
gpa_3,
test_comp, test_comp,
service_hours_20, service_hours_20,
service_hours_25, service_hours_25,
src/pages/scholarship_info.rs
+39 -23
View File
@@ -3,13 +3,14 @@ use leptos::either::Either;
use leptos::html::Dialog; use leptos::html::Dialog;
use leptos::logging::log; use leptos::logging::log;
use leptos::prelude::*; use leptos::prelude::*;
use leptos::task::spawn_local;
use leptos_oidc::{AuthLoaded, Authenticated}; use leptos_oidc::{AuthLoaded, Authenticated};
use leptos_router::hooks::{use_navigate, use_params}; use leptos_router::hooks::{use_navigate, use_params};
use crate::common::{ExpandableInfo, ScholarshipFormParams, SubmitStatus, ValueType}; use crate::common::{ExpandableInfo, ScholarshipFormParams, SubmitStatus, ValueType};
use crate::components::{ActionButton, Banner, ChipsList, Loading, OutlinedTextField, Panel, RadioList, Row, TextFieldType, ValidatedForm}; use crate::components::{ActionButton, Banner, ChipsList, Loading, OutlinedTextField, Panel, RadioList, Row, TextFieldType, ValidatedForm};
use super::UnauthenticatedPage; use super::UnauthenticatedPage;
use crate::pages::utils::get_user_claims; use crate::pages::utils::get_user_claims;
use super::api::{get_comparison_info, get_provider_scholarships, get_scholarship_info, CreateScholarshipInfo, RegisterScholarship, DeleteProviderScholarship, get_comparisons_categorized}; use super::api::{get_comparison_info, get_provider_scholarships, get_scholarship_info, CreateScholarshipInfo, RegisterScholarship, DeleteProviderScholarship, get_comparisons_categorized, create_test_comparisons, CreateTestComparisons};
/// # Scholarship Info Page /// # Scholarship Info Page
@@ -457,29 +458,20 @@ fn ScholarshipForm(
}; };
// Get comparison lists. // Get comparison lists.
let sports_ids = Signal::derive(move || { let sports_ids = Signal::derive(move || get_comp_ids("Sports Participation"));
get_comp_ids("Sports Participation") let sports_text = Signal::derive(move || get_comp_text("Sports Participation"));
});
let sports_text = Signal::derive(move || { let misc_ids = Signal::derive(move || get_comp_ids("Miscellaneous"));
get_comp_text("Sports Participation") let misc_text = Signal::derive(move || get_comp_text("Miscellaneous"));
});
let misc_ids = Signal::derive(move || { let comm_ids = Signal::derive(move || get_comp_ids("Community Service"));
get_comp_ids("Miscellaneous") let comm_text = Signal::derive(move || get_comp_text("Community Service"));
});
let misc_text = Signal::derive(move || { let res_ids = Signal::derive(move || get_comp_ids("Residency"));
get_comp_text("Miscellaneous") let res_text = Signal::derive(move || get_comp_text("Residency"));
});
let comm_ids = Signal::derive(move || { let gpa_ids = Signal::derive(move || get_comp_ids("GPA Limits"));
get_comp_ids("Community Involvement") let gpa_text = Signal::derive(move || get_comp_text("GPA Limits"));
});
let comm_text = Signal::derive(move || {
get_comp_text("Community Involvement")
});
// We'll collect the scholarship's name, num_awards, amount_per_award, total_awards, // We'll collect the scholarship's name, num_awards, amount_per_award, total_awards,
// fafsa_required, award_to, transcript_required, recipient_selection, essay_requirement (and prompt) // fafsa_required, award_to, transcript_required, recipient_selection, essay_requirement (and prompt)
@@ -495,6 +487,8 @@ fn ScholarshipForm(
}); });
}; };
let create_comps = ServerAction::<CreateTestComparisons>::new();
view! { view! {
<Panel> <Panel>
<Show <Show
@@ -598,6 +592,15 @@ fn ScholarshipForm(
label="If so, select a prompt from the list below." label="If so, select a prompt from the list below."
/> />
</Row> </Row>
<Row>
<ChipsList
label="GPA Requirements"
data_member="gpa"
data_map=chips_data
values=gpa_ids
displayed_text=gpa_text
/>
</Row>
<Row> <Row>
<ChipsList <ChipsList
label="Sports Participation" label="Sports Participation"
@@ -605,18 +608,26 @@ fn ScholarshipForm(
data_map=chips_data data_map=chips_data
values=sports_ids values=sports_ids
displayed_text=sports_text displayed_text=sports_text
allows_multiple=true
/> />
</Row> </Row>
<Row> <Row>
<ChipsList <ChipsList
label="Community Involvement" label="Community Service"
data_member="community_involvement" data_member="community_service"
data_map=chips_data data_map=chips_data
values=comm_ids values=comm_ids
displayed_text=comm_text displayed_text=comm_text
/> />
</Row> </Row>
<Row>
<ChipsList
label="Residency"
data_member="residency"
data_map=chips_data
values=res_ids
displayed_text=res_text
/>
</Row>
<Row> <Row>
<ChipsList <ChipsList
label="Miscellaneous" label="Miscellaneous"
@@ -637,6 +648,11 @@ fn ScholarshipForm(
}).collect_view() }).collect_view()
}} }}
</ValidatedForm> </ValidatedForm>
<ActionButton
on:click=move |_| {
create_comps.dispatch(CreateTestComparisons {});
}
>"Create Comparisons"</ActionButton>
</Suspense> </Suspense>
</Show> </Show>
</Panel> </Panel>