update range int size (#1479)

chillenberger · web-flow · commit 85e36eedef27 · 2024-05-24T09:42:55.000-06:00
diff --git a/pgml-dashboard/src/components/inputs/range/mod.rs b/pgml-dashboard/src/components/inputs/range/mod.rs
@@ -32,11 +32,11 @@ impl From<&str> for InterpolationType {
 #[template(path = "inputs/range/template.html")]
 pub struct Range {
     color: String,
-    min: i32,
-    max: i32,
+    min: i64,
+    max: i64,
     interpolation_type: InterpolationType,
     target: Target,
-    initial_value: i32,
+    initial_value: i64,
 }
 
 impl Range {
@@ -56,12 +56,12 @@ impl Range {
         self
     }
 
-    pub fn min(mut self, min: i32) -> Self {
+    pub fn min(mut self, min: i64) -> Self {
         self.min = min;
         self
     }
 
-    pub fn max(mut self, max: i32) -> Self {
+    pub fn max(mut self, max: i64) -> Self {
         self.max = max;
         self
     }
@@ -76,7 +76,7 @@ impl Range {
         self
     }
 
-    pub fn initial_value(mut self, initial_value: i32) -> Self {
+    pub fn initial_value(mut self, initial_value: i64) -> Self {
         self.initial_value = initial_value;
         self
     }
diff --git a/pgml-dashboard/src/components/inputs/range/range_controller.js b/pgml-dashboard/src/components/inputs/range/range_controller.js
@@ -15,7 +15,6 @@ export default class extends Controller {
   initialize() {}
 
   connect() {
-    // console.log("range connected", this.initialValue)
     this.rangeTarget.value =
       this.interpolationTypeValue === "exponential"
         ? this.exponentialInterpolationSolveX(this.initialValue)
@@ -52,7 +51,7 @@ export default class extends Controller {
 
   exponentialInterpolation(value) {
     if (value < 1) {
-      return 0;
+      return this.minValue;
     }
 
     let minValue = this.minValue > 1 ? this.minValue : 1;
@@ -72,7 +71,6 @@ export default class extends Controller {
     let numerator = Math.log(value / minValue);
     let denominator = Math.log(this.maxValue / minValue);
     let out = (numerator / denominator) * 100;
-    // console.log(numerator, denominator, out, Number(out.toPrecision(3)))
     return parseInt(Number(out.toPrecision(3)));
   }
 
@@ -82,7 +80,6 @@ export default class extends Controller {
   }
 
   linearInterpolationSolveX(value) {
-    // console.log("linear solve x ", value, this.minValue, this.maxValue)
     let out = ((value - this.minValue) / (this.maxValue - this.minValue)) * 100;
     return parseInt(Number(out.toPrecision(3)));
   }
diff --git a/pgml-dashboard/src/components/inputs/range_group_pricing_calc/mod.rs b/pgml-dashboard/src/components/inputs/range_group_pricing_calc/mod.rs
@@ -8,12 +8,12 @@ use sailfish::TemplateOnce;
 pub struct RangeGroupPricingCalc {
     interpolation_type: InterpolationType,
     include_slider: bool,
-    min: i32,
-    max: i32,
+    min: i64,
+    max: i64,
     target: StimulusTarget,
     label: String,
     name: String,
-    initial_value: i32,
+    initial_value: i64,
 }
 
 impl RangeGroupPricingCalc {
@@ -40,12 +40,12 @@ impl RangeGroupPricingCalc {
         self
     }
 
-    pub fn min(mut self, min: i32) -> Self {
+    pub fn min(mut self, min: i64) -> Self {
         self.min = min;
         self
     }
 
-    pub fn max(mut self, max: i32) -> Self {
+    pub fn max(mut self, max: i64) -> Self {
         self.max = max;
         self
     }
@@ -65,7 +65,7 @@ impl RangeGroupPricingCalc {
         self
     }
 
-    pub fn initial_value(mut self, initial_value: i32) -> Self {
+    pub fn initial_value(mut self, initial_value: i64) -> Self {
         self.initial_value = initial_value;
         self
     }

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ impl From<&str> for InterpolationType {`
`32`	`32`	`#[template(path = "inputs/range/template.html")]`
`33`	`33`	`pub struct Range {`
`34`	`34`	`color: String,`
`35`		`- min: i32,`
`36`		`- max: i32,`
	`35`	`+ min: i64,`
	`36`	`+ max: i64,`
`37`	`37`	`interpolation_type: InterpolationType,`
`38`	`38`	`target: Target,`
`39`		`- initial_value: i32,`
	`39`	`+ initial_value: i64,`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`impl Range {`
`@@ -56,12 +56,12 @@ impl Range {`
`56`	`56`	`self`
`57`	`57`	`}`
`58`	`58`
`59`		`- pub fn min(mut self, min: i32) -> Self {`
	`59`	`+ pub fn min(mut self, min: i64) -> Self {`
`60`	`60`	`self.min = min;`
`61`	`61`	`self`
`62`	`62`	`}`
`63`	`63`
`64`		`- pub fn max(mut self, max: i32) -> Self {`
	`64`	`+ pub fn max(mut self, max: i64) -> Self {`
`65`	`65`	`self.max = max;`
`66`	`66`	`self`
`67`	`67`	`}`
`@@ -76,7 +76,7 @@ impl Range {`
`76`	`76`	`self`
`77`	`77`	`}`
`78`	`78`
`79`		`- pub fn initial_value(mut self, initial_value: i32) -> Self {`
	`79`	`+ pub fn initial_value(mut self, initial_value: i64) -> Self {`
`80`	`80`	`self.initial_value = initial_value;`
`81`	`81`	`self`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ use sailfish::TemplateOnce;`
`8`	`8`	`pub struct RangeGroupPricingCalc {`
`9`	`9`	`interpolation_type: InterpolationType,`
`10`	`10`	`include_slider: bool,`
`11`		`- min: i32,`
`12`		`- max: i32,`
	`11`	`+ min: i64,`
	`12`	`+ max: i64,`
`13`	`13`	`target: StimulusTarget,`
`14`	`14`	`label: String,`
`15`	`15`	`name: String,`
`16`		`- initial_value: i32,`
	`16`	`+ initial_value: i64,`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl RangeGroupPricingCalc {`
`@@ -40,12 +40,12 @@ impl RangeGroupPricingCalc {`
`40`	`40`	`self`
`41`	`41`	`}`
`42`	`42`
`43`		`- pub fn min(mut self, min: i32) -> Self {`
	`43`	`+ pub fn min(mut self, min: i64) -> Self {`
`44`	`44`	`self.min = min;`
`45`	`45`	`self`
`46`	`46`	`}`
`47`	`47`
`48`		`- pub fn max(mut self, max: i32) -> Self {`
	`48`	`+ pub fn max(mut self, max: i64) -> Self {`
`49`	`49`	`self.max = max;`
`50`	`50`	`self`
`51`	`51`	`}`
`@@ -65,7 +65,7 @@ impl RangeGroupPricingCalc {`
`65`	`65`	`self`
`66`	`66`	`}`
`67`	`67`
`68`		`- pub fn initial_value(mut self, initial_value: i32) -> Self {`
	`68`	`+ pub fn initial_value(mut self, initial_value: i64) -> Self {`
`69`	`69`	`self.initial_value = initial_value;`
`70`	`70`	`self`
`71`	`71`	`}`