insects/beacon
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not show catch button on caught fish

Browse source
This commit is contained in:
insects 2025-02-06 15:15:58 +01:00
parent 77eeaef8cc
commit 90fadda0be
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data.rs
View file

@ -512,7 +512,7 @@ impl Filters {
pub fn filter<'a>( pub fn filter<'a>(
&'a self, &'a self,
fish: Vec<&'a CombinedFish>, fish: Vec<&'a CombinedFish>,
caught_fish_ids: Vec<i32>, caught_fish_ids: &Vec<i32>,
) -> Vec<&'a CombinedFish> { ) -> Vec<&'a CombinedFish> {
fish.into_iter() fish.into_iter()
.filter(|fish| { .filter(|fish| {

4
src/main.rs
View file

@ -59,8 +59,8 @@ async fn new_account_handler(state: State<Arc<AppState>>) -> Result<Markup, AppE
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct FilterQuery { pub struct FilterQuery {
pub caught: Option<()>, pub caught: Option<String>,
pub big: Option<()>, pub big: Option<String>,
pub patches: Option<Vec<f32>>, pub patches: Option<Vec<f32>>,
} }

9
src/templates.rs
View file

@ -32,8 +32,7 @@ pub fn main_page(
filters: &Filters, filters: &Filters,
) -> Markup { ) -> Markup {
let meta = state.data.fish_with_meta(); let meta = state.data.fish_with_meta();
let mut values: Vec<&CombinedFish> = filters.filter(meta.values().collect(), caught_fish); let mut values: Vec<&CombinedFish> = filters.filter(meta.values().collect(), &caught_fish);
dbg!(&filters);
values.sort_by(|afish, bfish| { values.sort_by(|afish, bfish| {
bfish bfish
@ -104,8 +103,10 @@ pub fn main_page(
section.up[fish.is_up].alwaysup[fish.is_always_up] { section.up[fish.is_up].alwaysup[fish.is_always_up] {
.title { .title {
div { div {
form action=(format!("/{}/catch/{}", acc_id, fish.entry.id)) method="post" { @if !caught_fish.contains(&(fish.entry.id as i32)) {
button.catch-button type="submit" { (PreEscaped("&check;")) } form action=(format!("/{}/catch/{}", acc_id, fish.entry.id)) method="post" {
button.catch-button type="submit" { (PreEscaped("&check;")) }
}
} }
} }
div { div {