Skip to content
Code-Schnipsel Gruppen Projekte

fix(Comments): correct sorting

Zusammengeführt Henning Leutz requested to merge dev into next
1 Datei
+ 26
13
Änderungen vergleichen
  • Nebeneinander
  • In der Reihe
@@ -138,7 +138,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -138,7 +138,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
});
});
// grouping
// grouping
let i, len, day, date, entry, title;
let i, len, Day, date, entry, title, unixDay;
const group = {};
const group = {};
const DayFormatter = this.$getDayFormatter();
const DayFormatter = this.$getDayFormatter();
@@ -146,11 +146,13 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -146,11 +146,13 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
for (i = 0, len = comments.length; i < len; i++) {
for (i = 0, len = comments.length; i < len; i++) {
entry = comments[i];
entry = comments[i];
date = entry.date;
date = entry.date;
day = DayFormatter.format(date);
if (typeof group[day] === 'undefined') {
Day = new Date(date.getFullYear(), date.getMonth(), date.getDate());
group[day] = {
unixDay = Day.getTime() / 1000;
day: day,
 
if (typeof group[unixDay] === 'undefined') {
 
group[unixDay] = {
 
day: DayFormatter.format(date),
data: []
data: []
};
};
}
}
@@ -165,8 +167,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -165,8 +167,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
});
});
}
}
group[day].data.push({
group[unixDay].data.push({
time: entry.time,
time: entry.time,
 
unixDay: unixDay,
message: entry.message,
message: entry.message,
type: entry.type,
type: entry.type,
timestamp: entry.timestamp,
timestamp: entry.timestamp,
@@ -187,15 +190,10 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -187,15 +190,10 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
*/
*/
refresh: function() {
refresh: function() {
let i, data, realData, commentEntries;
let i, data, realData, commentEntries;
 
const self = this;
const self = this;
const comments = [];
const comments = [];
const sortComments = function(a, b) {
return a.timestamp - b.timestamp;
};
const commentClone = Object.clone(this.$comments);
const filterComments = function(entry) {
const filterComments = function(entry) {
const message = entry.message.toLowerCase();
const message = entry.message.toLowerCase();
const type = entry.type.toLowerCase();
const type = entry.type.toLowerCase();
@@ -211,6 +209,21 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -211,6 +209,21 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
this.push(entry);
this.push(entry);
};
};
 
// sorting
 
const commentClone = [];
 
const tmpClone = Object.clone(this.$comments);
 
const sortedDays = Object.keys(tmpClone).sort((a, b) => b - a);
 
 
sortedDays.forEach(day => {
 
tmpClone[day].data.sort((a, b) => b.timestamp - a.timestamp);
 
 
commentClone.push({
 
unix: day,
 
day: tmpClone[day].day,
 
data: tmpClone[day].data
 
});
 
});
 
for (i in commentClone) {
for (i in commentClone) {
if (!commentClone.hasOwnProperty(i)) {
if (!commentClone.hasOwnProperty(i)) {
continue;
continue;
@@ -232,7 +245,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
@@ -232,7 +245,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
}
}
// reverse comments
// reverse comments
commentClone[i].data = data.sort(sortComments).reverse();
commentClone[i].data = data;
comments.push(commentClone[i]);
comments.push(commentClone[i]);
}
}
Lade