LLCAXCHZF-56/resolving conflicts

DataShades · Jul 29, 2024 · 1479552 · 1479552
2 parents b88e5b6 + 91ea83c
commit 1479552
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/ckanext/charts/assets/js/charts-render-observable.js b/ckanext/charts/assets/js/charts-render-observable.js
@@ -27,7 +27,7 @@ ckan.module("charts-render-observable", function ($, _) {
                     plot = Plot.dot(this.options.config.data, this.options.config.settings).plot();
                     break;
                 case "line":
-                    plot = Plot.line(this.options.config.data, this.options.config.settings).plot();
+                    plot = Plot.line(this.options.config.data, this.options.config.settings).plot(this.options.config.plot);
                     break;
                 case "pie":
                     plot = PieChart(this.options.config.data, this.options.config.settings);

diff --git a/ckanext/charts/chart_builders/base.py b/ckanext/charts/chart_builders/base.py
@@ -469,6 +469,30 @@ def sort_y_field(self) -> dict[str, Any]:
             ],
         }
 
+    def invert_x_field(self) -> dict[str, Any]:
+        return {
+            "field_name": "invert_x",
+            "label": "Invert X-axis",
+            "form_snippet": "chart_checkbox.html",
+            "group": "Data",
+            "validators": [
+                self.get_validator("default")(False),
+                self.get_validator("boolean_validator"),
+            ],
+        }
+
+    def invert_y_field(self) -> dict[str, Any]:
+        return {
+            "field_name": "invert_y",
+            "label": "Invert Y-axis",
+            "form_snippet": "chart_checkbox.html",
+            "group": "Data",
+            "validators": [
+                self.get_validator("default")(False),
+                self.get_validator("boolean_validator"),
+            ],
+        }
+
     def log_x_field(self) -> dict[str, Any]:
         return {
             "field_name": "log_x",

diff --git a/ckanext/charts/chart_builders/chartjs.py b/ckanext/charts/chart_builders/chartjs.py
@@ -127,7 +127,14 @@ def to_json(self) -> str:
             datasets.append(dataset)
 
         data["data"]["datasets"] = datasets
-
+        data["options"]["scales"] = {
+            "x": {
+                "reverse": self.settings.get("invert_x", False),
+            },
+            "y": {
+                "reverse": self.settings.get("invert_y", False),
+            },
+        }
         return json.dumps(data)
 
 
@@ -153,6 +160,8 @@ def get_form_fields(self):
             self.sort_x_field(),
             self.sort_y_field(),
             self.limit_field(),
+            self.invert_x_field(),
+            self.invert_y_field(),
             self.filter_field(columns),
         ]
 

diff --git a/ckanext/charts/chart_builders/observable.py b/ckanext/charts/chart_builders/observable.py
@@ -87,6 +87,10 @@ def to_json(self) -> str:
                 "type": "line",
                 "data": self.df.to_dict(orient="records"),
                 "settings": self.settings,
+                "plot": {
+                    "x": {"reverse": self.settings.get("invert_x", False)},
+                    "y": {"reverse": self.settings.get("invert_y", False)}
+                }
             }
         )
 
@@ -110,6 +114,8 @@ def get_form_fields(self):
             self.x_axis_field(columns),
             self.y_axis_field(columns),
             self.more_info_button_field(),
+            self.invert_x_field(),
+            self.invert_y_field(),
             self.sort_x_field(),
             self.sort_y_field(),
             self.limit_field(),

diff --git a/ckanext/charts/chart_builders/plotly.py b/ckanext/charts/chart_builders/plotly.py
@@ -72,6 +72,12 @@ def build_line_chart(self) -> Any:
         if chart_title := self.settings.get("chart_title"):
             fig.update_layout(title_text=chart_title)
 
+        if self.settings.get("invert_x", False):
+            fig.update_xaxes(autorange="reversed")
+
+        if self.settings.get("invert_y", False):
+            fig.update_yaxes(autorange="reversed")
+
         return fig.to_json()
 
 
@@ -182,6 +188,8 @@ def get_form_fields(self):
             self.x_axis_field(columns),
             self.plotly_y_multi_axis_field(columns, 2),
             self.more_info_button_field(),
+            self.invert_x_field(),
+            self.invert_y_field(),
             self.sort_x_field(),
             self.sort_y_field(),
             self.limit_field(),