Skip to content

Dan estimator fix #1075

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 3 commits into from
Oct 13, 2023
Merged

Dan estimator fix #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d963b61
give range input the power to reset values, trigger input event
chillenberger Oct 13, 2023
e68162c
use StimulusTarget
chillenberger Oct 13, 2023
dff96e0
max length should be 5
chillenberger Oct 13, 2023
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
24 changes: 16 additions & 8 deletions pgml-dashboard/src/components/inputs/range_group/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use pgml_components::component;
use sailfish::TemplateOnce;
use crate::components::stimulus::stimulus_target::StimulusTarget;

#[derive(TemplateOnce, Default)]
#[template(path = "inputs/range_group/template.html")]
Expand All @@ -10,10 +11,11 @@ pub struct RangeGroup {
pub max: i64,
pub step: f32,
pub initial_value: f64,
pub text_target: Option<String>,
pub range_target: Option<String>,
pub text_target: StimulusTarget,
pub range_target: StimulusTarget,
pub cost_rate: Option<f32>,
pub units: String,
pub group_target: StimulusTarget,
}

impl RangeGroup {
Expand All @@ -25,10 +27,11 @@ impl RangeGroup {
max: 100,
step: 1.0,
initial_value: 1.0,
text_target: None,
range_target: None,
text_target: StimulusTarget::new(),
range_target: StimulusTarget::new(),
cost_rate: None,
units: String::default(),
group_target: StimulusTarget::new(),
}
}

Expand All @@ -49,13 +52,13 @@ impl RangeGroup {
self
}

pub fn text_target(mut self, target: &str) -> Self {
self.text_target = Some(target.to_owned());
pub fn text_target(mut self, target: StimulusTarget) -> Self {
self.text_target = target;
self
}

pub fn range_target(mut self, target: &str) -> Self {
self.range_target = Some(target.to_owned());
pub fn range_target(mut self, target: StimulusTarget) -> Self {
self.range_target = target.to_owned();
self
}

Expand All @@ -68,6 +71,11 @@ impl RangeGroup {
self.units = units.to_owned();
self
}

pub fn group_target(mut self, target: StimulusTarget) -> Self {
self.group_target = target;
self
}
}

component!(RangeGroup);
20 changes: 13 additions & 7 deletions pgml-dashboard/src/components/inputs/range_group/range_group_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ export default class extends Controller {
static targets = [
"range",
"text",
"group"
]

static values = {
bounds: Object
bounds: Object,
initial: Number
}

initialize() {
Expand All @@ -17,26 +19,30 @@ export default class extends Controller {

updateText(e) {
this.textTarget.value = e.target.value
this.groupTarget.dispatchEvent(new Event("rangeInput"))
}

updateRange(e) {
if( e.target.value < this.boundsValue.min
|| !e.target.value || !this.isNumeric(e.target.value)) {
this.rangeTarget.value = this.boundsValue.min
this.textTarget.value = this.boundsValue.min
return
}

if( e.target.value > this.boundsValue.max) {
} else if( e.target.value > this.boundsValue.max) {
this.rangeTarget.value = this.boundsValue.max
this.textTarget.value = this.boundsValue.max
return
} else {
this.rangeTarget.value = e.target.value
}

this.rangeTarget.value = e.target.value
this.groupTarget.dispatchEvent(new Event("rangeInput"))
}

isNumeric(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
}

reset() {
this.rangeTarget.value = this.initialValue
this.textTarget.value = this.initialValue
}
}
13 changes: 9 additions & 4 deletions pgml-dashboard/src/components/inputs/range_group/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
<div data-controller="inputs-range-group" data-inputs-range-group-bounds-value='{"min": <%- min%>, "max": <%- max%>}'>
<div data-controller="inputs-range-group"
data-inputs-range-group-bounds-value='{"min": <%- min%>, "max": <%- max%>}'
data-inputs-range-group-initial-value="<%- initial_value.to_string() %>"
data-inputs-range-group-target="group"
<%- group_target %>
data-action="reset->inputs-range-group#reset">
<div class="d-flex flex-column flex-md-row">
<div class="flex-grow-1">
<h6 class="h6"><%- title %></h6>
</div>
<div>
<div class="input-group">
<input class="text-input form-control text-end text-white fw-bold" maxlength="4" type="text"
<input class="text-input form-control text-end text-white fw-bold" maxlength="5" type="text"
data-inputs-range-group-target="text"
data-action="focusout->inputs-range-group#updateRange"
<% if text_target.is_some() {%><%- text_target.unwrap()%><% } %>>
<%- text_target %>>
<div class="input-group-text fw-bold text-start" style="width: 2em;">
<%- units %>
</div>
Expand All @@ -25,7 +30,7 @@ <h6 class="h6"><%- title %></h6>
value="<%- initial_value.to_string() %>"
data-action="inputs-range-group#updateText"
data-inputs-range-group-target="range"
<% if range_target.is_some() { %><%- range_target.unwrap() %><% } %>>
<%- range_target %>>

<% if cost_rate.is_some() { %>
<div class="w-100 d-flex justify-content-end">
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy