Add ability to manage custom chart color schemes

cortezaproject · Oct 23, 2023 · 2508b60 · 2508b60
1 parent 6f45514
commit 2508b60
Show file tree

Hide file tree

Showing 20 changed files with 342 additions and 39 deletions.
diff --git a/client/web/admin/src/components/User/CUserEditorAvatar.vue b/client/web/admin/src/components/User/CUserEditorAvatar.vue
@@ -53,6 +53,7 @@
             data-test-id="input-text-color"
             :translations="{
               modalTitle: $t('colorPicker'),
+              cancelBtnLabel: $t('general:label.cancel'),
               saveBtnLabel: $t('general:label.saveAndClose')
             }"
           />
@@ -67,6 +68,7 @@
             data-test-id="input-background-color"
             :translations="{
               modalTitle: $t('colorPicker'),
+              cancelBtnLabel: $t('general:label.cancel'),
               saveBtnLabel: $t('general:label.saveAndClose')
             }"
           />

diff --git a/client/web/compose/src/components/Chart/index.vue b/client/web/compose/src/components/Chart/index.vue
@@ -168,6 +168,7 @@ export default {
           }
 
           data.labels = data.labels.map(l => l === 'undefined' ? this.$t('chart:undefined') : l)
+          data.customColorSchemes = this.$Settings.get('ui.charts.colorSchemes', [])
 
           this.renderer = chart.makeOptions(data)
         } else {

diff --git a/client/web/compose/src/components/ModuleFields/Configurator/File.vue b/client/web/compose/src/components/ModuleFields/Configurator/File.vue
@@ -166,6 +166,7 @@
               v-model="f.options.backgroundColor"
               :translations="{
                 modalTitle: $t('kind.file.view.colorPicker'),
+                cancelBtnLabel: $t('general:label.cancel'),
                 saveBtnLabel: $t('general:label.saveAndClose')
               }"
             />

diff --git a/.../web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue b/.../web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue
@@ -34,6 +34,7 @@
             v-model="feed.options.color"
             :translations="{
               modalTitle: $t('calendar.recordFeed.colorPicker'),
+              cancelBtnLabel: $t('general:label.cancel'),
               saveBtnLabel: $t('general:label.saveAndClose')
             }"
           />

diff --git a/...eb/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.vue b/...eb/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.vue
@@ -10,6 +10,7 @@
         v-model="feed.options.color"
         :translations="{
           modalTitle: $t('calendar.recordFeed.colorPicker'),
+          cancelBtnLabel: $t('general:label.cancel'),
           saveBtnLabel: $t('general:label.saveAndClose')
         }"
       />

diff --git a/client/web/compose/src/components/PageBlocks/FileConfigurator.vue b/client/web/compose/src/components/PageBlocks/FileConfigurator.vue
@@ -172,6 +172,7 @@
               v-model="options.backgroundColor"
               :translations="{
                 modalTitle: $t('kind.file.view.colorPicker'),
+                cancelBtnLabel: $t('general:label.cancel'),
                 saveBtnLabel: $t('general:label.saveAndClose')
               }"
             />

diff --git a/.../web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue b/.../web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue
@@ -89,6 +89,7 @@
             v-model="feed.options.color"
             :translations="{
               modalTitle: $t('geometry.recordFeed.colorPicker'),
+              cancelBtnLabel: $t('general:label.cancel'),
               saveBtnLabel: $t('general:label.saveAndClose')
             }"
           />

diff --git a/client/web/compose/src/components/PageBlocks/MetricConfigurator/MStyle.vue b/client/web/compose/src/components/PageBlocks/MetricConfigurator/MStyle.vue
@@ -10,6 +10,7 @@
           v-model="options.color"
           :translations="{
             modalTitle: $t('metric.editStyle.colorPicker'),
+            cancelBtnLabel: $t('general:label.cancel'),
             saveBtnLabel: $t('general:label.saveAndClose')
           }"
           class="mb-1"
@@ -23,6 +24,7 @@
           v-model="options.backgroundColor"
           :translations="{
             modalTitle: $t('geometry.recordFeed.colorPicker'),
+            cancelBtnLabel: $t('general:label.cancel'),
             saveBtnLabel: $t('general:label.saveAndClose')
           }"
           class="mb-1"

diff --git a/client/web/compose/src/components/PageBlocks/Navigation/Configurator.vue b/client/web/compose/src/components/PageBlocks/Navigation/Configurator.vue
@@ -134,6 +134,7 @@
                         v-model="item.options.textColor"
                         :translations="{
                           modalTitle: $t('navigation.colorPicker'),
+                          cancelBtnLabel: $t('general:label.cancel'),
                           saveBtnLabel: $t('general:label.saveAndClose')
                         }"
                         class="w-100"
@@ -144,6 +145,7 @@
                         v-model="item.options.backgroundColor"
                         :translations="{
                           modalTitle: $t('navigation.colorPicker'),
+                          cancelBtnLabel: $t('general:label.cancel'),
                           saveBtnLabel: $t('general:label.saveAndClose')
                         }"
                         class="w-100"