+
@@ -221,5 +225,6 @@ export default {
+
`,
};
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 17c2ac004..43031b8c1 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,5 +1,4 @@
import BsConfirm from "../Bootstrap/Confirm.js";
-import SectionModal from "../Bootstrap/Alert.js";
import DropGrid from '../Drop/Grid.js'
import DashboardItem from "./Item.js";
import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
@@ -41,6 +40,7 @@ export default {
gridWidth: 1,
gridHeight: null,
draggedItem:null,
+ additionalRow:false,
}
},
provide() {
@@ -108,13 +108,13 @@ export default {
},
showSectionInformation(){
if (this.name == "general"){
- SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription'));
+ return this.$p.t('dashboard', 'dashboardGeneralSectionDescription');
}
else if(this.name == "custom"){
- SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription'));
+ return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
}
else{
- SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]));
+ return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
}
},
handleConfigOpened() {
@@ -209,18 +209,20 @@ export default {
});
},
template: `
-
-
+
+
{{sectionNameTranslation()}}:
-
+
+
-
-
+
Create new widget
-
+
No Widgets available
-
+
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index a7d816cb2..76a32af8c 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -20,7 +20,7 @@ export default {
emits:["select"],
template: /*html */`
- ![]()
+ ![]()
{{ widget.setup.name || widget.widget_kurzbz }}
{{ widget.beschreibung }}
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 44ca0a603..55b9b1bbd 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -26,6 +26,10 @@ export default {
type: Number,
default: 0
},
+ additionalRow:{
+ type: Boolean,
+ default: false,
+ }
},
emits: [
"rearrangeItems",
@@ -48,7 +52,6 @@ export default {
draggedOffset: [0,0],
draggedItem: null,
draggedNode: null,
- additionalRow: null,
reorderedItems:[],
clonedWidget:null,
}
@@ -60,6 +63,14 @@ export default {
},
},
computed: {
+ additionalRowComputed: {
+ get() {
+ return this.additionalRow;
+ },
+ set(value) {
+ this.$emit('update:additionalRow', value);
+ }
+ },
items_hashmap() {
let items = {};
this.items.forEach(item => {
@@ -117,10 +128,19 @@ export default {
return [...this.placedItems, ...this.items_placeholders];
},
rows() {
- if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
- return this.dragGrid.h;
+ if (this.additionalRowComputed) {
+ return this.grid ? (this.grid.h+1) : 1;
}
return this.grid ? this.grid.h : 1;
+ /* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
+ return this.dragGrid.h;
+ }
+ if (this.mode == MODE_IDLE) {
+ if (this.additionalRowComputed) {
+ return this.grid ? (this.grid.h+1) : 1;
+ }
+ }
+ return this.grid ? this.grid.h : 1; */
},
gridStyle() {
const addH = this.active ? this.marginForExtraRow : 0;
@@ -347,17 +367,12 @@ export default {
});
},
mouseLeave() {
- if (this.mode == MODE_IDLE) {
+ /* if (this.mode == MODE_IDLE) {
this.x = -1;
this.y = -1;
- if (this.additionalRow !== null) {
- let gridHeight = this.grid.getMaxY() + 1;
- if(this.grid.h>gridHeight){
- this.grid.h = gridHeight;
- }
- this.additionalRow = null;
- }
- }
+ this.additionalRowComputed = false;
+
+ } */
},
updateCursor(evt) {
if (!this.active) {
@@ -380,18 +395,6 @@ export default {
if (this.x == gridX && this.y == gridY)
return false;
- if (this.mode == MODE_IDLE) {
- if (this.additionalRow === null && this.y == this.rows-1 && gridY == this.rows) {
- this.additionalRow = this.grid.h;
- this.grid.h += 1;
- } else if (this.additionalRow !== null && gridY != this.rows - 1) {
- let gridHeight = this.grid.getMaxY() + 1;
- if(this.grid.h > gridHeight){
- this.grid.h = gridHeight;
- }
- this.additionalRow = null;
- }
- }
this.x = gridX;
this.y = gridY;
@@ -405,6 +408,7 @@ export default {
}
},
startMove(evt, item) {
+
if (!this.active)
return;
@@ -413,14 +417,15 @@ export default {
this.grid.h += 1;
this.draggedItem = item;
this.$emit('draggedItem',item);
- this.draggedNode = evt.target;
+
+ this.draggedNode = evt.target.closest(".drop-grid-item");
//clones the widget for the drag Image
- let clone = evt.target.cloneNode(true);
+ let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
+
clone.style.zIndex = 5;
clone.classList.add("widgetClone");
this.$refs.container.appendChild(clone);
this.clonedWidget = clone;
-
this.draggedOffset = [item.x - this.x, item.y - this.y];
this._dragStart(evt, item);
},
@@ -480,6 +485,7 @@ export default {
}
},
dragCancel() {
+ this.additionalRowComputed = false;
this.toggleDraggedItemOverlay(false);
this.mode = MODE_IDLE;
this.positionUpdates = null;
@@ -498,9 +504,10 @@ export default {
Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
ele.classList.remove("denied-dragging-animation");
})
+
let widgetClones = document.getElementsByClassName("widgetClone");
- for(let widget of widgetClones){
- this.$refs.container.removeChild(widget);
+ for (let i=0; i = this.cols)
@@ -528,6 +535,7 @@ export default {
return updated;
},
emptyTileClicked() {
+ this.additionalRowComputed = false;
this.$emit('newItem', this.x, this.y);
},
updateCursorOnMouseMove(evt){
@@ -614,7 +622,7 @@ export default {
Pruefe Tabellen und Attribute!
';
diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
new file mode 100644
index 000000000..e59df948a
--- /dev/null
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -0,0 +1,57 @@
+db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+$errorList = array();
+for($i = 0; $i < $result_num_rows; $i++)
+{
+ $row = $db->db_fetch_object($result, $i);
+
+ $qry = "
+ UPDATE dashboard.tbl_dashboard_preset
+ SET preset =
+ COALESCE(
+ (SELECT jsonb_object_agg(keys,values) FROM (
+ SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+ FROM jsonb_each(preset->'widgets')
+ ) AS subquery
+ ),preset)
+ WHERE preset_id = ".$row->preset_id;
+
+ $db->db_query($qry);
+ if (!$db->db_query($qry))
+ array_push($errorList,'
dashboard.tbl_dashboard_preset: ' . $db->db_last_error() . '
') ;
+
+}
+
+$result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+for($i = 0; $i < $result_num_rows; $i++)
+{
+ $row = $db->db_fetch_object($result, $i);
+
+ $qry = "
+ UPDATE dashboard.tbl_dashboard_benutzer_override
+ SET override =
+ COALESCE(
+ (SELECT jsonb_object_agg(keys,values) FROM (
+ SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+ FROM jsonb_each(override->'widgets')
+ ) AS subquery
+ ),override)
+ WHERE override_id = ".$row->override_id;
+
+ $db->db_query($qry);
+ if (!$db->db_query($qry))
+ array_push($errorList,'
dashboard.tbl_dashboard_benutzer_override: ' . $db->db_last_error() . '
') ;
+
+}
+
+if(empty($errorList)){
+ echo '
successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
+}
+else{
+ foreach($errorList as $error){
+ echo $error;
+ }
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f51e8a200..32bbb4364 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40581,6 +40581,26 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'dashboard',
+ 'phrase' => 'addLine',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Weitere Zeile hinzufügen',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Add another line',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'dashboard',
+
No Widgets available
-
+
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index a7d816cb2..76a32af8c 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -20,7 +20,7 @@ export default {
emits:["select"],
template: /*html */`
- ![]()
+ ![]()
= this.cols)
@@ -528,6 +535,7 @@ export default {
return updated;
},
emptyTileClicked() {
+ this.additionalRowComputed = false;
this.$emit('newItem', this.x, this.y);
},
updateCursorOnMouseMove(evt){
@@ -614,7 +622,7 @@ export default {
dashboard.tbl_dashboard_preset: ' . $db->db_last_error() . '
') ; + +} + +$result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'"); +$result_num_rows = $db->db_num_rows($result); +for($i = 0; $i < $result_num_rows; $i++) +{ + $row = $db->db_fetch_object($result, $i); + + $qry = " + UPDATE dashboard.tbl_dashboard_benutzer_override + SET override = + COALESCE( + (SELECT jsonb_object_agg(keys,values) FROM ( + SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values + FROM jsonb_each(override->'widgets') + ) AS subquery + ),override) + WHERE override_id = ".$row->override_id; + + $db->db_query($qry); + if (!$db->db_query($qry)) + array_push($errorList,'
dashboard.tbl_dashboard_benutzer_override: ' . $db->db_last_error() . '
') ; + +} + +if(empty($errorList)){ + echo '
successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override'; +} +else{ + foreach($errorList as $error){ + echo $error; + } +} diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index f51e8a200..32bbb4364 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -40581,6 +40581,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'addLine', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Weitere Zeile hinzufügen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Add another line', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'dashboard',
{{ widget.setup.name || widget.widget_kurzbz }}
{{ widget.beschreibung }}
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js index 44ca0a603..55b9b1bbd 100644 --- a/public/js/components/Drop/Grid.js +++ b/public/js/components/Drop/Grid.js @@ -26,6 +26,10 @@ export default { type: Number, default: 0 }, + additionalRow:{ + type: Boolean, + default: false, + } }, emits: [ "rearrangeItems", @@ -48,7 +52,6 @@ export default { draggedOffset: [0,0], draggedItem: null, draggedNode: null, - additionalRow: null, reorderedItems:[], clonedWidget:null, } @@ -60,6 +63,14 @@ export default { }, }, computed: { + additionalRowComputed: { + get() { + return this.additionalRow; + }, + set(value) { + this.$emit('update:additionalRow', value); + } + }, items_hashmap() { let items = {}; this.items.forEach(item => { @@ -117,10 +128,19 @@ export default { return [...this.placedItems, ...this.items_placeholders]; }, rows() { - if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){ - return this.dragGrid.h; + if (this.additionalRowComputed) { + return this.grid ? (this.grid.h+1) : 1; } return this.grid ? this.grid.h : 1; + /* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){ + return this.dragGrid.h; + } + if (this.mode == MODE_IDLE) { + if (this.additionalRowComputed) { + return this.grid ? (this.grid.h+1) : 1; + } + } + return this.grid ? this.grid.h : 1; */ }, gridStyle() { const addH = this.active ? this.marginForExtraRow : 0; @@ -347,17 +367,12 @@ export default { }); }, mouseLeave() { - if (this.mode == MODE_IDLE) { + /* if (this.mode == MODE_IDLE) { this.x = -1; this.y = -1; - if (this.additionalRow !== null) { - let gridHeight = this.grid.getMaxY() + 1; - if(this.grid.h>gridHeight){ - this.grid.h = gridHeight; - } - this.additionalRow = null; - } - } + this.additionalRowComputed = false; + + } */ }, updateCursor(evt) { if (!this.active) { @@ -380,18 +395,6 @@ export default { if (this.x == gridX && this.y == gridY) return false; - if (this.mode == MODE_IDLE) { - if (this.additionalRow === null && this.y == this.rows-1 && gridY == this.rows) { - this.additionalRow = this.grid.h; - this.grid.h += 1; - } else if (this.additionalRow !== null && gridY != this.rows - 1) { - let gridHeight = this.grid.getMaxY() + 1; - if(this.grid.h > gridHeight){ - this.grid.h = gridHeight; - } - this.additionalRow = null; - } - } this.x = gridX; this.y = gridY; @@ -405,6 +408,7 @@ export default { } }, startMove(evt, item) { + if (!this.active) return; @@ -413,14 +417,15 @@ export default { this.grid.h += 1; this.draggedItem = item; this.$emit('draggedItem',item); - this.draggedNode = evt.target; + + this.draggedNode = evt.target.closest(".drop-grid-item"); //clones the widget for the drag Image - let clone = evt.target.cloneNode(true); + let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true); + clone.style.zIndex = 5; clone.classList.add("widgetClone"); this.$refs.container.appendChild(clone); this.clonedWidget = clone; - this.draggedOffset = [item.x - this.x, item.y - this.y]; this._dragStart(evt, item); }, @@ -480,6 +485,7 @@ export default { } }, dragCancel() { + this.additionalRowComputed = false; this.toggleDraggedItemOverlay(false); this.mode = MODE_IDLE; this.positionUpdates = null; @@ -498,9 +504,10 @@ export default { Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => { ele.classList.remove("denied-dragging-animation"); }) + let widgetClones = document.getElementsByClassName("widgetClone"); - for(let widget of widgetClones){ - this.$refs.container.removeChild(widget); + for (let i=0; iPruefe Tabellen und Attribute!
'; diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php new file mode 100644 index 000000000..e59df948a --- /dev/null +++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php @@ -0,0 +1,57 @@ +db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'"); +$result_num_rows = $db->db_num_rows($result); +$errorList = array(); +for($i = 0; $i < $result_num_rows; $i++) +{ + $row = $db->db_fetch_object($result, $i); + + $qry = " + UPDATE dashboard.tbl_dashboard_preset + SET preset = + COALESCE( + (SELECT jsonb_object_agg(keys,values) FROM ( + SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values + FROM jsonb_each(preset->'widgets') + ) AS subquery + ),preset) + WHERE preset_id = ".$row->preset_id; + + $db->db_query($qry); + if (!$db->db_query($qry)) + array_push($errorList,'dashboard.tbl_dashboard_preset: ' . $db->db_last_error() . '
') ; + +} + +$result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'"); +$result_num_rows = $db->db_num_rows($result); +for($i = 0; $i < $result_num_rows; $i++) +{ + $row = $db->db_fetch_object($result, $i); + + $qry = " + UPDATE dashboard.tbl_dashboard_benutzer_override + SET override = + COALESCE( + (SELECT jsonb_object_agg(keys,values) FROM ( + SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values + FROM jsonb_each(override->'widgets') + ) AS subquery + ),override) + WHERE override_id = ".$row->override_id; + + $db->db_query($qry); + if (!$db->db_query($qry)) + array_push($errorList,'
dashboard.tbl_dashboard_benutzer_override: ' . $db->db_last_error() . '
') ; + +} + +if(empty($errorList)){ + echo '
successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override'; +} +else{ + foreach($errorList as $error){ + echo $error; + } +} diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index f51e8a200..32bbb4364 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -40581,6 +40581,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'addLine', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Weitere Zeile hinzufügen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Add another line', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'dashboard',